diff --git a/.NetworkManager.metadata b/.NetworkManager.metadata
index 462411f..e61b8b4 100644
--- a/.NetworkManager.metadata
+++ b/.NetworkManager.metadata
@@ -1 +1 @@
-c1c90837161e149f454e886c4cdba414e87fc120 SOURCES/NetworkManager-1.18.0.tar.xz
+115416aebfeca18283e32daddce277f7994e844d SOURCES/NetworkManager-1.18.4.tar.xz
diff --git a/.gitignore b/.gitignore
index 03b22ff..a5dc152 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/NetworkManager-1.18.0.tar.xz
+SOURCES/NetworkManager-1.18.4.tar.xz
diff --git a/SOURCES/0001-cloned-mac-address-permanent-rh1413312.patch b/SOURCES/0001-cloned-mac-address-permanent-rh1413312.patch
index fb8e464..6ea0e36 100644
--- a/SOURCES/0001-cloned-mac-address-permanent-rh1413312.patch
+++ b/SOURCES/0001-cloned-mac-address-permanent-rh1413312.patch
@@ -1,4 +1,4 @@
-From 488696bfaabe783972f756f53ff2cce7b0aa8d4b Mon Sep 17 00:00:00 2001
+From 014a4b315205203dcfee659104b0e19204156a16 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Fri, 24 Feb 2017 20:25:56 +0100
Subject: [PATCH] Revert "device: change default value for cloned-mac-address
@@ -16,7 +16,7 @@ This reverts commit fae5ecec5a4d9987a1915441602cb78275a9f490.
5 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/clients/common/settings-docs.h.in b/clients/common/settings-docs.h.in
-index 59ca4cc..5fbafb7 100644
+index 811f2f16d630..8f1be4d89443 100644
--- a/clients/common/settings-docs.h.in
+++ b/clients/common/settings-docs.h.in
@@ -7,7 +7,7 @@
@@ -38,7 +38,7 @@ index 59ca4cc..5fbafb7 100644
#define DESCRIBE_DOC_NM_SETTING_WIRED_GENERATE_MAC_ADDRESS_MASK N_("With \"cloned-mac-address\" setting \"random\" or \"stable\", by default all bits of the MAC address are scrambled and a locally-administered, unicast MAC address is created. This property allows to specify that certain bits are fixed. Note that the least significant bit of the first MAC address will always be unset to create a unicast MAC address. If the property is NULL, it is eligible to be overwritten by a default connection setting. If the value is still NULL or an empty string, the default is to create a locally-administered, unicast MAC address. If the value contains one MAC address, this address is used as mask. The set bits of the mask are to be filled with the current MAC address of the device, while the unset bits are subject to randomization. Setting \"FE:FF:FF:00:00:00\" means to preserve the OUI of the current MAC address and only randomize the lower 3 bytes using the \"random\" or \"stable\" algorithm. If the value contains one additional MAC 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.")
#define DESCRIBE_DOC_NM_SETTING_WIRED_MAC_ADDRESS N_("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).")
diff --git a/libnm-core/nm-setting-wired.c b/libnm-core/nm-setting-wired.c
-index 7f08430..b916a7c 100644
+index 182e71930210..cf97ccb98a86 100644
--- a/libnm-core/nm-setting-wired.c
+++ b/libnm-core/nm-setting-wired.c
@@ -1150,8 +1150,8 @@ nm_setting_wired_class_init (NMSettingWiredClass *klass)
@@ -63,7 +63,7 @@ index 7f08430..b916a7c 100644
* On D-Bus, this field is expressed as "assigned-mac-address" or the deprecated
* "cloned-mac-address".
diff --git a/libnm-core/nm-setting-wireless.c b/libnm-core/nm-setting-wireless.c
-index b4cb105..ac3f168 100644
+index d8056c6c598e..188a40021862 100644
--- a/libnm-core/nm-setting-wireless.c
+++ b/libnm-core/nm-setting-wireless.c
@@ -1405,8 +1405,8 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *klass)
@@ -88,7 +88,7 @@ index b4cb105..ac3f168 100644
* On D-Bus, this field is expressed as "assigned-mac-address" or the deprecated
* "cloned-mac-address".
diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml
-index 2893424..a8c4d0b 100644
+index 289342473a30..a8c4d0b9b596 100644
--- a/man/NetworkManager.conf.xml
+++ b/man/NetworkManager.conf.xml
@@ -705,7 +705,7 @@ ipv6.ip6-privacy=0
@@ -110,10 +110,10 @@ index 2893424..a8c4d0b 100644
<varlistentry>
<term><varname>wifi.generate-mac-address-mask</varname></term>
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
-index 06ad2ce82..c0867a04b 100644
+index 43f03739bcf9..fafd71b38eb8 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
-@@ -15453,7 +15453,8 @@ _get_cloned_mac_address_setting (NMDevice *self, NMConnection *connection, gbool
+@@ -15555,7 +15555,8 @@ _get_cloned_mac_address_setting (NMDevice *self, NMConnection *connection, gbool
: NM_CON_DEFAULT ("ethernet.cloned-mac-address"),
self);
diff --git a/SOURCES/0003-dhclient-no-leading-zero-client-id-rh1556983.patch b/SOURCES/0003-dhclient-no-leading-zero-client-id-rh1556983.patch
index b3516dc..b308cc2 100644
--- a/SOURCES/0003-dhclient-no-leading-zero-client-id-rh1556983.patch
+++ b/SOURCES/0003-dhclient-no-leading-zero-client-id-rh1556983.patch
@@ -1,4 +1,4 @@
-From bbee3b6833ab1792e75470db5f3b7022e9a965f5 Mon Sep 17 00:00:00 2001
+From 6b92df3dfca4854e35cb87024ccd17a34e731277 Mon Sep 17 00:00:00 2001
From: Beniamino Galvani <bgalvani@redhat.com>
Date: Wed, 20 Jun 2018 11:49:22 +0200
Subject: [PATCH 1/2] Revert "dhclient: write client-id with backslash and
@@ -11,10 +11,10 @@ This reverts commit 0e4b33ee7552b036332f1bdbfed78f8ee75f000e.
2 files changed, 2 insertions(+), 33 deletions(-)
diff --git a/src/dhcp/nm-dhcp-dhclient-utils.c b/src/dhcp/nm-dhcp-dhclient-utils.c
-index cbd706f..7324597 100644
+index 85ca3704d12a..6cbc0c97c535 100644
--- a/src/dhcp/nm-dhcp-dhclient-utils.c
+++ b/src/dhcp/nm-dhcp-dhclient-utils.c
-@@ -124,7 +124,7 @@ add_ip4_config (GString *str, GBytes *client_id, const char *hostname, gboolean
+@@ -135,7 +135,7 @@ add_ip4_config (GString *str, GBytes *client_id, const char *hostname, gboolean
* as long as all the characters are printable.
*/
for (i = 1; (p[0] == 0) && i < l; i++) {
@@ -24,7 +24,7 @@ index cbd706f..7324597 100644
}
diff --git a/src/dhcp/tests/test-dhcp-dhclient.c b/src/dhcp/tests/test-dhcp-dhclient.c
-index 55d712b..7df0720 100644
+index 1eac36434cf9..fb9251f25a2e 100644
--- a/src/dhcp/tests/test-dhcp-dhclient.c
+++ b/src/dhcp/tests/test-dhcp-dhclient.c
@@ -178,36 +178,6 @@ test_quote_client_id (void)
@@ -77,7 +77,8 @@ index 55d712b..7df0720 100644
--
2.21.0
-From 2049c9c861f262aa6c949f45cd401ec515c2f2d0 Mon Sep 17 00:00:00 2001
+
+From 2203e61c9cee7b3fcb6052523cdc2721e54496c7 Mon Sep 17 00:00:00 2001
From: Beniamino Galvani <bgalvani@redhat.com>
Date: Wed, 20 Jun 2018 11:50:51 +0200
Subject: [PATCH 2/2] Revert "dhcp: dhclient: set type 0 for printable client
@@ -92,10 +93,10 @@ This reverts commit 8ffa22d10d3001405965826b46463663fd2dacc2.
2 files changed, 17 insertions(+), 116 deletions(-)
diff --git a/src/dhcp/nm-dhcp-dhclient-utils.c b/src/dhcp/nm-dhcp-dhclient-utils.c
-index 7324597..4eb4c5d 100644
+index 6cbc0c97c535..3338fbff2e93 100644
--- a/src/dhcp/nm-dhcp-dhclient-utils.c
+++ b/src/dhcp/nm-dhcp-dhclient-utils.c
-@@ -137,9 +137,8 @@ add_ip4_config (GString *str, GBytes *client_id, const char *hostname, gboolean
+@@ -148,9 +148,8 @@ add_ip4_config (GString *str, GBytes *client_id, const char *hostname, gboolean
g_string_append_printf (str, "%02x", (guint8) p[i]);
}
} else {
@@ -106,7 +107,7 @@ index 7324597..4eb4c5d 100644
g_string_append_len (str, p + 1, l - 1);
g_string_append_c (str, '"');
}
-@@ -177,60 +176,31 @@ read_client_id (const char *str)
+@@ -188,60 +187,31 @@ read_client_id (const char *str)
{
gs_free char *s = NULL;
char *p;
@@ -175,7 +176,7 @@ index 7324597..4eb4c5d 100644
static gboolean
diff --git a/src/dhcp/tests/test-dhcp-dhclient.c b/src/dhcp/tests/test-dhcp-dhclient.c
-index 7df0720..acdd276 100644
+index fb9251f25a2e..f6267cd2816d 100644
--- a/src/dhcp/tests/test-dhcp-dhclient.c
+++ b/src/dhcp/tests/test-dhcp-dhclient.c
@@ -151,7 +151,7 @@ test_override_client_id (void)
diff --git a/SOURCES/0005-dhcp-internal-default-client-id-rh1695723.patch b/SOURCES/0005-dhcp-internal-default-client-id-rh1695723.patch
index aa198b2..443500e 100644
--- a/SOURCES/0005-dhcp-internal-default-client-id-rh1695723.patch
+++ b/SOURCES/0005-dhcp-internal-default-client-id-rh1695723.patch
@@ -1,4 +1,4 @@
-From 5ca3888861d4f05935c9f330804c1f30ab8c57e5 Mon Sep 17 00:00:00 2001
+From c63d39ed73da9cd804e7ace3b11debb49ed5f6b4 Mon Sep 17 00:00:00 2001
From: Francesco Giudici <fgiudici@redhat.com>
Date: Tue, 9 Apr 2019 11:41:27 +0200
Subject: [PATCH] dhcp/internal: make default dhcp-client-id based on systemd
@@ -16,7 +16,7 @@ This reverts commit cfd696cc3cf43f5f510046b757949546bcee4cdc.
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/dhcp/nm-dhcp-manager.c b/src/dhcp/nm-dhcp-manager.c
-index 7063c82cf..4a40d2e52 100644
+index fe843a2ce43c..b998bf465b25 100644
--- a/src/dhcp/nm-dhcp-manager.c
+++ b/src/dhcp/nm-dhcp-manager.c
@@ -237,7 +237,7 @@ client_start (NMDhcpManager *self,
@@ -29,7 +29,7 @@ index 7063c82cf..4a40d2e52 100644
* to whatever dhclient uses by default.
* We do it this way, because for dhclient the user may configure a default
diff --git a/src/dhcp/nm-dhcp-systemd.c b/src/dhcp/nm-dhcp-systemd.c
-index 70ed87150..84973aa2a 100644
+index 1cd5ba278283..b6344d9bbf9c 100644
--- a/src/dhcp/nm-dhcp-systemd.c
+++ b/src/dhcp/nm-dhcp-systemd.c
@@ -750,7 +750,8 @@ ip4_start (NMDhcpClient *client,
@@ -43,5 +43,5 @@ index 70ed87150..84973aa2a 100644
}
--
-2.20.1
+2.21.0
diff --git a/SOURCES/0006-no-keyfile-file-name-extension-rh1697858.patch b/SOURCES/0006-no-keyfile-file-name-extension-rh1697858.patch
index 5f45622..bc1a3b6 100644
--- a/SOURCES/0006-no-keyfile-file-name-extension-rh1697858.patch
+++ b/SOURCES/0006-no-keyfile-file-name-extension-rh1697858.patch
@@ -1,7 +1,7 @@
-From a67de1d4f7025f86701c1e2cc319238cbbc88f98 Mon Sep 17 00:00:00 2001
+From d943f1093603176864cd029a013d4216ef5f277f Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 9 Apr 2019 18:00:21 +0200
-Subject: [PATCH 1/1] Revert "keyfile: also add ".nmconnection" extension when
+Subject: [PATCH] Revert "keyfile: also add ".nmconnection" extension when
writing keyfiles in /etc"
This reverts commit d37ad15f12bafd91cf724cda50aea7093e04bf7a.
@@ -10,7 +10,7 @@ This reverts commit d37ad15f12bafd91cf724cda50aea7093e04bf7a.
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/settings/plugins/keyfile/nms-keyfile-writer.c b/src/settings/plugins/keyfile/nms-keyfile-writer.c
-index 8c75d8c79..fe05df28e 100644
+index 2e06aeb9da69..ee652881d60b 100644
--- a/src/settings/plugins/keyfile/nms-keyfile-writer.c
+++ b/src/settings/plugins/keyfile/nms-keyfile-writer.c
@@ -357,16 +357,19 @@ nms_keyfile_writer_connection (NMConnection *connection,
@@ -36,5 +36,5 @@ index 8c75d8c79..fe05df28e 100644
0,
existing_path,
--
-2.20.1
+2.21.0
diff --git a/SOURCES/1000-cli-hide-certificate-blobs-rh1702199.patch b/SOURCES/1000-cli-hide-certificate-blobs-rh1702199.patch
deleted file mode 100644
index 02d3c75..0000000
--- a/SOURCES/1000-cli-hide-certificate-blobs-rh1702199.patch
+++ /dev/null
@@ -1,398 +0,0 @@
-From ff8fb5975a6cf8d904256fa414b359c9f1c4682d Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Tue, 23 Apr 2019 14:17:47 +0200
-Subject: [PATCH 1/6] cli: fix setting private key password
-
-Fixes: fe390556abfe ('cli: add property type for 802-1x certificate properties (pt3)')
-(cherry picked from commit ee96387578ca5428b9836dda382f9e6d64d5a7a8)
-(cherry picked from commit d8badb280ce2acfcd0ae6fb3d8d133cae6326b7c)
----
- clients/common/nm-meta-setting-desc.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c
-index 698ded869..b21ce37cf 100644
---- a/clients/common/nm-meta-setting-desc.c
-+++ b/clients/common/nm-meta-setting-desc.c
-@@ -2276,6 +2276,7 @@ _set_fcn_cert_8021x (ARGS_SET_FCN)
- password = path + strcspn (path, " \t");
- if (password[0] != '\0') {
- password[0] = '\0';
-+ password++;
- while (nm_utils_is_separator (password[0]))
- password++;
- } else {
---
-2.20.1
-
-From 2fe6e3a039fa1c1b1975020f409a1b505c27ec3d Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Tue, 23 Apr 2019 14:55:32 +0200
-Subject: [PATCH 2/6] cli: parse escape sequences when reading an 802.1x
- private key
-
-In this way it become possible to specify a filename that includes one
-of the delimiters.
-
-(cherry picked from commit eac15501b2364a20505a90661e037a339a63b0ea)
-(cherry picked from commit 0f03773b75548151a98cae8d696fcfc698a23bb7)
----
- clients/common/nm-meta-setting-desc.c | 28 +++++++++++++++++----------
- 1 file changed, 18 insertions(+), 10 deletions(-)
-
-diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c
-index b21ce37cf..768e371e9 100644
---- a/clients/common/nm-meta-setting-desc.c
-+++ b/clients/common/nm-meta-setting-desc.c
-@@ -2268,17 +2268,25 @@ _set_fcn_cert_8021x (ARGS_SET_FCN)
- vtable = &nm_setting_8021x_scheme_vtable[property_info->property_typ_data->subtype.cert_8021x.scheme_type];
-
- if (vtable->is_secret) {
-- gs_free char *path = NULL;
- nm_auto_free_secret char *password_free = NULL;
-- char *password;
--
-- path = g_strdup (value);
-- password = path + strcspn (path, " \t");
-- if (password[0] != '\0') {
-- password[0] = '\0';
-- password++;
-- while (nm_utils_is_separator (password[0]))
-- password++;
-+ gs_free const char **strv = NULL;
-+ const char *password;
-+ const char *path;
-+ gsize len;
-+
-+ strv = nm_utils_escaped_tokens_split (value, NM_ASCII_SPACES);
-+ len = NM_PTRARRAY_LEN (strv);
-+ if (len > 2) {
-+ g_set_error_literal (error,
-+ NM_UTILS_ERROR,
-+ NM_UTILS_ERROR_INVALID_ARGUMENT,
-+ _("too many arguments. Please only specify a private key file and optionally a password"));
-+ return FALSE;
-+ }
-+
-+ path = len > 0 ? strv[0] : NULL;
-+ if (len == 2) {
-+ password = strv[1];
- } else {
- password_free = g_strdup (vtable->passwd_func (NM_SETTING_802_1X (setting)));
- password = password_free;
---
-2.20.1
-
-From 312f84cefd672ee141c999e374d49711176ff877 Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Tue, 23 Apr 2019 21:14:31 +0200
-Subject: [PATCH 3/6] cli: remove bluetooth completion code
-
-The 'bt-type' property alias accepts values provided by
-gen_func_bt_type(); instead the 'bluetooth.type' property can only be
-set to [dun, panu, nap] and therefore it doesn't need special
-handling.
-
-(cherry picked from commit 78b9448b69d1e511aab9f24f4da8a6731c2dc7ee)
-(cherry picked from commit a9728a61125ef44ac5008ebb0d6d028d26d683af)
----
- clients/cli/connections.c | 10 ++--------
- 1 file changed, 2 insertions(+), 8 deletions(-)
-
-diff --git a/clients/cli/connections.c b/clients/cli/connections.c
-index 6ee3b49f9..b8f9b5f27 100644
---- a/clients/cli/connections.c
-+++ b/clients/cli/connections.c
-@@ -4561,14 +4561,8 @@ complete_property (const char *setting_name, const char *property, const char *p
- const NMMetaPropertyInfo *property_info;
-
- property_info = nm_meta_property_info_find_by_name (setting_name, property);
-- if (property_info) {
-- if (complete_option ((const NMMetaAbstractInfo *) property_info, prefix, connection))
-- return;
-- }
--
-- if ( strcmp (setting_name, NM_SETTING_BLUETOOTH_SETTING_NAME) == 0
-- && strcmp (property, NM_SETTING_BLUETOOTH_TYPE) == 0)
-- run_rl_generator (gen_func_bt_type, prefix);
-+ if (property_info)
-+ complete_option ((const NMMetaAbstractInfo *) property_info, prefix, connection);
- }
-
- /*****************************************************************************/
---
-2.20.1
-
-From 00cffb99f83e058835ed1f5a0ce78e4b2dc92e5c Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Tue, 23 Apr 2019 21:35:19 +0200
-Subject: [PATCH 4/6] cli: allow completing filenames
-
-Allow the completion function to indicate that the word should be
-completed as a filename by the shell.
-
-(cherry picked from commit eb724293c25038c7e0f0d6789af2cea11da176eb)
-(cherry picked from commit 09f9831fc628c2bfa406987bc1e1b77c036a3b20)
----
- clients/cli/connections.c | 23 ++++++++++++++++-------
- clients/common/nm-meta-setting-access.c | 2 ++
- clients/common/nm-meta-setting-access.h | 1 +
- clients/common/nm-meta-setting-desc.c | 4 +++-
- clients/common/nm-meta-setting-desc.h | 2 ++
- 5 files changed, 24 insertions(+), 8 deletions(-)
-
-diff --git a/clients/cli/connections.c b/clients/cli/connections.c
-index b8f9b5f27..034fc19f5 100644
---- a/clients/cli/connections.c
-+++ b/clients/cli/connections.c
-@@ -3785,6 +3785,7 @@ _meta_abstract_complete (const NMMetaAbstractInfo *abstract_info, const char *te
- nmc_meta_environment_arg,
- &ctx,
- text,
-+ NULL,
- &values_to_free);
- if (values)
- return values_to_free ?: g_strdupv ((char **) values);
-@@ -4525,11 +4526,12 @@ run_rl_generator (rl_compentry_func_t *generator_func, const char *prefix)
- }
-
- static gboolean
--complete_option (const NMMetaAbstractInfo *abstract_info, const char *prefix, NMConnection *context_connection)
-+complete_option (NmCli *nmc, const NMMetaAbstractInfo *abstract_info, const char *prefix, NMConnection *context_connection)
- {
- const OptionInfo *candidate;
- const char *const*values;
- gs_strfreev char **values_to_free = NULL;
-+ gboolean complete_filename = FALSE;
- const NMMetaOperationContext ctx = {
- .connection = context_connection,
- };
-@@ -4539,7 +4541,12 @@ complete_option (const NMMetaAbstractInfo *abstract_info, const char *prefix, NM
- nmc_meta_environment_arg,
- &ctx,
- prefix,
-+ &complete_filename,
- &values_to_free);
-+ if (complete_filename) {
-+ nmc->return_value = NMC_RESULT_COMPLETE_FILE;
-+ return TRUE;
-+ }
- if (values) {
- for (; values[0]; values++)
- g_print ("%s\n", values[0]);
-@@ -4556,13 +4563,13 @@ complete_option (const NMMetaAbstractInfo *abstract_info, const char *prefix, NM
- }
-
- static void
--complete_property (const char *setting_name, const char *property, const char *prefix, NMConnection *connection)
-+complete_property (NmCli *nmc, const char *setting_name, const char *property, const char *prefix, NMConnection *connection)
- {
- const NMMetaPropertyInfo *property_info;
-
- property_info = nm_meta_property_info_find_by_name (setting_name, property);
- if (property_info)
-- complete_option ((const NMMetaAbstractInfo *) property_info, prefix, connection);
-+ complete_option (nmc, (const NMMetaAbstractInfo *) property_info, prefix, connection);
- }
-
- /*****************************************************************************/
-@@ -4652,8 +4659,10 @@ nmc_read_connection_properties (NmCli *nmc,
- if (!get_value (&value, argc, argv, option, error))
- return FALSE;
-
-- if (!*argc && nmc->complete)
-- complete_property (setting, strv[1], value ?: "", connection);
-+ if (!*argc && nmc->complete) {
-+ complete_property (nmc, setting, strv[1], value ?: "", connection);
-+ return TRUE;
-+ }
-
- if (!set_property (nmc->client, connection, setting_name, strv[1], value, modifier, error))
- return FALSE;
-@@ -4734,7 +4743,7 @@ nmc_read_connection_properties (NmCli *nmc,
- return FALSE;
-
- if (!*argc && nmc->complete)
-- complete_option (chosen, value ?: "", connection);
-+ complete_option (nmc, chosen, value ?: "", connection);
-
- if (!set_option (nmc, connection, chosen, value, error))
- return FALSE;
-@@ -8861,7 +8870,7 @@ do_connection_import (NmCli *nmc, int argc, char **argv)
- if ( argc == 1
- && nmc->complete) {
- nmc_complete_strings (*argv, "wireguard");
-- complete_option ((const NMMetaAbstractInfo *) nm_meta_property_info_vpn_service_type,
-+ complete_option (nmc, (const NMMetaAbstractInfo *) nm_meta_property_info_vpn_service_type,
- *argv,
- NULL);
- }
-diff --git a/clients/common/nm-meta-setting-access.c b/clients/common/nm-meta-setting-access.c
-index 8399f29db..ce5cd331c 100644
---- a/clients/common/nm-meta-setting-access.c
-+++ b/clients/common/nm-meta-setting-access.c
-@@ -273,6 +273,7 @@ nm_meta_abstract_info_complete (const NMMetaAbstractInfo *abstract_info,
- gpointer environment_user_data,
- const NMMetaOperationContext *operation_context,
- const char *text,
-+ gboolean *out_complete_filename,
- char ***out_to_free)
- {
- const char *const*values;
-@@ -292,6 +293,7 @@ nm_meta_abstract_info_complete (const NMMetaAbstractInfo *abstract_info,
- environment_user_data,
- operation_context,
- text,
-+ out_complete_filename,
- out_to_free);
-
- nm_assert (!*out_to_free || values == (const char *const*) *out_to_free);
-diff --git a/clients/common/nm-meta-setting-access.h b/clients/common/nm-meta-setting-access.h
-index ec1c2ba00..38f22c7a4 100644
---- a/clients/common/nm-meta-setting-access.h
-+++ b/clients/common/nm-meta-setting-access.h
-@@ -69,6 +69,7 @@ const char *const*nm_meta_abstract_info_complete (const NMMetaAbstractInfo *abst
- gpointer environment_user_data,
- const NMMetaOperationContext *operation_context,
- const char *text,
-+ gboolean *out_complete_filename,
- char ***out_to_free);
-
- /*****************************************************************************/
-diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c
-index 768e371e9..7e4eb3d31 100644
---- a/clients/common/nm-meta-setting-desc.c
-+++ b/clients/common/nm-meta-setting-desc.c
-@@ -788,7 +788,7 @@ _env_warn_fcn (const NMMetaEnvironment *environment,
- const NMMetaPropertyInfo *property_info, const NMMetaEnvironment *environment, gpointer environment_user_data, NMSetting *setting, const char *value, GError **error
-
- #define ARGS_COMPLETE_FCN \
-- const NMMetaPropertyInfo *property_info, const NMMetaEnvironment *environment, gpointer environment_user_data, const NMMetaOperationContext *operation_context, const char *text, char ***out_to_free
-+ const NMMetaPropertyInfo *property_info, const NMMetaEnvironment *environment, gpointer environment_user_data, const NMMetaOperationContext *operation_context, const char *text, gboolean *out_complete_filename, char ***out_to_free
-
- #define ARGS_VALUES_FCN \
- const NMMetaPropertyInfo *property_info, char ***out_to_free
-@@ -8159,6 +8159,7 @@ _meta_type_property_info_complete_fcn (const NMMetaAbstractInfo *abstract_info,
- gpointer environment_user_data,
- const NMMetaOperationContext *operation_context,
- const char *text,
-+ gboolean *out_complete_filename,
- char ***out_to_free)
- {
- const NMMetaPropertyInfo *info = (const NMMetaPropertyInfo *) abstract_info;
-@@ -8171,6 +8172,7 @@ _meta_type_property_info_complete_fcn (const NMMetaAbstractInfo *abstract_info,
- environment_user_data,
- operation_context,
- text,
-+ out_complete_filename,
- out_to_free);
- }
-
-diff --git a/clients/common/nm-meta-setting-desc.h b/clients/common/nm-meta-setting-desc.h
-index b69a07b50..2fee080b9 100644
---- a/clients/common/nm-meta-setting-desc.h
-+++ b/clients/common/nm-meta-setting-desc.h
-@@ -221,6 +221,7 @@ struct _NMMetaPropertyType {
- gpointer environment_user_data,
- const NMMetaOperationContext *operation_context,
- const char *text,
-+ gboolean *out_complete_filename,
- char ***out_to_free);
-
- /* Whether set_fcn() supports the '-' modifier. That is, whether the property
-@@ -444,6 +445,7 @@ struct _NMMetaType {
- gpointer environment_user_data,
- const NMMetaOperationContext *operation_context,
- const char *text,
-+ gboolean *out_complete_filename,
- char ***out_to_free);
- };
-
---
-2.20.1
-
-From 4fe5505236fdf1d268d8d8a8cc9a339c4e2eb47e Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Tue, 23 Apr 2019 22:01:15 +0200
-Subject: [PATCH 5/6] cli: complete 802.1x certificate file names
-
-(cherry picked from commit ec4a12ecdbebbca5b8108e1611e95fa93b43d637)
-(cherry picked from commit 3d3fac55e38c5da544f8acc36aaf9334a92cbf11)
----
- clients/common/nm-meta-setting-desc.c | 21 +++++++++++++++++++++
- 1 file changed, 21 insertions(+)
-
-diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c
-index 7e4eb3d31..7c8f89563 100644
---- a/clients/common/nm-meta-setting-desc.c
-+++ b/clients/common/nm-meta-setting-desc.c
-@@ -2307,6 +2307,26 @@ _set_fcn_cert_8021x (ARGS_SET_FCN)
- }
- }
-
-+static const char *const*
-+_complete_fcn_cert_8021x (ARGS_COMPLETE_FCN)
-+{
-+ const NMSetting8021xSchemeVtable *vtable;
-+
-+ vtable = &nm_setting_8021x_scheme_vtable[property_info->property_typ_data->subtype.cert_8021x.scheme_type];
-+
-+ if (vtable->is_secret) {
-+ gs_free const char **strv = NULL;
-+
-+ strv = nm_utils_escaped_tokens_split (text, NM_ASCII_SPACES);
-+ /* don't try to complete the password */
-+ if (NM_PTRARRAY_LEN (strv) > 1)
-+ return NULL;
-+ }
-+
-+ NM_SET_OUT (out_complete_filename, TRUE);
-+ return NULL;
-+}
-+
- static gconstpointer
- _get_fcn_gobject_bytes (ARGS_GET_FCN)
- {
-@@ -4466,6 +4486,7 @@ static const NMMetaPropertyType _pt_dcb = {
- static const NMMetaPropertyType _pt_cert_8021x = {
- .get_fcn = _get_fcn_cert_8021x,
- .set_fcn = _set_fcn_cert_8021x,
-+ .complete_fcn = _complete_fcn_cert_8021x,
- };
-
- static const NMMetaPropertyType _pt_ethtool = {
---
-2.20.1
-
-From 1d02cd13072aa90471cdf0f0f2dde048a126c007 Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Wed, 24 Apr 2019 15:21:34 +0200
-Subject: [PATCH 6/6] cli: hide certificate blobs unless --show-secrets is
- passed
-
-This restores the behavior before commit 99711579ed43.
-
-Fixes: 99711579ed43 ('cli: add property type for 802-1x certificate properties (pt2)').
-(cherry picked from commit c91aad49695fc0d5ff1dd07a4459dc7fbe9bdbc0)
-(cherry picked from commit 8c75120df055ac6c7b778a885473af202897abf9)
----
- clients/common/nm-meta-setting-desc.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c
-index 7c8f89563..9b5debcfe 100644
---- a/clients/common/nm-meta-setting-desc.c
-+++ b/clients/common/nm-meta-setting-desc.c
-@@ -2229,8 +2229,7 @@ _get_fcn_cert_8021x (ARGS_GET_FCN)
-
- switch (vtable->scheme_func (s_8021X)) {
- case NM_SETTING_802_1X_CK_SCHEME_BLOB:
-- if ( vtable->is_secret
-- && !NM_FLAGS_HAS (get_flags, NM_META_ACCESSOR_GET_FLAGS_SHOW_SECRETS))
-+ if (!NM_FLAGS_HAS (get_flags, NM_META_ACCESSOR_GET_FLAGS_SHOW_SECRETS))
- return _get_text_hidden (get_type);
- str = bytes_to_string (vtable->blob_func (s_8021X));
- break;
---
-2.20.1
-
diff --git a/SOURCES/1000-dhclient-include-conditionals-rh1758550.patch b/SOURCES/1000-dhclient-include-conditionals-rh1758550.patch
new file mode 100644
index 0000000..b113dd0
--- /dev/null
+++ b/SOURCES/1000-dhclient-include-conditionals-rh1758550.patch
@@ -0,0 +1,136 @@
+From 7a5509053a78bf92511626ca06fdb61c2977693f Mon Sep 17 00:00:00 2001
+From: Beniamino Galvani <bgalvani@redhat.com>
+Date: Sun, 6 Oct 2019 08:27:18 +0200
+Subject: [PATCH] dhcp: include conditionals from existing dhclient
+ configuration
+
+Since commit 159ff23268b1 ('dhcp/dhclient-utils: skip over
+dhclient.conf blocks') we skip blocks enclosed in lines containing '{'
+and '}' because NM should ignore 'lease', 'alias' and other
+declarations. However, conditional statements seem useful and should
+not be skipped.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1758550
+(cherry picked from commit b58e4d311da630ea8d14f60ca3667710877e455d)
+(cherry picked from commit 58ffded2d0a317c3a480821272b41780aff0e64e)
+(cherry picked from commit 497101fd1e44128496d14a3b8b7496de7febe2f0)
+---
+ src/dhcp/nm-dhcp-dhclient-utils.c | 43 +++++++++++++++++++++--------
+ src/dhcp/tests/test-dhcp-dhclient.c | 19 ++++++++++++-
+ 2 files changed, 50 insertions(+), 12 deletions(-)
+
+diff --git a/src/dhcp/nm-dhcp-dhclient-utils.c b/src/dhcp/nm-dhcp-dhclient-utils.c
+index 3338fbff2..01d0fc020 100644
+--- a/src/dhcp/nm-dhcp-dhclient-utils.c
++++ b/src/dhcp/nm-dhcp-dhclient-utils.c
+@@ -275,11 +275,13 @@ nm_dhcp_dhclient_create_config (const char *interface,
+ if (orig_contents) {
+ gs_free const char **lines = NULL;
+ gsize line_i;
+- int nest = 0;
++ nm_auto_free_gstring GString *blocks_stack = NULL;
++ guint blocks_skip = 0;
+ gboolean in_alsoreq = FALSE;
+ gboolean in_req = FALSE;
+ char intf[IFNAMSIZ];
+
++ blocks_stack = g_string_new (NULL);
+ g_string_append_printf (new_contents, _("# Merged from %s\n\n"), orig_path);
+ intf[0] = '\0';
+
+@@ -297,19 +299,38 @@ nm_dhcp_dhclient_create_config (const char *interface,
+ if (in_req) {
+ /* pass */
+ } else if (strchr (p, '{')) {
+- nest++;
+- if ( !intf[0]
+- && NM_STR_HAS_PREFIX (p, "interface"))
+- if (read_interface (p, intf, sizeof (intf)))
+- continue;
++ if ( NM_STR_HAS_PREFIX (p, "lease")
++ || NM_STR_HAS_PREFIX (p, "alias")
++ || NM_STR_HAS_PREFIX (p, "interface")
++ || NM_STR_HAS_PREFIX (p, "pseudo")) {
++ /* skip over these blocks, except 'interface' when it
++ * matches the current interface */
++ blocks_skip++;
++ g_string_append_c (blocks_stack, 'b');
++ if ( !intf[0]
++ && NM_STR_HAS_PREFIX (p, "interface")) {
++ if (read_interface (p, intf, sizeof (intf)))
++ continue;
++ }
++ } else {
++ /* allow other blocks (conditionals) */
++ if (!strchr (p, '}')) /* '} else {' */
++ g_string_append_c (blocks_stack, 'c');
++ }
+ } else if (strchr (p, '}')) {
+- if (nest)
+- nest--;
+- intf[0] = '\0';
+- continue;
++ if (blocks_stack->len > 0) {
++ if (blocks_stack->str[blocks_stack->len - 1] == 'b') {
++ g_string_truncate (blocks_stack, blocks_stack->len - 1);
++ nm_assert(blocks_skip > 0);
++ blocks_skip--;
++ intf[0] = '\0';
++ continue;
++ }
++ g_string_truncate (blocks_stack, blocks_stack->len - 1);
++ }
+ }
+
+- if (nest && !intf[0])
++ if (blocks_skip > 0 && !intf[0])
+ continue;
+
+ if (intf[0] && !nm_streq (intf, interface))
+diff --git a/src/dhcp/tests/test-dhcp-dhclient.c b/src/dhcp/tests/test-dhcp-dhclient.c
+index f6267cd28..90480955f 100644
+--- a/src/dhcp/tests/test-dhcp-dhclient.c
++++ b/src/dhcp/tests/test-dhcp-dhclient.c
+@@ -900,6 +900,11 @@ test_structured (void)
+ " request subnet-mask, broadcast-address, time-offset, routers,\n"
+ " domain-search, domain-name, domain-name-servers, host-name;\n"
+ " require subnet-mask, domain-name-servers;\n"
++ " if not option domain-name = \"example.org\" {\n"
++ " prepend domain-name-servers 127.0.0.1;\n"
++ " } else {\n"
++ " prepend domain-name-servers 127.0.0.2;\n"
++ " } \n"
+ " } \n"
+ "\n"
+ "pseudo \"secondary\" \"eth0\" { \n"
+@@ -926,7 +931,13 @@ test_structured (void)
+ " interface \"eth0\";\n"
+ " fixed-address 192.0.2.2;\n"
+ " option subnet-mask 255.255.255.0;\n"
+- " } \n";
++ " } \n"
++ "if not option domain-name = \"example.org\" {\n"
++ " prepend domain-name-servers 127.0.0.1;\n"
++ " if not option domain-name = \"useless.example.com\" {\n"
++ " prepend domain-name-servers 127.0.0.2;\n"
++ " }\n"
++ "}\n";
+
+ static const char *const expected = \
+ "# Created by NetworkManager\n"
+@@ -937,6 +948,12 @@ test_structured (void)
+ "send dhcp-client-identifier \"sad-and-useless\";\n"
+ "send dhcp-lease-time 8086;\n"
+ "require subnet-mask;\n"
++ "if not option domain-name = \"example.org\" {\n"
++ "prepend domain-name-servers 127.0.0.1;\n"
++ "if not option domain-name = \"useless.example.com\" {\n"
++ "prepend domain-name-servers 127.0.0.2;\n"
++ "}\n"
++ "}\n"
+ "\n"
+ "option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;\n"
+ "option ms-classless-static-routes code 249 = array of unsigned integer 8;\n"
+--
+2.21.0
+
diff --git a/SOURCES/1001-device-fix-reapply-of-MTU-rh1702657.patch b/SOURCES/1001-device-fix-reapply-of-MTU-rh1702657.patch
deleted file mode 100644
index cd52c15..0000000
--- a/SOURCES/1001-device-fix-reapply-of-MTU-rh1702657.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 89af6353940018621493764927a3f10335084628 Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Fri, 26 Apr 2019 10:49:21 +0200
-Subject: [PATCH] device: fix reapply of MTU
-
-When we set the MTU on the link we remember its previous source
-(ip-config, parent-device or connection profile) and don't change it
-again afterwards to avoid interfering with user's manual changes. The
-only exceptions when we change it again are (1) if the parent device
-MTU changes and (2) if the new MTU has higher priority than the one
-previously set.
-
-To allow a live reapply of the MTU property we also need to clear the
-saved source, or the checks described above will prevent setting the
-new value.
-
-Fixes: 2f8917237fdf ('device: rework mtu priority handling')
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1702657
-(cherry picked from commit 4ed72fa658c03790700ba9084e9328fe38afdee9)
-(cherry picked from commit e738479bdd714f754aa311bada3315147efab376)
----
- src/devices/nm-device.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
-index b909f0ddf..8ae64b968 100644
---- a/src/devices/nm-device.c
-+++ b/src/devices/nm-device.c
-@@ -11312,6 +11312,9 @@ check_and_reapply_connection (NMDevice *self,
- s_ip6_old = nm_connection_get_setting_ip6_config (con_old);
- s_ip6_new = nm_connection_get_setting_ip6_config (con_new);
-
-+ /* Allow reapply of MTU */
-+ priv->mtu_source = NM_DEVICE_MTU_SOURCE_NONE;
-+
- nm_device_reactivate_ip4_config (self, s_ip4_old, s_ip4_new);
- nm_device_reactivate_ip6_config (self, s_ip6_old, s_ip6_new);
-
---
-2.20.1
-
diff --git a/SOURCES/1001-fix-arp-announcements-rh1767681.patch b/SOURCES/1001-fix-arp-announcements-rh1767681.patch
new file mode 100644
index 0000000..ed34127
--- /dev/null
+++ b/SOURCES/1001-fix-arp-announcements-rh1767681.patch
@@ -0,0 +1,58 @@
+From dae15bf2b3d7ebef817cacf22bbbc3a0e5ff1424 Mon Sep 17 00:00:00 2001
+From: Beniamino Galvani <bgalvani@redhat.com>
+Date: Mon, 4 Nov 2019 14:19:12 +0100
+Subject: [PATCH] acd: poll the acd fd after starting the announcements
+
+In nm_acd_manager_announce_addresses() we should not only start the
+probes but also add the acd file descriptor to the main loop.
+Otherwise, a timer is armed to send the announcements but it never
+fires and no announcements are sent.
+
+Fixes: d9a4b59c18e3 ('acd: adapt NM code and build options')
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1767681
+(cherry picked from commit 14992ab9cdb6394d133c8ac7b88ad1e4a1e995b0)
+(cherry picked from commit c36da8b990dcb4858e27abf87cc45cf7b550538c)
+(cherry picked from commit 5798b1b814556e0ca224c092fa2887d603703c38)
+---
+ src/devices/nm-acd-manager.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/src/devices/nm-acd-manager.c b/src/devices/nm-acd-manager.c
+index f437ce3a8..58bf4fd97 100644
+--- a/src/devices/nm-acd-manager.c
++++ b/src/devices/nm-acd-manager.c
+@@ -345,6 +345,8 @@ nm_acd_manager_start_probe (NMAcdManager *self, guint timeout)
+ if (success)
+ self->state = STATE_PROBING;
+
++ nm_assert (!self->channel);
++ nm_assert (self->event_id == 0);
+ n_acd_get_fd (self->acd, &fd);
+ self->channel = g_io_channel_unix_new (fd);
+ self->event_id = g_io_add_watch (self->channel, G_IO_IN, acd_event, self);
+@@ -390,6 +392,7 @@ nm_acd_manager_announce_addresses (NMAcdManager *self)
+ GHashTableIter iter;
+ AddressInfo *info;
+ int r;
++ int fd;
+ gboolean success = TRUE;
+
+ r = acd_init (self);
+@@ -429,6 +432,13 @@ nm_acd_manager_announce_addresses (NMAcdManager *self)
+ }
+ }
+
++ if (!self->channel) {
++ nm_assert (self->event_id == 0);
++ n_acd_get_fd (self->acd, &fd);
++ self->channel = g_io_channel_unix_new (fd);
++ self->event_id = g_io_add_watch (self->channel, G_IO_IN, acd_event, self);
++ }
++
+ return success ? 0 : -NME_UNSPEC;
+ }
+
+--
+2.21.0
+
diff --git a/SOURCES/1002-ovs-cloned-mac-rh1740557.patch b/SOURCES/1002-ovs-cloned-mac-rh1740557.patch
new file mode 100644
index 0000000..f076a07
--- /dev/null
+++ b/SOURCES/1002-ovs-cloned-mac-rh1740557.patch
@@ -0,0 +1,339 @@
+From bc2e2d8562cc856442e6f449bc422d152527b8c9 Mon Sep 17 00:00:00 2001
+From: Beniamino Galvani <bgalvani@redhat.com>
+Date: Fri, 25 Oct 2019 10:36:52 +0200
+Subject: [PATCH 1/2] ovs: fix memory leak
+
+(cherry picked from commit 508c7679cfb06f9d5149e637737d28a958f9131c)
+(cherry picked from commit ad17cfff249e7edde0011dc80f09f496ba2fe020)
+(cherry picked from commit 836b9e24a475fa9ef5b86d9ca34c751336da4b52)
+---
+ src/devices/ovs/nm-ovsdb.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/devices/ovs/nm-ovsdb.c b/src/devices/ovs/nm-ovsdb.c
+index 5b50f8406..8b6dca7a5 100644
+--- a/src/devices/ovs/nm-ovsdb.c
++++ b/src/devices/ovs/nm-ovsdb.c
+@@ -1068,7 +1068,7 @@ ovsdb_got_msg (NMOvsdb *self, json_t *msg)
+ OvsdbMethodCall *call = NULL;
+ OvsdbMethodCallback callback;
+ gpointer user_data;
+- GError *local = NULL;
++ gs_free_error GError *local = NULL;
+
+ if (json_unpack_ex (msg, &json_error, 0, "{s?:o, s?:s, s?:o, s?:o, s?:o}",
+ "id", &json_id,
+--
+2.21.0
+
+From 014c1f0ea0cd1b2723d4f123eb43996a0cf37522 Mon Sep 17 00:00:00 2001
+From: Beniamino Galvani <bgalvani@redhat.com>
+Date: Thu, 24 Oct 2019 15:59:43 +0200
+Subject: [PATCH 2/2] ovs: allow changing mac address of bridges and interfaces
+
+Allow changing the cloned MAC address for OVS bridges and
+interfaces. The MAC address set on the bridge is propagated by ovs to
+the local interface (the one with the same name as the bridge), while
+all other internal interfaces use the address defined in the interface
+connection.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1763734
+https://bugzilla.redhat.com/show_bug.cgi?id=1740557
+
+https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/321
+(cherry picked from commit 101e65d2bb1920853da4621e220b4825860ec46d)
+(cherry picked from commit b366234a3a1deb4a6924744f6b7cafa9f2650e3e)
+(cherry picked from commit 5a4a5f637bb65e9833836e724b3beea19158e9f8)
+---
+ clients/common/nm-meta-setting-desc.c | 1 +
+ src/devices/ovs/nm-device-ovs-port.c | 5 ++
+ src/devices/ovs/nm-ovsdb.c | 88 ++++++++++++++++++++++-----
+ src/devices/ovs/nm-ovsdb.h | 1 +
+ 4 files changed, 79 insertions(+), 16 deletions(-)
+
+diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c
+index afeb69a52..e14b23438 100644
+--- a/clients/common/nm-meta-setting-desc.c
++++ b/clients/common/nm-meta-setting-desc.c
+@@ -7871,6 +7871,7 @@ const NMMetaSettingInfoEditor nm_meta_setting_infos_editor[] = {
+ .valid_parts = NM_META_SETTING_VALID_PARTS (
+ NM_META_SETTING_VALID_PART_ITEM (CONNECTION, TRUE),
+ NM_META_SETTING_VALID_PART_ITEM (OVS_BRIDGE, TRUE),
++ NM_META_SETTING_VALID_PART_ITEM (WIRED, FALSE),
+ ),
+ ),
+ SETTING_INFO (OVS_INTERFACE,
+diff --git a/src/devices/ovs/nm-device-ovs-port.c b/src/devices/ovs/nm-device-ovs-port.c
+index 8a93a5a9d..39e64b3f1 100644
+--- a/src/devices/ovs/nm-device-ovs-port.c
++++ b/src/devices/ovs/nm-device-ovs-port.c
+@@ -102,6 +102,7 @@ enslave_slave (NMDevice *device, NMDevice *slave, NMConnection *connection, gboo
+ {
+ NMActiveConnection *ac_port = NULL;
+ NMActiveConnection *ac_bridge = NULL;
++ NMDevice *bridge_device;
+
+ if (!configure)
+ return TRUE;
+@@ -111,10 +112,14 @@ enslave_slave (NMDevice *device, NMDevice *slave, NMConnection *connection, gboo
+ if (!ac_bridge)
+ ac_bridge = ac_port;
+
++ bridge_device = nm_active_connection_get_device (ac_bridge);
++
+ nm_ovsdb_add_interface (nm_ovsdb_get (),
+ nm_active_connection_get_applied_connection (ac_bridge),
+ nm_device_get_applied_connection (device),
+ nm_device_get_applied_connection (slave),
++ bridge_device,
++ slave,
+ add_iface_cb, g_object_ref (slave));
+
+ return TRUE;
+diff --git a/src/devices/ovs/nm-ovsdb.c b/src/devices/ovs/nm-ovsdb.c
+index 8b6dca7a5..82e25f396 100644
+--- a/src/devices/ovs/nm-ovsdb.c
++++ b/src/devices/ovs/nm-ovsdb.c
+@@ -28,6 +28,7 @@
+ #include "devices/nm-device.h"
+ #include "platform/nm-platform.h"
+ #include "nm-core-internal.h"
++#include "devices/nm-device.h"
+
+ /*****************************************************************************/
+
+@@ -131,6 +132,8 @@ typedef struct {
+ NMConnection *bridge;
+ NMConnection *port;
+ NMConnection *interface;
++ NMDevice *bridge_device;
++ NMDevice *interface_device;
+ };
+ };
+ } OvsdbMethodCall;
+@@ -183,6 +186,7 @@ static void
+ ovsdb_call_method (NMOvsdb *self, OvsdbCommand command,
+ const char *ifname,
+ NMConnection *bridge, NMConnection *port, NMConnection *interface,
++ NMDevice *bridge_device, NMDevice *interface_device,
+ OvsdbMethodCallback callback, gpointer user_data)
+ {
+ NMOvsdbPrivate *priv = NM_OVSDB_GET_PRIVATE (self);
+@@ -205,6 +209,8 @@ ovsdb_call_method (NMOvsdb *self, OvsdbCommand command,
+ call->bridge = nm_simple_connection_new_clone (bridge);
+ call->port = nm_simple_connection_new_clone (port);
+ call->interface = nm_simple_connection_new_clone (interface);
++ call->bridge_device = g_object_ref (bridge_device);
++ call->interface_device = g_object_ref (interface_device);
+ break;
+ case OVSDB_DEL_INTERFACE:
+ call->ifname = g_strdup (ifname);
+@@ -337,17 +343,32 @@ _set_port_interfaces (json_t *params, const char *ifname, json_t *new_interfaces
+ * Returns an commands that adds new interface from a given connection.
+ */
+ static void
+-_insert_interface (json_t *params, NMConnection *interface)
++_insert_interface (json_t *params, NMConnection *interface, NMDevice *interface_device)
+ {
+ const char *type = NULL;
+ NMSettingOvsInterface *s_ovs_iface;
+ NMSettingOvsPatch *s_ovs_patch;
+ json_t *options = json_array ();
++ gs_free char *cloned_mac = NULL;
++ gs_free_error GError *error = NULL;
++ json_t *row;
+
+ s_ovs_iface = nm_connection_get_setting_ovs_interface (interface);
+ if (s_ovs_iface)
+ type = nm_setting_ovs_interface_get_interface_type (s_ovs_iface);
+
++ if (!nm_device_hw_addr_get_cloned (interface_device,
++ interface,
++ FALSE,
++ &cloned_mac,
++ NULL,
++ &error)) {
++ _LOGW ("Cannot determine cloned mac for OVS %s '%s': %s",
++ "interface",
++ nm_connection_get_interface_name (interface),
++ error->message);
++ }
++
+ json_array_append_new (options, json_string ("map"));
+ s_ovs_patch = nm_connection_get_setting_ovs_patch (interface);
+ if (s_ovs_patch) {
+@@ -358,14 +379,22 @@ _insert_interface (json_t *params, NMConnection *interface)
+ json_array_append_new (options, json_array ());
+ }
+
++ row = json_pack ("{s:s, s:s, s:o, s:[s, [[s, s]]]}",
++ "name", nm_connection_get_interface_name (interface),
++ "type", type ?: "",
++ "options", options,
++ "external_ids", "map",
++ "NM.connection.uuid", nm_connection_get_uuid (interface));
++
++ if (cloned_mac)
++ json_object_set_new (row, "mac", json_string (cloned_mac));
++
+ json_array_append_new (params,
+- json_pack ("{s:s, s:s, s:{s:s, s:s, s:o, s:[s, [[s, s]]]}, s:s}",
+- "op", "insert", "table", "Interface", "row",
+- "name", nm_connection_get_interface_name (interface),
+- "type", type ?: "",
+- "options", options,
+- "external_ids", "map", "NM.connection.uuid", nm_connection_get_uuid (interface),
+- "uuid-name", "rowInterface"));
++ json_pack ("{s:s, s:s, s:o, s:s}",
++ "op", "insert",
++ "table", "Interface",
++ "row", row,
++ "uuid-name", "rowInterface"));
+ }
+
+ /**
+@@ -429,7 +458,7 @@ _insert_port (json_t *params, NMConnection *port, json_t *new_interfaces)
+ * Returns an commands that adds new bridge from a given connection.
+ */
+ static void
+-_insert_bridge (json_t *params, NMConnection *bridge, json_t *new_ports)
++_insert_bridge (json_t *params, NMConnection *bridge, NMDevice *bridge_device, json_t *new_ports)
+ {
+ NMSettingOvsBridge *s_ovs_bridge;
+ const char *fail_mode = NULL;
+@@ -437,9 +466,23 @@ _insert_bridge (json_t *params, NMConnection *bridge, json_t *new_ports)
+ gboolean rstp_enable = FALSE;
+ gboolean stp_enable = FALSE;
+ json_t *row;
++ gs_free_error GError *error = NULL;
++ gs_free char *cloned_mac = NULL;
+
+ s_ovs_bridge = nm_connection_get_setting_ovs_bridge (bridge);
+
++ if (!nm_device_hw_addr_get_cloned (bridge_device,
++ bridge,
++ FALSE,
++ &cloned_mac,
++ NULL,
++ &error)) {
++ _LOGW ("Cannot determine cloned mac for OVS %s '%s': %s",
++ "bridge",
++ nm_connection_get_interface_name (bridge),
++ error->message);
++ }
++
+ row = json_object ();
+
+ if (s_ovs_bridge) {
+@@ -464,6 +507,12 @@ _insert_bridge (json_t *params, NMConnection *bridge, json_t *new_ports)
+ json_pack ("[s, [[s, s]]]", "map",
+ "NM.connection.uuid", nm_connection_get_uuid (bridge)));
+
++ if (cloned_mac) {
++ json_object_set_new (row, "other_config",
++ json_pack ("[s, [[s, s]]]", "map",
++ "hwaddr", cloned_mac));
++ }
++
+ /* Create a new one. */
+ json_array_append_new (params,
+ json_pack ("{s:s, s:s, s:o, s:s}", "op", "insert", "table", "Bridge",
+@@ -493,7 +542,8 @@ _inc_next_cfg (const char *db_uuid)
+ */
+ static void
+ _add_interface (NMOvsdb *self, json_t *params,
+- NMConnection *bridge, NMConnection *port, NMConnection *interface)
++ NMConnection *bridge, NMConnection *port, NMConnection *interface,
++ NMDevice *bridge_device, NMDevice *interface_device)
+ {
+ NMOvsdbPrivate *priv = NM_OVSDB_GET_PRIVATE (self);
+ GHashTableIter iter;
+@@ -566,7 +616,7 @@ _add_interface (NMOvsdb *self, json_t *params,
+ _expect_ovs_bridges (params, priv->db_uuid, bridges);
+ json_array_append_new (new_bridges, json_pack ("[s, s]", "named-uuid", "rowBridge"));
+ _set_ovs_bridges (params, priv->db_uuid, new_bridges);
+- _insert_bridge (params, bridge, new_ports);
++ _insert_bridge (params, bridge, bridge_device, new_ports);
+ } else {
+ /* Bridge already exists. */
+ g_return_if_fail (ovs_bridge);
+@@ -584,7 +634,7 @@ _add_interface (NMOvsdb *self, json_t *params,
+ }
+
+ if (!has_interface) {
+- _insert_interface (params, interface);
++ _insert_interface (params, interface, interface_device);
+ json_array_append_new (new_interfaces, json_pack ("[s, s]", "named-uuid", "rowInterface"));
+ }
+ }
+@@ -733,7 +783,8 @@ ovsdb_next_command (NMOvsdb *self)
+ json_array_append_new (params, json_string ("Open_vSwitch"));
+ json_array_append_new (params, _inc_next_cfg (priv->db_uuid));
+
+- _add_interface (self, params, call->bridge, call->port, call->interface);
++ _add_interface (self, params, call->bridge, call->port, call->interface,
++ call->bridge_device, call->interface_device);
+
+ msg = json_pack ("{s:i, s:s, s:o}",
+ "id", call->id,
+@@ -1385,7 +1436,7 @@ ovsdb_try_connect (NMOvsdb *self)
+ /* Queue a monitor call before any other command, ensuring that we have an up
+ * to date view of existing bridged that we need for add and remove ops. */
+ ovsdb_call_method (self, OVSDB_MONITOR, NULL,
+- NULL, NULL, NULL, _monitor_bridges_cb, NULL);
++ NULL, NULL, NULL, NULL, NULL, _monitor_bridges_cb, NULL);
+ }
+
+ /*****************************************************************************/
+@@ -1426,6 +1477,7 @@ out:
+ void
+ nm_ovsdb_add_interface (NMOvsdb *self,
+ NMConnection *bridge, NMConnection *port, NMConnection *interface,
++ NMDevice *bridge_device, NMDevice *interface_device,
+ NMOvsdbCallback callback, gpointer user_data)
+ {
+ OvsdbCall *call;
+@@ -1435,7 +1487,9 @@ nm_ovsdb_add_interface (NMOvsdb *self,
+ call->user_data = user_data;
+
+ ovsdb_call_method (self, OVSDB_ADD_INTERFACE, NULL,
+- bridge, port, interface, _transact_cb, call);
++ bridge, port, interface,
++ bridge_device, interface_device,
++ _transact_cb, call);
+ }
+
+ void
+@@ -1449,7 +1503,7 @@ nm_ovsdb_del_interface (NMOvsdb *self, const char *ifname,
+ call->user_data = user_data;
+
+ ovsdb_call_method (self, OVSDB_DEL_INTERFACE, ifname,
+- NULL, NULL, NULL, _transact_cb, call);
++ NULL, NULL, NULL, NULL, NULL, _transact_cb, call);
+ }
+
+ /*****************************************************************************/
+@@ -1466,6 +1520,8 @@ _clear_call (gpointer data)
+ g_clear_object (&call->bridge);
+ g_clear_object (&call->port);
+ g_clear_object (&call->interface);
++ g_clear_object (&call->bridge_device);
++ g_clear_object (&call->interface_device);
+ break;
+ case OVSDB_DEL_INTERFACE:
+ g_clear_pointer (&call->ifname, g_free);
+diff --git a/src/devices/ovs/nm-ovsdb.h b/src/devices/ovs/nm-ovsdb.h
+index cf9fe2a21..f9dbabbb7 100644
+--- a/src/devices/ovs/nm-ovsdb.h
++++ b/src/devices/ovs/nm-ovsdb.h
+@@ -42,6 +42,7 @@ GType nm_ovsdb_get_type (void);
+
+ void nm_ovsdb_add_interface (NMOvsdb *self,
+ NMConnection *bridge, NMConnection *port, NMConnection *interface,
++ NMDevice *bridge_device, NMDevice *interface_device,
+ NMOvsdbCallback callback, gpointer user_data);
+
+ void nm_ovsdb_del_interface (NMOvsdb *self, const char *ifname,
+--
+2.21.0
+
diff --git a/SOURCES/1002-settings-fix-failed-assertion-rh1707261.patch b/SOURCES/1002-settings-fix-failed-assertion-rh1707261.patch
deleted file mode 100644
index 6ab52cc..0000000
--- a/SOURCES/1002-settings-fix-failed-assertion-rh1707261.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From f85322d23536c1004db8ddc722d4f2f6abc56aba Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Tue, 23 Apr 2019 11:10:33 +0200
-Subject: [PATCH] settings: fix failed assertion
-
-Fix the following assertion failure:
-
- g_object_ref: assertion 'G_IS_OBJECT (object)' failed.
-
-nm_settings_add_connection() can return a NULL connection.
-
-Fixes: f034f17ff69c ('settings: keep the added connection alive for a bit longer')
-(cherry picked from commit 48ce3628c528553d4105ed443934d733998e81b4)
-(cherry picked from commit d80818e6cad94def1402be8326274bde998aa276)
----
- src/settings/nm-settings.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c
-index 8e18a33e0..e594860bc 100644
---- a/src/settings/nm-settings.c
-+++ b/src/settings/nm-settings.c
-@@ -1174,7 +1174,7 @@ pk_add_cb (NMAuthChain *chain,
- * because it's found to be incompatible with the device on AddAndActivate).
- * But we need to keep it alive for a bit longer, precisely to check wehther
- * it's still known to the setting manager. */
-- g_object_ref (added);
-+ nm_g_object_ref (added);
- }
-
- callback = nm_auth_chain_get_data (chain, "callback");
---
-2.20.1
-
diff --git a/SOURCES/1003-sw-devices-managed-after-wake-rh1701585.patch b/SOURCES/1003-sw-devices-managed-after-wake-rh1701585.patch
deleted file mode 100644
index 9f8abb0..0000000
--- a/SOURCES/1003-sw-devices-managed-after-wake-rh1701585.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 98b1cf070bfa857a8a39b6499b39494bc4f4e54b Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Tue, 23 Apr 2019 16:39:17 +0200
-Subject: [PATCH 1/2] manager: clear unmanaged-sleeping flag on software
- devices on resume
-
-When networking is disabled at NM startup we unmanage all devices
-(including software ones) due to SLEEPING. After networking gets
-enabled again we must clear the unmanaged-sleeping flag on software
-devices.
-
-(cherry picked from commit 656753b70888badc29ffca592f82fd8355894596)
-(cherry picked from commit bb555ff6b5959767ab663d610cdabb8baa280447)
----
- src/nm-manager.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/nm-manager.c b/src/nm-manager.c
-index 40e068ac5..ed2fa3df4 100644
---- a/src/nm-manager.c
-+++ b/src/nm-manager.c
-@@ -5923,10 +5923,10 @@ do_sleep_wake (NMManager *self, gboolean sleeping_changed)
- c_list_for_each_entry (device, &priv->devices_lst_head, devices_lst) {
- guint i;
-
-- if (nm_device_is_software (device)) {
-- /* We do not manage/unmanage software devices but
-- * their dhcp leases could have gone stale so we need
-- * to renew them */
-+ if ( nm_device_is_software (device)
-+ && !nm_device_get_unmanaged_flags (device, NM_UNMANAGED_SLEEPING)) {
-+ /* DHCP leases of software devices could have gone stale
-+ * so we need to renew them. */
- nm_device_update_dynamic_ip_setup (device);
- continue;
- }
---
-2.20.1
-
-From 9b08f52f043cb5f3794f1432df157a16c222b21c Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Tue, 23 Apr 2019 15:30:53 +0200
-Subject: [PATCH 2/2] manager: unmanage software devices when networking gets
- disabled
-
-If a user disables networking, we consider that as an indication that
-also software devices must be disconnected. OTOH, we don't want to
-destroy them for external events as a system suspend.
-
-(cherry picked from commit 32ee51eee002f5e6717b856fd0a095114a02cc96)
-(cherry picked from commit da8462df1a273cd6b31f885b866726a64ca14550)
----
- src/nm-manager.c | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/src/nm-manager.c b/src/nm-manager.c
-index ed2fa3df4..c0cd15c0c 100644
---- a/src/nm-manager.c
-+++ b/src/nm-manager.c
-@@ -5866,9 +5866,15 @@ do_sleep_wake (NMManager *self, gboolean sleeping_changed)
- * suspend/resume?
- */
- c_list_for_each_entry (device, &priv->devices_lst_head, devices_lst) {
-- /* FIXME: shouldn't we be unmanaging software devices if !suspending? */
-- if (nm_device_is_software (device))
-- continue;
-+ if (nm_device_is_software (device)) {
-+ /* If a user disables networking we consider that as an
-+ * indication that also software devices must be disconnected.
-+ * But we don't want to destroy them for external events as
-+ * a system suspend.
-+ */
-+ if (suspending)
-+ continue;
-+ }
- /* Wake-on-LAN devices will be taken down post-suspend rather than pre- */
- if ( suspending
- && device_is_wake_on_lan (priv->platform, device)) {
---
-2.20.1
-
diff --git a/SOURCES/1004-device-restore-ipv6-config-on-link-up-rh1548237.patch b/SOURCES/1004-device-restore-ipv6-config-on-link-up-rh1548237.patch
deleted file mode 100644
index 01d5972..0000000
--- a/SOURCES/1004-device-restore-ipv6-config-on-link-up-rh1548237.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-From bb782ab4b2058e0ae14aae1a4c71bd0dc908fbdc Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Tue, 7 May 2019 16:26:09 +0200
-Subject: [PATCH 1/3] all: fix typos (milli seconds -> milliseconds)
-
-(cherry picked from commit 4735d6764a5dc9c3bc6bc09d3220751e789b39c4)
-(cherry picked from commit f6b9366eb4435d7ee45f862dabdefb5f87c4739d)
----
- shared/nm-glib-aux/nm-time-utils.c | 2 +-
- src/devices/nm-device.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/shared/nm-glib-aux/nm-time-utils.c b/shared/nm-glib-aux/nm-time-utils.c
-index ae526c342..98a414595 100644
---- a/shared/nm-glib-aux/nm-time-utils.c
-+++ b/shared/nm-glib-aux/nm-time-utils.c
-@@ -231,7 +231,7 @@ nm_utils_get_monotonic_timestamp_s (void)
- * @timestamp: the monotonic-timestamp that should be converted into CLOCK_BOOTTIME.
- * @timestamp_ns_per_tick: How many nano seconds make one unit of @timestamp? E.g. if
- * @timestamp is in unit seconds, pass %NM_UTILS_NS_PER_SECOND; @timestamp in nano
-- * seconds, pass 1; @timestamp in milli seconds, pass %NM_UTILS_NS_PER_SECOND/1000; etc.
-+ * seconds, pass 1; @timestamp in milliseconds, pass %NM_UTILS_NS_PER_SECOND/1000; etc.
- *
- * Returns: the monotonic-timestamp as CLOCK_BOOTTIME, as returned by clock_gettime().
- * The unit is the same as the passed in @timestamp basd on @timestamp_ns_per_tick.
-diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
-index 8ae64b968..7bf1eb4ce 100644
---- a/src/devices/nm-device.c
-+++ b/src/devices/nm-device.c
-@@ -3588,7 +3588,7 @@ nm_device_set_carrier (NMDevice *self, gboolean carrier)
- now_ms = nm_utils_get_monotonic_timestamp_ms ();
- until_ms = NM_MAX (now_ms + _get_carrier_wait_ms (self), priv->carrier_wait_until_ms);
- priv->carrier_defer_id = g_timeout_add (until_ms - now_ms, carrier_disconnected_action_cb, self);
-- _LOGD (LOGD_DEVICE, "carrier: link disconnected (deferring action for %ld milli seconds) (id=%u)",
-+ _LOGD (LOGD_DEVICE, "carrier: link disconnected (deferring action for %ld milliseconds) (id=%u)",
- (long) (until_ms - now_ms), priv->carrier_defer_id);
- }
- }
---
-2.20.1
-
-From ef2113cf7c06d5157ddd2cdc26c1f781b60c477c Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Tue, 7 May 2019 16:25:04 +0200
-Subject: [PATCH 2/3] device: unconditionally reapply IP configuration on link
- up
-
-Consider the situation in which ipv4.method=auto and there is an
-address configured. Also, the DHCP timeout is long and there is no
-DHCP server. If the link is brought down temporarily, the prefix route
-for the static address is lost and not restored by NM because we
-reapply the IP configuration only when the IP state is DONE.
-
-The same can happen also for IPv6, but in that case also static IPv6
-addresses are lost.
-
-We should always reapply the IP configuration when the link goes up.
-
-(cherry picked from commit d0b16b9283dc16e9db642280be9d6b10a04092a8)
-(cherry picked from commit 4482ca64ba5bbf1c173ea5b4a3854da0173542a8)
----
- src/devices/nm-device.c | 12 ++++--------
- 1 file changed, 4 insertions(+), 8 deletions(-)
-
-diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
-index 7bf1eb4ce..510d9792e 100644
---- a/src/devices/nm-device.c
-+++ b/src/devices/nm-device.c
-@@ -3890,16 +3890,12 @@ device_link_changed (NMDevice *self)
- if (priv->up && (!was_up || seen_down)) {
- /* the link was down and just came up. That happens for example, while changing MTU.
- * We must restore IP configuration. */
-- if (priv->ip_state_4 == NM_DEVICE_IP_STATE_DONE) {
-- if (!ip_config_merge_and_apply (self, AF_INET, TRUE))
-- _LOGW (LOGD_IP4, "failed applying IP4 config after link comes up again");
-- }
-+ if (!ip_config_merge_and_apply (self, AF_INET, TRUE))
-+ _LOGW (LOGD_IP4, "failed applying IP4 config after link comes up again");
-
- priv->linklocal6_dad_counter = 0;
-- if (priv->ip_state_6 == NM_DEVICE_IP_STATE_DONE) {
-- if (!ip_config_merge_and_apply (self, AF_INET6, TRUE))
-- _LOGW (LOGD_IP6, "failed applying IP6 config after link comes up again");
-- }
-+ if (!ip_config_merge_and_apply (self, AF_INET6, TRUE))
-+ _LOGW (LOGD_IP6, "failed applying IP6 config after link comes up again");
- }
-
- if (update_unmanaged_specs)
---
-2.20.1
-
-From b3f9c33557951ed90767ff50e9e72e533a211b45 Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Tue, 7 May 2019 16:32:12 +0200
-Subject: [PATCH 3/3] device: fix intersecting IPv6 configurations
-
-If the link is down we shouldn't drop the link-local address from
-configuration as it wasn't removed by user but by kernel.
-
-(cherry picked from commit 18d2edfaa13d97597ddf5551e6dd5ea854f1fdbf)
-(cherry picked from commit 6f6914450072b79a91731e042e498ca26892696c)
----
- src/devices/nm-device.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
-index 510d9792e..06a95110b 100644
---- a/src/devices/nm-device.c
-+++ b/src/devices/nm-device.c
-@@ -12882,7 +12882,8 @@ update_ext_ip_config (NMDevice *self, int addr_family, gboolean intersect_config
- for (iter = priv->vpn_configs_6; iter; iter = iter->next)
- nm_ip6_config_intersect (iter->data, priv->ext_ip_config_6, is_up, is_up, 0);
-
-- if ( priv->ipv6ll_has
-+ if ( is_up
-+ && priv->ipv6ll_has
- && !nm_ip6_config_lookup_address (priv->ext_ip_config_6, &priv->ipv6ll_addr))
- priv->ipv6ll_has = FALSE;
- }
---
-2.20.1
-
diff --git a/SOURCES/1005-load-connection-dbus-fixes-rh1708660.patch b/SOURCES/1005-load-connection-dbus-fixes-rh1708660.patch
deleted file mode 100644
index 5f3b2af..0000000
--- a/SOURCES/1005-load-connection-dbus-fixes-rh1708660.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From 48193ae383de29c52bf37d869f2e0a8534fbe825 Mon Sep 17 00:00:00 2001
-From: Thomas Haller <thaller@redhat.com>
-Date: Fri, 10 May 2019 14:35:52 +0200
-Subject: [PATCH 1/2] settings: avoid assertion for LoadConnections D-Bus
- method with relative paths
-
- $ busctl call org.freedesktop.NetworkManager /org/freedesktop/NetworkManager/Settings org.freedesktop.NetworkManager.Settings LoadConnections as 1 relative/filename
-
-triggers a g_critical() assertion in nm_utils_file_is_in_path():
-
- ...
- #3 0x00007ffff7a19e7d in g_return_if_fail_warning
- (log_domain=log_domain@entry=0x55555586c333 "NetworkManager", pretty_function=pretty_function@entry=0x55555586c0a0 <__FUNCTION__.38585> "nm_utils_file_is_in_path", expression=expression@entry=0x55555586c010 "abs_filename && abs_filename[0] == '/'") at ../glib/gmessages.c:2767
- #4 0x00005555555f1128 in nm_utils_file_is_in_path (abs_filename=abs_filename@entry=0x555555b56670 "dfd", abs_path=<optimized out>) at src/NetworkManagerUtils.c:1077
- #5 0x00005555555a4779 in load_connection (config=<optimized out>, filename=0x555555b56670 "dfd") at src/settings/plugins/keyfile/nms-keyfile-plugin.c:522
- #6 0x00005555557ce291 in nm_settings_plugin_load_connection (self=0x5555559fd400 [NMSKeyfilePlugin], filename=0x555555b56670 "dfd") at src/settings/nm-settings-plugin.c:70
- #7 0x000055555559ccdf in impl_settings_load_connections
- (obj=<optimized out>, interface_info=<optimized out>, method_info=<optimized out>, connection=<optimized out>, sender=<optimized out>, invocation=0x7fffe0015ed0 [GDBusMethodInvocation], parameters=<optimized out>) at src/settings/nm-settings.c:1439
- #8 0x00005555555a9bf9 in dbus_vtable_method_call
- (connection=0x5555559b91b0 [GDBusConnection], sender=sender@entry=0x555555b5c360 ":1.32283", object_path=object_path@entry=0x7fffe0019070 "/org/freedesktop/NetworkManager/Settings", interface_name=<optimized out>, interface_name@entry=0x7fffe002aa70 "org.freedesktop.NetworkManager.Settings", method_name=<optimized out>,
- method_name@entry=0x7fffe00276b0 "LoadConnections", parameters=parameters@entry=0x555555c4a690, invocation=0x7fffe0015ed0 [GDBusMethodInvocation], user_data=0x5555559a1a00)
- at src/nm-dbus-manager.c:947
- #9 0x00007ffff7c506c4 in call_in_idle_cb (user_data=user_data@entry=0x7fffe0015ed0) at ../gio/gdbusconnection.c:4874
- #10 0x00007ffff7a0e8eb in g_idle_dispatch (source=source@entry=0x7fffe00208a0, callback=0x7ffff7c50590 <call_in_idle_cb>, user_data=0x7fffe0015ed0) at ../glib/gmain.c:5627
- #11 0x00007ffff7a11fd0 in g_main_dispatch (context=0x555555994d00) at ../glib/gmain.c:3189
- #12 0x00007ffff7a11fd0 in g_main_context_dispatch (context=context@entry=0x555555994d00) at ../glib/gmain.c:3854
- #13 0x00007ffff7a12368 in g_main_context_iterate (context=0x555555994d00, block=block@entry=1, dispatch=dispatch@entry=1, self=<optimized out>) at ../glib/gmain.c:3927
- #14 0x00007ffff7a126b3 in g_main_loop_run (loop=0x555555995e60) at ../glib/gmain.c:4123
- #15 0x000055555558a741 in main (argc=<optimized out>, argv=<optimized out>) at src/main.c:444
-
-Filter out relative filenames early.
-
-(cherry picked from commit a1b102eae4bc412297b72c327530abc1ca38d659)
-(cherry picked from commit c21171e06987353868e91d6e1cd395ade05e9390)
----
- src/settings/nm-settings.c | 31 ++++++++++++++++++-------------
- 1 file changed, 18 insertions(+), 13 deletions(-)
-
-diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c
-index e594860bc..1f8314847 100644
---- a/src/settings/nm-settings.c
-+++ b/src/settings/nm-settings.c
-@@ -1409,8 +1409,6 @@ impl_settings_load_connections (NMDBusObject *obj,
- NMSettings *self = NM_SETTINGS (obj);
- NMSettingsPrivate *priv = NM_SETTINGS_GET_PRIVATE (self);
- gs_unref_ptrarray GPtrArray *failures = NULL;
-- GSList *iter;
-- guint i;
- gs_free const char **filenames = NULL;
-
- g_variant_get (parameters, "(^a&s)", &filenames);
-@@ -1427,21 +1425,28 @@ impl_settings_load_connections (NMDBusObject *obj,
- return;
-
- if (filenames) {
-+ gsize i;
-+
- for (i = 0; filenames[i]; i++) {
-- for (iter = priv->plugins; iter; iter = g_slist_next (iter)) {
-- NMSettingsPlugin *plugin = NM_SETTINGS_PLUGIN (iter->data);
-+ GSList *iter;
-
-- if (nm_settings_plugin_load_connection (plugin, filenames[i]))
-- break;
-- }
-+ if (filenames[i][0] != '/')
-+ _LOGW ("load: connection filename '%s' is not an absolute path", filenames[i]);
-+ else {
-+ for (iter = priv->plugins; iter; iter = iter->next) {
-+ NMSettingsPlugin *plugin = NM_SETTINGS_PLUGIN (iter->data);
-
-- if (!iter) {
-- if (!g_path_is_absolute (filenames[i]))
-- _LOGW ("connection filename '%s' is not an absolute path", filenames[i]);
-- if (!failures)
-- failures = g_ptr_array_new ();
-- g_ptr_array_add (failures, (char *) filenames[i]);
-+ if (nm_settings_plugin_load_connection (plugin, filenames[i]))
-+ goto next_filename;
-+ }
- }
-+
-+ if (!failures)
-+ failures = g_ptr_array_new ();
-+ g_ptr_array_add (failures, (char *) filenames[i]);
-+
-+next_filename:
-+ ;
- }
- }
-
---
-2.21.0
-
-
-From b9123eb59de18ddf30b2cb5eab0f5a0c0eeef345 Mon Sep 17 00:00:00 2001
-From: Thomas Haller <thaller@redhat.com>
-Date: Fri, 10 May 2019 14:53:51 +0200
-Subject: [PATCH 2/2] settings/d-bus: fix boolean return value of
- "LoadConnections"
-
-The boolean value is intended to indicate success. It would indicated
-failure due to a bug.
-
-Fixes: 297d4985abcc ('core/dbus: rework D-Bus implementation to use lower layer GDBusConnection API'):
-(cherry picked from commit 22e830f0469a654159e71b5bbddb2774bb5342c2)
-(cherry picked from commit e73a505866a784b41393ae6082a26ff7389633d3)
----
- src/settings/nm-settings.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c
-index 1f8314847..90dd892cb 100644
---- a/src/settings/nm-settings.c
-+++ b/src/settings/nm-settings.c
-@@ -1455,7 +1455,7 @@ next_filename:
-
- g_dbus_method_invocation_return_value (invocation,
- g_variant_new ("(b^as)",
-- (gboolean) (!!failures),
-+ (gboolean) (!failures),
- failures
- ? (const char **) failures->pdata
- : NM_PTRARRAY_EMPTY (const char *)));
---
-2.21.0
-
diff --git a/SOURCES/1006-fix-file-permissions-secret-key-rh1709849.patch b/SOURCES/1006-fix-file-permissions-secret-key-rh1709849.patch
deleted file mode 100644
index ad50f90..0000000
--- a/SOURCES/1006-fix-file-permissions-secret-key-rh1709849.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From a6562097a4d0f35c22c4f0f949012dee918bf510 Mon Sep 17 00:00:00 2001
-From: Thomas Haller <thaller@redhat.com>
-Date: Tue, 14 May 2019 13:55:41 +0200
-Subject: [PATCH 1/1] core: fix file permissions for
- "/var/lib/NetworkManager/secret_key"
-
-Ooherwise, the file has wrong permissions:
-
- # ls -la /var/lib/NetworkManager/secret_key
- ----r-xr-x. 1 root root 50 May 14 13:52 /var/lib/NetworkManager/secret_key
-
-Luckily, /var/lib/NetworkManager should be already
-
- # ls -lad /var/lib/NetworkManager
- drwx------. 2 root root 8192 May 14 13:57 /var/lib/NetworkManager
-
-which mitigates this a bit.
-
-Fixes: dbcb1d6d97c6 ('core: let nm_utils_secret_key_read() handle failures internally')
-
-https://gitlab.freedesktop.org/NetworkManager/NetworkManager/issues/175
-(cherry picked from commit dc3a2f9bc4c35030bcaf9e81953daf7894ab62b6)
-(cherry picked from commit 2d46247c6ac6f89a0b8bac86d684431c07dc6c8e)
----
- src/nm-core-utils.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c
-index b0cc914e7..fd1628027 100644
---- a/src/nm-core-utils.c
-+++ b/src/nm-core-utils.c
-@@ -2697,7 +2697,7 @@ _host_id_read (guint8 **out_host_id,
- } else if (!nm_utils_file_set_contents (SECRET_KEY_FILE,
- (const char *) new_content,
- len,
-- 0077,
-+ 0600,
- &error)) {
- nm_log_warn (LOGD_CORE, "secret-key: failure to persist secret key in \"%s\" (%s) (use non-persistent key)",
- SECRET_KEY_FILE, error->message);
---
-2.21.0
-
diff --git a/SOURCES/1007-tc-update-rh1546802.patch b/SOURCES/1007-tc-update-rh1546802.patch
deleted file mode 100644
index 59c29e3..0000000
--- a/SOURCES/1007-tc-update-rh1546802.patch
+++ /dev/null
@@ -1,2449 +0,0 @@
-From 67047a444d45dd6e74d381cfe06a418c13693539 Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Tue, 9 Apr 2019 13:42:52 +0200
-Subject: [PATCH 01/20] tc/qdisc: add support for fq_codel attributes
-
-(cherry picked from commit 1efe982e39be7e8b7852a19957c7b49cab46e67c)
----
- libnm-core/nm-utils.c | 13 ++++++
- src/devices/nm-device.c | 23 ++++++++++
- src/platform/nm-linux-platform.c | 72 ++++++++++++++++++++++++++++++++
- src/platform/nm-platform.c | 55 ++++++++++++++++++++----
- src/platform/nm-platform.h | 14 +++++++
- 5 files changed, 170 insertions(+), 7 deletions(-)
-
-diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c
-index 04d5b1b558..b82c580345 100644
---- a/libnm-core/nm-utils.c
-+++ b/libnm-core/nm-utils.c
-@@ -2309,12 +2309,25 @@ static const NMVariantAttributeSpec * const tc_object_attribute_spec[] = {
- NULL,
- };
-
-+static const NMVariantAttributeSpec * const tc_qdisc_fq_codel_spec[] = {
-+ TC_ATTR_SPEC_PTR ("limit", G_VARIANT_TYPE_UINT32, FALSE, FALSE, 0 ),
-+ TC_ATTR_SPEC_PTR ("flows", G_VARIANT_TYPE_UINT32, FALSE, FALSE, 0 ),
-+ TC_ATTR_SPEC_PTR ("target", G_VARIANT_TYPE_UINT32, FALSE, FALSE, 0 ),
-+ TC_ATTR_SPEC_PTR ("interval", G_VARIANT_TYPE_UINT32, FALSE, FALSE, 0 ),
-+ TC_ATTR_SPEC_PTR ("quantum", G_VARIANT_TYPE_UINT32, FALSE, FALSE, 0 ),
-+ TC_ATTR_SPEC_PTR ("ce_threshold", G_VARIANT_TYPE_UINT32, FALSE, FALSE, 0 ),
-+ TC_ATTR_SPEC_PTR ("memory", G_VARIANT_TYPE_UINT32, FALSE, FALSE, 0 ),
-+ TC_ATTR_SPEC_PTR ("ecn", G_VARIANT_TYPE_BOOLEAN, TRUE, FALSE, 0 ),
-+ NULL,
-+};
-+
- typedef struct {
- const char *kind;
- const NMVariantAttributeSpec * const *attrs;
- } NMQdiscAttributeSpec;
-
- static const NMQdiscAttributeSpec *const tc_qdisc_attribute_spec[] = {
-+ &(const NMQdiscAttributeSpec) { "fq_codel", tc_qdisc_fq_codel_spec },
- NULL,
- };
-
-diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
-index 60709c50d5..195686707b 100644
---- a/src/devices/nm-device.c
-+++ b/src/devices/nm-device.c
-@@ -6522,6 +6522,29 @@ tc_commit (NMDevice *self)
- qdisc->parent = nm_tc_qdisc_get_parent (s_qdisc);
- qdisc->info = 0;
-
-+#define GET_ATTR(name, dst, variant_type, type, dflt) G_STMT_START { \
-+ GVariant *_variant = nm_tc_qdisc_get_attribute (s_qdisc, ""name""); \
-+ \
-+ if ( _variant \
-+ && g_variant_is_of_type (_variant, G_VARIANT_TYPE_ ## variant_type)) \
-+ (dst) = g_variant_get_ ## type (_variant); \
-+ else \
-+ (dst) = (dflt); \
-+} G_STMT_END
-+
-+ if (strcmp (qdisc->kind, "fq_codel") == 0) {
-+ GET_ATTR("limit", qdisc->fq_codel.limit, UINT32, uint32, 0);
-+ GET_ATTR("flows", qdisc->fq_codel.flows, UINT32, uint32, 0);
-+ GET_ATTR("target", qdisc->fq_codel.target, UINT32, uint32, 0);
-+ GET_ATTR("interval", qdisc->fq_codel.interval, UINT32, uint32, 0);
-+ GET_ATTR("quantum", qdisc->fq_codel.quantum, UINT32, uint32, 0);
-+ GET_ATTR("ce_threshold", qdisc->fq_codel.ce_threshold, UINT32, uint32, -1);
-+ GET_ATTR("memory", qdisc->fq_codel.memory, UINT32, uint32, -1);
-+ GET_ATTR("ecn", qdisc->fq_codel.ecn, BOOLEAN, boolean, FALSE);
-+ }
-+
-+#undef GET_ADDR
-+
- g_ptr_array_add (qdiscs, q);
- }
-
-diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c
-index d4b0115252..a346d6618c 100644
---- a/src/platform/nm-linux-platform.c
-+++ b/src/platform/nm-linux-platform.c
-@@ -84,6 +84,13 @@ enum {
-
- /*****************************************************************************/
-
-+/* Compat with older kernels. */
-+
-+#define TCA_FQ_CODEL_CE_THRESHOLD 7
-+#define TCA_FQ_CODEL_MEMORY_LIMIT 9
-+
-+/*****************************************************************************/
-+
- #define VLAN_FLAG_MVRP 0x8
-
- /*****************************************************************************/
-@@ -3481,6 +3488,7 @@ _new_from_nl_qdisc (struct nlmsghdr *nlh, gboolean id_only)
- {
- static const struct nla_policy policy[] = {
- [TCA_KIND] = { .type = NLA_STRING },
-+ [TCA_OPTIONS] = { .type = NLA_NESTED },
- };
- struct nlattr *tb[G_N_ELEMENTS (policy)];
- const struct tcmsg *tcm;
-@@ -3506,6 +3514,45 @@ _new_from_nl_qdisc (struct nlmsghdr *nlh, gboolean id_only)
- obj->qdisc.parent = tcm->tcm_parent;
- obj->qdisc.info = tcm->tcm_info;
-
-+ if (tb[TCA_OPTIONS]) {
-+ struct nlattr *options_attr;
-+ int remaining;
-+
-+ nla_for_each_nested (options_attr, tb[TCA_OPTIONS], remaining) {
-+ if (nla_len (options_attr) < sizeof (uint32_t))
-+ continue;
-+
-+ if (nm_streq0 (obj->qdisc.kind, "fq_codel")) {
-+ switch (nla_type (options_attr)) {
-+ case TCA_FQ_CODEL_LIMIT:
-+ obj->qdisc.fq_codel.limit = nla_get_u32 (options_attr);
-+ break;
-+ case TCA_FQ_CODEL_FLOWS:
-+ obj->qdisc.fq_codel.flows = nla_get_u32 (options_attr);
-+ break;
-+ case TCA_FQ_CODEL_TARGET:
-+ obj->qdisc.fq_codel.target = nla_get_u32 (options_attr);
-+ break;
-+ case TCA_FQ_CODEL_INTERVAL:
-+ obj->qdisc.fq_codel.interval = nla_get_u32 (options_attr);
-+ break;
-+ case TCA_FQ_CODEL_QUANTUM:
-+ obj->qdisc.fq_codel.quantum = nla_get_u32 (options_attr);
-+ break;
-+ case TCA_FQ_CODEL_CE_THRESHOLD:
-+ obj->qdisc.fq_codel.ce_threshold = nla_get_u32 (options_attr);
-+ break;
-+ case TCA_FQ_CODEL_MEMORY_LIMIT:
-+ obj->qdisc.fq_codel.memory = nla_get_u32 (options_attr);
-+ break;
-+ case TCA_FQ_CODEL_ECN:
-+ obj->qdisc.fq_codel.ecn = nla_get_u32 (options_attr);
-+ break;
-+ }
-+ }
-+ }
-+ }
-+
- return obj;
- }
-
-@@ -4161,6 +4208,7 @@ _nl_msg_new_qdisc (int nlmsg_type,
- const NMPlatformQdisc *qdisc)
- {
- nm_auto_nlmsg struct nl_msg *msg = NULL;
-+ struct nlattr *tc_options;
- const struct tcmsg tcm = {
- .tcm_family = qdisc->addr_family,
- .tcm_ifindex = qdisc->ifindex,
-@@ -4176,6 +4224,30 @@ _nl_msg_new_qdisc (int nlmsg_type,
-
- NLA_PUT_STRING (msg, TCA_KIND, qdisc->kind);
-
-+ if (!(tc_options = nla_nest_start (msg, TCA_OPTIONS)))
-+ goto nla_put_failure;
-+
-+ if (strcmp (qdisc->kind, "fq_codel") == 0) {
-+ if (qdisc->fq_codel.limit)
-+ NLA_PUT_U32 (msg, TCA_FQ_CODEL_LIMIT, qdisc->fq_codel.limit);
-+ if (qdisc->fq_codel.flows)
-+ NLA_PUT_U32 (msg, TCA_FQ_CODEL_FLOWS, qdisc->fq_codel.flows);
-+ if (qdisc->fq_codel.target)
-+ NLA_PUT_U32 (msg, TCA_FQ_CODEL_TARGET, qdisc->fq_codel.target);
-+ if (qdisc->fq_codel.interval)
-+ NLA_PUT_U32 (msg, TCA_FQ_CODEL_INTERVAL, qdisc->fq_codel.interval);
-+ if (qdisc->fq_codel.quantum)
-+ NLA_PUT_U32 (msg, TCA_FQ_CODEL_QUANTUM, qdisc->fq_codel.quantum);
-+ if (qdisc->fq_codel.ce_threshold != -1)
-+ NLA_PUT_U32 (msg, TCA_FQ_CODEL_CE_THRESHOLD, qdisc->fq_codel.ce_threshold);
-+ if (qdisc->fq_codel.memory != -1)
-+ NLA_PUT_U32 (msg, TCA_FQ_CODEL_MEMORY_LIMIT, qdisc->fq_codel.memory);
-+ if (qdisc->fq_codel.ecn)
-+ NLA_PUT_S32 (msg, TCA_FQ_CODEL_ECN, qdisc->fq_codel.ecn);
-+ }
-+
-+ nla_nest_end (msg, tc_options);
-+
- return g_steal_pointer (&msg);
-
- nla_put_failure:
-diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c
-index 1fc0ccb750..3d78902860 100644
---- a/src/platform/nm-platform.c
-+++ b/src/platform/nm-platform.c
-@@ -6430,13 +6430,32 @@ nm_platform_qdisc_to_string (const NMPlatformQdisc *qdisc, char *buf, gsize len)
- if (!nm_utils_to_string_buffer_init_null (qdisc, &buf, &len))
- return buf;
-
-- g_snprintf (buf, len, "%s%s family %d handle %x parent %x info %x",
-- qdisc->kind,
-- _to_string_dev (NULL, qdisc->ifindex, str_dev, sizeof (str_dev)),
-- qdisc->addr_family,
-- qdisc->handle,
-- qdisc->parent,
-- qdisc->info);
-+ nm_utils_strbuf_append (&buf, &len, "%s%s family %u handle %x parent %x info %x",
-+ qdisc->kind,
-+ _to_string_dev (NULL, qdisc->ifindex, str_dev, sizeof (str_dev)),
-+ qdisc->addr_family,
-+ qdisc->handle,
-+ qdisc->parent,
-+ qdisc->info);
-+
-+ if (nm_streq0 (qdisc->kind, "fq_codel")) {
-+ if (qdisc->fq_codel.limit)
-+ nm_utils_strbuf_append (&buf, &len, " limit %u", qdisc->fq_codel.limit);
-+ if (qdisc->fq_codel.flows)
-+ nm_utils_strbuf_append (&buf, &len, " flows %u", qdisc->fq_codel.flows);
-+ if (qdisc->fq_codel.target)
-+ nm_utils_strbuf_append (&buf, &len, " target %u", qdisc->fq_codel.target);
-+ if (qdisc->fq_codel.interval)
-+ nm_utils_strbuf_append (&buf, &len, " interval %u", qdisc->fq_codel.interval);
-+ if (qdisc->fq_codel.quantum)
-+ nm_utils_strbuf_append (&buf, &len, " quantum %u", qdisc->fq_codel.quantum);
-+ if (qdisc->fq_codel.ce_threshold != -1)
-+ nm_utils_strbuf_append (&buf, &len, " ce_threshold %u", qdisc->fq_codel.ce_threshold);
-+ if (qdisc->fq_codel.memory != -1)
-+ nm_utils_strbuf_append (&buf, &len, " memory %u", qdisc->fq_codel.memory);
-+ if (qdisc->fq_codel.ecn)
-+ nm_utils_strbuf_append (&buf, &len, " ecn");
-+ }
-
- return buf;
- }
-@@ -6451,6 +6470,17 @@ nm_platform_qdisc_hash_update (const NMPlatformQdisc *obj, NMHashState *h)
- obj->handle,
- obj->parent,
- obj->info);
-+ if (nm_streq0 (obj->kind, "fq_codel")) {
-+ nm_hash_update_vals (h,
-+ obj->fq_codel.limit,
-+ obj->fq_codel.flows,
-+ obj->fq_codel.target,
-+ obj->fq_codel.interval,
-+ obj->fq_codel.quantum,
-+ obj->fq_codel.ce_threshold,
-+ obj->fq_codel.memory,
-+ obj->fq_codel.ecn == TRUE);
-+ }
- }
-
- int
-@@ -6464,6 +6494,17 @@ nm_platform_qdisc_cmp (const NMPlatformQdisc *a, const NMPlatformQdisc *b)
- NM_CMP_FIELD (a, b, handle);
- NM_CMP_FIELD (a, b, info);
-
-+ if (nm_streq0 (a->kind, "fq_codel")) {
-+ NM_CMP_FIELD (a, b, fq_codel.limit);
-+ NM_CMP_FIELD (a, b, fq_codel.flows);
-+ NM_CMP_FIELD (a, b, fq_codel.target);
-+ NM_CMP_FIELD (a, b, fq_codel.interval);
-+ NM_CMP_FIELD (a, b, fq_codel.quantum);
-+ NM_CMP_FIELD (a, b, fq_codel.ce_threshold);
-+ NM_CMP_FIELD (a, b, fq_codel.memory);
-+ NM_CMP_FIELD (a, b, fq_codel.ecn == TRUE);
-+ }
-+
- return 0;
- }
-
-diff --git a/src/platform/nm-platform.h b/src/platform/nm-platform.h
-index 97be88324e..8742b90555 100644
---- a/src/platform/nm-platform.h
-+++ b/src/platform/nm-platform.h
-@@ -596,6 +596,17 @@ typedef struct {
- bool uid_range_has:1; /* has(FRA_UID_RANGE) */
- } NMPlatformRoutingRule;
-
-+typedef struct {
-+ guint32 limit;
-+ guint32 flows;
-+ guint32 target;
-+ guint32 interval;
-+ guint32 quantum;
-+ guint32 ce_threshold;
-+ guint32 memory;
-+ bool ecn:1;
-+} NMPlatformQdiscFqCodel;
-+
- typedef struct {
- __NMPlatformObjWithIfindex_COMMON;
- const char *kind;
-@@ -603,6 +614,9 @@ typedef struct {
- guint32 handle;
- guint32 parent;
- guint32 info;
-+ union {
-+ NMPlatformQdiscFqCodel fq_codel;
-+ };
- } NMPlatformQdisc;
-
- typedef struct {
---
-2.21.0
-
-From 4be7cf71e06da4801d8bb066b977c733e7e7097c Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Tue, 9 Apr 2019 16:23:39 +0200
-Subject: [PATCH 02/20] tc/tfilter: add mirred action
-
-(cherry picked from commit 900292147d8fd584479a7af0881984c2d77a60bf)
----
- libnm-core/nm-utils.c | 11 +++++++++++
- src/devices/nm-device.c | 29 +++++++++++++++++++++++-----
- src/platform/nm-linux-platform.c | 33 ++++++++++++++++++++++++++++++++
- src/platform/nm-platform.c | 29 +++++++++++++++++++++++++---
- src/platform/nm-platform.h | 10 ++++++++++
- 5 files changed, 104 insertions(+), 8 deletions(-)
-
-diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c
-index b82c580345..3af3e04ed9 100644
---- a/libnm-core/nm-utils.c
-+++ b/libnm-core/nm-utils.c
-@@ -2542,6 +2542,15 @@ static const NMVariantAttributeSpec * const tc_action_simple_attribute_spec[] =
- NULL,
- };
-
-+static const NMVariantAttributeSpec * const tc_action_mirred_attribute_spec[] = {
-+ TC_ATTR_SPEC_PTR ("egress", G_VARIANT_TYPE_BOOLEAN, TRUE, FALSE, 0 ),
-+ TC_ATTR_SPEC_PTR ("ingress", G_VARIANT_TYPE_BOOLEAN, TRUE, FALSE, 0 ),
-+ TC_ATTR_SPEC_PTR ("mirror", G_VARIANT_TYPE_BOOLEAN, TRUE, FALSE, 0 ),
-+ TC_ATTR_SPEC_PTR ("redirect", G_VARIANT_TYPE_BOOLEAN, TRUE, FALSE, 0 ),
-+ TC_ATTR_SPEC_PTR ("dev", G_VARIANT_TYPE_STRING, TRUE, FALSE, 'a' ),
-+ NULL,
-+};
-+
- static const NMVariantAttributeSpec * const tc_action_attribute_spec[] = {
- TC_ATTR_SPEC_PTR ("kind", G_VARIANT_TYPE_STRING, TRUE, FALSE, 'a' ),
- TC_ATTR_SPEC_PTR ("", G_VARIANT_TYPE_STRING, TRUE, TRUE, 'a' ),
-@@ -2636,6 +2645,8 @@ nm_utils_tc_action_from_str (const char *str, GError **error)
- kind = g_variant_get_string (variant, NULL);
- if (strcmp (kind, "simple") == 0)
- attrs = tc_action_simple_attribute_spec;
-+ else if (strcmp (kind, "mirred") == 0)
-+ attrs = tc_action_mirred_attribute_spec;
- else
- attrs = NULL;
-
-diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
-index 195686707b..ea6ad7e2ad 100644
---- a/src/devices/nm-device.c
-+++ b/src/devices/nm-device.c
-@@ -6566,16 +6566,35 @@ tc_commit (NMDevice *self)
-
- action = nm_tc_tfilter_get_action (s_tfilter);
- if (action) {
-+ GVariant *var;
-+
- tfilter->action.kind = nm_tc_action_get_kind (action);
- if (strcmp (tfilter->action.kind, "simple") == 0) {
-- GVariant *sdata;
--
-- sdata = nm_tc_action_get_attribute (action, "sdata");
-- if (sdata && g_variant_is_of_type (sdata, G_VARIANT_TYPE_BYTESTRING)) {
-+ var = nm_tc_action_get_attribute (action, "sdata");
-+ if (var && g_variant_is_of_type (var, G_VARIANT_TYPE_BYTESTRING)) {
- g_strlcpy (tfilter->action.simple.sdata,
-- g_variant_get_bytestring (sdata),
-+ g_variant_get_bytestring (var),
- sizeof (tfilter->action.simple.sdata));
- }
-+ } else if (strcmp (tfilter->action.kind, "mirred") == 0) {
-+ if (nm_tc_action_get_attribute (action, "egress"))
-+ tfilter->action.mirred.egress = TRUE;
-+
-+ if (nm_tc_action_get_attribute (action, "ingress"))
-+ tfilter->action.mirred.ingress = TRUE;
-+
-+ if (nm_tc_action_get_attribute (action, "mirror"))
-+ tfilter->action.mirred.mirror = TRUE;
-+
-+ if (nm_tc_action_get_attribute (action, "redirect"))
-+ tfilter->action.mirred.redirect = TRUE;
-+
-+ var = nm_tc_action_get_attribute (action, "dev");
-+ if (var && g_variant_is_of_type (var, G_VARIANT_TYPE_STRING)) {
-+ int ifindex = nm_platform_link_get_ifindex (nm_device_get_platform (self),
-+ g_variant_get_string (var, NULL));
-+ tfilter->action.mirred.ifindex = ifindex;
-+ }
- }
- }
-
-diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c
-index a346d6618c..6064d89eb6 100644
---- a/src/platform/nm-linux-platform.c
-+++ b/src/platform/nm-linux-platform.c
-@@ -34,6 +34,7 @@
- #include <linux/if_tun.h>
- #include <linux/if_tunnel.h>
- #include <linux/ip6_tunnel.h>
-+#include <linux/tc_act/tc_mirred.h>
- #include <netinet/icmp6.h>
- #include <netinet/in.h>
- #include <poll.h>
-@@ -4275,6 +4276,36 @@ nla_put_failure:
- return FALSE;
- }
-
-+static gboolean
-+_add_action_mirred (struct nl_msg *msg,
-+ const NMPlatformActionMirred *mirred)
-+{
-+ struct nlattr *act_options;
-+ struct tc_mirred sel = { 0, };
-+
-+ if (!(act_options = nla_nest_start (msg, TCA_ACT_OPTIONS)))
-+ goto nla_put_failure;
-+
-+ if (mirred->egress && mirred->redirect)
-+ sel.eaction = TCA_EGRESS_REDIR;
-+ else if (mirred->egress && mirred->mirror)
-+ sel.eaction = TCA_EGRESS_MIRROR;
-+ else if (mirred->ingress && mirred->redirect)
-+ sel.eaction = TCA_INGRESS_REDIR;
-+ else if (mirred->ingress && mirred->mirror)
-+ sel.eaction = TCA_INGRESS_MIRROR;
-+ sel.ifindex = mirred->ifindex;
-+
-+ NLA_PUT (msg, TCA_MIRRED_PARMS, sizeof (sel), &sel);
-+
-+ nla_nest_end (msg, act_options);
-+
-+ return TRUE;
-+
-+nla_put_failure:
-+ return FALSE;
-+}
-+
- static gboolean
- _add_action (struct nl_msg *msg,
- const NMPlatformAction *action)
-@@ -4290,6 +4321,8 @@ _add_action (struct nl_msg *msg,
-
- if (nm_streq (action->kind, NM_PLATFORM_ACTION_KIND_SIMPLE))
- _add_action_simple (msg, &action->simple);
-+ else if (nm_streq (action->kind, NM_PLATFORM_ACTION_KIND_MIRRED))
-+ _add_action_mirred (msg, &action->mirred);
-
- nla_nest_end (msg, prio);
-
-diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c
-index 3d78902860..6f23ddb589 100644
---- a/src/platform/nm-platform.c
-+++ b/src/platform/nm-platform.c
-@@ -34,6 +34,7 @@
- #include <linux/if_tun.h>
- #include <linux/if_tunnel.h>
- #include <linux/rtnetlink.h>
-+#include <linux/tc_act/tc_mirred.h>
- #include <libudev.h>
-
- #include "nm-utils.h"
-@@ -6533,11 +6534,18 @@ nm_platform_tfilter_to_string (const NMPlatformTfilter *tfilter, char *buf, gsiz
- NM_UTILS_STR_UTF8_SAFE_FLAG_ESCAPE_CTRL
- | NM_UTILS_STR_UTF8_SAFE_FLAG_ESCAPE_NON_ASCII,
- &t));
-+ } else if (nm_streq (tfilter->action.kind, NM_PLATFORM_ACTION_KIND_MIRRED)) {
-+ nm_utils_strbuf_append (&p, &l, "%s%s%s%s dev %d",
-+ tfilter->action.mirred.ingress ? " ingress" : "",
-+ tfilter->action.mirred.egress ? " egress" : "",
-+ tfilter->action.mirred.mirror ? " mirror" : "",
-+ tfilter->action.mirred.redirect ? " redirect" : "",
-+ tfilter->action.mirred.ifindex);
- }
- } else
- act_buf[0] = '\0';
-
-- g_snprintf (buf, len, "%s%s family %d handle %x parent %x info %x%s",
-+ g_snprintf (buf, len, "%s%s family %u handle %x parent %x info %x%s",
- tfilter->kind,
- _to_string_dev (NULL, tfilter->ifindex, str_dev, sizeof (str_dev)),
- tfilter->addr_family,
-@@ -6561,8 +6569,16 @@ nm_platform_tfilter_hash_update (const NMPlatformTfilter *obj, NMHashState *h)
- obj->info);
- if (obj->action.kind) {
- nm_hash_update_str (h, obj->action.kind);
-- if (nm_streq (obj->action.kind, NM_PLATFORM_ACTION_KIND_SIMPLE))
-+ if (nm_streq (obj->action.kind, NM_PLATFORM_ACTION_KIND_SIMPLE)) {
- nm_hash_update_strarr (h, obj->action.simple.sdata);
-+ } else if (nm_streq (obj->action.kind, NM_PLATFORM_ACTION_KIND_MIRRED)) {
-+ nm_hash_update_vals (h,
-+ obj->action.mirred.ingress,
-+ obj->action.mirred.egress,
-+ obj->action.mirred.mirror,
-+ obj->action.mirred.redirect,
-+ obj->action.mirred.ifindex);
-+ }
- }
- }
-
-@@ -6579,8 +6595,15 @@ nm_platform_tfilter_cmp (const NMPlatformTfilter *a, const NMPlatformTfilter *b)
-
- NM_CMP_FIELD_STR_INTERNED (a, b, action.kind);
- if (a->action.kind) {
-- if (nm_streq (a->action.kind, NM_PLATFORM_ACTION_KIND_SIMPLE))
-+ if (nm_streq (a->action.kind, NM_PLATFORM_ACTION_KIND_SIMPLE)) {
- NM_CMP_FIELD_STR (a, b, action.simple.sdata);
-+ } else if (nm_streq (a->action.kind, NM_PLATFORM_ACTION_KIND_MIRRED)) {
-+ NM_CMP_FIELD (a, b, action.mirred.ingress);
-+ NM_CMP_FIELD (a, b, action.mirred.egress);
-+ NM_CMP_FIELD (a, b, action.mirred.mirror);
-+ NM_CMP_FIELD (a, b, action.mirred.redirect);
-+ NM_CMP_FIELD (a, b, action.mirred.ifindex);
-+ }
- }
-
- return 0;
-diff --git a/src/platform/nm-platform.h b/src/platform/nm-platform.h
-index 8742b90555..16747f093b 100644
---- a/src/platform/nm-platform.h
-+++ b/src/platform/nm-platform.h
-@@ -623,14 +623,24 @@ typedef struct {
- char sdata[32];
- } NMPlatformActionSimple;
-
-+typedef struct {
-+ gboolean egress;
-+ gboolean ingress;
-+ gboolean mirror;
-+ gboolean redirect;
-+ int ifindex;
-+} NMPlatformActionMirred;
-+
- typedef struct {
- const char *kind;
- union {
- NMPlatformActionSimple simple;
-+ NMPlatformActionMirred mirred;
- };
- } NMPlatformAction;
-
- #define NM_PLATFORM_ACTION_KIND_SIMPLE "simple"
-+#define NM_PLATFORM_ACTION_KIND_MIRRED "mirred"
-
- typedef struct {
- __NMPlatformObjWithIfindex_COMMON;
---
-2.21.0
-
-From 84bd35e4fadf0aa8244b2c683c60fdfc4b87cf6f Mon Sep 17 00:00:00 2001
-From: Thomas Haller <thaller@redhat.com>
-Date: Wed, 1 May 2019 11:36:02 +0200
-Subject: [PATCH 03/20] shared: use nm_str_skip_leading_spaces() in
- _nm_utils_ascii_str_to_int64()
-
-(cherry picked from commit 9d2623cceb8550fbe6becf5dde2e0cef152e1086)
----
- shared/nm-glib-aux/nm-shared-utils.c | 9 +++------
- 1 file changed, 3 insertions(+), 6 deletions(-)
-
-diff --git a/shared/nm-glib-aux/nm-shared-utils.c b/shared/nm-glib-aux/nm-shared-utils.c
-index cf08a77fde..fb945ef9fb 100644
---- a/shared/nm-glib-aux/nm-shared-utils.c
-+++ b/shared/nm-glib-aux/nm-shared-utils.c
-@@ -734,10 +734,7 @@ _nm_utils_ascii_str_to_int64 (const char *str, guint base, gint64 min, gint64 ma
- gint64 v;
- const char *s = NULL;
-
-- if (str) {
-- while (g_ascii_isspace (str[0]))
-- str++;
-- }
-+ str = nm_str_skip_leading_spaces (str);
- if (!str || !str[0]) {
- errno = EINVAL;
- return fallback;
-@@ -748,9 +745,9 @@ _nm_utils_ascii_str_to_int64 (const char *str, guint base, gint64 min, gint64 ma
-
- if (errno != 0)
- return fallback;
-+
- if (s[0] != '\0') {
-- while (g_ascii_isspace (s[0]))
-- s++;
-+ s = nm_str_skip_leading_spaces (s);
- if (s[0] != '\0') {
- errno = EINVAL;
- return fallback;
---
-2.21.0
-
-From 13e3bd4161d11c81cd4188a733c6d370d41452c3 Mon Sep 17 00:00:00 2001
-From: Thomas Haller <thaller@redhat.com>
-Date: Wed, 1 May 2019 10:49:16 +0200
-Subject: [PATCH 04/20] libnm/tests: add test for _nm_utils_parse_tc_handle()
-
-(cherry picked from commit fac95d0062d9bbe256b8e479ba7cb452cbac340e)
----
- libnm-core/tests/test-setting.c | 56 +++++++++++++++++++++++++++++++++
- 1 file changed, 56 insertions(+)
-
-diff --git a/libnm-core/tests/test-setting.c b/libnm-core/tests/test-setting.c
-index 03100a039b..7587b65ba7 100644
---- a/libnm-core/tests/test-setting.c
-+++ b/libnm-core/tests/test-setting.c
-@@ -2979,6 +2979,60 @@ test_routing_rule (gconstpointer test_data)
-
- /*****************************************************************************/
-
-+static void
-+test_parse_tc_handle (void)
-+{
-+#define _parse_tc_handle(str, exp) \
-+ G_STMT_START { \
-+ gs_free_error GError *_error = NULL; \
-+ GError **_perror = nmtst_get_rand_bool () ? &_error : NULL; \
-+ guint32 _v; \
-+ const guint32 _v_exp = (exp); \
-+ \
-+ _v = _nm_utils_parse_tc_handle (""str"", _perror); \
-+ \
-+ if (_v != _v_exp) \
-+ g_error ("%s:%d: \"%s\" gave %08x but %08x expected.", __FILE__, __LINE__, ""str"", _v, _v_exp); \
-+ \
-+ if (_v == TC_H_UNSPEC) \
-+ g_assert (!_perror || *_perror); \
-+ else \
-+ g_assert (!_perror || !*_perror); \
-+ \
-+ } G_STMT_END
-+
-+#define _parse_tc_handle_inval(str) _parse_tc_handle (str, TC_H_UNSPEC)
-+#define _parse_tc_handle_valid(str, maj, min) _parse_tc_handle (str, TC_H_MAKE (((guint32) (maj)) << 16, ((guint16) (min))))
-+
-+ _parse_tc_handle_inval ("");
-+ _parse_tc_handle_inval (" ");
-+ _parse_tc_handle_inval (" \n");
-+ _parse_tc_handle_valid ("1", 1, 0);
-+ _parse_tc_handle_inval(" 1 ");
-+ _parse_tc_handle_valid ("1:", 1, 0);
-+ _parse_tc_handle_inval ("1: ");
-+ _parse_tc_handle_valid ("1:0", 1, 0);
-+ _parse_tc_handle_inval ("1 :0");
-+ _parse_tc_handle_inval ("1 \t\n\f\r:0");
-+ _parse_tc_handle_inval ("1 \t\n\f\r\v:0");
-+ _parse_tc_handle_inval (" 1 : 0 ");
-+ _parse_tc_handle_valid (" \t\v\n1: 0", 1, 0);
-+ _parse_tc_handle_valid ("1:2", 1, 2);
-+ _parse_tc_handle_valid ("01:02", 1, 2);
-+ _parse_tc_handle_valid ("0x01:0x02", 1, 2);
-+ _parse_tc_handle_valid (" 01: 02", 1, 2);
-+ _parse_tc_handle_valid ("019: 020", 0x19, 0x20);
-+ _parse_tc_handle_valid ("FFFF: 020", 0xFFFF, 0x20);
-+ _parse_tc_handle_valid ("FfFF: ffff", 0xFFFF, 0xFFFF);
-+ _parse_tc_handle_valid ("FFFF", 0xFFFF, 0);
-+ _parse_tc_handle_valid ("0xFFFF", 0xFFFF, 0);
-+ _parse_tc_handle_inval ("10000");
-+ _parse_tc_handle_valid ("\t\n\f\r FFFF", 0xFFFF, 0);
-+ _parse_tc_handle_valid ("\t\n\f\r \vFFFF", 0xFFFF, 0);
-+}
-+
-+/*****************************************************************************/
-+
- NMTST_DEFINE ();
-
- int
-@@ -3064,5 +3118,7 @@ main (int argc, char **argv)
-
- g_test_add_data_func ("/libnm/settings/routing-rule/1", GINT_TO_POINTER (0), test_routing_rule);
-
-+ g_test_add_func ("/libnm/parse-tc-handle", test_parse_tc_handle);
-+
- return g_test_run ();
- }
---
-2.21.0
-
-From b954ddc2752285b28885398441879edb922c68fc Mon Sep 17 00:00:00 2001
-From: Thomas Haller <thaller@redhat.com>
-Date: Wed, 1 May 2019 10:27:32 +0200
-Subject: [PATCH 05/20] libnm: cleanup _nm_utils_parse_tc_handle()
-
-- g_ascii_strtoll() accepts leading spaces, but it leaves
- the end pointer at the first space after the digit. That means,
- we accepted "1: 0" but not "1 :0". We should either consistently
- accept spaces around the digits/colon or reject it.
-
-- g_ascii_strtoll() accepts "\v" as a space (just like `man 3 isspace`
- comments that "\v" is a space in C and POSIX locale.
- For some reasons (unknown to me) g_ascii_isspace() does not treat
- "\v" as space. And neither does NM_ASCII_SPACES and
- nm_str_skip_leading_spaces().
- We should be consistent about what we consider spaces and what not.
- It's already odd to accept '\n' as spaces here, but well, lets do
- it for the sake of consistency (so that it matches with our
- understanding of ASCII spaces, albeit not POSIX's).
-
-- don't use bogus error domains in "g_set_error (error, 1, 0, ..."
- That is a bug and we have NM_UTILS_ERROR exactly for error instances
- with unspecified domain and code.
-
-- as before, accept a trailing ":" with omitted minor number.
-
-- reject all unexpected characters. strtoll() accepts '+' / '-'
- and a "0x" prefix of the numbers (and leading POSIX spaces). Be
- strict here and only accepts NM_ASCII_SPACES, ':', and hexdigits.
- In particular, don't accept the "0x" prefix.
-
-This parsing would be significantly simpler to implement, if we could
-just strdup() the string, split the string at the colon delimiter and
-use _nm_utils_ascii_str_to_int64() which gets leading/trailing spaces
-right. But let's save the "overhead" of an additional alloc.
-
-(cherry picked from commit cc9f07167607124bcb0df735034858aadfdb8541)
----
- libnm-core/nm-utils.c | 43 ++++++++++++++++++++++++---------
- libnm-core/tests/test-setting.c | 18 +++++++-------
- 2 files changed, 41 insertions(+), 20 deletions(-)
-
-diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c
-index 3af3e04ed9..7a7c6de114 100644
---- a/libnm-core/nm-utils.c
-+++ b/libnm-core/nm-utils.c
-@@ -2280,21 +2280,42 @@ _nm_utils_string_append_tc_parent (GString *string, const char *prefix, guint32
- guint32
- _nm_utils_parse_tc_handle (const char *str, GError **error)
- {
-- gint64 maj, min;
-- char *sep;
-+ gint64 maj;
-+ gint64 min = 0;
-+ const char *sep;
-
-- maj = g_ascii_strtoll (str, &sep, 0x10);
-- if (*sep == ':')
-- min = g_ascii_strtoll (&sep[1], &sep, 0x10);
-- else
-- min = 0;
-+ nm_assert (str);
-
-- if (*sep != '\0' || maj <= 0 || maj > 0xffff || min < 0 || min > 0xffff) {
-- g_set_error (error, 1, 0, _("'%s' is not a valid handle."), str);
-- return TC_H_UNSPEC;
-+ maj = g_ascii_strtoll (str, (char **) &sep, 0x10);
-+ if (sep == str)
-+ goto fail;
-+
-+ sep = nm_str_skip_leading_spaces (sep);
-+
-+ if (sep[0] == ':') {
-+ const char *str2 = &sep[1];
-+
-+ min = g_ascii_strtoll (str2, (char **) &sep, 0x10);
-+ sep = nm_str_skip_leading_spaces (sep);
-+ if (sep[0] != '\0')
-+ goto fail;
-+ } else if (sep[0] != '\0')
-+ goto fail;
-+
-+ if ( maj <= 0
-+ || maj > 0xffff
-+ || min < 0
-+ || min > 0xffff
-+ || !NM_STRCHAR_ALL (str, ch, ( g_ascii_isxdigit (ch)
-+ || ch == ':'
-+ || g_ascii_isspace (ch)))) {
-+ goto fail;
- }
-
-- return TC_H_MAKE (maj << 16, min);
-+ return TC_H_MAKE (((guint32) maj) << 16, (guint32) min);
-+fail:
-+ nm_utils_error_set (error, NM_UTILS_ERROR_UNKNOWN, _("'%s' is not a valid handle."), str);
-+ return TC_H_UNSPEC;
- }
-
- #define TC_ATTR_SPEC_PTR(name, type, no_value, consumes_rest, str_type) \
-diff --git a/libnm-core/tests/test-setting.c b/libnm-core/tests/test-setting.c
-index 7587b65ba7..5c9c614fb5 100644
---- a/libnm-core/tests/test-setting.c
-+++ b/libnm-core/tests/test-setting.c
-@@ -3008,27 +3008,27 @@ test_parse_tc_handle (void)
- _parse_tc_handle_inval (" ");
- _parse_tc_handle_inval (" \n");
- _parse_tc_handle_valid ("1", 1, 0);
-- _parse_tc_handle_inval(" 1 ");
-+ _parse_tc_handle_valid(" 1 ", 1, 0);
- _parse_tc_handle_valid ("1:", 1, 0);
-- _parse_tc_handle_inval ("1: ");
-+ _parse_tc_handle_valid ("1: ", 1, 0);
- _parse_tc_handle_valid ("1:0", 1, 0);
-- _parse_tc_handle_inval ("1 :0");
-- _parse_tc_handle_inval ("1 \t\n\f\r:0");
-+ _parse_tc_handle_valid ("1 :0", 1, 0);
-+ _parse_tc_handle_valid ("1 \t\n\f\r:0", 1, 0);
- _parse_tc_handle_inval ("1 \t\n\f\r\v:0");
-- _parse_tc_handle_inval (" 1 : 0 ");
-- _parse_tc_handle_valid (" \t\v\n1: 0", 1, 0);
-+ _parse_tc_handle_valid (" 1 : 0 ", 1, 0);
-+ _parse_tc_handle_inval (" \t\v\n1: 0");
- _parse_tc_handle_valid ("1:2", 1, 2);
- _parse_tc_handle_valid ("01:02", 1, 2);
-- _parse_tc_handle_valid ("0x01:0x02", 1, 2);
-+ _parse_tc_handle_inval ("0x01:0x02");
- _parse_tc_handle_valid (" 01: 02", 1, 2);
- _parse_tc_handle_valid ("019: 020", 0x19, 0x20);
- _parse_tc_handle_valid ("FFFF: 020", 0xFFFF, 0x20);
- _parse_tc_handle_valid ("FfFF: ffff", 0xFFFF, 0xFFFF);
- _parse_tc_handle_valid ("FFFF", 0xFFFF, 0);
-- _parse_tc_handle_valid ("0xFFFF", 0xFFFF, 0);
-+ _parse_tc_handle_inval ("0xFFFF");
- _parse_tc_handle_inval ("10000");
- _parse_tc_handle_valid ("\t\n\f\r FFFF", 0xFFFF, 0);
-- _parse_tc_handle_valid ("\t\n\f\r \vFFFF", 0xFFFF, 0);
-+ _parse_tc_handle_inval ("\t\n\f\r \vFFFF");
- }
-
- /*****************************************************************************/
---
-2.21.0
-
-From fde9250cdc664b557a80a517f57929a36597094a Mon Sep 17 00:00:00 2001
-From: Thomas Haller <thaller@redhat.com>
-Date: Wed, 1 May 2019 11:53:13 +0200
-Subject: [PATCH 06/20] libnm: mark NMVariantAttributeSpec pointers as const
-
-This actually allows the compiler/linker to mark the memory as read-only and any
-modification will cause a segmentation fault.
-
-I would also think that it allows the compiler to put the structure directly
-beside the outer constant array (in which this pointer is embedded). That is good
-locality-wise.
-
-(cherry picked from commit 4e3955e6ddf02d5ea32012bd563aa02fece5c0ef)
----
- libnm-core/nm-setting-ip-config.c | 2 +-
- libnm-core/nm-setting-sriov.c | 2 +-
- libnm-core/nm-utils.c | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/libnm-core/nm-setting-ip-config.c b/libnm-core/nm-setting-ip-config.c
-index f362945f41..26fbc8849f 100644
---- a/libnm-core/nm-setting-ip-config.c
-+++ b/libnm-core/nm-setting-ip-config.c
-@@ -1213,7 +1213,7 @@ nm_ip_route_set_attribute (NMIPRoute *route, const char *name, GVariant *value)
- }
-
- #define ATTR_SPEC_PTR(name, type, v4, v6, str_type) \
-- &(NMVariantAttributeSpec) { name, type, v4, v6, FALSE, FALSE, str_type }
-+ &((const NMVariantAttributeSpec) { name, type, v4, v6, FALSE, FALSE, str_type })
-
- static const NMVariantAttributeSpec * const ip_route_attribute_spec[] = {
- ATTR_SPEC_PTR (NM_IP_ROUTE_ATTRIBUTE_TABLE, G_VARIANT_TYPE_UINT32, TRUE, TRUE, 0 ),
-diff --git a/libnm-core/nm-setting-sriov.c b/libnm-core/nm-setting-sriov.c
-index b662ca2cf6..9a47d141d2 100644
---- a/libnm-core/nm-setting-sriov.c
-+++ b/libnm-core/nm-setting-sriov.c
-@@ -366,7 +366,7 @@ nm_sriov_vf_get_attribute (const NMSriovVF *vf, const char *name)
- }
-
- #define SRIOV_ATTR_SPEC_PTR(name, type, str_type) \
-- &(NMVariantAttributeSpec) { name, type, FALSE, FALSE, FALSE, FALSE, str_type }
-+ &((const NMVariantAttributeSpec) { name, type, FALSE, FALSE, FALSE, FALSE, str_type })
-
- const NMVariantAttributeSpec * const _nm_sriov_vf_attribute_spec[] = {
- SRIOV_ATTR_SPEC_PTR (NM_SRIOV_VF_ATTRIBUTE_MAC, G_VARIANT_TYPE_STRING, 'm'),
-diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c
-index 7a7c6de114..7df63b83bb 100644
---- a/libnm-core/nm-utils.c
-+++ b/libnm-core/nm-utils.c
-@@ -2319,7 +2319,7 @@ fail:
- }
-
- #define TC_ATTR_SPEC_PTR(name, type, no_value, consumes_rest, str_type) \
-- &(NMVariantAttributeSpec) { name, type, FALSE, FALSE, no_value, consumes_rest, str_type }
-+ &((const NMVariantAttributeSpec) { name, type, FALSE, FALSE, no_value, consumes_rest, str_type })
-
- static const NMVariantAttributeSpec * const tc_object_attribute_spec[] = {
- TC_ATTR_SPEC_PTR ("root", G_VARIANT_TYPE_BOOLEAN, TRUE, FALSE, 0 ),
---
-2.21.0
-
-From 38cf36022ef0bb678daf4d2e70da82c96185b310 Mon Sep 17 00:00:00 2001
-From: Thomas Haller <thaller@redhat.com>
-Date: Wed, 1 May 2019 11:56:29 +0200
-Subject: [PATCH 07/20] libnm: use macro and designated initializers for
- NMVariantAttributeSpec
-
-I think initializing structs should (almost) be always done with designated
-initializers, because otherwise it's easy to get the order wrong. The
-problem is that otherwise the order of fields gets additional meaning
-not only for the memory layout, but also for the code that initialize
-the structs.
-
-Add a macro NM_VARIANT_ATTRIBUTE_SPEC_DEFINE() that replaces the other
-(duplicate) macros. This macro also gets it right to mark the struct as
-const.
-
-(cherry picked from commit 86dc50d4760b77f30f3d29c5fa46ea32b06d73f8)
----
- libnm-core/nm-setting-ip-config.c | 35 ++++++++--------
- libnm-core/nm-setting-sriov.c | 17 ++++----
- libnm-core/nm-utils-private.h | 7 ++++
- libnm-core/nm-utils.c | 67 +++++++++++++++----------------
- 4 files changed, 62 insertions(+), 64 deletions(-)
-
-diff --git a/libnm-core/nm-setting-ip-config.c b/libnm-core/nm-setting-ip-config.c
-index 26fbc8849f..375c309dd6 100644
---- a/libnm-core/nm-setting-ip-config.c
-+++ b/libnm-core/nm-setting-ip-config.c
-@@ -1212,25 +1212,22 @@ nm_ip_route_set_attribute (NMIPRoute *route, const char *name, GVariant *value)
- g_hash_table_remove (route->attributes, name);
- }
-
--#define ATTR_SPEC_PTR(name, type, v4, v6, str_type) \
-- &((const NMVariantAttributeSpec) { name, type, v4, v6, FALSE, FALSE, str_type })
--
--static const NMVariantAttributeSpec * const ip_route_attribute_spec[] = {
-- ATTR_SPEC_PTR (NM_IP_ROUTE_ATTRIBUTE_TABLE, G_VARIANT_TYPE_UINT32, TRUE, TRUE, 0 ),
-- ATTR_SPEC_PTR (NM_IP_ROUTE_ATTRIBUTE_SRC, G_VARIANT_TYPE_STRING, TRUE, TRUE, 'a'),
-- ATTR_SPEC_PTR (NM_IP_ROUTE_ATTRIBUTE_FROM, G_VARIANT_TYPE_STRING, FALSE, TRUE, 'p'),
-- ATTR_SPEC_PTR (NM_IP_ROUTE_ATTRIBUTE_TOS, G_VARIANT_TYPE_BYTE, TRUE, FALSE, 0 ),
-- ATTR_SPEC_PTR (NM_IP_ROUTE_ATTRIBUTE_ONLINK, G_VARIANT_TYPE_BOOLEAN, TRUE, TRUE, 0 ),
-- ATTR_SPEC_PTR (NM_IP_ROUTE_ATTRIBUTE_WINDOW, G_VARIANT_TYPE_UINT32, TRUE, TRUE, 0 ),
-- ATTR_SPEC_PTR (NM_IP_ROUTE_ATTRIBUTE_CWND, G_VARIANT_TYPE_UINT32, TRUE, TRUE, 0 ),
-- ATTR_SPEC_PTR (NM_IP_ROUTE_ATTRIBUTE_INITCWND, G_VARIANT_TYPE_UINT32, TRUE, TRUE, 0 ),
-- ATTR_SPEC_PTR (NM_IP_ROUTE_ATTRIBUTE_INITRWND, G_VARIANT_TYPE_UINT32, TRUE, TRUE, 0 ),
-- ATTR_SPEC_PTR (NM_IP_ROUTE_ATTRIBUTE_MTU, G_VARIANT_TYPE_UINT32, TRUE, TRUE, 0 ),
-- ATTR_SPEC_PTR (NM_IP_ROUTE_ATTRIBUTE_LOCK_WINDOW, G_VARIANT_TYPE_BOOLEAN, TRUE, TRUE, 0 ),
-- ATTR_SPEC_PTR (NM_IP_ROUTE_ATTRIBUTE_LOCK_CWND, G_VARIANT_TYPE_BOOLEAN, TRUE, TRUE, 0 ),
-- ATTR_SPEC_PTR (NM_IP_ROUTE_ATTRIBUTE_LOCK_INITCWND, G_VARIANT_TYPE_BOOLEAN, TRUE, TRUE, 0 ),
-- ATTR_SPEC_PTR (NM_IP_ROUTE_ATTRIBUTE_LOCK_INITRWND, G_VARIANT_TYPE_BOOLEAN, TRUE, TRUE, 0 ),
-- ATTR_SPEC_PTR (NM_IP_ROUTE_ATTRIBUTE_LOCK_MTU, G_VARIANT_TYPE_BOOLEAN, TRUE, TRUE, 0 ),
-+static const NMVariantAttributeSpec *const ip_route_attribute_spec[] = {
-+ NM_VARIANT_ATTRIBUTE_SPEC_DEFINE (NM_IP_ROUTE_ATTRIBUTE_TABLE, G_VARIANT_TYPE_UINT32, .v4 = TRUE, .v6 = TRUE, ),
-+ NM_VARIANT_ATTRIBUTE_SPEC_DEFINE (NM_IP_ROUTE_ATTRIBUTE_SRC, G_VARIANT_TYPE_STRING, .v4 = TRUE, .v6 = TRUE, .str_type = 'a', ),
-+ NM_VARIANT_ATTRIBUTE_SPEC_DEFINE (NM_IP_ROUTE_ATTRIBUTE_FROM, G_VARIANT_TYPE_STRING, .v6 = TRUE, .str_type = 'p', ),
-+ NM_VARIANT_ATTRIBUTE_SPEC_DEFINE (NM_IP_ROUTE_ATTRIBUTE_TOS, G_VARIANT_TYPE_BYTE, .v4 = TRUE, ),
-+ NM_VARIANT_ATTRIBUTE_SPEC_DEFINE (NM_IP_ROUTE_ATTRIBUTE_ONLINK, G_VARIANT_TYPE_BOOLEAN, .v4 = TRUE, .v6 = TRUE, ),
-+ NM_VARIANT_ATTRIBUTE_SPEC_DEFINE (NM_IP_ROUTE_ATTRIBUTE_WINDOW, G_VARIANT_TYPE_UINT32, .v4 = TRUE, .v6 = TRUE, ),
-+ NM_VARIANT_ATTRIBUTE_SPEC_DEFINE (NM_IP_ROUTE_ATTRIBUTE_CWND, G_VARIANT_TYPE_UINT32, .v4 = TRUE, .v6 = TRUE, ),
-+ NM_VARIANT_ATTRIBUTE_SPEC_DEFINE (NM_IP_ROUTE_ATTRIBUTE_INITCWND, G_VARIANT_TYPE_UINT32, .v4 = TRUE, .v6 = TRUE, ),
-+ NM_VARIANT_ATTRIBUTE_SPEC_DEFINE (NM_IP_ROUTE_ATTRIBUTE_INITRWND, G_VARIANT_TYPE_UINT32, .v4 = TRUE, .v6 = TRUE, ),
-+ NM_VARIANT_ATTRIBUTE_SPEC_DEFINE (NM_IP_ROUTE_ATTRIBUTE_MTU, G_VARIANT_TYPE_UINT32, .v4 = TRUE, .v6 = TRUE, ),
-+ NM_VARIANT_ATTRIBUTE_SPEC_DEFINE (NM_IP_ROUTE_ATTRIBUTE_LOCK_WINDOW, G_VARIANT_TYPE_BOOLEAN, .v4 = TRUE, .v6 = TRUE, ),
-+ NM_VARIANT_ATTRIBUTE_SPEC_DEFINE (NM_IP_ROUTE_ATTRIBUTE_LOCK_CWND, G_VARIANT_TYPE_BOOLEAN, .v4 = TRUE, .v6 = TRUE, ),
-+ NM_VARIANT_ATTRIBUTE_SPEC_DEFINE (NM_IP_ROUTE_ATTRIBUTE_LOCK_INITCWND, G_VARIANT_TYPE_BOOLEAN, .v4 = TRUE, .v6 = TRUE, ),
-+ NM_VARIANT_ATTRIBUTE_SPEC_DEFINE (NM_IP_ROUTE_ATTRIBUTE_LOCK_INITRWND, G_VARIANT_TYPE_BOOLEAN, .v4 = TRUE, .v6 = TRUE, ),
-+ NM_VARIANT_ATTRIBUTE_SPEC_DEFINE (NM_IP_ROUTE_ATTRIBUTE_LOCK_MTU, G_VARIANT_TYPE_BOOLEAN, .v4 = TRUE, .v6 = TRUE, ),
- NULL,
- };
-
-diff --git a/libnm-core/nm-setting-sriov.c b/libnm-core/nm-setting-sriov.c
-index 9a47d141d2..0625331e3f 100644
---- a/libnm-core/nm-setting-sriov.c
-+++ b/libnm-core/nm-setting-sriov.c
-@@ -365,17 +365,14 @@ nm_sriov_vf_get_attribute (const NMSriovVF *vf, const char *name)
- return g_hash_table_lookup (vf->attributes, name);
- }
-
--#define SRIOV_ATTR_SPEC_PTR(name, type, str_type) \
-- &((const NMVariantAttributeSpec) { name, type, FALSE, FALSE, FALSE, FALSE, str_type })
--
--const NMVariantAttributeSpec * const _nm_sriov_vf_attribute_spec[] = {
-- SRIOV_ATTR_SPEC_PTR (NM_SRIOV_VF_ATTRIBUTE_MAC, G_VARIANT_TYPE_STRING, 'm'),
-- SRIOV_ATTR_SPEC_PTR (NM_SRIOV_VF_ATTRIBUTE_SPOOF_CHECK, G_VARIANT_TYPE_BOOLEAN, 0),
-- SRIOV_ATTR_SPEC_PTR (NM_SRIOV_VF_ATTRIBUTE_TRUST, G_VARIANT_TYPE_BOOLEAN, 0),
-- SRIOV_ATTR_SPEC_PTR (NM_SRIOV_VF_ATTRIBUTE_MIN_TX_RATE, G_VARIANT_TYPE_UINT32, 0),
-- SRIOV_ATTR_SPEC_PTR (NM_SRIOV_VF_ATTRIBUTE_MAX_TX_RATE, G_VARIANT_TYPE_UINT32, 0),
-+const NMVariantAttributeSpec *const _nm_sriov_vf_attribute_spec[] = {
-+ NM_VARIANT_ATTRIBUTE_SPEC_DEFINE (NM_SRIOV_VF_ATTRIBUTE_MAC, G_VARIANT_TYPE_STRING, .str_type = 'm', ),
-+ NM_VARIANT_ATTRIBUTE_SPEC_DEFINE (NM_SRIOV_VF_ATTRIBUTE_SPOOF_CHECK, G_VARIANT_TYPE_BOOLEAN, ),
-+ NM_VARIANT_ATTRIBUTE_SPEC_DEFINE (NM_SRIOV_VF_ATTRIBUTE_TRUST, G_VARIANT_TYPE_BOOLEAN, ),
-+ NM_VARIANT_ATTRIBUTE_SPEC_DEFINE (NM_SRIOV_VF_ATTRIBUTE_MIN_TX_RATE, G_VARIANT_TYPE_UINT32, ),
-+ NM_VARIANT_ATTRIBUTE_SPEC_DEFINE (NM_SRIOV_VF_ATTRIBUTE_MAX_TX_RATE, G_VARIANT_TYPE_UINT32, ),
- /* D-Bus only, synthetic attributes */
-- SRIOV_ATTR_SPEC_PTR ("vlans", G_VARIANT_TYPE_STRING, 'd'),
-+ NM_VARIANT_ATTRIBUTE_SPEC_DEFINE ("vlans", G_VARIANT_TYPE_STRING, .str_type = 'd', ),
- NULL,
- };
-
-diff --git a/libnm-core/nm-utils-private.h b/libnm-core/nm-utils-private.h
-index a1a1369a39..1b9b888773 100644
---- a/libnm-core/nm-utils-private.h
-+++ b/libnm-core/nm-utils-private.h
-@@ -38,6 +38,13 @@ struct _NMVariantAttributeSpec {
- char str_type;
- };
-
-+#define NM_VARIANT_ATTRIBUTE_SPEC_DEFINE(_name, _type, ...) \
-+ (&((const NMVariantAttributeSpec) { \
-+ .name = _name, \
-+ .type = _type, \
-+ __VA_ARGS__ \
-+ }))
-+
- gboolean _nm_utils_string_slist_validate (GSList *list,
- const char **valid_values);
-
-diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c
-index 7df63b83bb..7cf482d3de 100644
---- a/libnm-core/nm-utils.c
-+++ b/libnm-core/nm-utils.c
-@@ -2318,33 +2318,30 @@ fail:
- return TC_H_UNSPEC;
- }
-
--#define TC_ATTR_SPEC_PTR(name, type, no_value, consumes_rest, str_type) \
-- &((const NMVariantAttributeSpec) { name, type, FALSE, FALSE, no_value, consumes_rest, str_type })
--
--static const NMVariantAttributeSpec * const tc_object_attribute_spec[] = {
-- TC_ATTR_SPEC_PTR ("root", G_VARIANT_TYPE_BOOLEAN, TRUE, FALSE, 0 ),
-- TC_ATTR_SPEC_PTR ("parent", G_VARIANT_TYPE_STRING, FALSE, FALSE, 'a' ),
-- TC_ATTR_SPEC_PTR ("handle", G_VARIANT_TYPE_STRING, FALSE, FALSE, 'a' ),
-- TC_ATTR_SPEC_PTR ("kind", G_VARIANT_TYPE_STRING, TRUE, FALSE, 'a' ),
-- TC_ATTR_SPEC_PTR ("", G_VARIANT_TYPE_STRING, TRUE, TRUE, 'a' ),
-+static const NMVariantAttributeSpec *const tc_object_attribute_spec[] = {
-+ NM_VARIANT_ATTRIBUTE_SPEC_DEFINE ("root", G_VARIANT_TYPE_BOOLEAN, .no_value = TRUE, ),
-+ NM_VARIANT_ATTRIBUTE_SPEC_DEFINE ("parent", G_VARIANT_TYPE_STRING, .str_type = 'a', ),
-+ NM_VARIANT_ATTRIBUTE_SPEC_DEFINE ("handle", G_VARIANT_TYPE_STRING, .str_type = 'a', ),
-+ NM_VARIANT_ATTRIBUTE_SPEC_DEFINE ("kind", G_VARIANT_TYPE_STRING, .no_value = TRUE, .str_type = 'a', ),
-+ NM_VARIANT_ATTRIBUTE_SPEC_DEFINE ("", G_VARIANT_TYPE_STRING, .no_value = TRUE, .consumes_rest = TRUE, .str_type = 'a', ),
- NULL,
- };
-
--static const NMVariantAttributeSpec * const tc_qdisc_fq_codel_spec[] = {
-- TC_ATTR_SPEC_PTR ("limit", G_VARIANT_TYPE_UINT32, FALSE, FALSE, 0 ),
-- TC_ATTR_SPEC_PTR ("flows", G_VARIANT_TYPE_UINT32, FALSE, FALSE, 0 ),
-- TC_ATTR_SPEC_PTR ("target", G_VARIANT_TYPE_UINT32, FALSE, FALSE, 0 ),
-- TC_ATTR_SPEC_PTR ("interval", G_VARIANT_TYPE_UINT32, FALSE, FALSE, 0 ),
-- TC_ATTR_SPEC_PTR ("quantum", G_VARIANT_TYPE_UINT32, FALSE, FALSE, 0 ),
-- TC_ATTR_SPEC_PTR ("ce_threshold", G_VARIANT_TYPE_UINT32, FALSE, FALSE, 0 ),
-- TC_ATTR_SPEC_PTR ("memory", G_VARIANT_TYPE_UINT32, FALSE, FALSE, 0 ),
-- TC_ATTR_SPEC_PTR ("ecn", G_VARIANT_TYPE_BOOLEAN, TRUE, FALSE, 0 ),
-+static const NMVariantAttributeSpec *const tc_qdisc_fq_codel_spec[] = {
-+ NM_VARIANT_ATTRIBUTE_SPEC_DEFINE ("limit", G_VARIANT_TYPE_UINT32, ),
-+ NM_VARIANT_ATTRIBUTE_SPEC_DEFINE ("flows", G_VARIANT_TYPE_UINT32, ),
-+ NM_VARIANT_ATTRIBUTE_SPEC_DEFINE ("target", G_VARIANT_TYPE_UINT32, ),
-+ NM_VARIANT_ATTRIBUTE_SPEC_DEFINE ("interval", G_VARIANT_TYPE_UINT32, ),
-+ NM_VARIANT_ATTRIBUTE_SPEC_DEFINE ("quantum", G_VARIANT_TYPE_UINT32, ),
-+ NM_VARIANT_ATTRIBUTE_SPEC_DEFINE ("ce_threshold", G_VARIANT_TYPE_UINT32, ),
-+ NM_VARIANT_ATTRIBUTE_SPEC_DEFINE ("memory", G_VARIANT_TYPE_UINT32, ),
-+ NM_VARIANT_ATTRIBUTE_SPEC_DEFINE ("ecn", G_VARIANT_TYPE_BOOLEAN, .no_value = TRUE, ),
- NULL,
- };
-
- typedef struct {
- const char *kind;
-- const NMVariantAttributeSpec * const *attrs;
-+ const NMVariantAttributeSpec *const *attrs;
- } NMQdiscAttributeSpec;
-
- static const NMQdiscAttributeSpec *const tc_qdisc_attribute_spec[] = {
-@@ -2558,23 +2555,23 @@ nm_utils_tc_qdisc_from_str (const char *str, GError **error)
-
- /*****************************************************************************/
-
--static const NMVariantAttributeSpec * const tc_action_simple_attribute_spec[] = {
-- TC_ATTR_SPEC_PTR ("sdata", G_VARIANT_TYPE_BYTESTRING, FALSE, FALSE, 0 ),
-+static const NMVariantAttributeSpec *const tc_action_simple_attribute_spec[] = {
-+ NM_VARIANT_ATTRIBUTE_SPEC_DEFINE ("sdata", G_VARIANT_TYPE_BYTESTRING, ),
- NULL,
- };
-
--static const NMVariantAttributeSpec * const tc_action_mirred_attribute_spec[] = {
-- TC_ATTR_SPEC_PTR ("egress", G_VARIANT_TYPE_BOOLEAN, TRUE, FALSE, 0 ),
-- TC_ATTR_SPEC_PTR ("ingress", G_VARIANT_TYPE_BOOLEAN, TRUE, FALSE, 0 ),
-- TC_ATTR_SPEC_PTR ("mirror", G_VARIANT_TYPE_BOOLEAN, TRUE, FALSE, 0 ),
-- TC_ATTR_SPEC_PTR ("redirect", G_VARIANT_TYPE_BOOLEAN, TRUE, FALSE, 0 ),
-- TC_ATTR_SPEC_PTR ("dev", G_VARIANT_TYPE_STRING, TRUE, FALSE, 'a' ),
-+static const NMVariantAttributeSpec *const tc_action_mirred_attribute_spec[] = {
-+ NM_VARIANT_ATTRIBUTE_SPEC_DEFINE ("egress", G_VARIANT_TYPE_BOOLEAN, .no_value = TRUE, ),
-+ NM_VARIANT_ATTRIBUTE_SPEC_DEFINE ("ingress", G_VARIANT_TYPE_BOOLEAN, .no_value = TRUE, ),
-+ NM_VARIANT_ATTRIBUTE_SPEC_DEFINE ("mirror", G_VARIANT_TYPE_BOOLEAN, .no_value = TRUE, ),
-+ NM_VARIANT_ATTRIBUTE_SPEC_DEFINE ("redirect", G_VARIANT_TYPE_BOOLEAN, .no_value = TRUE, ),
-+ NM_VARIANT_ATTRIBUTE_SPEC_DEFINE ("dev", G_VARIANT_TYPE_STRING, .no_value = TRUE, .str_type = 'a', ),
- NULL,
- };
-
--static const NMVariantAttributeSpec * const tc_action_attribute_spec[] = {
-- TC_ATTR_SPEC_PTR ("kind", G_VARIANT_TYPE_STRING, TRUE, FALSE, 'a' ),
-- TC_ATTR_SPEC_PTR ("", G_VARIANT_TYPE_STRING, TRUE, TRUE, 'a' ),
-+static const NMVariantAttributeSpec *const tc_action_attribute_spec[] = {
-+ NM_VARIANT_ATTRIBUTE_SPEC_DEFINE ("kind", G_VARIANT_TYPE_STRING, .no_value = TRUE, .str_type = 'a', ),
-+ NM_VARIANT_ATTRIBUTE_SPEC_DEFINE ("", G_VARIANT_TYPE_STRING, .no_value = TRUE, .consumes_rest = TRUE, .str_type = 'a', ),
- NULL,
- };
-
-@@ -2643,7 +2640,7 @@ nm_utils_tc_action_from_str (const char *str, GError **error)
- gs_unref_hashtable GHashTable *ht = NULL;
- gs_unref_hashtable GHashTable *options = NULL;
- GVariant *variant;
-- const NMVariantAttributeSpec * const *attrs;
-+ const NMVariantAttributeSpec *const *attrs;
-
- nm_assert (str);
- nm_assert (!error || !*error);
-@@ -2771,9 +2768,9 @@ nm_utils_tc_tfilter_to_str (NMTCTfilter *tfilter, GError **error)
- return g_string_free (string, FALSE);
- }
-
--static const NMVariantAttributeSpec * const tc_tfilter_attribute_spec[] = {
-- TC_ATTR_SPEC_PTR ("action", G_VARIANT_TYPE_BOOLEAN, TRUE, FALSE, 0 ),
-- TC_ATTR_SPEC_PTR ("", G_VARIANT_TYPE_STRING, TRUE, TRUE, 'a' ),
-+static const NMVariantAttributeSpec *const tc_tfilter_attribute_spec[] = {
-+ NM_VARIANT_ATTRIBUTE_SPEC_DEFINE ("action", G_VARIANT_TYPE_BOOLEAN, .no_value = TRUE, ),
-+ NM_VARIANT_ATTRIBUTE_SPEC_DEFINE ("", G_VARIANT_TYPE_STRING, .no_value = TRUE, .consumes_rest = TRUE, .str_type = 'a', ),
- NULL,
- };
-
-@@ -6460,7 +6457,7 @@ nm_utils_parse_variant_attributes (const char *string,
- gs_unref_hashtable GHashTable *ht = NULL;
- const char *ptr = string, *start = NULL, *sep;
- GVariant *variant;
-- const NMVariantAttributeSpec * const *s;
-+ const NMVariantAttributeSpec *const *s;
-
- g_return_val_if_fail (string, NULL);
- g_return_val_if_fail (attr_separator, NULL);
---
-2.21.0
-
-From 73fdcd38f16eb759de395de8680c994a742fbe1c Mon Sep 17 00:00:00 2001
-From: Thomas Haller <thaller@redhat.com>
-Date: Wed, 1 May 2019 08:52:54 +0200
-Subject: [PATCH 08/20] device: fix type of loop variable in tc_commit()
-
-nqdiscs and ntfilters are unsigned integers. The loop variable must agree in
-range and signedness.
-
-(cherry picked from commit 438855e915c328867b7802b14ebef47d7f946ca8)
----
- src/devices/nm-device.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
-index ea6ad7e2ad..e07798094f 100644
---- a/src/devices/nm-device.c
-+++ b/src/devices/nm-device.c
-@@ -6496,7 +6496,7 @@ tc_commit (NMDevice *self)
- NMSettingTCConfig *s_tc = NULL;
- int ip_ifindex;
- guint nqdiscs, ntfilters;
-- int i;
-+ guint i;
-
- connection = nm_device_get_applied_connection (self);
- if (connection)
---
-2.21.0
-
-From 366d3af00960803c973a307a6bd7ffeedd9c1520 Mon Sep 17 00:00:00 2001
-From: Thomas Haller <thaller@redhat.com>
-Date: Wed, 1 May 2019 08:10:47 +0200
-Subject: [PATCH 09/20] platform: use NM_CMP_FIELD_UNSAFE() for comparing
- bitfield in nm_platform_qdisc_cmp()
-
-"NM_CMP_FIELD (a, b, fq_codel.ecn == TRUE)" is quite a hack as it relies on
-the implementation of the macro in a particular way. The problem is, that
-NM_CMP_FIELD() uses typeof() which cannot be used with bitfields. So, the
-nicer solution is to use NM_CMP_FIELD_UNSAFE() which exists exactly for bitfields
-(it's "unsafe", because it evaluates arguments more than once as it avoids
-the temporary variable with typeof()).
-
-Same with nm_hash_update_vals() which uses typeof() to avoid evaluating
-arguments more than once. But that again does not work with bitfields.
-The "proper" way is to use NM_HASH_COMBINE_BOOLS().
-
-(cherry picked from commit 47d8bee1130c619a41fe64753d88d88012f9fb98)
----
- src/platform/nm-platform.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c
-index 6f23ddb589..f8cf0b8999 100644
---- a/src/platform/nm-platform.c
-+++ b/src/platform/nm-platform.c
-@@ -6480,7 +6480,8 @@ nm_platform_qdisc_hash_update (const NMPlatformQdisc *obj, NMHashState *h)
- obj->fq_codel.quantum,
- obj->fq_codel.ce_threshold,
- obj->fq_codel.memory,
-- obj->fq_codel.ecn == TRUE);
-+ NM_HASH_COMBINE_BOOLS (guint8,
-+ obj->fq_codel.ecn));
- }
- }
-
-@@ -6503,7 +6504,7 @@ nm_platform_qdisc_cmp (const NMPlatformQdisc *a, const NMPlatformQdisc *b)
- NM_CMP_FIELD (a, b, fq_codel.quantum);
- NM_CMP_FIELD (a, b, fq_codel.ce_threshold);
- NM_CMP_FIELD (a, b, fq_codel.memory);
-- NM_CMP_FIELD (a, b, fq_codel.ecn == TRUE);
-+ NM_CMP_FIELD_UNSAFE (a, b, fq_codel.ecn);
- }
-
- return 0;
---
-2.21.0
-
-From ef2b660bb8cb2c30faf55c51a411e8a757707076 Mon Sep 17 00:00:00 2001
-From: Thomas Haller <thaller@redhat.com>
-Date: Wed, 1 May 2019 08:20:42 +0200
-Subject: [PATCH 10/20] platform: use u32 netlink type for TCA_FQ_CODEL_ECN
-
-In practice, there is no difference when representing 0 or 1 as signed/unsigned 32
-bit integer. But still use the correct type that also kernel uses.
-
-Also, the implicit conversation from uint32 to bool was correct already.
-Still, explicitly convert the uint32 value to boolean in _new_from_nl_qdisc().
-It's no change in behavior.
-
-(cherry picked from commit a1099a1fab661a430fa8e8015369b536c806433e)
----
- src/platform/nm-linux-platform.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c
-index 6064d89eb6..1428778e03 100644
---- a/src/platform/nm-linux-platform.c
-+++ b/src/platform/nm-linux-platform.c
-@@ -3547,7 +3547,7 @@ _new_from_nl_qdisc (struct nlmsghdr *nlh, gboolean id_only)
- obj->qdisc.fq_codel.memory = nla_get_u32 (options_attr);
- break;
- case TCA_FQ_CODEL_ECN:
-- obj->qdisc.fq_codel.ecn = nla_get_u32 (options_attr);
-+ obj->qdisc.fq_codel.ecn = !!nla_get_u32 (options_attr);
- break;
- }
- }
-@@ -4244,7 +4244,7 @@ _nl_msg_new_qdisc (int nlmsg_type,
- if (qdisc->fq_codel.memory != -1)
- NLA_PUT_U32 (msg, TCA_FQ_CODEL_MEMORY_LIMIT, qdisc->fq_codel.memory);
- if (qdisc->fq_codel.ecn)
-- NLA_PUT_S32 (msg, TCA_FQ_CODEL_ECN, qdisc->fq_codel.ecn);
-+ NLA_PUT_U32 (msg, TCA_FQ_CODEL_ECN, qdisc->fq_codel.ecn);
- }
-
- nla_nest_end (msg, tc_options);
---
-2.21.0
-
-From dd3ca10284f9f7f95b1f313a3aa678f2aef01b3f Mon Sep 17 00:00:00 2001
-From: Thomas Haller <thaller@redhat.com>
-Date: Wed, 1 May 2019 08:23:00 +0200
-Subject: [PATCH 11/20] platform: fix nm_platform_qdisc_to_string()
-
-When using nm_utils_strbuf_*() API, the buffer gets always moved to the current
-end. We must thus remember and return the original start of the buffer.
-
-(cherry picked from commit b658e3da0825cf6e62e0850d3508dde1dd5c1914)
----
- src/platform/nm-platform.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c
-index f8cf0b8999..4d3b61405d 100644
---- a/src/platform/nm-platform.c
-+++ b/src/platform/nm-platform.c
-@@ -6427,10 +6427,13 @@ const char *
- nm_platform_qdisc_to_string (const NMPlatformQdisc *qdisc, char *buf, gsize len)
- {
- char str_dev[TO_STRING_DEV_BUF_SIZE];
-+ const char *buf0;
-
- if (!nm_utils_to_string_buffer_init_null (qdisc, &buf, &len))
- return buf;
-
-+ buf0 = buf;
-+
- nm_utils_strbuf_append (&buf, &len, "%s%s family %u handle %x parent %x info %x",
- qdisc->kind,
- _to_string_dev (NULL, qdisc->ifindex, str_dev, sizeof (str_dev)),
-@@ -6458,7 +6461,7 @@ nm_platform_qdisc_to_string (const NMPlatformQdisc *qdisc, char *buf, gsize len)
- nm_utils_strbuf_append (&buf, &len, " ecn");
- }
-
-- return buf;
-+ return buf0;
- }
-
- void
---
-2.21.0
-
-From 509a1bc5f2e52f6d639b75a0467b584c08a90463 Mon Sep 17 00:00:00 2001
-From: Thomas Haller <thaller@redhat.com>
-Date: Wed, 1 May 2019 08:43:31 +0200
-Subject: [PATCH 12/20] platform: fix handling of fq_codel's memory limit
- default value
-
-The memory-limit is an unsigned integer. It is ugly (if not wrong) to compare unsigned
-values with "-1". When comparing with the default value we must also use an u32 type.
-Instead add a define NM_PLATFORM_FQ_CODEL_MEMORY_LIMIT_UNSET.
-
-Note that like iproute2 we treat NM_PLATFORM_FQ_CODEL_MEMORY_LIMIT_UNSET
-to indicate to not set TCA_FQ_CODEL_MEMORY_LIMIT in RTM_NEWQDISC. This
-special value is entirely internal to NetworkManager (or iproute2) and
-kernel will then choose a default memory limit (of 32MB). So setting
-NM_PLATFORM_FQ_CODEL_MEMORY_LIMIT_UNSET means to leave it to kernel to
-choose a value (which then chooses 32MB).
-
-See kernel's net/sched/sch_fq_codel.c:
-
- static int fq_codel_init(struct Qdisc *sch, struct nlattr *opt,
- struct netlink_ext_ack *extack)
- {
- ...
- q->memory_limit = 32 << 20; /* 32 MBytes */
-
- static int fq_codel_change(struct Qdisc *sch, struct nlattr *opt,
- struct netlink_ext_ack *extack)
- ...
- if (tb[TCA_FQ_CODEL_MEMORY_LIMIT])
- q->memory_limit = min(1U << 31, nla_get_u32(tb[TCA_FQ_CODEL_MEMORY_LIMIT]));
-
-Note that not having zero as default value is problematic. In fields like
-"NMPlatformIP4Route.table_coerced" and "NMPlatformRoutingRule.suppress_prefixlen_inverse"
-we avoid this problem by storing a coerced value in the structure so that zero is still
-the default. We don't do that here for memory-limit, so the caller must always explicitly
-set the value.
-
-(cherry picked from commit 46a904389bf13a2cfd40888ab2a843827fda7469)
----
- libnm-core/nm-utils.c | 5 +++++
- src/devices/nm-device.c | 2 +-
- src/platform/nm-linux-platform.c | 5 ++++-
- src/platform/nm-platform.c | 2 +-
- src/platform/nm-platform.h | 9 ++++++++-
- 5 files changed, 19 insertions(+), 4 deletions(-)
-
-diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c
-index 7cf482d3de..2e66e6ae2d 100644
---- a/libnm-core/nm-utils.c
-+++ b/libnm-core/nm-utils.c
-@@ -2334,7 +2334,12 @@ static const NMVariantAttributeSpec *const tc_qdisc_fq_codel_spec[] = {
- NM_VARIANT_ATTRIBUTE_SPEC_DEFINE ("interval", G_VARIANT_TYPE_UINT32, ),
- NM_VARIANT_ATTRIBUTE_SPEC_DEFINE ("quantum", G_VARIANT_TYPE_UINT32, ),
- NM_VARIANT_ATTRIBUTE_SPEC_DEFINE ("ce_threshold", G_VARIANT_TYPE_UINT32, ),
-+
-+ /* kernel clamps the value at 2^31. Possibly such values should be rejected from configuration
-+ * as they cannot be configured. Leaving the attribute unspecified causes kernel to choose
-+ * a default (currently 32MB). */
- NM_VARIANT_ATTRIBUTE_SPEC_DEFINE ("memory", G_VARIANT_TYPE_UINT32, ),
-+
- NM_VARIANT_ATTRIBUTE_SPEC_DEFINE ("ecn", G_VARIANT_TYPE_BOOLEAN, .no_value = TRUE, ),
- NULL,
- };
-diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
-index e07798094f..ce50d5b73d 100644
---- a/src/devices/nm-device.c
-+++ b/src/devices/nm-device.c
-@@ -6539,7 +6539,7 @@ tc_commit (NMDevice *self)
- GET_ATTR("interval", qdisc->fq_codel.interval, UINT32, uint32, 0);
- GET_ATTR("quantum", qdisc->fq_codel.quantum, UINT32, uint32, 0);
- GET_ATTR("ce_threshold", qdisc->fq_codel.ce_threshold, UINT32, uint32, -1);
-- GET_ATTR("memory", qdisc->fq_codel.memory, UINT32, uint32, -1);
-+ GET_ATTR("memory", qdisc->fq_codel.memory, UINT32, uint32, NM_PLATFORM_FQ_CODEL_MEMORY_LIMIT_UNSET);
- GET_ATTR("ecn", qdisc->fq_codel.ecn, BOOLEAN, boolean, FALSE);
- }
-
-diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c
-index 1428778e03..cec5fb9431 100644
---- a/src/platform/nm-linux-platform.c
-+++ b/src/platform/nm-linux-platform.c
-@@ -3515,6 +3515,9 @@ _new_from_nl_qdisc (struct nlmsghdr *nlh, gboolean id_only)
- obj->qdisc.parent = tcm->tcm_parent;
- obj->qdisc.info = tcm->tcm_info;
-
-+ if (nm_streq0 (obj->qdisc.kind, "fq_codel"))
-+ obj->qdisc.fq_codel.memory = NM_PLATFORM_FQ_CODEL_MEMORY_LIMIT_UNSET;
-+
- if (tb[TCA_OPTIONS]) {
- struct nlattr *options_attr;
- int remaining;
-@@ -4241,7 +4244,7 @@ _nl_msg_new_qdisc (int nlmsg_type,
- NLA_PUT_U32 (msg, TCA_FQ_CODEL_QUANTUM, qdisc->fq_codel.quantum);
- if (qdisc->fq_codel.ce_threshold != -1)
- NLA_PUT_U32 (msg, TCA_FQ_CODEL_CE_THRESHOLD, qdisc->fq_codel.ce_threshold);
-- if (qdisc->fq_codel.memory != -1)
-+ if (qdisc->fq_codel.memory != NM_PLATFORM_FQ_CODEL_MEMORY_LIMIT_UNSET)
- NLA_PUT_U32 (msg, TCA_FQ_CODEL_MEMORY_LIMIT, qdisc->fq_codel.memory);
- if (qdisc->fq_codel.ecn)
- NLA_PUT_U32 (msg, TCA_FQ_CODEL_ECN, qdisc->fq_codel.ecn);
-diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c
-index 4d3b61405d..fc49db19a1 100644
---- a/src/platform/nm-platform.c
-+++ b/src/platform/nm-platform.c
-@@ -6455,7 +6455,7 @@ nm_platform_qdisc_to_string (const NMPlatformQdisc *qdisc, char *buf, gsize len)
- nm_utils_strbuf_append (&buf, &len, " quantum %u", qdisc->fq_codel.quantum);
- if (qdisc->fq_codel.ce_threshold != -1)
- nm_utils_strbuf_append (&buf, &len, " ce_threshold %u", qdisc->fq_codel.ce_threshold);
-- if (qdisc->fq_codel.memory != -1)
-+ if (qdisc->fq_codel.memory != NM_PLATFORM_FQ_CODEL_MEMORY_LIMIT_UNSET)
- nm_utils_strbuf_append (&buf, &len, " memory %u", qdisc->fq_codel.memory);
- if (qdisc->fq_codel.ecn)
- nm_utils_strbuf_append (&buf, &len, " ecn");
-diff --git a/src/platform/nm-platform.h b/src/platform/nm-platform.h
-index 16747f093b..9f9fcf5c31 100644
---- a/src/platform/nm-platform.h
-+++ b/src/platform/nm-platform.h
-@@ -596,6 +596,8 @@ typedef struct {
- bool uid_range_has:1; /* has(FRA_UID_RANGE) */
- } NMPlatformRoutingRule;
-
-+#define NM_PLATFORM_FQ_CODEL_MEMORY_LIMIT_UNSET (~((guint32) 0))
-+
- typedef struct {
- guint32 limit;
- guint32 flows;
-@@ -603,7 +605,12 @@ typedef struct {
- guint32 interval;
- guint32 quantum;
- guint32 ce_threshold;
-- guint32 memory;
-+ guint32 memory; /* TCA_FQ_CODEL_MEMORY_LIMIT: note that only values <= 2^31 are accepted by kernel
-+ * and kernel defaults to 32MB.
-+ * Note that we use the special value NM_PLATFORM_FQ_CODEL_MEMORY_LIMIT_UNSET
-+ * to indicate that no explicit limit is set (when we send a RTM_NEWQDISC request).
-+ * This will cause kernel to choose the default (32MB).
-+ * Beware: zero is not the default you must always explicitly set this value. */
- bool ecn:1;
- } NMPlatformQdiscFqCodel;
-
---
-2.21.0
-
-From 859f8479d453c9270987245b9d6e537af0e42077 Mon Sep 17 00:00:00 2001
-From: Thomas Haller <thaller@redhat.com>
-Date: Wed, 1 May 2019 09:19:59 +0200
-Subject: [PATCH 13/20] platform: fix handling of default value for
- TCA_FQ_CODEL_CE_THRESHOLD
-
-iproute2 uses the special value ~0u to indicate not to set
-TCA_FQ_CODEL_CE_THRESHOLD in RTM_NEWQDISC. When not explicitly
-setting the value, kernel treats the threshold as disabled.
-
-However note that 0xFFFFFFFFu is not an invalid threshold (as far as
-kernel is concerned). Thus, we should not use that as value to indicate
-that the value is unset. Note that iproute2 uses the special value ~0u
-only internally thereby making it impossible to set the threshold to
-0xFFFFFFFFu). But kernel does not have this limitation.
-
-Maybe the cleanest way would be to add another field to NMPlatformQDisc:
-
- guint32 ce_threshold;
- bool ce_threshold_set:1;
-
-that indicates whether the threshold is enable or not.
-But note that kernel does:
-
- static void codel_params_init(struct codel_params *params)
- {
- ...
- params->ce_threshold = CODEL_DISABLED_THRESHOLD;
-
- static int fq_codel_change(struct Qdisc *sch, struct nlattr *opt,
- struct netlink_ext_ack *extack)
- {
- ...
- if (tb[TCA_FQ_CODEL_CE_THRESHOLD]) {
- u64 val = nla_get_u32(tb[TCA_FQ_CODEL_CE_THRESHOLD]);
-
- q->cparams.ce_threshold = (val * NSEC_PER_USEC) >> CODEL_SHIFT;
- }
-
- static int fq_codel_dump(struct Qdisc *sch, struct sk_buff *skb)
- {
- ...
- if (q->cparams.ce_threshold != CODEL_DISABLED_THRESHOLD &&
- nla_put_u32(skb, TCA_FQ_CODEL_CE_THRESHOLD,
- codel_time_to_us(q->cparams.ce_threshold)))
- goto nla_put_failure;
-
-This means, kernel internally uses the special value 0x83126E97u to indicate
-that the threshold is disabled (WTF). That is because
-
- (((guint64) 0x83126E97u) * NSEC_PER_USEC) >> CODEL_SHIFT == CODEL_DISABLED_THRESHOLD
-
-So in kernel API this value is reserved (and has a special meaning
-to indicate that the threshold is disabled). So, instead of adding a
-ce_threshold_set flag, use the same value that kernel anyway uses.
-
-(cherry picked from commit 973db2d41b957c4ee9d4ee9863f4b35c6890ac30)
----
- libnm-core/nm-utils.c | 3 +++
- src/devices/nm-device.c | 2 +-
- src/platform/nm-linux-platform.c | 6 ++++--
- src/platform/nm-platform.c | 2 +-
- src/platform/nm-platform.h | 12 +++++++++++-
- 5 files changed, 20 insertions(+), 5 deletions(-)
-
-diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c
-index 2e66e6ae2d..9e2eb63594 100644
---- a/libnm-core/nm-utils.c
-+++ b/libnm-core/nm-utils.c
-@@ -2333,6 +2333,9 @@ static const NMVariantAttributeSpec *const tc_qdisc_fq_codel_spec[] = {
- NM_VARIANT_ATTRIBUTE_SPEC_DEFINE ("target", G_VARIANT_TYPE_UINT32, ),
- NM_VARIANT_ATTRIBUTE_SPEC_DEFINE ("interval", G_VARIANT_TYPE_UINT32, ),
- NM_VARIANT_ATTRIBUTE_SPEC_DEFINE ("quantum", G_VARIANT_TYPE_UINT32, ),
-+
-+ /* 0x83126E97u is not a valid value (it means "disabled"). We should reject that
-+ * value. Or alternatively, reject all values >= MAX_INT(32). */
- NM_VARIANT_ATTRIBUTE_SPEC_DEFINE ("ce_threshold", G_VARIANT_TYPE_UINT32, ),
-
- /* kernel clamps the value at 2^31. Possibly such values should be rejected from configuration
-diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
-index ce50d5b73d..22ccabb26e 100644
---- a/src/devices/nm-device.c
-+++ b/src/devices/nm-device.c
-@@ -6538,7 +6538,7 @@ tc_commit (NMDevice *self)
- GET_ATTR("target", qdisc->fq_codel.target, UINT32, uint32, 0);
- GET_ATTR("interval", qdisc->fq_codel.interval, UINT32, uint32, 0);
- GET_ATTR("quantum", qdisc->fq_codel.quantum, UINT32, uint32, 0);
-- GET_ATTR("ce_threshold", qdisc->fq_codel.ce_threshold, UINT32, uint32, -1);
-+ GET_ATTR("ce_threshold", qdisc->fq_codel.ce_threshold, UINT32, uint32, NM_PLATFORM_FQ_CODEL_CE_THRESHOLD_DISABLED);
- GET_ATTR("memory", qdisc->fq_codel.memory, UINT32, uint32, NM_PLATFORM_FQ_CODEL_MEMORY_LIMIT_UNSET);
- GET_ATTR("ecn", qdisc->fq_codel.ecn, BOOLEAN, boolean, FALSE);
- }
-diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c
-index cec5fb9431..2e11052e1a 100644
---- a/src/platform/nm-linux-platform.c
-+++ b/src/platform/nm-linux-platform.c
-@@ -3515,8 +3515,10 @@ _new_from_nl_qdisc (struct nlmsghdr *nlh, gboolean id_only)
- obj->qdisc.parent = tcm->tcm_parent;
- obj->qdisc.info = tcm->tcm_info;
-
-- if (nm_streq0 (obj->qdisc.kind, "fq_codel"))
-+ if (nm_streq0 (obj->qdisc.kind, "fq_codel")) {
- obj->qdisc.fq_codel.memory = NM_PLATFORM_FQ_CODEL_MEMORY_LIMIT_UNSET;
-+ obj->qdisc.fq_codel.ce_threshold = NM_PLATFORM_FQ_CODEL_CE_THRESHOLD_DISABLED;
-+ }
-
- if (tb[TCA_OPTIONS]) {
- struct nlattr *options_attr;
-@@ -4242,7 +4244,7 @@ _nl_msg_new_qdisc (int nlmsg_type,
- NLA_PUT_U32 (msg, TCA_FQ_CODEL_INTERVAL, qdisc->fq_codel.interval);
- if (qdisc->fq_codel.quantum)
- NLA_PUT_U32 (msg, TCA_FQ_CODEL_QUANTUM, qdisc->fq_codel.quantum);
-- if (qdisc->fq_codel.ce_threshold != -1)
-+ if (qdisc->fq_codel.ce_threshold != NM_PLATFORM_FQ_CODEL_CE_THRESHOLD_DISABLED)
- NLA_PUT_U32 (msg, TCA_FQ_CODEL_CE_THRESHOLD, qdisc->fq_codel.ce_threshold);
- if (qdisc->fq_codel.memory != NM_PLATFORM_FQ_CODEL_MEMORY_LIMIT_UNSET)
- NLA_PUT_U32 (msg, TCA_FQ_CODEL_MEMORY_LIMIT, qdisc->fq_codel.memory);
-diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c
-index fc49db19a1..cbf9eed5c1 100644
---- a/src/platform/nm-platform.c
-+++ b/src/platform/nm-platform.c
-@@ -6453,7 +6453,7 @@ nm_platform_qdisc_to_string (const NMPlatformQdisc *qdisc, char *buf, gsize len)
- nm_utils_strbuf_append (&buf, &len, " interval %u", qdisc->fq_codel.interval);
- if (qdisc->fq_codel.quantum)
- nm_utils_strbuf_append (&buf, &len, " quantum %u", qdisc->fq_codel.quantum);
-- if (qdisc->fq_codel.ce_threshold != -1)
-+ if (qdisc->fq_codel.ce_threshold != NM_PLATFORM_FQ_CODEL_CE_THRESHOLD_DISABLED)
- nm_utils_strbuf_append (&buf, &len, " ce_threshold %u", qdisc->fq_codel.ce_threshold);
- if (qdisc->fq_codel.memory != NM_PLATFORM_FQ_CODEL_MEMORY_LIMIT_UNSET)
- nm_utils_strbuf_append (&buf, &len, " memory %u", qdisc->fq_codel.memory);
-diff --git a/src/platform/nm-platform.h b/src/platform/nm-platform.h
-index 9f9fcf5c31..d7c388b1b8 100644
---- a/src/platform/nm-platform.h
-+++ b/src/platform/nm-platform.h
-@@ -598,13 +598,23 @@ typedef struct {
-
- #define NM_PLATFORM_FQ_CODEL_MEMORY_LIMIT_UNSET (~((guint32) 0))
-
-+#define NM_PLATFORM_FQ_CODEL_CE_THRESHOLD_DISABLED ((guint32) 0x83126E97u)
-+
-+G_STATIC_ASSERT (((((guint64) NM_PLATFORM_FQ_CODEL_CE_THRESHOLD_DISABLED) * 1000u) >> 10) == (guint64) INT_MAX);
-+
- typedef struct {
- guint32 limit;
- guint32 flows;
- guint32 target;
- guint32 interval;
- guint32 quantum;
-- guint32 ce_threshold;
-+ guint32 ce_threshold; /* TCA_FQ_CODEL_CE_THRESHOLD: kernel internally stores this value as
-+ * ((val64 * NSEC_PER_USEC) >> CODEL_SHIFT). The default value (in
-+ * the domain with this coersion) is CODEL_DISABLED_THRESHOLD (INT_MAX).
-+ * That means, "disabled" is expressed on RTM_NEWQDISC netlink API by absence of the
-+ * netlink attribute but also as the special value 0x83126E97u
-+ * (NM_PLATFORM_FQ_CODEL_CE_THRESHOLD_DISABLED).
-+ * Beware: zero is not the default you must always explicitly set this value. */
- guint32 memory; /* TCA_FQ_CODEL_MEMORY_LIMIT: note that only values <= 2^31 are accepted by kernel
- * and kernel defaults to 32MB.
- * Note that we use the special value NM_PLATFORM_FQ_CODEL_MEMORY_LIMIT_UNSET
---
-2.21.0
-
-From c17fa82b314d6b3c027240ee3506706e26ef9e5d Mon Sep 17 00:00:00 2001
-From: Thomas Haller <thaller@redhat.com>
-Date: Wed, 1 May 2019 12:56:46 +0200
-Subject: [PATCH 14/20] libnm: rename "memory" parameter of fq_codel QDisc to
- "memory_limit"
-
-Kernel calls the netlink attribute TCA_FQ_CODEL_MEMORY_LIMIT. Likewise,
-iproute2 calls this "memory_limit".
-
-Rename because TC parameters are inherrently tied to the kernel
-implementation and we should use the familiar name.
-
-(cherry picked from commit 666d58802b6f9072825d97498ab74e5d37652e93)
----
- libnm-core/nm-utils.c | 2 +-
- src/devices/nm-device.c | 2 +-
- src/platform/nm-linux-platform.c | 8 ++++----
- src/platform/nm-platform.c | 8 ++++----
- src/platform/nm-platform.h | 2 +-
- 5 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c
-index 9e2eb63594..394ca7c3a7 100644
---- a/libnm-core/nm-utils.c
-+++ b/libnm-core/nm-utils.c
-@@ -2341,7 +2341,7 @@ static const NMVariantAttributeSpec *const tc_qdisc_fq_codel_spec[] = {
- /* kernel clamps the value at 2^31. Possibly such values should be rejected from configuration
- * as they cannot be configured. Leaving the attribute unspecified causes kernel to choose
- * a default (currently 32MB). */
-- NM_VARIANT_ATTRIBUTE_SPEC_DEFINE ("memory", G_VARIANT_TYPE_UINT32, ),
-+ NM_VARIANT_ATTRIBUTE_SPEC_DEFINE ("memory_limit", G_VARIANT_TYPE_UINT32, ),
-
- NM_VARIANT_ATTRIBUTE_SPEC_DEFINE ("ecn", G_VARIANT_TYPE_BOOLEAN, .no_value = TRUE, ),
- NULL,
-diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
-index 22ccabb26e..e2a5fd4bf2 100644
---- a/src/devices/nm-device.c
-+++ b/src/devices/nm-device.c
-@@ -6539,7 +6539,7 @@ tc_commit (NMDevice *self)
- GET_ATTR("interval", qdisc->fq_codel.interval, UINT32, uint32, 0);
- GET_ATTR("quantum", qdisc->fq_codel.quantum, UINT32, uint32, 0);
- GET_ATTR("ce_threshold", qdisc->fq_codel.ce_threshold, UINT32, uint32, NM_PLATFORM_FQ_CODEL_CE_THRESHOLD_DISABLED);
-- GET_ATTR("memory", qdisc->fq_codel.memory, UINT32, uint32, NM_PLATFORM_FQ_CODEL_MEMORY_LIMIT_UNSET);
-+ GET_ATTR("memory_limit", qdisc->fq_codel.memory_limit, UINT32, uint32, NM_PLATFORM_FQ_CODEL_MEMORY_LIMIT_UNSET);
- GET_ATTR("ecn", qdisc->fq_codel.ecn, BOOLEAN, boolean, FALSE);
- }
-
-diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c
-index 2e11052e1a..9721ff9403 100644
---- a/src/platform/nm-linux-platform.c
-+++ b/src/platform/nm-linux-platform.c
-@@ -3516,7 +3516,7 @@ _new_from_nl_qdisc (struct nlmsghdr *nlh, gboolean id_only)
- obj->qdisc.info = tcm->tcm_info;
-
- if (nm_streq0 (obj->qdisc.kind, "fq_codel")) {
-- obj->qdisc.fq_codel.memory = NM_PLATFORM_FQ_CODEL_MEMORY_LIMIT_UNSET;
-+ obj->qdisc.fq_codel.memory_limit = NM_PLATFORM_FQ_CODEL_MEMORY_LIMIT_UNSET;
- obj->qdisc.fq_codel.ce_threshold = NM_PLATFORM_FQ_CODEL_CE_THRESHOLD_DISABLED;
- }
-
-@@ -3549,7 +3549,7 @@ _new_from_nl_qdisc (struct nlmsghdr *nlh, gboolean id_only)
- obj->qdisc.fq_codel.ce_threshold = nla_get_u32 (options_attr);
- break;
- case TCA_FQ_CODEL_MEMORY_LIMIT:
-- obj->qdisc.fq_codel.memory = nla_get_u32 (options_attr);
-+ obj->qdisc.fq_codel.memory_limit = nla_get_u32 (options_attr);
- break;
- case TCA_FQ_CODEL_ECN:
- obj->qdisc.fq_codel.ecn = !!nla_get_u32 (options_attr);
-@@ -4246,8 +4246,8 @@ _nl_msg_new_qdisc (int nlmsg_type,
- NLA_PUT_U32 (msg, TCA_FQ_CODEL_QUANTUM, qdisc->fq_codel.quantum);
- if (qdisc->fq_codel.ce_threshold != NM_PLATFORM_FQ_CODEL_CE_THRESHOLD_DISABLED)
- NLA_PUT_U32 (msg, TCA_FQ_CODEL_CE_THRESHOLD, qdisc->fq_codel.ce_threshold);
-- if (qdisc->fq_codel.memory != NM_PLATFORM_FQ_CODEL_MEMORY_LIMIT_UNSET)
-- NLA_PUT_U32 (msg, TCA_FQ_CODEL_MEMORY_LIMIT, qdisc->fq_codel.memory);
-+ if (qdisc->fq_codel.memory_limit != NM_PLATFORM_FQ_CODEL_MEMORY_LIMIT_UNSET)
-+ NLA_PUT_U32 (msg, TCA_FQ_CODEL_MEMORY_LIMIT, qdisc->fq_codel.memory_limit);
- if (qdisc->fq_codel.ecn)
- NLA_PUT_U32 (msg, TCA_FQ_CODEL_ECN, qdisc->fq_codel.ecn);
- }
-diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c
-index cbf9eed5c1..ea73f21019 100644
---- a/src/platform/nm-platform.c
-+++ b/src/platform/nm-platform.c
-@@ -6455,8 +6455,8 @@ nm_platform_qdisc_to_string (const NMPlatformQdisc *qdisc, char *buf, gsize len)
- nm_utils_strbuf_append (&buf, &len, " quantum %u", qdisc->fq_codel.quantum);
- if (qdisc->fq_codel.ce_threshold != NM_PLATFORM_FQ_CODEL_CE_THRESHOLD_DISABLED)
- nm_utils_strbuf_append (&buf, &len, " ce_threshold %u", qdisc->fq_codel.ce_threshold);
-- if (qdisc->fq_codel.memory != NM_PLATFORM_FQ_CODEL_MEMORY_LIMIT_UNSET)
-- nm_utils_strbuf_append (&buf, &len, " memory %u", qdisc->fq_codel.memory);
-+ if (qdisc->fq_codel.memory_limit != NM_PLATFORM_FQ_CODEL_MEMORY_LIMIT_UNSET)
-+ nm_utils_strbuf_append (&buf, &len, " memory_limit %u", qdisc->fq_codel.memory_limit);
- if (qdisc->fq_codel.ecn)
- nm_utils_strbuf_append (&buf, &len, " ecn");
- }
-@@ -6482,7 +6482,7 @@ nm_platform_qdisc_hash_update (const NMPlatformQdisc *obj, NMHashState *h)
- obj->fq_codel.interval,
- obj->fq_codel.quantum,
- obj->fq_codel.ce_threshold,
-- obj->fq_codel.memory,
-+ obj->fq_codel.memory_limit,
- NM_HASH_COMBINE_BOOLS (guint8,
- obj->fq_codel.ecn));
- }
-@@ -6506,7 +6506,7 @@ nm_platform_qdisc_cmp (const NMPlatformQdisc *a, const NMPlatformQdisc *b)
- NM_CMP_FIELD (a, b, fq_codel.interval);
- NM_CMP_FIELD (a, b, fq_codel.quantum);
- NM_CMP_FIELD (a, b, fq_codel.ce_threshold);
-- NM_CMP_FIELD (a, b, fq_codel.memory);
-+ NM_CMP_FIELD (a, b, fq_codel.memory_limit);
- NM_CMP_FIELD_UNSAFE (a, b, fq_codel.ecn);
- }
-
-diff --git a/src/platform/nm-platform.h b/src/platform/nm-platform.h
-index d7c388b1b8..5a0efceca7 100644
---- a/src/platform/nm-platform.h
-+++ b/src/platform/nm-platform.h
-@@ -615,7 +615,7 @@ typedef struct {
- * netlink attribute but also as the special value 0x83126E97u
- * (NM_PLATFORM_FQ_CODEL_CE_THRESHOLD_DISABLED).
- * Beware: zero is not the default you must always explicitly set this value. */
-- guint32 memory; /* TCA_FQ_CODEL_MEMORY_LIMIT: note that only values <= 2^31 are accepted by kernel
-+ guint32 memory_limit; /* TCA_FQ_CODEL_MEMORY_LIMIT: note that only values <= 2^31 are accepted by kernel
- * and kernel defaults to 32MB.
- * Note that we use the special value NM_PLATFORM_FQ_CODEL_MEMORY_LIMIT_UNSET
- * to indicate that no explicit limit is set (when we send a RTM_NEWQDISC request).
---
-2.21.0
-
-From 79e3b2a838b1ae7e6174de8ff000509e918d5c90 Mon Sep 17 00:00:00 2001
-From: Thomas Haller <thaller@redhat.com>
-Date: Wed, 1 May 2019 12:58:37 +0200
-Subject: [PATCH 15/20] platform: use bool bitfields in NMPlatformActionMirred
- structure
-
-Arguably, the structure is used inside a union with another (larger)
-struct, hence no memory is saved.
-
-In fact, it may well be slower performance wise to access a boolean bitfield
-than a gboolean (int).
-
-Still, boolean fields in structures should be bool:1 bitfields for
-consistency.
-
-(cherry picked from commit 36d6aa3bcd97f2144e8f435249ed8f3cb709ae43)
----
- src/platform/nm-platform.c | 19 ++++++++++---------
- src/platform/nm-platform.h | 8 ++++----
- 2 files changed, 14 insertions(+), 13 deletions(-)
-
-diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c
-index ea73f21019..ee71319dd6 100644
---- a/src/platform/nm-platform.c
-+++ b/src/platform/nm-platform.c
-@@ -6577,11 +6577,12 @@ nm_platform_tfilter_hash_update (const NMPlatformTfilter *obj, NMHashState *h)
- nm_hash_update_strarr (h, obj->action.simple.sdata);
- } else if (nm_streq (obj->action.kind, NM_PLATFORM_ACTION_KIND_MIRRED)) {
- nm_hash_update_vals (h,
-- obj->action.mirred.ingress,
-- obj->action.mirred.egress,
-- obj->action.mirred.mirror,
-- obj->action.mirred.redirect,
-- obj->action.mirred.ifindex);
-+ obj->action.mirred.ifindex,
-+ NM_HASH_COMBINE_BOOLS (guint8,
-+ obj->action.mirred.ingress,
-+ obj->action.mirred.egress,
-+ obj->action.mirred.mirror,
-+ obj->action.mirred.redirect));
- }
- }
- }
-@@ -6602,11 +6603,11 @@ nm_platform_tfilter_cmp (const NMPlatformTfilter *a, const NMPlatformTfilter *b)
- if (nm_streq (a->action.kind, NM_PLATFORM_ACTION_KIND_SIMPLE)) {
- NM_CMP_FIELD_STR (a, b, action.simple.sdata);
- } else if (nm_streq (a->action.kind, NM_PLATFORM_ACTION_KIND_MIRRED)) {
-- NM_CMP_FIELD (a, b, action.mirred.ingress);
-- NM_CMP_FIELD (a, b, action.mirred.egress);
-- NM_CMP_FIELD (a, b, action.mirred.mirror);
-- NM_CMP_FIELD (a, b, action.mirred.redirect);
- NM_CMP_FIELD (a, b, action.mirred.ifindex);
-+ NM_CMP_FIELD_UNSAFE (a, b, action.mirred.ingress);
-+ NM_CMP_FIELD_UNSAFE (a, b, action.mirred.egress);
-+ NM_CMP_FIELD_UNSAFE (a, b, action.mirred.mirror);
-+ NM_CMP_FIELD_UNSAFE (a, b, action.mirred.redirect);
- }
- }
-
-diff --git a/src/platform/nm-platform.h b/src/platform/nm-platform.h
-index 5a0efceca7..9b6848d977 100644
---- a/src/platform/nm-platform.h
-+++ b/src/platform/nm-platform.h
-@@ -641,11 +641,11 @@ typedef struct {
- } NMPlatformActionSimple;
-
- typedef struct {
-- gboolean egress;
-- gboolean ingress;
-- gboolean mirror;
-- gboolean redirect;
- int ifindex;
-+ bool egress:1;
-+ bool ingress:1;
-+ bool mirror:1;
-+ bool redirect:1;
- } NMPlatformActionMirred;
-
- typedef struct {
---
-2.21.0
-
-From 8b1b398c0545f31121c52d323276e013705ddf80 Mon Sep 17 00:00:00 2001
-From: Thomas Haller <thaller@redhat.com>
-Date: Wed, 1 May 2019 13:07:43 +0200
-Subject: [PATCH 16/20] platform: assert for out-of-memory in netlink code
-
-These lines can be reached if the allocated buffer is too
-small to hold the netlink message. That is actually a bug
-that we need to fix. Assert.
-
-(cherry picked from commit 3784a2a2ec6f8c6307f45bae12c17630b7d70b0a)
----
- src/platform/nm-linux-platform.c | 10 +++++-----
- src/platform/wifi/nm-wifi-utils-nl80211.c | 12 ++++++------
- src/platform/wpan/nm-wpan-utils.c | 8 ++++----
- 3 files changed, 15 insertions(+), 15 deletions(-)
-
-diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c
-index 9721ff9403..6dd5b4ab3e 100644
---- a/src/platform/nm-linux-platform.c
-+++ b/src/platform/nm-linux-platform.c
-@@ -3681,7 +3681,7 @@ _nl_msg_new_link_set_afspec (struct nl_msg *msg,
-
- return TRUE;
- nla_put_failure:
-- return FALSE;
-+ g_return_val_if_reached (FALSE);
- }
-
- static gboolean
-@@ -3832,7 +3832,7 @@ _nl_msg_new_link_set_linkinfo_vlan (struct nl_msg *msg,
-
- return TRUE;
- nla_put_failure:
-- return FALSE;
-+ g_return_val_if_reached (FALSE);
- }
-
- static struct nl_msg *
-@@ -4278,7 +4278,7 @@ _add_action_simple (struct nl_msg *msg,
- return TRUE;
-
- nla_put_failure:
-- return FALSE;
-+ g_return_val_if_reached (FALSE);
- }
-
- static gboolean
-@@ -4308,7 +4308,7 @@ _add_action_mirred (struct nl_msg *msg,
- return TRUE;
-
- nla_put_failure:
-- return FALSE;
-+ g_return_val_if_reached (FALSE);
- }
-
- static gboolean
-@@ -4334,7 +4334,7 @@ _add_action (struct nl_msg *msg,
- return TRUE;
-
- nla_put_failure:
-- return FALSE;
-+ g_return_val_if_reached (FALSE);
- }
-
- static struct nl_msg *
-diff --git a/src/platform/wifi/nm-wifi-utils-nl80211.c b/src/platform/wifi/nm-wifi-utils-nl80211.c
-index 4f7ede9757..6a8525ed4b 100644
---- a/src/platform/wifi/nm-wifi-utils-nl80211.c
-+++ b/src/platform/wifi/nm-wifi-utils-nl80211.c
-@@ -103,7 +103,7 @@ _nl80211_alloc_msg (int id, int ifindex, int phy, guint32 cmd, guint32 flags)
- return g_steal_pointer (&msg);
-
- nla_put_failure:
-- return NULL;
-+ g_return_val_if_reached (NULL);
- }
-
- static struct nl_msg *
-@@ -250,7 +250,7 @@ wifi_nl80211_set_mode (NMWifiUtils *data, const NM80211Mode mode)
- return err >= 0;
-
- nla_put_failure:
-- return FALSE;
-+ g_return_val_if_reached (FALSE);
- }
-
- static gboolean
-@@ -267,7 +267,7 @@ wifi_nl80211_set_powersave (NMWifiUtils *data, guint32 powersave)
- return err >= 0;
-
- nla_put_failure:
-- return FALSE;
-+ g_return_val_if_reached (FALSE);
- }
-
- static int
-@@ -365,7 +365,7 @@ wifi_nl80211_set_wake_on_wlan (NMWifiUtils *data, NMSettingWirelessWakeOnWLan wo
- return err >= 0;
-
- nla_put_failure:
-- return FALSE;
-+ g_return_val_if_reached (FALSE);
- }
-
- /* @divisor: pass what value @xbm should be divided by to get dBm */
-@@ -642,7 +642,7 @@ nl80211_get_ap_info (NMWifiUtilsNl80211 *self,
- return;
-
- nla_put_failure:
-- return;
-+ g_return_if_reached ();
- }
-
- static guint32
-@@ -695,7 +695,7 @@ wifi_nl80211_indicate_addressing_running (NMWifiUtils *data, gboolean running)
- return err >= 0;
-
- nla_put_failure:
-- return FALSE;
-+ g_return_val_if_reached (FALSE);
- }
-
- struct nl80211_device_info {
-diff --git a/src/platform/wpan/nm-wpan-utils.c b/src/platform/wpan/nm-wpan-utils.c
-index b7a51e9bf2..0afc2a4d0c 100644
---- a/src/platform/wpan/nm-wpan-utils.c
-+++ b/src/platform/wpan/nm-wpan-utils.c
-@@ -92,7 +92,7 @@ _nl802154_alloc_msg (int id, int ifindex, guint32 cmd, guint32 flags)
- return g_steal_pointer (&msg);
-
- nla_put_failure:
-- return NULL;
-+ g_return_val_if_reached (NULL);
- }
-
- static struct nl_msg *
-@@ -217,7 +217,7 @@ nm_wpan_utils_set_pan_id (NMWpanUtils *self, guint16 pan_id)
- return err >= 0;
-
- nla_put_failure:
-- return FALSE;
-+ g_return_val_if_reached (FALSE);
- }
-
- guint16
-@@ -244,7 +244,7 @@ nm_wpan_utils_set_short_addr (NMWpanUtils *self, guint16 short_addr)
- return err >= 0;
-
- nla_put_failure:
-- return FALSE;
-+ g_return_val_if_reached (FALSE);
- }
-
- gboolean
-@@ -262,7 +262,7 @@ nm_wpan_utils_set_channel (NMWpanUtils *self, guint8 page, guint8 channel)
- return err >= 0;
-
- nla_put_failure:
-- return FALSE;
-+ g_return_val_if_reached (FALSE);
- }
-
- /*****************************************************************************/
---
-2.21.0
-
-From 27341d042487afabcd48fbc08054069f89b9c424 Mon Sep 17 00:00:00 2001
-From: Thomas Haller <thaller@redhat.com>
-Date: Wed, 1 May 2019 13:15:57 +0200
-Subject: [PATCH 17/20] platform: merge _add_action(), _add_action_simple() and
- _add_action_mirred() into _nl_msg_new_tfilter()
-
-There is only one caller, hence it's simpler to see it all in one place.
-I prefer this, because then I can read the code top to bottom and
-see what's happening, without following helper functions.
-
-Also, this way we can "reuse" the nla_put_failure label and assertion. Previously,
-if the assertion was hit we would not rewind the buffer but continue
-constructing the message (which is already borked). Not that it matters
-too much, because this was on an "failed-assertion" code path.
-
-(cherry picked from commit 04bd404dffc8bc1ec5c3fed91e75fad1a1b1a4d3)
----
- src/platform/nm-linux-platform.c | 125 ++++++++++++-------------------
- 1 file changed, 46 insertions(+), 79 deletions(-)
-
-diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c
-index 6dd5b4ab3e..4a62a76485 100644
---- a/src/platform/nm-linux-platform.c
-+++ b/src/platform/nm-linux-platform.c
-@@ -4260,83 +4260,6 @@ nla_put_failure:
- g_return_val_if_reached (NULL);
- }
-
--static gboolean
--_add_action_simple (struct nl_msg *msg,
-- const NMPlatformActionSimple *simple)
--{
-- struct nlattr *act_options;
-- struct tc_defact sel = { 0, };
--
-- if (!(act_options = nla_nest_start (msg, TCA_ACT_OPTIONS)))
-- goto nla_put_failure;
--
-- NLA_PUT (msg, TCA_DEF_PARMS, sizeof (sel), &sel);
-- NLA_PUT (msg, TCA_DEF_DATA, sizeof (simple->sdata), simple->sdata);
--
-- nla_nest_end (msg, act_options);
--
-- return TRUE;
--
--nla_put_failure:
-- g_return_val_if_reached (FALSE);
--}
--
--static gboolean
--_add_action_mirred (struct nl_msg *msg,
-- const NMPlatformActionMirred *mirred)
--{
-- struct nlattr *act_options;
-- struct tc_mirred sel = { 0, };
--
-- if (!(act_options = nla_nest_start (msg, TCA_ACT_OPTIONS)))
-- goto nla_put_failure;
--
-- if (mirred->egress && mirred->redirect)
-- sel.eaction = TCA_EGRESS_REDIR;
-- else if (mirred->egress && mirred->mirror)
-- sel.eaction = TCA_EGRESS_MIRROR;
-- else if (mirred->ingress && mirred->redirect)
-- sel.eaction = TCA_INGRESS_REDIR;
-- else if (mirred->ingress && mirred->mirror)
-- sel.eaction = TCA_INGRESS_MIRROR;
-- sel.ifindex = mirred->ifindex;
--
-- NLA_PUT (msg, TCA_MIRRED_PARMS, sizeof (sel), &sel);
--
-- nla_nest_end (msg, act_options);
--
-- return TRUE;
--
--nla_put_failure:
-- g_return_val_if_reached (FALSE);
--}
--
--static gboolean
--_add_action (struct nl_msg *msg,
-- const NMPlatformAction *action)
--{
-- struct nlattr *prio;
--
-- nm_assert (action || action->kind);
--
-- if (!(prio = nla_nest_start (msg, 1 /* priority */)))
-- goto nla_put_failure;
--
-- NLA_PUT_STRING (msg, TCA_ACT_KIND, action->kind);
--
-- if (nm_streq (action->kind, NM_PLATFORM_ACTION_KIND_SIMPLE))
-- _add_action_simple (msg, &action->simple);
-- else if (nm_streq (action->kind, NM_PLATFORM_ACTION_KIND_MIRRED))
-- _add_action_mirred (msg, &action->mirred);
--
-- nla_nest_end (msg, prio);
--
-- return TRUE;
--
--nla_put_failure:
-- g_return_val_if_reached (FALSE);
--}
--
- static struct nl_msg *
- _nl_msg_new_tfilter (int nlmsg_type,
- int nlmsg_flags,
-@@ -4366,8 +4289,52 @@ _nl_msg_new_tfilter (int nlmsg_type,
- if (!(act_tab = nla_nest_start (msg, TCA_OPTIONS))) // 3 TCA_ACT_KIND TCA_ACT_KIND
- goto nla_put_failure;
-
-- if (tfilter->action.kind)
-- _add_action (msg, &tfilter->action);
-+ if (tfilter->action.kind) {
-+ const NMPlatformAction *action = &tfilter->action;
-+ struct nlattr *prio;
-+ struct nlattr *act_options;
-+
-+ if (!(prio = nla_nest_start (msg, 1 /* priority */)))
-+ goto nla_put_failure;
-+
-+ NLA_PUT_STRING (msg, TCA_ACT_KIND, action->kind);
-+
-+ if (nm_streq (action->kind, NM_PLATFORM_ACTION_KIND_SIMPLE)) {
-+ const NMPlatformActionSimple *simple = &action->simple;
-+ struct tc_defact sel = { 0, };
-+
-+ if (!(act_options = nla_nest_start (msg, TCA_ACT_OPTIONS)))
-+ goto nla_put_failure;
-+
-+ NLA_PUT (msg, TCA_DEF_PARMS, sizeof (sel), &sel);
-+ NLA_PUT (msg, TCA_DEF_DATA, sizeof (simple->sdata), simple->sdata);
-+
-+ nla_nest_end (msg, act_options);
-+
-+ } else if (nm_streq (action->kind, NM_PLATFORM_ACTION_KIND_MIRRED)) {
-+ const NMPlatformActionMirred *mirred = &action->mirred;
-+ struct tc_mirred sel = { 0, };
-+
-+ if (!(act_options = nla_nest_start (msg, TCA_ACT_OPTIONS)))
-+ goto nla_put_failure;
-+
-+ if (mirred->egress && mirred->redirect)
-+ sel.eaction = TCA_EGRESS_REDIR;
-+ else if (mirred->egress && mirred->mirror)
-+ sel.eaction = TCA_EGRESS_MIRROR;
-+ else if (mirred->ingress && mirred->redirect)
-+ sel.eaction = TCA_INGRESS_REDIR;
-+ else if (mirred->ingress && mirred->mirror)
-+ sel.eaction = TCA_INGRESS_MIRROR;
-+ sel.ifindex = mirred->ifindex;
-+
-+ NLA_PUT (msg, TCA_MIRRED_PARMS, sizeof (sel), &sel);
-+
-+ nla_nest_end (msg, act_options);
-+ }
-+
-+ nla_nest_end (msg, prio);
-+ }
-
- nla_nest_end (msg, tc_options);
-
---
-2.21.0
-
-From a0161aa9772af8d7a35812dfdf86864bb941f751 Mon Sep 17 00:00:00 2001
-From: Thomas Haller <thaller@redhat.com>
-Date: Wed, 1 May 2019 13:27:28 +0200
-Subject: [PATCH 18/20] device/trivial: add space between macro name and
- arguments and vertically align lines
-
-Also calling macros we commonly put a space between the macro name and
-the parenthesis.
-
-Also align the parameters. Otherwise it's hard to read for me.
-
-(cherry picked from commit 9399297a82cbb5e8fc218fdefde7005353cb44d6)
----
- src/devices/nm-device.c | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
-index e2a5fd4bf2..1241a098d1 100644
---- a/src/devices/nm-device.c
-+++ b/src/devices/nm-device.c
-@@ -6533,14 +6533,14 @@ tc_commit (NMDevice *self)
- } G_STMT_END
-
- if (strcmp (qdisc->kind, "fq_codel") == 0) {
-- GET_ATTR("limit", qdisc->fq_codel.limit, UINT32, uint32, 0);
-- GET_ATTR("flows", qdisc->fq_codel.flows, UINT32, uint32, 0);
-- GET_ATTR("target", qdisc->fq_codel.target, UINT32, uint32, 0);
-- GET_ATTR("interval", qdisc->fq_codel.interval, UINT32, uint32, 0);
-- GET_ATTR("quantum", qdisc->fq_codel.quantum, UINT32, uint32, 0);
-- GET_ATTR("ce_threshold", qdisc->fq_codel.ce_threshold, UINT32, uint32, NM_PLATFORM_FQ_CODEL_CE_THRESHOLD_DISABLED);
-- GET_ATTR("memory_limit", qdisc->fq_codel.memory_limit, UINT32, uint32, NM_PLATFORM_FQ_CODEL_MEMORY_LIMIT_UNSET);
-- GET_ATTR("ecn", qdisc->fq_codel.ecn, BOOLEAN, boolean, FALSE);
-+ GET_ATTR ("limit", qdisc->fq_codel.limit, UINT32, uint32, 0);
-+ GET_ATTR ("flows", qdisc->fq_codel.flows, UINT32, uint32, 0);
-+ GET_ATTR ("target", qdisc->fq_codel.target, UINT32, uint32, 0);
-+ GET_ATTR ("interval", qdisc->fq_codel.interval, UINT32, uint32, 0);
-+ GET_ATTR ("quantum", qdisc->fq_codel.quantum, UINT32, uint32, 0);
-+ GET_ATTR ("ce_threshold", qdisc->fq_codel.ce_threshold, UINT32, uint32, NM_PLATFORM_FQ_CODEL_CE_THRESHOLD_DISABLED);
-+ GET_ATTR ("memory_limit", qdisc->fq_codel.memory_limit, UINT32, uint32, NM_PLATFORM_FQ_CODEL_MEMORY_LIMIT_UNSET);
-+ GET_ATTR ("ecn", qdisc->fq_codel.ecn, BOOLEAN, boolean, FALSE);
- }
-
- #undef GET_ADDR
---
-2.21.0
-
-From ea7de52d774f3aa3a099f6fce1cb9313b6456cef Mon Sep 17 00:00:00 2001
-From: Thomas Haller <thaller@redhat.com>
-Date: Wed, 1 May 2019 16:34:27 +0200
-Subject: [PATCH 19/20] device: don't rely on nm_platform_link_get_ifindex()
- returning 0
-
-While nm_platform_link_get_ifindex() is documented to return 0 if the device
-is not found, don't rely on it. Instead, check that a valid(!) ifindex was
-returned, and only then set the ifindex. Otherwise leave it at zero. There
-is of course no difference in practice, but we generally treat invalid ifindexes
-as <= 0, so it's not immediately clear what nm_platform_link_get_ifindex()
-returns to signal no device.
-
-(cherry picked from commit 9eefe27a1c7879e6f94bbb7dec5c9efe722888fa)
----
- src/devices/nm-device.c | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
-index 1241a098d1..5195eb667f 100644
---- a/src/devices/nm-device.c
-+++ b/src/devices/nm-device.c
-@@ -6504,7 +6504,7 @@ tc_commit (NMDevice *self)
-
- ip_ifindex = nm_device_get_ip_ifindex (self);
- if (!ip_ifindex)
-- return s_tc == NULL;
-+ return s_tc == NULL;
-
- if (s_tc) {
- nqdiscs = nm_setting_tc_config_get_num_qdiscs (s_tc);
-@@ -6591,9 +6591,12 @@ tc_commit (NMDevice *self)
-
- var = nm_tc_action_get_attribute (action, "dev");
- if (var && g_variant_is_of_type (var, G_VARIANT_TYPE_STRING)) {
-- int ifindex = nm_platform_link_get_ifindex (nm_device_get_platform (self),
-- g_variant_get_string (var, NULL));
-- tfilter->action.mirred.ifindex = ifindex;
-+ int ifindex;
-+
-+ ifindex = nm_platform_link_get_ifindex (nm_device_get_platform (self),
-+ g_variant_get_string (var, NULL));
-+ if (ifindex > 0)
-+ tfilter->action.mirred.ifindex = ifindex;
- }
- }
- }
---
-2.21.0
-
-From 6d9030acb60c2f9a89224847f0a5e68f8b55b0f0 Mon Sep 17 00:00:00 2001
-From: Thomas Haller <thaller@redhat.com>
-Date: Wed, 1 May 2019 16:35:29 +0200
-Subject: [PATCH 20/20] device/trivial: add comment about lifetime of "kind" in
- tc_commit()
-
-In general, all fields of public NMPlatform* structs must be
-plain/simple. Meaning: copying the struct must be possible without
-caring about cloning/duplicating memory.
-In other words, if there are fields which lifetime is limited,
-then these fields cannot be inside the public part NMPlatform*.
-
-That is why
-
- - "NMPlatformLink.kind", "NMPlatformQdisc.kind", "NMPlatformTfilter.kind"
- are set by platform code to an interned string (g_intern_string())
- that has a static lifetime.
-
- - the "ingress_qos_map" field is inside the ref-counted struct NMPObjectLnkVlan
- and not NMPlatformLnkVlan. This field requires managing the lifetime
- of the array and NMPlatformLnkVlan cannot provide that.
-
-See also for example NMPClass.cmd_obj_copy() which can deep-copy an object.
-But this is only suitable for fields in NMPObject*. The purpose of this
-rule is that you always can safely copy a NMPlatform* struct without
-worrying about the ownership and lifetime of the fields (the field's
-lifetime is unlimited).
-
-This rule and managing of resource lifetime is the main reason for the
-NMPlatform*/NMPObject* split. NMPlatform* structs simply have no mechanism
-for copying/releasing fields, that is why the NMPObject* counterpart exists
-(which is ref-counted and has a copy and destructor function).
-
-This is violated in tc_commit() for the "kind" strings. The lifetime
-of these strings is tied to the setting instance.
-
-We cannot intern the strings (because these are arbitrary strings
-and interned strings are leaked indefinitely). We also cannot g_strdup()
-the strings, because NMPlatform* is not supposed to own strings.
-
-So, just add comments that warn about this ugliness.
-
-The more correct solution would be to move the "kind" fields inside
-NMPObjectQdisc and NMPObjectTfilter, but that is a lot of extra effort.
-
-(cherry picked from commit f2ae994b2359aa690183a268c5b4cc8fb1a6012e)
----
- src/devices/nm-device.c | 14 +++++++++++++
- src/platform/nm-linux-platform.c | 6 ++++++
- src/platform/nm-platform.c | 34 ++++++++++++++++++++++++++++++++
- src/platform/nm-platform.h | 12 +++++++++++
- 4 files changed, 66 insertions(+)
-
-diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
-index 5195eb667f..09ba9c5d57 100644
---- a/src/devices/nm-device.c
-+++ b/src/devices/nm-device.c
-@@ -6516,7 +6516,12 @@ tc_commit (NMDevice *self)
- NMPlatformQdisc *qdisc = NMP_OBJECT_CAST_QDISC (q);
-
- qdisc->ifindex = ip_ifindex;
-+
-+ /* Note: kind string is still owned by NMTCTfilter.
-+ * This qdisc instance must not be kept alive beyond this function.
-+ * nm_platform_qdisc_sync() promises to do that. */
- qdisc->kind = nm_tc_qdisc_get_kind (s_qdisc);
-+
- qdisc->addr_family = AF_UNSPEC;
- qdisc->handle = nm_tc_qdisc_get_handle (s_qdisc);
- qdisc->parent = nm_tc_qdisc_get_parent (s_qdisc);
-@@ -6558,7 +6563,12 @@ tc_commit (NMDevice *self)
- NMPlatformTfilter *tfilter = NMP_OBJECT_CAST_TFILTER (q);
-
- tfilter->ifindex = ip_ifindex;
-+
-+ /* Note: kind string is still owned by NMTCTfilter.
-+ * This tfilter instance must not be kept alive beyond this function.
-+ * nm_platform_tfilter_sync() promises to do that. */
- tfilter->kind = nm_tc_tfilter_get_kind (s_tfilter);
-+
- tfilter->addr_family = AF_UNSPEC;
- tfilter->handle = nm_tc_tfilter_get_handle (s_tfilter);
- tfilter->parent = nm_tc_tfilter_get_parent (s_tfilter);
-@@ -6568,7 +6578,11 @@ tc_commit (NMDevice *self)
- if (action) {
- GVariant *var;
-
-+ /* Note: kind string is still owned by NMTCAction.
-+ * This tfilter instance must not be kept alive beyond this function.
-+ * nm_platform_tfilter_sync() promises to do that. */
- tfilter->action.kind = nm_tc_action_get_kind (action);
-+
- if (strcmp (tfilter->action.kind, "simple") == 0) {
- var = nm_tc_action_get_attribute (action, "sdata");
- if (var && g_variant_is_of_type (var, G_VARIANT_TYPE_BYTESTRING)) {
-diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c
-index 4a62a76485..7d66a88fa7 100644
---- a/src/platform/nm-linux-platform.c
-+++ b/src/platform/nm-linux-platform.c
-@@ -8244,6 +8244,9 @@ qdisc_add (NMPlatform *platform,
- char s_buf[256];
- nm_auto_nlmsg struct nl_msg *msg = NULL;
-
-+ /* Note: @qdisc must not be copied or kept alive because the lifetime of qdisc.kind
-+ * is undefined. */
-+
- msg = _nl_msg_new_qdisc (RTM_NEWQDISC, flags, qdisc);
-
- event_handler_read_netlink (platform, FALSE);
-@@ -8285,6 +8288,9 @@ tfilter_add (NMPlatform *platform,
- char s_buf[256];
- nm_auto_nlmsg struct nl_msg *msg = NULL;
-
-+ /* Note: @tfilter must not be copied or kept alive because the lifetime of tfilter.kind
-+ * and tfilter.action.kind is undefined. */
-+
- msg = _nl_msg_new_tfilter (RTM_NEWTFILTER, flags, tfilter);
-
- event_handler_read_netlink (platform, FALSE);
-diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c
-index ee71319dd6..7add7dcdbe 100644
---- a/src/platform/nm-platform.c
-+++ b/src/platform/nm-platform.c
-@@ -5077,10 +5077,27 @@ nm_platform_qdisc_add (NMPlatform *self,
- int ifindex = qdisc->ifindex;
- _CHECK_SELF (self, klass, -NME_BUG);
-
-+ /* Note: @qdisc must not be copied or kept alive because the lifetime of qdisc.kind
-+ * is undefined. */
-+
- _LOG3D ("adding or updating a qdisc: %s", nm_platform_qdisc_to_string (qdisc, NULL, 0));
- return klass->qdisc_add (self, flags, qdisc);
- }
-
-+/**
-+ * nm_platform_qdisc_sync:
-+ * @self: the #NMPlatform instance
-+ * @ifindex: the ifindex where to configure the qdiscs.
-+ * @known_qdiscs: the list of qdiscs (#NMPObject).
-+ *
-+ * The function promises not to take any reference to the qdisc
-+ * instances from @known_qdiscs, nor to keep them around after
-+ * the function returns. This is important, because it allows the
-+ * caller to pass NMPlatformQdisc instances which "kind" string
-+ * have a limited lifetime.
-+ *
-+ * Returns: %TRUE on success.
-+ */
- gboolean
- nm_platform_qdisc_sync (NMPlatform *self,
- int ifindex,
-@@ -5143,10 +5160,27 @@ nm_platform_tfilter_add (NMPlatform *self,
- int ifindex = tfilter->ifindex;
- _CHECK_SELF (self, klass, -NME_BUG);
-
-+ /* Note: @tfilter must not be copied or kept alive because the lifetime of tfilter.kind
-+ * and tfilter.action.kind is undefined. */
-+
- _LOG3D ("adding or updating a tfilter: %s", nm_platform_tfilter_to_string (tfilter, NULL, 0));
- return klass->tfilter_add (self, flags, tfilter);
- }
-
-+/**
-+ * nm_platform_qdisc_sync:
-+ * @self: the #NMPlatform instance
-+ * @ifindex: the ifindex where to configure the qdiscs.
-+ * @known_tfilters: the list of tfilters (#NMPObject).
-+ *
-+ * The function promises not to take any reference to the tfilter
-+ * instances from @known_tfilters, nor to keep them around after
-+ * the function returns. This is important, because it allows the
-+ * caller to pass NMPlatformTfilter instances which "kind" string
-+ * have a limited lifetime.
-+ *
-+ * Returns: %TRUE on success.
-+ */
- gboolean
- nm_platform_tfilter_sync (NMPlatform *self,
- int ifindex,
-diff --git a/src/platform/nm-platform.h b/src/platform/nm-platform.h
-index 9b6848d977..a2d8e57ff6 100644
---- a/src/platform/nm-platform.h
-+++ b/src/platform/nm-platform.h
-@@ -626,7 +626,11 @@ typedef struct {
-
- typedef struct {
- __NMPlatformObjWithIfindex_COMMON;
-+
-+ /* beware, kind is embedded in an NMPObject, hence you must
-+ * take care of the lifetime of the string. */
- const char *kind;
-+
- int addr_family;
- guint32 handle;
- guint32 parent;
-@@ -649,7 +653,11 @@ typedef struct {
- } NMPlatformActionMirred;
-
- typedef struct {
-+
-+ /* beware, kind is embedded in an NMPObject, hence you must
-+ * take care of the lifetime of the string. */
- const char *kind;
-+
- union {
- NMPlatformActionSimple simple;
- NMPlatformActionMirred mirred;
-@@ -661,7 +669,11 @@ typedef struct {
-
- typedef struct {
- __NMPlatformObjWithIfindex_COMMON;
-+
-+ /* beware, kind is embedded in an NMPObject, hence you must
-+ * take care of the lifetime of the string. */
- const char *kind;
-+
- int addr_family;
- guint32 handle;
- guint32 parent;
---
-2.21.0
-
diff --git a/SOURCES/1008-don-t-kill-teamd-for-external-devices-rh1711952.patch b/SOURCES/1008-don-t-kill-teamd-for-external-devices-rh1711952.patch
deleted file mode 100644
index 18134c7..0000000
--- a/SOURCES/1008-don-t-kill-teamd-for-external-devices-rh1711952.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 2711e9be108063d9e269412c9026c10c63f1cda3 Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Sun, 19 May 2019 11:35:02 +0200
-Subject: [PATCH] team: don't kill teamd for external devices
-
-The teamd instance must not be killed if the device was externally
-activated.
-
-https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/158
-https://bugzilla.redhat.com/show_bug.cgi?id=1693142
-(cherry picked from commit 008a4b4215dcce40345b2c372ffc8cfd0d388fa5)
-(cherry picked from commit bd113fe72eac3f609a6d05ab33ef52d6773c1985)
----
- src/devices/team/nm-device-team.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/devices/team/nm-device-team.c b/src/devices/team/nm-device-team.c
-index 287f4d1b1..4ae276dbf 100644
---- a/src/devices/team/nm-device-team.c
-+++ b/src/devices/team/nm-device-team.c
-@@ -694,6 +694,9 @@ deactivate (NMDevice *device)
- NMDeviceTeam *self = NM_DEVICE_TEAM (device);
- NMDeviceTeamPrivate *priv = NM_DEVICE_TEAM_GET_PRIVATE (self);
-
-+ if (nm_device_sys_iface_state_is_external (device))
-+ return;
-+
- if (priv->teamd_pid || priv->tdc)
- _LOGI (LOGD_TEAM, "deactivation: stopping teamd...");
-
---
-2.20.1
-
diff --git a/SOURCES/1009-ifcfg-rh-use-PKCS12-private-as-client-cert-rh1714610.patch b/SOURCES/1009-ifcfg-rh-use-PKCS12-private-as-client-cert-rh1714610.patch
deleted file mode 100644
index 770eaa9..0000000
--- a/SOURCES/1009-ifcfg-rh-use-PKCS12-private-as-client-cert-rh1714610.patch
+++ /dev/null
@@ -1,305 +0,0 @@
-From 51c47c0a9d77f04d04c6cde7f1254623328898f9 Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Tue, 14 May 2019 13:59:00 +0200
-Subject: [PATCH 1/3] ifcfg-rh: write client certificate even if it is pkcs12
-
-The writer should only persist properties without too much additional
-logic, which should be instead embedded in the setting itself.
-
-(cherry picked from commit a995244e9bf526b2d10143858655c3ea3731bf91)
-(cherry picked from commit 5a5cd8d05dfbde11b0983e09a5a37f6929bb2178)
----
- .../plugins/ifcfg-rh/nms-ifcfg-rh-reader.c | 4 ----
- .../plugins/ifcfg-rh/nms-ifcfg-rh-writer.c | 24 ++++++-------------
- 2 files changed, 7 insertions(+), 21 deletions(-)
-
-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 e5423b181..9b7511064 100644
---- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
-+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
-@@ -3117,10 +3117,6 @@ eap_tls_reader (const char *eap_method,
- &client_cert,
- error))
- return FALSE;
-- /* FIXME: writer does not actually write IEEE_8021X_CLIENT_CERT_PASSWORD and other
-- * certificate related passwords. It should, because otherwise persisting such profiles
-- * to ifcfg looses information. As this currently only matters for PKCS11 URIs, it seems
-- * a seldom used feature so that it is not fixed yet. */
- _secret_set_from_ifcfg (s_8021x,
- ifcfg,
- keys_ifcfg,
-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 80b1bffe1..90f06e183 100644
---- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
-+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
-@@ -358,23 +358,13 @@ write_8021x_certs (NMSetting8021x *s_8021x,
- if (!write_object (s_8021x, ifcfg, secrets, blobs, otype, error))
- return FALSE;
-
-- /* Client certificate */
-- if (otype->vtable->format_func (s_8021x) == NM_SETTING_802_1X_CK_FORMAT_PKCS12) {
-- /* Don't need a client certificate with PKCS#12 since the file is both
-- * the client certificate and the private key in one file.
-- */
-- svSetValueStr (ifcfg,
-- phase2 ? "IEEE_8021X_INNER_CLIENT_CERT" : "IEEE_8021X_CLIENT_CERT",
-- NULL);
-- } else {
-- /* Save the client certificate */
-- if (!write_object (s_8021x, ifcfg, secrets, blobs,
-- phase2
-- ? &setting_8021x_scheme_vtable[NM_SETTING_802_1X_SCHEME_TYPE_PHASE2_CLIENT_CERT]
-- : &setting_8021x_scheme_vtable[NM_SETTING_802_1X_SCHEME_TYPE_CLIENT_CERT],
-- error))
-- return FALSE;
-- }
-+ /* Save the client certificate */
-+ if (!write_object (s_8021x, ifcfg, secrets, blobs,
-+ phase2
-+ ? &setting_8021x_scheme_vtable[NM_SETTING_802_1X_SCHEME_TYPE_PHASE2_CLIENT_CERT]
-+ : &setting_8021x_scheme_vtable[NM_SETTING_802_1X_SCHEME_TYPE_CLIENT_CERT],
-+ error))
-+ return FALSE;
-
- return TRUE;
- }
---
-2.20.1
-
-From c62a97f608c4c28cbefe1b5b57bec5f6da24b342 Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Tue, 14 May 2019 14:32:19 +0200
-Subject: [PATCH 2/3] ifcfg-rh: don't check for 802.1x private key or client
- cert in reader
-
-Let the setting check it in verify().
-
-(cherry picked from commit d9b3b2b8cec9fdb984a6103240688dc46f33866e)
-(cherry picked from commit c28db67a781388e1f742b3406e26a35c8c2522a8)
----
- .../plugins/ifcfg-rh/nms-ifcfg-rh-reader.c | 16 +++-------------
- 1 file changed, 3 insertions(+), 13 deletions(-)
-
-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 9b7511064..da3b89e1a 100644
---- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
-+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
-@@ -3077,6 +3077,7 @@ eap_tls_reader (const char *eap_method,
- svGetValueStr (ifcfg, "IEEE_8021X_IDENTITY", &identity_free),
- NULL);
-
-+ /* CA certificate */
- if (!_cert_set_from_ifcfg (s_8021x,
- ifcfg,
- phase2 ? "IEEE_8021X_INNER_CA_CERT" : "IEEE_8021X_CA_CERT",
-@@ -3090,6 +3091,7 @@ eap_tls_reader (const char *eap_method,
- phase2 ? "IEEE_8021X_INNER_CA_CERT_PASSWORD" : "IEEE_8021X_CA_CERT_PASSWORD",
- phase2 ? NM_SETTING_802_1X_PHASE2_CA_CERT_PASSWORD : NM_SETTING_802_1X_CA_CERT_PASSWORD);
-
-+ /* Private key */
- if (!_cert_set_from_ifcfg (s_8021x,
- ifcfg,
- phase2 ? "IEEE_8021X_INNER_PRIVATE_KEY" : "IEEE_8021X_PRIVATE_KEY",
-@@ -3102,14 +3104,8 @@ eap_tls_reader (const char *eap_method,
- keys_ifcfg,
- phase2 ? "IEEE_8021X_INNER_PRIVATE_KEY_PASSWORD" : "IEEE_8021X_PRIVATE_KEY_PASSWORD",
- phase2 ? NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD : NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD);
-- if (!privkey) {
-- g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION,
-- "Missing %s for EAP method '%s'.",
-- phase2 ? "IEEE_8021X_INNER_PRIVATE_KEY" : "IEEE_8021X_PRIVATE_KEY",
-- eap_method);
-- return FALSE;
-- }
-
-+ /* Client certificate */
- if (!_cert_set_from_ifcfg (s_8021x,
- ifcfg,
- phase2 ? "IEEE_8021X_INNER_CLIENT_CERT" : "IEEE_8021X_CLIENT_CERT",
-@@ -3122,12 +3118,6 @@ eap_tls_reader (const char *eap_method,
- keys_ifcfg,
- phase2 ? "IEEE_8021X_INNER_CLIENT_CERT_PASSWORD" : "IEEE_8021X_CLIENT_CERT_PASSWORD",
- phase2 ? NM_SETTING_802_1X_PHASE2_CLIENT_CERT_PASSWORD : NM_SETTING_802_1X_CLIENT_CERT_PASSWORD);
-- if (!client_cert) {
-- g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION,
-- "Missing certificate for EAP method '%s'.",
-- eap_method);
-- return FALSE;
-- }
-
- return TRUE;
- }
---
-2.20.1
-
-From b3935bb0f25bede6e9c29735314f42f4bd773e09 Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Tue, 14 May 2019 15:27:45 +0200
-Subject: [PATCH 3/3] ifcfg-rh: use PKCS #12 private key also as client cert in
- reader
-
-Before commit e3ac45c02610 the reader set the private key in the
-setting using the libnm function, which also set the key as client
-certificate if it was in PKCS #12 format.
-
-After the commit, existing connections with a PKCS #12 private key but
-without a client certificate became invalid. Restore the old behavior.
-
-Fixes: e3ac45c02610 ('ifcfg-rh: don't use 802-1x certifcate setter functions')
-(cherry picked from commit 9a410fc312c50ac405c57ff4e9eb692e798e248d)
-(cherry picked from commit 51896e1e6b24e0b5d6aefce3c4945d27a5b9f5b7)
----
- Makefile.am | 2 ++
- .../plugins/ifcfg-rh/nms-ifcfg-rh-reader.c | 28 ++++++++++++++++--
- .../plugins/ifcfg-rh/nms-ifcfg-rh-writer.c | 21 +++++++++----
- ...fg-test-wired-8021x-tls-p12-no-client-cert | 13 ++++++++
- .../tests/network-scripts/test_client.p12 | Bin 0 -> 2848 bytes
- .../plugins/ifcfg-rh/tests/test-ifcfg-rh.c | 23 ++++++++++++++
- 6 files changed, 79 insertions(+), 8 deletions(-)
- create mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-p12-no-client-cert
- create mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/test_client.p12
-
-diff --git a/Makefile.am b/Makefile.am
-index d78bfdeda..8c470df31 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -3014,6 +3014,7 @@ EXTRA_DIST += \
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-peap-mschapv2 \
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-agent \
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-always \
-+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-p12-no-client-cert \
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-auto-negotiate-on \
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-autoip \
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ctc-static \
-@@ -3083,6 +3084,7 @@ EXTRA_DIST += \
- src/settings/plugins/ifcfg-rh/tests/network-scripts/route6-test-wired-ipv6-manual \
- src/settings/plugins/ifcfg-rh/tests/network-scripts/test1_key_and_cert.pem \
- src/settings/plugins/ifcfg-rh/tests/network-scripts/test_ca_cert.pem \
-+ src/settings/plugins/ifcfg-rh/tests/network-scripts/test_client.p12 \
- $(NULL)
-
- # make target dependencies can't have colons in their names, which ends up
-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 da3b89e1a..317e22f7a 100644
---- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
-+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
-@@ -3071,6 +3071,10 @@ eap_tls_reader (const char *eap_method,
- gs_unref_bytes GBytes *privkey = NULL;
- gs_unref_bytes GBytes *client_cert = NULL;
- gs_free char *identity_free = NULL;
-+ gs_free char *value_to_free = NULL;
-+ const char *client_cert_var;
-+ const char *client_cert_prop;
-+ NMSetting8021xCKFormat format;
-
- g_object_set (s_8021x,
- NM_SETTING_802_1X_IDENTITY,
-@@ -3106,10 +3110,12 @@ eap_tls_reader (const char *eap_method,
- phase2 ? NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD : NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD);
-
- /* Client certificate */
-+ client_cert_var = phase2 ? "IEEE_8021X_INNER_CLIENT_CERT" : "IEEE_8021X_CLIENT_CERT";
-+ client_cert_prop = phase2 ? NM_SETTING_802_1X_PHASE2_CLIENT_CERT : NM_SETTING_802_1X_CLIENT_CERT;
- if (!_cert_set_from_ifcfg (s_8021x,
- ifcfg,
-- phase2 ? "IEEE_8021X_INNER_CLIENT_CERT" : "IEEE_8021X_CLIENT_CERT",
-- phase2 ? NM_SETTING_802_1X_PHASE2_CLIENT_CERT : NM_SETTING_802_1X_CLIENT_CERT,
-+ client_cert_var,
-+ client_cert_prop,
- &client_cert,
- error))
- return FALSE;
-@@ -3119,6 +3125,24 @@ eap_tls_reader (const char *eap_method,
- phase2 ? "IEEE_8021X_INNER_CLIENT_CERT_PASSWORD" : "IEEE_8021X_CLIENT_CERT_PASSWORD",
- phase2 ? NM_SETTING_802_1X_PHASE2_CLIENT_CERT_PASSWORD : NM_SETTING_802_1X_CLIENT_CERT_PASSWORD);
-
-+ /* In the past when the private key and client certificate
-+ * were the same PKCS #12 file we used to write only the
-+ * private key variable. Still support that even if it means
-+ * that we have to look into the file content, which makes
-+ * the connection not self-contained.
-+ */
-+ if ( !client_cert
-+ && privkey
-+ && !svGetValue (ifcfg, client_cert_var, &value_to_free)) {
-+ if (phase2)
-+ format = nm_setting_802_1x_get_phase2_private_key_format (s_8021x);
-+ else
-+ format = nm_setting_802_1x_get_private_key_format (s_8021x);
-+
-+ if (format == NM_SETTING_802_1X_CK_FORMAT_PKCS12)
-+ g_object_set (s_8021x, client_cert_prop, privkey, NULL);
-+ }
-+
- return TRUE;
- }
-
-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 90f06e183..6e2bc8493 100644
---- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
-+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
-@@ -209,6 +209,7 @@ write_object (NMSetting8021x *s_8021x,
- GHashTable *secrets,
- GHashTable *blobs,
- const Setting8021xSchemeVtable *objtype,
-+ gboolean force_write,
- GError **error)
- {
- NMSetting8021xCKScheme scheme;
-@@ -287,7 +288,7 @@ write_object (NMSetting8021x *s_8021x,
- */
- standard_file = utils_cert_path (svFileGetName (ifcfg), objtype->vtable->file_suffix, extension);
- g_hash_table_replace (blobs, standard_file, NULL);
-- svUnsetValue (ifcfg, objtype->ifcfg_rh_key);
-+ svSetValue (ifcfg, objtype->ifcfg_rh_key, force_write ? "" : NULL);
- return TRUE;
- }
-
-@@ -338,31 +339,39 @@ write_8021x_certs (NMSetting8021x *s_8021x,
- shvarFile *ifcfg,
- GError **error)
- {
-- const Setting8021xSchemeVtable *otype = NULL;
-+ const Setting8021xSchemeVtable *pk_otype = NULL;
-+ gs_free char *value_to_free = NULL;
-
- /* CA certificate */
- if (!write_object (s_8021x, ifcfg, secrets, blobs,
- phase2
- ? &setting_8021x_scheme_vtable[NM_SETTING_802_1X_SCHEME_TYPE_PHASE2_CA_CERT]
- : &setting_8021x_scheme_vtable[NM_SETTING_802_1X_SCHEME_TYPE_CA_CERT],
-+ FALSE,
- error))
- return FALSE;
-
- /* Private key */
- if (phase2)
-- otype = &setting_8021x_scheme_vtable[NM_SETTING_802_1X_SCHEME_TYPE_PHASE2_PRIVATE_KEY];
-+ pk_otype = &setting_8021x_scheme_vtable[NM_SETTING_802_1X_SCHEME_TYPE_PHASE2_PRIVATE_KEY];
- else
-- otype = &setting_8021x_scheme_vtable[NM_SETTING_802_1X_SCHEME_TYPE_PRIVATE_KEY];
-+ pk_otype = &setting_8021x_scheme_vtable[NM_SETTING_802_1X_SCHEME_TYPE_PRIVATE_KEY];
-
- /* Save the private key */
-- if (!write_object (s_8021x, ifcfg, secrets, blobs, otype, error))
-+ if (!write_object (s_8021x, ifcfg, secrets, blobs, pk_otype, FALSE, error))
- return FALSE;
-
-- /* Save the client certificate */
-+ /* Save the client certificate.
-+ * If there is a private key, always write a property for the
-+ * client certificate even if it is empty, so that the reader
-+ * doesn't have to read the private key file to determine if it
-+ * is a PKCS #12 one which serves also as client certificate.
-+ */
- if (!write_object (s_8021x, ifcfg, secrets, blobs,
- phase2
- ? &setting_8021x_scheme_vtable[NM_SETTING_802_1X_SCHEME_TYPE_PHASE2_CLIENT_CERT]
- : &setting_8021x_scheme_vtable[NM_SETTING_802_1X_SCHEME_TYPE_CLIENT_CERT],
-+ !!svGetValue (ifcfg, pk_otype->ifcfg_rh_key, &value_to_free),
- error))
- return FALSE;
-
---
-2.20.1
-
diff --git a/SOURCES/1010-translations-rh1689962.patch b/SOURCES/1010-translations-rh1689962.patch
deleted file mode 100644
index f37e570..0000000
--- a/SOURCES/1010-translations-rh1689962.patch
+++ /dev/null
@@ -1,39527 +0,0 @@
-From 9de7c0542c6ee44cb0c54c0fcdb5155d00ef3a31 Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Tue, 21 May 2019 10:00:16 +0200
-Subject: [PATCH 1/2] po: update-po
-
----
- po/ar.po | 4526 +++++++++++++++++++++++--------------------
- po/as.po | 4643 +++++++++++++++++++++++++--------------------
- po/be@latin.po | 4487 +++++++++++++++++++++++--------------------
- po/bg.po | 4544 ++++++++++++++++++++++++--------------------
- po/bn_IN.po | 4642 ++++++++++++++++++++++++--------------------
- po/bs.po | 4516 +++++++++++++++++++++++--------------------
- po/ca.po | 4658 +++++++++++++++++++++++++--------------------
- po/cs.po | 4811 ++++++++++++++++++++++++----------------------
- po/da.po | 4398 ++++++++++++++++++++++--------------------
- po/de.po | 4703 +++++++++++++++++++++++++--------------------
- po/dz.po | 4536 +++++++++++++++++++++++--------------------
- po/el.po | 4652 +++++++++++++++++++++++++--------------------
- po/en_CA.po | 4618 +++++++++++++++++++++++---------------------
- po/en_GB.po | 4545 ++++++++++++++++++++++++--------------------
- po/eo.po | 3110 +++++++++++++++---------------
- po/es.po | 4749 ++++++++++++++++++++++++++--------------------
- po/et.po | 4505 +++++++++++++++++++++++--------------------
- po/eu.po | 4541 ++++++++++++++++++++++++--------------------
- po/fi.po | 4579 +++++++++++++++++++++++---------------------
- po/fr.po | 4700 +++++++++++++++++++++++++--------------------
- po/gd.po | 4631 ++++++++++++++++++++++++--------------------
- po/gl.po | 4536 +++++++++++++++++++++++--------------------
- po/gu.po | 4603 ++++++++++++++++++++++++--------------------
- po/he.po | 4485 +++++++++++++++++++++++--------------------
- po/hi.po | 4718 ++++++++++++++++++++++++---------------------
- po/hr.po | 4557 ++++++++++++++++++++++++--------------------
- po/hu.po | 4599 ++++++++++++++++++++++++--------------------
- po/id.po | 4959 ++++++++++++++++++++++++++----------------------
- po/it.po | 3470 ++++++++++++++++++---------------
- po/ja.po | 4680 +++++++++++++++++++++++++--------------------
- po/ka.po | 4546 ++++++++++++++++++++++++--------------------
- po/kn.po | 4646 +++++++++++++++++++++++++--------------------
- po/ko.po | 4681 +++++++++++++++++++++++++--------------------
- po/ku.po | 4576 +++++++++++++++++++++++---------------------
- po/lt.po | 4619 ++++++++++++++++++++++++--------------------
- po/lv.po | 4555 +++++++++++++++++++++++---------------------
- po/mk.po | 4485 +++++++++++++++++++++++--------------------
- po/ml.po | 4604 ++++++++++++++++++++++++--------------------
- po/mr.po | 4640 ++++++++++++++++++++++++--------------------
- po/nb.po | 4487 +++++++++++++++++++++++--------------------
- po/ne.po | 4525 +++++++++++++++++++++++--------------------
- po/nl.po | 4489 +++++++++++++++++++++++--------------------
- po/oc.po | 4562 ++++++++++++++++++++++++--------------------
- po/or.po | 4602 ++++++++++++++++++++++++--------------------
- po/pa.po | 4740 ++++++++++++++++++++++++---------------------
- po/pl.po | 3877 ++++++++++++++++++++++++++++++-------
- po/pt.po | 4536 +++++++++++++++++++++++--------------------
- po/pt_BR.po | 1433 +++++++-------
- po/ru.po | 4696 +++++++++++++++++++++++++--------------------
- po/rw.po | 4595 +++++++++++++++++++++++---------------------
- po/sk.po | 4526 +++++++++++++++++++++++--------------------
- po/sl.po | 4550 ++++++++++++++++++++++++--------------------
- po/sq.po | 4496 +++++++++++++++++++++++--------------------
- po/sr.po | 4604 +++++++++++++++++++++++---------------------
- po/sr@latin.po | 4604 +++++++++++++++++++++++---------------------
- po/sv.po | 4950 +++++++++++++++++++++++++----------------------
- po/ta.po | 4647 +++++++++++++++++++++++++--------------------
- po/te.po | 4639 ++++++++++++++++++++++++--------------------
- po/th.po | 4546 ++++++++++++++++++++++++--------------------
- po/tr.po | 4647 +++++++++++++++++++++++++--------------------
- po/uk.po | 4845 +++++++++++++++++++++++++---------------------
- po/vi.po | 4505 +++++++++++++++++++++++--------------------
- po/wa.po | 4543 ++++++++++++++++++++++++--------------------
- po/zh_CN.po | 4671 +++++++++++++++++++++++++--------------------
- po/zh_HK.po | 4546 ++++++++++++++++++++++++--------------------
- po/zh_TW.po | 4687 +++++++++++++++++++++++++--------------------
- 66 files changed, 162449 insertions(+), 135152 deletions(-)
-
-diff --git a/po/fr.po b/po/fr.po
-index 4193042a1b..4c13083f08 100644
---- a/po/fr.po
-+++ b/po/fr.po
-@@ -19,7 +19,7 @@ msgid ""
- msgstr ""
- "Project-Id-Version: PACKAGE VERSION\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2019-01-08 18:22+0100\n"
-+"POT-Creation-Date: 2019-05-21 09:59+0200\n"
- "PO-Revision-Date: 2017-11-07 06:49+0000\n"
- "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
- "Language-Team: French <trans-fr@lists.fedoraproject.org>\n"
-@@ -30,7 +30,7 @@ msgstr ""
- "Plural-Forms: nplurals=2; plural=n>1;\n"
- "X-Generator: Zanata 4.6.2\n"
-
--#: ../clients/cli/agent.c:40
-+#: ../clients/cli/agent.c:39
- #, c-format
- msgid ""
- "Usage: nmcli agent { COMMAND | help }\n"
-@@ -43,7 +43,7 @@ msgstr ""
- "COMMAND := { secret | polkit | all }\n"
- "\n"
-
--#: ../clients/cli/agent.c:48
-+#: ../clients/cli/agent.c:47
- #, c-format
- msgid ""
- "Usage: nmcli agent secret { help }\n"
-@@ -65,7 +65,7 @@ msgstr ""
- "à l'utilisateur.\n"
- "\n"
-
--#: ../clients/cli/agent.c:58
-+#: ../clients/cli/agent.c:57
- #, c-format
- msgid ""
- "Usage: nmcli agent polkit { help }\n"
-@@ -83,7 +83,7 @@ msgstr ""
- "l'utilisateur et donnera la réponse à polkit.\n"
- "\n"
-
--#: ../clients/cli/agent.c:68
-+#: ../clients/cli/agent.c:67
- #, c-format
- msgid ""
- "Usage: nmcli agent all { help }\n"
-@@ -97,49 +97,49 @@ msgstr ""
- "polkit.\n"
- "\n"
-
--#: ../clients/cli/agent.c:157
-+#: ../clients/cli/agent.c:159
- #, 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"
-
--#: ../clients/cli/agent.c:159
-+#: ../clients/cli/agent.c:161
- #, c-format
- msgid "Error: secret agent initialization failed"
- msgstr "Erreur : l'initialisation de l'agent de secret a échoué"
-
--#: ../clients/cli/agent.c:178
-+#: ../clients/cli/agent.c:180
- #, c-format
- msgid "Error: polkit agent initialization failed: %s"
- msgstr "Erreur : l'initialisation de l'agent polkit a échoué : %s"
-
--#: ../clients/cli/agent.c:186
-+#: ../clients/cli/agent.c:188
- #, c-format
- msgid "nmcli successfully registered as a polkit agent.\n"
- msgstr "nmcli est enregistré comme agent polkit.\n"
-
--#: ../clients/cli/common.c:361 ../clients/cli/common.c:362
--#: ../clients/cli/common.c:393 ../clients/cli/common.c:394
--#: ../clients/cli/connections.c:1454
-+#: ../clients/cli/common.c:360 ../clients/cli/common.c:361
-+#: ../clients/cli/common.c:392 ../clients/cli/common.c:393
-+#: ../clients/cli/connections.c:1460
- msgid "GROUP"
- msgstr "GROUPE"
-
--#: ../clients/cli/common.c:621
-+#: ../clients/cli/common.c:620
- #, c-format
- msgid "Error: openconnect failed: %s\n"
- msgstr "Erreur : échec de openconnect : %s\n"
-
--#: ../clients/cli/common.c:628
-+#: ../clients/cli/common.c:627
- #, c-format
- msgid "Error: openconnect failed with status %d\n"
- msgstr "Erreur : échec de openconnect avec l'état %d\n"
-
--#: ../clients/cli/common.c:630
-+#: ../clients/cli/common.c:629
- #, c-format
- msgid "Error: openconnect failed with signal %d\n"
- msgstr "Erreur : échec de openconnect avec le signal %d\n"
-
--#: ../clients/cli/common.c:711
-+#: ../clients/cli/common.c:717
- #, c-format
- msgid ""
- "Warning: password for '%s' not given in 'passwd-file' and nmcli cannot ask "
-@@ -149,134 +149,134 @@ msgstr ""
- "paramètre« passwd-file » et nmcli ne peut le demander à l'utilisateur sans "
- "l'option « --ask ».\n"
-
--#: ../clients/cli/common.c:1211
-+#: ../clients/cli/common.c:1217
- #, c-format
- msgid "Error: Could not create NMClient object: %s."
- msgstr "Erreur : impossible de créer l'objet NMClient : %s."
-
--#: ../clients/cli/common.c:1231
-+#: ../clients/cli/common.c:1237
- msgid "Error: NetworkManager is not running."
- msgstr "Erreur : NetworkManager n'est pas lancé."
-
--#: ../clients/cli/common.c:1327
-+#: ../clients/cli/common.c:1333
- #, 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:1337
-+#: ../clients/cli/common.c:1343
- msgid "Error: missing argument. Try passing --help."
- msgstr "Erreur : paramètre manquant. Essayez --help."
-
--#: ../clients/cli/common.c:1390
-+#: ../clients/cli/common.c:1412
- msgid "access denied"
- msgstr "accès refusé"
-
--#: ../clients/cli/common.c:1398 ../clients/cli/connections.c:81
--#: ../clients/cli/connections.c:90 ../clients/cli/devices.c:444
--#: ../clients/cli/devices.c:536 ../clients/cli/devices.c:543
--#: ../clients/cli/general.c:41 ../clients/cli/general.c:129
--#: ../clients/cli/general.c:134 ../clients/common/nm-client-utils.c:260
--#: ../clients/common/nm-client-utils.c:273
-+#: ../clients/cli/common.c:1420 ../clients/cli/connections.c:79
-+#: ../clients/cli/connections.c:88 ../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:282
--#: ../clients/common/nm-meta-setting-desc.c:1567
--#: ../clients/common/nm-meta-setting-desc.c:1617
--#: ../clients/common/nm-meta-setting-desc.c:2757
--#: ../clients/common/nm-meta-setting-desc.c:2812
-+#: ../clients/common/nm-client-utils.c:281
-+#: ../clients/common/nm-client-utils.c:286
-+#: ../clients/common/nm-meta-setting-desc.c:1766
-+#: ../clients/common/nm-meta-setting-desc.c:1797
-+#: ../clients/common/nm-meta-setting-desc.c:2708
-+#: ../clients/common/nm-meta-setting-desc.c:2766
- msgid "unknown"
- msgstr "inconnu"
-
--#: ../clients/cli/common.c:1399
-+#: ../clients/cli/common.c:1421
- msgid "none"
- msgstr "aucun"
-
--#: ../clients/cli/common.c:1400
-+#: ../clients/cli/common.c:1422
- msgid "portal"
- msgstr "portail"
-
--#: ../clients/cli/common.c:1401
-+#: ../clients/cli/common.c:1423
- msgid "limited"
- msgstr "limité"
-
--#: ../clients/cli/common.c:1402
-+#: ../clients/cli/common.c:1424
- msgid "full"
- msgstr "plein"
-
- #. define some prompts for connection editor
--#: ../clients/cli/connections.c:65
-+#: ../clients/cli/connections.c:63
- msgid "Setting name? "
- msgstr "Nom du paramètre ?"
-
--#: ../clients/cli/connections.c:66
-+#: ../clients/cli/connections.c:64
- msgid "Property name? "
- msgstr "Nom de la propriété ?"
-
--#: ../clients/cli/connections.c:67
-+#: ../clients/cli/connections.c:65
- msgid "Enter connection type: "
- msgstr "Saisissez le type de connexion : "
-
- #. define some other prompts
--#: ../clients/cli/connections.c:71
-+#: ../clients/cli/connections.c:69
- msgid "Connection (name, UUID, or path): "
- msgstr "Connexion (nom, UUID, ou chemin) :"
-
--#: ../clients/cli/connections.c:72
-+#: ../clients/cli/connections.c:70
- msgid "VPN connection (name, UUID, or path): "
- msgstr "Connexion VPN (nom, UUID, ou chemin) :"
-
--#: ../clients/cli/connections.c:73
-+#: ../clients/cli/connections.c:71
- msgid "Connection(s) (name, UUID, or path): "
- msgstr "Connexion(s) (nom, UUID, ou chemin) :"
-
--#: ../clients/cli/connections.c:74
-+#: ../clients/cli/connections.c:72
- msgid "Connection(s) (name, UUID, path or apath): "
- msgstr "Connexion(s) (nom, UUID, path ou apath) : "
-
--#: ../clients/cli/connections.c:82
-+#: ../clients/cli/connections.c:80
- msgid "activating"
- msgstr "activation"
-
--#: ../clients/cli/connections.c:83
-+#: ../clients/cli/connections.c:81
- msgid "activated"
- msgstr "activé"
-
--#: ../clients/cli/connections.c:84 ../clients/common/nm-client-utils.c:271
-+#: ../clients/cli/connections.c:82 ../clients/common/nm-client-utils.c:275
- msgid "deactivating"
- msgstr "désactivation"
-
--#: ../clients/cli/connections.c:85
-+#: ../clients/cli/connections.c:83
- msgid "deactivated"
- msgstr "désactivé"
-
--#: ../clients/cli/connections.c:91
-+#: ../clients/cli/connections.c:89
- msgid "VPN connecting (prepare)"
- msgstr "Connexion VPN (préparation)"
-
--#: ../clients/cli/connections.c:92
-+#: ../clients/cli/connections.c:90
- msgid "VPN connecting (need authentication)"
- msgstr "Connexion VPN (authentification requise)"
-
--#: ../clients/cli/connections.c:93
-+#: ../clients/cli/connections.c:91
- msgid "VPN connecting"
- msgstr "Connexion VPN"
-
--#: ../clients/cli/connections.c:94
-+#: ../clients/cli/connections.c:92
- msgid "VPN connecting (getting IP configuration)"
- msgstr "Connexion VPN (obtention de la configuration IP)"
-
--#: ../clients/cli/connections.c:95
-+#: ../clients/cli/connections.c:93
- msgid "VPN connected"
- msgstr "VPN connecté"
-
--#: ../clients/cli/connections.c:96
-+#: ../clients/cli/connections.c:94
- msgid "VPN connection failed"
- msgstr "Échec de la connexion VPN"
-
--#: ../clients/cli/connections.c:97
-+#: ../clients/cli/connections.c:95
- msgid "VPN disconnected"
- msgstr "VPN déconnecté"
-
--#: ../clients/cli/connections.c:518
-+#: ../clients/cli/connections.c:516
- msgid "never"
- msgstr "jamais"
-
-@@ -1021,342 +1021,337 @@ msgstr ""
- 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:1307
-+#: ../clients/cli/connections.c:1313
- msgid "Connection profile details"
- msgstr "Informations de profil de connexion"
-
--#: ../clients/cli/connections.c:1320 ../clients/cli/connections.c:1405
-+#: ../clients/cli/connections.c:1326 ../clients/cli/connections.c:1411
- #, c-format
- msgid "Error: 'connection show': %s"
- msgstr "Erreur : « connection show » : %s"
-
--#: ../clients/cli/connections.c:1395
-+#: ../clients/cli/connections.c:1401
- msgid "Activate connection details"
- msgstr "Informations d'activation de connexion"
-
--#: ../clients/cli/connections.c:1503 ../clients/cli/devices.c:1453
--#: ../clients/cli/devices.c:1467 ../clients/cli/devices.c:1482
--#: ../clients/cli/devices.c:1540 ../clients/cli/devices.c:1642
-+#: ../clients/cli/connections.c:1509 ../clients/cli/devices.c:1447
-+#: ../clients/cli/devices.c:1461 ../clients/cli/devices.c:1476
-+#: ../clients/cli/devices.c:1534 ../clients/cli/devices.c:1636
- msgid "NAME"
- msgstr "NOM"
-
--#: ../clients/cli/connections.c:1591
-+#: ../clients/cli/connections.c:1602
- #, 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:1606 ../clients/cli/connections.c:1614
-+#: ../clients/cli/connections.c:1612 ../clients/cli/connections.c:1620
- #, c-format
- msgid "'%s' has to be alone"
- msgstr "« %s » doit être seul"
-
--#: ../clients/cli/connections.c:1876
-+#: ../clients/cli/connections.c:1880
- #, c-format
- msgid "incorrect string '%s' of '--order' option"
- msgstr "chaîne incorrecte « %s » de l'option « --order »"
-
--#: ../clients/cli/connections.c:1901
-+#: ../clients/cli/connections.c:1905
- #, c-format
- msgid "incorrect item '%s' in '--order' option"
- msgstr "élément incorrect « %s » de l'option « --order »"
-
--#: ../clients/cli/connections.c:1939
-+#: ../clients/cli/connections.c:1943
- msgid "No connection specified"
- msgstr "Aucune connexion spécifiée."
-
--#: ../clients/cli/connections.c:1950
-+#: ../clients/cli/connections.c:1954
- #, c-format
- msgid "%s argument is missing"
- msgstr "le paramètre %s est manquant"
-
--#: ../clients/cli/connections.c:1968
-+#: ../clients/cli/connections.c:1972
- #, c-format
- msgid "unknown connection '%s'"
- msgstr "connexion inconnue : « %s »"
-
--#: ../clients/cli/connections.c:1997
-+#: ../clients/cli/connections.c:2001
- msgid "'--order' argument is missing"
- msgstr "l'argument de « --order » est manquant"
-
--#: ../clients/cli/connections.c:2057
-+#: ../clients/cli/connections.c:2061
- 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:2058
-+#: ../clients/cli/connections.c:2062
- msgid "NetworkManager connection profiles"
- msgstr "Profils de connexion NetworkManager"
-
--#: ../clients/cli/connections.c:2110 ../clients/cli/connections.c:2856
--#: ../clients/cli/connections.c:2868 ../clients/cli/connections.c:2880
--#: ../clients/cli/connections.c:3109 ../clients/cli/connections.c:8899
--#: ../clients/cli/connections.c:8915 ../clients/cli/devices.c:2976
--#: ../clients/cli/devices.c:2988 ../clients/cli/devices.c:3001
--#: ../clients/cli/devices.c:3195 ../clients/cli/devices.c:3206
--#: ../clients/cli/devices.c:3224 ../clients/cli/devices.c:3233
--#: ../clients/cli/devices.c:3254 ../clients/cli/devices.c:3265
--#: ../clients/cli/devices.c:3283 ../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:3952
--#: ../clients/cli/devices.c:3963 ../clients/cli/devices.c:4134
-+#: ../clients/cli/connections.c:2114 ../clients/cli/connections.c:2859
-+#: ../clients/cli/connections.c:2871 ../clients/cli/connections.c:2883
-+#: ../clients/cli/connections.c:3112 ../clients/cli/connections.c:8866
-+#: ../clients/cli/connections.c:8887 ../clients/cli/devices.c:2970
-+#: ../clients/cli/devices.c:2982 ../clients/cli/devices.c:2995
-+#: ../clients/cli/devices.c:3189 ../clients/cli/devices.c:3200
-+#: ../clients/cli/devices.c:3218 ../clients/cli/devices.c:3227
-+#: ../clients/cli/devices.c:3248 ../clients/cli/devices.c:3259
-+#: ../clients/cli/devices.c:3277 ../clients/cli/devices.c:3721
-+#: ../clients/cli/devices.c:3731 ../clients/cli/devices.c:3739
-+#: ../clients/cli/devices.c:3751 ../clients/cli/devices.c:3766
-+#: ../clients/cli/devices.c:3774 ../clients/cli/devices.c:3949
-+#: ../clients/cli/devices.c:3960 ../clients/cli/devices.c:4131
- #, c-format
- msgid "Error: %s argument is missing."
- msgstr "Erreur : le paramètre %s est manquant."
-
--#: ../clients/cli/connections.c:2138
-+#: ../clients/cli/connections.c:2142
- #, c-format
- msgid "Error: %s - no such connection profile."
- msgstr "Erreur : %s - profil de connexion introuvable."
-
--#: ../clients/cli/connections.c:2229 ../clients/cli/connections.c:2843
--#: ../clients/cli/connections.c:2907 ../clients/cli/connections.c:8419
--#: ../clients/cli/connections.c:8525 ../clients/cli/connections.c:9015
--#: ../clients/cli/devices.c:1727 ../clients/cli/devices.c:1995
--#: ../clients/cli/devices.c:2168 ../clients/cli/devices.c:2276
--#: ../clients/cli/devices.c:2468 ../clients/cli/devices.c:3915
--#: ../clients/cli/devices.c:4140 ../clients/cli/general.c:895
-+#: ../clients/cli/connections.c:2233 ../clients/cli/connections.c:2846
-+#: ../clients/cli/connections.c:2910 ../clients/cli/connections.c:8383
-+#: ../clients/cli/connections.c:8489 ../clients/cli/connections.c:8992
-+#: ../clients/cli/devices.c:1721 ../clients/cli/devices.c:1989
-+#: ../clients/cli/devices.c:2162 ../clients/cli/devices.c:2270
-+#: ../clients/cli/devices.c:2462 ../clients/cli/devices.c:3912
-+#: ../clients/cli/devices.c:4137 ../clients/cli/general.c:896
- #, c-format
- msgid "Error: %s."
- msgstr "Erreur : %s."
-
--#: ../clients/cli/connections.c:2322
-+#: ../clients/cli/connections.c:2326
- #, c-format
- msgid "no active connection on device '%s'"
- msgstr "aucune connexion active sur le périphérique « %s »"
-
--#: ../clients/cli/connections.c:2330
-+#: ../clients/cli/connections.c:2334
- msgid "no active connection or device"
- msgstr "aucune connexion ou périphérique actif"
-
--#: ../clients/cli/connections.c:2350
-+#: ../clients/cli/connections.c:2354
- #, fuzzy, c-format
- msgid "device '%s' not compatible with connection '%s': "
- msgstr "périphérique « %s » incompatible avec la connexion « %s » :"
-
--#: ../clients/cli/connections.c:2383
-+#: ../clients/cli/connections.c:2387
- #, c-format
- msgid "device '%s' not compatible with connection '%s'"
- msgstr "périphérique « %s » incompatible avec la connexion « %s »"
-
--#: ../clients/cli/connections.c:2386
-+#: ../clients/cli/connections.c:2390
- #, c-format
- msgid "no device found for connection '%s'"
- msgstr "aucun périphérique trouvé pour la connexion « %s »"
-
--#: ../clients/cli/connections.c:2437
-+#: ../clients/cli/connections.c:2441
- #, c-format
- msgid "Hint: use '%s' to get more details."
- msgstr ""
-
--#: ../clients/cli/connections.c:2455
-+#: ../clients/cli/connections.c:2459
- #, 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:2459 ../clients/cli/connections.c:2609
--#: ../clients/cli/connections.c:6716
-+#: ../clients/cli/connections.c:2463 ../clients/cli/connections.c:2613
-+#: ../clients/cli/connections.c:6701
- #, 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:2466 ../clients/cli/connections.c:2588
-+#: ../clients/cli/connections.c:2470 ../clients/cli/connections.c:2592
- #, c-format
- msgid "Error: Connection activation failed: %s"
- msgstr "Erreur : l'activation de la connexion a échoué : %s"
-
--#: ../clients/cli/connections.c:2503
-+#: ../clients/cli/connections.c:2507
- #, c-format
- msgid "Error: Timeout expired (%d seconds)"
- msgstr "Erreur : le délai d'attente a expiré (%d secondes)"
-
--#: ../clients/cli/connections.c:2671
-+#: ../clients/cli/connections.c:2675
- #, 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:2684
-+#: ../clients/cli/connections.c:2688
- #, c-format
- msgid "missing colon in 'password' entry '%s'"
- msgstr "Virgule manquant dans la saisie du mot de passe « %s »"
-
--#: ../clients/cli/connections.c:2692
-+#: ../clients/cli/connections.c:2696
- #, c-format
- msgid "missing dot in 'password' entry '%s'"
- msgstr "Point manquant dans la saisie du mot de passe « %s »"
-
--#: ../clients/cli/connections.c:2705
-+#: ../clients/cli/connections.c:2709
- #, 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:2759
-+#: ../clients/cli/connections.c:2763
- #, c-format
- msgid "unknown device '%s'."
- msgstr "périphérique inconnu « %s »."
-
--#: ../clients/cli/connections.c:2764
-+#: ../clients/cli/connections.c:2768
- 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:2890 ../clients/cli/devices.c:1686
--#: ../clients/cli/devices.c:3033 ../clients/cli/devices.c:3296
--#: ../clients/cli/devices.c:3969
-+#: ../clients/cli/connections.c:2893 ../clients/cli/devices.c:1680
-+#: ../clients/cli/devices.c:3027 ../clients/cli/devices.c:3290
-+#: ../clients/cli/devices.c:3966
- #, c-format
- msgid "Unknown parameter: %s\n"
- msgstr "Paramètre inconnu : %s\n"
-
--#: ../clients/cli/connections.c:2915
-+#: ../clients/cli/connections.c:2918
- msgid "preparing"
- msgstr "préparation"
-
--#: ../clients/cli/connections.c:3024
-+#: ../clients/cli/connections.c:3027
- #, c-format
- msgid "Connection '%s' (%s) successfully deleted.\n"
- msgstr "Connexion « %s » (%s) supprimée.\n"
-
--#: ../clients/cli/connections.c:3040
-+#: ../clients/cli/connections.c:3043
- #, 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:3091 ../clients/cli/connections.c:8633
--#: ../clients/cli/connections.c:8664 ../clients/cli/connections.c:8822
-+#: ../clients/cli/connections.c:3094 ../clients/cli/connections.c:8597
-+#: ../clients/cli/connections.c:8628 ../clients/cli/connections.c:8786
- #, c-format
- msgid "Error: No connection specified."
- msgstr "Erreur : aucune connexion spécifiée."
-
--#: ../clients/cli/connections.c:3121
-+#: ../clients/cli/connections.c:3124
- #, 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:3122
-+#: ../clients/cli/connections.c:3125
- #, c-format
- msgid "Error: not all active connections found."
- msgstr "Erreur : les connexions n'ont pas toutes été trouvées."
-
--#: ../clients/cli/connections.c:3130
-+#: ../clients/cli/connections.c:3133
- #, c-format
- msgid "Error: no active connection provided."
- msgstr "Erreur : aucune connexion fournie."
-
--#: ../clients/cli/connections.c:3161
-+#: ../clients/cli/connections.c:3164
- #, 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:3412 ../clients/cli/connections.c:3469
--#: ../clients/common/nm-client-utils.c:221
-+#: ../clients/cli/connections.c:3415 ../clients/cli/connections.c:3472
-+#: ../clients/common/nm-client-utils.c:225
- #, 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:3432 ../clients/cli/connections.c:3492
--#: ../clients/common/nm-client-utils.c:289
-+#: ../clients/cli/connections.c:3435 ../clients/cli/connections.c:3495
-+#: ../clients/common/nm-client-utils.c:293
- #, c-format
- msgid "Unknown error"
- msgstr "Erreur inconnue"
-
--#: ../clients/cli/connections.c:3626
-+#: ../clients/cli/connections.c:3629
- #, 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"
-
--#: ../clients/cli/connections.c:3979
-+#: ../clients/cli/connections.c:3984
- #, c-format
- msgid "Error: invalid property '%s': %s."
- msgstr "Erreur : propriété « %s » non valide : %s."
-
--#: ../clients/cli/connections.c:3996
--#, c-format
--msgid "Error: failed to modify %s.%s: %s."
-+#: ../clients/cli/connections.c:3998
-+#, fuzzy, c-format
-+msgid "Error: failed to %s %s.%s: %s."
- msgstr "Erreur : échec de la modification de %s.%s : %s."
-
--#: ../clients/cli/connections.c:4016
--#, c-format
--msgid "Error: failed to remove a value from %s.%s: %s."
--msgstr "Erreur : échec lors de la suppression d'une valeur de %s.%s : %s."
--
--#: ../clients/cli/connections.c:4050
-+#: ../clients/cli/connections.c:4033
- #, c-format
- msgid "Error: '%s' is mandatory."
- msgstr "Erreur : « %s » est obligatoire."
-
--#: ../clients/cli/connections.c:4077
-+#: ../clients/cli/connections.c:4060
- #, c-format
- msgid "Error: invalid slave type; %s."
- msgstr "Erreur : type esclave invalide ; %s."
-
--#: ../clients/cli/connections.c:4085
-+#: ../clients/cli/connections.c:4068
- #, c-format
- msgid "Error: invalid connection type; %s."
- msgstr "Erreur : type de connexion non valide ; %s."
-
--#: ../clients/cli/connections.c:4162
-+#: ../clients/cli/connections.c:4145
- #, c-format
- msgid "Error: bad connection type: %s"
- msgstr "Erreur : type de connexion invalide : %s."
-
--#: ../clients/cli/connections.c:4208
-+#: ../clients/cli/connections.c:4191
- #, c-format
- msgid "Error: '%s': %s"
- msgstr "Erreur : « %s » : %s"
-
--#: ../clients/cli/connections.c:4229
-+#: ../clients/cli/connections.c:4212
- msgid "Error: master is required"
- msgstr "Erreur : « master » requis."
-
--#: ../clients/cli/connections.c:4288
-+#: ../clients/cli/connections.c:4271
- #, 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:4319
-+#: ../clients/cli/connections.c:4302
- #, 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"
-
--#: ../clients/cli/connections.c:4350
-+#: ../clients/cli/connections.c:4333
- #, 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."
-
--#: ../clients/cli/connections.c:4599
-+#: ../clients/cli/connections.c:4582
- #, c-format
- msgid "Error: value for '%s' is missing."
- msgstr "Erreur : la valeur de l'argument « %s » est requise."
-
--#: ../clients/cli/connections.c:4645
-+#: ../clients/cli/connections.c:4628
- msgid "Error: <setting>.<property> argument is missing."
- msgstr "Erreur : l'argument <setting>.<property> est manquant."
-
--#: ../clients/cli/connections.c:4668
-+#: ../clients/cli/connections.c:4651
- #, 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:4714 ../clients/cli/connections.c:4730
-+#: ../clients/cli/connections.c:4699 ../clients/cli/connections.c:4715
- #, 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:4748
-+#: ../clients/cli/connections.c:4733
- #, c-format
- msgid "Error: invalid <setting>.<property> '%s'."
- msgstr "Erreur : <setting>.<property> non valide '%s’."
-
--#: ../clients/cli/connections.c:4792 ../clients/cli/connections.c:8465
-+#: ../clients/cli/connections.c:4777 ../clients/cli/connections.c:8429
- #, c-format
- msgid "Error: Failed to add '%s' connection: %s"
- msgstr "Erreur: impossible d'ajouter la connexion « %s » : %s"
-
--#: ../clients/cli/connections.c:4810
-+#: ../clients/cli/connections.c:4795
- #, c-format
- msgid ""
- "Warning: There is another connection with the name '%1$s'. Reference the "
-@@ -1371,32 +1366,32 @@ 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:4819
-+#: ../clients/cli/connections.c:4804
- #, c-format
- msgid "Connection '%s' (%s) successfully added.\n"
- msgstr "Connexion « %s » (%s) ajoutée avec succès.\n"
-
--#: ../clients/cli/connections.c:4872 ../clients/cli/connections.c:6839
--#: ../clients/cli/connections.c:6840 ../clients/cli/devices.c:535
--#: ../clients/cli/devices.c:542 ../clients/cli/devices.c:1207
--#: ../clients/cli/general.c:136 ../clients/cli/utils.h:296
--#: ../clients/common/nm-client-utils.c:279
--#: ../clients/common/nm-meta-setting-desc.c:771
--#: ../clients/common/nm-meta-setting-desc.c:2752
-+#: ../clients/cli/connections.c:4857 ../clients/cli/connections.c:6824
-+#: ../clients/cli/connections.c:6825 ../clients/cli/devices.c:529
-+#: ../clients/cli/devices.c:536 ../clients/cli/devices.c:1201
-+#: ../clients/cli/general.c:137 ../clients/cli/utils.h:296
-+#: ../clients/common/nm-client-utils.c:283
-+#: ../clients/common/nm-meta-setting-desc.c:939
-+#: ../clients/common/nm-meta-setting-desc.c:2703
- msgid "no"
- msgstr "non"
-
--#: ../clients/cli/connections.c:4873 ../clients/cli/connections.c:6839
--#: ../clients/cli/connections.c:6840 ../clients/cli/devices.c:534
--#: ../clients/cli/devices.c:541 ../clients/cli/devices.c:1207
--#: ../clients/cli/general.c:135 ../clients/cli/utils.h:296
--#: ../clients/common/nm-client-utils.c:278
--#: ../clients/common/nm-meta-setting-desc.c:771
--#: ../clients/common/nm-meta-setting-desc.c:2749
-+#: ../clients/cli/connections.c:4858 ../clients/cli/connections.c:6824
-+#: ../clients/cli/connections.c:6825 ../clients/cli/devices.c:528
-+#: ../clients/cli/devices.c:535 ../clients/cli/devices.c:1201
-+#: ../clients/cli/general.c:136 ../clients/cli/utils.h:296
-+#: ../clients/common/nm-client-utils.c:282
-+#: ../clients/common/nm-meta-setting-desc.c:939
-+#: ../clients/common/nm-meta-setting-desc.c:2700
- msgid "yes"
- msgstr "oui"
-
--#: ../clients/cli/connections.c:4959
-+#: ../clients/cli/connections.c:4944
- #, c-format
- msgid ""
- "You can specify this option more than once. Press <Enter> when you're done.\n"
-@@ -1405,36 +1400,36 @@ msgstr ""
- "vous avez terminé.\n"
-
- #. Ask for optional arguments.
--#: ../clients/cli/connections.c:5061
-+#: ../clients/cli/connections.c:5046
- #, 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:5067
-+#: ../clients/cli/connections.c:5052
- #, 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:5200 ../clients/cli/utils.c:295
-+#: ../clients/cli/connections.c:5185 ../clients/cli/utils.c:293
- #, c-format
- msgid "Error: value for '%s' argument is required."
- msgstr "Erreur : la valeur de l'argument « %s » est requise."
-
--#: ../clients/cli/connections.c:5207
-+#: ../clients/cli/connections.c:5192
- #, c-format
- msgid "Error: 'save': %s."
- msgstr "Erreur: « save » : %s."
-
--#: ../clients/cli/connections.c:5293 ../clients/cli/connections.c:5304
-+#: ../clients/cli/connections.c:5278 ../clients/cli/connections.c:5289
- #, c-format
- msgid "Error: '%s' argument is required."
- msgstr "Erreur : l'argument « %s » est requis."
-
--#: ../clients/cli/connections.c:6269
-+#: ../clients/cli/connections.c:6254
- #, c-format
- msgid "['%s' setting values]\n"
- msgstr "[« %s » setting values]\n"
-@@ -1442,7 +1437,7 @@ 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:6378
-+#: ../clients/cli/connections.c:6363
- #, c-format
- msgid ""
- "---[ Main menu ]---\n"
-@@ -1477,7 +1472,7 @@ msgstr ""
- "nmcli <conf-option> <value> :: configuration de nmcli\n"
- "quit :: quitter nmcli\n"
-
--#: ../clients/cli/connections.c:6405
-+#: ../clients/cli/connections.c:6390
- #, c-format
- msgid ""
- "goto <setting>[.<prop>] | <prop> :: enter setting/property for editing\n"
-@@ -1498,7 +1493,7 @@ msgstr ""
- " nmcli connection> goto secondaries\n"
- " nmcli> goto ipv4.addresses\n"
-
--#: ../clients/cli/connections.c:6412
-+#: ../clients/cli/connections.c:6397
- #, c-format
- msgid ""
- "remove <setting>[.<prop>] :: remove setting or reset property value\n"
-@@ -1520,7 +1515,7 @@ msgstr ""
- "Exemples : nmcli> remove wifi-sec\n"
- " nmcli> remove eth.mtu\n"
-
--#: ../clients/cli/connections.c:6419
-+#: ../clients/cli/connections.c:6404
- #, c-format
- msgid ""
- "set [<setting>.<prop> <value>] :: set property value\n"
-@@ -1535,7 +1530,7 @@ msgstr ""
- "\n"
- "Exemple : nmcli> set con.id My connection\n"
-
--#: ../clients/cli/connections.c:6424
-+#: ../clients/cli/connections.c:6409
- #, c-format
- msgid ""
- "describe [<setting>.<prop>] :: describe property\n"
-@@ -1548,7 +1543,7 @@ msgstr ""
- "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:6429
-+#: ../clients/cli/connections.c:6414
- #, c-format
- msgid ""
- "print [all] :: print setting or connection values\n"
-@@ -1563,7 +1558,7 @@ msgstr ""
- "\n"
- "Exemple : nmcli ipv4> print all\n"
-
--#: ../clients/cli/connections.c:6434
-+#: ../clients/cli/connections.c:6419
- #, c-format
- msgid ""
- "verify [all | fix] :: verify setting or connection validity\n"
-@@ -1589,7 +1584,7 @@ msgstr ""
- " nmcli> verify fix\n"
- " nmcli bond> verifyerify\n"
-
--#: ../clients/cli/connections.c:6443
-+#: ../clients/cli/connections.c:6428
- #, c-format
- msgid ""
- "save [persistent|temporary] :: save the connection\n"
-@@ -1619,7 +1614,7 @@ msgstr ""
- "connexion\n"
- "persitante, le profil de connexion devra être supprimé.\n"
-
--#: ../clients/cli/connections.c:6454
-+#: ../clients/cli/connections.c:6439
- #, c-format
- msgid ""
- "activate [<ifname>] [/<ap>|<nsp>] :: activate the connection\n"
-@@ -1640,7 +1635,7 @@ msgstr ""
- "/<ap>|<nsp> - AP (Wi-Fi) ou NSP (WiMAX) (ajouter avec ou lorsque <ifname> "
- "n'est pas spécifié)\n"
-
--#: ../clients/cli/connections.c:6461 ../clients/cli/connections.c:6619
-+#: ../clients/cli/connections.c:6446 ../clients/cli/connections.c:6604
- #, c-format
- msgid ""
- "back :: go to upper menu level\n"
-@@ -1649,7 +1644,7 @@ msgstr ""
- "back :: aller au niveau supérieur du menu\n"
- "\n"
-
--#: ../clients/cli/connections.c:6464
-+#: ../clients/cli/connections.c:6449
- #, c-format
- msgid ""
- "help/? [<command>] :: help for the nmcli commands\n"
-@@ -1658,7 +1653,7 @@ msgstr ""
- "help/? [<command>] :: aide pour les commandes nmcli\n"
- "\n"
-
--#: ../clients/cli/connections.c:6467
-+#: ../clients/cli/connections.c:6452
- #, c-format
- msgid ""
- "nmcli [<conf-option> <value>] :: nmcli configuration\n"
-@@ -1684,7 +1679,7 @@ msgstr ""
- " nmcli> nmcli save-confirmation no\n"
- " nmcli> nmcli prompt-color 3\n"
-
--#: ../clients/cli/connections.c:6489 ../clients/cli/connections.c:6625
-+#: ../clients/cli/connections.c:6474 ../clients/cli/connections.c:6610
- #, c-format
- msgid ""
- "quit :: exit nmcli\n"
-@@ -1698,8 +1693,8 @@ msgstr ""
- "modification n'est pas enregistrée, il est demandé à l'utilisateur de "
- "confirmer l'action.\n"
-
--#: ../clients/cli/connections.c:6494 ../clients/cli/connections.c:6630
--#: ../clients/cli/connections.c:7065 ../clients/cli/connections.c:8048
-+#: ../clients/cli/connections.c:6479 ../clients/cli/connections.c:6615
-+#: ../clients/cli/connections.c:7024 ../clients/cli/connections.c:8009
- #, c-format
- msgid "Unknown command: '%s'\n"
- msgstr "Commande inconnue : « %s »\n"
-@@ -1707,7 +1702,7 @@ 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:6559
-+#: ../clients/cli/connections.c:6544
- #, c-format
- msgid ""
- "---[ Property menu ]---\n"
-@@ -1736,7 +1731,7 @@ msgstr ""
- "commande\n"
- "quit :: quitter nmcli\n"
-
--#: ../clients/cli/connections.c:6584
-+#: ../clients/cli/connections.c:6569
- #, c-format
- msgid ""
- "set [<value>] :: set new value\n"
-@@ -1747,7 +1742,7 @@ msgstr ""
- "\n"
- "Cette commande définit la <value> (valeur) fournie à cette propriété\n"
-
--#: ../clients/cli/connections.c:6588
-+#: ../clients/cli/connections.c:6573
- #, c-format
- msgid ""
- "add [<value>] :: append new value to the property\n"
-@@ -1762,7 +1757,7 @@ msgstr ""
- "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:6594
-+#: ../clients/cli/connections.c:6579
- #, c-format
- msgid ""
- "change :: change current value\n"
-@@ -1773,7 +1768,7 @@ msgstr ""
- "\n"
- "Affiche la valeur actuelle et permet sa modification.\n"
-
--#: ../clients/cli/connections.c:6598
-+#: ../clients/cli/connections.c:6583
- #, c-format
- msgid ""
- "remove [<value>|<index>|<option name>] :: delete the value\n"
-@@ -1810,7 +1805,7 @@ msgstr ""
- " nmcli bond.options> remove downdelay\n"
- "\n"
-
--#: ../clients/cli/connections.c:6609
-+#: ../clients/cli/connections.c:6594
- #, c-format
- msgid ""
- "describe :: describe property\n"
-@@ -1824,7 +1819,7 @@ msgstr ""
- "manuel nm-settings(5) pour voir tous les paramètres et toutes les propriétés "
- "NM.\n"
-
--#: ../clients/cli/connections.c:6614
-+#: ../clients/cli/connections.c:6599
- #, c-format
- msgid ""
- "print [property|setting|connection] :: print property (setting, connection) "
-@@ -1840,7 +1835,7 @@ msgstr ""
- "pourrez aussi afficher les valeurs de la totalité du paramètre ou de la "
- "connexion.\n"
-
--#: ../clients/cli/connections.c:6622
-+#: ../clients/cli/connections.c:6607
- #, c-format
- msgid ""
- "help/? [<command>] :: help for nmcli commands\n"
-@@ -1849,30 +1844,30 @@ msgstr ""
- "help/? [<command>] :: aide pour les commandes nmcli\n"
- "\n"
-
--#: ../clients/cli/connections.c:6722
-+#: ../clients/cli/connections.c:6707
- #, c-format
- msgid "Error: Connection activation failed.\n"
- msgstr "Erreur : échec de l'activation de la connexion.\n"
-
--#: ../clients/cli/connections.c:6819
-+#: ../clients/cli/connections.c:6804
- #, 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"
-
- #. TRANSLATORS: status line in nmcli connection editor
--#: ../clients/cli/connections.c:6837
-+#: ../clients/cli/connections.c:6822
- #, 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:6873
-+#: ../clients/cli/connections.c:6858
- #, 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"
-
--#: ../clients/cli/connections.c:6915
-+#: ../clients/cli/connections.c:6899
- #, c-format
- msgid ""
- "The connection profile has been removed from another client. You may type "
-@@ -1881,66 +1876,60 @@ 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:6949 ../clients/cli/connections.c:7364
--#: ../clients/cli/connections.c:7424
-+#: ../clients/cli/connections.c:6933 ../clients/cli/connections.c:7323
-+#: ../clients/cli/connections.c:7382
- #, 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:6953 ../clients/cli/connections.c:7368
--#: ../clients/cli/connections.c:7428
-+#: ../clients/cli/connections.c:6937 ../clients/cli/connections.c:7327
-+#: ../clients/cli/connections.c:7386
- #, c-format
- msgid "Enter '%s' value: "
- msgstr "Saisissez la valeur « %s » : "
-
--#: ../clients/cli/connections.c:6968 ../clients/cli/connections.c:6990
--#: ../clients/cli/connections.c:7373 ../clients/cli/connections.c:7434
-+#: ../clients/cli/connections.c:6951 ../clients/cli/connections.c:6964
-+#: ../clients/cli/connections.c:7331 ../clients/cli/connections.c:7397
- #, 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:6983
-+#: ../clients/cli/connections.c:6960
- #, c-format
- msgid "Edit '%s' value: "
- msgstr "Paramétrer la valeur « %s » :"
-
--#: ../clients/cli/connections.c:7012 ../clients/cli/settings.c:395
-+#: ../clients/cli/connections.c:6978 ../clients/cli/settings.c:414
- #, c-format
- msgid "Error: %s\n"
- msgstr "Erreur : %s\n"
-
--#: ../clients/cli/connections.c:7017 ../clients/cli/connections.c:7532
--#: ../clients/cli/connections.c:7583
--#, 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:7038
-+#: ../clients/cli/connections.c:6997
- #, c-format
- msgid "Unknown command argument: '%s'\n"
- msgstr "Argument de commande inconnu : « %s »\n"
-
--#: ../clients/cli/connections.c:7129
-+#: ../clients/cli/connections.c:7088
- #, c-format
- msgid "Available settings: %s\n"
- msgstr "Paramètres disponibles : %s\n"
-
--#: ../clients/cli/connections.c:7141
-+#: ../clients/cli/connections.c:7100
- #, c-format
- msgid "Error: invalid setting name; %s\n"
- msgstr "Erreur : nom de paramètre non valide ; %s\n"
-
--#: ../clients/cli/connections.c:7159
-+#: ../clients/cli/connections.c:7118
- #, c-format
- msgid "Available properties: %s\n"
- msgstr "Propriétés disponibles : %s\n"
-
--#: ../clients/cli/connections.c:7167
-+#: ../clients/cli/connections.c:7126
- #, c-format
- msgid "Error: property %s\n"
- msgstr "Erreur : propriété %s\n"
-
--#: ../clients/cli/connections.c:7212
-+#: ../clients/cli/connections.c:7171
- #, c-format
- msgid ""
- "Saving the connection with 'autoconnect=yes'. That might result in an "
-@@ -1951,12 +1940,12 @@ msgstr ""
- "l'activation immédiate de la connexion.\n"
- "Souhaitez-vous tout de même enregistrer ? %s"
-
--#: ../clients/cli/connections.c:7298
-+#: ../clients/cli/connections.c:7257
- #, 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:7329
-+#: ../clients/cli/connections.c:7288
- #, c-format
- msgid ""
- "The connection profile has been removed from another client. You may type "
-@@ -1965,222 +1954,227 @@ 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:7377 ../clients/cli/connections.c:7628
--#: ../clients/cli/connections.c:7660
-+#: ../clients/cli/connections.c:7335 ../clients/cli/connections.c:7589
-+#: ../clients/cli/connections.c:7621
- #, 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:7378
-+#: ../clients/cli/connections.c:7336
- #, 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:7393 ../clients/cli/connections.c:7559
--#: ../clients/cli/connections.c:7650
-+#: ../clients/cli/connections.c:7351 ../clients/cli/connections.c:7521
-+#: ../clients/cli/connections.c:7611
- #, 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:7402
-+#: ../clients/cli/connections.c:7360
- #, 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:7409
-+#: ../clients/cli/connections.c:7367
- #, c-format
- msgid "Error: invalid property: %s\n"
- msgstr "Erreur : propriété non valide : %s\n"
-
--#: ../clients/cli/connections.c:7466
-+#: ../clients/cli/connections.c:7429
- #, c-format
- msgid "Error: unknown setting '%s'\n"
- msgstr "Erreur : paramètre inconnu « %s »\n"
-
--#: ../clients/cli/connections.c:7491
-+#: ../clients/cli/connections.c:7454
- #, 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:7537
-+#: ../clients/cli/connections.c:7494 ../clients/cli/connections.c:7544
-+#, 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:7499
- #, c-format
- msgid "Error: no argument given; valid are [%s]\n"
- msgstr "Erreur : aucun argument donné ; [%s] sont valides\n"
-
--#: ../clients/cli/connections.c:7556
-+#: ../clients/cli/connections.c:7518
- #, 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:7604
-+#: ../clients/cli/connections.c:7565
- #, 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"
-
--#: ../clients/cli/connections.c:7629 ../clients/cli/connections.c:7661
-+#: ../clients/cli/connections.c:7590 ../clients/cli/connections.c:7622
- #, c-format
- msgid "use 'goto <setting>' first, or 'describe <setting>.<property>'\n"
- msgstr ""
- "utilisez d'abord « goto <setting> » ou « describe <setting>.<property> »\n"
-
--#: ../clients/cli/connections.c:7684
-+#: ../clients/cli/connections.c:7645
- #, 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"
-
--#: ../clients/cli/connections.c:7714
-+#: ../clients/cli/connections.c:7675
- #, c-format
- msgid "Error: unknown setting: '%s'\n"
- msgstr "Erreur : paramètre inconnu : « %s »\n"
-
--#: ../clients/cli/connections.c:7719
-+#: ../clients/cli/connections.c:7680
- #, 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:7750
-+#: ../clients/cli/connections.c:7711
- #, c-format
- msgid "Error: invalid property: %s%s\n"
- msgstr "Erreur : propriété non valide : %s%s,\n"
-
--#: ../clients/cli/connections.c:7752
-+#: ../clients/cli/connections.c:7713
- 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:7768
-+#: ../clients/cli/connections.c:7729
- #, c-format
- msgid "Invalid verify option: %s\n"
- msgstr "Option de vérification non valide : %s\n"
-
--#: ../clients/cli/connections.c:7776
-+#: ../clients/cli/connections.c:7737
- #, c-format
- msgid "Verify setting '%s': %s\n"
- msgstr "Vérifier le paramètre « %s » : %s\n"
-
--#: ../clients/cli/connections.c:7791
-+#: ../clients/cli/connections.c:7752
- #, c-format
- msgid "Verify connection: %s\n"
- msgstr "Vérifier la connexion : %s\n"
-
--#: ../clients/cli/connections.c:7794
-+#: ../clients/cli/connections.c:7755
- #, 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:7815
-+#: ../clients/cli/connections.c:7776
- #, c-format
- msgid "Error: invalid argument '%s'\n"
- msgstr "Erreur : argument « %s » non valideerify\n"
-
--#: ../clients/cli/connections.c:7867
-+#: ../clients/cli/connections.c:7828
- #, 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:7873
-+#: ../clients/cli/connections.c:7834
- #, fuzzy, c-format
- msgid "Error: Timeout saving '%s' (%s) connection\n"
- msgstr "Erreur : échec de l'enregistrement de la connexion « %s » (%s) : %s\n"
-
--#: ../clients/cli/connections.c:7878
-+#: ../clients/cli/connections.c:7839
- #, c-format
- msgid "Connection '%s' (%s) successfully saved.\n"
- msgstr "Connexion « %s » (%s) enregistrée.\n"
-
--#: ../clients/cli/connections.c:7879
-+#: ../clients/cli/connections.c:7840
- #, c-format
- msgid "Connection '%s' (%s) successfully updated.\n"
- msgstr "Connexion « %s » (%s) mise à jour.\n"
-
--#: ../clients/cli/connections.c:7912
-+#: ../clients/cli/connections.c:7873
- #, 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:7913
-+#: ../clients/cli/connections.c:7874
- msgid "(unknown error)"
- msgstr "(erreur inconnue)"
-
--#: ../clients/cli/connections.c:7914
-+#: ../clients/cli/connections.c:7875
- #, 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:7936
-+#: ../clients/cli/connections.c:7897
- #, 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"
-
--#: ../clients/cli/connections.c:7940
-+#: ../clients/cli/connections.c:7901
- #, c-format
- msgid "Error: connection is not valid: %s\n"
- msgstr "Erreur : la connexion n'est pas valide : %s\n"
-
--#: ../clients/cli/connections.c:7950
-+#: ../clients/cli/connections.c:7911
- #, c-format
- msgid "Error: Cannot activate connection: %s.\n"
- msgstr "Erreur : impossible d'activer la connexion : %s.\n"
-
--#: ../clients/cli/connections.c:7959
-+#: ../clients/cli/connections.c:7920
- #, 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:7966
-+#: ../clients/cli/connections.c:7927
- 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"
-
--#: ../clients/cli/connections.c:8002
-+#: ../clients/cli/connections.c:7963
- #, c-format
- msgid "Error: status-line: %s\n"
- msgstr "Erreur : statut ligne : %s\n"
-
--#: ../clients/cli/connections.c:8010
-+#: ../clients/cli/connections.c:7971
- #, c-format
- msgid "Error: save-confirmation: %s\n"
- msgstr "Erreur : sauvegarder confirmation : %s\n"
-
--#: ../clients/cli/connections.c:8018
-+#: ../clients/cli/connections.c:7979
- #, c-format
- msgid "Error: show-secrets: %s\n"
- msgstr "Erreur : afficher les secrets : %s\n"
-
--#: ../clients/cli/connections.c:8025
-+#: ../clients/cli/connections.c:7986
- #, c-format
- msgid "Current nmcli configuration:\n"
- msgstr "Configuration nmcli actuelle :\n"
-
--#: ../clients/cli/connections.c:8033
-+#: ../clients/cli/connections.c:7994
- #, c-format
- msgid "Invalid configuration option '%s'; allowed [%s]\n"
- msgstr "Option de configuration « %s » non valide ; [%s] autorisé\n"
-
--#: ../clients/cli/connections.c:8251
-+#: ../clients/cli/connections.c:8215
- #, 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."
-
--#: ../clients/cli/connections.c:8265 ../clients/cli/connections.c:8426
-+#: ../clients/cli/connections.c:8229 ../clients/cli/connections.c:8390
- #, c-format
- msgid "Error: Unknown connection '%s'."
- msgstr "Erreur : connexion inconnue : « %s »."
-
--#: ../clients/cli/connections.c:8281
-+#: ../clients/cli/connections.c:8245
- #, 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"
-
--#: ../clients/cli/connections.c:8284
-+#: ../clients/cli/connections.c:8248
- #, c-format
- msgid ""
- "Warning: editing existing connection '%s'; 'con-name' argument is ignored\n"
-@@ -2188,241 +2182,241 @@ msgstr ""
- "Avertissement : modification de la connexion existante « %s » ; l'argument "
- "« con-name » est ignoré\n"
-
--#: ../clients/cli/connections.c:8311
-+#: ../clients/cli/connections.c:8275
- #, c-format
- msgid "Valid connection types: %s\n"
- msgstr "Types de connexion valides : %s\n"
-
--#: ../clients/cli/connections.c:8313
-+#: ../clients/cli/connections.c:8277
- #, c-format
- msgid "Error: invalid connection type; %s\n"
- msgstr "Erreur : type de connexion non valide ; %s\n"
-
--#: ../clients/cli/connections.c:8349
-+#: ../clients/cli/connections.c:8313
- #, c-format
- msgid "===| nmcli interactive connection editor |==="
- msgstr "===| éditeur de connexions interactives nmcli |==="
-
--#: ../clients/cli/connections.c:8352
-+#: ../clients/cli/connections.c:8316
- #, c-format
- msgid "Editing existing '%s' connection: '%s'"
- msgstr "Modification de la connexion « %s » : « %s »"
-
--#: ../clients/cli/connections.c:8354
-+#: ../clients/cli/connections.c:8318
- #, c-format
- msgid "Adding a new '%s' connection"
- msgstr "Ajout d'une nouvelle connexion « %s »"
-
--#: ../clients/cli/connections.c:8356
-+#: ../clients/cli/connections.c:8320
- #, c-format
- msgid "Type 'help' or '?' for available commands."
- msgstr "Saisissez « help » ou « ? » pour les commandes disponibles."
-
--#: ../clients/cli/connections.c:8358
-+#: ../clients/cli/connections.c:8322
- #, c-format
- msgid "Type 'print' to show all the connection properties."
- msgstr ""
- "Saisissez « print » (imprimer) pour afficher toutes les propriétés de "
- "connexion."
-
--#: ../clients/cli/connections.c:8360
-+#: ../clients/cli/connections.c:8324
- #, 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."
-
--#: ../clients/cli/connections.c:8388
-+#: ../clients/cli/connections.c:8352
- #, 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:8394
-+#: ../clients/cli/connections.c:8358
- #, c-format
- msgid "Connection '%s' (%s) successfully modified.\n"
- msgstr "Connexion « %s » (%s) modifiée.\n"
-
--#: ../clients/cli/connections.c:8470
-+#: ../clients/cli/connections.c:8434
- #, 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:8536
-+#: ../clients/cli/connections.c:8500
- msgid "New connection name: "
- msgstr "Nom de la nouvelle connexion :"
-
--#: ../clients/cli/connections.c:8538
-+#: ../clients/cli/connections.c:8502
- #, c-format
- msgid "Error: <new name> argument is missing."
- msgstr "Erreur : le paramètre <new name> est manquant."
-
--#: ../clients/cli/connections.c:8543 ../clients/cli/connections.c:9026
-+#: ../clients/cli/connections.c:8507 ../clients/cli/connections.c:9003
- #, c-format
- msgid "Error: unknown extra argument: '%s'."
- msgstr "Erreur : argument supplémentaire « %s » inconnu"
-
--#: ../clients/cli/connections.c:8588
-+#: ../clients/cli/connections.c:8552
- #, c-format
- msgid "Error: not all connections deleted."
- msgstr "Erreur : les connexions n'ont pas toutes été supprimées."
-
--#: ../clients/cli/connections.c:8589
--#, c-format
--msgid "Error: Connection deletion failed: %s"
-+#: ../clients/cli/connections.c:8553
-+#, fuzzy, c-format
-+msgid "Error: Connection deletion failed: %s\n"
- msgstr "Erreur : la suppression de la connexion a échoué : %s"
-
--#: ../clients/cli/connections.c:8645 ../clients/cli/connections.c:8766
-+#: ../clients/cli/connections.c:8609 ../clients/cli/connections.c:8730
- #, c-format
- msgid "Error: %s.\n"
- msgstr "Erreur : %s.\n"
-
--#: ../clients/cli/connections.c:8646 ../clients/cli/connections.c:8767
-+#: ../clients/cli/connections.c:8610 ../clients/cli/connections.c:8731
- #, 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:8697
-+#: ../clients/cli/connections.c:8661
- #, c-format
- msgid "Error: cannot delete unknown connection(s): %s."
- msgstr ""
- "Erreur : impossible de supprimer la(les) connexion(s) inconnue(s) : %s."
-
--#: ../clients/cli/connections.c:8707
-+#: ../clients/cli/connections.c:8671
- #, c-format
- msgid "%s: connection profile changed\n"
- msgstr "%s: le profil de connexion a changé\n"
-
--#: ../clients/cli/connections.c:8733
-+#: ../clients/cli/connections.c:8697
- #, c-format
- msgid "%s: connection profile created\n"
- msgstr "%s: profil de connection créé\n"
-
--#: ../clients/cli/connections.c:8742
-+#: ../clients/cli/connections.c:8706
- #, c-format
- msgid "%s: connection profile removed\n"
- msgstr "%s: profil de connexion supprimé\n"
-
--#: ../clients/cli/connections.c:8804
-+#: ../clients/cli/connections.c:8768
- #, c-format
- msgid "Error: failed to reload connections: %s."
- msgstr "Erreur : échec lors du rechargement des connexions : %s."
-
--#: ../clients/cli/connections.c:8837
-+#: ../clients/cli/connections.c:8801
- #, c-format
- msgid "Error: failed to load connection: %s."
- msgstr "Erreur : échec lors du rechargement de la connexion : %s."
-
--#: ../clients/cli/connections.c:8845
-+#: ../clients/cli/connections.c:8809
- #, c-format
- msgid "Could not load file '%s'\n"
- msgstr "Impossible de charger le fichier « %s »\n"
-
--#: ../clients/cli/connections.c:8852
-+#: ../clients/cli/connections.c:8816
- msgid "File to import: "
- msgstr "Fichier à importer :"
-
--#: ../clients/cli/connections.c:8886
-+#: ../clients/cli/connections.c:8850
- #, c-format
- msgid "Error: No arguments provided."
- msgstr "Erreur : aucun argument fourni."
-
--#: ../clients/cli/connections.c:8909
-+#: ../clients/cli/connections.c:8881
- #, 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:8923
-+#: ../clients/cli/connections.c:8895
- #, 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:8925
-+#: ../clients/cli/connections.c:8897
- #, c-format
- msgid "Unknown parameter: %s"
- msgstr "Paramètre inconnu : %s"
-
--#: ../clients/cli/connections.c:8936
-+#: ../clients/cli/connections.c:8908
- #, c-format
- msgid "Error: 'type' argument is required."
- msgstr "Erreur : l'argument « type » est requis."
-
--#: ../clients/cli/connections.c:8940
-+#: ../clients/cli/connections.c:8912
- #, c-format
- msgid "Error: 'file' argument is required."
- msgstr "Erreur : l'argument «fichier » est requis."
-
--#: ../clients/cli/connections.c:8946
-+#: ../clients/cli/connections.c:8921
- #, 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:8953 ../clients/cli/connections.c:9047
-+#: ../clients/cli/connections.c:8928 ../clients/cli/connections.c:9024
- #, c-format
- msgid "Error: failed to load VPN plugin: %s."
- msgstr "Erreur : échec du chargement du greffon de VPN : %s."
-
--#: ../clients/cli/connections.c:8960
-+#: ../clients/cli/connections.c:8937
- #, c-format
- msgid "Error: failed to import '%s': %s."
- msgstr "Erreur : n'a pas pu importer « %s »: %s."
-
--#: ../clients/cli/connections.c:9033
-+#: ../clients/cli/connections.c:9010
- msgid "Output file name: "
- msgstr "Nom du fichier de sortie :"
-
--#: ../clients/cli/connections.c:9038
-+#: ../clients/cli/connections.c:9015
- #, c-format
- msgid "Error: the connection is not VPN."
- msgstr "Erreur : la connexion n'est pas VPN."
-
--#: ../clients/cli/connections.c:9060
-+#: ../clients/cli/connections.c:9037
- #, c-format
- msgid "Error: failed to create temporary file %s."
- msgstr "Erreur : impossible de créer le fichier temporaire %s"
-
--#: ../clients/cli/connections.c:9068
-+#: ../clients/cli/connections.c:9045
- #, c-format
- msgid "Error: failed to export '%s': %s."
- msgstr "Erreur : n'a pas pu exporter « %s » : %s."
-
--#: ../clients/cli/connections.c:9080
-+#: ../clients/cli/connections.c:9057
- #, 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:39
-+#: ../clients/cli/devices.c:37
- msgid "Interface: "
- msgstr "Interface : "
-
--#: ../clients/cli/devices.c:40
-+#: ../clients/cli/devices.c:38
- msgid "Interface(s): "
- msgstr "Interface(s) : "
-
--#: ../clients/cli/devices.c:73 ../clients/cli/devices.c:1235
-+#: ../clients/cli/devices.c:73 ../clients/cli/devices.c:1229
- msgid "(none)"
- msgstr "(aucun)"
-
--#: ../clients/cli/devices.c:184 ../clients/cli/devices.c:191
-+#: ../clients/cli/devices.c:178 ../clients/cli/devices.c:185
- msgid "(unknown)"
- msgstr "(inconnu)"
-
--#: ../clients/cli/devices.c:339
-+#: ../clients/cli/devices.c:333
- #, c-format
- msgid "<invisible> | %s"
- msgstr "<invisible> | %s"
-
--#: ../clients/cli/devices.c:340
-+#: ../clients/cli/devices.c:334
- msgid "<invisible>"
- msgstr "<invisible>"
-
--#: ../clients/cli/devices.c:441
-+#: ../clients/cli/devices.c:435
- #, c-format
- msgid "%u Mb/s"
- msgstr "%u Mo/s"
-
--#: ../clients/cli/devices.c:695
-+#: ../clients/cli/devices.c:689
- #, c-format
- msgid ""
- "Usage: nmcli device { COMMAND | help }\n"
-@@ -2501,7 +2495,7 @@ msgstr ""
- " lldp [list [ifname <ifname>]]\n"
- "\n"
-
--#: ../clients/cli/devices.c:718
-+#: ../clients/cli/devices.c:712
- #, c-format
- msgid ""
- "Usage: nmcli device status { help }\n"
-@@ -2532,7 +2526,7 @@ msgstr ""
- "status'.\n"
- "\n"
-
--#: ../clients/cli/devices.c:733
-+#: ../clients/cli/devices.c:727
- #, c-format
- msgid ""
- "Usage: nmcli device show { ARGUMENTS | help }\n"
-@@ -2552,7 +2546,7 @@ msgstr ""
- "périphérique donné.\n"
- "\n"
-
--#: ../clients/cli/devices.c:744
-+#: ../clients/cli/devices.c:738
- #, c-format
- msgid ""
- "Usage: nmcli device connect { ARGUMENTS | help }\n"
-@@ -2576,7 +2570,7 @@ msgstr ""
- "auto-connect.\n"
- "\n"
-
--#: ../clients/cli/devices.c:756
-+#: ../clients/cli/devices.c:750
- #, c-format
- msgid ""
- "Usage: nmcli device reapply { ARGUMENTS | help }\n"
-@@ -2595,7 +2589,7 @@ msgstr ""
- "à la connexion active depuis sa dernière application.\n"
- "\n"
-
--#: ../clients/cli/devices.c:767
-+#: ../clients/cli/devices.c:761
- #, c-format
- msgid ""
- "Usage: nmcli device modify { ARGUMENTS | --help }\n"
-@@ -2635,7 +2629,7 @@ msgstr ""
- "nmcli dev mod em1 -ipv4.dns 1\n"
- "nmcli dev mod em1 -ipv6.addr \"abbe::cafe/56\"\n"
-
--#: ../clients/cli/devices.c:787
-+#: ../clients/cli/devices.c:781
- #, c-format
- msgid ""
- "Usage: nmcli device disconnect { ARGUMENTS | help }\n"
-@@ -2658,7 +2652,7 @@ msgstr ""
- "l'utilisateur.\n"
- "\n"
-
--#: ../clients/cli/devices.c:799
-+#: ../clients/cli/devices.c:793
- #, c-format
- msgid ""
- "Usage: nmcli device delete { ARGUMENTS | help }\n"
-@@ -2683,7 +2677,7 @@ msgstr ""
- "commande.\n"
- "\n"
-
--#: ../clients/cli/devices.c:812
-+#: ../clients/cli/devices.c:806
- #, c-format
- msgid ""
- "Usage: nmcli device set { ARGUMENTS | help }\n"
-@@ -2706,7 +2700,7 @@ msgstr ""
- "Modifie les propriétés du périphérique.\n"
- "\n"
-
--#: ../clients/cli/devices.c:825
-+#: ../clients/cli/devices.c:819
- #, c-format
- msgid ""
- "Usage: nmcli device monitor { ARGUMENTS | help }\n"
-@@ -2728,7 +2722,7 @@ msgstr ""
- "Surveille tous les périphériques si aucune interface n'est spécifiée.\n"
- "\n"
-
--#: ../clients/cli/devices.c:837
-+#: ../clients/cli/devices.c:831
- #, fuzzy, c-format
- msgid ""
- "Usage: nmcli device wifi { ARGUMENTS | help }\n"
-@@ -2839,7 +2833,7 @@ msgstr ""
- "veuillez utiliser « nmcli device wifi list » pour cela.\n"
- "\n"
-
--#: ../clients/cli/devices.c:884
-+#: ../clients/cli/devices.c:878
- #, c-format
- msgid ""
- "Usage: nmcli device lldp { ARGUMENTS | help }\n"
-@@ -2860,262 +2854,246 @@ msgstr ""
- "utilisée pour dresser cette liste pour une interface donnée.\n"
- "\n"
-
--#: ../clients/cli/devices.c:982
-+#: ../clients/cli/devices.c:976
- #, c-format
- msgid "Error: No interface specified."
- msgstr "Erreur : aucune interface spécifiée."
-
--#: ../clients/cli/devices.c:1005
-+#: ../clients/cli/devices.c:999
- #, c-format
- msgid "Warning: argument '%s' is duplicated.\n"
- msgstr "Avertissement : l'argument « %s » est dupliqué.\n"
-
--#: ../clients/cli/devices.c:1008
-+#: ../clients/cli/devices.c:1002
- #, c-format
- msgid "Error: Device '%s' not found.\n"
- msgstr "Erreur : périphérique « %s » introuvable.\n"
-
--#: ../clients/cli/devices.c:1009
-+#: ../clients/cli/devices.c:1003
- #, 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:1040
-+#: ../clients/cli/devices.c:1034
- msgid "No interface specified"
- msgstr "Aucune interface spécifiée"
-
--#: ../clients/cli/devices.c:1059
-+#: ../clients/cli/devices.c:1053
- #, c-format
- msgid "Device '%s' not found"
- msgstr "Périphérique « %s » introuvable"
-
--#: ../clients/cli/devices.c:1155
-+#: ../clients/cli/devices.c:1149
- #, c-format
- msgid "%u MHz"
- msgstr "%u MHz"
-
--#: ../clients/cli/devices.c:1156
-+#: ../clients/cli/devices.c:1150
- #, c-format
- msgid "%u Mbit/s"
- msgstr "%u Mo/s"
-
--#: ../clients/cli/devices.c:1167
--msgid "WEP"
--msgstr "WEP"
--
--#: ../clients/cli/devices.c:1171
--msgid "WPA1"
--msgstr "WPA1"
--
--#: ../clients/cli/devices.c:1175
--msgid "WPA2"
--msgstr "WPA2"
--
--#: ../clients/cli/devices.c:1180
--msgid "802.1X"
--msgstr "802.1X"
--
--#: ../clients/cli/devices.c:1195
-+#: ../clients/cli/devices.c:1189
- msgid "Ad-Hoc"
- msgstr "Ad-Hoc"
-
--#: ../clients/cli/devices.c:1196
-+#: ../clients/cli/devices.c:1190
- msgid "Infra"
- msgstr "Infra"
-
--#: ../clients/cli/devices.c:1197
-+#: ../clients/cli/devices.c:1191
- msgid "N/A"
- msgstr "N/A"
-
--#: ../clients/cli/devices.c:1392
-+#: ../clients/cli/devices.c:1386
- msgid "Device details"
- msgstr "Détails de périphérique"
-
--#: ../clients/cli/devices.c:1403
-+#: ../clients/cli/devices.c:1397
- #, c-format
- msgid "Error: 'device show': %s"
- msgstr "Erreur : « device show » : %s"
-
--#: ../clients/cli/devices.c:1701
-+#: ../clients/cli/devices.c:1695
- msgid "Status of devices"
- msgstr "État des périphériques"
-
--#: ../clients/cli/devices.c:1705
-+#: ../clients/cli/devices.c:1699
- #, c-format
- msgid "Error: 'device status': %s"
- msgstr "Erreur : « device status » : %s"
-
--#: ../clients/cli/devices.c:1732 ../clients/cli/devices.c:2173
--#: ../clients/cli/devices.c:4144
-+#: ../clients/cli/devices.c:1726 ../clients/cli/devices.c:2167
-+#: ../clients/cli/devices.c:4141
- #, c-format
- msgid "Error: invalid extra argument '%s'."
- msgstr "Erreur : argument supplémentaire « %s » non valide."
-
--#: ../clients/cli/devices.c:1768 ../clients/cli/general.c:518
-+#: ../clients/cli/devices.c:1762 ../clients/cli/general.c:519
- #, c-format
- msgid "Error: Timeout %d sec expired."
- msgstr "Erreur : le délai d'attente de %d sec a expiré."
-
--#: ../clients/cli/devices.c:1817
-+#: ../clients/cli/devices.c:1811
- #, c-format
- msgid "Device '%s' successfully activated with '%s'.\n"
- msgstr "Périphérique « %s » activé avec « %s ».\n"
-
--#: ../clients/cli/devices.c:1823
-+#: ../clients/cli/devices.c:1817
- #, 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:1862
-+#: ../clients/cli/devices.c:1856
- #, 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:1865
-+#: ../clients/cli/devices.c:1859
- #, 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"
-
--#: ../clients/cli/devices.c:1868
-+#: ../clients/cli/devices.c:1862
- #, fuzzy, c-format
- msgid "Error: Failed to activate connection: %s"
- msgstr ""
- "Erreur : échec de l'ajout ou de l'activation de la nouvelle connexion : %s"
-
--#: ../clients/cli/devices.c:1938
-+#: ../clients/cli/devices.c:1932
- #, c-format
- msgid "Error: Device activation failed: %s"
- msgstr "Erreur : l'activation du périphérique a échoué : %s"
-
--#: ../clients/cli/devices.c:1947
-+#: ../clients/cli/devices.c:1941
- #, 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:2000
-+#: ../clients/cli/devices.c:1994
- #, c-format
- msgid "Error: extra argument not allowed: '%s'."
- msgstr "Erreur : argument supplémentaire non autorisé : « %s »."
-
--#: ../clients/cli/devices.c:2073 ../clients/cli/devices.c:2088
--#: ../clients/cli/devices.c:2325
-+#: ../clients/cli/devices.c:2067 ../clients/cli/devices.c:2082
-+#: ../clients/cli/devices.c:2319
- #, c-format
- msgid "Device '%s' successfully disconnected.\n"
- msgstr "Périphérique « %s » déconnecté.\n"
-
--#: ../clients/cli/devices.c:2076 ../clients/cli/devices.c:2399
-+#: ../clients/cli/devices.c:2070 ../clients/cli/devices.c:2393
- #, c-format
- msgid "Device '%s' successfully removed.\n"
- msgstr "Périphérique « %s »supprimé.\n"
-
--#: ../clients/cli/devices.c:2138 ../clients/cli/devices.c:2208
-+#: ../clients/cli/devices.c:2132 ../clients/cli/devices.c:2202
- #, 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:2148 ../clients/cli/devices.c:2217
-+#: ../clients/cli/devices.c:2142 ../clients/cli/devices.c:2211
- #, 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:2242
-+#: ../clients/cli/devices.c:2236
- #, 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"
-
--#: ../clients/cli/devices.c:2309
-+#: ../clients/cli/devices.c:2303
- #, 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:2310
-+#: ../clients/cli/devices.c:2304
- #, 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:2390
-+#: ../clients/cli/devices.c:2384
- #, 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:2391
-+#: ../clients/cli/devices.c:2385
- #, 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:2473
-+#: ../clients/cli/devices.c:2467
- #, c-format
- msgid "Error: No property specified."
- msgstr "Erreur : aucune propriété n'a été spécifiée."
-
--#: ../clients/cli/devices.c:2488 ../clients/cli/devices.c:2505
--#: ../clients/cli/general.c:691 ../clients/cli/general.c:703
-+#: ../clients/cli/devices.c:2482 ../clients/cli/devices.c:2499
-+#: ../clients/cli/general.c:692 ../clients/cli/general.c:704
- #, c-format
- msgid "Error: '%s' argument is missing."
- msgstr "Erreur : l'argument « %s » est manquant."
-
--#: ../clients/cli/devices.c:2494
-+#: ../clients/cli/devices.c:2488
- #, c-format
- msgid "Error: 'managed': %s."
- msgstr "Erreur: 'géré': %s."
-
--#: ../clients/cli/devices.c:2511
-+#: ../clients/cli/devices.c:2505
- #, c-format
- msgid "Error: 'autoconnect': %s."
- msgstr "Erreur : « autoconnect » : %s."
-
--#: ../clients/cli/devices.c:2519 ../clients/cli/general.c:717
-+#: ../clients/cli/devices.c:2513 ../clients/cli/general.c:718
- #, c-format
- msgid "Error: property '%s' is not known."
- msgstr "Erreur : propriété « %s » inconnue."
-
--#: ../clients/cli/devices.c:2568
-+#: ../clients/cli/devices.c:2562
- #, c-format
- msgid "%s: using connection '%s'\n"
- msgstr "%s: utilisation de la connection « %s »\n"
-
--#: ../clients/cli/devices.c:2594
-+#: ../clients/cli/devices.c:2588
- #, 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:2601
-+#: ../clients/cli/devices.c:2595
- #, c-format
- msgid "%s: device removed\n"
- msgstr "%s: périphérique supprimé\n"
-
--#: ../clients/cli/devices.c:2781
-+#: ../clients/cli/devices.c:2775
- msgid "Wi-Fi scan list"
- msgstr "Liste de balayage Wi-Fi"
-
--#: ../clients/cli/devices.c:2868
-+#: ../clients/cli/devices.c:2862
- #, 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:3024
-+#: ../clients/cli/devices.c:3018
- #, c-format
- msgid "Error: 'device wifi': %s"
- msgstr "Erreur : « device wifi » : %s"
-
--#: ../clients/cli/devices.c:3042
-+#: ../clients/cli/devices.c:3036
- #, 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]"
-
--#: ../clients/cli/devices.c:3049
-+#: ../clients/cli/devices.c:3043
- #, c-format
- msgid "Error: Device '%s' not found."
- msgstr "Erreur : périphérique « %s » introuvable."
-
--#: ../clients/cli/devices.c:3060
-+#: ../clients/cli/devices.c:3054
- #, c-format
- msgid ""
- "Error: Device '%s' was not recognized as a Wi-Fi device, check "
-@@ -3124,29 +3102,29 @@ 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:3064 ../clients/cli/devices.c:3324
--#: ../clients/cli/devices.c:3823 ../clients/cli/devices.c:3982
-+#: ../clients/cli/devices.c:3058 ../clients/cli/devices.c:3318
-+#: ../clients/cli/devices.c:3819 ../clients/cli/devices.c:3979
- #, 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:3173
-+#: ../clients/cli/devices.c:3167
- msgid "SSID or BSSID: "
- msgstr "SSID ou BSSID : "
-
--#: ../clients/cli/devices.c:3178
-+#: ../clients/cli/devices.c:3172
- #, c-format
- msgid "Error: SSID or BSSID are missing."
- msgstr "Erreur : SSID ou BSSID sont manquants."
-
--#: ../clients/cli/devices.c:3215
-+#: ../clients/cli/devices.c:3209
- #, 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."
-
--#: ../clients/cli/devices.c:3245
-+#: ../clients/cli/devices.c:3239
- #, c-format
- msgid ""
- "Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
-@@ -3154,50 +3132,50 @@ msgstr ""
- "Erreur : la valeur de l'argument wep-key-type « %s » est non valide, "
- "veuillez utiliser « key » ou « phrase »."
-
--#: ../clients/cli/devices.c:3272 ../clients/cli/devices.c:3290
-+#: ../clients/cli/devices.c:3266 ../clients/cli/devices.c:3284
- #, c-format
- msgid "Error: %s: %s."
- msgstr "Erreur : %s : %s."
-
--#: ../clients/cli/devices.c:3307
-+#: ../clients/cli/devices.c:3301
- #, 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)."
-
--#: ../clients/cli/devices.c:3313
-+#: ../clients/cli/devices.c:3307
- #, 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:3326 ../clients/cli/devices.c:3825
--#: ../clients/cli/devices.c:3984
-+#: ../clients/cli/devices.c:3320 ../clients/cli/devices.c:3821
-+#: ../clients/cli/devices.c:3981
- #, c-format
- msgid "Error: No Wi-Fi device found."
- msgstr "Erreur : aucun périphérique Wi-Fi trouvé."
-
--#: ../clients/cli/devices.c:3346
-+#: ../clients/cli/devices.c:3340
- #, c-format
- msgid "Error: Failed to scan hidden SSID: %s."
- msgstr "Erreur : impossible de scanner le SSID caché : %s."
-
--#: ../clients/cli/devices.c:3373
-+#: ../clients/cli/devices.c:3367
- #, c-format
- msgid "Error: No network with SSID '%s' found."
- msgstr "Erreur : aucun réseau avec le SSID « %s » trouvé."
-
--#: ../clients/cli/devices.c:3375
-+#: ../clients/cli/devices.c:3369
- #, 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:3403
-+#: ../clients/cli/devices.c:3397
- #, c-format
- msgid "Error: Connection '%s' exists but properties don't match."
- msgstr ""
-
--#: ../clients/cli/devices.c:3446
-+#: ../clients/cli/devices.c:3440
- #, c-format
- msgid ""
- "Warning: '%s' should be SSID for hidden APs; but it looks like a BSSID.\n"
-@@ -3205,131 +3183,131 @@ 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:3482
-+#: ../clients/cli/devices.c:3477
- msgid "Password: "
- msgstr "Mot de passe :"
-
--#: ../clients/cli/devices.c:3644
-+#: ../clients/cli/devices.c:3640
- #, 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:3657
- #, 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)"
-
--#: ../clients/cli/devices.c:3677
-+#: ../clients/cli/devices.c:3673
- #, c-format
- msgid "Hotspot password: %s\n"
- msgstr "Mot de passe hotspot : %s\n"
-
--#: ../clients/cli/devices.c:3748
-+#: ../clients/cli/devices.c:3744
- #, c-format
- msgid "Error: ssid is too long."
- msgstr "Erreur : « ssid » est trop long."
-
--#: ../clients/cli/devices.c:3762
-+#: ../clients/cli/devices.c:3758
- #, 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 »."
-
--#: ../clients/cli/devices.c:3787
-+#: ../clients/cli/devices.c:3783
- #, c-format
- msgid "Error: Unknown parameter %s."
- msgstr "Erreur : paramètre inconnu : %s."
-
--#: ../clients/cli/devices.c:3807
-+#: ../clients/cli/devices.c:3803
- #, 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:3808
- #, 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:3832
- #, 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."
-
--#: ../clients/cli/devices.c:3870
-+#: ../clients/cli/devices.c:3866
- #, c-format
- msgid "Error: Invalid 'password': %s."
- msgstr "Erreur : le mot de passe est non valide : « %s »"
-
--#: ../clients/cli/devices.c:3945
-+#: ../clients/cli/devices.c:3942
- #, c-format
- msgid "Error: '%s' cannot repeat."
- msgstr "Erreur : le paramètre « %s » ne peut pas être répété."
-
- #. Main header name
--#: ../clients/cli/devices.c:4050
-+#: ../clients/cli/devices.c:4047
- msgid "Device LLDP neighbors"
- msgstr "Voisins du périphérique LLDP"
-
--#: ../clients/cli/devices.c:4160
-+#: ../clients/cli/devices.c:4157
- #, c-format
- msgid "Error: 'device lldp list': %s"
- msgstr "Erreur : « liste des périphériques lldp » : %s"
-
--#: ../clients/cli/general.c:42
-+#: ../clients/cli/general.c:41
- msgid "asleep"
- msgstr "veille"
-
--#: ../clients/cli/general.c:43
-+#: ../clients/cli/general.c:42
- msgid "connecting"
- msgstr "connexion"
-
--#: ../clients/cli/general.c:44
-+#: ../clients/cli/general.c:43
- msgid "connected (local only)"
- msgstr "connecté (local seulement)"
-
--#: ../clients/cli/general.c:45
-+#: ../clients/cli/general.c:44
- msgid "connected (site only)"
- msgstr "connecté (site seulement)"
-
--#: ../clients/cli/general.c:46 ../clients/common/nm-client-utils.c:270
-+#: ../clients/cli/general.c:45 ../clients/common/nm-client-utils.c:274
- msgid "connected"
- msgstr "connecté"
-
--#: ../clients/cli/general.c:47
-+#: ../clients/cli/general.c:46
- msgid "disconnecting"
- msgstr "déconnexion"
-
--#: ../clients/cli/general.c:48 ../clients/common/nm-client-utils.c:263
-+#: ../clients/cli/general.c:47 ../clients/common/nm-client-utils.c:267
- msgid "disconnected"
- msgstr "déconnecté"
-
--#: ../clients/cli/general.c:137
-+#: ../clients/cli/general.c:138
- msgid "auth"
- msgstr "auth"
-
--#: ../clients/cli/general.c:165
-+#: ../clients/cli/general.c:166
- msgid "running"
- msgstr "actif"
-
--#: ../clients/cli/general.c:179
-+#: ../clients/cli/general.c:180
- msgid "starting"
- msgstr "démarrage"
-
--#: ../clients/cli/general.c:179
-+#: ../clients/cli/general.c:180
- msgid "started"
- msgstr "démarré"
-
--#: ../clients/cli/general.c:213
-+#: ../clients/cli/general.c:214
- msgid "enabled"
- msgstr "activé"
-
--#: ../clients/cli/general.c:213
-+#: ../clients/cli/general.c:214
- msgid "disabled"
- msgstr "désactivé"
-
--#: ../clients/cli/general.c:331
-+#: ../clients/cli/general.c:332
- #, c-format
- msgid ""
- "Usage: nmcli general { COMMAND | help }\n"
-@@ -3358,7 +3336,7 @@ msgstr ""
- " logging [level <log level>] [domains <log domains>]\n"
- "\n"
-
--#: ../clients/cli/general.c:342
-+#: ../clients/cli/general.c:343
- #, c-format
- msgid ""
- "Usage: nmcli general status { help }\n"
-@@ -3375,7 +3353,7 @@ msgstr ""
- "appelle « nmcli gen status »\n"
- "\n"
-
--#: ../clients/cli/general.c:351
-+#: ../clients/cli/general.c:352
- #, c-format
- msgid ""
- "Usage: nmcli general hostname { ARGUMENTS | help }\n"
-@@ -3399,7 +3377,7 @@ msgstr ""
- "d'hôte persistant du système.\n"
- "\n"
-
--#: ../clients/cli/general.c:363
-+#: ../clients/cli/general.c:364
- #, c-format
- msgid ""
- "Usage: nmcli general permissions { help }\n"
-@@ -3412,7 +3390,7 @@ msgstr ""
- "Affiche les permissions de l'appelant pour les opérations authentifiées.\n"
- "\n"
-
--#: ../clients/cli/general.c:371
-+#: ../clients/cli/general.c:372
- #, c-format
- msgid ""
- "Usage: nmcli general logging { ARGUMENTS | help }\n"
-@@ -3440,7 +3418,7 @@ msgstr ""
- "pour obtenir la liste des domaines de connexion possibles.\n"
- "\n"
-
--#: ../clients/cli/general.c:384
-+#: ../clients/cli/general.c:385
- #, c-format
- msgid ""
- "Usage: nmcli networking { COMMAND | help }\n"
-@@ -3465,7 +3443,7 @@ msgstr ""
- " connectivity [check]\n"
- "\n"
-
--#: ../clients/cli/general.c:394
-+#: ../clients/cli/general.c:395
- #, c-format
- msgid ""
- "Usage: nmcli networking on { help }\n"
-@@ -3478,7 +3456,7 @@ msgstr ""
- "Active la mise en réseau.\n"
- "\n"
-
--#: ../clients/cli/general.c:402
-+#: ../clients/cli/general.c:403
- #, c-format
- msgid ""
- "Usage: nmcli networking off { help }\n"
-@@ -3491,7 +3469,7 @@ msgstr ""
- "Désactive la mise en réseau.\n"
- "\n"
-
--#: ../clients/cli/general.c:410
-+#: ../clients/cli/general.c:411
- #, c-format
- msgid ""
- "Usage: nmcli networking connectivity { ARGUMENTS | help }\n"
-@@ -3512,7 +3490,7 @@ msgstr ""
- "connectivité.\n"
- "\n"
-
--#: ../clients/cli/general.c:422
-+#: ../clients/cli/general.c:423
- #, c-format
- msgid ""
- "Usage: nmcli radio { COMMAND | help }\n"
-@@ -3529,7 +3507,7 @@ msgstr ""
- " all | wifi | wwan | wimax [ on | off ]\n"
- "\n"
-
--#: ../clients/cli/general.c:431
-+#: ../clients/cli/general.c:432
- #, c-format
- msgid ""
- "Usage: nmcli radio all { ARGUMENTS | help }\n"
-@@ -3547,7 +3525,7 @@ msgstr ""
- "désactiver.\n"
- "\n"
-
--#: ../clients/cli/general.c:441
-+#: ../clients/cli/general.c:442
- #, c-format
- msgid ""
- "Usage: nmcli radio wifi { ARGUMENTS | help }\n"
-@@ -3565,7 +3543,7 @@ msgstr ""
- "désactiver.\n"
- "\n"
-
--#: ../clients/cli/general.c:451
-+#: ../clients/cli/general.c:452
- #, c-format
- msgid ""
- "Usage: nmcli radio wwan { ARGUMENTS | help }\n"
-@@ -3583,7 +3561,7 @@ msgstr ""
- "le désactiver.\n"
- "\n"
-
--#: ../clients/cli/general.c:461
-+#: ../clients/cli/general.c:462
- #, c-format
- msgid ""
- "Usage: nmcli monitor\n"
-@@ -3598,180 +3576,180 @@ msgstr ""
- "Imprime une ligne à chaque changement du NetworkManager\n"
- "\n"
-
--#: ../clients/cli/general.c:491
-+#: ../clients/cli/general.c:492
- msgid "NetworkManager status"
- msgstr "État de NetworkManager"
-
--#: ../clients/cli/general.c:495
-+#: ../clients/cli/general.c:496
- #, c-format
- msgid "Error: only these fields are allowed: %s"
- msgstr "Erreur : seuls ces champs sont autorisés : %s"
-
--#: ../clients/cli/general.c:548
-+#: ../clients/cli/general.c:549
- msgid "NetworkManager permissions"
- msgstr "Permissions NetworkManager"
-
--#: ../clients/cli/general.c:552
-+#: ../clients/cli/general.c:553
- #, c-format
- msgid "Error: 'general permissions': %s"
- msgstr "Erreur : « general permissions » : %s"
-
--#: ../clients/cli/general.c:641
-+#: ../clients/cli/general.c:642
- msgid "NetworkManager logging"
- msgstr "Journalisation NetworkManager"
-
--#: ../clients/cli/general.c:645
-+#: ../clients/cli/general.c:646
- #, c-format
- msgid "Error: 'general logging': %s"
- msgstr "Erreur : « general logging » : %s"
-
--#: ../clients/cli/general.c:727
-+#: ../clients/cli/general.c:728
- #, c-format
- msgid "Error: failed to set logging: %s"
- msgstr "Erreur : accès refusé pour définir la journalisation : %s"
-
--#: ../clients/cli/general.c:744
-+#: ../clients/cli/general.c:745
- #, 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:813
-+#: ../clients/cli/general.c:814
- #, 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)"
-
--#: ../clients/cli/general.c:838
-+#: ../clients/cli/general.c:839
- #, 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:886 ../clients/cli/general.c:898
-+#: ../clients/cli/general.c:887 ../clients/cli/general.c:899
- msgid "Connectivity"
- msgstr "Connectivité"
-
--#: ../clients/cli/general.c:901
-+#: ../clients/cli/general.c:902
- #, c-format
- msgid "Error: 'networking' command '%s' is not valid."
- msgstr "Erreur : commande « networking » « %s » non valide."
-
--#: ../clients/cli/general.c:915
-+#: ../clients/cli/general.c:916
- msgid "Networking"
- msgstr "Réseau"
-
- #. no argument, show all radio switches
--#: ../clients/cli/general.c:950
-+#: ../clients/cli/general.c:951
- msgid "Radio switches"
- msgstr "Interrupteurs radio"
-
- #. no argument, show current Wi-Fi state
--#: ../clients/cli/general.c:980
-+#: ../clients/cli/general.c:981
- msgid "Wi-Fi radio switch"
- msgstr "Interrupteur radio Wi-Fi"
-
- #. no argument, show current WWAN (mobile broadband) state
--#: ../clients/cli/general.c:1007
-+#: ../clients/cli/general.c:1008
- msgid "WWAN radio switch"
- msgstr "Interrupteur radio WWAN"
-
--#: ../clients/cli/general.c:1055
-+#: ../clients/cli/general.c:1056
- msgid "NetworkManager has started"
- msgstr "Le NetworkManager a démarré"
-
--#: ../clients/cli/general.c:1055
-+#: ../clients/cli/general.c:1056
- msgid "NetworkManager has stopped"
- msgstr "Le NetworkManager est arrêté"
-
--#: ../clients/cli/general.c:1066
-+#: ../clients/cli/general.c:1067
- #, c-format
- msgid "Hostname set to '%s'\n"
- msgstr "Nom d'hôte défini à « %s »\n"
-
--#: ../clients/cli/general.c:1081
-+#: ../clients/cli/general.c:1082
- #, c-format
- msgid "'%s' is now the primary connection\n"
- msgstr "« %s » est la connexion primaire.\n"
-
--#: ../clients/cli/general.c:1083
-+#: ../clients/cli/general.c:1084
- #, c-format
- msgid "There's no primary connection\n"
- msgstr "Il n'y a pas de connexion primaire\n"
-
--#: ../clients/cli/general.c:1095
-+#: ../clients/cli/general.c:1096
- #, c-format
- msgid "Connectivity is now '%s'\n"
- msgstr "La connectivité est « %s » maintenant\n"
-
--#: ../clients/cli/general.c:1109
-+#: ../clients/cli/general.c:1110
- #, 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:1129
-+#: ../clients/cli/general.c:1130
- msgid "connection available"
- msgstr "connexion disponible"
-
--#: ../clients/cli/general.c:1131
-+#: ../clients/cli/general.c:1132
- msgid "connections available"
- msgstr "connexions disponibles"
-
--#: ../clients/cli/general.c:1149
-+#: ../clients/cli/general.c:1150
- msgid "autoconnect"
- msgstr "connexion automatique"
-
--#: ../clients/cli/general.c:1151
-+#: ../clients/cli/general.c:1152
- msgid "fw missing"
- msgstr "fw manquant"
-
--#: ../clients/cli/general.c:1156
-+#: ../clients/cli/general.c:1157
- msgid "plugin missing"
- msgstr "greffon manquant"
-
--#: ../clients/cli/general.c:1161
-+#: ../clients/cli/general.c:1162
- msgid "sw"
- msgstr "sw"
-
--#: ../clients/cli/general.c:1163
-+#: ../clients/cli/general.c:1164
- msgid "hw"
- msgstr "hw"
-
--#: ../clients/cli/general.c:1168
-+#: ../clients/cli/general.c:1169
- msgid "iface"
- msgstr "iface"
-
--#: ../clients/cli/general.c:1171
-+#: ../clients/cli/general.c:1172
- msgid "port"
- msgstr "port"
-
--#: ../clients/cli/general.c:1174
-+#: ../clients/cli/general.c:1175
- msgid "mtu"
- msgstr "mtu"
-
--#: ../clients/cli/general.c:1191
-+#: ../clients/cli/general.c:1192
- msgid "master"
- msgstr "master"
-
--#: ../clients/cli/general.c:1195 ../clients/tui/nm-editor-utils.c:239
-+#: ../clients/cli/general.c:1196 ../clients/tui/nm-editor-utils.c:239
- #: ../clients/tui/nmt-connect-connection-list.c:407
- msgid "VPN"
- msgstr "VPN"
-
--#: ../clients/cli/general.c:1197
-+#: ../clients/cli/general.c:1198
- msgid "ip4 default"
- msgstr "ip4 par défaut"
-
--#: ../clients/cli/general.c:1199
-+#: ../clients/cli/general.c:1200
- msgid "ip6 default"
- msgstr "ip6 par défaut"
-
--#: ../clients/cli/general.c:1281
-+#: ../clients/cli/general.c:1282
- #, c-format
- msgid "%s VPN connection"
- msgstr "Connexion VPN « %s »"
-
--#: ../clients/cli/general.c:1349
-+#: ../clients/cli/general.c:1350
- #, c-format
- msgid ""
- "Use \"nmcli device show\" to get complete information about known devices "
-@@ -3788,17 +3766,17 @@ msgstr ""
- "Consultez les pages de manuel nmcli(1) et nmcli-examples(7) pour les détails "
- "complets d'utilisation.\n"
-
--#: ../clients/cli/general.c:1370
-+#: ../clients/cli/general.c:1371
- #, c-format
- msgid "Error: 'monitor' command '%s' is not valid."
- msgstr "Erreur : commande « monitor » « %s » non valide."
-
--#: ../clients/cli/general.c:1382
-+#: ../clients/cli/general.c:1383
- 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:245
--#, c-format
-+#: ../clients/cli/nmcli.c:244
-+#, fuzzy, c-format
- msgid ""
- "Usage: nmcli [OPTIONS] OBJECT { COMMAND | help }\n"
- "\n"
-@@ -3815,7 +3793,7 @@ msgid ""
- " -p, --pretty pretty output\n"
- " -s, --show-secrets allow displaying passwords\n"
- " -t, --terse terse output\n"
--" -v, --version how program version\n"
-+" -v, --version show program version\n"
- " -w, --wait <seconds> set timeout waiting for finishing "
- "operations\n"
- "\n"
-@@ -3861,98 +3839,98 @@ msgstr ""
- " m[onitor] monitor NetworkManager changes\n"
- "\n"
-
--#: ../clients/cli/nmcli.c:325
-+#: ../clients/cli/nmcli.c:324
- #, c-format
- msgid "Error: missing argument for '%s' option."
- msgstr "Erreur : paramètre manquant pour l'option « %s »."
-
--#: ../clients/cli/nmcli.c:626
-+#: ../clients/cli/nmcli.c:625
- #, c-format
- msgid "Unexpected end of file following '%s'\n"
- msgstr "Fin inattendue du fichier après « %s »\n"
-
--#: ../clients/cli/nmcli.c:634
-+#: ../clients/cli/nmcli.c:633
- #, c-format
- msgid "Expected whitespace following '%s'\n"
- msgstr "Espacement prévu après « %s »\n"
-
--#: ../clients/cli/nmcli.c:646
-+#: ../clients/cli/nmcli.c:645
- #, c-format
- msgid "Expected a value for '%s'\n"
- msgstr "Valeur attendue pour « %s »\n"
-
--#: ../clients/cli/nmcli.c:660
-+#: ../clients/cli/nmcli.c:659
- #, 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:749
-+#: ../clients/cli/nmcli.c:748
- #, 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:754
-+#: ../clients/cli/nmcli.c:753
- #, c-format
- msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
- msgstr "Erreur : option « --terse » mutuellement exclusive avec « --pretty »."
-
--#: ../clients/cli/nmcli.c:762
-+#: ../clients/cli/nmcli.c:761
- #, 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:767
-+#: ../clients/cli/nmcli.c:766
- #, c-format
- msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
- msgstr "Erreur : option « --pretty » mutuellement exclusive avec « --terse »."
-
--#: ../clients/cli/nmcli.c:782
-+#: ../clients/cli/nmcli.c:781
- #, 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:796 ../clients/cli/nmcli.c:808
-+#: ../clients/cli/nmcli.c:795 ../clients/cli/nmcli.c:807
- #, 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 »."
-
--#: ../clients/cli/nmcli.c:832
-+#: ../clients/cli/nmcli.c:831
- #, 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:839
-+#: ../clients/cli/nmcli.c:838
- #, c-format
- msgid "nmcli tool, version %s\n"
- msgstr "outil nmcli, version %s\n"
-
--#: ../clients/cli/nmcli.c:847
-+#: ../clients/cli/nmcli.c:846
- #, c-format
- msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
- msgstr "Erreur : option « %s » inconnue, essayez « nmcli -help »."
-
--#: ../clients/cli/nmcli.c:903 ../clients/cli/nmcli.c:910
-+#: ../clients/cli/nmcli.c:902 ../clients/cli/nmcli.c:909
- #, c-format
- msgid "Error: nmcli terminated by signal %s (%d)"
- msgstr "Erreur : nmcli terminé par le signal %s (%d)"
-
--#: ../clients/cli/nmcli.c:1060
-+#: ../clients/cli/nmcli.c:1059
- msgid "Success"
- msgstr "Succès"
-
--#: ../clients/cli/polkit-agent.c:69
-+#: ../clients/cli/polkit-agent.c:68
- #, c-format
- msgid "Authentication message: %s\n"
- msgstr "Message d'authentication : %s\n"
-
--#: ../clients/cli/polkit-agent.c:77
-+#: ../clients/cli/polkit-agent.c:76
- #, 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:137
-+#: ../clients/cli/polkit-agent.c:136
- #, c-format
- msgid "Warning: polkit agent initialization failed: %s\n"
- msgstr "Warning: l'initialisation de l'agent polkit a échoué : %s\n"
-@@ -3967,7 +3945,7 @@ msgstr "Souhaitez-vous aussi définir « %s » sur « %s » ? [yes] : "
- msgid "Do you also want to clear '%s'? [yes]: "
- msgstr "Souhaitez-vous aussi supprimer « %s » ? [yes] : "
-
--#: ../clients/cli/settings.c:224
-+#: ../clients/cli/settings.c:243
- #, c-format
- msgid ""
- "Warning: %s.%s set to '%s', but it might be ignored in infrastructure mode\n"
-@@ -3975,80 +3953,80 @@ msgstr ""
- "Attention : %s.%s défini à '%s', mais il est possible que ce soit ignoré en "
- "mode d'infrastructure\n"
-
--#: ../clients/cli/settings.c:243
-+#: ../clients/cli/settings.c:262
- #, 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"
-
--#: ../clients/cli/settings.c:245
-+#: ../clients/cli/settings.c:264
- msgid "Do you want to remove them? [yes] "
- msgstr "Souhaitez-vous les supprimer ? [oui]"
-
--#: ../clients/cli/settings.c:333
-+#: ../clients/cli/settings.c:352
- #, 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:338 ../clients/cli/settings.c:351
-+#: ../clients/cli/settings.c:357 ../clients/cli/settings.c:370
- #, c-format
- msgid "'%s' is not a VPN connection profile"
- msgstr "« %s » n'est pas un profil de connexion VPN"
-
--#: ../clients/cli/settings.c:345
-+#: ../clients/cli/settings.c:364
- #, 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:389
-+#: ../clients/cli/settings.c:408
- #, c-format
- msgid "Warning: %s\n"
- msgstr "Avertissement : %s\n"
-
--#: ../clients/cli/settings.c:392
-+#: ../clients/cli/settings.c:411
- #, c-format
- msgid "Info: %s\n"
- msgstr "Info : %s\n"
-
--#: ../clients/cli/settings.c:485
-+#: ../clients/cli/settings.c:504
- 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:575 ../clients/cli/settings.c:617
-+#: ../clients/cli/settings.c:593
- msgid "the property can't be changed"
- msgstr "la propriété ne peut pas être modifiée"
-
--#: ../clients/cli/settings.c:731
-+#: ../clients/cli/settings.c:671
- msgid "[NM property description]"
- msgstr "[description de la propriété NM]"
-
--#: ../clients/cli/settings.c:741
-+#: ../clients/cli/settings.c:681
- msgid "[nmcli specific description]"
- msgstr "[description spécifique de nmcli]"
-
--#: ../clients/cli/utils.c:320
-+#: ../clients/cli/utils.c:318
- #, 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:323
-+#: ../clients/cli/utils.c:321
- #, c-format
- msgid "Error: Unexpected argument '%s'"
- msgstr "Erreur : argument « %s » inattendu"
-
--#: ../clients/cli/utils.c:710
-+#: ../clients/cli/utils.c:709
- #, c-format
- msgid "invalid field '%s%s%s'; no such field"
- msgstr "champ « %s%s%s » invalide ; champ inconnu"
-
--#: ../clients/cli/utils.c:714
-+#: ../clients/cli/utils.c:713
- #, 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:810
-+#: ../clients/cli/utils.c:809
- #, c-format
- msgid "failure to select field"
- msgstr "Impossible de sélectionner le champ"
-@@ -4063,26 +4041,26 @@ msgstr "Erreur de lecture de la sortie nmcli : %s\n"
- msgid "Error writing nmcli output: %s\n"
- msgstr "Erreur d'écriture de la sortie nmcli : %s\n"
-
--#: ../clients/cli/utils.c:1467
-+#: ../clients/cli/utils.c:1469
- #, 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:1475
-+#: ../clients/cli/utils.c:1478
- #, c-format
- msgid "Failed to fork pager: %s\n"
- msgstr "Échec du fork pager : %s\n"
-
--#: ../clients/cli/utils.c:1521 ../clients/cli/utils.c:1523
-+#: ../clients/cli/utils.c:1525 ../clients/cli/utils.c:1529
- #, 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:302 ../clients/common/nm-meta-setting-desc.c:4949
-+#: ../clients/cli/utils.h:302 ../clients/common/nm-meta-setting-desc.c:4237
- msgid "on"
- msgstr "marche"
-
--#: ../clients/cli/utils.h:302 ../clients/common/nm-meta-setting-desc.c:4951
-+#: ../clients/cli/utils.h:302 ../clients/common/nm-meta-setting-desc.c:4239
- msgid "off"
- msgstr "arrêt"
-
-@@ -4099,104 +4077,104 @@ 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:117
--#: ../clients/common/nm-client-utils.c:148
-+#: ../clients/common/nm-client-utils.c:121
-+#: ../clients/common/nm-client-utils.c:152
- #, c-format
- msgid "'%s' is ambiguous (%s)"
- msgstr "« %s » est ambigu (%s)"
-
--#: ../clients/common/nm-client-utils.c:127
-+#: ../clients/common/nm-client-utils.c:131
- #, 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:160
-+#: ../clients/common/nm-client-utils.c:164
- #, 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:209
-+#: ../clients/common/nm-client-utils.c:213
- #, c-format
- msgid "'%s' is ambiguous: %s"
- msgstr "« %s » est ambigu : %s"
-
--#: ../clients/common/nm-client-utils.c:219
-+#: ../clients/common/nm-client-utils.c:223
- #, c-format
- msgid "missing name, try one of [%s]"
- msgstr "nom manquant, essayez l'un de [%s]"
-
--#: ../clients/common/nm-client-utils.c:261
-+#: ../clients/common/nm-client-utils.c:265
- msgid "unmanaged"
- msgstr "non-géré"
-
--#: ../clients/common/nm-client-utils.c:262
-+#: ../clients/common/nm-client-utils.c:266
- msgid "unavailable"
- msgstr "indisponible"
-
--#: ../clients/common/nm-client-utils.c:264
-+#: ../clients/common/nm-client-utils.c:268
- msgid "connecting (prepare)"
- msgstr "connexion (préparation)"
-
--#: ../clients/common/nm-client-utils.c:265
-+#: ../clients/common/nm-client-utils.c:269
- msgid "connecting (configuring)"
- msgstr "connexion (configuration)"
-
--#: ../clients/common/nm-client-utils.c:266
-+#: ../clients/common/nm-client-utils.c:270
- msgid "connecting (need authentication)"
- msgstr "connexion (authentification requise)"
-
--#: ../clients/common/nm-client-utils.c:267
-+#: ../clients/common/nm-client-utils.c:271
- msgid "connecting (getting IP configuration)"
- msgstr "connexion (obtention de la configuration IP)"
-
--#: ../clients/common/nm-client-utils.c:268
-+#: ../clients/common/nm-client-utils.c:272
- msgid "connecting (checking IP connectivity)"
- msgstr "connexion (contrôle de la connectivité IP)"
-
--#: ../clients/common/nm-client-utils.c:269
-+#: ../clients/common/nm-client-utils.c:273
- msgid "connecting (starting secondary connections)"
- msgstr "connexion (démarrage des connexions secondaires)"
-
--#: ../clients/common/nm-client-utils.c:272
-+#: ../clients/common/nm-client-utils.c:276
- msgid "connection failed"
- msgstr "échec de la connexion"
-
--#: ../clients/common/nm-client-utils.c:280
-+#: ../clients/common/nm-client-utils.c:284
- msgid "yes (guessed)"
- msgstr "oui (deviné)"
-
--#: ../clients/common/nm-client-utils.c:281
-+#: ../clients/common/nm-client-utils.c:285
- 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:287
--#: ../clients/common/nm-client-utils.c:359 ../libnm-glib/nm-device.c:1859
--#: ../libnm/nm-device.c:1437
-+#: ../clients/common/nm-client-utils.c:291
-+#: ../clients/common/nm-client-utils.c:364 ../libnm-glib/nm-device.c:1859
-+#: ../libnm/nm-device.c:1439
- msgid "Unknown"
- msgstr "Inconnu"
-
--#: ../clients/common/nm-client-utils.c:288
-+#: ../clients/common/nm-client-utils.c:292
- msgid "No reason given"
- msgstr "Aucun raison donnée"
-
--#: ../clients/common/nm-client-utils.c:290
-+#: ../clients/common/nm-client-utils.c:294
- 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:291
-+#: ../clients/common/nm-client-utils.c:295
- 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:292
-+#: ../clients/common/nm-client-utils.c:296
- 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:293
-+#: ../clients/common/nm-client-utils.c:297
- msgid ""
- "IP configuration could not be reserved (no available address, timeout, etc.)"
- msgstr ""
-@@ -4204,381 +4182,387 @@ msgstr ""
- "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:294
-+#: ../clients/common/nm-client-utils.c:298
- 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:295
-+#: ../clients/common/nm-client-utils.c:299
- 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:296
-+#: ../clients/common/nm-client-utils.c:300
- 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:297
-+#: ../clients/common/nm-client-utils.c:301
- 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:298
-+#: ../clients/common/nm-client-utils.c:302
- 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:299
-+#: ../clients/common/nm-client-utils.c:303
- 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:300
-+#: ../clients/common/nm-client-utils.c:304
- 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:301
-+#: ../clients/common/nm-client-utils.c:305
- 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:302
-+#: ../clients/common/nm-client-utils.c:306
- 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:303
-+#: ../clients/common/nm-client-utils.c:307
- 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:304
-+#: ../clients/common/nm-client-utils.c:308
- 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:305
-+#: ../clients/common/nm-client-utils.c:309
- 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:306
-+#: ../clients/common/nm-client-utils.c:310
- 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:307
-+#: ../clients/common/nm-client-utils.c:311
- 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:308
-+#: ../clients/common/nm-client-utils.c:312
- 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:309
-+#: ../clients/common/nm-client-utils.c:313
- 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:310
-+#: ../clients/common/nm-client-utils.c:314
- 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:311
-+#: ../clients/common/nm-client-utils.c:315
- 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:312
-+#: ../clients/common/nm-client-utils.c:316
- 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:313
-+#: ../clients/common/nm-client-utils.c:317
- 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:314
-+#: ../clients/common/nm-client-utils.c:318
- 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:315
-+#: ../clients/common/nm-client-utils.c:319
- 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:316
-+#: ../clients/common/nm-client-utils.c:320
- 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:317
-+#: ../clients/common/nm-client-utils.c:321
- 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:318
-+#: ../clients/common/nm-client-utils.c:322
- 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:319
-+#: ../clients/common/nm-client-utils.c:323
- 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:320
-+#: ../clients/common/nm-client-utils.c:324
- 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:321
-+#: ../clients/common/nm-client-utils.c:325
- 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:322
-+#: ../clients/common/nm-client-utils.c:326
- 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:323
-+#: ../clients/common/nm-client-utils.c:327
- 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:324
-+#: ../clients/common/nm-client-utils.c:328
- 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:325
-+#: ../clients/common/nm-client-utils.c:329
- 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:326
-+#: ../clients/common/nm-client-utils.c:330
- 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:327
-+#: ../clients/common/nm-client-utils.c:331
- 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:328
-+#: ../clients/common/nm-client-utils.c:332
- 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:329
-+#: ../clients/common/nm-client-utils.c:333
- 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:330
-+#: ../clients/common/nm-client-utils.c:334
- 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:331
-+#: ../clients/common/nm-client-utils.c:335
- 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:332
-+#: ../clients/common/nm-client-utils.c:336
- 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:333
-+#: ../clients/common/nm-client-utils.c:337
- 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:334
-+#: ../clients/common/nm-client-utils.c:338
- 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:335
-+#: ../clients/common/nm-client-utils.c:339
- 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:336
-+#: ../clients/common/nm-client-utils.c:340
- 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:337
-+#: ../clients/common/nm-client-utils.c:341
- 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:338
-+#: ../clients/common/nm-client-utils.c:342
- 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:339
-+#: ../clients/common/nm-client-utils.c:343
- 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:340
-+#: ../clients/common/nm-client-utils.c:344
- 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:341
-+#: ../clients/common/nm-client-utils.c:345
- 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:342
-+#: ../clients/common/nm-client-utils.c:346
- 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:343
-+#: ../clients/common/nm-client-utils.c:347
- msgid "DCB or FCoE setup failed"
- msgstr "L'installation DCB ou FCoE a échoué"
-
--#: ../clients/common/nm-client-utils.c:344
-+#: ../clients/common/nm-client-utils.c:348
- msgid "teamd control failed"
- msgstr "échec du contrôle teamd"
-
--#: ../clients/common/nm-client-utils.c:345
-+#: ../clients/common/nm-client-utils.c:349
- msgid "Modem failed or no longer available"
- msgstr "Le modem est en échec ou n'est plus disponible"
-
--#: ../clients/common/nm-client-utils.c:346
-+#: ../clients/common/nm-client-utils.c:350
- msgid "Modem now ready and available"
- msgstr "Le modem est prêt et disponible"
-
--#: ../clients/common/nm-client-utils.c:347
-+#: ../clients/common/nm-client-utils.c:351
- msgid "SIM PIN was incorrect"
- msgstr "Le code PIN de la SIM est incorrect"
-
--#: ../clients/common/nm-client-utils.c:348
-+#: ../clients/common/nm-client-utils.c:352
- 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:349
-+#: ../clients/common/nm-client-utils.c:353
- msgid "The device's parent changed"
- msgstr "Le parent du périphérique a changé"
-
--#: ../clients/common/nm-client-utils.c:350
-+#: ../clients/common/nm-client-utils.c:354
- msgid "The device parent's management changed"
- msgstr "Le gestionnaire du périphérique parent a changé"
-
--#: ../clients/common/nm-client-utils.c:351
-+#: ../clients/common/nm-client-utils.c:355
- msgid "Open vSwitch database connection failed"
- msgstr "Echec de la connexion à la base de données Open vSwitch"
-
--#: ../clients/common/nm-client-utils.c:352
-+#: ../clients/common/nm-client-utils.c:356
- msgid "A duplicate IP address was detected"
- msgstr "Une adresse IP en double a été détectée"
-
--#: ../clients/common/nm-client-utils.c:353
-+#: ../clients/common/nm-client-utils.c:357
- 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:354
-+#: ../clients/common/nm-client-utils.c:358
- msgid "Failed to configure SR-IOV parameters"
- msgstr "Échec de la configuration des paramètres SR-IOV"
-
--#: ../clients/common/nm-client-utils.c:360
-+# auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-+#: ../clients/common/nm-client-utils.c:359
-+#, fuzzy
-+msgid "The Wi-Fi P2P peer could not be found"
-+msgstr "Le réseau Wi-Fi est introuvable"
-+
-+#: ../clients/common/nm-client-utils.c:365
- msgid "Unknown reason"
- msgstr "Raison inconnue"
-
--#: ../clients/common/nm-client-utils.c:361
-+#: ../clients/common/nm-client-utils.c:366
- msgid "The connection was disconnected"
- msgstr "La connexion a été déconnectée"
-
--#: ../clients/common/nm-client-utils.c:362
-+#: ../clients/common/nm-client-utils.c:367
- msgid "Disconnected by user"
- msgstr "Déconnecté par l'utilisateur"
-
--#: ../clients/common/nm-client-utils.c:363
-+#: ../clients/common/nm-client-utils.c:368
- msgid "The base network connection was interrupted"
- msgstr "La connexion réseau de base a été interrompue"
-
--#: ../clients/common/nm-client-utils.c:364
-+#: ../clients/common/nm-client-utils.c:369
- msgid "The VPN service stopped unexpectedly"
- msgstr "Arrêt inattendu du service VPN"
-
--#: ../clients/common/nm-client-utils.c:365
-+#: ../clients/common/nm-client-utils.c:370
- msgid "The VPN service returned invalid configuration"
- msgstr "Le service VPN a retourné une configuration non valide"
-
--#: ../clients/common/nm-client-utils.c:366
-+#: ../clients/common/nm-client-utils.c:371
- 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:367
-+#: ../clients/common/nm-client-utils.c:372
- 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:368
-+#: ../clients/common/nm-client-utils.c:373
- msgid "The VPN service failed to start"
- msgstr "Échec du démarrage du service VPN"
-
--#: ../clients/common/nm-client-utils.c:369
-+#: ../clients/common/nm-client-utils.c:374
- msgid "No valid secrets"
- msgstr "Aucun secret valide"
-
--#: ../clients/common/nm-client-utils.c:370
-+#: ../clients/common/nm-client-utils.c:375
- msgid "Invalid secrets"
- msgstr "Secrets non valides"
-
--#: ../clients/common/nm-client-utils.c:371
-+#: ../clients/common/nm-client-utils.c:376
- msgid "The connection was removed"
- msgstr "La connexion a été supprimée"
-
--#: ../clients/common/nm-client-utils.c:372
-+#: ../clients/common/nm-client-utils.c:377
- msgid "Master connection failed"
- msgstr "Échec de la connexion maître"
-
--#: ../clients/common/nm-client-utils.c:373
-+#: ../clients/common/nm-client-utils.c:378
- 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:374
-+#: ../clients/common/nm-client-utils.c:379
- msgid "The device disappeared"
- msgstr "Le périphérique a disparu"
-
--#: ../clients/common/nm-meta-setting-access.c:492
-+#: ../clients/common/nm-meta-setting-access.c:510
- #, c-format
- msgid "field '%s' has to be alone"
- msgstr "champ « %s » doit être seul"
-
--#: ../clients/common/nm-meta-setting-access.c:507
-+#: ../clients/common/nm-meta-setting-access.c:525
- #, 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:99
--#: ../clients/common/nm-meta-setting-desc.c:161
-+#: ../clients/common/nm-meta-setting-desc.c:291
-+#: ../clients/common/nm-meta-setting-desc.c:352
- #, c-format
- msgid "invalid prefix '%s'; <1-%d> allowed"
- msgstr "préfixe invalide « %s »; <1-%d> autorisé"
-
--#: ../clients/common/nm-meta-setting-desc.c:107
-+#: ../clients/common/nm-meta-setting-desc.c:299
- #, c-format
- msgid "invalid IP address: %s"
- msgstr "adresse IP invalide : %s"
-
--#: ../clients/common/nm-meta-setting-desc.c:133
-+#: ../clients/common/nm-meta-setting-desc.c:324
- msgid ""
- "The valid syntax is: 'ip[/prefix] [next-hop] [metric] [attribute=val]... [,"
- "ip[/prefix] ...]'"
-@@ -4586,244 +4570,208 @@ msgstr ""
- "La syntaxe valide est : 'ip[/prefix][next-hop][metric][attribute=val]... [,"
- "ip[/prefix] ....]’"
-
--#: ../clients/common/nm-meta-setting-desc.c:172
-+#: ../clients/common/nm-meta-setting-desc.c:363
- #, 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:178
-+#: ../clients/common/nm-meta-setting-desc.c:369
- #, 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:227
-+#: ../clients/common/nm-meta-setting-desc.c:417
- #, c-format
- msgid "invalid route: %s. %s"
- msgstr "route non valide : %s. %s"
-
--#: ../clients/common/nm-meta-setting-desc.c:239
--msgid "default route cannot be added (NetworkManager handles it by itself)"
--msgstr ""
--"la route par défaut ne peut être ajoutée (NetworkManager la gère lui-même)"
--
--#: ../clients/common/nm-meta-setting-desc.c:446
--#, c-format
--msgid "invalid priority map '%s'"
--msgstr "Plan des priorités non valide « %s »"
--
--#: ../clients/common/nm-meta-setting-desc.c:453
--#: ../clients/common/nm-meta-setting-desc.c:459
--#, c-format
--msgid "priority '%s' is not valid (<0-%ld>)"
--msgstr "priorité « %s » n'est pas valide (<0-%ld>)"
--
--#: ../clients/common/nm-meta-setting-desc.c:511
-+#: ../clients/common/nm-meta-setting-desc.c:634
- #, 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:518
-+#: ../clients/common/nm-meta-setting-desc.c:641
- #, 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:531
-+#: ../clients/common/nm-meta-setting-desc.c:654
- #, 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:534
-+#: ../clients/common/nm-meta-setting-desc.c:657
- #, c-format
- msgid "Not a valid PAC Script"
- msgstr "Script PAC non valide"
-
--#: ../clients/common/nm-meta-setting-desc.c:588
-+#: ../clients/common/nm-meta-setting-desc.c:711
- #, c-format
- msgid "cannot read team config from file '%s'"
- msgstr ""
- "ne peut pas lire la configuration de l'équipe à partir du fichier « %s »"
-
--#: ../clients/common/nm-meta-setting-desc.c:595
-+#: ../clients/common/nm-meta-setting-desc.c:718
- #, 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"
-
--#: ../clients/common/nm-meta-setting-desc.c:607
-+#: ../clients/common/nm-meta-setting-desc.c:730
- #, c-format
- msgid "'%s' does not contain a valid team configuration"
- msgstr "« %s » ne contient pas de configuration d'équipe valide."
-
--#: ../clients/common/nm-meta-setting-desc.c:610
-+#: ../clients/common/nm-meta-setting-desc.c:733
- #, c-format
- msgid "team configuration must be a JSON object"
- msgstr "la configuration de l'équipe doit être un objet JSON"
-
--#: ../clients/common/nm-meta-setting-desc.c:731
-+#: ../clients/common/nm-meta-setting-desc.c:926
- #: ../clients/tui/nmt-mtu-entry.c:84
- msgid "(default)"
- msgstr "(par défaut)"
-
--#: ../clients/common/nm-meta-setting-desc.c:885
-+#: ../clients/common/nm-meta-setting-desc.c:1072
- msgid "auto"
- msgstr "auto"
-
--#: ../clients/common/nm-meta-setting-desc.c:1037
-+#: ../clients/common/nm-meta-setting-desc.c:1224
- #, c-format
- msgid "%s (%s)"
- msgstr "%s (%s)"
-
--#: ../clients/common/nm-meta-setting-desc.c:1180
--#: ../clients/common/nm-meta-setting-desc.c:1184
-+#: ../clients/common/nm-meta-setting-desc.c:1372
-+#: ../clients/common/nm-meta-setting-desc.c:1376
- #, fuzzy
- msgid "'%s' is out of range [%"
- msgstr "« %s » est en dehors de la plage [0, %u]"
-
--#: ../clients/common/nm-meta-setting-desc.c:1189
-+#: ../clients/common/nm-meta-setting-desc.c:1381
- #, c-format
- msgid "'%s' is not a valid number"
- msgstr "« %s » n'est pas un nombre valide"
-
--#: ../clients/common/nm-meta-setting-desc.c:1243
-+#: ../clients/common/nm-meta-setting-desc.c:1438
- #, 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:1286
-+#: ../clients/common/nm-meta-setting-desc.c:1484
- #, 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:1391
-+#: ../clients/common/nm-meta-setting-desc.c:1592
- #, 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:1396 ../libnm-core/nm-keyfile.c:780
-+#: ../clients/common/nm-meta-setting-desc.c:1597 ../libnm-core/nm-keyfile.c:884
- #, 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:1515
-+#: ../clients/common/nm-meta-setting-desc.c:1716
- #, c-format
- msgid "%d (key)"
- msgstr "%d (clé)"
-
--#: ../clients/common/nm-meta-setting-desc.c:1517
-+#: ../clients/common/nm-meta-setting-desc.c:1718
- #, c-format
- msgid "%d (passphrase)"
- msgstr "%d (phrase de passe)"
-
--#: ../clients/common/nm-meta-setting-desc.c:1520
-+#: ../clients/common/nm-meta-setting-desc.c:1721
- #, c-format
- msgid "%d (unknown)"
- msgstr "%d (inconnu)"
-
--#: ../clients/common/nm-meta-setting-desc.c:1552
-+#: ../clients/common/nm-meta-setting-desc.c:1751
- msgid "0 (NONE)"
- msgstr "0 (AUCUN)"
-
--#: ../clients/common/nm-meta-setting-desc.c:1558
-+#: ../clients/common/nm-meta-setting-desc.c:1757
- msgid "REORDER_HEADERS, "
- msgstr "REORDER_HEADERS, "
-
--#: ../clients/common/nm-meta-setting-desc.c:1560
-+#: ../clients/common/nm-meta-setting-desc.c:1759
- msgid "GVRP, "
- msgstr "GVRP, "
-
--#: ../clients/common/nm-meta-setting-desc.c:1562
-+#: ../clients/common/nm-meta-setting-desc.c:1761
- msgid "LOOSE_BINDING, "
- msgstr "LOOSE_BINDING, "
-
--#: ../clients/common/nm-meta-setting-desc.c:1564
-+#: ../clients/common/nm-meta-setting-desc.c:1763
- msgid "MVRP, "
- msgstr "MVRP, "
-
--#: ../clients/common/nm-meta-setting-desc.c:1604
-+#: ../clients/common/nm-meta-setting-desc.c:1784
- msgid "0 (none)"
- msgstr "0 (aucun)"
-
--#: ../clients/common/nm-meta-setting-desc.c:1610
-+#: ../clients/common/nm-meta-setting-desc.c:1790
- msgid "agent-owned, "
- msgstr "appartient-à-l'agent"
-
--#: ../clients/common/nm-meta-setting-desc.c:1612
-+#: ../clients/common/nm-meta-setting-desc.c:1792
- msgid "not saved, "
- msgstr "non enregistré,"
-
--#: ../clients/common/nm-meta-setting-desc.c:1614
-+#: ../clients/common/nm-meta-setting-desc.c:1794
- msgid "not required, "
- msgstr "non requis,"
-
--#: ../clients/common/nm-meta-setting-desc.c:1679
-+#: ../clients/common/nm-meta-setting-desc.c:1983
- #, 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:1718
--msgid "no item to remove"
--msgstr "aucun élément à supprimer"
-+#: ../clients/common/nm-meta-setting-desc.c:1993
-+#, fuzzy, c-format
-+msgid "cannot set empty \"%s\" option"
-+msgstr "n'a pas pu définir la propriété : %s"
-
--#: ../clients/common/nm-meta-setting-desc.c:1722
--#, c-format
--msgid "index '%d' is not in range <0-%d>"
--msgstr "index « %d » n'est pas dans la plage <0-%d>"
--
--#: ../clients/common/nm-meta-setting-desc.c:1737
--#, c-format
--msgid "invalid option '%s'"
--msgstr "option « %s » non valide"
--
--#: ../clients/common/nm-meta-setting-desc.c:1739
--msgid "missing option"
--msgstr "option manquante"
--
--#: ../clients/common/nm-meta-setting-desc.c:1763
--#, c-format
--msgid "'%s' is not a valid MAC"
--msgstr "« %s » n'est pas une adresse MAC valide"
--
--#: ../clients/common/nm-meta-setting-desc.c:1790
--#: ../clients/common/nm-meta-setting-desc.c:1887
--#: ../clients/common/nm-meta-setting-desc.c:4855 ../src/nm-config.c:547
--#, c-format
--msgid "'%s' is not valid"
--msgstr "« %s » n'est pas valide"
--
--#: ../clients/common/nm-meta-setting-desc.c:1831
-+#: ../clients/common/nm-meta-setting-desc.c:2052
- #, 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"
-
--#: ../clients/common/nm-meta-setting-desc.c:1867
-+#: ../clients/common/nm-meta-setting-desc.c:2069
- #, 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:1985
-+#: ../clients/common/nm-meta-setting-desc.c:2090
-+#: ../clients/common/nm-meta-setting-desc.c:4153 ../src/nm-config.c:546
-+#, c-format
-+msgid "'%s' is not valid"
-+msgstr "« %s » n'est pas valide"
-+
-+#: ../clients/common/nm-meta-setting-desc.c:2187
-+#, fuzzy
-+msgid "not a valid hex-string"
-+msgstr "nom d'interface non valide"
-+
-+#: ../clients/common/nm-meta-setting-desc.c:2203
- #, 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:2268
--#, c-format
--msgid "the property doesn't contain EAP method '%s'"
--msgstr "la propriété ne contient pas de méthode EAP « %s »"
--
--#: ../clients/common/nm-meta-setting-desc.c:2291
--#, c-format
--msgid "the property doesn't contain alternative subject match '%s'"
--msgstr "la propriété ne contient pas de sujet alternatif correspondant « %s »"
--
--#: ../clients/common/nm-meta-setting-desc.c:2317
--#, c-format
--msgid "the property doesn't contain \"phase2\" alternative subject match '%s'"
-+#: ../clients/common/nm-meta-setting-desc.c:2282
-+msgid ""
-+"too many arguments. Please only specify a private key file and optionally a "
-+"password"
- msgstr ""
--"la propriété ne contient pas de sujet alternatif « phase 2 » correspondant "
--"« %s »"
-
--#: ../clients/common/nm-meta-setting-desc.c:2439
-+#: ../clients/common/nm-meta-setting-desc.c:2404
-+#, fuzzy, c-format
-+msgid "failed to set bond option \"%s\""
-+msgstr "n'a pas pu définir la propriété : %s"
-+
-+#: ../clients/common/nm-meta-setting-desc.c:2421
- #, c-format
- msgid ""
- "Enter a list of bonding options formatted as:\n"
-@@ -4861,248 +4809,132 @@ 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:2502
-+#: ../clients/common/nm-meta-setting-desc.c:2486
- #, c-format
- msgid "Can not change the connection type"
- msgstr "Impossible de changer le type de connexion"
-
--#: ../clients/common/nm-meta-setting-desc.c:2605
--#, c-format
--msgid "the property doesn't contain permission '%s'"
--msgstr "la propriété ne contient pas de permission « %s »"
-+#: ../clients/common/nm-meta-setting-desc.c:2564
-+#, fuzzy, c-format
-+msgid "invalid permission \"%s\""
-+msgstr "runner non valide : « %s »"
-
--#: ../clients/common/nm-meta-setting-desc.c:2626
-+#: ../clients/common/nm-meta-setting-desc.c:2601
- #, 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"
-
--#: ../clients/common/nm-meta-setting-desc.c:2723
-+#: ../clients/common/nm-meta-setting-desc.c:2682
- #, 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:2730
--#, c-format
--msgid "the property doesn't contain UUID '%s'"
--msgstr "la propriété ne contient pas d'UUID « %s »"
--
--#: ../clients/common/nm-meta-setting-desc.c:2799
-+#: ../clients/common/nm-meta-setting-desc.c:2753
- msgid "0 (disabled)"
- msgstr "0 (désactivé)"
-
--#: ../clients/common/nm-meta-setting-desc.c:2805
-+#: ../clients/common/nm-meta-setting-desc.c:2759
- msgid "enabled, "
- msgstr "activé, "
-
--#: ../clients/common/nm-meta-setting-desc.c:2807
-+#: ../clients/common/nm-meta-setting-desc.c:2761
- msgid "advertise, "
- msgstr "annoncer, "
-
--#: ../clients/common/nm-meta-setting-desc.c:2809
-+#: ../clients/common/nm-meta-setting-desc.c:2763
- msgid "willing, "
- msgstr "disposé, "
-
--#: ../clients/common/nm-meta-setting-desc.c:2931
-+#: ../clients/common/nm-meta-setting-desc.c:2852
- #, 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:2960
-+#: ../clients/common/nm-meta-setting-desc.c:2879
- 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:2976
-+#: ../clients/common/nm-meta-setting-desc.c:2893
- #, 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:2979
-+#: ../clients/common/nm-meta-setting-desc.c:2896
- #, 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:3000
-+#: ../clients/common/nm-meta-setting-desc.c:2917
- #, 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é)"
-
--#: ../clients/common/nm-meta-setting-desc.c:3055
-+#: ../clients/common/nm-meta-setting-desc.c:2947
- #, 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:3128
--#: ../clients/common/nm-meta-setting-desc.c:3134
-+#: ../clients/common/nm-meta-setting-desc.c:3018
-+#: ../clients/common/nm-meta-setting-desc.c:3024
- 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"
-
--#: ../clients/common/nm-meta-setting-desc.c:3158
-+#: ../clients/common/nm-meta-setting-desc.c:3048
- #, 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:3181
-+#: ../clients/common/nm-meta-setting-desc.c:3071
- msgid "default"
- msgstr "par défaut"
-
--#: ../clients/common/nm-meta-setting-desc.c:3320
--#: ../clients/common/nm-meta-setting-desc.c:3337
--#, c-format
--msgid "invalid IPv4 address '%s'"
-+#: ../clients/common/nm-meta-setting-desc.c:3235
-+#, fuzzy, c-format
-+msgid "invalid IPv%c address '%s'"
- msgstr "adresse IPv4 « %s » non valide"
-
--#: ../clients/common/nm-meta-setting-desc.c:3343
--#: ../clients/common/nm-meta-setting-desc.c:3587
--#, c-format
--msgid "the property doesn't contain DNS server '%s'"
--msgstr "la propriété ne contient pas de serveur DNS « %s »"
--
--#: ../clients/common/nm-meta-setting-desc.c:3381
--#: ../clients/common/nm-meta-setting-desc.c:3625
--#, c-format
--msgid "the property doesn't contain DNS search domain '%s'"
--msgstr "la propriété ne contient pas de domaine de recherche DNS « %s »"
--
--#: ../clients/common/nm-meta-setting-desc.c:3418
--#: ../clients/common/nm-meta-setting-desc.c:3662
--#, c-format
--msgid "the property doesn't contain DNS option '%s'"
--msgstr "la propriété ne contient pas d'option DNS « %s »"
--
--#: ../clients/common/nm-meta-setting-desc.c:3461
--#: ../clients/common/nm-meta-setting-desc.c:3711
--#, c-format
--msgid "the property doesn't contain IP address '%s'"
--msgstr "la propriété ne contient pas d'adresse IP « %s »"
--
--#: ../clients/common/nm-meta-setting-desc.c:3481
--#: ../clients/common/nm-meta-setting-desc.c:3730
-+#: ../clients/common/nm-meta-setting-desc.c:3362
- #, c-format
- msgid "invalid gateway address '%s'"
- msgstr "adresse de passerelle « %s » non valide"
-
--#: ../clients/common/nm-meta-setting-desc.c:3520
--#: ../clients/common/nm-meta-setting-desc.c:3771
--#, c-format
--msgid "the property doesn't contain route '%s'"
--msgstr "la propriété ne contient pas la route « %s »"
--
--#: ../clients/common/nm-meta-setting-desc.c:3564
--#: ../clients/common/nm-meta-setting-desc.c:3581
--#, c-format
--msgid "invalid IPv6 address '%s'"
--msgstr "adresse IPv6 « %s » non valide"
--
--#: ../clients/common/nm-meta-setting-desc.c:3833
--#, c-format
--msgid "the property doesn't contain interface name '%s'"
--msgstr "la propriété ne contient pas le nom de l'interface « %s »"
--
--#: ../clients/common/nm-meta-setting-desc.c:3870
-+#: ../clients/common/nm-meta-setting-desc.c:3513
- #, 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:3962
-+#: ../clients/common/nm-meta-setting-desc.c:3593
- 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:3984
-+#: ../clients/common/nm-meta-setting-desc.c:3617
-+#: ../clients/common/nm-meta-setting-desc.c:3697
-+#, fuzzy
- msgid ""
--"The valid syntax is: '[root | parent <handle>] [handle <handle>] <qdisc>'"
-+"The valid syntax is: '[root | parent <handle>] [handle <handle>] <kind>'"
- msgstr ""
- "La syntaxe valide est : '[root | parent <handle>][handle <handle>] <qdisc>’"
-
--#: ../clients/common/nm-meta-setting-desc.c:4008
--#, c-format
--msgid "the property doesn't contain vf with index %u"
--msgstr "la propriété ne contient pas vf avec l’index %u"
--
--#: ../clients/common/nm-meta-setting-desc.c:4035
--#, c-format
--msgid "the property doesn't contain qdisc '%s'"
--msgstr "la propriété ne contient pas de qdisc « %s »"
--
--#: ../clients/common/nm-meta-setting-desc.c:4089
--msgid ""
--"The valid syntax is: '[root | parent <handle>] [handle <handle>] <tfilter>'"
-+#: ../clients/common/nm-meta-setting-desc.c:3642
-+msgid "The valid syntax is: '<vid>[-<vid>] [pvid] [untagged]'"
- msgstr ""
--"La syntaxe valide est : '[root | parent <handle>][handle <handle>] <tfilter>'"
-
--#: ../clients/common/nm-meta-setting-desc.c:4112
-+#: ../clients/common/nm-meta-setting-desc.c:3917
- #, c-format
--msgid "the property doesn't contain tfilter '%s'"
--msgstr "la propriété ne contient pas de tfilter « %s »"
-+msgid "invalid priority map '%s'"
-+msgstr "Plan des priorités non valide « %s »"
-
--#: ../clients/common/nm-meta-setting-desc.c:4179
--#, c-format
--msgid "the property doesn't contain string '%s'"
--msgstr "la propriété ne contient pas la chaîne « %s »"
--
--#: ../clients/common/nm-meta-setting-desc.c:4254
--#: ../clients/common/nm-meta-setting-desc.c:4328
--#, c-format
--msgid "the property doesn't contain link watcher '%s'"
--msgstr "la propriété ne contient pas le lien observateur « %s »"
--
--#: ../clients/common/nm-meta-setting-desc.c:4434
--#, c-format
--msgid "only one mapping at a time is supported; taking the first one (%s)"
--msgstr ""
--"un seul mappage à la fois est pris en charge ; le premier est retenu (%s)"
--
--#: ../clients/common/nm-meta-setting-desc.c:4442
--#, c-format
--msgid "the property doesn't contain mapping '%s'"
--msgstr "la propriété ne contient pas le mappage « %s »"
--
--#: ../clients/common/nm-meta-setting-desc.c:4450
--msgid "no priority to remove"
--msgstr "aucune priorité à supprimer"
--
--#: ../clients/common/nm-meta-setting-desc.c:4454
--#, c-format
--msgid "index '%d' is not in the range of <0-%d>"
--msgstr "L’index « %d » n'est pas dans la plage <0-%d>"
--
--#: ../clients/common/nm-meta-setting-desc.c:4523
--#, c-format
--msgid "'%s' cannot be empty"
--msgstr "« %s » ne peut pas rester vide"
--
--#: ../clients/common/nm-meta-setting-desc.c:4562
--#: ../clients/common/nm-meta-setting-desc.c:4693
--#: ../libnm-core/nm-setting-sriov.c:446 ../libnm-core/nm-setting-wired.c:662
--#: ../libnm-core/nm-setting-wireless.c:857
--#: ../libnm-core/nm-setting-wireless.c:869 ../libnm-util/nm-setting-wired.c:645
--#: ../libnm-util/nm-setting-wireless.c:858
--#: ../libnm-util/nm-setting-wireless.c:872
--#, c-format
--msgid "'%s' is not a valid MAC address"
--msgstr "« %s » n'est pas une adresse MAC valide"
--
--#: ../clients/common/nm-meta-setting-desc.c:4568
--#: ../clients/common/nm-meta-setting-desc.c:4699
--#, c-format
--msgid "the property doesn't contain MAC address '%s'"
--msgstr "la propriété ne contient pas d'adresse MAC « %s »"
--
--#: ../clients/common/nm-meta-setting-desc.c:4586
-+#: ../clients/common/nm-meta-setting-desc.c:4005
- #, 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:4600
--#, c-format
--msgid "'%s' string value should consist of 1 - 199 characters"
--msgstr "« %s » doit consister à un nombre de 1 - 199 caractères"
--
--#: ../clients/common/nm-meta-setting-desc.c:4632
-+#: ../clients/common/nm-meta-setting-desc.c:4044
- #, c-format
- msgid ""
- "Enter a list of S/390 options formatted as:\n"
-@@ -5113,24 +4945,27 @@ msgstr ""
- " option = <value>, option = <value>,...\n"
- "Les options acceptées sont : %s\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:4666
-+#: ../clients/common/nm-meta-setting-desc.c:4079
- #, c-format
- msgid "'%s' is not a valid channel"
- msgstr "« %s » n'est pas un canal valide"
-
--#: ../clients/common/nm-meta-setting-desc.c:4672
-+#: ../clients/common/nm-meta-setting-desc.c:4085
- #, c-format
- msgid "'%ld' is not a valid channel"
- msgstr "« %ld » n'est pas un canal valide"
-
--#: ../clients/common/nm-meta-setting-desc.c:4755
--#: ../clients/common/nm-meta-setting-desc.c:4791
--#: ../clients/common/nm-meta-setting-desc.c:4827
-+#: ../clients/common/nm-meta-setting-desc.c:4102
-+#: ../libnm-core/nm-setting-sriov.c:443 ../libnm-core/nm-setting-wired.c:646
-+#: ../libnm-core/nm-setting-wireless.c:844
-+#: ../libnm-core/nm-setting-wireless.c:856 ../libnm-util/nm-setting-wired.c:645
-+#: ../libnm-util/nm-setting-wireless.c:858
-+#: ../libnm-util/nm-setting-wireless.c:872
- #, c-format
--msgid "the property doesn't contain protocol '%s'"
--msgstr "la propriété ne contient pas le protocole « %s »"
-+msgid "'%s' is not a valid MAC address"
-+msgstr "« %s » n'est pas une adresse MAC valide"
-
--#: ../clients/common/nm-meta-setting-desc.c:4864
-+#: ../clients/common/nm-meta-setting-desc.c:4162
- #, c-format
- msgid ""
- "'%s' not compatible with %s '%s', please change the key or set the right %s "
-@@ -5139,71 +4974,64 @@ 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:4874
-+#: ../clients/common/nm-meta-setting-desc.c:4172
- #, 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:4879
-+#: ../clients/common/nm-meta-setting-desc.c:4177
- #, 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:4918
-+#: ../clients/common/nm-meta-setting-desc.c:4216
- #, 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é"
-
--#: ../clients/common/nm-meta-setting-desc.c:4928
--#, c-format
--msgid "'%s' is not a valid PSK"
--msgstr "« %s » n'est pas un PSK valide"
--
--#: ../clients/common/nm-meta-setting-desc.c:4980
-+#: ../clients/common/nm-meta-setting-desc.c:4273
- #, 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:5039
-+#: ../clients/common/nm-meta-setting-desc.c:4333
- 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:5046
-+#: ../clients/common/nm-meta-setting-desc.c:4340
- msgid "Bonding monitoring mode"
- msgstr "Mode de surveillance de liaison"
-
--#: ../clients/common/nm-meta-setting-desc.c:5055
-+#: ../clients/common/nm-meta-setting-desc.c:4349
- msgid "Bonding miimon [100]"
- msgstr "miimon de liaison [100]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5063
-+#: ../clients/common/nm-meta-setting-desc.c:4357
- msgid "Bonding downdelay [0]"
- msgstr "downdelay de liaison [0] "
-
--#: ../clients/common/nm-meta-setting-desc.c:5071
-+#: ../clients/common/nm-meta-setting-desc.c:4365
- msgid "Bonding updelay [0]"
- msgstr "updelay de liaison [0] "
-
--#: ../clients/common/nm-meta-setting-desc.c:5079
-+#: ../clients/common/nm-meta-setting-desc.c:4373
- msgid "Bonding arp-interval [0]"
- msgstr "arp-interval de liaison [0] "
-
--#: ../clients/common/nm-meta-setting-desc.c:5087
-+#: ../clients/common/nm-meta-setting-desc.c:4381
- msgid "Bonding arp-ip-target [none]"
- msgstr "arp-ip-target de liaison [none] "
-
--#: ../clients/common/nm-meta-setting-desc.c:5095
-+#: ../clients/common/nm-meta-setting-desc.c:4389
- msgid "LACP rate ('slow' or 'fast') [slow]"
- msgstr "Débit LACP (« lent » ou « rapide ») [lent]"
-
--#. macro that returns @func as const (gboolean(*)(NMSetting*)) type, but checks
--#. * that the actual type is (gboolean(*)(type *)).
- #. macro that returns @func as const (guint32(*)(NMSetting*)) type, but checks
- #. * that the actual type is (guint32(*)(type *)).
--#: ../clients/common/nm-meta-setting-desc.c:5212
-+#: ../clients/common/nm-meta-setting-desc.c:4553
- 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 "
-@@ -5221,7 +5049,7 @@ msgstr ""
- "\"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n"
- " set team.config /etc/my-team.conf\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5220
-+#: ../clients/common/nm-meta-setting-desc.c:4561
- 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 "
-@@ -5271,7 +5099,11 @@ msgstr ""
- " 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:5270
-+#: ../clients/common/nm-meta-setting-desc.c:4594
-+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:4627
- msgid ""
- "Enter file path to CA certificate (optionally prefixed with file://).\n"
- " [file://]<file path>\n"
-@@ -5284,7 +5116,7 @@ msgstr ""
- "de données brutes de blob.\n"
- "Exemple : /home/cimrman/cacert.crt\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5304
-+#: ../clients/common/nm-meta-setting-desc.c:4666
- msgid ""
- "Enter file path to client certificate (optionally prefixed with file://).\n"
- " [file://]<file path>\n"
-@@ -5297,7 +5129,7 @@ msgstr ""
- "de données brutes de blob.\n"
- "Exemple : /home/cimrman/jara.crt\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5361
-+#: ../clients/common/nm-meta-setting-desc.c:4723
- msgid ""
- "Enter file path to CA certificate for inner authentication (optionally "
- "prefixed\n"
-@@ -5313,7 +5145,7 @@ msgstr ""
- "de données brutes de blob.\n"
- "Exemple : /home/cimrman/ca-zweite-phase.crt\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5396
-+#: ../clients/common/nm-meta-setting-desc.c:4763
- msgid ""
- "Enter file path to client certificate for inner authentication (optionally "
- "prefixed\n"
-@@ -5329,7 +5161,7 @@ msgstr ""
- "de données brutes de blob.\n"
- "Exemple : /home/cimrman/jara-zweite-phase.crt\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5423
-+#: ../clients/common/nm-meta-setting-desc.c:4790
- msgid ""
- "Enter bytes as a list of hexadecimal values.\n"
- "Two formats are accepted:\n"
-@@ -5352,8 +5184,8 @@ msgstr ""
- "Exemples : ab0455a6ea3a74C2\n"
- " ab 4 55 0xa6 ea 3a 74 C2\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5440
--#: ../clients/common/nm-meta-setting-desc.c:5458
-+#: ../clients/common/nm-meta-setting-desc.c:4807
-+#: ../clients/common/nm-meta-setting-desc.c:4825
- msgid ""
- "Enter path to a private key and the key password (if not set yet):\n"
- " [file://]<file path> [<password>]\n"
-@@ -5365,84 +5197,84 @@ msgstr ""
- " [file://]<file path> [<password>]\n"
- "Exemple : /home/cimrman/jara-priv-key Dardanely\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5497
--#: ../clients/common/nm-secret-agent-simple.c:265
--#: ../clients/common/nm-secret-agent-simple.c:363
-+#: ../clients/common/nm-meta-setting-desc.c:4864
-+#: ../clients/common/nm-secret-agent-simple.c:281
-+#: ../clients/common/nm-secret-agent-simple.c:369
- #: ../clients/tui/nmt-page-dsl.c:66 ../clients/tui/nmt-page-wifi.c:332
- msgid "Username"
- msgstr "Nom d'utilisateur"
-
--#: ../clients/common/nm-meta-setting-desc.c:5503
--#: ../clients/common/nm-meta-setting-desc.c:5687
--#: ../clients/common/nm-meta-setting-desc.c:6060
--#: ../clients/common/nm-meta-setting-desc.c:6720
-+#: ../clients/common/nm-meta-setting-desc.c:4870
-+#: ../clients/common/nm-meta-setting-desc.c:5085
-+#: ../clients/common/nm-meta-setting-desc.c:5475
-+#: ../clients/common/nm-meta-setting-desc.c:6378
- msgid "Password [none]"
- msgstr "Mot de passe [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5549
-+#: ../clients/common/nm-meta-setting-desc.c:4916
- msgid "Bluetooth device address"
- msgstr "Adresse du périphérique Bluetooth"
-
--#: ../clients/common/nm-meta-setting-desc.c:5594
--#: ../clients/common/nm-meta-setting-desc.c:6114
--#: ../clients/common/nm-meta-setting-desc.c:7446
--#: ../clients/common/nm-meta-setting-desc.c:7484
--#: ../clients/common/nm-meta-setting-desc.c:7621
--#: ../clients/common/nm-meta-setting-desc.c:7839
-+#: ../clients/common/nm-meta-setting-desc.c:4964
-+#: ../clients/common/nm-meta-setting-desc.c:5528
-+#: ../clients/common/nm-meta-setting-desc.c:7035
-+#: ../clients/common/nm-meta-setting-desc.c:7073
-+#: ../clients/common/nm-meta-setting-desc.c:7248
-+#: ../clients/common/nm-meta-setting-desc.c:7478
- msgid "MAC [none]"
- msgstr "MAC [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5600
-+#: ../clients/common/nm-meta-setting-desc.c:4970
- msgid "Enable STP [no]"
- msgstr "Activer STP [no]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5606
-+#: ../clients/common/nm-meta-setting-desc.c:4976
- msgid "STP priority [32768]"
- msgstr "Priorité STP [32768]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5612
-+#: ../clients/common/nm-meta-setting-desc.c:4982
- msgid "Forward delay [15]"
- msgstr "Délai de réacheminement [15]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5618
-+#: ../clients/common/nm-meta-setting-desc.c:4988
- msgid "Hello time [2]"
- msgstr "Hello time [2]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5624
-+#: ../clients/common/nm-meta-setting-desc.c:4994
- msgid "Max age [20]"
- msgstr "Max age [20]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5630
-+#: ../clients/common/nm-meta-setting-desc.c:5000
- msgid "MAC address ageing time [300]"
- msgstr "Période de vieillissement des adresses MAC [300] "
-
--#: ../clients/common/nm-meta-setting-desc.c:5636
-+#: ../clients/common/nm-meta-setting-desc.c:5006
- msgid "Group forward mask [0]"
- msgstr "Group forward mask [0]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5642
-+#: ../clients/common/nm-meta-setting-desc.c:5012
- msgid "Enable IGMP snooping [no]"
- msgstr "Activer le snooping IGMP [no]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5654
-+#: ../clients/common/nm-meta-setting-desc.c:5041
- msgid "Bridge port priority [32]"
- msgstr "Priorité du port de pontage [32] "
-
--#: ../clients/common/nm-meta-setting-desc.c:5660
-+#: ../clients/common/nm-meta-setting-desc.c:5047
- 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:5666
-+#: ../clients/common/nm-meta-setting-desc.c:5053
- msgid "Hairpin [no]"
- msgstr "Hairpin [no]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5681
--#: ../clients/common/nm-meta-setting-desc.c:6054
--#: ../clients/common/nm-meta-setting-desc.c:7336
-+#: ../clients/common/nm-meta-setting-desc.c:5079
-+#: ../clients/common/nm-meta-setting-desc.c:5469
-+#: ../clients/common/nm-meta-setting-desc.c:6893
- msgid "Username [none]"
- msgstr "Nom d'utilisateur [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5784
-+#: ../clients/common/nm-meta-setting-desc.c:5182
- msgid ""
- "Enter a list of user permissions. This is a list of user names formatted "
- "as:\n"
-@@ -5458,7 +5290,7 @@ msgstr ""
- "\n"
- "Exemple : alice bob charlie\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5826
-+#: ../clients/common/nm-meta-setting-desc.c:5234
- msgid ""
- "Enter secondary connections that should be activated when this connection "
- "is\n"
-@@ -5482,7 +5314,7 @@ msgstr ""
- "\n"
- "Exemple : private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5843
-+#: ../clients/common/nm-meta-setting-desc.c:5257
- 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"
-@@ -5499,25 +5331,25 @@ msgstr ""
- "'unknown' permettre au NetworkManager de choisir une valeur à partir "
- "d'heuristiques\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:6071
-+#: ../clients/common/nm-meta-setting-desc.c:5485
- msgid "APN"
- msgstr "APN"
-
--#: ../clients/common/nm-meta-setting-desc.c:6123
--#: ../clients/common/nm-meta-setting-desc.c:7509
--#: ../clients/common/nm-meta-setting-desc.c:7655
-+#: ../clients/common/nm-meta-setting-desc.c:5537
-+#: ../clients/common/nm-meta-setting-desc.c:7104
-+#: ../clients/common/nm-meta-setting-desc.c:7288
- msgid "MTU [auto]"
- msgstr "MTU [auto]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6142
-+#: ../clients/common/nm-meta-setting-desc.c:5556
- msgid "P_KEY [none]"
- msgstr "P_KEY [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6151
-+#: ../clients/common/nm-meta-setting-desc.c:5565
- msgid "Parent interface [none]"
- msgstr "Interface parente [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6174
-+#: ../clients/common/nm-meta-setting-desc.c:5592
- msgid ""
- "Enter a list of IPv4 addresses of DNS servers.\n"
- "\n"
-@@ -5527,11 +5359,11 @@ msgstr ""
- "\n"
- "Exemple : 8.8.8.8, 8.8.4.4\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:6206
-+#: ../clients/common/nm-meta-setting-desc.c:5639
- msgid "IPv4 address (IP[/plen]) [none]"
- msgstr "Adresse IPv4 (IP[/plen]) [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6208
-+#: ../clients/common/nm-meta-setting-desc.c:5641
- msgid ""
- "Enter a list of IPv4 addresses formatted as:\n"
- " ip[/prefix], ip[/prefix],...\n"
-@@ -5545,11 +5377,11 @@ msgstr ""
- "\n"
- "Exemple : 192.168.1.5/24, 10.0.0.11/24\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:6221
-+#: ../clients/common/nm-meta-setting-desc.c:5660
- msgid "IPv4 gateway [none]"
- msgstr "Passerelle IPv4 [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6229
-+#: ../clients/common/nm-meta-setting-desc.c:5668
- msgid ""
- "Enter a list of IPv4 routes formatted as:\n"
- " ip[/prefix] [next-hop] [metric],...\n"
-@@ -5572,7 +5404,14 @@ msgstr ""
- "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:6331
-+#: ../clients/common/nm-meta-setting-desc.c:5708
-+msgid ""
-+"Enter a list of IPv4 routing rules formatted as:\n"
-+" priority [prio] [from [src]] [to [dst]], ,...\n"
-+"\n"
-+msgstr ""
-+
-+#: ../clients/common/nm-meta-setting-desc.c:5798
- 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 "
-@@ -5593,11 +5432,11 @@ msgstr ""
- "\n"
- "Exemple : 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:6369
-+#: ../clients/common/nm-meta-setting-desc.c:5851
- msgid "IPv6 address (IP[/plen]) [none]"
- msgstr "Adresse IPv6 (IP[/plen]) [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6371
-+#: ../clients/common/nm-meta-setting-desc.c:5853
- msgid ""
- "Enter a list of IPv6 addresses formatted as:\n"
- " ip[/prefix], ip[/prefix],...\n"
-@@ -5611,11 +5450,11 @@ msgstr ""
- "\n"
- "Exemple : 2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:6384
-+#: ../clients/common/nm-meta-setting-desc.c:5872
- msgid "IPv6 gateway [none]"
- msgstr "Passerelle IPv6 [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6392
-+#: ../clients/common/nm-meta-setting-desc.c:5880
- msgid ""
- "Enter a list of IPv6 routes formatted as:\n"
- " ip[/prefix] [next-hop] [metric],...\n"
-@@ -5640,162 +5479,173 @@ msgstr ""
- "db8:beef::3 2\n"
- " abbe::/64 55\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:6497
--#: ../clients/common/nm-meta-setting-desc.c:7369
-+#: ../clients/common/nm-meta-setting-desc.c:5920
-+msgid ""
-+"Enter a list of IPv6 routing rules formatted as:\n"
-+" priority [prio] [from [src]] [to [dst]], ,...\n"
-+"\n"
-+msgstr ""
-+
-+#: ../clients/common/nm-meta-setting-desc.c:6008
-+#: ../clients/common/nm-meta-setting-desc.c:6934
- msgid "Parent device [none]"
- msgstr "Périphérique parent [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6503
-+#: ../clients/common/nm-meta-setting-desc.c:6014
- msgid "Local endpoint [none]"
- msgstr "Point de terminaison local [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6510
--#: ../clients/common/nm-meta-setting-desc.c:7389
-+#: ../clients/common/nm-meta-setting-desc.c:6021
-+#: ../clients/common/nm-meta-setting-desc.c:6954
- msgid "Remote"
- msgstr "Distant"
-
--#: ../clients/common/nm-meta-setting-desc.c:6555
-+#: ../clients/common/nm-meta-setting-desc.c:6066
- msgid "MACsec parent device or connection UUID"
- msgstr "Périphérique parent ou connexion MACsec UUID"
-
--#: ../clients/common/nm-meta-setting-desc.c:6576
-+#: ../clients/common/nm-meta-setting-desc.c:6087
- msgid "Enable encryption [yes]"
- msgstr "Activer le chiffrement [yes]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6582
--#: ../clients/common/nm-secret-agent-simple.c:835
-+#: ../clients/common/nm-meta-setting-desc.c:6093
-+#: ../clients/common/nm-secret-agent-simple.c:930
- msgid "MKA CAK"
- msgstr "MKA CAK"
-
--#: ../clients/common/nm-meta-setting-desc.c:6592
-+#: ../clients/common/nm-meta-setting-desc.c:6103
- msgid "MKA_CKN"
- msgstr "MKA_CKN"
-
--#: ../clients/common/nm-meta-setting-desc.c:6598
-+#: ../clients/common/nm-meta-setting-desc.c:6109
- msgid "SCI port [1]"
- msgstr "SCI port [1]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6624
-+#: ../clients/common/nm-meta-setting-desc.c:6135
- msgid "MACVLAN parent device or connection UUID"
- msgstr "Périphérique parent MACVLAN ou connexion UUID"
-
--#: ../clients/common/nm-meta-setting-desc.c:6645
-+#: ../clients/common/nm-meta-setting-desc.c:6156
- msgid "Tap [no]"
- msgstr "Cliquez [no]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6671
--#: ../clients/common/nm-meta-setting-desc.c:7576
-+#: ../clients/common/nm-meta-setting-desc.c:6191
-+#: ../clients/common/nm-meta-setting-desc.c:7203
- #: ../clients/tui/nmt-page-wifi.c:224
- msgid "SSID"
- msgstr "SSID"
-
--#: ../clients/common/nm-meta-setting-desc.c:6680
-+#: ../clients/common/nm-meta-setting-desc.c:6200
- msgid "OLPC Mesh channel [1]"
- msgstr "Canal OLPC Mesh [1]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6689
-+#: ../clients/common/nm-meta-setting-desc.c:6209
- msgid "DHCP anycast MAC address [none]"
- msgstr "Adresse MAC anycast DHCP [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6701
-+#: ../clients/common/nm-meta-setting-desc.c:6359
- msgid "PPPoE parent device"
- msgstr "Périphérique parent PPPoE"
-
--#: ../clients/common/nm-meta-setting-desc.c:6707
-+#: ../clients/common/nm-meta-setting-desc.c:6365
- msgid "Service [none]"
- msgstr "Service [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6714
-+#: ../clients/common/nm-meta-setting-desc.c:6372
- msgid "PPPoE username"
- msgstr "Nom d'utilisateur PPPoE"
-
--#: ../clients/common/nm-meta-setting-desc.c:6888
-+#: ../clients/common/nm-meta-setting-desc.c:6408
- msgid "Browser only [no]"
- msgstr "Navigateur seulement [no]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6894
-+#: ../clients/common/nm-meta-setting-desc.c:6414
- msgid "PAC URL"
- msgstr "URL PAC"
-
--#: ../clients/common/nm-meta-setting-desc.c:6900
-+#: ../clients/common/nm-meta-setting-desc.c:6420
- msgid "PAC script"
- msgstr "Script PAC"
-
--#: ../clients/common/nm-meta-setting-desc.c:6935
--#: ../clients/common/nm-meta-setting-desc.c:7084
-+#: ../clients/common/nm-meta-setting-desc.c:6544
-+#: ../clients/common/nm-meta-setting-desc.c:6707
- msgid "Team JSON configuration [none]"
- msgstr "Configuration de l'équipe JSON [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:7239
-+#: ../clients/common/nm-meta-setting-desc.c:6796
- msgid "User ID [none]"
- msgstr "ID Utilisateur [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:7245
-+#: ../clients/common/nm-meta-setting-desc.c:6802
- msgid "Group ID [none]"
- msgstr "ID Groupe [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:7251
-+#: ../clients/common/nm-meta-setting-desc.c:6808
- msgid "Enable PI [no]"
- msgstr "Activer PI [no]"
-
--#: ../clients/common/nm-meta-setting-desc.c:7257
-+#: ../clients/common/nm-meta-setting-desc.c:6814
- msgid "Enable VNET header [no]"
- msgstr "Activer l'en-tête VNET [no]"
-
--#: ../clients/common/nm-meta-setting-desc.c:7263
-+#: ../clients/common/nm-meta-setting-desc.c:6820
- msgid "Enable multi queue [no]"
- msgstr "Activer les files d'attente multiples [no]"
-
--#: ../clients/common/nm-meta-setting-desc.c:7276
-+#: ../clients/common/nm-meta-setting-desc.c:6833
- msgid "VLAN parent device or connection UUID"
- msgstr "Périphérique parent VLAN ou connexion UUID"
-
--#: ../clients/common/nm-meta-setting-desc.c:7283
-+#: ../clients/common/nm-meta-setting-desc.c:6840
- msgid "VLAN ID (<0-4094>)"
- msgstr "VLAN ID (<0-4094>)"
-
--#: ../clients/common/nm-meta-setting-desc.c:7289
-+#: ../clients/common/nm-meta-setting-desc.c:6846
- msgid "VLAN flags (<0-7>) [none]"
- msgstr "Drapeaux VLAN (<0-7>) [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:7298
-+#: ../clients/common/nm-meta-setting-desc.c:6855
- msgid "Ingress priority maps [none]"
- msgstr "Carte des priorités entrantes [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:7308
-+#: ../clients/common/nm-meta-setting-desc.c:6865
- msgid "Egress priority maps [none]"
- msgstr "Carte des priorités sortantes [aucune] "
-
--#: ../clients/common/nm-meta-setting-desc.c:7376
-+#: ../clients/common/nm-meta-setting-desc.c:6941
- msgid "VXLAN ID"
- msgstr "ID VXLAN"
-
--#: ../clients/common/nm-meta-setting-desc.c:7382
-+#: ../clients/common/nm-meta-setting-desc.c:6947
- msgid "Local address [none]"
- msgstr "Adresse locale [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:7395
-+#: ../clients/common/nm-meta-setting-desc.c:6960
- msgid "Minimum source port [0]"
- msgstr "Port source minimum [0]"
-
--#: ../clients/common/nm-meta-setting-desc.c:7401
-+#: ../clients/common/nm-meta-setting-desc.c:6966
- msgid "Maximum source port [0]"
- msgstr "Port source maximum [0]"
-
--#: ../clients/common/nm-meta-setting-desc.c:7407
-+#: ../clients/common/nm-meta-setting-desc.c:6972
- msgid "Destination port [8472]"
- msgstr "Port de destination [8472]"
-
--#: ../clients/common/nm-meta-setting-desc.c:7453
-+#: ../clients/common/nm-meta-setting-desc.c:7012
-+msgid "Peer"
-+msgstr ""
-+
-+#: ../clients/common/nm-meta-setting-desc.c:7042
- msgid "WiMAX NSP name"
- msgstr "Nom NSP WiMAX"
-
--#: ../clients/common/nm-meta-setting-desc.c:7490
--#: ../clients/common/nm-meta-setting-desc.c:7626
-+#: ../clients/common/nm-meta-setting-desc.c:7079
-+#: ../clients/common/nm-meta-setting-desc.c:7253
- msgid "Cloned MAC [none]"
- msgstr "MAC dupliqué [aucun]"
-
--#: ../clients/common/nm-meta-setting-desc.c:7517
-+#: ../clients/common/nm-meta-setting-desc.c:7112
- msgid ""
- "Enter a list of subchannels (comma or space separated).\n"
- "\n"
-@@ -5805,7 +5655,7 @@ msgstr ""
- "\n"
- "Exemple : 0.0.0e20 0.0.0e21 0.0.0e22\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:7785
-+#: ../clients/common/nm-meta-setting-desc.c:7427
- msgid ""
- "Enter the type of WEP keys. The accepted values are: 0 or unknown, 1 or key, "
- "and 2 or passphrase.\n"
-@@ -5813,266 +5663,287 @@ 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:7847
-+#: ../clients/common/nm-meta-setting-desc.c:7486
- msgid "Short address (<0x0000-0xffff>)"
- msgstr "Adresse courte (<0x000000-0xffffff>)"
-
--#: ../clients/common/nm-meta-setting-desc.c:7863
-+#: ../clients/common/nm-meta-setting-desc.c:7502
- msgid "PAN Identifier (<0x0000-0xffff>)"
- msgstr "Identificateur PAN (<0x000000-0xffffff>)"
-
--#: ../clients/common/nm-meta-setting-desc.c:7878
-+#: ../clients/common/nm-meta-setting-desc.c:7517
- #, fuzzy
- msgid "Page (<default|0-31>)"
- msgstr "(par défaut)"
-
--#: ../clients/common/nm-meta-setting-desc.c:7892
-+#: ../clients/common/nm-meta-setting-desc.c:7531
- msgid "Channel (<default|0-26>)"
- msgstr ""
-
--#: ../clients/common/nm-meta-setting-desc.c:7913
--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:8040
-+#: ../clients/common/nm-meta-setting-desc.c:7666
-+msgid "6LOWPAN settings"
-+msgstr "Configuration 6LOWPAN"
-+
-+#: ../clients/common/nm-meta-setting-desc.c:7667
- msgid "802-1x settings"
- msgstr "Configuration 802-1x"
-
--#: ../clients/common/nm-meta-setting-desc.c:8041
--#: ../src/devices/adsl/nm-device-adsl.c:133
-+#: ../clients/common/nm-meta-setting-desc.c:7668
-+#: ../src/devices/adsl/nm-device-adsl.c:132
- msgid "ADSL connection"
- msgstr "Connexion ADSL"
-
--#: ../clients/common/nm-meta-setting-desc.c:8042
-+#: ../clients/common/nm-meta-setting-desc.c:7669
- msgid "bluetooth connection"
- msgstr "Connexion bluetooth"
-
--#: ../clients/common/nm-meta-setting-desc.c:8043
-+#: ../clients/common/nm-meta-setting-desc.c:7670
- msgid "Bond device"
- msgstr "Périphérique de liaison"
-
--#: ../clients/common/nm-meta-setting-desc.c:8044
-+#: ../clients/common/nm-meta-setting-desc.c:7671
- msgid "Bridge device"
- msgstr "Périphérique de pontage"
-
--#: ../clients/common/nm-meta-setting-desc.c:8045
-+#: ../clients/common/nm-meta-setting-desc.c:7672
- msgid "Bridge port"
- msgstr "Pont port"
-
--#: ../clients/common/nm-meta-setting-desc.c:8046
-+#: ../clients/common/nm-meta-setting-desc.c:7673
- msgid "CDMA mobile broadband connection"
- msgstr "Connexion haut débit mobile "
-
--#: ../clients/common/nm-meta-setting-desc.c:8047
-+#: ../clients/common/nm-meta-setting-desc.c:7674
- msgid "General settings"
- msgstr "Configuration générale"
-
--#: ../clients/common/nm-meta-setting-desc.c:8048
-+#: ../clients/common/nm-meta-setting-desc.c:7675
- msgid "DCB settings"
- msgstr "Configuration DCB"
-
--#: ../clients/common/nm-meta-setting-desc.c:8049
-+#: ../clients/common/nm-meta-setting-desc.c:7676
- msgid "Dummy settings"
- msgstr "Paramètres fictifs"
-
--#: ../clients/common/nm-meta-setting-desc.c:8050
-+#: ../clients/common/nm-meta-setting-desc.c:7677
- msgid "Ethtool settings"
- msgstr "Paramètres de l'Ethtool"
-
--#: ../clients/common/nm-meta-setting-desc.c:8051
-+#: ../clients/common/nm-meta-setting-desc.c:7678
- msgid "Generic settings"
- msgstr "Paramètres génériques"
-
--#: ../clients/common/nm-meta-setting-desc.c:8052
-+#: ../clients/common/nm-meta-setting-desc.c:7679
- msgid "GSM mobile broadband connection"
- msgstr "Connexion haut débit mobile "
-
--#: ../clients/common/nm-meta-setting-desc.c:8053
-+#: ../clients/common/nm-meta-setting-desc.c:7680
- #: ../src/devices/nm-device-infiniband.c:172
- msgid "InfiniBand connection"
- msgstr "Connexion InfiniBand"
-
--#: ../clients/common/nm-meta-setting-desc.c:8054
-+#: ../clients/common/nm-meta-setting-desc.c:7681
- msgid "IPv4 protocol"
- msgstr "Protocole IPv4"
-
--#: ../clients/common/nm-meta-setting-desc.c:8055
-+#: ../clients/common/nm-meta-setting-desc.c:7682
- msgid "IPv6 protocol"
- msgstr "Protocole IPv6"
-
--#: ../clients/common/nm-meta-setting-desc.c:8056
-+#: ../clients/common/nm-meta-setting-desc.c:7683
- msgid "IP-tunnel settings"
- msgstr "Paramètres du tunnel IP"
-
--#: ../clients/common/nm-meta-setting-desc.c:8057
-+#: ../clients/common/nm-meta-setting-desc.c:7684
- msgid "MACsec connection"
- msgstr "Connexion MACsec"
-
--#: ../clients/common/nm-meta-setting-desc.c:8058
-+#: ../clients/common/nm-meta-setting-desc.c:7685
- msgid "macvlan connection"
- msgstr "Connexion macvlan"
-
--#: ../clients/common/nm-meta-setting-desc.c:8059
-+#: ../clients/common/nm-meta-setting-desc.c:7686
- msgid "Match"
- msgstr "Correspond"
-
--#: ../clients/common/nm-meta-setting-desc.c:8060
-+#: ../clients/common/nm-meta-setting-desc.c:7687
- msgid "OLPC Mesh connection"
- msgstr "Connexion OLPC Mesh"
-
--#: ../clients/common/nm-meta-setting-desc.c:8061
-+#: ../clients/common/nm-meta-setting-desc.c:7688
- msgid "Open vSwitch bridge settings"
- msgstr "Configuration du pont Open vSwitch"
-
--#: ../clients/common/nm-meta-setting-desc.c:8062
-+#: ../clients/common/nm-meta-setting-desc.c:7689
- msgid "Open vSwitch interface settings"
- msgstr "Paramètres de l'interface Open vSwitch"
-
--#: ../clients/common/nm-meta-setting-desc.c:8063
-+#: ../clients/common/nm-meta-setting-desc.c:7690
- msgid "Open vSwitch patch interface settings"
- msgstr "Paramètres de l'interface de patch Open vSwitch"
-
--#: ../clients/common/nm-meta-setting-desc.c:8064
-+#: ../clients/common/nm-meta-setting-desc.c:7691
- msgid "Open vSwitch port settings"
- msgstr "Paramètres du port Open vSwitch"
-
--#: ../clients/common/nm-meta-setting-desc.c:8065
-+#: ../clients/common/nm-meta-setting-desc.c:7692
- msgid "PPP settings"
- msgstr "Paramètres PPP"
-
--#: ../clients/common/nm-meta-setting-desc.c:8066
-+#: ../clients/common/nm-meta-setting-desc.c:7693
- msgid "PPPoE"
- msgstr "PPPoE"
-
--#: ../clients/common/nm-meta-setting-desc.c:8067
-+#: ../clients/common/nm-meta-setting-desc.c:7694
- msgid "Proxy"
- msgstr "Procuration"
-
--#: ../clients/common/nm-meta-setting-desc.c:8068
-+#: ../clients/common/nm-meta-setting-desc.c:7695
- msgid "Serial settings"
- msgstr "Configuration de série"
-
--#: ../clients/common/nm-meta-setting-desc.c:8069
-+#: ../clients/common/nm-meta-setting-desc.c:7696
- msgid "SR-IOV settings"
- msgstr "Configuration SR-IOV"
-
--#: ../clients/common/nm-meta-setting-desc.c:8070
-+#: ../clients/common/nm-meta-setting-desc.c:7697
- 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:8071
-+#: ../clients/common/nm-meta-setting-desc.c:7698
- msgid "Team device"
- msgstr "Périphérique de l'équipe"
-
--#: ../clients/common/nm-meta-setting-desc.c:8072
-+#: ../clients/common/nm-meta-setting-desc.c:7699
- 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:8073
-+#: ../clients/common/nm-meta-setting-desc.c:7700
- msgid "Tun device"
- msgstr "Périphérique TUN"
-
--#: ../clients/common/nm-meta-setting-desc.c:8074
-+#: ../clients/common/nm-meta-setting-desc.c:7701
- msgid "User settings"
- msgstr "Configuration utilisateur"
-
--#: ../clients/common/nm-meta-setting-desc.c:8075
-+#: ../clients/common/nm-meta-setting-desc.c:7702
- #: ../src/devices/nm-device-vlan.c:400
- msgid "VLAN connection"
- msgstr "Connexion VLAN"
-
--#: ../clients/common/nm-meta-setting-desc.c:8076 ../src/nm-manager.c:5488
-+#: ../clients/common/nm-meta-setting-desc.c:7703 ../src/nm-manager.c:5539
- msgid "VPN connection"
- msgstr "Connexion VPN"
-
--#: ../clients/common/nm-meta-setting-desc.c:8077
--#: ../src/devices/nm-device-vxlan.c:371
-+#: ../clients/common/nm-meta-setting-desc.c:7704
-+#: ../src/devices/nm-device-vxlan.c:369
- msgid "VXLAN connection"
- msgstr "Connexion VXLAN"
-
--#: ../clients/common/nm-meta-setting-desc.c:8078
-+#: ../clients/common/nm-meta-setting-desc.c:7705
-+#, fuzzy
-+msgid "Wi-Fi P2P connection"
-+msgstr "Connexion Wi-Fi "
-+
-+#: ../clients/common/nm-meta-setting-desc.c:7706
- msgid "WiMAX connection"
- msgstr "Connexion WiMAX"
-
--#: ../clients/common/nm-meta-setting-desc.c:8079
-+#: ../clients/common/nm-meta-setting-desc.c:7707
- msgid "Wired Ethernet"
- msgstr "Ethernet filaire"
-
--#: ../clients/common/nm-meta-setting-desc.c:8080
-+#: ../clients/common/nm-meta-setting-desc.c:7708
-+#, fuzzy
-+msgid "WireGuard VPN settings"
-+msgstr "Configuration WPAN"
-+
-+#: ../clients/common/nm-meta-setting-desc.c:7709
- msgid "Wi-Fi connection"
- msgstr "Connexion Wi-Fi "
-
--#: ../clients/common/nm-meta-setting-desc.c:8081
-+#: ../clients/common/nm-meta-setting-desc.c:7710
- msgid "Wi-Fi security settings"
- msgstr "Paramètres de sécurité Wi-Fi"
-
--#: ../clients/common/nm-meta-setting-desc.c:8082
-+#: ../clients/common/nm-meta-setting-desc.c:7711
- msgid "WPAN settings"
- msgstr "Configuration WPAN"
-
--#: ../clients/common/nm-meta-setting-desc.c:8083
--msgid "6LOWPAN settings"
--msgstr "Configuration 6LOWPAN"
--
--#: ../clients/common/nm-meta-setting-desc.c:8434
-+#: ../clients/common/nm-meta-setting-desc.c:8074
- msgid "name"
- msgstr "nom"
-
--#: ../clients/common/nm-polkit-listener.c:239
-+#: ../clients/common/nm-polkit-listener.c:238
- 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:271
--#: ../clients/common/nm-secret-agent-simple.c:311
--#: ../clients/common/nm-secret-agent-simple.c:339
--#: ../clients/common/nm-secret-agent-simple.c:375
--#: ../clients/common/nm-secret-agent-simple.c:820
--#: ../clients/common/nm-secret-agent-simple.c:852
--#: ../clients/common/nm-secret-agent-simple.c:874
--#: ../clients/common/nm-vpn-helpers.c:119
-+#: ../clients/common/nm-secret-agent-simple.c:230
-+#, c-format
-+msgid "Preshared-key for %s"
-+msgstr ""
-+
-+#: ../clients/common/nm-secret-agent-simple.c:286
-+#: ../clients/common/nm-secret-agent-simple.c:323
-+#: ../clients/common/nm-secret-agent-simple.c:346
-+#: ../clients/common/nm-secret-agent-simple.c:379
-+#: ../clients/common/nm-secret-agent-simple.c:916
-+#: ../clients/common/nm-secret-agent-simple.c:951
-+#: ../clients/common/nm-secret-agent-simple.c:974
- #: ../clients/common/nm-vpn-helpers.c:123
--#: ../clients/common/nm-vpn-helpers.c:129
--#: ../clients/common/nm-vpn-helpers.c:134 ../clients/tui/nmt-page-dsl.c:75
-+#: ../clients/common/nm-vpn-helpers.c:127
-+#: ../clients/common/nm-vpn-helpers.c:133
-+#: ../clients/common/nm-vpn-helpers.c:138 ../clients/tui/nmt-page-dsl.c:75
- #: ../clients/tui/nmt-page-wifi.c:277 ../clients/tui/nmt-page-wifi.c:308
- #: ../clients/tui/nmt-page-wifi.c:341
- msgid "Password"
- msgstr "Mot de passe"
-
--#: ../clients/common/nm-secret-agent-simple.c:281
-+#: ../clients/common/nm-secret-agent-simple.c:295
- msgid "Identity"
- msgstr "Identité"
-
--#: ../clients/common/nm-secret-agent-simple.c:287
-+#: ../clients/common/nm-secret-agent-simple.c:300
- msgid "Private key password"
- msgstr "Mot de passe de la clé privée"
-
--#: ../clients/common/nm-secret-agent-simple.c:326
-+#: ../clients/common/nm-secret-agent-simple.c:336
- #: ../clients/tui/nmt-page-wifi.c:289
- msgid "Key"
- msgstr "Clé"
-
--#: ../clients/common/nm-secret-agent-simple.c:369
-+#: ../clients/common/nm-secret-agent-simple.c:374
- #: ../clients/tui/nmt-page-dsl.c:78
- msgid "Service"
- msgstr "Service"
-
--#: ../clients/common/nm-secret-agent-simple.c:548
--#: ../clients/common/nm-secret-agent-simple.c:816
--#: ../clients/common/nm-secret-agent-simple.c:848
--#: ../clients/common/nm-secret-agent-simple.c:870
--#: ../clients/common/nm-secret-agent-simple.c:892
-+#: ../clients/common/nm-secret-agent-simple.c:486
-+#, fuzzy
-+msgid "WireGuard private-key"
-+msgstr "clé privée non valide"
-+
-+#: ../clients/common/nm-secret-agent-simple.c:527
-+#, fuzzy, c-format
-+msgid "Secrets are required to connect WireGuard VPN '%s'"
-+msgstr "Il faut un secret pour accéder au réseau sans fil « %s »"
-+
-+#: ../clients/common/nm-secret-agent-simple.c:628
-+#: ../clients/common/nm-secret-agent-simple.c:912
-+#: ../clients/common/nm-secret-agent-simple.c:947
-+#: ../clients/common/nm-secret-agent-simple.c:970
-+#: ../clients/common/nm-secret-agent-simple.c:989
- #, 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:785
-+#: ../clients/common/nm-secret-agent-simple.c:879
- msgid "Authentication required by wireless network"
- msgstr "L'authentification est requise par le réseau sans fil"
-
--#: ../clients/common/nm-secret-agent-simple.c:786
-+#: ../clients/common/nm-secret-agent-simple.c:880
- #, c-format
- msgid ""
- "Passwords or encryption keys are required to access the wireless network "
-@@ -6081,70 +5952,75 @@ 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:790
-+#: ../clients/common/nm-secret-agent-simple.c:885
- msgid "Wired 802.1X authentication"
- msgstr "Authentification filaire 802.1X"
-
--#: ../clients/common/nm-secret-agent-simple.c:791
-+#: ../clients/common/nm-secret-agent-simple.c:886
- #, 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:796
-+#: ../clients/common/nm-secret-agent-simple.c:892
- msgid "DSL authentication"
- msgstr "Authentification DSL"
-
--#: ../clients/common/nm-secret-agent-simple.c:797
-+#: ../clients/common/nm-secret-agent-simple.c:893
- #, 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:805
-+#: ../clients/common/nm-secret-agent-simple.c:902
- msgid "PIN code required"
- msgstr "Code PIN requis"
-
--#: ../clients/common/nm-secret-agent-simple.c:806
-+#: ../clients/common/nm-secret-agent-simple.c:903
- 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:809
-+#: ../clients/common/nm-secret-agent-simple.c:906
- msgid "PIN"
- msgstr "PIN"
-
--#: ../clients/common/nm-secret-agent-simple.c:815
--#: ../clients/common/nm-secret-agent-simple.c:847
--#: ../clients/common/nm-secret-agent-simple.c:869
-+#: ../clients/common/nm-secret-agent-simple.c:911
-+#: ../clients/common/nm-secret-agent-simple.c:946
-+#: ../clients/common/nm-secret-agent-simple.c:969
- msgid "Mobile broadband network password"
- msgstr "Mot de passe du réseau haut débit mobile"
-
--#: ../clients/common/nm-secret-agent-simple.c:829
-+#: ../clients/common/nm-secret-agent-simple.c:924
- #, 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:833
-+#: ../clients/common/nm-secret-agent-simple.c:928
- msgid "MACsec PSK authentication"
- msgstr "Authentification MACsec PSK"
-
--#: ../clients/common/nm-secret-agent-simple.c:841
-+#: ../clients/common/nm-secret-agent-simple.c:935
- msgid "MACsec EAP authentication"
- msgstr "Authentification MACsec EAP"
-
--#: ../clients/common/nm-secret-agent-simple.c:882
-+#: ../clients/common/nm-secret-agent-simple.c:940
-+#, fuzzy
-+msgid "WireGuard VPN secret"
-+msgstr "WireGuard"
-+
-+#: ../clients/common/nm-secret-agent-simple.c:979
- msgid "VPN password required"
- msgstr "Mot de passe VPN requis"
-
--#: ../clients/common/nm-vpn-helpers.c:48
-+#: ../clients/common/nm-vpn-helpers.c:52
- #, c-format
- msgid "unknown VPN plugin \"%s\""
- msgstr "Greffon VPN inconnu « %s »"
-
--#: ../clients/common/nm-vpn-helpers.c:59
-+#: ../clients/common/nm-vpn-helpers.c:63
- #, 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:64
-+#: ../clients/common/nm-vpn-helpers.c:68
- #, c-format
- msgid ""
- "cannot load VPN plugin \"%s\" due to missing \"%s\". Missing client plugin?"
-@@ -6152,38 +6028,70 @@ msgstr ""
- "impossible de charger le greffon VPN « %s » à cause de « %s » manquant. "
- "Greffon client manquant ?"
-
--#: ../clients/common/nm-vpn-helpers.c:69
-+#: ../clients/common/nm-vpn-helpers.c:73
- #, 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:124
-+#: ../clients/common/nm-vpn-helpers.c:128
- msgid "Certificate password"
- msgstr "Mot de passe du certificat"
-
- # ctx::sourcefile::/rhn/admin/config/GeneralConfig.do
--#: ../clients/common/nm-vpn-helpers.c:125
-+#: ../clients/common/nm-vpn-helpers.c:129
- msgid "HTTP proxy password"
- msgstr "Mot de passe du proxy HTTP"
-
--#: ../clients/common/nm-vpn-helpers.c:130
--#: ../clients/common/nm-vpn-helpers.c:135
-+#: ../clients/common/nm-vpn-helpers.c:134
-+#: ../clients/common/nm-vpn-helpers.c:139
- msgid "Group password"
- msgstr "Mot de passe de groupe"
-
--#: ../clients/common/nm-vpn-helpers.c:139 ../clients/tui/nmt-page-ip4.c:143
-+#: ../clients/common/nm-vpn-helpers.c:143 ../clients/tui/nmt-page-ip4.c:143
- #: ../clients/tui/nmt-page-ip6.c:143
- msgid "Gateway"
- msgstr "Passerelle"
-
--#: ../clients/common/nm-vpn-helpers.c:140
-+#: ../clients/common/nm-vpn-helpers.c:144
- msgid "Cookie"
- msgstr "Cookie"
-
--#: ../clients/common/nm-vpn-helpers.c:141
-+#: ../clients/common/nm-vpn-helpers.c:145
- msgid "Gateway certificate hash"
- msgstr "Hachage de certificat de passerelle"
-
-+#: ../clients/common/nm-vpn-helpers.c:270
-+#, fuzzy, c-format
-+msgid "Invalid peer starting at %s:%zu: %s"
-+msgstr "nom de configuration non valide « %s »"
-+
-+#: ../clients/common/nm-vpn-helpers.c:390
-+msgid ""
-+"The WireGuard config file must be a valid interface name followed by \".conf"
-+"\""
-+msgstr ""
-+
-+#: ../clients/common/nm-vpn-helpers.c:678
-+#, c-format
-+msgid "unrecognized line at %s:%zu"
-+msgstr ""
-+
-+#: ../clients/common/nm-vpn-helpers.c:683
-+#, fuzzy, c-format
-+msgid "invalid value for '%s' at %s:%zu"
-+msgstr "valeur non valide pour \"%s\": %s"
-+
-+#: ../clients/common/nm-vpn-helpers.c:688
-+#, fuzzy, c-format
-+msgid "invalid secret '%s' at %s:%zu"
-+msgstr "route non valide : %s. %s"
-+
-+#: ../clients/common/nm-vpn-helpers.c:801
-+#, fuzzy, c-format
-+msgid "Failed to create WireGuard connection: %s"
-+msgstr ""
-+"Erreur : échec de l'ajout ou de l'activation de la nouvelle connexion : %s"
-+
- #. Generated file. Do not edit.
- #: ../clients/common/settings-docs.h.in:3
- msgid ""
-@@ -6254,19 +6162,20 @@ msgstr ""
- "propriété nécessite également de définir la propriété \"band\"."
-
- #: ../clients/common/settings-docs.h.in:10
-+#, fuzzy
- 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 "
--"address, the special values \"preserve\", \"permanent\", \"random\" and "
--"\"stable\" are supported. \"preserve\" means not to touch the MAC address on "
--"activation. \"permanent\" means to use the permanent hardware address of the "
--"device. \"random\" 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 \"cloned-mac-address\"."
-+"If specified, request that the device use this MAC address instead of its "
-+"permanent MAC address. This is known as MAC cloning or spoofing. Beside "
-+"explicitly specifying a MAC address, the special values \"preserve\", "
-+"\"permanent\", \"random\" and \"stable\" are supported. \"preserve\" means "
-+"not to touch the MAC address on activation. \"permanent\" means to use the "
-+"permanent hardware address of the device. \"random\" 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 \"permanent\". 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. "
-@@ -6540,11 +6449,12 @@ msgstr ""
- "\"ccmp\"."
-
- #: ../clients/common/settings-docs.h.in:27
-+#, fuzzy
- 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), or \"wpa-eap\" (WPA-Enterprise). This property must be set for "
--"any Wi-Fi connection that uses security."
-+"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-"
-@@ -6619,19 +6529,12 @@ msgstr ""
-
- #: ../clients/common/settings-docs.h.in:34
- msgid ""
--"Pre-Shared-Key for WPA networks. If the key is 64-characters long, it must "
--"contain only hexadecimal characters and is interpreted as a hexadecimal WPA "
--"key. Otherwise, the key must be between 8 and 63 ASCII characters (as "
--"specified in the 802.11i standard) and is interpreted as a WPA passphrase, "
--"and is hashed to derive the actual WPA-PSK used when connecting to the Wi-Fi "
--"network."
-+"Pre-Shared-Key for WPA networks. For WPA-PSK, it's either an ASCII "
-+"passphrase of 8 to 63 characters that is (as specified in the 802.11i "
-+"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. Si la clé est longue de 64 "
--"caractères, elle ne doit contenir que des caractères hexadécimaux et est "
--"interprétée comme une clé WPA hexadécimale. Sinon, la clé doit comporter "
--"entre 8 et 63 caractères ASCII (comme spécifié dans la norme 802.11i) et est "
--"interprétée comme une phrase de passe WPA, et est hachée pour obtenir le WPA-"
--"PSK réel utilisé pour la connexion au réseau Wi-Fi."
-
- #: ../clients/common/settings-docs.h.in:35
- msgid "Flags indicating how to handle the \"psk\" property."
-@@ -6887,9 +6790,9 @@ msgstr ""
-
- #: ../clients/common/settings-docs.h.in:59
- #: ../clients/common/settings-docs.h.in:104
--#: ../clients/common/settings-docs.h.in:127
--#: ../clients/common/settings-docs.h.in:174
--#: ../clients/common/settings-docs.h.in:286
-+#: ../clients/common/settings-docs.h.in:131
-+#: ../clients/common/settings-docs.h.in:178
-+#: ../clients/common/settings-docs.h.in:290
- msgid "Flags indicating how to handle the \"password\" property."
- msgstr "Drapeaux indiquant comment gérer la propriété \"password\"."
-
-@@ -7198,7 +7101,7 @@ 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:176
-+#: ../clients/common/settings-docs.h.in:180
- msgid "Flags indicating how to handle the \"pin\" property."
- msgstr "Drapeaux indiquant comment gérer la propriété \"pin\"."
-
-@@ -7315,20 +7218,20 @@ msgstr ""
- "les deux réglées ou la configuration de la liaison sera ignorée."
-
- #: ../clients/common/settings-docs.h.in:89
-+#, fuzzy
- 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 "
--"address, the special values \"preserve\", \"permanent\", \"random\" and "
--"\"stable\" are supported. \"preserve\" means not to touch the MAC address on "
--"activation. \"permanent\" means to use the permanent hardware address if the "
--"device has one (otherwise this is treated as \"preserve\"). \"random\" "
--"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 "
--"\"cloned-mac-address\"."
-+"If specified, request that the device use this MAC address instead of its "
-+"permanent MAC address. This is known as MAC cloning or spoofing. Beside "
-+"explicitly specifying a MAC address, the special values \"preserve\", "
-+"\"permanent\", \"random\" and \"stable\" are supported. \"preserve\" means "
-+"not to touch the MAC address on activation. \"permanent\" means to use the "
-+"permanent hardware address if the device has one (otherwise this is treated "
-+"as \"preserve\"). \"random\" 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 \"permanent\". On D-Bus, this field is expressed as \"assigned-"
-+"mac-address\" or the deprecated \"cloned-mac-address\"."
- msgstr ""
- "Si spécifié, demandez 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. "
-@@ -7639,26 +7542,59 @@ msgstr ""
-
- #: ../clients/common/settings-docs.h.in:121
- msgid ""
-+"The default PVID for the ports of the bridge, that is the VLAN id assigned "
-+"to incoming untagged frames."
-+msgstr ""
-+
-+#: ../clients/common/settings-docs.h.in:122
-+#, fuzzy
-+msgid "Control whether VLAN filtering is enabled on the bridge."
-+msgstr ""
-+"Contrôle si le protocole Spanning Tree Protocol (STP) est activé pour ce "
-+"pont."
-+
-+#: ../clients/common/settings-docs.h.in:123
-+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-"
-+"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 ""
-+
-+#: ../clients/common/settings-docs.h.in:124
-+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."
-
--#: ../clients/common/settings-docs.h.in:122
-+#: ../clients/common/settings-docs.h.in:125
- 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."
-
--#: ../clients/common/settings-docs.h.in:123
-+#: ../clients/common/settings-docs.h.in:126
- 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:124
--#: ../clients/common/settings-docs.h.in:170
--#: ../clients/common/settings-docs.h.in:181
-+#: ../clients/common/settings-docs.h.in:127
-+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 ""
-+
-+#: ../clients/common/settings-docs.h.in:128
-+#: ../clients/common/settings-docs.h.in:174
-+#: ../clients/common/settings-docs.h.in:185
- msgid ""
- "If non-zero, only transmit packets of the specified size or smaller, "
- "breaking larger packets up into multiple frames."
-@@ -7666,7 +7602,7 @@ 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:125
-+#: ../clients/common/settings-docs.h.in:129
- 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 "
-@@ -7676,8 +7612,8 @@ msgstr ""
- "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:126
--#: ../clients/common/settings-docs.h.in:173
-+#: ../clients/common/settings-docs.h.in:130
-+#: ../clients/common/settings-docs.h.in:177
- 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 "
-@@ -7688,8 +7624,8 @@ msgstr ""
- "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:128
--#: ../clients/common/settings-docs.h.in:179
-+#: ../clients/common/settings-docs.h.in:132
-+#: ../clients/common/settings-docs.h.in:183
- 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 "
-@@ -7700,7 +7636,7 @@ msgstr ""
- "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:129
-+#: ../clients/common/settings-docs.h.in:133
- 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 "
-@@ -7713,7 +7649,7 @@ msgstr ""
- "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:130
-+#: ../clients/common/settings-docs.h.in:134
- msgid ""
- "Whether or not the connection should be automatically connected by "
- "NetworkManager when the resources for the connection are available. TRUE to "
-@@ -7729,7 +7665,7 @@ msgstr ""
- "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:131
-+#: ../clients/common/settings-docs.h.in:135
- msgid ""
- "The autoconnect priority. If the connection is set to autoconnect, "
- "connections with higher priority will be preferred. Defaults to 0. The "
-@@ -7740,7 +7676,7 @@ msgstr ""
- "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:132
-+#: ../clients/common/settings-docs.h.in:136
- 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 "
-@@ -7755,7 +7691,7 @@ msgstr ""
- "automatique. Notez qu’après un timeout, NetworkManager va essayer de se "
- "reconnecter automatiquement."
-
--#: ../clients/common/settings-docs.h.in:133
-+#: ../clients/common/settings-docs.h.in:137
- msgid ""
- "Whether or not slaves of this connection should be automatically brought up "
- "when NetworkManager activates this connection. This only has a real effect "
-@@ -7776,7 +7712,7 @@ msgstr ""
- "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:134
-+#: ../clients/common/settings-docs.h.in:138
- msgid ""
- "If greater than zero, delay success of IP addressing until either the "
- "timeout is reached, or an IP gateway replies to a ping."
-@@ -7785,7 +7721,7 @@ msgstr ""
- "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:135
-+#: ../clients/common/settings-docs.h.in:139
- msgid ""
- "A human readable unique identifier for the connection, like \"Work Wi-Fi\" "
- "or \"T-Mobile 3G\"."
-@@ -7793,7 +7729,7 @@ 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:136
-+#: ../clients/common/settings-docs.h.in:140
- 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 "
-@@ -7816,11 +7752,11 @@ msgstr ""
- "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:137
-+#: ../clients/common/settings-docs.h.in:141
- msgid "Whether LLDP is enabled for the connection."
- msgstr "Indique si LLDP est activé pour la connexion."
-
--#: ../clients/common/settings-docs.h.in:138
-+#: ../clients/common/settings-docs.h.in:142
- 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 "
-@@ -7840,12 +7776,12 @@ msgstr ""
- "nécessite un plugin qui supporte LLMNR. Un de ces plug-ins est dns-systemd-"
- "resolved."
-
--#: ../clients/common/settings-docs.h.in:139
-+#: ../clients/common/settings-docs.h.in:143
- 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."
-
--#: ../clients/common/settings-docs.h.in:140
-+#: ../clients/common/settings-docs.h.in:144
- 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 "
-@@ -7860,7 +7796,7 @@ msgstr ""
- "fonctionnalité nécessite un plugin qui supporte mDNS. dns-systemd-resolved "
- "est l'un de ces plug-ins."
-
--#: ../clients/common/settings-docs.h.in:141
-+#: ../clients/common/settings-docs.h.in:145
- msgid ""
- "Whether the connection is metered. When updating this property on a "
- "currently activated connection, the change takes effect immediately."
-@@ -7869,7 +7805,7 @@ msgstr ""
- "propriété sur une connexion actuellement activée, le changement prend effet "
- "immédiatement."
-
--#: ../clients/common/settings-docs.h.in:142
-+#: ../clients/common/settings-docs.h.in:146
- msgid ""
- "Specifies whether the profile can be active multiple times at a particular "
- "moment. The value is of type NMConnectionMultiConnect."
-@@ -7877,7 +7813,7 @@ 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:143
-+#: ../clients/common/settings-docs.h.in:147
- 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 "
-@@ -7905,7 +7841,7 @@ msgstr ""
- "ê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:144
-+#: ../clients/common/settings-docs.h.in:148
- 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 "
-@@ -7915,7 +7851,7 @@ msgstr ""
- "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:145
-+#: ../clients/common/settings-docs.h.in:149
- msgid ""
- "List of connection UUIDs that should be activated when the base connection "
- "itself is activated. Currently only VPN connections are supported."
-@@ -7924,7 +7860,7 @@ msgstr ""
- "de base elle-même est activée, actuellement seules les connexions VPN sont "
- "supportées."
-
--#: ../clients/common/settings-docs.h.in:146
-+#: ../clients/common/settings-docs.h.in:150
- msgid ""
- "Setting name of the device type of this slave's master connection (eg, \"bond"
- "\"), or NULL if this connection is not a slave."
-@@ -7932,7 +7868,8 @@ 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:147
-+#: ../clients/common/settings-docs.h.in:151
-+#, fuzzy
- msgid ""
- "This represents the identity of the connection used for various purposes. It "
- "allows to configure multiple profiles to share the identity. Also, the "
-@@ -7951,7 +7888,7 @@ msgid ""
- "treated special to perform dynamic substitutions at runtime. Currently "
- "supported are \"${CONNECTION}\", \"${DEVICE}\", \"${MAC}\", \"${BOOT}\", "
- "\"${RANDOM}\". These effectively create unique IDs per-connection, per-"
--"device, per-boot, or every time. Note that \"${DEVICE}\" corresponds the the "
-+"device, per-boot, or every time. Note that \"${DEVICE}\" corresponds to the "
- "interface name of the device and \"${MAC}\" is the permanent MAC address of "
- "the device. Any unrecognized patterns following '$' are treated verbatim, "
- "however are reserved for future use. You are thus advised to avoid '$' or "
-@@ -7991,7 +7928,7 @@ msgstr ""
- "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:148
-+#: ../clients/common/settings-docs.h.in:152
- msgid ""
- "The time, in seconds since the Unix Epoch, that the connection was last "
- "_successfully_ fully activated. NetworkManager updates the connection "
-@@ -8006,7 +7943,7 @@ msgstr ""
- "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:149
-+#: ../clients/common/settings-docs.h.in:153
- msgid ""
- "Base type of the connection. For hardware-dependent connections, should "
- "contain the setting name of the hardware-type specific setting (ie, \"802-3-"
-@@ -8021,7 +7958,7 @@ msgstr ""
- "contenir le nom du paramètre de ce type (par exemple, \"vpn\" ou \"pont\", "
- "etc)."
-
--#: ../clients/common/settings-docs.h.in:150
-+#: ../clients/common/settings-docs.h.in:154
- msgid ""
- "A universally unique identifier for the connection, for example generated "
- "with libuuid. It should be assigned when the connection is created, and "
-@@ -8041,7 +7978,7 @@ msgstr ""
- "\" 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:151
-+#: ../clients/common/settings-docs.h.in:155
- msgid ""
- "The trust level of a the connection. Free form case-insensitive string (for "
- "example \"Home\", \"Work\", \"Public\"). NULL or unspecified zone means the "
-@@ -8055,7 +7992,7 @@ msgstr ""
- "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:152
-+#: ../clients/common/settings-docs.h.in:156
- msgid ""
- "Specifies the NMSettingDcbFlags for the DCB FCoE application. Flags may be "
- "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
-@@ -8066,11 +8003,11 @@ msgstr ""
- "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:153
-+#: ../clients/common/settings-docs.h.in:157
- 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:154
-+#: ../clients/common/settings-docs.h.in:158
- 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 "
-@@ -8081,7 +8018,7 @@ msgstr ""
- "propriété \"app-fcoe-flags\" inclut l'indicateur NM_SETTING_DCB_FLAG_ENABLE "
- "(0x1)."
-
--#: ../clients/common/settings-docs.h.in:155
-+#: ../clients/common/settings-docs.h.in:159
- msgid ""
- "Specifies the NMSettingDcbFlags for the DCB FIP application. Flags may be "
- "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
-@@ -8092,7 +8029,7 @@ msgstr ""
- "(0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2) et NM_SETTING_DCB_FLAG_WILLING "
- "(0x4)."
-
--#: ../clients/common/settings-docs.h.in:156
-+#: ../clients/common/settings-docs.h.in:160
- 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 "
-@@ -8103,7 +8040,7 @@ msgstr ""
- "propriété \"app-fcoe-flags\" inclut l'indicateur NM_SETTING_DCB_FLAG_ENABLE "
- "(0x1)."
-
--#: ../clients/common/settings-docs.h.in:157
-+#: ../clients/common/settings-docs.h.in:161
- msgid ""
- "Specifies the NMSettingDcbFlags for the DCB iSCSI application. Flags may be "
- "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
-@@ -8114,7 +8051,7 @@ msgstr ""
- "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:162
- 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 "
-@@ -8125,7 +8062,7 @@ msgstr ""
- "propriété \"app-iscsi-flags\" inclut l'indicateur NM_SETTING_DCB_FLAG_ENABLE "
- "(0x1)."
-
--#: ../clients/common/settings-docs.h.in:159
-+#: ../clients/common/settings-docs.h.in:163
- 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 "
-@@ -8139,7 +8076,7 @@ msgstr ""
- "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:160
-+#: ../clients/common/settings-docs.h.in:164
- 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 "
-@@ -8149,7 +8086,7 @@ msgstr ""
- "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:161
-+#: ../clients/common/settings-docs.h.in:165
- msgid ""
- "Specifies the NMSettingDcbFlags for DCB Priority Flow Control (PFC). Flags "
- "may be any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
-@@ -8160,7 +8097,7 @@ msgstr ""
- "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:162
-+#: ../clients/common/settings-docs.h.in:166
- 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 "
-@@ -8172,7 +8109,7 @@ msgstr ""
- "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:163
-+#: ../clients/common/settings-docs.h.in:167
- msgid ""
- "Specifies the NMSettingDcbFlags for DCB Priority Groups. Flags may be any "
- "combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
-@@ -8183,7 +8120,7 @@ msgstr ""
- "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:164
-+#: ../clients/common/settings-docs.h.in:168
- 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 "
-@@ -8194,7 +8131,7 @@ msgstr ""
- "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:165
-+#: ../clients/common/settings-docs.h.in:169
- 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 "
-@@ -8204,7 +8141,7 @@ msgstr ""
- "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:166
-+#: ../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 traffic class (0 - 7) to which "
-@@ -8214,7 +8151,7 @@ msgstr ""
- "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:167
-+#: ../clients/common/settings-docs.h.in:171
- 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 "
-@@ -8232,7 +8169,7 @@ msgstr ""
- "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:168
-+#: ../clients/common/settings-docs.h.in:172
- 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 "
-@@ -8242,7 +8179,7 @@ msgstr ""
- "WWAN) auquel cette connexion s'applique. Si donné, la connexion ne "
- "s'appliquera qu'à l'appareil spécifié."
-
--#: ../clients/common/settings-docs.h.in:169
-+#: ../clients/common/settings-docs.h.in:173
- msgid ""
- "When TRUE, only connections to the home network will be allowed. Connections "
- "to roaming networks will not be made."
-@@ -8250,7 +8187,7 @@ 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:171
-+#: ../clients/common/settings-docs.h.in:175
- msgid ""
- "The Network ID (GSM LAI format, ie MCC-MNC) to force specific network "
- "registration. If the Network ID is specified, NetworkManager will attempt "
-@@ -8265,7 +8202,7 @@ msgstr ""
- "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:172
-+#: ../clients/common/settings-docs.h.in:176
- msgid ""
- "Legacy setting that used to help establishing PPP data sessions for GSM-"
- "based modems. Deprecated: 1"
-@@ -8276,7 +8213,7 @@ msgstr ""
- "laissée vide, ce qui permet à NetworkManager de sélectionner les paramètres "
- "appropriés automatiquement."
-
--#: ../clients/common/settings-docs.h.in:175
-+#: ../clients/common/settings-docs.h.in:179
- 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 "
-@@ -8286,7 +8223,7 @@ msgstr ""
- "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:177
-+#: ../clients/common/settings-docs.h.in:181
- 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 "
-@@ -8298,7 +8235,7 @@ msgstr ""
- "s'appliquera à tout appareil également autorisé par \"device-id\" qui "
- "contient une carte SIM correspondant à l'identifiant donné."
-
--#: ../clients/common/settings-docs.h.in:178
-+#: ../clients/common/settings-docs.h.in:182
- msgid ""
- "A MCC/MNC string like \"310260\" or \"21601\" identifying the specific "
- "mobile network operator which this connection applies to. If given, the "
-@@ -8310,7 +8247,7 @@ msgstr ""
- "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:180
-+#: ../clients/common/settings-docs.h.in:184
- 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 "
-@@ -8320,7 +8257,7 @@ msgstr ""
- "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:182
-+#: ../clients/common/settings-docs.h.in:186
- 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 "
-@@ -8331,7 +8268,7 @@ msgstr ""
- "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:183
-+#: ../clients/common/settings-docs.h.in:187
- 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 "
-@@ -8341,19 +8278,19 @@ msgstr ""
- "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:184
-+#: ../clients/common/settings-docs.h.in:188
- 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:185
-+#: ../clients/common/settings-docs.h.in:189
- 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:186
-+#: ../clients/common/settings-docs.h.in:190
- msgid ""
- "Tunnel flags. Currently the following values are supported: "
- "NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT (0x1), "
-@@ -8371,7 +8308,7 @@ msgstr ""
- "(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:187
-+#: ../clients/common/settings-docs.h.in:191
- msgid ""
- "The flow label to assign to tunnel packets. This property applies only to "
- "IPv6 tunnels."
-@@ -8379,7 +8316,7 @@ 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:188
-+#: ../clients/common/settings-docs.h.in:192
- 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."
-@@ -8388,7 +8325,7 @@ msgstr ""
- "valide que pour certains modes de tunnel (GRE, IP6GRE), si vide, aucune clé "
- "n'est utilisée."
-
--#: ../clients/common/settings-docs.h.in:189
-+#: ../clients/common/settings-docs.h.in:193
- msgid ""
- "The local endpoint of the tunnel; the value can be empty, otherwise it must "
- "contain an IPv4 or IPv6 address."
-@@ -8396,7 +8333,7 @@ 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:190
-+#: ../clients/common/settings-docs.h.in:194
- msgid ""
- "The tunneling mode, for example NM_IP_TUNNEL_MODE_IPIP (1) or "
- "NM_IP_TUNNEL_MODE_GRE (2)."
-@@ -8404,7 +8341,7 @@ 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:191
-+#: ../clients/common/settings-docs.h.in:195
- msgid ""
- "If non-zero, only transmit packets of the specified size or smaller, "
- "breaking larger packets up into multiple fragments."
-@@ -8412,7 +8349,7 @@ 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:192
-+#: ../clients/common/settings-docs.h.in:196
- 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."
-@@ -8421,7 +8358,7 @@ msgstr ""
- "valide que pour certains modes de tunnel (GRE, IP6GRE). Si vide, aucune clé "
- "n'est utilisée."
-
--#: ../clients/common/settings-docs.h.in:193
-+#: ../clients/common/settings-docs.h.in:197
- 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 "
-@@ -8431,11 +8368,11 @@ msgstr ""
- "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:194
-+#: ../clients/common/settings-docs.h.in:198
- 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:195
-+#: ../clients/common/settings-docs.h.in:199
- msgid ""
- "The remote endpoint of the tunnel; the value must contain an IPv4 or IPv6 "
- "address."
-@@ -8443,7 +8380,7 @@ msgstr ""
- "Le point de terminaison distant du tunnel ; la valeur doit contenir une "
- "adresse IPv4 ou IPv6."
-
--#: ../clients/common/settings-docs.h.in:196
-+#: ../clients/common/settings-docs.h.in:200
- msgid ""
- "The type of service (IPv4) or traffic class (IPv6) field to be set on "
- "tunneled packets."
-@@ -8451,7 +8388,7 @@ 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:197
-+#: ../clients/common/settings-docs.h.in:201
- msgid ""
- "The TTL to assign to tunneled packets. 0 is a special value meaning that "
- "packets inherit the TTL value."
-@@ -8459,13 +8396,13 @@ 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:198
--#: ../clients/common/settings-docs.h.in:219
-+#: ../clients/common/settings-docs.h.in:202
-+#: ../clients/common/settings-docs.h.in:223
- msgid "Array of IP addresses."
- msgstr "Tableau d'adresses IP."
-
--#: ../clients/common/settings-docs.h.in:199
--#: ../clients/common/settings-docs.h.in:220
-+#: ../clients/common/settings-docs.h.in:203
-+#: ../clients/common/settings-docs.h.in:224
- msgid ""
- "Timeout in milliseconds used to check for the presence of duplicate IP "
- "addresses on the network. If an address conflict is detected, the "
-@@ -8482,7 +8419,7 @@ msgstr ""
- "timeout en millisecondes. La propriété est actuellement mise en œuvre "
- "uniquement pour IPv4."
-
--#: ../clients/common/settings-docs.h.in:200
-+#: ../clients/common/settings-docs.h.in:204
- 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 "
-@@ -8523,7 +8460,7 @@ msgstr ""
- "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:201
-+#: ../clients/common/settings-docs.h.in:205
- 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-"
-@@ -8534,8 +8471,8 @@ msgstr ""
- "propriété et \"dhcp-hostname\" sont mutuellement exclusifs et ne peuvent "
- "être définis simultanément."
-
--#: ../clients/common/settings-docs.h.in:202
--#: ../clients/common/settings-docs.h.in:222
-+#: ../clients/common/settings-docs.h.in:206
-+#: ../clients/common/settings-docs.h.in:226
- 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-"
-@@ -8546,8 +8483,8 @@ msgstr ""
- "propriété et \"dhcp-hostname\" sont mutuellement exclusifs et ne peuvent "
- "être définis simultanément."
-
--#: ../clients/common/settings-docs.h.in:203
--#: ../clients/common/settings-docs.h.in:223
-+#: ../clients/common/settings-docs.h.in:207
-+#: ../clients/common/settings-docs.h.in:227
- 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 "
-@@ -8562,18 +8499,18 @@ msgstr ""
- "que cette propriété est TRUE, le nom d'hôte permanent actuel de l'ordinateur "
- "est envoyé."
-
--#: ../clients/common/settings-docs.h.in:204
--#: ../clients/common/settings-docs.h.in:224
-+#: ../clients/common/settings-docs.h.in:208
-+#: ../clients/common/settings-docs.h.in:228
- 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:205
--#: ../clients/common/settings-docs.h.in:225
-+#: ../clients/common/settings-docs.h.in:209
-+#: ../clients/common/settings-docs.h.in:229
- msgid "Array of IP addresses of DNS servers."
- msgstr "Tableau d'adresses IP des serveurs DNS."
-
--#: ../clients/common/settings-docs.h.in:206
--#: ../clients/common/settings-docs.h.in:226
-+#: ../clients/common/settings-docs.h.in:210
-+#: ../clients/common/settings-docs.h.in:230
- 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 "
-@@ -8584,8 +8521,8 @@ msgstr ""
- "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:207
--#: ../clients/common/settings-docs.h.in:227
-+#: ../clients/common/settings-docs.h.in:211
-+#: ../clients/common/settings-docs.h.in:231
- msgid ""
- "DNS servers priority. The relative priority for DNS servers specified by "
- "this setting. A lower value is better (higher priority). Zero selects a "
-@@ -8636,8 +8573,8 @@ msgstr ""
- "d'un autre domaine avec une valeur de priorité DNS négative, le sous-domaine "
- "est ignoré."
-
--#: ../clients/common/settings-docs.h.in:208
--#: ../clients/common/settings-docs.h.in:228
-+#: ../clients/common/settings-docs.h.in:212
-+#: ../clients/common/settings-docs.h.in:232
- msgid ""
- "Array of DNS search domains. Domains starting with a tilde ('~') are "
- "considered 'routing' domains and are used only to decide the interface over "
-@@ -8650,8 +8587,8 @@ msgstr ""
- "transmise ; ils ne sont pas utilisés pour compléter des noms d'hôtes non "
- "qualifiés."
-
--#: ../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:233
- msgid ""
- "The gateway associated with this configuration. This is only meaningful if "
- "\"addresses\" is also set."
-@@ -8659,8 +8596,8 @@ 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:210
--#: ../clients/common/settings-docs.h.in:230
-+#: ../clients/common/settings-docs.h.in:214
-+#: ../clients/common/settings-docs.h.in:234
- msgid ""
- "When \"method\" is set to \"auto\" and this property to TRUE, automatically "
- "configured nameservers and search domains are ignored and only nameservers "
-@@ -8673,8 +8610,8 @@ msgstr ""
- "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:211
--#: ../clients/common/settings-docs.h.in:231
-+#: ../clients/common/settings-docs.h.in:215
-+#: ../clients/common/settings-docs.h.in:235
- msgid ""
- "When \"method\" is set to \"auto\" and this property to TRUE, automatically "
- "configured routes are ignored and only routes specified in the \"routes\" "
-@@ -8684,8 +8621,8 @@ msgstr ""
- "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:212
--#: ../clients/common/settings-docs.h.in:233
-+#: ../clients/common/settings-docs.h.in:216
-+#: ../clients/common/settings-docs.h.in:237
- msgid ""
- "If TRUE, allow overall network configuration to proceed even if the "
- "configuration specified by this property times out. Note that at least one "
-@@ -8702,8 +8639,8 @@ msgstr ""
- "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:213
--#: ../clients/common/settings-docs.h.in:234
-+#: ../clients/common/settings-docs.h.in:217
-+#: ../clients/common/settings-docs.h.in:238
- msgid ""
- "IP configuration method. NMSettingIP4Config and NMSettingIP6Config both "
- "support \"auto\", \"manual\", and \"link-local\". See the subclass-specific "
-@@ -8732,8 +8669,8 @@ msgstr ""
- "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:214
--#: ../clients/common/settings-docs.h.in:235
-+#: ../clients/common/settings-docs.h.in:218
-+#: ../clients/common/settings-docs.h.in:239
- 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."
-@@ -8742,8 +8679,8 @@ msgstr ""
- "d'IP, ce qui signifie que NetworkManager ne lui assignera jamais la route "
- "par défaut."
-
--#: ../clients/common/settings-docs.h.in:215
--#: ../clients/common/settings-docs.h.in:236
-+#: ../clients/common/settings-docs.h.in:219
-+#: ../clients/common/settings-docs.h.in:240
- 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 "
-@@ -8763,8 +8700,8 @@ msgstr ""
- "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:216
--#: ../clients/common/settings-docs.h.in:237
-+#: ../clients/common/settings-docs.h.in:220
-+#: ../clients/common/settings-docs.h.in:241
- msgid ""
- "Enable policy routing (source routing) and set the routing table used when "
- "adding routes. This affects all routes, including device-routes, IPv4LL, "
-@@ -8796,12 +8733,12 @@ msgstr ""
- "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:217
--#: ../clients/common/settings-docs.h.in:238
-+#: ../clients/common/settings-docs.h.in:221
-+#: ../clients/common/settings-docs.h.in:242
- msgid "Array of IP routes."
- msgstr "Tale de routes IP."
-
--#: ../clients/common/settings-docs.h.in:218
-+#: ../clients/common/settings-docs.h.in:222
- msgid ""
- "Configure method for creating the address for use with RFC4862 IPv6 "
- "Stateless Address Autoconfiguration. The permitted values are: "
-@@ -8843,7 +8780,7 @@ msgstr ""
- "par la propriété \"ip6-privacy\" et n'affecte pas les adresses temporaires "
- "configurées avec cette option."
-
--#: ../clients/common/settings-docs.h.in:221
-+#: ../clients/common/settings-docs.h.in:225
- 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 "
-@@ -8897,7 +8834,7 @@ msgstr ""
- "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:232
-+#: ../clients/common/settings-docs.h.in:236
- msgid ""
- "Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941. If "
- "enabled, it makes the kernel generate a temporary IPv6 address in addition "
-@@ -8928,7 +8865,7 @@ msgstr ""
- "\"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:239
-+#: ../clients/common/settings-docs.h.in:243
- msgid ""
- "Configure the token for draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 "
- "tokenized interface identifiers. Useful with eui64 addr-gen-mode."
-@@ -8937,28 +8874,28 @@ msgstr ""
- "de draft-chown-6man-tokenised-ipv6-identifiers-02. Utile dans le mode eui64 "
- "addr-gen."
-
--#: ../clients/common/settings-docs.h.in:240
-+#: ../clients/common/settings-docs.h.in:244
- msgid "Whether the transmitted traffic must be encrypted."
- msgstr "Indique si le trafic transmis doit être crypté."
-
--#: ../clients/common/settings-docs.h.in:241
-+#: ../clients/common/settings-docs.h.in:245
- msgid ""
- "The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement."
- msgstr ""
- "Le CAK (Connectivity Association Key) pré-partagé pour MACsec Key Agreement."
-
--#: ../clients/common/settings-docs.h.in:242
-+#: ../clients/common/settings-docs.h.in:246
- msgid "Flags indicating how to handle the \"mka-cak\" property."
- msgstr "Drapeaux indiquant comment gérer la propriété \"mka-cak\"."
-
--#: ../clients/common/settings-docs.h.in:243
-+#: ../clients/common/settings-docs.h.in:247
- 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."
-
--#: ../clients/common/settings-docs.h.in:244
-+#: ../clients/common/settings-docs.h.in:248
- msgid ""
- "Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
- "Agreement) is obtained."
-@@ -8966,7 +8903,7 @@ msgstr ""
- "Indique si le CAK (Connectivity Association Key) pré-partagé pour MACsec Key "
- "Agreement a été obtenu."
-
--#: ../clients/common/settings-docs.h.in:245
-+#: ../clients/common/settings-docs.h.in:249
- 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 "
-@@ -8978,25 +8915,25 @@ msgstr ""
- "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:246
-+#: ../clients/common/settings-docs.h.in:250
- 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."
-
--#: ../clients/common/settings-docs.h.in:247
-+#: ../clients/common/settings-docs.h.in:251
- 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."
-
--#: ../clients/common/settings-docs.h.in:248
-+#: ../clients/common/settings-docs.h.in:252
- msgid "Specifies the validation mode for incoming frames."
- msgstr "Spécifie le mode de validation des trames entrantes."
-
--#: ../clients/common/settings-docs.h.in:249
-+#: ../clients/common/settings-docs.h.in:253
- msgid ""
- "The macvlan mode, which specifies the communication mechanism between "
- "multiple macvlans on the same lower device."
-@@ -9004,7 +8941,7 @@ 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:250
-+#: ../clients/common/settings-docs.h.in:254
- 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 "
-@@ -9016,15 +8953,15 @@ msgstr ""
- "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:255
- 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:252
-+#: ../clients/common/settings-docs.h.in:256
- msgid "Whether the interface should be a MACVTAP."
- msgstr "Indique si l'interface doit être une MACVTAP."
-
--#: ../clients/common/settings-docs.h.in:253
-+#: ../clients/common/settings-docs.h.in:257
- msgid ""
- "A list of interface names to match. Each element is a shell wildcard "
- "pattern. When an element is prefixed with exclamation mark (!) the "
-@@ -9041,29 +8978,29 @@ msgstr ""
- "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:254
-+#: ../clients/common/settings-docs.h.in:258
- 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."
-
--#: ../clients/common/settings-docs.h.in:255
-+#: ../clients/common/settings-docs.h.in:259
- msgid "Enable or disable multicast snooping."
- msgstr "Activer ou désactiver le snooping multicast."
-
--#: ../clients/common/settings-docs.h.in:256
-+#: ../clients/common/settings-docs.h.in:260
- msgid "Enable or disable RSTP."
- msgstr "Activer ou désactiver le RSTP."
-
--#: ../clients/common/settings-docs.h.in:257
-+#: ../clients/common/settings-docs.h.in:261
- msgid "Enable or disable STP."
- msgstr "Activer ou désactiver STP."
-
--#: ../clients/common/settings-docs.h.in:258
-+#: ../clients/common/settings-docs.h.in:262
- msgid "The interface type. Either \"internal\", or empty."
- msgstr "Le type d'interface : soit \"interne\", soit vide."
-
--#: ../clients/common/settings-docs.h.in:259
-+#: ../clients/common/settings-docs.h.in:263
- msgid ""
- "Specifies the unicast destination IP address of a remote Open vSwitch bridge "
- "port to connect to."
-@@ -9071,31 +9008,31 @@ 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:260
-+#: ../clients/common/settings-docs.h.in:264
- 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:261
-+#: ../clients/common/settings-docs.h.in:265
- 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:262
-+#: ../clients/common/settings-docs.h.in:266
- 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."
-
--#: ../clients/common/settings-docs.h.in:263
-+#: ../clients/common/settings-docs.h.in:267
- msgid "LACP mode. One of \"active\", \"off\", or \"passive\"."
- msgstr "Mode LACP : \"actif\", \"éteint\" ou \"passif\"."
-
--#: ../clients/common/settings-docs.h.in:264
-+#: ../clients/common/settings-docs.h.in:268
- msgid "The VLAN tag in the range 0-4095."
- msgstr "L'étiquette VLAN dans la plage 0-4095."
-
--#: ../clients/common/settings-docs.h.in:265
-+#: ../clients/common/settings-docs.h.in:269
- msgid ""
- "The VLAN mode. One of \"access\", \"native-tagged\", \"native-untagged\", "
- "\"trunk\" or unset."
-@@ -9103,7 +9040,7 @@ msgstr ""
- "Le mode VLAN, l'un des modes \"accès\", \"native-tagged\", \"native-untagged"
- "\", \"trunk\" ou unset."
-
--#: ../clients/common/settings-docs.h.in:266
-+#: ../clients/common/settings-docs.h.in:270
- 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 "
-@@ -9113,7 +9050,7 @@ msgstr ""
- "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:267
-+#: ../clients/common/settings-docs.h.in:271
- 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 "
-@@ -9123,7 +9060,7 @@ msgstr ""
- "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:268
-+#: ../clients/common/settings-docs.h.in:272
- 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 "
-@@ -9136,7 +9073,7 @@ msgstr ""
- "également être définie à une valeur non nulle si cette propriété est "
- "utilisée."
-
--#: ../clients/common/settings-docs.h.in:269
-+#: ../clients/common/settings-docs.h.in:273
- 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 "
-@@ -9148,7 +9085,7 @@ msgstr ""
- "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:270
-+#: ../clients/common/settings-docs.h.in:274
- msgid ""
- "If TRUE, stateful MPPE is used. See pppd documentation for more information "
- "on stateful MPPE."
-@@ -9156,7 +9093,7 @@ 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:271
-+#: ../clients/common/settings-docs.h.in:275
- 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 "
-@@ -9166,20 +9103,20 @@ msgstr ""
- "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:272
-+#: ../clients/common/settings-docs.h.in:276
- 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."
-
--#: ../clients/common/settings-docs.h.in:273
-+#: ../clients/common/settings-docs.h.in:277
- 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."
-
--#: ../clients/common/settings-docs.h.in:274
-+#: ../clients/common/settings-docs.h.in:278
- msgid ""
- "If TRUE, do not require the other side (usually the PPP server) to "
- "authenticate itself to the client. If FALSE, require authentication from "
-@@ -9189,35 +9126,35 @@ msgstr ""
- "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:275
-+#: ../clients/common/settings-docs.h.in:279
- 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:276
-+#: ../clients/common/settings-docs.h.in:280
- 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:277
-+#: ../clients/common/settings-docs.h.in:281
- 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:278
-+#: ../clients/common/settings-docs.h.in:282
- 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:279
-+#: ../clients/common/settings-docs.h.in:283
- 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:280
-+#: ../clients/common/settings-docs.h.in:284
- 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:281
-+#: ../clients/common/settings-docs.h.in:285
- 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:282
-+#: ../clients/common/settings-docs.h.in:286
- 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 "
-@@ -9228,7 +9165,7 @@ msgstr ""
- "échouera. Notez que MPPE n'est pas utilisé sur les connexions haut débit "
- "mobiles."
-
--#: ../clients/common/settings-docs.h.in:283
-+#: ../clients/common/settings-docs.h.in:287
- 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 "
-@@ -9238,7 +9175,7 @@ msgstr ""
- "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:284
-+#: ../clients/common/settings-docs.h.in:288
- 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 "
-@@ -9250,11 +9187,11 @@ msgstr ""
- "connexion sera activée sur l'interface spécifiée dans \"interface-name\" de "
- "NMSettingConnection."
-
--#: ../clients/common/settings-docs.h.in:285
-+#: ../clients/common/settings-docs.h.in:289
- 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:287
-+#: ../clients/common/settings-docs.h.in:291
- msgid ""
- "If specified, instruct PPPoE to only initiate sessions with access "
- "concentrators that provide the specified service. For most providers, this "
-@@ -9267,31 +9204,31 @@ msgstr ""
- "que s'il y a plusieurs concentrateurs d'accès ou si un service spécifique "
- "est requis."
-
--#: ../clients/common/settings-docs.h.in:288
-+#: ../clients/common/settings-docs.h.in:292
- 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:289
-+#: ../clients/common/settings-docs.h.in:293
- msgid "Whether the proxy configuration is for browser only."
- msgstr ""
- "Indique si la configuration du proxy est uniquement pour le navigateur."
-
--#: ../clients/common/settings-docs.h.in:290
-+#: ../clients/common/settings-docs.h.in:294
- 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)"
-
--#: ../clients/common/settings-docs.h.in:291
-+#: ../clients/common/settings-docs.h.in:295
- msgid "PAC script for the connection."
- msgstr "Script PAC pour la connexion."
-
--#: ../clients/common/settings-docs.h.in:292
-+#: ../clients/common/settings-docs.h.in:296
- msgid "PAC URL for obtaining PAC file."
- msgstr "URL PAC pour obtenir le fichier PAC."
-
--#: ../clients/common/settings-docs.h.in:293
-+#: ../clients/common/settings-docs.h.in:297
- 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 "
-@@ -9302,20 +9239,20 @@ msgstr ""
- "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:294
-+#: ../clients/common/settings-docs.h.in:298
- 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\"."
-
--#: ../clients/common/settings-docs.h.in:295
-+#: ../clients/common/settings-docs.h.in:299
- msgid "Parity setting of the serial port."
- msgstr "Réglage de la parité du port série."
-
--#: ../clients/common/settings-docs.h.in:296
-+#: ../clients/common/settings-docs.h.in:300
- 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:297
-+#: ../clients/common/settings-docs.h.in:301
- msgid ""
- "Number of stop bits for communication on the serial port. Either 1 or 2. "
- "The 1 in \"8n1\" for example."
-@@ -9323,7 +9260,7 @@ 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:298
-+#: ../clients/common/settings-docs.h.in:302
- 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 "
-@@ -9343,7 +9280,7 @@ msgstr ""
- "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:299
-+#: ../clients/common/settings-docs.h.in:303
- msgid ""
- "The total number of virtual functions to create. Note that when the sriov "
- "setting is present NetworkManager enforces the number of virtual functions "
-@@ -9351,7 +9288,7 @@ msgid ""
- "parameters don't add a sriov setting to the connection."
- msgstr ""
-
--#: ../clients/common/settings-docs.h.in:300
-+#: ../clients/common/settings-docs.h.in:304
- msgid ""
- "Array of virtual function descriptors. Each VF descriptor is a dictionary "
- "mapping attribute names to GVariant values. The 'index' entry is mandatory "
-@@ -9374,15 +9311,15 @@ msgstr ""
- "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:301
-+#: ../clients/common/settings-docs.h.in:305
- msgid "Array of TC queueing disciplines."
- msgstr "Table de disciplines de mise en file d'attente TC"
-
--#: ../clients/common/settings-docs.h.in:302
-+#: ../clients/common/settings-docs.h.in:306
- msgid "Array of TC traffic filters."
- msgstr "Table de filtres de trafic TC."
-
--#: ../clients/common/settings-docs.h.in:303
-+#: ../clients/common/settings-docs.h.in:307
- msgid ""
- "The JSON configuration for the team network interface. The property should "
- "contain raw JSON configuration data suitable for teamd, because the value is "
-@@ -9395,8 +9332,8 @@ msgstr ""
- "configuration par défaut sera utilisée. Voir man teamd.conf pour les "
- "détails du format."
-
--#: ../clients/common/settings-docs.h.in:304
--#: ../clients/common/settings-docs.h.in:322
-+#: ../clients/common/settings-docs.h.in:308
-+#: ../clients/common/settings-docs.h.in:326
- msgid ""
- "Link watchers configuration for the connection: each link watcher is defined "
- "by a dictionary, whose keys depend upon the selected link watcher. Available "
-@@ -9416,23 +9353,23 @@ msgstr ""
- "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:305
-+#: ../clients/common/settings-docs.h.in:309
- msgid "Corresponds to the teamd mcast_rejoin.count."
- msgstr "Correspond au teamd mcast_rejoin.count."
-
--#: ../clients/common/settings-docs.h.in:306
-+#: ../clients/common/settings-docs.h.in:310
- msgid "Corresponds to the teamd mcast_rejoin.interval."
- msgstr "Correspond au teamd mcast_rejoin.count."
-
--#: ../clients/common/settings-docs.h.in:307
-+#: ../clients/common/settings-docs.h.in:311
- msgid "Corresponds to the teamd notify_peers.count."
- msgstr "Correspond au teamd notify_peers.count."
-
--#: ../clients/common/settings-docs.h.in:308
-+#: ../clients/common/settings-docs.h.in:312
- msgid "Corresponds to the teamd notify_peers.interval."
- msgstr "Correspond au teamd notify_peers.count."
-
--#: ../clients/common/settings-docs.h.in:309
-+#: ../clients/common/settings-docs.h.in:313
- msgid ""
- "Corresponds to the teamd runner.name. Permitted values are: \"roundrobin\", "
- "\"broadcast\", \"activebackup\", \"loadbalance\", \"lacp\", \"random\". When "
-@@ -9447,43 +9384,43 @@ msgstr ""
- "spécifiques aux autres runnerrs seront réinitialisées à une valeur vide (ou "
- "si ce n'est pas possible à une valeur par défaut)."
-
--#: ../clients/common/settings-docs.h.in:310
-+#: ../clients/common/settings-docs.h.in:314
- msgid "Corresponds to the teamd runner.active."
- msgstr "Correspond au teamd runner.active."
-
--#: ../clients/common/settings-docs.h.in:311
-+#: ../clients/common/settings-docs.h.in:315
- msgid "Corresponds to the teamd runner.agg_select_policy."
- msgstr "Correspond au teamd runner.active."
-
--#: ../clients/common/settings-docs.h.in:312
-+#: ../clients/common/settings-docs.h.in:316
- msgid "Corresponds to the teamd runner.fast_rate."
- msgstr "Correspond au teamd runner.active."
-
--#: ../clients/common/settings-docs.h.in:313
-+#: ../clients/common/settings-docs.h.in:317
- msgid "Corresponds to the teamd runner.hwaddr_policy."
- msgstr "Correspond au teamd runner.active."
-
--#: ../clients/common/settings-docs.h.in:314
-+#: ../clients/common/settings-docs.h.in:318
- msgid "Corresponds to the teamd runner.min_ports."
- msgstr "Correspond au teamd runner.active."
-
--#: ../clients/common/settings-docs.h.in:315
-+#: ../clients/common/settings-docs.h.in:319
- msgid "Corresponds to the teamd runner.sys_prio."
- msgstr "Correspond au teamd runner.active."
-
--#: ../clients/common/settings-docs.h.in:316
-+#: ../clients/common/settings-docs.h.in:320
- msgid "Corresponds to the teamd runner.tx_balancer.name."
- msgstr "Correspond au teamd runner.active."
-
--#: ../clients/common/settings-docs.h.in:317
-+#: ../clients/common/settings-docs.h.in:321
- msgid "Corresponds to the teamd runner.tx_balancer.interval."
- msgstr "Correspond au teamd runner.active."
-
--#: ../clients/common/settings-docs.h.in:318
-+#: ../clients/common/settings-docs.h.in:322
- msgid "Corresponds to the teamd runner.tx_hash."
- msgstr "Correspond au teamd runner.active."
-
--#: ../clients/common/settings-docs.h.in:319
-+#: ../clients/common/settings-docs.h.in:323
- msgid ""
- "The JSON configuration for the team port. The property should contain raw "
- "JSON configuration data suitable for teamd, because the value is passed "
-@@ -9496,19 +9433,19 @@ msgstr ""
- "configuration par défaut sera utilisée. Voir man teamd.conf pour les "
- "détails du format."
-
--#: ../clients/common/settings-docs.h.in:320
-+#: ../clients/common/settings-docs.h.in:324
- msgid "Corresponds to the teamd ports.PORTIFNAME.lacp_key."
- msgstr "Correspond au teamd ports.PORTIFNAME.lacp_key."
-
--#: ../clients/common/settings-docs.h.in:321
-+#: ../clients/common/settings-docs.h.in:325
- msgid "Corresponds to the teamd ports.PORTIFNAME.lacp_prio."
- msgstr "Correspond au teamd ports.PORTIFNAME.lacp_prio."
-
--#: ../clients/common/settings-docs.h.in:323
-+#: ../clients/common/settings-docs.h.in:327
- msgid "Corresponds to the teamd ports.PORTIFNAME.prio."
- msgstr "Correspond au teamd ports.PORTIFNAME.lacp_key."
-
--#: ../clients/common/settings-docs.h.in:324
-+#: ../clients/common/settings-docs.h.in:328
- msgid ""
- "Corresponds to the teamd ports.PORTIFNAME.queue_id. When set to -1 means the "
- "parameter is skipped from the json config."
-@@ -9516,11 +9453,11 @@ 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:325
-+#: ../clients/common/settings-docs.h.in:329
- msgid "Corresponds to the teamd ports.PORTIFNAME.sticky."
- msgstr "Correspond au teamd ports.PORTIFNAME.lacp_key."
-
--#: ../clients/common/settings-docs.h.in:326
-+#: ../clients/common/settings-docs.h.in:330
- msgid ""
- "The group ID which will own the device. If set to NULL everyone will be able "
- "to use the device."
-@@ -9528,7 +9465,7 @@ 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:327
-+#: ../clients/common/settings-docs.h.in:331
- msgid ""
- "The operating mode of the virtual device. Allowed values are "
- "NM_SETTING_TUN_MODE_TUN (1) to create a layer 3 device and "
-@@ -9538,7 +9475,7 @@ msgstr ""
- "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:328
-+#: ../clients/common/settings-docs.h.in:332
- msgid ""
- "If the property is set to TRUE, the interface will support multiple file "
- "descriptors (queues) to parallelize packet sending or receiving. Otherwise, "
-@@ -9549,7 +9486,7 @@ msgstr ""
- "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:329
-+#: ../clients/common/settings-docs.h.in:333
- msgid ""
- "The user ID which will own the device. If set to NULL everyone will be able "
- "to use the device."
-@@ -9557,7 +9494,7 @@ 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:330
-+#: ../clients/common/settings-docs.h.in:334
- msgid ""
- "If TRUE the interface will prepend a 4 byte header describing the physical "
- "interface to the packets."
-@@ -9565,7 +9502,7 @@ 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:331
-+#: ../clients/common/settings-docs.h.in:335
- msgid ""
- "If TRUE the IFF_VNET_HDR the tunnel packets will include a virtio network "
- "header."
-@@ -9573,7 +9510,7 @@ 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:332
-+#: ../clients/common/settings-docs.h.in:336
- 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 "
-@@ -9586,7 +9523,7 @@ msgstr ""
- "strict, mais les valeurs peuvent être des chaînes UTF8 arbitraires jusqu'à "
- "une certaine longueur."
-
--#: ../clients/common/settings-docs.h.in:333
-+#: ../clients/common/settings-docs.h.in:337
- 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"
-@@ -9596,7 +9533,7 @@ msgstr ""
- "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:334
-+#: ../clients/common/settings-docs.h.in:338
- 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 "
-@@ -9619,7 +9556,7 @@ msgstr ""
- "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:335
-+#: ../clients/common/settings-docs.h.in:339
- 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."
-@@ -9627,7 +9564,7 @@ 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:336
-+#: ../clients/common/settings-docs.h.in:340
- 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"
-@@ -9637,7 +9574,7 @@ msgstr ""
- "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:337
-+#: ../clients/common/settings-docs.h.in:341
- 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 "
-@@ -9649,7 +9586,7 @@ msgstr ""
- "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:338
-+#: ../clients/common/settings-docs.h.in:342
- msgid ""
- "Dictionary of key/value pairs of VPN plugin specific data. Both keys and "
- "values must be strings."
-@@ -9657,7 +9594,7 @@ 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:339
-+#: ../clients/common/settings-docs.h.in:343
- 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 "
-@@ -9667,7 +9604,7 @@ msgstr ""
- "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:340
-+#: ../clients/common/settings-docs.h.in:344
- msgid ""
- "Dictionary of key/value pairs of VPN plugin specific secrets like passwords "
- "or private keys. Both keys and values must be strings."
-@@ -9676,7 +9613,7 @@ msgstr ""
- "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:341
-+#: ../clients/common/settings-docs.h.in:345
- 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."
-@@ -9685,7 +9622,7 @@ msgstr ""
- "connecter à son réseau. i.e. org.freedesktop.NetworkManager.vpnc pour le "
- "plugin vpnc."
-
--#: ../clients/common/settings-docs.h.in:342
-+#: ../clients/common/settings-docs.h.in:346
- 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 "
-@@ -9698,7 +9635,7 @@ msgstr ""
- "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:343
-+#: ../clients/common/settings-docs.h.in:347
- 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 "
-@@ -9714,12 +9651,12 @@ msgstr ""
- "vide, le NetworkManager fournira automatiquement le nom d’utilisateur de "
- "l’utilisateur qui a demandé la connexion VPN."
-
--#: ../clients/common/settings-docs.h.in:344
-+#: ../clients/common/settings-docs.h.in:348
- 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."
-
--#: ../clients/common/settings-docs.h.in:345
-+#: ../clients/common/settings-docs.h.in:349
- msgid ""
- "Specifies the UDP destination port to communicate to the remote VXLAN tunnel "
- "endpoint."
-@@ -9727,22 +9664,22 @@ msgstr ""
- "Spécifie le port de destination UDP à communiquer avec le point de "
- "terminaison du tunnel VXLAN distant."
-
--#: ../clients/common/settings-docs.h.in:346
-+#: ../clients/common/settings-docs.h.in:350
- 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."
-
--#: ../clients/common/settings-docs.h.in:347
-+#: ../clients/common/settings-docs.h.in:351
- 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:348
-+#: ../clients/common/settings-docs.h.in:352
- 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:349
-+#: ../clients/common/settings-docs.h.in:353
- msgid ""
- "Specifies whether unknown source link layer addresses and IP addresses are "
- "entered into the VXLAN device forwarding database."
-@@ -9751,7 +9688,7 @@ msgstr ""
- "inconnues sont entrées dans la base de données de transfert de périphérique "
- "VXLAN."
-
--#: ../clients/common/settings-docs.h.in:350
-+#: ../clients/common/settings-docs.h.in:354
- msgid ""
- "Specifies the maximum number of FDB entries. A value of zero means that the "
- "kernel will store unlimited entries."
-@@ -9759,23 +9696,23 @@ 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:351
-+#: ../clients/common/settings-docs.h.in:355
- 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."
-
--#: ../clients/common/settings-docs.h.in:352
-+#: ../clients/common/settings-docs.h.in:356
- 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."
-
--#: ../clients/common/settings-docs.h.in:353
-+#: ../clients/common/settings-docs.h.in:357
- msgid "Specifies whether ARP proxy is turned on."
- msgstr "Indique si le proxy ARP est activé."
-
--#: ../clients/common/settings-docs.h.in:354
-+#: ../clients/common/settings-docs.h.in:358
- 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 "
-@@ -9786,11 +9723,11 @@ msgstr ""
- "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:355
-+#: ../clients/common/settings-docs.h.in:359
- 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:356
-+#: ../clients/common/settings-docs.h.in:360
- msgid ""
- "Specifies the maximum UDP source port to communicate to the remote VXLAN "
- "tunnel endpoint."
-@@ -9798,7 +9735,7 @@ msgstr ""
- "Spécifie le port de destination UDP maximum à communiquer au point de "
- "terminaison du tunnel VXLAN distant."
-
--#: ../clients/common/settings-docs.h.in:357
-+#: ../clients/common/settings-docs.h.in:361
- msgid ""
- "Specifies the minimum UDP source port to communicate to the remote VXLAN "
- "tunnel endpoint."
-@@ -9806,16 +9743,44 @@ msgstr ""
- "Spécifie le port de destination UDP minimum à communiquer au point de "
- "terminaison du tunnel VXLAN distant."
-
--#: ../clients/common/settings-docs.h.in:358
-+#: ../clients/common/settings-docs.h.in:362
- 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:359
-+#: ../clients/common/settings-docs.h.in:363
- 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."
-
--#: ../clients/common/settings-docs.h.in:360
-+#: ../clients/common/settings-docs.h.in:364
-+msgid ""
-+"The P2P device that should be connected to. Currently this is the only way "
-+"to create or join a group."
-+msgstr ""
-+
-+#: ../clients/common/settings-docs.h.in:365
-+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 ""
-+
-+#: ../clients/common/settings-docs.h.in:366
-+#, fuzzy
-+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 ""
-+"Drapeaux 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:367
- 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 "
-@@ -9825,7 +9790,7 @@ msgstr ""
- "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:361
-+#: ../clients/common/settings-docs.h.in:368
- msgid ""
- "Network Service Provider (NSP) name of the WiMAX network this connection "
- "should use. Deprecated: 1"
-@@ -9833,13 +9798,56 @@ 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:362
-+#: ../clients/common/settings-docs.h.in:369
-+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."
-+msgstr ""
-+
-+#: ../clients/common/settings-docs.h.in:370
-+msgid ""
-+"The listen-port. If listen-port is not specified, the port will be chosen "
-+"randomly when the interface comes up."
-+msgstr ""
-+
-+#: ../clients/common/settings-docs.h.in:371
-+#, fuzzy
-+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 "
-+"Ethernet."
-+
-+#: ../clients/common/settings-docs.h.in:372
-+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 ""
-+
-+#: ../clients/common/settings-docs.h.in:373
-+msgid "The 256 bit private-key in base64 encoding."
-+msgstr ""
-+
-+#: ../clients/common/settings-docs.h.in:374
-+#, fuzzy
-+msgid "Flags indicating how to handle the \"private-key\" property."
-+msgstr ""
-+"Drapeaux indiquant comment gérer la propriété \"private-key-password\"."
-+
-+#: ../clients/common/settings-docs.h.in:375
- msgid ""
- "IEEE 802.15.4 channel. A positive integer or -1, meaning \"do not set, use "
- "whatever the device is already set to\"."
- msgstr ""
-
--#: ../clients/common/settings-docs.h.in:363
-+#: ../clients/common/settings-docs.h.in:376
- msgid ""
- "If specified, this connection will only apply to the IEEE 802.15.4 (WPAN) "
- "MAC layer device whose permanent MAC address matches."
-@@ -9847,17 +9855,17 @@ 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:364
-+#: ../clients/common/settings-docs.h.in:377
- 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 ""
-
--#: ../clients/common/settings-docs.h.in:365
-+#: ../clients/common/settings-docs.h.in:378
- 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:366
-+#: ../clients/common/settings-docs.h.in:379
- 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."
-@@ -9912,25 +9920,25 @@ msgstr ""
- "Option invalide. Veuillez utiliser --help pour afficher une liste d'options "
- "valides."
-
--#: ../clients/tui/newt/nmt-newt-utils.c:177 ../clients/tui/nmt-editor.c:429
-+#: ../clients/tui/newt/nmt-newt-utils.c:176 ../clients/tui/nmt-editor.c:433
- #: ../clients/tui/nmt-password-dialog.c:174
- #: ../clients/tui/nmt-route-editor.c:122 ../clients/tui/nmtui-hostname.c:69
- #: ../clients/tui/nmtui.c:134
- msgid "OK"
- msgstr "Valider"
-
--#: ../clients/tui/newt/nmt-newt-utils.c:325
--#: ../clients/tui/newt/nmt-newt-utils.c:357
-+#: ../clients/tui/newt/nmt-newt-utils.c:324
-+#: ../clients/tui/newt/nmt-newt-utils.c:356
- #, 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:363
-+#: ../clients/tui/newt/nmt-newt-utils.c:362
- #, c-format
- msgid "Editor failed: %s"
- msgstr "L'éditeur a échoué : %s"
-
--#: ../clients/tui/newt/nmt-newt-utils.c:369
-+#: ../clients/tui/newt/nmt-newt-utils.c:368
- #, c-format
- msgid "Could not re-read file: %s"
- msgstr "Impossible de relire le fichier : %s"
-@@ -9955,7 +9963,7 @@ msgstr "Wi-Fi"
- msgid "Wi-Fi connection %d"
- msgstr "Connexion Wi-Fi %d"
-
--#: ../clients/tui/nm-editor-utils.c:161 ../libnm-core/nm-connection.c:2376
-+#: ../clients/tui/nm-editor-utils.c:161 ../libnm-core/nm-connection.c:2517
- #: ../libnm-glib/nm-device.c:1832 ../libnm/nm-device.c:1398
- msgid "InfiniBand"
- msgstr "InfiniBand"
-@@ -9984,10 +9992,10 @@ msgstr "DSL"
- msgid "DSL connection %d"
- msgstr "Connexion DSL %d"
-
--#: ../clients/tui/nm-editor-utils.c:188 ../libnm-core/nm-connection.c:2368
-+#: ../clients/tui/nm-editor-utils.c:188 ../libnm-core/nm-connection.c:2509
- #: ../libnm-glib/nm-device.c:1834 ../libnm-util/nm-connection.c:1623
- #: ../libnm/nm-device.c:1400
--#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4794
-+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4836
- msgid "Bond"
- msgstr "Liaison"
-
-@@ -9996,10 +10004,10 @@ msgstr "Liaison"
- msgid "Bond connection %d"
- msgstr "Connexion de liaison %d"
-
--#: ../clients/tui/nm-editor-utils.c:197 ../libnm-core/nm-connection.c:2372
-+#: ../clients/tui/nm-editor-utils.c:197 ../libnm-core/nm-connection.c:2513
- #: ../libnm-glib/nm-device.c:1838 ../libnm-util/nm-connection.c:1627
- #: ../libnm/nm-device.c:1404
--#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5130
-+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5216
- msgid "Bridge"
- msgstr "Pont"
-
-@@ -10008,10 +10016,10 @@ msgstr "Pont"
- msgid "Bridge connection %d"
- msgstr "Connexion de pont %d"
-
--#: ../clients/tui/nm-editor-utils.c:206 ../libnm-core/nm-connection.c:2370
-+#: ../clients/tui/nm-editor-utils.c:206 ../libnm-core/nm-connection.c:2511
- #: ../libnm-glib/nm-device.c:1836 ../libnm-util/nm-connection.c:1625
- #: ../libnm/nm-device.c:1402
--#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4897
-+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4939
- msgid "Team"
- msgstr "Équipe"
-
-@@ -10021,7 +10029,7 @@ msgid "Team connection %d"
- msgstr "Connexion de l'équipe %d"
-
- #: ../clients/tui/nm-editor-utils.c:215 ../clients/tui/nmt-page-vlan.c:82
--#: ../libnm-core/nm-connection.c:2374 ../libnm-glib/nm-device.c:1840
-+#: ../libnm-core/nm-connection.c:2515 ../libnm-glib/nm-device.c:1840
- #: ../libnm-util/nm-connection.c:1629 ../libnm/nm-device.c:1406
- msgid "VLAN"
- msgstr "VLAN"
-@@ -10072,53 +10080,53 @@ msgstr "Masquer"
- msgid "Show"
- msgstr "Afficher"
-
--#: ../clients/tui/nmt-editor.c:98
-+#: ../clients/tui/nmt-editor.c:100
- #, 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 »."
-
--#: ../clients/tui/nmt-editor.c:102
-+#: ../clients/tui/nmt-editor.c:104
- #, 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:112
-+#: ../clients/tui/nmt-editor.c:114
- msgid "Edit Connection"
- msgstr "Modifier la connexion"
-
--#: ../clients/tui/nmt-editor.c:173
-+#: ../clients/tui/nmt-editor.c:175
- #, c-format
- msgid "Unable to save connection: %s"
- msgstr "Impossible d'enregistrer la connexion : %s"
-
--#: ../clients/tui/nmt-editor.c:187
-+#: ../clients/tui/nmt-editor.c:189
- #, c-format
- msgid "Unable to add new connection: %s"
- msgstr "Impossible d'ajouter une nouvelle connexion : %s"
-
--#: ../clients/tui/nmt-editor.c:332
-+#: ../clients/tui/nmt-editor.c:336
- msgid "Profile name"
- msgstr "Nom du profil"
-
--#: ../clients/tui/nmt-editor.c:343
-+#: ../clients/tui/nmt-editor.c:347
- msgid "Ethernet device"
- msgstr "Ethernet"
-
--#: ../clients/tui/nmt-editor.c:345
-+#: ../clients/tui/nmt-editor.c:349
- msgid "Device"
- msgstr "Périphérique"
-
- #. And finally the bottom widgets
--#: ../clients/tui/nmt-editor.c:405
-+#: ../clients/tui/nmt-editor.c:409
- msgid "Automatically connect"
- msgstr "Connecter automatiquement"
-
--#: ../clients/tui/nmt-editor.c:411
-+#: ../clients/tui/nmt-editor.c:415
- msgid "Available to all users"
- msgstr "Disponible à tous les utilisateurs"
-
--#: ../clients/tui/nmt-editor.c:426 ../clients/tui/nmt-password-dialog.c:171
-+#: ../clients/tui/nmt-editor.c:430 ../clients/tui/nmt-password-dialog.c:171
- #: ../clients/tui/nmt-route-editor.c:115 ../clients/tui/nmtui-edit.c:220
- #: ../clients/tui/nmtui-edit.c:528 ../clients/tui/nmtui-hostname.c:67
- msgid "Cancel"
-@@ -10830,115 +10838,115 @@ msgstr "Impossible de contacter le NetworkManager : « %s »\n"
- msgid "NetworkManager is not running."
- msgstr "NetworkManager n'est pas en cours d'exécution."
-
--#: ../libnm-core/nm-crypto.c:214
-+#: ../libnm-core/nm-crypto.c:213
- #, 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:222 ../libnm-util/crypto.c:130
-+#: ../libnm-core/nm-crypto.c:221 ../libnm-util/crypto.c:130
- #, 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:249 ../libnm-util/crypto.c:160
-+#: ../libnm-core/nm-crypto.c:248 ../libnm-util/crypto.c:160
- #, 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:257 ../libnm-util/crypto.c:168
-+#: ../libnm-core/nm-crypto.c:256 ../libnm-util/crypto.c:168
- #, 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:269 ../libnm-util/crypto.c:178
-+#: ../libnm-core/nm-crypto.c:268 ../libnm-util/crypto.c:178
- #, 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:280 ../libnm-util/crypto.c:189
-+#: ../libnm-core/nm-crypto.c:279 ../libnm-util/crypto.c:189
- #, 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:288 ../libnm-util/crypto.c:196
-+#: ../libnm-core/nm-crypto.c:287 ../libnm-util/crypto.c:196
- #, 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:299 ../libnm-util/crypto.c:211
-+#: ../libnm-core/nm-crypto.c:298 ../libnm-util/crypto.c:211
- #, 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:320 ../libnm-util/crypto.c:230
-+#: ../libnm-core/nm-crypto.c:319 ../libnm-util/crypto.c:230
- #, c-format
- msgid "Could not decode private key."
- msgstr "Impossible de décoder la clé privée."
-
--#: ../libnm-core/nm-crypto.c:361 ../libnm-util/crypto.c:282
-+#: ../libnm-core/nm-crypto.c:360 ../libnm-util/crypto.c:282
- msgid "Failed to find expected PKCS#8 start tag."
- msgstr "Impossible de trouver la balise initiale PKCS#8 attendue."
-
--#: ../libnm-core/nm-crypto.c:369 ../libnm-util/crypto.c:290
-+#: ../libnm-core/nm-crypto.c:368 ../libnm-util/crypto.c:290
- #, 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:381 ../libnm-util/crypto.c:309
-+#: ../libnm-core/nm-crypto.c:380 ../libnm-util/crypto.c:309
- 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:440 ../libnm-util/crypto.c:351
-+#: ../libnm-core/nm-crypto.c:439 ../libnm-util/crypto.c:351
- #, 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:456 ../libnm-util/crypto.c:365
-+#: ../libnm-core/nm-crypto.c:455 ../libnm-util/crypto.c:365
- #, c-format
- msgid "IV contains non-hexadecimal digits."
- msgstr "Le IV contient des chiffres non hexadécimaux."
-
--#: ../libnm-core/nm-crypto.c:532
-+#: ../libnm-core/nm-crypto.c:531
- #, 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:580 ../libnm-util/crypto.c:515
-+#: ../libnm-core/nm-crypto.c:579 ../libnm-util/crypto.c:515
- #, 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:592
-+#: ../libnm-core/nm-crypto.c:591
- #, 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:653 ../libnm-util/crypto.c:570
-+#: ../libnm-core/nm-crypto.c:652 ../libnm-util/crypto.c:570
- #, 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:662 ../libnm-util/crypto.c:579
-+#: ../libnm-core/nm-crypto.c:661 ../libnm-util/crypto.c:579
- #, 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:674 ../libnm-util/crypto.c:597
-+#: ../libnm-core/nm-crypto.c:673 ../libnm-util/crypto.c:597
- #, c-format
- msgid "Failed to decode certificate."
- msgstr "Impossible de décoder le certificat."
-
--#: ../libnm-core/nm-crypto.c:703 ../libnm-core/nm-crypto.c:756
-+#: ../libnm-core/nm-crypto.c:702 ../libnm-core/nm-crypto.c:755
- #, c-format
- msgid "Certificate file is empty"
- msgstr "Le fichier de certificat est vide"
-
--#: ../libnm-core/nm-crypto.c:736
-+#: ../libnm-core/nm-crypto.c:735
- #, c-format
- msgid "Failed to recognize certificate"
- msgstr "Impossible de reconnaître le certificat."
-
--#: ../libnm-core/nm-crypto.c:846
-+#: ../libnm-core/nm-crypto.c:845
- #, c-format
- msgid "not a valid private key"
- msgstr "clé privée non valide"
-@@ -11140,60 +11148,60 @@ msgstr "Impossible de vérifier le fichier PKCS#12 : %d"
- msgid "Could not generate random data."
- msgstr "Impossible de générer des données aléatoires."
-
--#: ../libnm-core/nm-connection.c:301
-+#: ../libnm-core/nm-connection.c:322
- msgid "wrong type; should be a list of strings."
- msgstr "Type erroné ; doit correspondre à une liste de chaînes."
-
--#: ../libnm-core/nm-connection.c:371
-+#: ../libnm-core/nm-connection.c:392
- msgid "unknown setting name"
- msgstr "Nom de paramètre inconnu"
-
--#: ../libnm-core/nm-connection.c:383
-+#: ../libnm-core/nm-connection.c:404
- msgid "duplicate setting name"
- msgstr "reproduire le nom du paramètre"
-
--#: ../libnm-core/nm-connection.c:1366
-+#: ../libnm-core/nm-connection.c:1414
- msgid "setting not found"
- msgstr "paramètre non trouvé"
-
--#: ../libnm-core/nm-connection.c:1432 ../libnm-core/nm-connection.c:1457
--#: ../libnm-core/nm-connection.c:1482
-+#: ../libnm-core/nm-connection.c:1480 ../libnm-core/nm-connection.c:1505
-+#: ../libnm-core/nm-connection.c:1530
- msgid "setting is required for non-slave connections"
- msgstr "paramètre requis pour les connexions non esclaves"
-
--#: ../libnm-core/nm-connection.c:1445 ../libnm-core/nm-connection.c:1470
--#: ../libnm-core/nm-connection.c:1495
-+#: ../libnm-core/nm-connection.c:1493 ../libnm-core/nm-connection.c:1518
-+#: ../libnm-core/nm-connection.c:1543
- msgid "setting not allowed in slave connection"
- msgstr "le paramètre n'est pas accepté dans la connexion esclave"
-
--#: ../libnm-core/nm-connection.c:1585
-+#: ../libnm-core/nm-connection.c:1633
- msgid "Unexpected failure to verify the connection"
- msgstr "Erreur inattendue lors de la vérification de la connexion"
-
--#: ../libnm-core/nm-connection.c:1630
-+#: ../libnm-core/nm-connection.c:1680
- msgid "Unexpected failure to normalize the connection"
- msgstr "Erreur inattendue lors de la normalisation de la connexion"
-
--#: ../libnm-core/nm-connection.c:2234 ../libnm-core/nm-setting-8021x.c:2571
--#: ../libnm-core/nm-setting-8021x.c:2588 ../libnm-core/nm-setting-8021x.c:2619
--#: ../libnm-core/nm-setting-8021x.c:2636 ../libnm-core/nm-setting-8021x.c:2678
--#: ../libnm-core/nm-setting-8021x.c:2690 ../libnm-core/nm-setting-8021x.c:2708
--#: ../libnm-core/nm-setting-8021x.c:2720 ../libnm-core/nm-setting-8021x.c:2744
--#: ../libnm-core/nm-setting-8021x.c:2826 ../libnm-core/nm-setting-adsl.c:187
--#: ../libnm-core/nm-setting-bluetooth.c:136
--#: ../libnm-core/nm-setting-bluetooth.c:194
--#: ../libnm-core/nm-setting-bluetooth.c:208 ../libnm-core/nm-setting-cdma.c:157
--#: ../libnm-core/nm-setting-connection.c:947
--#: ../libnm-core/nm-setting-connection.c:990
--#: ../libnm-core/nm-setting-connection.c:1156
--#: ../libnm-core/nm-setting-ip-config.c:2492
--#: ../libnm-core/nm-setting-ip-tunnel.c:373
--#: ../libnm-core/nm-setting-olpc-mesh.c:118
--#: ../libnm-core/nm-setting-ovs-patch.c:92 ../libnm-core/nm-setting-pppoe.c:159
--#: ../libnm-core/nm-setting-vpn.c:550 ../libnm-core/nm-setting-vxlan.c:358
--#: ../libnm-core/nm-setting-wimax.c:124
--#: ../libnm-core/nm-setting-wireless-security.c:918
--#: ../libnm-core/nm-setting-wireless.c:750 ../libnm-util/nm-setting.c:1355
-+#: ../libnm-core/nm-connection.c:2374 ../libnm-core/nm-setting-8021x.c:2569
-+#: ../libnm-core/nm-setting-8021x.c:2586 ../libnm-core/nm-setting-8021x.c:2617
-+#: ../libnm-core/nm-setting-8021x.c:2634 ../libnm-core/nm-setting-8021x.c:2676
-+#: ../libnm-core/nm-setting-8021x.c:2688 ../libnm-core/nm-setting-8021x.c:2706
-+#: ../libnm-core/nm-setting-8021x.c:2718 ../libnm-core/nm-setting-8021x.c:2742
-+#: ../libnm-core/nm-setting-8021x.c:2824 ../libnm-core/nm-setting-adsl.c:174
-+#: ../libnm-core/nm-setting-bluetooth.c:125
-+#: ../libnm-core/nm-setting-bluetooth.c:183
-+#: ../libnm-core/nm-setting-bluetooth.c:197 ../libnm-core/nm-setting-cdma.c:144
-+#: ../libnm-core/nm-setting-connection.c:931
-+#: ../libnm-core/nm-setting-connection.c:974
-+#: ../libnm-core/nm-setting-connection.c:1140
-+#: ../libnm-core/nm-setting-ip-config.c:4816
-+#: ../libnm-core/nm-setting-ip-tunnel.c:374
-+#: ../libnm-core/nm-setting-olpc-mesh.c:99
-+#: ../libnm-core/nm-setting-ovs-patch.c:92 ../libnm-core/nm-setting-pppoe.c:146
-+#: ../libnm-core/nm-setting-vpn.c:531 ../libnm-core/nm-setting-vxlan.c:339
-+#: ../libnm-core/nm-setting-wifi-p2p.c:136 ../libnm-core/nm-setting-wimax.c:110
-+#: ../libnm-core/nm-setting-wireless-security.c:914
-+#: ../libnm-core/nm-setting-wireless.c:737 ../libnm-util/nm-setting.c:1355
- #: ../libnm-util/nm-setting.c:1374 ../libnm-util/nm-setting.c:1392
- #: ../libnm-util/nm-setting-8021x.c:2324 ../libnm-util/nm-setting-8021x.c:2341
- #: ../libnm-util/nm-setting-8021x.c:2382 ../libnm-util/nm-setting-8021x.c:2399
-@@ -11209,18 +11217,18 @@ msgstr "Erreur inattendue lors de la normalisation de la connexion"
- #: ../libnm-util/nm-setting-ip6-config.c:831
- #: ../libnm-util/nm-setting-ip6-config.c:897
- #: ../libnm-util/nm-setting-olpc-mesh.c:123
--#: ../libnm-util/nm-setting-pppoe.c:162 ../libnm-util/nm-setting-vpn.c:422
-+#: ../libnm-util/nm-setting-pppoe.c:162 ../libnm-util/nm-setting-vpn.c:421
- #: ../libnm-util/nm-setting-wimax.c:149
- #: ../libnm-util/nm-setting-wireless-security.c:890
- #: ../libnm-util/nm-setting-wireless.c:768
- msgid "property is missing"
- msgstr "la propriété est manquante"
-
--#: ../libnm-core/nm-connection.c:2379
-+#: ../libnm-core/nm-connection.c:2520
- msgid "IP Tunnel"
- msgstr "Tunnel IP"
-
--#: ../libnm-core/nm-dbus-utils.c:202
-+#: ../libnm-core/nm-dbus-utils.c:200
- #, c-format
- msgid "Method returned type '%s', but expected '%s'"
- msgstr "La méthode a renvoyé le type « %s », mais « %s » était attendu"
-@@ -11230,259 +11238,298 @@ msgstr "La méthode a renvoyé le type « %s », mais « %s » était attend
- msgid "value is not an integer in range [%lld, %lld]"
- msgstr ""
-
--#: ../libnm-core/nm-keyfile.c:210
-+#: ../libnm-core/nm-keyfile.c:211
- msgid "ignoring missing number"
- msgstr "numéro manquant ignoré"
-
--#: ../libnm-core/nm-keyfile.c:218
-+#: ../libnm-core/nm-keyfile.c:219
- #, c-format
- msgid "ignoring invalid number '%s'"
- msgstr "numéro « %s » ignoré"
-
--#: ../libnm-core/nm-keyfile.c:239
-+#: ../libnm-core/nm-keyfile.c:240
- #, 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:282
- #, 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:303
- #, c-format
- msgid "ignoring invalid %s route: %s"
- msgstr "route %s non valide ignorée : %s"
-
--#: ../libnm-core/nm-keyfile.c:427
-+#: ../libnm-core/nm-keyfile.c:428
- #, 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:437
-+#: ../libnm-core/nm-keyfile.c:438
- #, 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:446
-+#: ../libnm-core/nm-keyfile.c:447
- #, 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)"
-
--#: ../libnm-core/nm-keyfile.c:457
-+#: ../libnm-core/nm-keyfile.c:458
- #, c-format
- msgid "garbage at the end of value %s: '%s'"
- msgstr "informations unutiles à la fin de %s : « %s »"
-
--#: ../libnm-core/nm-keyfile.c:463
-+#: ../libnm-core/nm-keyfile.c:464
- #, 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:478
-+#: ../libnm-core/nm-keyfile.c:479
- #, 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:485
-+#: ../libnm-core/nm-keyfile.c:486
- #, 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:748
-+#: ../libnm-core/nm-keyfile.c:814 ../libnm-core/nm-setting-user.c:374
-+#, c-format
-+msgid "invalid value for \"%s\": %s"
-+msgstr "valeur non valide pour \"%s\": %s"
-+
-+#: ../libnm-core/nm-keyfile.c:852
- #, 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:844 ../libnm-core/nm-keyfile.c:2734
-+#: ../libnm-core/nm-keyfile.c:948 ../libnm-core/nm-keyfile.c:2997
- #, 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)"
-
--#: ../libnm-core/nm-keyfile.c:855
-+#: ../libnm-core/nm-keyfile.c:959
- msgid "ignoring invalid MAC address"
- msgstr "adresse MAC non valide ignorée"
-
--#: ../libnm-core/nm-keyfile.c:1105
-+#: ../libnm-core/nm-keyfile.c:1209
- msgid "ignoring invalid SSID"
- msgstr "SSID non valide ignoré"
-
--#: ../libnm-core/nm-keyfile.c:1121
-+#: ../libnm-core/nm-keyfile.c:1225
- msgid "ignoring invalid raw password"
- msgstr "mot de passe brut non valid ignoré"
-
--#: ../libnm-core/nm-keyfile.c:1258
-+#: ../libnm-core/nm-keyfile.c:1362
- msgid "invalid key/cert value"
- msgstr "valeur clé/cert non valide"
-
--#: ../libnm-core/nm-keyfile.c:1269
-+#: ../libnm-core/nm-keyfile.c:1373
- #, c-format
- msgid "invalid key/cert value path \"%s\""
- msgstr "chemin de valeur de cert / clé non valide « %s »"
-
--#: ../libnm-core/nm-keyfile.c:1285 ../libnm-core/nm-keyfile.c:1368
-+#: ../libnm-core/nm-keyfile.c:1389 ../libnm-core/nm-keyfile.c:1472
- #, 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:1294
-+#: ../libnm-core/nm-keyfile.c:1398
- #, c-format
- msgid "invalid PKCS#11 URI \"%s\""
- msgstr "URI « %s » PKCS#11 invalide"
-
--#: ../libnm-core/nm-keyfile.c:1338
-+#: ../libnm-core/nm-keyfile.c:1442
- 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:1347
-+#: ../libnm-core/nm-keyfile.c:1451
- msgid "invalid key/cert value data:;base64,file://"
- msgstr "valeur de clé / cert data non valide :;base64,file://"
-
--#: ../libnm-core/nm-keyfile.c:1380
-+#: ../libnm-core/nm-keyfile.c:1484
- 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:1482
-+#: ../libnm-core/nm-keyfile.c:1586
- #, c-format
- msgid "invalid parity value '%s'"
- msgstr "valeur de parité « %s » non valide"
-
--#: ../libnm-core/nm-keyfile.c:1499 ../libnm-core/nm-keyfile.c:2789
-+#: ../libnm-core/nm-keyfile.c:1603 ../libnm-core/nm-keyfile.c:3052
- #, fuzzy, c-format
- msgid "invalid setting: %s"
- msgstr "nom de configuration non valide « %s »"
-
--#: ../libnm-core/nm-keyfile.c:1514
-+#: ../libnm-core/nm-keyfile.c:1618
- #, c-format
- msgid "ignoring invalid team configuration: %s"
- msgstr "configuration de équipe non valide ignorée : %s"
-
--#: ../libnm-core/nm-keyfile.c:1557
-+#: ../libnm-core/nm-keyfile.c:1698
- #, c-format
- msgid "invalid qdisc: %s"
- msgstr "qdisc non valide : %s"
-
--#: ../libnm-core/nm-keyfile.c:1605
-+#: ../libnm-core/nm-keyfile.c:1744
- #, c-format
- msgid "invalid tfilter: %s"
- msgstr "tfilter non valide : %s"
-
--#: ../libnm-core/nm-keyfile.c:2634
-+#: ../libnm-core/nm-keyfile.c:2896
- #, c-format
- msgid "error loading setting value: %s"
- msgstr "erreur de chargement de la valeur du paramètre : %s"
-
--#: ../libnm-core/nm-keyfile.c:2661 ../libnm-core/nm-keyfile.c:2672
--#: ../libnm-core/nm-keyfile.c:2690 ../libnm-core/nm-keyfile.c:2701
--#: ../libnm-core/nm-keyfile.c:2712 ../libnm-core/nm-keyfile.c:2764
--#: ../libnm-core/nm-keyfile.c:2775
-+#: ../libnm-core/nm-keyfile.c:2924 ../libnm-core/nm-keyfile.c:2935
-+#: ../libnm-core/nm-keyfile.c:2953 ../libnm-core/nm-keyfile.c:2964
-+#: ../libnm-core/nm-keyfile.c:2975 ../libnm-core/nm-keyfile.c:3027
-+#: ../libnm-core/nm-keyfile.c:3038
- msgid "value cannot be interpreted as integer"
- msgstr ""
-
--#: ../libnm-core/nm-keyfile.c:2810
-+#: ../libnm-core/nm-keyfile.c:3073
- #, c-format
- msgid "invalid setting name '%s'"
- msgstr "nom de configuration non valide « %s »"
-
--#: ../libnm-core/nm-keyfile.c:2855
-+#: ../libnm-core/nm-keyfile.c:3118
- #, c-format
- msgid "invalid key '%s.%s'"
- msgstr "clé non valide '%s.%s'"
-
--#: ../libnm-core/nm-keyfile.c:2870
-+#: ../libnm-core/nm-keyfile.c:3133
- #, c-format
- msgid "key '%s.%s' is not boolean"
- msgstr "clé '%s.%s' n’est pas un booléen"
-
--#: ../libnm-core/nm-setting-6lowpan.c:104
-+#: ../libnm-core/nm-keyfile.c:3190
-+#, fuzzy, c-format
-+msgid "invalid peer public key in section '%s'"
-+msgstr "option « %s » non valide"
-+
-+#: ../libnm-core/nm-keyfile.c:3202
-+#, c-format
-+msgid "key '%s.%s' is not a valid 256 bit key in base64 encoding"
-+msgstr ""
-+
-+#: ../libnm-core/nm-keyfile.c:3215
-+#, fuzzy, c-format
-+msgid "key '%s.%s' is not a valid secret flag"
-+msgstr "« %s » n'est pas un marqueur DCB valide"
-+
-+#: ../libnm-core/nm-keyfile.c:3227
-+#, fuzzy, c-format
-+msgid "key '%s.%s' is not a integer in range 0 to 2^32"
-+msgstr "clé '%s.%s' n’est pas un booléen"
-+
-+#: ../libnm-core/nm-keyfile.c:3239
-+#, fuzzy, c-format
-+msgid "key '%s.%s' is not a valid endpoint"
-+msgstr "'%s' n’est pas un type valide"
-+
-+#: ../libnm-core/nm-keyfile.c:3261
-+#, c-format
-+msgid "key '%s.%s' has invalid allowed-ips"
-+msgstr ""
-+
-+#: ../libnm-core/nm-keyfile.c:3273
-+#, fuzzy, c-format
-+msgid "peer '%s' is invalid: %s"
-+msgstr "« %s » n'est pas valide"
-+
-+#: ../libnm-core/nm-setting-6lowpan.c:93
- #, c-format
- msgid "property is not specified"
- msgstr "propriété non spécifiée"
-
--#: ../libnm-core/nm-setting-6lowpan.c:126 ../libnm-core/nm-setting-macsec.c:314
--#: ../libnm-core/nm-setting-vlan.c:632 ../libnm-util/nm-setting-vlan.c:556
-+#: ../libnm-core/nm-setting-6lowpan.c:115 ../libnm-core/nm-setting-macsec.c:302
-+#: ../libnm-core/nm-setting-vlan.c:615 ../libnm-util/nm-setting-vlan.c:556
- #, 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:137
--#: ../libnm-core/nm-setting-ip-tunnel.c:351
--#: ../libnm-core/nm-setting-macsec.c:325 ../libnm-core/nm-setting-macvlan.c:161
--#: ../libnm-core/nm-setting-vlan.c:643 ../libnm-core/nm-setting-vxlan.c:401
-+#: ../libnm-core/nm-setting-6lowpan.c:126
-+#: ../libnm-core/nm-setting-ip-tunnel.c:352
-+#: ../libnm-core/nm-setting-macsec.c:313 ../libnm-core/nm-setting-macvlan.c:143
-+#: ../libnm-core/nm-setting-vlan.c:626 ../libnm-core/nm-setting-vxlan.c:382
- #: ../libnm-util/nm-setting-vlan.c:567
- #, 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:229
-+#: ../libnm-core/nm-setting-8021x.c:227
- msgid "binary data missing"
- msgstr "donnée binaire manquante"
-
--#: ../libnm-core/nm-setting-8021x.c:257
-+#: ../libnm-core/nm-setting-8021x.c:255
- msgid "URI not NUL terminated"
- msgstr "URI non NUL terminé"
-
--#: ../libnm-core/nm-setting-8021x.c:266
-+#: ../libnm-core/nm-setting-8021x.c:264
- msgid "URI is empty"
- msgstr "URI vide"
-
--#: ../libnm-core/nm-setting-8021x.c:274
-+#: ../libnm-core/nm-setting-8021x.c:272
- msgid "URI is not valid UTF-8"
- msgstr "URI n'est pas un UTF-8 valide"
-
--#: ../libnm-core/nm-setting-8021x.c:292
-+#: ../libnm-core/nm-setting-8021x.c:290
- msgid "data missing"
- msgstr "données manquantes"
-
--#: ../libnm-core/nm-setting-8021x.c:315 ../libnm-core/nm-setting-8021x.c:682
-+#: ../libnm-core/nm-setting-8021x.c:313 ../libnm-core/nm-setting-8021x.c:680
- #, c-format
- msgid "certificate is invalid: %s"
- msgstr "certificat non valide : %s"
-
--#: ../libnm-core/nm-setting-8021x.c:323
-+#: ../libnm-core/nm-setting-8021x.c:321
- #, c-format
- msgid "certificate detected as invalid scheme"
- msgstr "certificat non valide : "
-
--#: ../libnm-core/nm-setting-8021x.c:537 ../libnm-util/nm-setting-8021x.c:639
-+#: ../libnm-core/nm-setting-8021x.c:535 ../libnm-util/nm-setting-8021x.c:639
- 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:553 ../libnm-util/nm-setting-8021x.c:957
-+#: ../libnm-core/nm-setting-8021x.c:551 ../libnm-util/nm-setting-8021x.c:957
- #: ../libnm-util/nm-setting-8021x.c:1220 ../libnm-util/nm-setting-8021x.c:1542
- msgid "invalid certificate format"
- msgstr "format de certificat non valide"
-
--#: ../libnm-core/nm-setting-8021x.c:692
-+#: ../libnm-core/nm-setting-8021x.c:690
- #, 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:2578 ../libnm-core/nm-setting-8021x.c:2595
--#: ../libnm-core/nm-setting-8021x.c:2626 ../libnm-core/nm-setting-8021x.c:2643
--#: ../libnm-core/nm-setting-8021x.c:2684 ../libnm-core/nm-setting-8021x.c:2696
--#: ../libnm-core/nm-setting-8021x.c:2714 ../libnm-core/nm-setting-8021x.c:2726
--#: ../libnm-core/nm-setting-8021x.c:2751 ../libnm-core/nm-setting-adsl.c:194
--#: ../libnm-core/nm-setting-cdma.c:164 ../libnm-core/nm-setting-cdma.c:173
--#: ../libnm-core/nm-setting-connection.c:954
--#: ../libnm-core/nm-setting-connection.c:1002
--#: ../libnm-core/nm-setting-gsm.c:299 ../libnm-core/nm-setting-gsm.c:356
--#: ../libnm-core/nm-setting-gsm.c:393 ../libnm-core/nm-setting-gsm.c:402
--#: ../libnm-core/nm-setting-ip-config.c:2499
--#: ../libnm-core/nm-setting-ip4-config.c:196
--#: ../libnm-core/nm-setting-ip4-config.c:203
--#: ../libnm-core/nm-setting-pppoe.c:166 ../libnm-core/nm-setting-pppoe.c:175
--#: ../libnm-core/nm-setting-vpn.c:559 ../libnm-core/nm-setting-vpn.c:569
--#: ../libnm-core/nm-setting-wimax.c:133
--#: ../libnm-core/nm-setting-wireless-security.c:948
--#: ../libnm-core/nm-setting-wireless-security.c:972
--#: ../libnm-core/nm-setting.c:1237 ../libnm-util/nm-setting-8021x.c:2331
-+#: ../libnm-core/nm-setting-8021x.c:2576 ../libnm-core/nm-setting-8021x.c:2593
-+#: ../libnm-core/nm-setting-8021x.c:2624 ../libnm-core/nm-setting-8021x.c:2641
-+#: ../libnm-core/nm-setting-8021x.c:2682 ../libnm-core/nm-setting-8021x.c:2694
-+#: ../libnm-core/nm-setting-8021x.c:2712 ../libnm-core/nm-setting-8021x.c:2724
-+#: ../libnm-core/nm-setting-8021x.c:2749 ../libnm-core/nm-setting-adsl.c:181
-+#: ../libnm-core/nm-setting-cdma.c:151 ../libnm-core/nm-setting-cdma.c:160
-+#: ../libnm-core/nm-setting-connection.c:938
-+#: ../libnm-core/nm-setting-connection.c:986 ../libnm-core/nm-setting-gsm.c:286
-+#: ../libnm-core/nm-setting-gsm.c:343 ../libnm-core/nm-setting-gsm.c:380
-+#: ../libnm-core/nm-setting-gsm.c:389 ../libnm-core/nm-setting-ip-config.c:4823
-+#: ../libnm-core/nm-setting-ip4-config.c:183
-+#: ../libnm-core/nm-setting-ip4-config.c:190
-+#: ../libnm-core/nm-setting-pppoe.c:153 ../libnm-core/nm-setting-pppoe.c:162
-+#: ../libnm-core/nm-setting-vpn.c:540 ../libnm-core/nm-setting-vpn.c:550
-+#: ../libnm-core/nm-setting-wimax.c:119
-+#: ../libnm-core/nm-setting-wireless-security.c:944
-+#: ../libnm-core/nm-setting-wireless-security.c:968
-+#: ../libnm-core/nm-setting.c:1278 ../libnm-util/nm-setting-8021x.c:2331
- #: ../libnm-util/nm-setting-8021x.c:2348 ../libnm-util/nm-setting-8021x.c:2389
- #: ../libnm-util/nm-setting-8021x.c:2406 ../libnm-util/nm-setting-8021x.c:2457
- #: ../libnm-util/nm-setting-8021x.c:2469 ../libnm-util/nm-setting-8021x.c:2487
-@@ -11494,45 +11541,44 @@ msgstr ""
- #: ../libnm-util/nm-setting-gsm.c:338 ../libnm-util/nm-setting-ip4-config.c:934
- #: ../libnm-util/nm-setting-ip4-config.c:943
- #: ../libnm-util/nm-setting-pppoe.c:169 ../libnm-util/nm-setting-pppoe.c:178
--#: ../libnm-util/nm-setting-vpn.c:431 ../libnm-util/nm-setting-vpn.c:441
-+#: ../libnm-util/nm-setting-vpn.c:430 ../libnm-util/nm-setting-vpn.c:440
- #: ../libnm-util/nm-setting-wimax.c:158
- #: ../libnm-util/nm-setting-wireless-security.c:920
- #: ../libnm-util/nm-setting-wireless-security.c:944
- msgid "property is empty"
- msgstr "la propriété est vide"
-
--#: ../libnm-core/nm-setting-8021x.c:2608 ../libnm-core/nm-setting-8021x.c:2656
-+#: ../libnm-core/nm-setting-8021x.c:2606 ../libnm-core/nm-setting-8021x.c:2654
- #: ../libnm-util/nm-setting-8021x.c:2359 ../libnm-util/nm-setting-8021x.c:2371
- #: ../libnm-util/nm-setting-8021x.c:2417 ../libnm-util/nm-setting-8021x.c:2429
- #, c-format
- msgid "has to match '%s' property for PKCS#12"
- msgstr "doit correspondre à la propriété « %s » pour PKCS#12"
-
--#: ../libnm-core/nm-setting-8021x.c:2835
--#: ../libnm-core/nm-setting-bluetooth.c:121
--#: ../libnm-core/nm-setting-infiniband.c:190
--#: ../libnm-core/nm-setting-infiniband.c:205
--#: ../libnm-core/nm-setting-ip4-config.c:187
--#: ../libnm-core/nm-setting-ip6-config.c:235
--#: ../libnm-core/nm-setting-ip6-config.c:246
--#: ../libnm-core/nm-setting-olpc-mesh.c:147
--#: ../libnm-core/nm-setting-wimax.c:142 ../libnm-core/nm-setting-wired.c:676
--#: ../libnm-core/nm-setting-wired.c:686
--#: ../libnm-core/nm-setting-wireless-security.c:991
--#: ../libnm-core/nm-setting-wireless-security.c:1000
--#: ../libnm-core/nm-setting-wireless-security.c:1009
--#: ../libnm-core/nm-setting-wireless-security.c:1045
--#: ../libnm-core/nm-setting-wireless-security.c:1055
--#: ../libnm-core/nm-setting-wireless-security.c:1078
--#: ../libnm-core/nm-setting-wireless-security.c:1103
--#: ../libnm-core/nm-setting-wireless-security.c:1130
--#: ../libnm-core/nm-setting-wireless-security.c:1169
--#: ../libnm-core/nm-setting-wireless.c:811
--#: ../libnm-core/nm-setting-wireless.c:820
--#: ../libnm-core/nm-setting-wireless.c:831 ../libnm-core/nm-setting-wpan.c:173
--#: ../libnm-util/nm-setting.c:1365 ../libnm-util/nm-setting.c:1383
--#: ../libnm-util/nm-setting.c:1402 ../libnm-util/nm-setting-8021x.c:2652
--#: ../libnm-util/nm-setting-8021x.c:2686
-+#: ../libnm-core/nm-setting-8021x.c:2833
-+#: ../libnm-core/nm-setting-bluetooth.c:110
-+#: ../libnm-core/nm-setting-infiniband.c:178
-+#: ../libnm-core/nm-setting-infiniband.c:188
-+#: ../libnm-core/nm-setting-ip4-config.c:174
-+#: ../libnm-core/nm-setting-ip6-config.c:222
-+#: ../libnm-core/nm-setting-ip6-config.c:233
-+#: ../libnm-core/nm-setting-olpc-mesh.c:128
-+#: ../libnm-core/nm-setting-wifi-p2p.c:145 ../libnm-core/nm-setting-wimax.c:128
-+#: ../libnm-core/nm-setting-wired.c:660 ../libnm-core/nm-setting-wired.c:670
-+#: ../libnm-core/nm-setting-wireless-security.c:987
-+#: ../libnm-core/nm-setting-wireless-security.c:996
-+#: ../libnm-core/nm-setting-wireless-security.c:1005
-+#: ../libnm-core/nm-setting-wireless-security.c:1041
-+#: ../libnm-core/nm-setting-wireless-security.c:1051
-+#: ../libnm-core/nm-setting-wireless-security.c:1074
-+#: ../libnm-core/nm-setting-wireless-security.c:1112
-+#: ../libnm-core/nm-setting-wireless-security.c:1153
-+#: ../libnm-core/nm-setting-wireless.c:798
-+#: ../libnm-core/nm-setting-wireless.c:807
-+#: ../libnm-core/nm-setting-wireless.c:818 ../libnm-core/nm-setting-wpan.c:176
-+#: ../libnm-core/nm-utils.c:4509 ../libnm-util/nm-setting.c:1365
-+#: ../libnm-util/nm-setting.c:1383 ../libnm-util/nm-setting.c:1402
-+#: ../libnm-util/nm-setting-8021x.c:2652 ../libnm-util/nm-setting-8021x.c:2686
- #: ../libnm-util/nm-setting-bluetooth.c:150
- #: ../libnm-util/nm-setting-infiniband.c:205
- #: ../libnm-util/nm-setting-infiniband.c:221
-@@ -11552,11 +11598,11 @@ msgstr "doit correspondre à la propriété « %s » pour PKCS#12"
- msgid "property is invalid"
- msgstr "propriété non valide"
-
--#: ../libnm-core/nm-setting-8021x.c:2862 ../libnm-core/nm-setting-8021x.c:2874
--#: ../libnm-core/nm-setting-8021x.c:2888 ../libnm-core/nm-setting-8021x.c:2915
--#: ../libnm-core/nm-setting-8021x.c:2930 ../libnm-core/nm-setting-adsl.c:206
--#: ../libnm-core/nm-setting-adsl.c:218 ../libnm-core/nm-setting-bluetooth.c:149
--#: ../libnm-core/nm-setting-wireless-security.c:927
-+#: ../libnm-core/nm-setting-8021x.c:2860 ../libnm-core/nm-setting-8021x.c:2872
-+#: ../libnm-core/nm-setting-8021x.c:2886 ../libnm-core/nm-setting-8021x.c:2913
-+#: ../libnm-core/nm-setting-8021x.c:2928 ../libnm-core/nm-setting-adsl.c:193
-+#: ../libnm-core/nm-setting-adsl.c:205 ../libnm-core/nm-setting-bluetooth.c:138
-+#: ../libnm-core/nm-setting-wireless-security.c:923
- #: ../libnm-util/nm-setting-8021x.c:2711 ../libnm-util/nm-setting-8021x.c:2721
- #: ../libnm-util/nm-setting-8021x.c:2731 ../libnm-util/nm-setting-8021x.c:2741
- #: ../libnm-util/nm-setting-8021x.c:2751 ../libnm-util/nm-setting-adsl.c:228
-@@ -11566,111 +11612,111 @@ msgstr "propriété non valide"
- 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:2898
-+#: ../libnm-core/nm-setting-8021x.c:2896
- msgid "invalid auth flags"
- msgstr "drapeaux d'auth non valides"
-
--#: ../libnm-core/nm-setting-bluetooth.c:171
-+#: ../libnm-core/nm-setting-bluetooth.c:160
- #, 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:217
-+#: ../libnm-core/nm-setting-bluetooth.c:206
- #, c-format
- msgid "'%s' connection requires '%s' setting"
- msgstr "la connexion « %s » requiert une configuration « %s »"
-
--#: ../libnm-core/nm-setting-bond.c:564 ../libnm-util/nm-setting-bond.c:516
-+#: ../libnm-core/nm-setting-bond.c:556 ../libnm-util/nm-setting-bond.c:515
- #, 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:589 ../libnm-util/nm-setting-bond.c:535
-+#: ../libnm-core/nm-setting-bond.c:581 ../libnm-util/nm-setting-bond.c:534
- #, 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:602 ../libnm-util/nm-setting-bond.c:546
-+#: ../libnm-core/nm-setting-bond.c:594 ../libnm-util/nm-setting-bond.c:545
- #, c-format
- msgid "mandatory option '%s' is missing"
- msgstr "l'option obligatoire « %s » est manquante"
-
--#: ../libnm-core/nm-setting-bond.c:612 ../libnm-util/nm-setting-bond.c:555
-+#: ../libnm-core/nm-setting-bond.c:604 ../libnm-util/nm-setting-bond.c:554
- #, 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:626 ../libnm-util/nm-setting-bond.c:568
-+#: ../libnm-core/nm-setting-bond.c:618 ../libnm-util/nm-setting-bond.c:567
- #, c-format
- msgid "'%s=%s' is incompatible with '%s > 0'"
- msgstr "« %s=%s » est incompatible avec « %s > 0 »"
-
--#: ../libnm-core/nm-setting-bond.c:641
-+#: ../libnm-core/nm-setting-bond.c:633
- #, 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:652 ../libnm-util/nm-setting-bond.c:591
-+#: ../libnm-core/nm-setting-bond.c:644 ../libnm-util/nm-setting-bond.c:590
- #, 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:665 ../libnm-util/nm-setting-bond.c:604
-+#: ../libnm-core/nm-setting-bond.c:657 ../libnm-util/nm-setting-bond.c:603
- #, 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:678 ../libnm-core/nm-setting-bond.c:687
--#: ../libnm-core/nm-setting-bond.c:707 ../libnm-core/nm-setting-bond.c:743
--#: ../libnm-util/nm-setting-bond.c:617 ../libnm-util/nm-setting-bond.c:626
--#: ../libnm-util/nm-setting-bond.c:646 ../libnm-util/nm-setting-bond.c:682
-+#: ../libnm-core/nm-setting-bond.c:670 ../libnm-core/nm-setting-bond.c:679
-+#: ../libnm-core/nm-setting-bond.c:699 ../libnm-core/nm-setting-bond.c:735
-+#: ../libnm-util/nm-setting-bond.c:616 ../libnm-util/nm-setting-bond.c:625
-+#: ../libnm-util/nm-setting-bond.c:645 ../libnm-util/nm-setting-bond.c:681
- #, 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:718 ../libnm-util/nm-setting-bond.c:657
-+#: ../libnm-core/nm-setting-bond.c:710 ../libnm-util/nm-setting-bond.c:656
- #, c-format
- msgid "'%s' option is empty"
- msgstr "l'option « %s » est vide"
-
--#: ../libnm-core/nm-setting-bond.c:730 ../libnm-util/nm-setting-bond.c:669
-+#: ../libnm-core/nm-setting-bond.c:722 ../libnm-util/nm-setting-bond.c:668
- #, 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:758 ../libnm-util/nm-setting-bond.c:696
-+#: ../libnm-core/nm-setting-bond.c:750 ../libnm-util/nm-setting-bond.c:695
- #, 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:769
-+#: ../libnm-core/nm-setting-bond.c:761
- #, 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:785
-+#: ../libnm-core/nm-setting-bond.c:777
- #, c-format
- msgid "'%s' option should be string"
- msgstr "l'option « %s » doit correspondre à une chaîne"
-
--#: ../libnm-core/nm-setting-bond.c:801
-+#: ../libnm-core/nm-setting-bond.c:793
- #, 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:125
-+#: ../libnm-core/nm-setting-bridge-port.c:317
-+#: ../libnm-core/nm-setting-ovs-bridge.c:150
- #: ../libnm-core/nm-setting-ovs-interface.c:259
- #: ../libnm-core/nm-setting-ovs-port.c:187
--#: ../libnm-core/nm-setting-ovs-bridge.c:150
--#: ../libnm-core/nm-setting-team-port.c:357
-+#: ../libnm-core/nm-setting-team-port.c:343
- #, c-format
- msgid "missing setting"
- msgstr "configuration manquante"
-
--#: ../libnm-core/nm-setting-bridge-port.c:136
-+#: ../libnm-core/nm-setting-bridge-port.c:328
- #: ../libnm-core/nm-setting-ovs-interface.c:280
- #: ../libnm-core/nm-setting-ovs-port.c:208
--#: ../libnm-core/nm-setting-team-port.c:368
-+#: ../libnm-core/nm-setting-team-port.c:354
- #, c-format
- msgid ""
- "A connection with a '%s' setting must have the slave-type set to '%s'. "
-@@ -11679,86 +11725,86 @@ 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:229 ../libnm-util/nm-setting-bridge.c:268
-+#: ../libnm-core/nm-setting-bridge.c:912 ../libnm-util/nm-setting-bridge.c:268
- #, 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:246 ../libnm-core/nm-setting-wired.c:650
--#: ../libnm-core/nm-setting-wired.c:712 ../libnm-core/nm-setting-wired.c:754
-+#: ../libnm-core/nm-setting-bridge.c:929 ../libnm-core/nm-setting-wired.c:634
-+#: ../libnm-core/nm-setting-wired.c:696 ../libnm-core/nm-setting-wired.c:738
- #: ../libnm-util/nm-setting-bridge.c:285 ../libnm-util/nm-setting-wired.c:632
- #: ../libnm-util/nm-setting-wired.c:690
- msgid "is not a valid MAC address"
- msgstr "n'est pas une adresse MAC valide"
-
--#: ../libnm-core/nm-setting-bridge.c:287
-+#: ../libnm-core/nm-setting-bridge.c:970
- 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:924
-+#: ../libnm-core/nm-setting-connection.c:908
- #, 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:963
-+#: ../libnm-core/nm-setting-connection.c:947
- #: ../libnm-util/nm-setting-connection.c:788
- #, c-format
- msgid "'%s' is not a valid UUID"
- msgstr "« %s » n'est pas un UUID valide"
-
--#: ../libnm-core/nm-setting-connection.c:1013
-+#: ../libnm-core/nm-setting-connection.c:997
- #, c-format
- msgid "connection type '%s' is not valid"
- msgstr "type de connexion « %s » non valide"
-
--#: ../libnm-core/nm-setting-connection.c:1049
-+#: ../libnm-core/nm-setting-connection.c:1033
- #: ../libnm-util/nm-setting-connection.c:874
- #, c-format
- msgid "Unknown slave type '%s'"
- msgstr "type d'esclave « %s » inconnu"
-
--#: ../libnm-core/nm-setting-connection.c:1060
-+#: ../libnm-core/nm-setting-connection.c:1044
- #: ../libnm-util/nm-setting-connection.c:884
- #, 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:1081
-+#: ../libnm-core/nm-setting-connection.c:1065
- #: ../libnm-util/nm-setting-connection.c:894
- #, c-format
- msgid "Cannot set '%s' without '%s'"
- msgstr "Ne peut pas définir « %s » sans « %s »"
-
--#: ../libnm-core/nm-setting-connection.c:1095
-+#: ../libnm-core/nm-setting-connection.c:1079
- #, 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:1109
-+#: ../libnm-core/nm-setting-connection.c:1093
- #, c-format
- msgid "metered value %d is not valid"
- msgstr "valeur contrôlée %d non valide"
-
--#: ../libnm-core/nm-setting-connection.c:1120
--#: ../libnm-core/nm-setting-connection.c:1131
--#: ../libnm-core/nm-setting-connection.c:1144
-+#: ../libnm-core/nm-setting-connection.c:1104
-+#: ../libnm-core/nm-setting-connection.c:1115
-+#: ../libnm-core/nm-setting-connection.c:1128
- #, c-format
- msgid "value %d is not valid"
- msgstr "la valeur %d n’est pas valide"
-
--#: ../libnm-core/nm-setting-connection.c:1165
-+#: ../libnm-core/nm-setting-connection.c:1149
- #, 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:1180
-+#: ../libnm-core/nm-setting-connection.c:1164
- #, 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"
-
--#: ../libnm-core/nm-setting-connection.c:1190
-+#: ../libnm-core/nm-setting-connection.c:1174
- #, c-format
- msgid ""
- "Detect a slave connection with '%s' set and a port type '%s'. '%s' should be "
-@@ -11767,40 +11813,40 @@ 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:1207
-+#: ../libnm-core/nm-setting-connection.c:1191
- #, 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 »"
-
--#: ../libnm-core/nm-setting-dcb.c:520 ../libnm-util/nm-setting-dcb.c:593
-+#: ../libnm-core/nm-setting-dcb.c:508 ../libnm-util/nm-setting-dcb.c:593
- msgid "flags invalid"
- msgstr "marqueurs non valides"
-
--#: ../libnm-core/nm-setting-dcb.c:529 ../libnm-util/nm-setting-dcb.c:602
-+#: ../libnm-core/nm-setting-dcb.c:517 ../libnm-util/nm-setting-dcb.c:602
- msgid "flags invalid - disabled"
- msgstr "marqueurs non valides - désactivé"
-
--#: ../libnm-core/nm-setting-dcb.c:555 ../libnm-core/nm-setting-dcb.c:604
-+#: ../libnm-core/nm-setting-dcb.c:543 ../libnm-core/nm-setting-dcb.c:592
- #: ../libnm-util/nm-setting-dcb.c:628 ../libnm-util/nm-setting-dcb.c:677
- msgid "property invalid (not enabled)"
- msgstr "la propriété n'est pas valide (non activée)"
-
--#: ../libnm-core/nm-setting-dcb.c:564 ../libnm-util/nm-setting-dcb.c:637
-+#: ../libnm-core/nm-setting-dcb.c:552 ../libnm-util/nm-setting-dcb.c:637
- msgid "element invalid"
- msgstr "élément non valide"
-
--#: ../libnm-core/nm-setting-dcb.c:579 ../libnm-util/nm-setting-dcb.c:652
-+#: ../libnm-core/nm-setting-dcb.c:567 ../libnm-util/nm-setting-dcb.c:652
- msgid "sum not 100%"
- msgstr "la somme n'est pas à 100%"
-
--#: ../libnm-core/nm-setting-dcb.c:613 ../libnm-core/nm-setting-dcb.c:645
-+#: ../libnm-core/nm-setting-dcb.c:601 ../libnm-core/nm-setting-dcb.c:633
- #: ../libnm-util/nm-setting-dcb.c:686 ../libnm-util/nm-setting-dcb.c:718
- msgid "property invalid"
- msgstr "propriété non valide"
-
--#: ../libnm-core/nm-setting-dcb.c:635 ../libnm-util/nm-setting-dcb.c:708
-+#: ../libnm-core/nm-setting-dcb.c:623 ../libnm-util/nm-setting-dcb.c:708
- msgid "property missing"
- msgstr "propriété manquante"
-
-@@ -11817,47 +11863,47 @@ msgstr "la fonctionnalité de déchargement a un type de variante non valide"
- msgid "unknown ethtool option '%s'"
- msgstr "option ethtool '%s' inconnue"
-
--#: ../libnm-core/nm-setting-gsm.c:312 ../libnm-util/nm-setting-gsm.c:294
-+#: ../libnm-core/nm-setting-gsm.c:299 ../libnm-util/nm-setting-gsm.c:294
- #, 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:344 ../libnm-util/nm-setting-gsm.c:326
-+#: ../libnm-core/nm-setting-gsm.c:331 ../libnm-util/nm-setting-gsm.c:326
- #, 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._-])"
-
--#: ../libnm-core/nm-setting-gsm.c:370 ../libnm-util/nm-setting-gsm.c:352
-+#: ../libnm-core/nm-setting-gsm.c:357 ../libnm-util/nm-setting-gsm.c:352
- #, 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)"
-
--#: ../libnm-core/nm-setting-gsm.c:381 ../libnm-util/nm-setting-gsm.c:363
-+#: ../libnm-core/nm-setting-gsm.c:368 ../libnm-util/nm-setting-gsm.c:363
- #, c-format
- msgid "'%s' is not a number"
- msgstr "« %s » n'est pas un numéro"
-
--#: ../libnm-core/nm-setting-gsm.c:415
-+#: ../libnm-core/nm-setting-gsm.c:402
- msgid "property is empty or wrong size"
- msgstr "la propriété est vide ou de la mauvaise taille"
-
--#: ../libnm-core/nm-setting-gsm.c:425
-+#: ../libnm-core/nm-setting-gsm.c:412
- msgid "property must contain only digits"
- msgstr "la propriété doit comprendre des chiffres uniquement"
-
--#: ../libnm-core/nm-setting-infiniband.c:226
-+#: ../libnm-core/nm-setting-infiniband.c:209
- #: ../libnm-util/nm-setting-infiniband.c:239
- 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:236
-+#: ../libnm-core/nm-setting-infiniband.c:219
- #: ../libnm-util/nm-setting-infiniband.c:249
- 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"
-
--#: ../libnm-core/nm-setting-infiniband.c:274
-+#: ../libnm-core/nm-setting-infiniband.c:257
- #: ../libnm-util/nm-setting-infiniband.c:285
- #, c-format
- msgid ""
-@@ -11867,144 +11913,349 @@ 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:289
--#, c-format
--msgid "mtu for transport mode '%s' can be at most %d but it is %d"
-+#: ../libnm-core/nm-setting-infiniband.c:281
-+#, fuzzy, c-format
-+msgid "mtu can be at most %u but it is %u"
- msgstr ""
- "mtu pour le mode de transport « %s » but être %d au maximum et non pas %d"
-
--#: ../libnm-core/nm-setting-ip-config.c:133
-+#: ../libnm-core/nm-setting-ip-config.c:136
- #, c-format
- msgid "Missing IPv4 address"
- msgstr "adresse IPv4 manquante"
-
--#: ../libnm-core/nm-setting-ip-config.c:133
-+#: ../libnm-core/nm-setting-ip-config.c:136
- #, c-format
- msgid "Missing IPv6 address"
- msgstr "adresse IPv6 manquante"
-
--#: ../libnm-core/nm-setting-ip-config.c:138
-+#: ../libnm-core/nm-setting-ip-config.c:141
- #, c-format
- msgid "Invalid IPv4 address '%s'"
- msgstr "adresse IPv4 « %s » non valide"
-
--#: ../libnm-core/nm-setting-ip-config.c:138
-+#: ../libnm-core/nm-setting-ip-config.c:141
- #, c-format
- msgid "Invalid IPv6 address '%s'"
- msgstr "adresse IPv6 « %s » non valide"
-
--#: ../libnm-core/nm-setting-ip-config.c:153
-+#: ../libnm-core/nm-setting-ip-config.c:156
- #, c-format
- msgid "Invalid IPv4 address prefix '%u'"
- msgstr "préfixe d'adresse IPv4 « %u » non valide"
-
--#: ../libnm-core/nm-setting-ip-config.c:153
-+#: ../libnm-core/nm-setting-ip-config.c:156
- #, c-format
- msgid "Invalid IPv6 address prefix '%u'"
- msgstr "préfixe d'adresse IPv6 « %u » non valide"
-
--#: ../libnm-core/nm-setting-ip-config.c:168
-+#: ../libnm-core/nm-setting-ip-config.c:171
- #, 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:421
-+#: ../libnm-core/nm-setting-ip-config.c:1289
-+#: ../libnm-core/nm-setting-sriov.c:418
- msgid "unknown attribute"
- msgstr "attribut inconnu"
-
--#: ../libnm-core/nm-setting-ip-config.c:1297
--#: ../libnm-core/nm-setting-sriov.c:431
-+#: ../libnm-core/nm-setting-ip-config.c:1299
-+#: ../libnm-core/nm-setting-sriov.c:428
- #, 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:1310
- #, 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:1311
- #, 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:1327
-+#: ../libnm-core/nm-setting-ip-config.c:1351
- #, 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:1328
-+#: ../libnm-core/nm-setting-ip-config.c:1352
- #, 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:1342
- #, c-format
- msgid "invalid prefix %s"
- msgstr "préfixe %s non valide"
-
--#: ../libnm-core/nm-setting-ip-config.c:2512
-+#: ../libnm-core/nm-setting-ip-config.c:2479
-+#, fuzzy
-+msgid "invalid priority"
-+msgstr "Plan des priorités non valide « %s »"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2490
-+#, fuzzy
-+msgid "missing table"
-+msgstr "clé manquante"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2496
-+#, fuzzy
-+msgid "invalid action"
-+msgstr "option « » non valide"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2503
-+msgid "has from/src but the prefix-length is zero"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2510
-+msgid "missing from/src for a non zero prefix-length"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2515
-+#, fuzzy
-+msgid "invalid from/src"
-+msgstr "port invalide %d"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2520
-+#, fuzzy
-+msgid "invalid prefix length for from/src"
-+msgstr "longueur de préfixe non valide pour %s : « %s », valeur par défaut %d"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2527
-+msgid "has to/dst but the prefix-length is zero"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2534
-+msgid "missing to/dst for a non zero prefix-length"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2539
-+#, fuzzy
-+msgid "invalid to/dst"
-+msgstr "port invalide %d"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2544
-+#, fuzzy
-+msgid "invalid prefix length for to/dst"
-+msgstr "longueur de préfixe non valide pour %s : « %s », valeur par défaut %d"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2552
-+#, fuzzy
-+msgid "invalid iifname"
-+msgstr "valeur non valide"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2560
-+#, fuzzy
-+msgid "invalid oifname"
-+msgstr "valeur non valide"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2566
-+#, fuzzy
-+msgid "invalid source port range"
-+msgstr "Port source minimum [0]"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2572
-+#, fuzzy
-+msgid "invalid destination port range"
-+msgstr "option « » non valide"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2676
-+#, fuzzy, c-format
-+msgid "duplicate key %s"
-+msgstr "dupliquer la propriété"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2690
-+#, fuzzy, c-format
-+msgid "invalid key \"%s\""
-+msgstr "clé non valide \"%s\": %s"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2703
-+#, fuzzy, c-format
-+msgid "invalid variant type '%s' for \"%s\""
-+msgstr "type d'attribut « %s » non valide"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2712
-+#, fuzzy
-+msgid "missing \""
-+msgstr "clé manquante"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2718
-+#, fuzzy
-+msgid "invalid \""
-+msgstr "DUID non valide"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2909
-+#, fuzzy
-+msgid "Unsupported to-string-flags argument"
-+msgstr "fonctionnalité de déchargement non prise en charge"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2916
-+msgid "Unsupported extra-argument"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-ip-config.c:3161
-+#, fuzzy, c-format
-+msgid "unsupported key \"%s\""
-+msgstr "attribut « %s » de type « » non supporté"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:3166
-+#, fuzzy, c-format
-+msgid "duplicate key \"%s\""
-+msgstr "index VF dupliqué %u"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:3171
-+#, fuzzy, c-format
-+msgid "invalid value for \"%s\""
-+msgstr "valeur non valide pour \"%s\": %s"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:3181
-+msgid "empty text does not describe a rule"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-ip-config.c:3187
-+#, fuzzy, c-format
-+msgid "missing argument for \"%s\""
-+msgstr "hôte cible manquant"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:3199
-+#, fuzzy
-+msgid "invalid \"from\" part"
-+msgstr "port invalide %d"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:3213
-+#, fuzzy
-+msgid "invalid \"to\" part"
-+msgstr "port invalide %d"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:3222
-+#, c-format
-+msgid "cannot detect address family for rule"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-ip-config.c:3279
-+#: ../libnm-core/nm-setting-ip-config.c:3373
-+#, fuzzy, c-format
-+msgid "rule is invalid: %s"
-+msgstr "certificat non valide : %s"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:3356
-+#, fuzzy
-+msgid "invalid address family"
-+msgstr "adresse IP invalide : %s"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:4618
-+#, fuzzy, c-format
-+msgid "rule #%u is invalid: %s"
-+msgstr "certificat non valide : %s"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:4836
- #, 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:2528
-+#: ../libnm-core/nm-setting-ip-config.c:4852
- #, c-format
- msgid "%d. IP address is invalid"
- msgstr "%d. L'adresse IP n'est pas valide"
-
--#: ../libnm-core/nm-setting-ip-config.c:2540
-+#: ../libnm-core/nm-setting-ip-config.c:4864
- #, 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"
-
--#: ../libnm-core/nm-setting-ip-config.c:2549
-+#: ../libnm-core/nm-setting-ip-config.c:4873
- #, 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:2563
-+#: ../libnm-core/nm-setting-ip-config.c:4887
- 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"
-
--#: ../libnm-core/nm-setting-ip-config.c:2572
-+#: ../libnm-core/nm-setting-ip-config.c:4896
- msgid "gateway is invalid"
- msgstr "la passerelle n'est pas valide"
-
--#: ../libnm-core/nm-setting-ip-config.c:2586
-+#: ../libnm-core/nm-setting-ip-config.c:4910
- #, c-format
- msgid "%d. route is invalid"
- msgstr "%d. La route n'est pas valide"
-
--#: ../libnm-core/nm-setting-ip-config.c:2595
-+#: ../libnm-core/nm-setting-ip-config.c:4919
- #, 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:2606
-+#: ../libnm-core/nm-setting-ip-config.c:4935
-+#, c-format
-+msgid "%u. rule has wrong address-family"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-ip-config.c:4944
-+#, fuzzy, c-format
-+msgid "%u. rule is invalid: %s"
-+msgstr "%d. La route n'est pas valide"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:4957
- #, c-format
- msgid "a gateway is incompatible with '%s'"
- msgstr "une passerelle n'est pas compatible avec « %s »"
-
--#: ../libnm-core/nm-setting-ip4-config.c:141
--#: ../libnm-core/nm-setting-ip6-config.c:187
-+#: ../libnm-core/nm-setting-ip-tunnel.c:340
-+#, 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:363
-+#: ../libnm-core/nm-setting-ip-tunnel.c:383
-+#, 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:400
-+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"
-+
-+#: ../libnm-core/nm-setting-ip-tunnel.c:413
-+#: ../libnm-core/nm-setting-ip-tunnel.c:429
-+#, 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:441
-+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:454
-+#, c-format
-+msgid "some flags are invalid for the select mode: %s"
-+msgstr "certains drapeaux ne sont pas valides pour le mode select : %s"
-+
-+#: ../libnm-core/nm-setting-ip-tunnel.c:468
-+#, 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:128
-+#: ../libnm-core/nm-setting-ip6-config.c:174
- #: ../libnm-util/nm-setting-ip4-config.c:879
- #: ../libnm-util/nm-setting-ip6-config.c:841
- #, 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:153
--#: ../libnm-core/nm-setting-ip4-config.c:163
--#: ../libnm-core/nm-setting-ip4-config.c:175
--#: ../libnm-core/nm-setting-ip6-config.c:202
--#: ../libnm-core/nm-setting-ip6-config.c:212
--#: ../libnm-core/nm-setting-ip6-config.c:222
-+#: ../libnm-core/nm-setting-ip4-config.c:140
-+#: ../libnm-core/nm-setting-ip4-config.c:150
-+#: ../libnm-core/nm-setting-ip4-config.c:162
-+#: ../libnm-core/nm-setting-ip6-config.c:189
-+#: ../libnm-core/nm-setting-ip6-config.c:199
-+#: ../libnm-core/nm-setting-ip6-config.c:209
- #: ../libnm-util/nm-setting-ip4-config.c:891
- #: ../libnm-util/nm-setting-ip4-config.c:901
- #: ../libnm-util/nm-setting-ip4-config.c:913
-@@ -12015,140 +12266,115 @@ msgstr "cette propriété ne peut pas demeurer vide pour « %s=%s »"
- 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:212
-+#: ../libnm-core/nm-setting-ip4-config.c:199
- #, c-format
- msgid "'%s' is not a valid FQDN"
- msgstr "« %s » n'est pas un FQDN valide"
-
--#: ../libnm-core/nm-setting-ip4-config.c:221
-+#: ../libnm-core/nm-setting-ip4-config.c:208
- 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"
-
--#: ../libnm-core/nm-setting-ip4-config.c:233
-+#: ../libnm-core/nm-setting-ip4-config.c:220
- #, 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:247
-+#: ../libnm-core/nm-setting-ip4-config.c:234
- 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"
-
--#: ../libnm-core/nm-setting-ip6-config.c:261
-+#: ../libnm-core/nm-setting-ip6-config.c:248
- msgid "value is not a valid token"
- msgstr "la valeur ne correspond pas à un jeton valide"
-
--#: ../libnm-core/nm-setting-ip6-config.c:272
-+#: ../libnm-core/nm-setting-ip6-config.c:259
- 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:283
-+#: ../libnm-core/nm-setting-ip6-config.c:270
- msgid "invalid DUID"
- msgstr "DUID non valide"
-
--#: ../libnm-core/nm-setting-ip6-config.c:295
-+#: ../libnm-core/nm-setting-ip6-config.c:282
- msgid "token is not in canonical form"
- msgstr "le jeton n'est pas dans une forme canonique"
-
--#: ../libnm-core/nm-setting-ip6-config.c:307
-+#: ../libnm-core/nm-setting-ip6-config.c:294
- msgid "property should be TRUE when method is set to ignore"
- msgstr ""
- "la propriété doit être sur TRUE lorsque la méthode est définie à « ignore »"
-
--#: ../libnm-core/nm-setting-ip-tunnel.c:339
--#, 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
--#, 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
--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"
--
--#: ../libnm-core/nm-setting-ip-tunnel.c:412
--#: ../libnm-core/nm-setting-ip-tunnel.c:428
--#, 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
--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
--#, c-format
--msgid "some flags are invalid for the select mode: %s"
--msgstr "certains drapeaux ne sont pas valides pour le mode select : %s"
--
--#: ../libnm-core/nm-setting-ip-tunnel.c:467
--#, 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-macsec.c:258
-+#: ../libnm-core/nm-setting-macsec.c:246
- msgid "the key is empty"
- msgstr "la clé est vide"
-
--#: ../libnm-core/nm-setting-macsec.c:269
-+#: ../libnm-core/nm-setting-macsec.c:257
- #, c-format
- msgid "the key must be %d characters"
- msgstr "la clé doit faire %d caractères"
-
--#: ../libnm-core/nm-setting-macsec.c:277
-+#: ../libnm-core/nm-setting-macsec.c:265
- msgid "the key contains non-hexadecimal characters"
- msgstr "la clé contient des chiffres non hexadécimaux."
-
--#: ../libnm-core/nm-setting-macsec.c:339 ../libnm-core/nm-setting-macvlan.c:175
--#: ../libnm-core/nm-setting-vlan.c:657 ../libnm-util/nm-setting-vlan.c:580
-+#: ../libnm-core/nm-setting-macsec.c:327 ../libnm-core/nm-setting-macvlan.c:157
-+#: ../libnm-core/nm-setting-vlan.c:640 ../libnm-util/nm-setting-vlan.c:580
- #, 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:360
-+#: ../libnm-core/nm-setting-macsec.c:348
- #, 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:369
-+#: ../libnm-core/nm-setting-macsec.c:357
- msgid "must be either psk (0) or eap (1)"
- msgstr ""
-
--#: ../libnm-core/nm-setting-macsec.c:378
-+#: ../libnm-core/nm-setting-macsec.c:366
- #, c-format
- msgid "invalid port %d"
- msgstr "port invalide %d"
-
--#: ../libnm-core/nm-setting-macsec.c:389
-+#: ../libnm-core/nm-setting-macsec.c:377
- msgid "only valid for psk mode"
- msgstr ""
-
--#: ../libnm-core/nm-setting-macvlan.c:186
-+#: ../libnm-core/nm-setting-macvlan.c:168
- msgid "non promiscuous operation is allowed only in passthru mode"
- msgstr "opération de non promiscuité autorisée en mode passthru uniquement "
-
--#: ../libnm-core/nm-setting-olpc-mesh.c:128
--#: ../libnm-core/nm-setting-wireless.c:760
-+#: ../libnm-core/nm-setting-olpc-mesh.c:109
-+#: ../libnm-core/nm-setting-wireless.c:747
- #: ../libnm-util/nm-setting-olpc-mesh.c:132
- #: ../libnm-util/nm-setting-wireless.c:777
- 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:137
--#: ../libnm-core/nm-setting-wireless.c:800
-+#: ../libnm-core/nm-setting-olpc-mesh.c:118
-+#: ../libnm-core/nm-setting-wireless.c:787
- #: ../libnm-util/nm-setting-olpc-mesh.c:141
- #: ../libnm-util/nm-setting-wireless.c:817
- #, c-format
- msgid "'%d' is not a valid channel"
- msgstr "« %d » n'est pas un canal valide"
-
-+#: ../libnm-core/nm-setting-ovs-bridge.c:159
-+#, 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:170
-+#, c-format
-+msgid "'%s' is not allowed in fail_mode"
-+msgstr " '%s' n'est pas autorisé en fail_mode"
-+
- #: ../libnm-core/nm-setting-ovs-interface.c:111
- #, c-format
- msgid "'%s' is not a valid interface type"
-@@ -12214,7 +12440,7 @@ 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:104
--#: ../libnm-core/nm-setting-vxlan.c:373
-+#: ../libnm-core/nm-setting-vxlan.c:354
- #, c-format
- msgid "'%s' is not a valid IP address"
- msgstr "« %s » n'est pas une adresse IP valide"
-@@ -12239,91 +12465,94 @@ msgstr " '%s' n'est pas autorisé dans le lacp"
- msgid "'%s' is not allowed in bond_mode"
- msgstr " '%s' n'est pas autorisé en bond_mode"
-
--#: ../libnm-core/nm-setting-ovs-bridge.c:159
--#, 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:170
--#, c-format
--msgid "'%s' is not allowed in fail_mode"
--msgstr " '%s' n'est pas autorisé en fail_mode"
--
--#: ../libnm-core/nm-setting-ppp.c:363 ../libnm-util/nm-setting-ppp.c:386
-+#: ../libnm-core/nm-setting-ppp.c:352 ../libnm-util/nm-setting-ppp.c:386
- #, 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:376 ../libnm-util/nm-setting-ppp.c:399
-+#: ../libnm-core/nm-setting-ppp.c:365 ../libnm-util/nm-setting-ppp.c:399
- #, 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:161
-+#: ../libnm-core/nm-setting-proxy.c:148
- #, c-format
- msgid "invalid proxy method"
- msgstr "méthode de proxy invalide"
-
--#: ../libnm-core/nm-setting-proxy.c:171 ../libnm-core/nm-setting-proxy.c:180
-+#: ../libnm-core/nm-setting-proxy.c:158 ../libnm-core/nm-setting-proxy.c:167
- #, 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:191
-+#: ../libnm-core/nm-setting-proxy.c:178
- #, c-format
- msgid "the script is too large"
- msgstr "ce script est trop grand"
-
--#: ../libnm-core/nm-setting-proxy.c:199
-+#: ../libnm-core/nm-setting-proxy.c:186
- #, c-format
- msgid "the script is not valid utf8"
- msgstr "le script n'est pas valide utf8"
-
--#: ../libnm-core/nm-setting-proxy.c:207
-+#: ../libnm-core/nm-setting-proxy.c:194
- #, c-format
- msgid "the script lacks FindProxyForURL function"
- msgstr "il manque à ce script la fonction FindProxyForURL"
-
--#: ../libnm-core/nm-setting-sriov.c:1086
-+#: ../libnm-core/nm-setting-sriov.c:1070
- #, fuzzy, c-format
- msgid "VF with index %u, but the total number of VFs is %u"
- msgstr "VF avec indice %u, mais le nombre total de VF est "
-
--#: ../libnm-core/nm-setting-sriov.c:1097
-+#: ../libnm-core/nm-setting-sriov.c:1081
- #, c-format
- msgid "invalid VF %u: %s"
- msgstr "VF non valide %u: %s"
-
--#: ../libnm-core/nm-setting-sriov.c:1109
-+#: ../libnm-core/nm-setting-sriov.c:1093
- #, c-format
- msgid "duplicate VF index %u"
- msgstr "index VF dupliqué %u"
-
--#: ../libnm-core/nm-setting-sriov.c:1130
-+#: ../libnm-core/nm-setting-sriov.c:1114
- #, 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:68
--#: ../libnm-core/nm-setting-tc-config.c:296
--#: ../libnm-core/nm-setting-tc-config.c:550
-+#: ../libnm-core/nm-setting-tc-config.c:70
-+#: ../libnm-core/nm-setting-tc-config.c:436
-+#: ../libnm-core/nm-setting-tc-config.c:706
-+#, fuzzy, c-format
-+msgid "kind is missing"
-+msgstr "la valeur est manquante"
-+
-+#: ../libnm-core/nm-setting-tc-config.c:78
-+#: ../libnm-core/nm-setting-tc-config.c:444
-+#: ../libnm-core/nm-setting-tc-config.c:714
- #, c-format
- msgid "'%s' is not a valid kind"
- msgstr "'%s' n’est pas un type valide"
-
--#: ../libnm-core/nm-setting-tc-config.c:76
--#: ../libnm-core/nm-setting-tc-config.c:558
-+#: ../libnm-core/nm-setting-tc-config.c:86
-+#: ../libnm-core/nm-setting-tc-config.c:722
- msgid "parent handle missing"
- msgstr "propriété parente manquante"
-
--#: ../libnm-core/nm-setting-tc-config.c:1203
-+#: ../libnm-core/nm-setting-tc-config.c:1292
- msgid "there are duplicate TC qdiscs"
- msgstr "il y a des qdisques TC en double"
-
--#: ../libnm-core/nm-setting-tc-config.c:1223
-+#: ../libnm-core/nm-setting-tc-config.c:1312
- msgid "there are duplicate TC filters"
- msgstr "il y a des filtres TC en double"
-
-+#: ../libnm-core/nm-setting-team-port.c:366
-+#: ../libnm-core/nm-setting-team.c:1234
-+#, c-format
-+msgid "team config exceeds size limit"
-+msgstr "la configuration de l'équipe dépasse la limite de taille"
-+
- #: ../libnm-core/nm-setting-team.c:135 ../libnm-core/nm-setting-team.c:194
- #: ../libnm-core/nm-setting-team.c:306
- #, c-format
-@@ -12355,48 +12584,42 @@ msgstr "hôte-source « %s » contient des caractères non valides"
- msgid "vlanid is out of range [-1, 4094]"
- msgstr "La valeur « %d » est hors de portée <%d-%d>"
-
--#: ../libnm-core/nm-setting-team.c:1220
--#: ../libnm-core/nm-setting-team-port.c:380
--#, c-format
--msgid "team config exceeds size limit"
--msgstr "la configuration de l'équipe dépasse la limite de taille"
--
--#: ../libnm-core/nm-setting-team.c:1246
-+#: ../libnm-core/nm-setting-team.c:1260
- #, c-format
- msgid "invalid runner \"%s\""
- msgstr "runner non valide : « %s »"
-
--#: ../libnm-core/nm-setting-team.c:1259
-+#: ../libnm-core/nm-setting-team.c:1273
- #, c-format
- msgid "missing link watcher name"
- msgstr "nom d'observateur de liens manquant"
-
--#: ../libnm-core/nm-setting-team.c:1269
-+#: ../libnm-core/nm-setting-team.c:1283
- #, c-format
- msgid "unknown link watcher \"%s\""
- msgstr "impossible de charger l'observateur de liens « %s »"
-
--#: ../libnm-core/nm-setting-team.c:1280
-+#: ../libnm-core/nm-setting-team.c:1294
- #, c-format
- msgid "missing target host"
- msgstr "hôte cible manquant"
-
--#: ../libnm-core/nm-setting-team.c:1288
-+#: ../libnm-core/nm-setting-team.c:1302
- #, c-format
- msgid "missing source address"
- msgstr "adresse source manquante"
-
--#: ../libnm-core/nm-setting-tun.c:185
-+#: ../libnm-core/nm-setting-tun.c:167
- #, c-format
- msgid "'%u': invalid mode"
- msgstr "« %u » n'est pas un mode valide"
-
--#: ../libnm-core/nm-setting-tun.c:195
-+#: ../libnm-core/nm-setting-tun.c:177
- #, c-format
- msgid "'%s': invalid user ID"
- msgstr "« %s » n'est pas un ID d'utilisateur valide"
-
--#: ../libnm-core/nm-setting-tun.c:206
-+#: ../libnm-core/nm-setting-tun.c:188
- #, c-format
- msgid "'%s': invalid group ID"
- msgstr "« %s » n'est pas un ID de groupe valide"
-@@ -12446,405 +12669,516 @@ msgstr "nombre maximal d'entrées de données d'utilisateur atteint"
- msgid "invalid key \"%s\": %s"
- msgstr "clé non valide \"%s\": %s"
-
--#: ../libnm-core/nm-setting-user.c:374
--#, c-format
--msgid "invalid value for \"%s\": %s"
--msgstr "valeur non valide pour \"%s\": %s"
--
- #: ../libnm-core/nm-setting-user.c:389
- #, 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)"
-
--#: ../libnm-core/nm-setting-vlan.c:668 ../libnm-util/nm-setting-vlan.c:600
-+#: ../libnm-core/nm-setting-vlan.c:651 ../libnm-util/nm-setting-vlan.c:600
- #, 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:678 ../libnm-util/nm-setting-vlan.c:591
-+#: ../libnm-core/nm-setting-vlan.c:661 ../libnm-util/nm-setting-vlan.c:591
- msgid "flags are invalid"
- msgstr "les marqueurs ne sont pas valides"
-
--#: ../libnm-core/nm-setting-vlan.c:690
-+#: ../libnm-core/nm-setting-vlan.c:673
- 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:580
-+#: ../libnm-core/nm-setting-vpn.c:561
- msgid "cannot set connection.multi-connect for VPN setting"
- msgstr ""
- "ne peut pas définir connection.multi-connect pour la configuration du VPN"
-
--#: ../libnm-core/nm-setting-vpn.c:601
-+#: ../libnm-core/nm-setting-vpn.c:582
- #, c-format
- msgid "secret was empty"
- msgstr "secret vide"
-
--#: ../libnm-core/nm-setting-vpn.c:631
-+#: ../libnm-core/nm-setting-vpn.c:612
- msgid "setting contained a secret with an empty name"
- msgstr "configuration contenant un secret avec un nom vide"
-
--#: ../libnm-core/nm-setting-vpn.c:639
-+#: ../libnm-core/nm-setting-vpn.c:620
- #, c-format
- msgid "secret value was empty"
- msgstr "valeur de secret vide"
-
--#: ../libnm-core/nm-setting-vpn.c:686 ../libnm-core/nm-setting.c:2024
-+#: ../libnm-core/nm-setting-vpn.c:667 ../libnm-core/nm-setting.c:2114
- msgid "not a secret property"
- msgstr "ne correspond pas à une propriété secrète"
-
--#: ../libnm-core/nm-setting-vpn.c:692
-+#: ../libnm-core/nm-setting-vpn.c:673
- msgid "secret is not of correct type"
- msgstr "secret de type erroné"
-
--#: ../libnm-core/nm-setting-vpn.c:725
-+#: ../libnm-core/nm-setting-vpn.c:757
- #, fuzzy
- msgid "secret flags property not found"
- msgstr "La propriété « %s » de marqueurs secrets n'a pas été trouvée"
-
--#: ../libnm-core/nm-setting-vxlan.c:386
-+#: ../libnm-core/nm-setting-vxlan.c:367
- #, 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:413
-+#: ../libnm-core/nm-setting-vxlan.c:394
- #, 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:630 ../libnm-util/nm-setting-wired.c:612
-+#: ../libnm-core/nm-setting-wired.c:614 ../libnm-util/nm-setting-wired.c:612
- #, 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:640 ../libnm-util/nm-setting-wired.c:622
-+#: ../libnm-core/nm-setting-wired.c:624 ../libnm-util/nm-setting-wired.c:622
- #, 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:699 ../libnm-util/nm-setting-wired.c:679
-+#: ../libnm-core/nm-setting-wired.c:683 ../libnm-util/nm-setting-wired.c:679
- #, 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:736
-+#: ../libnm-core/nm-setting-wired.c:720
- 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"
-
--#: ../libnm-core/nm-setting-wired.c:745
-+#: ../libnm-core/nm-setting-wired.c:729
- 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"
-
--#: ../libnm-core/nm-setting-wired.c:770
-+#: ../libnm-core/nm-setting-wired.c:754
- 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:771
-+#: ../libnm-core/nm-setting-wired.c:755
- 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"
-
--#: ../libnm-core/nm-setting-wireless-security.c:939
-+#: ../libnm-core/nm-setting-wireguard.c:778
-+msgid "missing public-key for peer"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-wireguard.c:782
-+msgid "invalid public-key for peer"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-wireguard.c:791
-+#, fuzzy
-+msgid "invalid preshared-key for peer"
-+msgstr "clé privée non valide"
-+
-+#: ../libnm-core/nm-setting-wireguard.c:809
-+#, fuzzy
-+msgid "invalid endpoint for peer"
-+msgstr "Point de terminaison local [none]"
-+
-+#: ../libnm-core/nm-setting-wireguard.c:819
-+#, fuzzy, c-format
-+msgid "invalid IP address \"%s\" for allowed-ip of peer"
-+msgstr "adresse IP invalide : %s"
-+
-+#: ../libnm-core/nm-setting-wireguard.c:828
-+msgid "invalid preshared-key-flags for peer"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-wireguard.c:1567
-+#, c-format
-+msgid "peer #%u has no public-key"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-wireguard.c:1578
-+#, c-format
-+msgid "peer #%u has invalid public-key"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-wireguard.c:1592
-+#, c-format
-+msgid "peer #%u has invalid endpoint"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-wireguard.c:1622
-+#, c-format
-+msgid "peer #%u has invalid allowed-ips setting"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-wireguard.c:1634
-+#, fuzzy, c-format
-+msgid "peer #%u is invalid: %s"
-+msgstr "certificat non valide : %s"
-+
-+#: ../libnm-core/nm-setting-wireguard.c:1705
-+#: ../libnm-core/nm-setting-wireguard.c:1719
-+#, c-format
-+msgid "method \"%s\" is not supported for WireGuard"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-wireguard.c:1739
-+msgid "key must be 32 bytes base64 encoded"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-wireguard.c:1875
-+#, fuzzy
-+msgid "invalid peer secrets"
-+msgstr "Secrets non valides"
-+
-+#: ../libnm-core/nm-setting-wireguard.c:1898
-+#, c-format
-+msgid "peer #%u lacks public-key"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-wireguard.c:1912
-+#, c-format
-+msgid "non-existing peer '%s'"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-wireless-security.c:935
- #: ../libnm-util/nm-setting-wireless-security.c:911
- #, c-format
- msgid "'%s' security requires '%s=%s'"
- msgstr "la sécurité « %s » requiert « %s=%s »"
-
--#: ../libnm-core/nm-setting-wireless-security.c:960
-+#: ../libnm-core/nm-setting-wireless-security.c:956
- #: ../libnm-util/nm-setting-wireless-security.c:932
- #, 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:981
-+#: ../libnm-core/nm-setting-wireless-security.c:977
- #: ../libnm-util/nm-setting-wireless-security.c:953
- #, 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:1036
-+#: ../libnm-core/nm-setting-wireless-security.c:1032
- #: ../libnm-util/nm-setting-wireless-security.c:1008
- #, 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:1066
-+#: ../libnm-core/nm-setting-wireless-security.c:1062
- #: ../libnm-util/nm-setting-wireless-security.c:1038
- #, 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:1090
--#, c-format
--msgid "'%s' can only be used with '%s=%s' or '%s=%s'"
-+#: ../libnm-core/nm-setting-wireless-security.c:1086
-+#, fuzzy, c-format
-+msgid ""
-+"'%s' can only be used with 'wpa-eap', 'wpa-psk' or 'sae' key management "
- msgstr "« %s » peut uniquement être utilisé avec '%s=%s' or '%s=%s'"
-
--#: ../libnm-core/nm-setting-wireless-security.c:1112
--msgid "can't be simultaneously disabled and enabled"
--msgstr "ne peut pas être simultanément désactivé et activé"
--
--#: ../libnm-core/nm-setting-wireless.c:769
-+#: ../libnm-core/nm-setting-wireless.c:756
- #: ../libnm-util/nm-setting-wireless.c:786
- #, 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:779
-+#: ../libnm-core/nm-setting-wireless.c:766
- #: ../libnm-util/nm-setting-wireless.c:796
- #, c-format
- msgid "'%s' is not a valid band"
- msgstr "« %s » n'est pas une bande valide"
-
--#: ../libnm-core/nm-setting-wireless.c:789
-+#: ../libnm-core/nm-setting-wireless.c:776
- #, c-format
- msgid "'%s' requires setting '%s' property"
- msgstr "« %s » requiert de paramétrer la propriété « %s »"
-
--#: ../libnm-core/nm-setting-wireless.c:883
-+#: ../libnm-core/nm-setting-wireless.c:870
- #, c-format
- msgid "invalid value"
- msgstr "valeur non valide"
-
--#: ../libnm-core/nm-setting-wireless.c:893
-+#: ../libnm-core/nm-setting-wireless.c:880
- 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"
-
--#: ../libnm-core/nm-setting-wireless.c:902
-+#: ../libnm-core/nm-setting-wireless.c:889
- msgid "Wake-on-WLAN trying to set unknown flag"
- msgstr "Wake-on-WLAN essaye d'activer un drapeau inconnu"
-
--#: ../libnm-core/nm-setting-wireless.c:924
-+#: ../libnm-core/nm-setting-wireless.c:911
- #, 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"
-
--#: ../libnm-core/nm-setting-wpan.c:182
-+#: ../libnm-core/nm-setting-wpan.c:185
- msgid "page must be defined along with a channel"
- msgstr ""
-
--#: ../libnm-core/nm-setting-wpan.c:191
-+#: ../libnm-core/nm-setting-wpan.c:194
- #, c-format
- msgid "page must be between %d and %d"
- msgstr ""
-
--#: ../libnm-core/nm-setting-wpan.c:202
-+#: ../libnm-core/nm-setting-wpan.c:205
- #, c-format
- msgid "channel must not be between %d and %d"
- msgstr ""
-
--#: ../libnm-core/nm-setting.c:852
-+#: ../libnm-core/nm-setting.c:872
- #, c-format
- msgid "duplicate property"
- msgstr "dupliquer la propriété"
-
--#: ../libnm-core/nm-setting.c:900 ../libnm-core/nm-setting.c:947
-+#: ../libnm-core/nm-setting.c:922 ../libnm-core/nm-setting.c:971
- #, 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 »"
-
--#: ../libnm-core/nm-setting.c:919 ../libnm-core/nm-setting.c:933
-+#: ../libnm-core/nm-setting.c:941 ../libnm-core/nm-setting.c:956
- #, c-format
- msgid "failed to set property: %s"
- msgstr "n'a pas pu définir la propriété : %s"
-
--#: ../libnm-core/nm-setting.c:961
-+#: ../libnm-core/nm-setting.c:986
- #, c-format
- msgid "can not set property: %s"
- msgstr "n'a pas pu définir la propriété : %s"
-
--#: ../libnm-core/nm-setting.c:977
-+#: ../libnm-core/nm-setting.c:1002
- #, c-format
- msgid "unknown property"
- msgstr "propriété inconnue"
-
--#: ../libnm-core/nm-setting.c:1935
-+#: ../libnm-core/nm-setting.c:2005
- msgid "secret not found"
- msgstr "secret non trouvé"
-
--#: ../libnm-core/nm-utils.c:2045
-+#: ../libnm-core/nm-utils.c:2317
- #, c-format
- msgid "'%s' is not a valid handle."
- msgstr "« %s » n'est pas un handle valide"
-
--#: ../libnm-core/nm-utils.c:2141
-+#: ../libnm-core/nm-utils.c:2445
- #, c-format
- msgid "'%s' unexpected: parent already specified."
- msgstr "« %s » inattendu : parent déjà spécifié."
-
--#: ../libnm-core/nm-utils.c:2157
-+#: ../libnm-core/nm-utils.c:2461
- #, c-format
- msgid "invalid handle: '%s'"
- msgstr "action non valide : '%s'"
-
--#: ../libnm-core/nm-utils.c:2179
-+#: ../libnm-core/nm-utils.c:2483
- msgid "parent not specified."
- msgstr "parent non spécifié"
-
--#: ../libnm-core/nm-utils.c:2226
-+#: ../libnm-core/nm-utils.c:2545
- #, c-format
- msgid "unsupported qdisc option: '%s'."
- msgstr "attribut « %s » de type « » non supporté"
-
--#: ../libnm-core/nm-utils.c:2342
-+#: ../libnm-core/nm-utils.c:2667
- msgid "action name missing."
- msgstr "nom de l'action manquant"
-
--#: ../libnm-core/nm-utils.c:2366
-+#: ../libnm-core/nm-utils.c:2693
- #, c-format
- msgid "unsupported action option: '%s'."
- msgstr "attribut « %s » de type « » non supporté"
-
--#: ../libnm-core/nm-utils.c:2504
-+#: ../libnm-core/nm-utils.c:2831
- msgid "invalid action: "
- msgstr "option « » non valide"
-
--#: ../libnm-core/nm-utils.c:2508
-+#: ../libnm-core/nm-utils.c:2835
- #, c-format
- msgid "unsupported tfilter option: '%s'."
- msgstr "attribut « %s » de type « » non supporté"
-
--#: ../libnm-core/nm-utils.c:3110
-+#: ../libnm-core/nm-utils.c:3436
- #, c-format
- msgid "failed stat file %s: %s"
- msgstr "échec fichier stat %s: %s"
-
--#: ../libnm-core/nm-utils.c:3119
-+#: ../libnm-core/nm-utils.c:3445
- #, c-format
- msgid "not a file (%s)"
- msgstr "pas un fichier (%s) "
-
--#: ../libnm-core/nm-utils.c:3130
-+#: ../libnm-core/nm-utils.c:3456
- #, c-format
- msgid "invalid file owner %d for %s"
- msgstr "propriétaire de fichier non valide %d pour %s"
-
--#: ../libnm-core/nm-utils.c:3141
-+#: ../libnm-core/nm-utils.c:3467
- #, c-format
- msgid "file permissions for %s"
- msgstr "permissions de fichier pour %s"
-
--#: ../libnm-core/nm-utils.c:3151
-+#: ../libnm-core/nm-utils.c:3477
- #, c-format
- msgid "reject %s"
- msgstr "rejète %s"
-
--#: ../libnm-core/nm-utils.c:3170
-+#: ../libnm-core/nm-utils.c:3496
- #, c-format
- msgid "path is not absolute (%s)"
- msgstr "le chemin n'est pas absolu (%s)"
-
--#: ../libnm-core/nm-utils.c:3184
-+#: ../libnm-core/nm-utils.c:3510
- #, c-format
- msgid "Plugin file does not exist (%s)"
- msgstr "le fichier de greffon n'existe pas (%s)"
-
--#: ../libnm-core/nm-utils.c:3192
-+#: ../libnm-core/nm-utils.c:3518
- #, 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:3202
-+#: ../libnm-core/nm-utils.c:3528
- #, 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:3284 ../libnm-util/nm-utils.c:1794
-+#: ../libnm-core/nm-utils.c:3610 ../libnm-util/nm-utils.c:1794
- #, c-format
- msgid "Could not find \"%s\" binary"
- msgstr "N'a pas pu trouver le binaire « %s »"
-
--#: ../libnm-core/nm-utils.c:4369
-+#: ../libnm-core/nm-utils.c:4460
-+#, fuzzy
-+msgid "unknown secret flags"
-+msgstr "Nom de paramètre inconnu"
-+
-+#: ../libnm-core/nm-utils.c:4470
-+msgid "conflicting secret flags"
-+msgstr ""
-+
-+#: ../libnm-core/nm-utils.c:4481
-+#, fuzzy
-+msgid "secret flags must not be \"not-required\""
-+msgstr "La propriété « %s » de marqueurs secrets n'a pas été trouvée"
-+
-+#: ../libnm-core/nm-utils.c:4489
-+#, fuzzy
-+msgid "unsupported secret flags"
-+msgstr "attribut « %s » de type « » non supporté"
-+
-+#: ../libnm-core/nm-utils.c:4519
-+msgid "can't be simultaneously disabled and enabled"
-+msgstr "ne peut pas être simultanément désactivé et activé"
-+
-+#: ../libnm-core/nm-utils.c:4527
-+#, fuzzy
-+msgid "WPS is required"
-+msgstr "Code PIN requis"
-+
-+#: ../libnm-core/nm-utils.c:4593
- #, 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:4384
-+#: ../libnm-core/nm-utils.c:4608
- #, 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:4420
-+#: ../libnm-core/nm-utils.c:4667
- msgid "interface name is too short"
- msgstr "le nom de l'interface est trop court"
-
--#: ../libnm-core/nm-utils.c:4429
-+#: ../libnm-core/nm-utils.c:4676
- msgid "interface name is reserved"
- msgstr "le nom d'interface est réservé"
-
--#: ../libnm-core/nm-utils.c:4441
-+#: ../libnm-core/nm-utils.c:4688
- msgid "interface name contains an invalid character"
- msgstr "le nom de l'interface contient un caractère invalide"
-
--#: ../libnm-core/nm-utils.c:4447
-+#: ../libnm-core/nm-utils.c:4694
- 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:5107
-+#: ../libnm-core/nm-utils.c:5354
- msgid "not valid utf-8"
- msgstr "utf-8 invalide"
-
--#: ../libnm-core/nm-utils.c:5128 ../libnm-core/nm-utils.c:5601
-+#: ../libnm-core/nm-utils.c:5375 ../libnm-core/nm-utils.c:5850
- msgid "is not a JSON object"
- msgstr "n'est pas un objet JSON"
-
--#: ../libnm-core/nm-utils.c:5577 ../libnm-core/nm-utils.c:5917
-+#: ../libnm-core/nm-utils.c:5826 ../libnm-core/nm-utils.c:6161
- msgid "value is NULL"
- msgstr "la valeur est NULL"
-
--#: ../libnm-core/nm-utils.c:5577 ../libnm-core/nm-utils.c:5917
-+#: ../libnm-core/nm-utils.c:5826 ../libnm-core/nm-utils.c:6161
- msgid "value is empty"
- msgstr "la valeur est vide"
-
--#: ../libnm-core/nm-utils.c:5589
-+#: ../libnm-core/nm-utils.c:5838
- #, c-format
- msgid "invalid JSON at position %d (%s)"
- msgstr "JSON invalide à la position %d (%s)"
-
--#: ../libnm-core/nm-utils.c:6244 ../libnm-core/nm-utils.c:6264
-+#: ../libnm-core/nm-utils.c:6488 ../libnm-core/nm-utils.c:6508
- msgid "unterminated escape sequence"
- msgstr "séquence d'échappement no terminée"
-
--#: ../libnm-core/nm-utils.c:6289
-+#: ../libnm-core/nm-utils.c:6533
- #, c-format
- msgid "unknown attribute '%s'"
- msgstr "attribut inconnu « %s »"
-
--#: ../libnm-core/nm-utils.c:6304
-+#: ../libnm-core/nm-utils.c:6548
- #, 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:6320
-+#: ../libnm-core/nm-utils.c:6564
- #, c-format
- msgid "invalid uint32 value '%s' for attribute '%s'"
- msgstr "valeur « %s » uint32 invalide pour l'attribut « %s »"
-
--#: ../libnm-core/nm-utils.c:6329
-+#: ../libnm-core/nm-utils.c:6573
- #, c-format
- msgid "invalid uint8 value '%s' for attribute '%s'"
- msgstr "valeur « %s » uint8 invalide pour l'attribut « %s »"
-
--#: ../libnm-core/nm-utils.c:6339
-+#: ../libnm-core/nm-utils.c:6583
- #, 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:6349
-+#: ../libnm-core/nm-utils.c:6593
- #, c-format
- msgid "unsupported attribute '%s' of type '%s'"
- msgstr "attribut « %s » de type « %s » non supporté"
-
-+#: ../libnm-core/nm-utils.c:6935
-+#, fuzzy, c-format
-+msgid "Bridge VLANs %d and %d are not sorted by ascending vid"
-+msgstr "les VF %d et %d ne sont pas ordonnancés par index ascendant"
-+
-+#: ../libnm-core/nm-utils.c:6959
-+#, fuzzy, c-format
-+msgid "duplicate bridge VLAN vid %u"
-+msgstr "index VF dupliqué %u"
-+
-+#: ../libnm-core/nm-utils.c:6971
-+msgid "only one VLAN can be the PVID"
-+msgstr ""
-+
- #: ../libnm-core/nm-vpn-editor-plugin.c:296
- #, c-format
- msgid "cannot load plugin \"%s\": %s"
-@@ -12884,51 +13218,51 @@ msgstr "le greffon ne prend pas en charge la fonction d'importation"
- 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:110
-+#: ../libnm-core/nm-vpn-plugin-info.c:108
- #, c-format
- msgid "missing filename"
- msgstr "nom de fichier manquant"
-
--#: ../libnm-core/nm-vpn-plugin-info.c:118
-+#: ../libnm-core/nm-vpn-plugin-info.c:116
- #, 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:127
-+#: ../libnm-core/nm-vpn-plugin-info.c:125
- #, 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:450
-+#: ../libnm-core/nm-vpn-plugin-info.c:448
- #, 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"
-
--#: ../libnm-core/nm-vpn-plugin-info.c:488
-+#: ../libnm-core/nm-vpn-plugin-info.c:486
- #, 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:1070
-+#: ../libnm-core/nm-vpn-plugin-info.c:1068
- #, c-format
- msgid "missing \"plugin\" setting"
- msgstr "paramètre \"plugin\" manquant"
-
--#: ../libnm-core/nm-vpn-plugin-info.c:1080
-+#: ../libnm-core/nm-vpn-plugin-info.c:1078
- #, 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:1174
-+#: ../libnm-core/nm-vpn-plugin-info.c:1154
- 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:1186
-+#: ../libnm-core/nm-vpn-plugin-info.c:1166
- msgid "missing name for VPN plugin info"
- msgstr "nom manquant pour les informations de greffon VPN"
-
--#: ../libnm-core/nm-vpn-plugin-info.c:1195
-+#: ../libnm-core/nm-vpn-plugin-info.c:1175
- msgid "missing service for VPN plugin info"
- msgstr "service manquant pour les informations de greffon VPN"
-
-@@ -12968,15 +13302,15 @@ msgstr "Tun"
- msgid "Veth"
- msgstr "Veth"
-
--#: ../libnm-glib/nm-device.c:1884 ../libnm/nm-device.c:1462
-+#: ../libnm-glib/nm-device.c:1884 ../libnm/nm-device.c:1464
- msgid "Wired"
- msgstr "Filaire"
-
--#: ../libnm-glib/nm-device.c:1915 ../libnm/nm-device.c:1493
-+#: ../libnm-glib/nm-device.c:1915 ../libnm/nm-device.c:1495
- msgid "PCI"
- msgstr "PCI"
-
--#: ../libnm-glib/nm-device.c:1917 ../libnm/nm-device.c:1495
-+#: ../libnm-glib/nm-device.c:1917 ../libnm/nm-device.c:1497
- msgid "USB"
- msgstr "USB"
-
-@@ -12987,7 +13321,7 @@ msgstr "USB"
- #. * the strings otherwise.
- #.
- #: ../libnm-glib/nm-device.c:2014 ../libnm-glib/nm-device.c:2033
--#: ../libnm/nm-device.c:1808 ../libnm/nm-device.c:1827
-+#: ../libnm/nm-device.c:1810 ../libnm/nm-device.c:1829
- #, c-format
- msgctxt "long device name"
- msgid "%s %s"
-@@ -13052,7 +13386,7 @@ msgstr "clé privée phase2 non valide"
- msgid "requires '%s' or '%s' setting"
- msgstr "requiert un paramètre « %s » ou « %s »"
-
--#: ../libnm-util/nm-setting-bond.c:581
-+#: ../libnm-util/nm-setting-bond.c:580
- #, c-format
- msgid "'%s' is not a valid interface name for '%s' option"
- msgstr "« %s » n'est pas un nom d'interface valide pour l'option « %s »"
-@@ -13098,12 +13432,12 @@ msgstr "%d. L'adresse IPv6 n'est pas valide"
- msgid "%d. IPv6 address has invalid prefix"
- msgstr "%d. Le préfixe de l'adresse IPv6 n'est pas valide"
-
--#: ../libnm-util/nm-setting-vpn.c:581
-+#: ../libnm-util/nm-setting-vpn.c:580
- #, c-format
- msgid "Failed to convert '%s' value '%s' to uint"
- msgstr "N'a pas pu convertir la valeur « %s » de « %s » à uint"
-
--#: ../libnm-util/nm-setting-vpn.c:588
-+#: ../libnm-util/nm-setting-vpn.c:587
- #, c-format
- msgid "Secret flags property '%s' not found"
- msgstr "La propriété « %s » de marqueurs secrets n'a pas été trouvée"
-@@ -13113,139 +13447,130 @@ msgstr "La propriété « %s » de marqueurs secrets n'a pas été trouvée"
- msgid "requires setting '%s' property"
- msgstr "requiert de paramétrer la propriété « %s »"
-
--#: ../libnm/nm-device-adsl.c:72
-+#: ../libnm/nm-device-adsl.c:69
- msgid "The connection was not an ADSL connection."
- msgstr "La connexion n'était pas une connexion ADSL."
-
--#: ../libnm/nm-device-bond.c:111
-+#: ../libnm/nm-device-bond.c:109
- msgid "The connection was not a bond connection."
- msgstr "La connexion n'était pas un connexion de liaison"
-
--#: ../libnm/nm-device-bridge.c:115
-+#: ../libnm/nm-device-bridge.c:113
- msgid "The connection was not a bridge connection."
- msgstr "La connexion n'était pas une connexion de pontage"
-
--#: ../libnm/nm-device-bt.c:137
-+#: ../libnm/nm-device-bt.c:135
- #, c-format
- msgid "The connection was not a Bluetooth connection."
- msgstr "La connexion n'était pas une connexion Bluetooth"
-
--#: ../libnm/nm-device-bt.c:143
-+#: ../libnm/nm-device-bt.c:141
- #, c-format
- msgid "The connection is of Bluetooth NAP type."
- msgstr "La connexion est de type Bluetooth NAP."
-
--#: ../libnm/nm-device-bt.c:152
-+#: ../libnm/nm-device-bt.c:150
- msgid "Invalid device Bluetooth address."
- msgstr "Adresse de périphérique Bluetooth non valide"
-
--#: ../libnm/nm-device-bt.c:158
-+#: ../libnm/nm-device-bt.c:156
- 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."
-
--#: ../libnm/nm-device-bt.c:167
-+#: ../libnm/nm-device-bt.c:165
- 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."
-
--#: ../libnm/nm-device-dummy.c:76
-+#: ../libnm/nm-device-dummy.c:75
- msgid "The connection was not a dummy connection."
- msgstr "La connexion n'était pas une connexion factice."
-
--#: ../libnm/nm-device-dummy.c:83 ../libnm/nm-device-generic.c:97
--#: ../libnm/nm-device-ovs-bridge.c:97 ../libnm/nm-device-ovs-interface.c:68
-+#: ../libnm/nm-device-dummy.c:82 ../libnm/nm-device-generic.c:96
-+#: ../libnm/nm-device-ovs-bridge.c:96 ../libnm/nm-device-ovs-interface.c:67
- #: ../libnm/nm-device-ovs-port.c:96
- 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:206
-+#: ../libnm/nm-device-ethernet.c:204
- 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:221
-+#: ../libnm/nm-device-ethernet.c:219
- 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:236
-+#: ../libnm/nm-device-ethernet.c:234
- #, c-format
- msgid "Invalid device MAC address %s."
- msgstr "Adresse MAC du périphérique %s invalide"
-
--#: ../libnm/nm-device-ethernet.c:241
-+#: ../libnm/nm-device-ethernet.c:239
- 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:251
-+#: ../libnm/nm-device-ethernet.c:249
- #, c-format
- msgid "Invalid MAC in the blacklist: %s."
- msgstr "MAC non valide, dans la liste noire : %s"
-
--#: ../libnm/nm-device-ethernet.c:257
-+#: ../libnm/nm-device-ethernet.c:255
- #, 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:90
-+#: ../libnm/nm-device-generic.c:89
- msgid "The connection was not a generic connection."
- msgstr "La connexion n'était pas une connexion standard"
-
--#: ../libnm/nm-device-tun.c:208
--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:217
--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-infiniband.c:93
-+#: ../libnm/nm-device-infiniband.c:91
- msgid "The connection was not an InfiniBand connection."
- msgstr "La connexion n'était pas une connexion InfiniBand."
-
--#: ../libnm/nm-device-infiniband.c:101 ../libnm/nm-device-wifi.c:625
--#: ../libnm/nm-device-wimax.c:324
-+#: ../libnm/nm-device-infiniband.c:99 ../libnm/nm-device-wifi.c:622
-+#: ../libnm/nm-device-wimax.c:322
- msgid "Invalid device MAC address."
- msgstr "Adresse MAC de périphérique non valide."
-
--#: ../libnm/nm-device-infiniband.c:109 ../libnm/nm-device-wifi.c:632
--#: ../libnm/nm-device-wimax.c:331
-+#: ../libnm/nm-device-infiniband.c:107 ../libnm/nm-device-wifi.c:629
-+#: ../libnm/nm-device-wimax.c:329
- 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:271
-+#: ../libnm/nm-device-ip-tunnel.c:269
- 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:157
-+#: ../libnm/nm-device-macvlan.c:155
- msgid "The connection was not a MAC-VLAN connection."
- msgstr "La connexion n'était pas une connexion MAC-VLAN."
-
--#: ../libnm/nm-device-modem.c:119
-+#: ../libnm/nm-device-modem.c:117
- msgid "The connection was not a modem connection."
- msgstr "La connexion n'était pas une connexion de modem."
-
--#: ../libnm/nm-device-modem.c:127
-+#: ../libnm/nm-device-modem.c:125
- 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:134
-+#: ../libnm/nm-device-modem.c:132
- 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."
-
--#: ../libnm/nm-device-olpc-mesh.c:114
-+#: ../libnm/nm-device-olpc-mesh.c:112
- 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:90
-+#: ../libnm/nm-device-ovs-bridge.c:89
- 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:61
-+#: ../libnm/nm-device-ovs-interface.c:60
- msgid "The connection was not a ovs_interface connection."
- msgstr "La connexion n'était pas une connexion ovs_interface."
-
-@@ -13253,57 +13578,71 @@ msgstr "La connexion n'était pas une connexion ovs_interface."
- msgid "The connection was not a ovs_port connection."
- msgstr "La connexion n'était pas une connexion ovs_port."
-
--#: ../libnm/nm-device-team.c:138
-+#: ../libnm/nm-device-team.c:136
- msgid "The connection was not a team connection."
- msgstr "La connexion n'était pas une connexion team."
-
--#: ../libnm/nm-device-vlan.c:128
-+#: ../libnm/nm-device-tun.c:207
-+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:216
-+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:126
- msgid "The connection was not a VLAN connection."
- msgstr "La connexion n'était pas une connexion VLAN."
-
--#: ../libnm/nm-device-vlan.c:135
-+#: ../libnm/nm-device-vlan.c:133
- 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."
-
--#: ../libnm/nm-device-vlan.c:150
-+#: ../libnm/nm-device-vlan.c:148
- 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."
-
--#: ../libnm/nm-device-vxlan.c:386
-+#: ../libnm/nm-device-vxlan.c:384
- msgid "The connection was not a VXLAN connection."
- msgstr "La connexion n'était pas une connexion VXLAN."
-
--#: ../libnm/nm-device-vxlan.c:393
-+#: ../libnm/nm-device-vxlan.c:391
- 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."
-
--#: ../libnm/nm-device-wifi.c:616
-+#: ../libnm/nm-device-wifi-p2p.c:326
-+#, fuzzy
-+msgid "The connection was not a Wi-Fi P2P connection."
-+msgstr "La connexion n'était pas une connexion Wi-Fi."
-+
-+#: ../libnm/nm-device-wifi.c:613
- msgid "The connection was not a Wi-Fi connection."
- msgstr "La connexion n'était pas une connexion Wi-Fi."
-
--#: ../libnm/nm-device-wifi.c:652
-+#: ../libnm/nm-device-wifi.c:649
- 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."
-
--#: ../libnm/nm-device-wifi.c:659
-+#: ../libnm/nm-device-wifi.c:656
- 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:315
-+#: ../libnm/nm-device-wimax.c:313
- msgid "The connection was not a WiMAX connection."
- msgstr "La connexion n'était pas une connexion WiMAX."
-
--#: ../libnm/nm-device-wpan.c:82
-+#: ../libnm/nm-device-wpan.c:81
- msgid "The connection was not a wpan connection."
- msgstr "La connexion n'était pas une connexion wpan."
-
-@@ -13343,31 +13682,36 @@ msgstr "6LoWPAN"
- msgid "WireGuard"
- msgstr "WireGuard"
-
--#: ../libnm/nm-device.c:2549
-+#: ../libnm/nm-device.c:1432
-+#, fuzzy
-+msgid "Wi-Fi P2P"
-+msgstr "Wi-Fi"
-+
-+#: ../libnm/nm-device.c:2551
- #, c-format
- msgid "The connection was not valid: %s"
- msgstr "La connexion n'était pas valide : %s"
-
--#: ../libnm/nm-device.c:2558
-+#: ../libnm/nm-device.c:2560
- #, 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:274
-+#: ../libnm/nm-manager.c:272
- msgid "Checkpoint was removed before it was initialized"
- msgstr "Point de contrôle supprimé avant l'initialisation"
-
--#: ../libnm/nm-manager.c:953
-+#: ../libnm/nm-manager.c:993
- 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:256
-+#: ../libnm/nm-remote-settings.c:253
- 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:847 ../libnm/nm-vpn-service-plugin.c:1051
-+#: ../libnm/nm-vpn-plugin-old.c:846 ../libnm/nm-vpn-service-plugin.c:1049
- msgid "No service name specified"
- msgstr "Aucun nom de service spécifié"
-
-@@ -13444,61 +13788,73 @@ msgid "System policy prevents control of network connections"
- msgstr "La politique du système empêche le contrôle des connexions réseau"
-
- #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:15
-+#, fuzzy
-+msgid "Allow control of Wi-Fi scans"
-+msgstr "Autoriser le contrôle des connexions réseau"
-+
-+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:16
-+#, fuzzy
-+msgid "System policy prevents Wi-Fi scans"
-+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:17
- msgid "Connection sharing via a protected Wi-Fi network"
- msgstr "Partage de connexion via un réseau Wi-Fi protégé"
-
--#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:16
-+#: ../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é"
-
--#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:17
-+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:19
- msgid "Connection sharing via an open Wi-Fi network"
- msgstr "Partage de connexion via un réseau Wi-Fi ouvert"
-
--#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:18
-+#: ../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"
-
--#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:19
-+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:21
- msgid "Modify personal network connections"
- msgstr "Modifier les connexions du réseau personnel"
-
--#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:20
-+#: ../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"
-
--#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:21
-+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:23
- msgid "Modify network connections for all users"
- msgstr "Modifier les connexions réseau pour tous les utilisateurs"
-
--#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:22
-+#: ../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"
-
--#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:23
-+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:25
- msgid "Modify persistent system hostname"
- msgstr "Modifier le nom d'hôte persistant du système"
-
--#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:24
-+#: ../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"
-
--#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:25
-+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:27
- msgid "Modify persistent global DNS configuration"
- msgstr "Modifier la configuration DNS globale persistante"
-
--#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:26
-+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:28
- msgid ""
- "System policy prevents modification of the persistent global DNS "
- "configuration"
-@@ -13506,49 +13862,49 @@ msgstr ""
- "La politique du système empêche toute modification de la configuration DNS "
- "globale persistante"
-
--#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:27
-+#: ../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"
-
--#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:28
-+#: ../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"
-
--#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:29
-+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:31
- msgid "Enable or disable device statistics"
- msgstr "Activer ou désactiver les statistiques système du périphérique"
-
--#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:30
-+#: ../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"
-
--#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:31
-+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:33
- msgid "Enable or disable connectivity checking"
- msgstr "Activer ou désactiver le contrôle de connectivité"
-
--#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:32
-+#: ../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é"
-
--#: ../shared/nm-utils/nm-shared-utils.c:1130
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:1481
- #, 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-utils/nm-shared-utils.c:1137
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:1488
- #, 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-utils/nm-shared-utils.c:1144
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:1495
- #, c-format
- msgid ""
- "construct property \"%s\" for object '%s' can't be set after construction"
-@@ -13556,21 +13912,21 @@ msgstr ""
- "propriété de construction « %s » de l'objet « %s » ne peut pas être définie "
- "après la construction"
-
--#: ../shared/nm-utils/nm-shared-utils.c:1152
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:1503
- #, 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"
-
--#: ../shared/nm-utils/nm-shared-utils.c:1161
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:1512
- #, 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 »"
-
--#: ../shared/nm-utils/nm-shared-utils.c:1172
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:1523
- #, c-format
- msgid ""
- "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
-@@ -13583,51 +13939,51 @@ msgstr ""
- #. * as "Wired Connection" or "VPN Connection". The %d is a number
- #. * that is combined with the first argument to create a unique
- #. * connection id.
--#: ../src/NetworkManagerUtils.c:120
-+#: ../src/NetworkManagerUtils.c:122
- #, c-format
- msgctxt "connection id fallback"
- msgid "%s %u"
- msgstr "%s %u"
-
--#: ../src/main.c:180 ../src/main.c:315
-+#: ../src/main.c:177 ../src/main.c:313
- #, c-format
- msgid "Failed to read configuration: %s\n"
- msgstr "Échec de la lecture de la configuration : %s\n"
-
- #. Logging/debugging
--#: ../src/main.c:194 ../src/nm-iface-helper.c:297
-+#: ../src/main.c:191 ../src/nm-iface-helper.c:293
- msgid "Print NetworkManager version and exit"
- msgstr "Imprimer la version de NetworkManager et quitter"
-
--#: ../src/main.c:195 ../src/nm-iface-helper.c:298
-+#: ../src/main.c:192 ../src/nm-iface-helper.c:294
- msgid "Don't become a daemon"
- msgstr "Ne pas devenir un démon"
-
--#: ../src/main.c:196 ../src/nm-iface-helper.c:300
-+#: ../src/main.c:193 ../src/nm-iface-helper.c:296
- #, c-format
- msgid "Log level: one of [%s]"
- msgstr "Niveau du journal : un de [%s]"
-
--#: ../src/main.c:198 ../src/nm-iface-helper.c:302
-+#: ../src/main.c:195 ../src/nm-iface-helper.c:298
- #, 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]"
-
--#: ../src/main.c:200 ../src/nm-iface-helper.c:304
-+#: ../src/main.c:197 ../src/nm-iface-helper.c:300
- msgid "Make all warnings fatal"
- msgstr "Rendre tous les avertissements fatals"
-
--#: ../src/main.c:201
-+#: ../src/main.c:198
- msgid "Specify the location of a PID file"
- msgstr "Spécifier l'emplacement d'un fichier PID"
-
--#: ../src/main.c:203
-+#: ../src/main.c:200
- msgid "Print NetworkManager configuration and exit"
- msgstr "Imprimer la configuration de NetworkManager et quitter"
-
--#: ../src/main.c:213
-+#: ../src/main.c:210
- msgid ""
- "NetworkManager monitors all network connections and automatically\n"
- "chooses the best connection to use. It also allows the user to\n"
-@@ -13642,52 +13998,52 @@ msgstr ""
- "de\n"
- "l'ordinateur devraient s'associer."
-
--#: ../src/main.c:305 ../src/main-utils.c:286 ../src/nm-iface-helper.c:441
-+#: ../src/main.c:303 ../src/main-utils.c:290 ../src/nm-iface-helper.c:439
- #, 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:340 ../src/nm-iface-helper.c:456
-+#: ../src/main.c:336 ../src/nm-iface-helper.c:452
- #, 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:100
- #, c-format
- msgid "Opening %s failed: %s\n"
- msgstr "Échec de l'ouverture de %s : %s\n"
-
--#: ../src/main-utils.c:105
-+#: ../src/main-utils.c:107
- #, c-format
- msgid "Writing to %s failed: %s\n"
- msgstr "Échec de l'écriture sur %s : %s\n"
-
--#: ../src/main-utils.c:110
-+#: ../src/main-utils.c:113
- #, c-format
- msgid "Closing %s failed: %s\n"
- msgstr "Échec de la fermeture de %s : %s\n"
-
--#: ../src/main-utils.c:148 ../src/main-utils.c:159
-+#: ../src/main-utils.c:152 ../src/main-utils.c:163
- #, c-format
- msgid "Cannot create '%s': %s"
- msgstr "Impossible de créer « %s » : %s"
-
--#: ../src/main-utils.c:212
-+#: ../src/main-utils.c:216
- #, 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:222
-+#: ../src/main-utils.c:226
- #, 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"
-
--#: ../src/dhcp/nm-dhcp-dhclient-utils.c:291
-+#: ../src/dhcp/nm-dhcp-dhclient-utils.c:272
- msgid "# Created by NetworkManager\n"
- msgstr "# Créé par NetworkManager\n"
-
--#: ../src/dhcp/nm-dhcp-dhclient-utils.c:302
-+#: ../src/dhcp/nm-dhcp-dhclient-utils.c:283
- #, c-format
- msgid ""
- "# Merged from %s\n"
-@@ -13696,7 +14052,7 @@ msgstr ""
- "# Fusionné depuis %s\n"
- "\n"
-
--#: ../src/devices/bluetooth/nm-bluez-device.c:212
-+#: ../src/devices/bluetooth/nm-bluez-device.c:210
- #, c-format
- msgid "%s Network"
- msgstr "Réseau %s"
-@@ -13726,12 +14082,12 @@ 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:322
--#: ../src/devices/wwan/nm-modem-broadband.c:696
-+#: ../src/devices/wwan/nm-modem-broadband.c:687
- msgid "GSM connection"
- msgstr "Connexion GSM"
-
- #: ../src/devices/bluetooth/nm-device-bt.c:324
--#: ../src/devices/wwan/nm-modem-broadband.c:720
-+#: ../src/devices/wwan/nm-modem-broadband.c:711
- msgid "CDMA connection"
- msgstr "Connexion CDMA"
-
-@@ -13742,7 +14098,7 @@ msgstr "Type de connexion Bluetooth inconnu/non supporté"
- #: ../src/devices/bluetooth/nm-device-bt.c:353
- #: ../src/devices/nm-device-ethernet.c:1432
- #: ../src/devices/nm-device-infiniband.c:190
--#: ../src/devices/wifi/nm-device-wifi.c:908
-+#: ../src/devices/wifi/nm-device-wifi.c:925
- msgid "connection does not match device"
- msgstr "la connexion ne correspond pas au périphérique"
-
-@@ -13750,15 +14106,15 @@ msgstr "la connexion ne correspond pas au périphérique"
- msgid "6LOWPAN connection"
- msgstr "Connexion 6LOWPAN"
-
--#: ../src/devices/nm-device-bond.c:72
-+#: ../src/devices/nm-device-bond.c:71
- msgid "Bond connection"
- msgstr "Connexion de liaison"
-
--#: ../src/devices/nm-device-bridge.c:153
-+#: ../src/devices/nm-device-bridge.c:154
- msgid "Bridge connection"
- msgstr "Connexion de pont"
-
--#: ../src/devices/nm-device-dummy.c:68
-+#: ../src/devices/nm-device-dummy.c:67
- msgid "Dummy connection"
- msgstr "Connexion factice"
-
-@@ -13775,19 +14131,19 @@ msgstr "Connexion filaire"
- msgid "Wired connection %d"
- msgstr "Connexion filaire %d"
-
--#: ../src/devices/nm-device-ip-tunnel.c:419
-+#: ../src/devices/nm-device-ip-tunnel.c:422
- msgid "IP tunnel connection"
- msgstr "Connexion de tunnel IP"
-
--#: ../src/devices/nm-device-macvlan.c:366
-+#: ../src/devices/nm-device-macvlan.c:365
- msgid "MACVLAN connection"
- msgstr "Connexion MACVLAN"
-
--#: ../src/devices/nm-device-tun.c:158
-+#: ../src/devices/nm-device-tun.c:157
- msgid "TUN connection"
- msgstr "Connexion TUN"
-
--#: ../src/devices/nm-device-wpan.c:69
-+#: ../src/devices/nm-device-wpan.c:68
- msgid "WPAN connection"
- msgstr "Connexion WPAN"
-
-@@ -13795,165 +14151,165 @@ msgstr "Connexion WPAN"
- msgid "Team connection"
- msgstr "Connexion Team"
-
--#: ../src/devices/wifi/nm-device-olpc-mesh.c:136
-+#: ../src/devices/wifi/nm-device-olpc-mesh.c:134
- msgid "Mesh"
- msgstr "Mesh"
-
--#: ../src/devices/wifi/nm-device-wifi.c:881
-+#: ../src/devices/wifi/nm-device-wifi.c:898
- 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:43
-+#: ../src/devices/wifi/nm-wifi-utils.c:42
- #, 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:77
-+#: ../src/devices/wifi/nm-wifi-utils.c:76
- msgid "LEAP authentication requires a LEAP username"
- msgstr "L'authentification LEP requiert un nom d'utilisateur LEAP"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:87
-+#: ../src/devices/wifi/nm-wifi-utils.c:86
- msgid "LEAP username requires 'leap' authentication"
- msgstr "Le nom d'utilisateur LEAP requiert une authentification LEAP"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:100
-+#: ../src/devices/wifi/nm-wifi-utils.c:99
- 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:120
-+#: ../src/devices/wifi/nm-wifi-utils.c:119
- 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:132
-+#: ../src/devices/wifi/nm-wifi-utils.c:131
- 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:154
-+#: ../src/devices/wifi/nm-wifi-utils.c:153
- #, 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"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:165
-+#: ../src/devices/wifi/nm-wifi-utils.c:164
- #, 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"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:181
--#: ../src/devices/wifi/nm-wifi-utils.c:198
-+#: ../src/devices/wifi/nm-wifi-utils.c:180
-+#: ../src/devices/wifi/nm-wifi-utils.c:197
- #, 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"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:210
-+#: ../src/devices/wifi/nm-wifi-utils.c:209
- #, 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"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:241
-+#: ../src/devices/wifi/nm-wifi-utils.c:240
- msgid "Dynamic WEP requires an 802.1x setting"
- msgstr "WEP Dynamique requiert une configuration 802.1x"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:251
--#: ../src/devices/wifi/nm-wifi-utils.c:279
-+#: ../src/devices/wifi/nm-wifi-utils.c:250
-+#: ../src/devices/wifi/nm-wifi-utils.c:278
- msgid "Dynamic WEP requires 'open' authentication"
- msgstr "WEP Dynamique requiert une authentification « open »"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:266
-+#: ../src/devices/wifi/nm-wifi-utils.c:265
- msgid "Dynamic WEP requires 'ieee8021x' key management"
- msgstr "WEP Dynamique requiert une gestion de clés « ieee802x »"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:313
-+#: ../src/devices/wifi/nm-wifi-utils.c:312
- 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:323
-+#: ../src/devices/wifi/nm-wifi-utils.c:322
- msgid "WPA-PSK requires 'open' authentication"
- msgstr "Authentification « open » exige WPA-PSK"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:335
-+#: ../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:348
-+#: ../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:360
-+#: ../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:372
-+#: ../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:386
-+#: ../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:416
-+#: ../src/devices/wifi/nm-wifi-utils.c:415
- 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:426
-+#: ../src/devices/wifi/nm-wifi-utils.c:425
- msgid "WPA-EAP requires 'open' authentication"
- msgstr "WPA-EAP requiert une authentification « open »"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:437
-+#: ../src/devices/wifi/nm-wifi-utils.c:436
- 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:450
-+#: ../src/devices/wifi/nm-wifi-utils.c:449
- 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"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:478
-+#: ../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:488
-+#: ../src/devices/wifi/nm-wifi-utils.c:487
- 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:497
-+#: ../src/devices/wifi/nm-wifi-utils.c:496
- 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:507
-+#: ../src/devices/wifi/nm-wifi-utils.c:506
- msgid "Ad-Hoc mode requires 'open' authentication"
- msgstr "Le mode Ad-Hoc requiert une authentification « open »"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:517
-+#: ../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:558
--#: ../src/devices/wifi/nm-wifi-utils.c:586
-+#: ../src/devices/wifi/nm-wifi-utils.c:557
-+#: ../src/devices/wifi/nm-wifi-utils.c:585
- #, 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:610
-+#: ../src/devices/wifi/nm-wifi-utils.c:609
- 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é"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:699
-+#: ../src/devices/wifi/nm-wifi-utils.c:698
- msgid ""
- "WPA authentication is incompatible with non-EAP (original) LEAP or Dynamic "
- "WEP"
-@@ -13961,163 +14317,158 @@ 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:709
-+#: ../src/devices/wifi/nm-wifi-utils.c:708
- 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"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:756
-+#: ../src/devices/wifi/nm-wifi-utils.c:761
- msgid "Failed to determine AP security information"
- msgstr "N'a pas pu déterminer les informations de sécurité AP"
-
--#: ../src/devices/wwan/nm-modem-broadband.c:686
--msgid "GSM mobile broadband connection requires a 'gsm' setting"
--msgstr ""
--"La connexion de bande passante mobile GSM exige une configuration «gsm »"
--
--#: ../src/nm-config.c:563
-+#: ../src/nm-config.c:562
- #, fuzzy, c-format
- msgid "Bad '%s' option: "
- msgstr "l'option « %s » est vide"
-
--#: ../src/nm-config.c:576
-+#: ../src/nm-config.c:575
- msgid "Config file location"
- msgstr "Emplacement du fichier de configuration"
-
--#: ../src/nm-config.c:577
-+#: ../src/nm-config.c:576
- msgid "Config directory location"
- msgstr "Emplacement du répertoire de configuration"
-
--#: ../src/nm-config.c:578
-+#: ../src/nm-config.c:577
- msgid "System config directory location"
- msgstr "Emplacement du répertoire de configuration système"
-
--#: ../src/nm-config.c:579
-+#: ../src/nm-config.c:578
- msgid "Internal config file location"
- msgstr "Emplacement du fichier de configuration interne"
-
--#: ../src/nm-config.c:580
-+#: ../src/nm-config.c:579
- msgid "State file location"
- msgstr "Indiquez l'emplacement du fichier"
-
--#: ../src/nm-config.c:581
-+#: ../src/nm-config.c:580
- 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:582
-+#: ../src/nm-config.c:581
- msgid "List of plugins separated by ','"
- msgstr "Liste des greffons séparée par des virgules « , »"
-
--#: ../src/nm-config.c:583
-+#: ../src/nm-config.c:582
- msgid "Quit after initial configuration"
- msgstr "Sortie après la configuration initiale"
-
--#: ../src/nm-config.c:584 ../src/nm-iface-helper.c:299
-+#: ../src/nm-config.c:583 ../src/nm-iface-helper.c:295
- 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:587
-+#: ../src/nm-config.c:586
- msgid "An http(s) address for checking internet connectivity"
- msgstr "Adresse http(s) pour vérifier la connectivité internet"
-
--#: ../src/nm-config.c:588
-+#: ../src/nm-config.c:587
- msgid "The interval between connectivity checks (in seconds)"
- msgstr "Intervalle entre les vérifications de connectivité (en secondes)"
-
--#: ../src/nm-config.c:589
-+#: ../src/nm-config.c:588
- msgid "The expected start of the response"
- msgstr "Début prévu de la réponse"
-
--#: ../src/nm-config.c:596
-+#: ../src/nm-config.c:595
- #, fuzzy
- msgid "NetworkManager options"
- msgstr "Permissions NetworkManager"
-
--#: ../src/nm-config.c:596
-+#: ../src/nm-config.c:595
- #, fuzzy
- msgid "Show NetworkManager options"
- msgstr "Permissions NetworkManager"
-
- #. Interface/IP config
--#: ../src/nm-iface-helper.c:279
-+#: ../src/nm-iface-helper.c:275
- msgid "The interface to manage"
- msgstr "L'interface à gérer"
-
--#: ../src/nm-iface-helper.c:280
-+#: ../src/nm-iface-helper.c:276
- msgid "Connection UUID"
- msgstr "Connexion UUID"
-
--#: ../src/nm-iface-helper.c:281
-+#: ../src/nm-iface-helper.c:277
- msgid "Connection Token for Stable IDs"
- msgstr "Jeton de connexion pour les ID stables"
-
--#: ../src/nm-iface-helper.c:282
-+#: ../src/nm-iface-helper.c:278
- msgid "Whether to manage IPv6 SLAAC"
- msgstr "Indique si on doit gérer IPv6 SLAAC"
-
--#: ../src/nm-iface-helper.c:283
-+#: ../src/nm-iface-helper.c:279
- msgid "Whether SLAAC must be successful"
- msgstr "Indique si SLAAC doit avoir réussi"
-
--#: ../src/nm-iface-helper.c:284
-+#: ../src/nm-iface-helper.c:280
- msgid "Use an IPv6 temporary privacy address"
- msgstr "Utiliser une adresse privée temporaire d'IPv6"
-
--#: ../src/nm-iface-helper.c:285
-+#: ../src/nm-iface-helper.c:281
- msgid "Current DHCPv4 address"
- msgstr "Adresse DHCPv4 actuelle"
-
--#: ../src/nm-iface-helper.c:286
-+#: ../src/nm-iface-helper.c:282
- msgid "Whether DHCPv4 must be successful"
- msgstr "Indique si DHCPv4 doit avoir réussi"
-
--#: ../src/nm-iface-helper.c:287
-+#: ../src/nm-iface-helper.c:283
- msgid "Hex-encoded DHCPv4 client ID"
- msgstr "Identifiant de client DHCPv4 encodé en hexadécimal"
-
--#: ../src/nm-iface-helper.c:288
-+#: ../src/nm-iface-helper.c:284
- msgid "Hostname to send to DHCP server"
- msgstr "Nom d'hôte à envoyer au serveur DHCP"
-
--#: ../src/nm-iface-helper.c:288
-+#: ../src/nm-iface-helper.c:284
- msgid "barbar"
- msgstr "barbar"
-
--#: ../src/nm-iface-helper.c:289
-+#: ../src/nm-iface-helper.c:285
- msgid "FQDN to send to DHCP server"
- msgstr "FQDN à envoyer au serveur DHCP"
-
--#: ../src/nm-iface-helper.c:289
-+#: ../src/nm-iface-helper.c:285
- msgid "host.domain.org"
- msgstr "host.domain.org"
-
--#: ../src/nm-iface-helper.c:290
-+#: ../src/nm-iface-helper.c:286
- msgid "Route priority for IPv4"
- msgstr "Priorité de route pour IPv4"
-
--#: ../src/nm-iface-helper.c:290
-+#: ../src/nm-iface-helper.c:286
- msgid "0"
- msgstr "0"
-
--#: ../src/nm-iface-helper.c:291
-+#: ../src/nm-iface-helper.c:287
- msgid "Route priority for IPv6"
- msgstr "Priorité de route pour IPv6"
-
--#: ../src/nm-iface-helper.c:291
-+#: ../src/nm-iface-helper.c:287
- msgid "1024"
- msgstr "1024"
-
--#: ../src/nm-iface-helper.c:292
-+#: ../src/nm-iface-helper.c:288
- msgid "Hex-encoded Interface Identifier"
- msgstr "Identifiant d'interface encodé en hexadécimal"
-
--#: ../src/nm-iface-helper.c:293
-+#: ../src/nm-iface-helper.c:289
- msgid "IPv6 SLAAC address generation mode"
- msgstr "Mode de génération d'adresses IPv6 SLAAC"
-
--#: ../src/nm-iface-helper.c:294
-+#: ../src/nm-iface-helper.c:290
- msgid ""
- "The logging backend configuration value. See logging.backend in "
- "NetworkManager.conf"
-@@ -14125,7 +14476,7 @@ msgstr ""
- "La valeur de configuration du backend de journalisation. Voir logging."
- "backend dans NetworkManager.conf"
-
--#: ../src/nm-iface-helper.c:314
-+#: ../src/nm-iface-helper.c:310
- msgid ""
- "nm-iface-helper is a small, standalone process that manages a single network "
- "interface."
-@@ -14133,43 +14484,186 @@ msgstr ""
- "nm-iface-helper est un petit processus autonome qui gère une interface de "
- "réseau unique."
-
--#: ../src/nm-iface-helper.c:422
-+#: ../src/nm-iface-helper.c:419
- #, c-format
- msgid "An interface name and UUID are required\n"
- msgstr "UUID et Nom d'interface obligatoires\n"
-
--#: ../src/nm-iface-helper.c:428
-+#: ../src/nm-iface-helper.c:426
- #, 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:446
-+#: ../src/nm-iface-helper.c:444
- #, 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"
-
--#: ../src/nm-iface-helper.c:485
-+#: ../src/nm-iface-helper.c:481
- #, c-format
- msgid "(%s): Invalid IID %s\n"
- msgstr "(%s): IID non valide %s\n"
-
--#: ../src/nm-iface-helper.c:496
-+#: ../src/nm-iface-helper.c:492
- #, fuzzy, c-format
- msgid "(%s): Invalid DHCP client-id %s\n"
- msgstr "(%s) : id-client DHCP non valide\n"
-
--#: ../src/nm-logging.c:275
-+#: ../src/nm-logging.c:290
- #, c-format
- msgid "Unknown log level '%s'"
- msgstr "Niveau de journalisation « %s » inconnu"
-
--#: ../src/nm-logging.c:377
-+#: ../src/nm-logging.c:400
- #, c-format
- msgid "Unknown log domain '%s'"
- msgstr "Domaine de journalisation « %s » inconnu"
-
-+#~ msgid "Error: failed to remove a value from %s.%s: %s."
-+#~ msgstr "Erreur : échec lors de la suppression d'une valeur de %s.%s : %s."
-+
-+#~ msgid "WEP"
-+#~ msgstr "WEP"
-+
-+#~ msgid "WPA1"
-+#~ msgstr "WPA1"
-+
-+#~ msgid "WPA2"
-+#~ msgstr "WPA2"
-+
-+#~ msgid "802.1X"
-+#~ msgstr "802.1X"
-+
-+#~ msgid "default route cannot be added (NetworkManager handles it by itself)"
-+#~ msgstr ""
-+#~ "la route par défaut ne peut être ajoutée (NetworkManager la gère lui-même)"
-+
-+#~ msgid "priority '%s' is not valid (<0-%ld>)"
-+#~ msgstr "priorité « %s » n'est pas valide (<0-%ld>)"
-+
-+#~ msgid "no item to remove"
-+#~ msgstr "aucun élément à supprimer"
-+
-+#~ msgid "index '%d' is not in range <0-%d>"
-+#~ msgstr "index « %d » n'est pas dans la plage <0-%d>"
-+
-+#~ msgid "missing option"
-+#~ msgstr "option manquante"
-+
-+#~ msgid "'%s' is not a valid MAC"
-+#~ msgstr "« %s » n'est pas une adresse MAC valide"
-+
-+#~ msgid "the property doesn't contain EAP method '%s'"
-+#~ msgstr "la propriété ne contient pas de méthode EAP « %s »"
-+
-+#~ msgid "the property doesn't contain alternative subject match '%s'"
-+#~ msgstr ""
-+#~ "la propriété ne contient pas de sujet alternatif correspondant « %s »"
-+
-+#~ msgid ""
-+#~ "the property doesn't contain \"phase2\" alternative subject match '%s'"
-+#~ msgstr ""
-+#~ "la propriété ne contient pas de sujet alternatif « phase 2 » "
-+#~ "correspondant « %s »"
-+
-+#~ msgid "the property doesn't contain permission '%s'"
-+#~ msgstr "la propriété ne contient pas de permission « %s »"
-+
-+#~ msgid "the property doesn't contain UUID '%s'"
-+#~ msgstr "la propriété ne contient pas d'UUID « %s »"
-+
-+#~ msgid "the property doesn't contain DNS server '%s'"
-+#~ msgstr "la propriété ne contient pas de serveur DNS « %s »"
-+
-+#~ msgid "the property doesn't contain DNS search domain '%s'"
-+#~ msgstr "la propriété ne contient pas de domaine de recherche DNS « %s »"
-+
-+#~ msgid "the property doesn't contain DNS option '%s'"
-+#~ msgstr "la propriété ne contient pas d'option DNS « %s »"
-+
-+#~ msgid "the property doesn't contain IP address '%s'"
-+#~ msgstr "la propriété ne contient pas d'adresse IP « %s »"
-+
-+#~ msgid "the property doesn't contain route '%s'"
-+#~ msgstr "la propriété ne contient pas la route « %s »"
-+
-+#~ msgid "invalid IPv6 address '%s'"
-+#~ msgstr "adresse IPv6 « %s » non valide"
-+
-+#~ msgid "the property doesn't contain interface name '%s'"
-+#~ msgstr "la propriété ne contient pas le nom de l'interface « %s »"
-+
-+#~ msgid "the property doesn't contain vf with index %u"
-+#~ msgstr "la propriété ne contient pas vf avec l’index %u"
-+
-+#~ msgid "the property doesn't contain qdisc '%s'"
-+#~ msgstr "la propriété ne contient pas de qdisc « %s »"
-+
-+#~ msgid ""
-+#~ "The valid syntax is: '[root | parent <handle>] [handle <handle>] "
-+#~ "<tfilter>'"
-+#~ msgstr ""
-+#~ "La syntaxe valide est : '[root | parent <handle>][handle <handle>] "
-+#~ "<tfilter>'"
-+
-+#~ msgid "the property doesn't contain tfilter '%s'"
-+#~ msgstr "la propriété ne contient pas de tfilter « %s »"
-+
-+#~ msgid "the property doesn't contain string '%s'"
-+#~ msgstr "la propriété ne contient pas la chaîne « %s »"
-+
-+#~ msgid "the property doesn't contain link watcher '%s'"
-+#~ msgstr "la propriété ne contient pas le lien observateur « %s »"
-+
-+#~ msgid "only one mapping at a time is supported; taking the first one (%s)"
-+#~ msgstr ""
-+#~ "un seul mappage à la fois est pris en charge ; le premier est retenu (%s)"
-+
-+#~ msgid "the property doesn't contain mapping '%s'"
-+#~ msgstr "la propriété ne contient pas le mappage « %s »"
-+
-+#~ msgid "no priority to remove"
-+#~ msgstr "aucune priorité à supprimer"
-+
-+#~ msgid "index '%d' is not in the range of <0-%d>"
-+#~ msgstr "L’index « %d » n'est pas dans la plage <0-%d>"
-+
-+#~ msgid "'%s' cannot be empty"
-+#~ msgstr "« %s » ne peut pas rester vide"
-+
-+#~ msgid "the property doesn't contain MAC address '%s'"
-+#~ msgstr "la propriété ne contient pas d'adresse MAC « %s »"
-+
-+#~ msgid "'%s' string value should consist of 1 - 199 characters"
-+#~ msgstr "« %s » doit consister à un nombre de 1 - 199 caractères"
-+
-+#~ msgid "the property doesn't contain protocol '%s'"
-+#~ msgstr "la propriété ne contient pas le protocole « %s »"
-+
-+#~ msgid "'%s' is not a valid PSK"
-+#~ msgstr "« %s » n'est pas un PSK valide"
-+
-+#~ msgid ""
-+#~ "Pre-Shared-Key for WPA networks. If the key is 64-characters long, it "
-+#~ "must contain only hexadecimal characters and is interpreted as a "
-+#~ "hexadecimal WPA key. Otherwise, the key must be between 8 and 63 ASCII "
-+#~ "characters (as specified in the 802.11i standard) and is interpreted as a "
-+#~ "WPA passphrase, and is hashed to derive the actual WPA-PSK used when "
-+#~ "connecting to the Wi-Fi network."
-+#~ msgstr ""
-+#~ "Clé pré-partagée pour les réseaux WPA. Si la clé est longue de 64 "
-+#~ "caractères, elle ne doit contenir que des caractères hexadécimaux et est "
-+#~ "interprétée comme une clé WPA hexadécimale. Sinon, la clé doit comporter "
-+#~ "entre 8 et 63 caractères ASCII (comme spécifié dans la norme 802.11i) et "
-+#~ "est interprétée comme une phrase de passe WPA, et est hachée pour obtenir "
-+#~ "le WPA-PSK réel utilisé pour la connexion au réseau Wi-Fi."
-+
-+#~ msgid "GSM mobile broadband connection requires a 'gsm' setting"
-+#~ msgstr ""
-+#~ "La connexion de bande passante mobile GSM exige une configuration «gsm »"
-+
- #~ msgid "Error: Failed to setup a Wi-Fi hotspot"
- #~ msgstr "Erreur : échec lors de l'installation du Wi-Fi Hotspot"
-
-diff --git a/po/ja.po b/po/ja.po
-index 6c72e12b29..b2ca86093b 100644
---- a/po/ja.po
-+++ b/po/ja.po
-@@ -14,7 +14,7 @@ msgid ""
- msgstr ""
- "Project-Id-Version: PACKAGE VERSION\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2019-01-08 18:22+0100\n"
-+"POT-Creation-Date: 2019-05-21 09:59+0200\n"
- "PO-Revision-Date: 2018-08-16 01:39+0000\n"
- "Last-Translator: kemorigu <kemorigu@redhat.com>\n"
- "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
-@@ -25,7 +25,7 @@ msgstr ""
- "Plural-Forms: Plural-Forms: nplurals=1; plural=0;\n"
- "X-Generator: Zanata 4.6.2\n"
-
--#: ../clients/cli/agent.c:40
-+#: ../clients/cli/agent.c:39
- #, c-format
- msgid ""
- "Usage: nmcli agent { COMMAND | help }\n"
-@@ -39,7 +39,7 @@ msgstr ""
- "\n"
- "\n"
-
--#: ../clients/cli/agent.c:48
-+#: ../clients/cli/agent.c:47
- #, c-format
- msgid ""
- "Usage: nmcli agent secret { help }\n"
-@@ -58,7 +58,7 @@ msgstr ""
- "場合はパスワード入力が求められます。\n"
- "\n"
-
--#: ../clients/cli/agent.c:58
-+#: ../clients/cli/agent.c:57
- #, c-format
- msgid ""
- "Usage: nmcli agent polkit { help }\n"
-@@ -76,7 +76,7 @@ msgstr ""
- "を polkit に返します。\n"
- "\n"
-
--#: ../clients/cli/agent.c:68
-+#: ../clients/cli/agent.c:67
- #, c-format
- msgid ""
- "Usage: nmcli agent all { help }\n"
-@@ -90,50 +90,50 @@ msgstr ""
- "す。\n"
- "\n"
-
--#: ../clients/cli/agent.c:157
-+#: ../clients/cli/agent.c:159
- #, c-format
- msgid "nmcli successfully registered as a NetworkManager's secret agent.\n"
- msgstr ""
- "nmcli は NetworkManager のシークレットエージェントとして適切に登録されまし"
- "た。\n"
-
--#: ../clients/cli/agent.c:159
-+#: ../clients/cli/agent.c:161
- #, c-format
- msgid "Error: secret agent initialization failed"
- msgstr "エラー: シークレットエージェントの初期化に失敗しました"
-
--#: ../clients/cli/agent.c:178
-+#: ../clients/cli/agent.c:180
- #, c-format
- msgid "Error: polkit agent initialization failed: %s"
- msgstr "エラー: polkit エージェントの初期化に失敗しました: %s"
-
--#: ../clients/cli/agent.c:186
-+#: ../clients/cli/agent.c:188
- #, c-format
- msgid "nmcli successfully registered as a polkit agent.\n"
- msgstr "nmcli が polkit エージェントとして適切に登録されました。\n"
-
--#: ../clients/cli/common.c:361 ../clients/cli/common.c:362
--#: ../clients/cli/common.c:393 ../clients/cli/common.c:394
--#: ../clients/cli/connections.c:1454
-+#: ../clients/cli/common.c:360 ../clients/cli/common.c:361
-+#: ../clients/cli/common.c:392 ../clients/cli/common.c:393
-+#: ../clients/cli/connections.c:1460
- msgid "GROUP"
- msgstr "グループ"
-
--#: ../clients/cli/common.c:621
-+#: ../clients/cli/common.c:620
- #, c-format
- msgid "Error: openconnect failed: %s\n"
- msgstr "エラー: openconnect が失敗しました: %s\n"
-
--#: ../clients/cli/common.c:628
-+#: ../clients/cli/common.c:627
- #, c-format
- msgid "Error: openconnect failed with status %d\n"
- msgstr "エラー: openconnect がステータス %d で失敗しました\n"
-
--#: ../clients/cli/common.c:630
-+#: ../clients/cli/common.c:629
- #, c-format
- msgid "Error: openconnect failed with signal %d\n"
- msgstr "エラー: openconnect がシグナル %d で失敗しました\n"
-
--#: ../clients/cli/common.c:711
-+#: ../clients/cli/common.c:717
- #, c-format
- msgid ""
- "Warning: password for '%s' not given in 'passwd-file' and nmcli cannot ask "
-@@ -142,134 +142,134 @@ msgstr ""
- "警告: '%s' のパスワードが 'passwd-file' で提供されていません。nmcli は '--"
- "ask' オプションがないと尋ねることができません。\n"
-
--#: ../clients/cli/common.c:1211
-+#: ../clients/cli/common.c:1217
- #, c-format
- msgid "Error: Could not create NMClient object: %s."
- msgstr "エラー: NMClient オブジェクトを作成できませんでした: %s。"
-
--#: ../clients/cli/common.c:1231
-+#: ../clients/cli/common.c:1237
- msgid "Error: NetworkManager is not running."
- msgstr "エラー: NetworkManager が起動していません。"
-
--#: ../clients/cli/common.c:1327
-+#: ../clients/cli/common.c:1333
- #, c-format
- msgid "Error: argument '%s' not understood. Try passing --help instead."
- msgstr "エラー: 引数 '%s' が認識されません。代わりに --help を渡してください。"
-
--#: ../clients/cli/common.c:1337
-+#: ../clients/cli/common.c:1343
- msgid "Error: missing argument. Try passing --help."
- msgstr "エラー: 引数がありません。--help を渡してください。"
-
--#: ../clients/cli/common.c:1390
-+#: ../clients/cli/common.c:1412
- msgid "access denied"
- msgstr "アクセスは拒否されました"
-
--#: ../clients/cli/common.c:1398 ../clients/cli/connections.c:81
--#: ../clients/cli/connections.c:90 ../clients/cli/devices.c:444
--#: ../clients/cli/devices.c:536 ../clients/cli/devices.c:543
--#: ../clients/cli/general.c:41 ../clients/cli/general.c:129
--#: ../clients/cli/general.c:134 ../clients/common/nm-client-utils.c:260
--#: ../clients/common/nm-client-utils.c:273
-+#: ../clients/cli/common.c:1420 ../clients/cli/connections.c:79
-+#: ../clients/cli/connections.c:88 ../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:282
--#: ../clients/common/nm-meta-setting-desc.c:1567
--#: ../clients/common/nm-meta-setting-desc.c:1617
--#: ../clients/common/nm-meta-setting-desc.c:2757
--#: ../clients/common/nm-meta-setting-desc.c:2812
-+#: ../clients/common/nm-client-utils.c:281
-+#: ../clients/common/nm-client-utils.c:286
-+#: ../clients/common/nm-meta-setting-desc.c:1766
-+#: ../clients/common/nm-meta-setting-desc.c:1797
-+#: ../clients/common/nm-meta-setting-desc.c:2708
-+#: ../clients/common/nm-meta-setting-desc.c:2766
- msgid "unknown"
- msgstr "不明"
-
--#: ../clients/cli/common.c:1399
-+#: ../clients/cli/common.c:1421
- msgid "none"
- msgstr "なし"
-
--#: ../clients/cli/common.c:1400
-+#: ../clients/cli/common.c:1422
- msgid "portal"
- msgstr "ポータル"
-
--#: ../clients/cli/common.c:1401
-+#: ../clients/cli/common.c:1423
- msgid "limited"
- msgstr "制限付き"
-
--#: ../clients/cli/common.c:1402
-+#: ../clients/cli/common.c:1424
- msgid "full"
- msgstr "完全"
-
- #. define some prompts for connection editor
--#: ../clients/cli/connections.c:65
-+#: ../clients/cli/connections.c:63
- msgid "Setting name? "
- msgstr "設定名は? "
-
--#: ../clients/cli/connections.c:66
-+#: ../clients/cli/connections.c:64
- msgid "Property name? "
- msgstr "プロパティー名は? "
-
--#: ../clients/cli/connections.c:67
-+#: ../clients/cli/connections.c:65
- msgid "Enter connection type: "
- msgstr "接続タイプを入力してください: "
-
- #. define some other prompts
--#: ../clients/cli/connections.c:71
-+#: ../clients/cli/connections.c:69
- msgid "Connection (name, UUID, or path): "
- msgstr "接続 (名前、UUID またはパス): "
-
--#: ../clients/cli/connections.c:72
-+#: ../clients/cli/connections.c:70
- msgid "VPN connection (name, UUID, or path): "
- msgstr "VPN 接続 (名前、UUID またはパス): "
-
--#: ../clients/cli/connections.c:73
-+#: ../clients/cli/connections.c:71
- msgid "Connection(s) (name, UUID, or path): "
- msgstr "接続 (名前、UUID またはパス): "
-
--#: ../clients/cli/connections.c:74
-+#: ../clients/cli/connections.c:72
- msgid "Connection(s) (name, UUID, path or apath): "
- msgstr "接続 (名前、UUID、パス または apath): "
-
--#: ../clients/cli/connections.c:82
-+#: ../clients/cli/connections.c:80
- msgid "activating"
- msgstr "アクティベート中"
-
--#: ../clients/cli/connections.c:83
-+#: ../clients/cli/connections.c:81
- msgid "activated"
- msgstr "アクティベート済み"
-
--#: ../clients/cli/connections.c:84 ../clients/common/nm-client-utils.c:271
-+#: ../clients/cli/connections.c:82 ../clients/common/nm-client-utils.c:275
- msgid "deactivating"
- msgstr "停止中"
-
--#: ../clients/cli/connections.c:85
-+#: ../clients/cli/connections.c:83
- msgid "deactivated"
- msgstr "停止しました"
-
--#: ../clients/cli/connections.c:91
-+#: ../clients/cli/connections.c:89
- msgid "VPN connecting (prepare)"
- msgstr "VPN 接続（準備）"
-
--#: ../clients/cli/connections.c:92
-+#: ../clients/cli/connections.c:90
- msgid "VPN connecting (need authentication)"
- msgstr "VPN 接続（認証が必要）"
-
--#: ../clients/cli/connections.c:93
-+#: ../clients/cli/connections.c:91
- msgid "VPN connecting"
- msgstr "VPN 接続"
-
--#: ../clients/cli/connections.c:94
-+#: ../clients/cli/connections.c:92
- msgid "VPN connecting (getting IP configuration)"
- msgstr "VPN 接続（IP 設定を取得）"
-
--#: ../clients/cli/connections.c:95
-+#: ../clients/cli/connections.c:93
- msgid "VPN connected"
- msgstr "VPN 接続済み"
-
--#: ../clients/cli/connections.c:96
-+#: ../clients/cli/connections.c:94
- msgid "VPN connection failed"
- msgstr "VPN 接続失敗"
-
--#: ../clients/cli/connections.c:97
-+#: ../clients/cli/connections.c:95
- msgid "VPN disconnected"
- msgstr "VPN 切断済み"
-
--#: ../clients/cli/connections.c:518
-+#: ../clients/cli/connections.c:516
- msgid "never"
- msgstr "しない"
-
-@@ -995,343 +995,338 @@ msgstr ""
- msgid "Error updating secrets for %s: %s\n"
- msgstr "%s のシークレットの更新中にエラーが発生しました: %s\n"
-
--#: ../clients/cli/connections.c:1307
-+#: ../clients/cli/connections.c:1313
- msgid "Connection profile details"
- msgstr "接続プロファイルの詳細"
-
--#: ../clients/cli/connections.c:1320 ../clients/cli/connections.c:1405
-+#: ../clients/cli/connections.c:1326 ../clients/cli/connections.c:1411
- #, c-format
- msgid "Error: 'connection show': %s"
- msgstr "エラー: 'connection show': %s"
-
--#: ../clients/cli/connections.c:1395
-+#: ../clients/cli/connections.c:1401
- msgid "Activate connection details"
- msgstr "アクティブな接続の詳細"
-
--#: ../clients/cli/connections.c:1503 ../clients/cli/devices.c:1453
--#: ../clients/cli/devices.c:1467 ../clients/cli/devices.c:1482
--#: ../clients/cli/devices.c:1540 ../clients/cli/devices.c:1642
-+#: ../clients/cli/connections.c:1509 ../clients/cli/devices.c:1447
-+#: ../clients/cli/devices.c:1461 ../clients/cli/devices.c:1476
-+#: ../clients/cli/devices.c:1534 ../clients/cli/devices.c:1636
- msgid "NAME"
- msgstr "名前"
-
--#: ../clients/cli/connections.c:1591
-+#: ../clients/cli/connections.c:1602
- #, c-format
- msgid "invalid field '%s'; allowed fields: %s and %s, or %s,%s"
- msgstr ""
- "無効なフィールド '%s'; 使用できるフィールド: %s および %s、または %s、%s"
-
--#: ../clients/cli/connections.c:1606 ../clients/cli/connections.c:1614
-+#: ../clients/cli/connections.c:1612 ../clients/cli/connections.c:1620
- #, c-format
- msgid "'%s' has to be alone"
- msgstr "'%s' は孤立させる必要があります"
-
--#: ../clients/cli/connections.c:1876
-+#: ../clients/cli/connections.c:1880
- #, c-format
- msgid "incorrect string '%s' of '--order' option"
- msgstr "'--order' オプションの正しくない文字列 '%s'"
-
--#: ../clients/cli/connections.c:1901
-+#: ../clients/cli/connections.c:1905
- #, c-format
- msgid "incorrect item '%s' in '--order' option"
- msgstr "'--order' オプションの正しくないアイテム '%s'"
-
--#: ../clients/cli/connections.c:1939
-+#: ../clients/cli/connections.c:1943
- msgid "No connection specified"
- msgstr "接続が指定されていません。"
-
--#: ../clients/cli/connections.c:1950
-+#: ../clients/cli/connections.c:1954
- #, c-format
- msgid "%s argument is missing"
- msgstr "%s 引数がありません。"
-
--#: ../clients/cli/connections.c:1968
-+#: ../clients/cli/connections.c:1972
- #, c-format
- msgid "unknown connection '%s'"
- msgstr "不明な接続 '%s'"
-
--#: ../clients/cli/connections.c:1997
-+#: ../clients/cli/connections.c:2001
- msgid "'--order' argument is missing"
- msgstr "'--order' 引数がありません"
-
--#: ../clients/cli/connections.c:2057
-+#: ../clients/cli/connections.c:2061
- msgid "NetworkManager active profiles"
- msgstr "NetworkManager のアクティブなプロファイル"
-
--#: ../clients/cli/connections.c:2058
-+#: ../clients/cli/connections.c:2062
- msgid "NetworkManager connection profiles"
- msgstr "NetworkManager 接続プロファイル"
-
--#: ../clients/cli/connections.c:2110 ../clients/cli/connections.c:2856
--#: ../clients/cli/connections.c:2868 ../clients/cli/connections.c:2880
--#: ../clients/cli/connections.c:3109 ../clients/cli/connections.c:8899
--#: ../clients/cli/connections.c:8915 ../clients/cli/devices.c:2976
--#: ../clients/cli/devices.c:2988 ../clients/cli/devices.c:3001
--#: ../clients/cli/devices.c:3195 ../clients/cli/devices.c:3206
--#: ../clients/cli/devices.c:3224 ../clients/cli/devices.c:3233
--#: ../clients/cli/devices.c:3254 ../clients/cli/devices.c:3265
--#: ../clients/cli/devices.c:3283 ../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:3952
--#: ../clients/cli/devices.c:3963 ../clients/cli/devices.c:4134
-+#: ../clients/cli/connections.c:2114 ../clients/cli/connections.c:2859
-+#: ../clients/cli/connections.c:2871 ../clients/cli/connections.c:2883
-+#: ../clients/cli/connections.c:3112 ../clients/cli/connections.c:8866
-+#: ../clients/cli/connections.c:8887 ../clients/cli/devices.c:2970
-+#: ../clients/cli/devices.c:2982 ../clients/cli/devices.c:2995
-+#: ../clients/cli/devices.c:3189 ../clients/cli/devices.c:3200
-+#: ../clients/cli/devices.c:3218 ../clients/cli/devices.c:3227
-+#: ../clients/cli/devices.c:3248 ../clients/cli/devices.c:3259
-+#: ../clients/cli/devices.c:3277 ../clients/cli/devices.c:3721
-+#: ../clients/cli/devices.c:3731 ../clients/cli/devices.c:3739
-+#: ../clients/cli/devices.c:3751 ../clients/cli/devices.c:3766
-+#: ../clients/cli/devices.c:3774 ../clients/cli/devices.c:3949
-+#: ../clients/cli/devices.c:3960 ../clients/cli/devices.c:4131
- #, c-format
- msgid "Error: %s argument is missing."
- msgstr "エラー: %s 引数がありません。"
-
--#: ../clients/cli/connections.c:2138
-+#: ../clients/cli/connections.c:2142
- #, c-format
- msgid "Error: %s - no such connection profile."
- msgstr "エラー: %s - そのような接続プロファイルはありません。"
-
--#: ../clients/cli/connections.c:2229 ../clients/cli/connections.c:2843
--#: ../clients/cli/connections.c:2907 ../clients/cli/connections.c:8419
--#: ../clients/cli/connections.c:8525 ../clients/cli/connections.c:9015
--#: ../clients/cli/devices.c:1727 ../clients/cli/devices.c:1995
--#: ../clients/cli/devices.c:2168 ../clients/cli/devices.c:2276
--#: ../clients/cli/devices.c:2468 ../clients/cli/devices.c:3915
--#: ../clients/cli/devices.c:4140 ../clients/cli/general.c:895
-+#: ../clients/cli/connections.c:2233 ../clients/cli/connections.c:2846
-+#: ../clients/cli/connections.c:2910 ../clients/cli/connections.c:8383
-+#: ../clients/cli/connections.c:8489 ../clients/cli/connections.c:8992
-+#: ../clients/cli/devices.c:1721 ../clients/cli/devices.c:1989
-+#: ../clients/cli/devices.c:2162 ../clients/cli/devices.c:2270
-+#: ../clients/cli/devices.c:2462 ../clients/cli/devices.c:3912
-+#: ../clients/cli/devices.c:4137 ../clients/cli/general.c:896
- #, c-format
- msgid "Error: %s."
- msgstr "エラー: %s."
-
--#: ../clients/cli/connections.c:2322
-+#: ../clients/cli/connections.c:2326
- #, c-format
- msgid "no active connection on device '%s'"
- msgstr "デバイス '%s' 上にアクティブな接続はありません"
-
--#: ../clients/cli/connections.c:2330
-+#: ../clients/cli/connections.c:2334
- msgid "no active connection or device"
- msgstr "アクティブな接続またはデバイスがありません"
-
--#: ../clients/cli/connections.c:2350
-+#: ../clients/cli/connections.c:2354
- #, fuzzy, c-format
- msgid "device '%s' not compatible with connection '%s': "
- msgstr "デバイス '%s' は接続 '%s' と互換性がありません:"
-
--#: ../clients/cli/connections.c:2383
-+#: ../clients/cli/connections.c:2387
- #, c-format
- msgid "device '%s' not compatible with connection '%s'"
- msgstr "デバイス '%s' は接続 '%s' と互換性がありません"
-
--#: ../clients/cli/connections.c:2386
-+#: ../clients/cli/connections.c:2390
- #, c-format
- msgid "no device found for connection '%s'"
- msgstr "接続 '%s'用のデバイスが見つかりません"
-
--#: ../clients/cli/connections.c:2437
-+#: ../clients/cli/connections.c:2441
- #, c-format
- msgid "Hint: use '%s' to get more details."
- msgstr ""
-
--#: ../clients/cli/connections.c:2455
-+#: ../clients/cli/connections.c:2459
- #, c-format
- msgid "Connection successfully activated (%s) (D-Bus active path: %s)\n"
- msgstr "接続が正常にアクティベートされました (%s) (D-Bus アクティブパス: %s)\n"
-
--#: ../clients/cli/connections.c:2459 ../clients/cli/connections.c:2609
--#: ../clients/cli/connections.c:6716
-+#: ../clients/cli/connections.c:2463 ../clients/cli/connections.c:2613
-+#: ../clients/cli/connections.c:6701
- #, c-format
- msgid "Connection successfully activated (D-Bus active path: %s)\n"
- msgstr "接続が正常にアクティベートされました (D-Bus アクティブパス: %s)\n"
-
--#: ../clients/cli/connections.c:2466 ../clients/cli/connections.c:2588
-+#: ../clients/cli/connections.c:2470 ../clients/cli/connections.c:2592
- #, c-format
- msgid "Error: Connection activation failed: %s"
- msgstr "エラー: 接続のアクティベーションに失敗: %s"
-
--#: ../clients/cli/connections.c:2503
-+#: ../clients/cli/connections.c:2507
- #, c-format
- msgid "Error: Timeout expired (%d seconds)"
- msgstr "エラー: タイムアウト (%d 秒) になりました"
-
--#: ../clients/cli/connections.c:2671
-+#: ../clients/cli/connections.c:2675
- #, c-format
- msgid "failed to read passwd-file '%s': %s"
- msgstr "passwd-file '%s'の読み込みに失敗: %s"
-
--#: ../clients/cli/connections.c:2684
-+#: ../clients/cli/connections.c:2688
- #, c-format
- msgid "missing colon in 'password' entry '%s'"
- msgstr "'password' エントリー '%s' にコロンがありません"
-
--#: ../clients/cli/connections.c:2692
-+#: ../clients/cli/connections.c:2696
- #, c-format
- msgid "missing dot in 'password' entry '%s'"
- msgstr "'password' エントリー '%s' にドットがありません"
-
--#: ../clients/cli/connections.c:2705
-+#: ../clients/cli/connections.c:2709
- #, c-format
- msgid "invalid setting name in 'password' entry '%s'"
- msgstr "'password' エントリー '%s' の設定名が無効です"
-
--#: ../clients/cli/connections.c:2759
-+#: ../clients/cli/connections.c:2763
- #, c-format
- msgid "unknown device '%s'."
- msgstr "不明なデバイス '%s' です。"
-
--#: ../clients/cli/connections.c:2764
-+#: ../clients/cli/connections.c:2768
- msgid "neither a valid connection nor device given"
- msgstr "有効な接続、デバイスいずれも指定されていません"
-
--#: ../clients/cli/connections.c:2890 ../clients/cli/devices.c:1686
--#: ../clients/cli/devices.c:3033 ../clients/cli/devices.c:3296
--#: ../clients/cli/devices.c:3969
-+#: ../clients/cli/connections.c:2893 ../clients/cli/devices.c:1680
-+#: ../clients/cli/devices.c:3027 ../clients/cli/devices.c:3290
-+#: ../clients/cli/devices.c:3966
- #, c-format
- msgid "Unknown parameter: %s\n"
- msgstr "不明なパラメーター: %s\n"
-
--#: ../clients/cli/connections.c:2915
-+#: ../clients/cli/connections.c:2918
- msgid "preparing"
- msgstr "準備中"
-
--#: ../clients/cli/connections.c:3024
-+#: ../clients/cli/connections.c:3027
- #, c-format
- msgid "Connection '%s' (%s) successfully deleted.\n"
- msgstr "接続 '%s' (%s) が正常に削除されました。\n"
-
--#: ../clients/cli/connections.c:3040
-+#: ../clients/cli/connections.c:3043
- #, c-format
- msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n"
- msgstr ""
- "接続 '%s' が正常に非アクティブ化されました (D-Bus アクティブパス: %s)\n"
-
--#: ../clients/cli/connections.c:3091 ../clients/cli/connections.c:8633
--#: ../clients/cli/connections.c:8664 ../clients/cli/connections.c:8822
-+#: ../clients/cli/connections.c:3094 ../clients/cli/connections.c:8597
-+#: ../clients/cli/connections.c:8628 ../clients/cli/connections.c:8786
- #, c-format
- msgid "Error: No connection specified."
- msgstr "エラー: 接続が指定されていません。"
-
--#: ../clients/cli/connections.c:3121
-+#: ../clients/cli/connections.c:3124
- #, c-format
- msgid "Error: '%s' is not an active connection.\n"
- msgstr "エラー: '%s' はアクティブな接続ではありません。\n"
-
--#: ../clients/cli/connections.c:3122
-+#: ../clients/cli/connections.c:3125
- #, c-format
- msgid "Error: not all active connections found."
- msgstr "エラー: アクティブな一部の接続が見つかりません。"
-
--#: ../clients/cli/connections.c:3130
-+#: ../clients/cli/connections.c:3133
- #, c-format
- msgid "Error: no active connection provided."
- msgstr "エラー: アクティブな接続がありません。"
-
--#: ../clients/cli/connections.c:3161
-+#: ../clients/cli/connections.c:3164
- #, c-format
- msgid "Connection '%s' deactivation failed: %s\n"
- msgstr "接続 '%s' の非アクティブ化に失敗しました: %s\n"
-
--#: ../clients/cli/connections.c:3412 ../clients/cli/connections.c:3469
--#: ../clients/common/nm-client-utils.c:221
-+#: ../clients/cli/connections.c:3415 ../clients/cli/connections.c:3472
-+#: ../clients/common/nm-client-utils.c:225
- #, c-format
- msgid "'%s' not among [%s]"
- msgstr "'%s' は [%s] にはありません"
-
- #. We should not really come here
--#: ../clients/cli/connections.c:3432 ../clients/cli/connections.c:3492
--#: ../clients/common/nm-client-utils.c:289
-+#: ../clients/cli/connections.c:3435 ../clients/cli/connections.c:3495
-+#: ../clients/common/nm-client-utils.c:293
- #, c-format
- msgid "Unknown error"
- msgstr "不明なエラー"
-
--#: ../clients/cli/connections.c:3626
-+#: ../clients/cli/connections.c:3629
- #, c-format
- msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
- msgstr "警告: master='%s' は既存のプロファイルを参照しません。\n"
-
--#: ../clients/cli/connections.c:3979
-+#: ../clients/cli/connections.c:3984
- #, c-format
- msgid "Error: invalid property '%s': %s."
- msgstr "エラー: 無効なプロパティー '%s': %s。"
-
--#: ../clients/cli/connections.c:3996
--#, c-format
--msgid "Error: failed to modify %s.%s: %s."
-+#: ../clients/cli/connections.c:3998
-+#, fuzzy, c-format
-+msgid "Error: failed to %s %s.%s: %s."
- msgstr "エラー: %s.%s の変更に失敗しました: %s。"
-
--#: ../clients/cli/connections.c:4016
--#, c-format
--msgid "Error: failed to remove a value from %s.%s: %s."
--msgstr "エラー: '%s' の値の削除に失敗しました、%s: %s。"
--
--#: ../clients/cli/connections.c:4050
-+#: ../clients/cli/connections.c:4033
- #, c-format
- msgid "Error: '%s' is mandatory."
- msgstr "エラー: '%s' は必須です。"
-
--#: ../clients/cli/connections.c:4077
-+#: ../clients/cli/connections.c:4060
- #, c-format
- msgid "Error: invalid slave type; %s."
- msgstr "エラー: 無効なスレーブタイプ; %s。"
-
--#: ../clients/cli/connections.c:4085
-+#: ../clients/cli/connections.c:4068
- #, c-format
- msgid "Error: invalid connection type; %s."
- msgstr "エラー: 無効な接続タイプ; %s。"
-
--#: ../clients/cli/connections.c:4162
-+#: ../clients/cli/connections.c:4145
- #, c-format
- msgid "Error: bad connection type: %s"
- msgstr "エラー: 問題のある接続タイプ: %s"
-
--#: ../clients/cli/connections.c:4208
-+#: ../clients/cli/connections.c:4191
- #, c-format
- msgid "Error: '%s': %s"
- msgstr "エラー: '%s': %s"
-
--#: ../clients/cli/connections.c:4229
-+#: ../clients/cli/connections.c:4212
- msgid "Error: master is required"
- msgstr "エラー: マスターが必要です"
-
--#: ../clients/cli/connections.c:4288
-+#: ../clients/cli/connections.c:4271
- #, c-format
- msgid "Error: error adding bond option '%s=%s'."
- msgstr "エラー: ボンドオプション '%s=%s' の追加中にエラー。"
-
--#: ../clients/cli/connections.c:4319
-+#: ../clients/cli/connections.c:4302
- #, 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:4350
-+#: ../clients/cli/connections.c:4333
- #, 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:4599
-+#: ../clients/cli/connections.c:4582
- #, c-format
- msgid "Error: value for '%s' is missing."
- msgstr "エラー: '%s' の値が不明です。"
-
--#: ../clients/cli/connections.c:4645
-+#: ../clients/cli/connections.c:4628
- msgid "Error: <setting>.<property> argument is missing."
- msgstr "エラー: <setting>.<property> 引数がありません。"
-
--#: ../clients/cli/connections.c:4668
-+#: ../clients/cli/connections.c:4651
- #, c-format
- msgid "Error: invalid or not allowed setting '%s': %s."
- msgstr "エラー: 無効または許可されていない設定 '%s' です: %s。"
-
--#: ../clients/cli/connections.c:4714 ../clients/cli/connections.c:4730
-+#: ../clients/cli/connections.c:4699 ../clients/cli/connections.c:4715
- #, c-format
- msgid "Error: '%s' is ambiguous (%s.%s or %s.%s)."
- msgstr "エラー:'%s' があいまいです (%s.%s または %s.%s)。"
-
--#: ../clients/cli/connections.c:4748
-+#: ../clients/cli/connections.c:4733
- #, c-format
- msgid "Error: invalid <setting>.<property> '%s'."
- msgstr "エラー: 無効な <setting>.<property> '%s' です。"
-
--#: ../clients/cli/connections.c:4792 ../clients/cli/connections.c:8465
-+#: ../clients/cli/connections.c:4777 ../clients/cli/connections.c:8429
- #, c-format
- msgid "Error: Failed to add '%s' connection: %s"
- msgstr "エラー: '%s' 接続の追加に失敗しました: %s"
-
--#: ../clients/cli/connections.c:4810
-+#: ../clients/cli/connections.c:4795
- #, c-format
- msgid ""
- "Warning: There is another connection with the name '%1$s'. Reference the "
-@@ -1343,32 +1338,32 @@ msgstr[0] ""
- "警告: 名前が '%1$s' の接続が他に %3$u 個あります。uuid が '%2$s' の接続を参照"
- "してください。\n"
-
--#: ../clients/cli/connections.c:4819
-+#: ../clients/cli/connections.c:4804
- #, c-format
- msgid "Connection '%s' (%s) successfully added.\n"
- msgstr "接続 '%s' (%s) が正常に追加されました。\n"
-
--#: ../clients/cli/connections.c:4872 ../clients/cli/connections.c:6839
--#: ../clients/cli/connections.c:6840 ../clients/cli/devices.c:535
--#: ../clients/cli/devices.c:542 ../clients/cli/devices.c:1207
--#: ../clients/cli/general.c:136 ../clients/cli/utils.h:296
--#: ../clients/common/nm-client-utils.c:279
--#: ../clients/common/nm-meta-setting-desc.c:771
--#: ../clients/common/nm-meta-setting-desc.c:2752
-+#: ../clients/cli/connections.c:4857 ../clients/cli/connections.c:6824
-+#: ../clients/cli/connections.c:6825 ../clients/cli/devices.c:529
-+#: ../clients/cli/devices.c:536 ../clients/cli/devices.c:1201
-+#: ../clients/cli/general.c:137 ../clients/cli/utils.h:296
-+#: ../clients/common/nm-client-utils.c:283
-+#: ../clients/common/nm-meta-setting-desc.c:939
-+#: ../clients/common/nm-meta-setting-desc.c:2703
- msgid "no"
- msgstr "いいえ"
-
--#: ../clients/cli/connections.c:4873 ../clients/cli/connections.c:6839
--#: ../clients/cli/connections.c:6840 ../clients/cli/devices.c:534
--#: ../clients/cli/devices.c:541 ../clients/cli/devices.c:1207
--#: ../clients/cli/general.c:135 ../clients/cli/utils.h:296
--#: ../clients/common/nm-client-utils.c:278
--#: ../clients/common/nm-meta-setting-desc.c:771
--#: ../clients/common/nm-meta-setting-desc.c:2749
-+#: ../clients/cli/connections.c:4858 ../clients/cli/connections.c:6824
-+#: ../clients/cli/connections.c:6825 ../clients/cli/devices.c:528
-+#: ../clients/cli/devices.c:535 ../clients/cli/devices.c:1201
-+#: ../clients/cli/general.c:136 ../clients/cli/utils.h:296
-+#: ../clients/common/nm-client-utils.c:282
-+#: ../clients/common/nm-meta-setting-desc.c:939
-+#: ../clients/common/nm-meta-setting-desc.c:2700
- msgid "yes"
- msgstr "はい"
-
--#: ../clients/cli/connections.c:4959
-+#: ../clients/cli/connections.c:4944
- #, c-format
- msgid ""
- "You can specify this option more than once. Press <Enter> when you're done.\n"
-@@ -1377,34 +1372,34 @@ msgstr ""
- "さい。\n"
-
- #. Ask for optional arguments.
--#: ../clients/cli/connections.c:5061
-+#: ../clients/cli/connections.c:5046
- #, 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:5067
-+#: ../clients/cli/connections.c:5052
- #, 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:5200 ../clients/cli/utils.c:295
-+#: ../clients/cli/connections.c:5185 ../clients/cli/utils.c:293
- #, c-format
- msgid "Error: value for '%s' argument is required."
- msgstr "エラー: '%s' 引数の値が必要です。"
-
--#: ../clients/cli/connections.c:5207
-+#: ../clients/cli/connections.c:5192
- #, c-format
- msgid "Error: 'save': %s."
- msgstr "エラー: 'save': %s。"
-
--#: ../clients/cli/connections.c:5293 ../clients/cli/connections.c:5304
-+#: ../clients/cli/connections.c:5278 ../clients/cli/connections.c:5289
- #, c-format
- msgid "Error: '%s' argument is required."
- msgstr "エラー: '%s' 引数が必要です。"
-
--#: ../clients/cli/connections.c:6269
-+#: ../clients/cli/connections.c:6254
- #, c-format
- msgid "['%s' setting values]\n"
- msgstr "['%s' 設定値]\n"
-@@ -1412,7 +1407,7 @@ msgstr "['%s' 設定値]\n"
- #. TRANSLATORS: do not translate command names and keywords before ::
- #. * However, you should translate terms enclosed in <>.
- #.
--#: ../clients/cli/connections.c:6378
-+#: ../clients/cli/connections.c:6363
- #, c-format
- msgid ""
- "---[ Main menu ]---\n"
-@@ -1445,7 +1440,7 @@ msgstr ""
- "nmcli <conf-option> <value> :: nmcli 設定\n"
- "quit :: nmcli を終了する\n"
-
--#: ../clients/cli/connections.c:6405
-+#: ../clients/cli/connections.c:6390
- #, c-format
- msgid ""
- "goto <setting>[.<prop>] | <prop> :: enter setting/property for editing\n"
-@@ -1464,7 +1459,7 @@ msgstr ""
- " nmcli connection> goto secondaries\n"
- " nmcli> goto ipv4.addresses\n"
-
--#: ../clients/cli/connections.c:6412
-+#: ../clients/cli/connections.c:6397
- #, c-format
- msgid ""
- "remove <setting>[.<prop>] :: remove setting or reset property value\n"
-@@ -1485,7 +1480,7 @@ msgstr ""
- "例: nmcli> remove wifi-sec\n"
- " nmcli> remove eth.mtu\n"
-
--#: ../clients/cli/connections.c:6419
-+#: ../clients/cli/connections.c:6404
- #, c-format
- msgid ""
- "set [<setting>.<prop> <value>] :: set property value\n"
-@@ -1500,7 +1495,7 @@ msgstr ""
- "\n"
- "例: nmcli> set con.id My connection\n"
-
--#: ../clients/cli/connections.c:6424
-+#: ../clients/cli/connections.c:6409
- #, c-format
- msgid ""
- "describe [<setting>.<prop>] :: describe property\n"
-@@ -1513,7 +1508,7 @@ msgstr ""
- "プロパティー詳細を表示します。NM の設定およびプロパティーの全詳細については、"
- "nm-settings(5) の man ページを参照してください。\n"
-
--#: ../clients/cli/connections.c:6429
-+#: ../clients/cli/connections.c:6414
- #, c-format
- msgid ""
- "print [all] :: print setting or connection values\n"
-@@ -1528,7 +1523,7 @@ msgstr ""
- "\n"
- "例: nmcli ipv4> print all\n"
-
--#: ../clients/cli/connections.c:6434
-+#: ../clients/cli/connections.c:6419
- #, c-format
- msgid ""
- "verify [all | fix] :: verify setting or connection validity\n"
-@@ -1553,7 +1548,7 @@ msgstr ""
- " nmcli> verify fix\n"
- " nmcli bond> verify\n"
-
--#: ../clients/cli/connections.c:6443
-+#: ../clients/cli/connections.c:6428
- #, c-format
- msgid ""
- "save [persistent|temporary] :: save the connection\n"
-@@ -1579,7 +1574,7 @@ msgstr ""
- "永続的な接続を完全に削除する場合は、接続プロファイルを削除する\n"
- "必要があります。\n"
-
--#: ../clients/cli/connections.c:6454
-+#: ../clients/cli/connections.c:6439
- #, c-format
- msgid ""
- "activate [<ifname>] [/<ap>|<nsp>] :: activate the connection\n"
-@@ -1600,7 +1595,7 @@ msgstr ""
- "/<ap>|<nsp> - AP (Wi-Fi) または NSP (WiMAX) (<ifname> が指定されていない場合"
- "は / を先頭に付ける)\n"
-
--#: ../clients/cli/connections.c:6461 ../clients/cli/connections.c:6619
-+#: ../clients/cli/connections.c:6446 ../clients/cli/connections.c:6604
- #, c-format
- msgid ""
- "back :: go to upper menu level\n"
-@@ -1609,7 +1604,7 @@ msgstr ""
- "back :: 一つ上のメニューレベルに移動\n"
- "\n"
-
--#: ../clients/cli/connections.c:6464
-+#: ../clients/cli/connections.c:6449
- #, c-format
- msgid ""
- "help/? [<command>] :: help for the nmcli commands\n"
-@@ -1618,7 +1613,7 @@ msgstr ""
- "help/? [<command>] :: nmcli コマンドのヘルプ\n"
- "\n"
-
--#: ../clients/cli/connections.c:6467
-+#: ../clients/cli/connections.c:6452
- #, c-format
- msgid ""
- "nmcli [<conf-option> <value>] :: nmcli configuration\n"
-@@ -1645,7 +1640,7 @@ msgstr ""
- " nmcli> nmcli save-confirmation no\n"
- " nmcli> nmcli prompt-color 3\n"
-
--#: ../clients/cli/connections.c:6489 ../clients/cli/connections.c:6625
-+#: ../clients/cli/connections.c:6474 ../clients/cli/connections.c:6610
- #, c-format
- msgid ""
- "quit :: exit nmcli\n"
-@@ -1658,8 +1653,8 @@ msgstr ""
- "nmcli を終了します。変更した接続の保存を行なっていない場合、この動作の確認が"
- "求められます。\n"
-
--#: ../clients/cli/connections.c:6494 ../clients/cli/connections.c:6630
--#: ../clients/cli/connections.c:7065 ../clients/cli/connections.c:8048
-+#: ../clients/cli/connections.c:6479 ../clients/cli/connections.c:6615
-+#: ../clients/cli/connections.c:7024 ../clients/cli/connections.c:8009
- #, c-format
- msgid "Unknown command: '%s'\n"
- msgstr "不明なコマンド: '%s'\n"
-@@ -1667,7 +1662,7 @@ msgstr "不明なコマンド: '%s'\n"
- #. TRANSLATORS: do not translate command names and keywords before ::
- #. * However, you should translate terms enclosed in <>.
- #.
--#: ../clients/cli/connections.c:6559
-+#: ../clients/cli/connections.c:6544
- #, c-format
- msgid ""
- "---[ Property menu ]---\n"
-@@ -1693,7 +1688,7 @@ msgstr ""
- "help/? [<command>] :: このヘルプまたはコマンドの詳細を表示\n"
- "quit :: nmcli の終了\n"
-
--#: ../clients/cli/connections.c:6584
-+#: ../clients/cli/connections.c:6569
- #, c-format
- msgid ""
- "set [<value>] :: set new value\n"
-@@ -1704,7 +1699,7 @@ msgstr ""
- "\n"
- "このプロパティーに指定した <value> を設定します。\n"
-
--#: ../clients/cli/connections.c:6588
-+#: ../clients/cli/connections.c:6573
- #, c-format
- msgid ""
- "add [<value>] :: append new value to the property\n"
-@@ -1719,7 +1714,7 @@ msgstr ""
- "<value> がこのプロパティーに追加されます。単一値のプロパティーの場合は、その"
- "プロパティー値が置換されます ('set' の場合と同じ)。\n"
-
--#: ../clients/cli/connections.c:6594
-+#: ../clients/cli/connections.c:6579
- #, c-format
- msgid ""
- "change :: change current value\n"
-@@ -1730,7 +1725,7 @@ msgstr ""
- "\n"
- "現在の値を表示し、その値を変更することができます。\n"
-
--#: ../clients/cli/connections.c:6598
-+#: ../clients/cli/connections.c:6583
- #, c-format
- msgid ""
- "remove [<value>|<index>|<option name>] :: delete the value\n"
-@@ -1765,7 +1760,7 @@ msgstr ""
- " nmcli bond.options> remove downdelay\n"
- "\n"
-
--#: ../clients/cli/connections.c:6609
-+#: ../clients/cli/connections.c:6594
- #, c-format
- msgid ""
- "describe :: describe property\n"
-@@ -1778,7 +1773,7 @@ msgstr ""
- "プロパティーの詳細を表示します。NM 設定とプロパティーの詳細は、nm-"
- "settings(5) man ページを参照してください。\n"
-
--#: ../clients/cli/connections.c:6614
-+#: ../clients/cli/connections.c:6599
- #, c-format
- msgid ""
- "print [property|setting|connection] :: print property (setting, connection) "
-@@ -1792,7 +1787,7 @@ msgstr ""
- "プロパティー値を表示します。引数を指定すると、設定または接続全体の値を表示さ"
- "せることもできます。\n"
-
--#: ../clients/cli/connections.c:6622
-+#: ../clients/cli/connections.c:6607
- #, c-format
- msgid ""
- "help/? [<command>] :: help for nmcli commands\n"
-@@ -1801,28 +1796,28 @@ msgstr ""
- "help/? [<command>] :: nmcli コマンドのヘルプ\n"
- "\n"
-
--#: ../clients/cli/connections.c:6722
-+#: ../clients/cli/connections.c:6707
- #, c-format
- msgid "Error: Connection activation failed.\n"
- msgstr "エラー: 接続のアクティベートに失敗しました。\n"
-
--#: ../clients/cli/connections.c:6819
-+#: ../clients/cli/connections.c:6804
- #, 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:6837
-+#: ../clients/cli/connections.c:6822
- #, 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:6873
-+#: ../clients/cli/connections.c:6858
- #, c-format
- msgid "The connection is not saved. Do you really want to quit? %s"
- msgstr "この接続は保存されません。本当に終了しますか? %s"
-
--#: ../clients/cli/connections.c:6915
-+#: ../clients/cli/connections.c:6899
- #, c-format
- msgid ""
- "The connection profile has been removed from another client. You may type "
-@@ -1831,66 +1826,60 @@ msgstr ""
- "この接続プロファイルは別のクライアントからは削除されています。メインメニュー"
- "で 'save' と入力すると元に戻すことができます。\n"
-
--#: ../clients/cli/connections.c:6949 ../clients/cli/connections.c:7364
--#: ../clients/cli/connections.c:7424
-+#: ../clients/cli/connections.c:6933 ../clients/cli/connections.c:7323
-+#: ../clients/cli/connections.c:7382
- #, c-format
- msgid "Allowed values for '%s' property: %s\n"
- msgstr "'%s' プロパティーに使用できる値: %s\n"
-
--#: ../clients/cli/connections.c:6953 ../clients/cli/connections.c:7368
--#: ../clients/cli/connections.c:7428
-+#: ../clients/cli/connections.c:6937 ../clients/cli/connections.c:7327
-+#: ../clients/cli/connections.c:7386
- #, c-format
- msgid "Enter '%s' value: "
- msgstr "'%s' 値を入力してください: "
-
--#: ../clients/cli/connections.c:6968 ../clients/cli/connections.c:6990
--#: ../clients/cli/connections.c:7373 ../clients/cli/connections.c:7434
-+#: ../clients/cli/connections.c:6951 ../clients/cli/connections.c:6964
-+#: ../clients/cli/connections.c:7331 ../clients/cli/connections.c:7397
- #, c-format
- msgid "Error: failed to set '%s' property: %s\n"
- msgstr "エラー: '%s' プロパティーの設定に失敗しました: %s\n"
-
--#: ../clients/cli/connections.c:6983
-+#: ../clients/cli/connections.c:6960
- #, c-format
- msgid "Edit '%s' value: "
- msgstr "'%s' 値の編集: "
-
--#: ../clients/cli/connections.c:7012 ../clients/cli/settings.c:395
-+#: ../clients/cli/connections.c:6978 ../clients/cli/settings.c:414
- #, c-format
- msgid "Error: %s\n"
- msgstr "エラー: %s\n"
-
--#: ../clients/cli/connections.c:7017 ../clients/cli/connections.c:7532
--#: ../clients/cli/connections.c:7583
--#, c-format
--msgid "Error: failed to remove value of '%s': %s\n"
--msgstr "エラー: '%s' の値の削除に失敗しました: %s\n"
--
--#: ../clients/cli/connections.c:7038
-+#: ../clients/cli/connections.c:6997
- #, c-format
- msgid "Unknown command argument: '%s'\n"
- msgstr "不明なコマンド引数: '%s'\n"
-
--#: ../clients/cli/connections.c:7129
-+#: ../clients/cli/connections.c:7088
- #, c-format
- msgid "Available settings: %s\n"
- msgstr "使用可能な設定: %s\n"
-
--#: ../clients/cli/connections.c:7141
-+#: ../clients/cli/connections.c:7100
- #, c-format
- msgid "Error: invalid setting name; %s\n"
- msgstr "エラー: 無効な設定名; %s\n"
-
--#: ../clients/cli/connections.c:7159
-+#: ../clients/cli/connections.c:7118
- #, c-format
- msgid "Available properties: %s\n"
- msgstr "利用可能なプロパティー: %s\n"
-
--#: ../clients/cli/connections.c:7167
-+#: ../clients/cli/connections.c:7126
- #, c-format
- msgid "Error: property %s\n"
- msgstr "エラー: プロパティー %s\n"
-
--#: ../clients/cli/connections.c:7212
-+#: ../clients/cli/connections.c:7171
- #, c-format
- msgid ""
- "Saving the connection with 'autoconnect=yes'. That might result in an "
-@@ -1901,12 +1890,12 @@ msgstr ""
- "ベートされる可能性があります。\n"
- "本当に保存しますか? %s"
-
--#: ../clients/cli/connections.c:7298
-+#: ../clients/cli/connections.c:7257
- #, c-format
- msgid "You may edit the following settings: %s\n"
- msgstr "次の設定を変更することができます: %s\n"
-
--#: ../clients/cli/connections.c:7329
-+#: ../clients/cli/connections.c:7288
- #, c-format
- msgid ""
- "The connection profile has been removed from another client. You may type "
-@@ -1915,454 +1904,459 @@ msgstr ""
- "この接続プロファイルは別のクライアントからは削除されています。'save' と入力す"
- "ると元に戻すことができます。\n"
-
--#: ../clients/cli/connections.c:7377 ../clients/cli/connections.c:7628
--#: ../clients/cli/connections.c:7660
-+#: ../clients/cli/connections.c:7335 ../clients/cli/connections.c:7589
-+#: ../clients/cli/connections.c:7621
- #, c-format
- msgid "Error: no setting selected; valid are [%s]\n"
- msgstr "エラー: 設定が選択されていません。有効な設定は [%s] になります\n"
-
--#: ../clients/cli/connections.c:7378
-+#: ../clients/cli/connections.c:7336
- #, c-format
- msgid "use 'goto <setting>' first, or 'set <setting>.<property>'\n"
- msgstr ""
- "まず先に 'goto <setting>' を使用するか、'set <setting>.<property>' を使用して"
- "ください。\n"
-
--#: ../clients/cli/connections.c:7393 ../clients/cli/connections.c:7559
--#: ../clients/cli/connections.c:7650
-+#: ../clients/cli/connections.c:7351 ../clients/cli/connections.c:7521
-+#: ../clients/cli/connections.c:7611
- #, c-format
- msgid "Error: invalid setting argument '%s'; valid are [%s]\n"
- msgstr "エラー: 無効な設定引数 %s です。[%s] が有効な引数になります\n"
-
--#: ../clients/cli/connections.c:7402
-+#: ../clients/cli/connections.c:7360
- #, c-format
- msgid "Error: missing setting for '%s' property\n"
- msgstr "エラー: '%s' プロパティー用の設定がありません\n"
-
--#: ../clients/cli/connections.c:7409
-+#: ../clients/cli/connections.c:7367
- #, c-format
- msgid "Error: invalid property: %s\n"
- msgstr "エラー: 無効なプロパティー: %s\n"
-
--#: ../clients/cli/connections.c:7466
-+#: ../clients/cli/connections.c:7429
- #, c-format
- msgid "Error: unknown setting '%s'\n"
- msgstr "エラー: 不明な設定 '%s'\n"
-
--#: ../clients/cli/connections.c:7491
-+#: ../clients/cli/connections.c:7454
- #, c-format
- msgid "You may edit the following properties: %s\n"
- msgstr "変更できるのは次のプロパティーになります: %s\n"
-
--#: ../clients/cli/connections.c:7537
-+#: ../clients/cli/connections.c:7494 ../clients/cli/connections.c:7544
-+#, c-format
-+msgid "Error: failed to remove value of '%s': %s\n"
-+msgstr "エラー: '%s' の値の削除に失敗しました: %s\n"
-+
-+#: ../clients/cli/connections.c:7499
- #, c-format
- msgid "Error: no argument given; valid are [%s]\n"
- msgstr "エラー: 引数が指定されていません。[%s] が有効な引数になります\n"
-
--#: ../clients/cli/connections.c:7556
-+#: ../clients/cli/connections.c:7518
- #, c-format
- msgid "Setting '%s' is not present in the connection.\n"
- msgstr "この接続には、設定 '%s' はありません。\n"
-
--#: ../clients/cli/connections.c:7604
-+#: ../clients/cli/connections.c:7565
- #, c-format
- msgid "Error: %s properties, nor it is a setting name.\n"
- msgstr "エラー: %s プロパティー、設定名でもありません。\n"
-
--#: ../clients/cli/connections.c:7629 ../clients/cli/connections.c:7661
-+#: ../clients/cli/connections.c:7590 ../clients/cli/connections.c:7622
- #, c-format
- msgid "use 'goto <setting>' first, or 'describe <setting>.<property>'\n"
- msgstr ""
- "まず先に 'goto <setting>' を使用するか、'describe <setting>.<property>' を使"
- "用してください\n"
-
--#: ../clients/cli/connections.c:7684
-+#: ../clients/cli/connections.c:7645
- #, c-format
- msgid "Error: invalid property: %s, neither a valid setting name.\n"
- msgstr "エラー: 無効なプロパティー: %s、有効な設定名でもありません。\n"
-
--#: ../clients/cli/connections.c:7714
-+#: ../clients/cli/connections.c:7675
- #, c-format
- msgid "Error: unknown setting: '%s'\n"
- msgstr "エラー: 不明な設定: '%s'\n"
-
--#: ../clients/cli/connections.c:7719
-+#: ../clients/cli/connections.c:7680
- #, c-format
- msgid "Error: '%s' setting not present in the connection\n"
- msgstr "エラー: この接続には、設定 '%s' がありません。\n"
-
--#: ../clients/cli/connections.c:7750
-+#: ../clients/cli/connections.c:7711
- #, c-format
- msgid "Error: invalid property: %s%s\n"
- msgstr "エラー: 無効なプロパティー: %s%s\n"
-
--#: ../clients/cli/connections.c:7752
-+#: ../clients/cli/connections.c:7713
- msgid ", neither a valid setting name"
- msgstr "有効な設定名でもありません。"
-
--#: ../clients/cli/connections.c:7768
-+#: ../clients/cli/connections.c:7729
- #, c-format
- msgid "Invalid verify option: %s\n"
- msgstr "無効な検証オプション: %s\n"
-
--#: ../clients/cli/connections.c:7776
-+#: ../clients/cli/connections.c:7737
- #, c-format
- msgid "Verify setting '%s': %s\n"
- msgstr "設定 '%s' の確認: %s\n"
-
--#: ../clients/cli/connections.c:7791
-+#: ../clients/cli/connections.c:7752
- #, c-format
- msgid "Verify connection: %s\n"
- msgstr "接続の確認: %s\n"
-
--#: ../clients/cli/connections.c:7794
-+#: ../clients/cli/connections.c:7755
- #, c-format
- msgid "The error cannot be fixed automatically.\n"
- msgstr "エラーを自動的に修正できません。\n"
-
--#: ../clients/cli/connections.c:7815
-+#: ../clients/cli/connections.c:7776
- #, c-format
- msgid "Error: invalid argument '%s'\n"
- msgstr "エラー: 無効な引数 '%s'\n"
-
--#: ../clients/cli/connections.c:7867
-+#: ../clients/cli/connections.c:7828
- #, c-format
- msgid "Error: Failed to save '%s' (%s) connection: %s\n"
- msgstr "エラー: '%s' (%s) 接続の保存に失敗しました: %s\n"
-
--#: ../clients/cli/connections.c:7873
-+#: ../clients/cli/connections.c:7834
- #, fuzzy, c-format
- msgid "Error: Timeout saving '%s' (%s) connection\n"
- msgstr "エラー: '%s' (%s) 接続の保存に失敗しました: %s\n"
-
--#: ../clients/cli/connections.c:7878
-+#: ../clients/cli/connections.c:7839
- #, c-format
- msgid "Connection '%s' (%s) successfully saved.\n"
- msgstr "接続 '%s' (%s) が正常に保存されました。\n"
-
--#: ../clients/cli/connections.c:7879
-+#: ../clients/cli/connections.c:7840
- #, c-format
- msgid "Connection '%s' (%s) successfully updated.\n"
- msgstr "接続 '%s' (%s) が正常に更新されました。\n"
-
--#: ../clients/cli/connections.c:7912
-+#: ../clients/cli/connections.c:7873
- #, c-format
- msgid "Error: connection verification failed: %s\n"
- msgstr "エラー: 接続の確認に失敗しました: %s\n"
-
--#: ../clients/cli/connections.c:7913
-+#: ../clients/cli/connections.c:7874
- msgid "(unknown error)"
- msgstr "(不明なエラー)"
-
--#: ../clients/cli/connections.c:7914
-+#: ../clients/cli/connections.c:7875
- #, c-format
- msgid "You may try running 'verify fix' to fix errors.\n"
- msgstr "エラーを修正するために 'verify fix' の実行を試行できます。\n"
-
--#: ../clients/cli/connections.c:7936
-+#: ../clients/cli/connections.c:7897
- #, c-format
- msgid "Error: connection is not saved. Type 'save' first.\n"
- msgstr "エラー: 接続は保存されていません。まず 'save' と入力します。\n"
-
--#: ../clients/cli/connections.c:7940
-+#: ../clients/cli/connections.c:7901
- #, c-format
- msgid "Error: connection is not valid: %s\n"
- msgstr "エラー: 接続は無効です: %s\n"
-
--#: ../clients/cli/connections.c:7950
-+#: ../clients/cli/connections.c:7911
- #, c-format
- msgid "Error: Cannot activate connection: %s.\n"
- msgstr "エラー: 接続をアクティベートできません: %s。\n"
-
--#: ../clients/cli/connections.c:7959
-+#: ../clients/cli/connections.c:7920
- #, c-format
- msgid "Error: Failed to activate '%s' (%s) connection: %s\n"
- msgstr "エラー: '%s' (%s) 接続のアクティベートに失敗しました: %s\n"
-
--#: ../clients/cli/connections.c:7966
-+#: ../clients/cli/connections.c:7927
- msgid "Monitoring connection activation (press any key to continue)\n"
- msgstr "モニタリング接続のアクティベート (いずれかのキーを押して続行する)\n"
-
--#: ../clients/cli/connections.c:8002
-+#: ../clients/cli/connections.c:7963
- #, c-format
- msgid "Error: status-line: %s\n"
- msgstr "エラー: status-line: %s\n"
-
--#: ../clients/cli/connections.c:8010
-+#: ../clients/cli/connections.c:7971
- #, c-format
- msgid "Error: save-confirmation: %s\n"
- msgstr "エラー: save-confirmation: %s\n"
-
--#: ../clients/cli/connections.c:8018
-+#: ../clients/cli/connections.c:7979
- #, c-format
- msgid "Error: show-secrets: %s\n"
- msgstr "エラー: show-secrets: %s\n"
-
--#: ../clients/cli/connections.c:8025
-+#: ../clients/cli/connections.c:7986
- #, c-format
- msgid "Current nmcli configuration:\n"
- msgstr "現在の nmcli 設定:\n"
-
--#: ../clients/cli/connections.c:8033
-+#: ../clients/cli/connections.c:7994
- #, c-format
- msgid "Invalid configuration option '%s'; allowed [%s]\n"
- msgstr "無効な設定オプション '%s'; [%s] は指定できます\n"
-
--#: ../clients/cli/connections.c:8251
-+#: ../clients/cli/connections.c:8215
- #, 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:8265 ../clients/cli/connections.c:8426
-+#: ../clients/cli/connections.c:8229 ../clients/cli/connections.c:8390
- #, c-format
- msgid "Error: Unknown connection '%s'."
- msgstr "エラー: 不明な接続 '%s' です。"
-
--#: ../clients/cli/connections.c:8281
-+#: ../clients/cli/connections.c:8245
- #, c-format
- msgid "Warning: editing existing connection '%s'; 'type' argument is ignored\n"
- msgstr "警告: 既存の接続 '%s' を編集しています。'type' 引数は無視されます\n"
-
--#: ../clients/cli/connections.c:8284
-+#: ../clients/cli/connections.c:8248
- #, c-format
- msgid ""
- "Warning: editing existing connection '%s'; 'con-name' argument is ignored\n"
- msgstr ""
- "警告: 既存の接続 '%s' を編集しています。'con-name' 引数は無視されます\n"
-
--#: ../clients/cli/connections.c:8311
-+#: ../clients/cli/connections.c:8275
- #, c-format
- msgid "Valid connection types: %s\n"
- msgstr "有効な接続タイプ: %s\n"
-
--#: ../clients/cli/connections.c:8313
-+#: ../clients/cli/connections.c:8277
- #, c-format
- msgid "Error: invalid connection type; %s\n"
- msgstr "エラー: 無効な接続タイプ; %s\n"
-
--#: ../clients/cli/connections.c:8349
-+#: ../clients/cli/connections.c:8313
- #, c-format
- msgid "===| nmcli interactive connection editor |==="
- msgstr "===| nmcli インテラクティブ接続エディター |==="
-
--#: ../clients/cli/connections.c:8352
-+#: ../clients/cli/connections.c:8316
- #, c-format
- msgid "Editing existing '%s' connection: '%s'"
- msgstr "既存の '%s' 接続を編集中: '%s'"
-
--#: ../clients/cli/connections.c:8354
-+#: ../clients/cli/connections.c:8318
- #, c-format
- msgid "Adding a new '%s' connection"
- msgstr "新規の '%s' 接続を追加中"
-
--#: ../clients/cli/connections.c:8356
-+#: ../clients/cli/connections.c:8320
- #, c-format
- msgid "Type 'help' or '?' for available commands."
- msgstr "使用できるコマンドを表示するには 'help' または '?' を入力します。"
-
--#: ../clients/cli/connections.c:8358
-+#: ../clients/cli/connections.c:8322
- #, c-format
- msgid "Type 'print' to show all the connection properties."
- msgstr "すべての接続プロパティーを表示するには 'print' とタイプします。"
-
--#: ../clients/cli/connections.c:8360
-+#: ../clients/cli/connections.c:8324
- #, c-format
- msgid "Type 'describe [<setting>.<prop>]' for detailed property description."
- msgstr ""
- "プロパティー詳細を表示するには、'describe [<setting>.<prop>]' を入力します。"
-
--#: ../clients/cli/connections.c:8388
-+#: ../clients/cli/connections.c:8352
- #, c-format
- msgid "Error: Failed to modify connection '%s': %s"
- msgstr "エラー: 接続 '%s' の変更に失敗しました: %s"
-
--#: ../clients/cli/connections.c:8394
-+#: ../clients/cli/connections.c:8358
- #, c-format
- msgid "Connection '%s' (%s) successfully modified.\n"
- msgstr "接続 '%s' (%s) が正常に変更されました。\n"
-
--#: ../clients/cli/connections.c:8470
-+#: ../clients/cli/connections.c:8434
- #, c-format
- msgid "%s (%s) cloned as %s (%s).\n"
- msgstr "%s (%s) が %s (%s) としてクローンされました。\n"
-
--#: ../clients/cli/connections.c:8536
-+#: ../clients/cli/connections.c:8500
- msgid "New connection name: "
- msgstr "新規の接続名:"
-
--#: ../clients/cli/connections.c:8538
-+#: ../clients/cli/connections.c:8502
- #, c-format
- msgid "Error: <new name> argument is missing."
- msgstr "エラー: <new name> 引数がありません。"
-
--#: ../clients/cli/connections.c:8543 ../clients/cli/connections.c:9026
-+#: ../clients/cli/connections.c:8507 ../clients/cli/connections.c:9003
- #, c-format
- msgid "Error: unknown extra argument: '%s'."
- msgstr "エラー: 不明な追加の引数: '%s'。"
-
--#: ../clients/cli/connections.c:8588
-+#: ../clients/cli/connections.c:8552
- #, c-format
- msgid "Error: not all connections deleted."
- msgstr "エラー: 一部の接続が削除されていません。"
-
--#: ../clients/cli/connections.c:8589
--#, c-format
--msgid "Error: Connection deletion failed: %s"
-+#: ../clients/cli/connections.c:8553
-+#, fuzzy, c-format
-+msgid "Error: Connection deletion failed: %s\n"
- msgstr "エラー: 接続の削除に失敗しました: %s"
-
--#: ../clients/cli/connections.c:8645 ../clients/cli/connections.c:8766
-+#: ../clients/cli/connections.c:8609 ../clients/cli/connections.c:8730
- #, c-format
- msgid "Error: %s.\n"
- msgstr "エラー: %s。\n"
-
--#: ../clients/cli/connections.c:8646 ../clients/cli/connections.c:8767
-+#: ../clients/cli/connections.c:8610 ../clients/cli/connections.c:8731
- #, c-format
- msgid "Error: not all connections found."
- msgstr "エラー: 一部の接続が見つかりません。"
-
- #. truncate trailing ", "
--#: ../clients/cli/connections.c:8697
-+#: ../clients/cli/connections.c:8661
- #, c-format
- msgid "Error: cannot delete unknown connection(s): %s."
- msgstr "エラー: 不明な接続を削除できません: %s。"
-
--#: ../clients/cli/connections.c:8707
-+#: ../clients/cli/connections.c:8671
- #, c-format
- msgid "%s: connection profile changed\n"
- msgstr "%s: 接続プロファイルが変更されました\n"
-
--#: ../clients/cli/connections.c:8733
-+#: ../clients/cli/connections.c:8697
- #, c-format
- msgid "%s: connection profile created\n"
- msgstr "%s: 接続プロファイルが作成されました\n"
-
--#: ../clients/cli/connections.c:8742
-+#: ../clients/cli/connections.c:8706
- #, c-format
- msgid "%s: connection profile removed\n"
- msgstr "%s: 接続プロファイルが削除されました\n"
-
--#: ../clients/cli/connections.c:8804
-+#: ../clients/cli/connections.c:8768
- #, c-format
- msgid "Error: failed to reload connections: %s."
- msgstr "エラー: 接続のリロードに失敗しました: %s。"
-
--#: ../clients/cli/connections.c:8837
-+#: ../clients/cli/connections.c:8801
- #, c-format
- msgid "Error: failed to load connection: %s."
- msgstr "エラー: 接続のロードに失敗しました: %s。"
-
--#: ../clients/cli/connections.c:8845
-+#: ../clients/cli/connections.c:8809
- #, c-format
- msgid "Could not load file '%s'\n"
- msgstr "'%s' ファイルを読み込めませんでした。\n"
-
--#: ../clients/cli/connections.c:8852
-+#: ../clients/cli/connections.c:8816
- msgid "File to import: "
- msgstr "インポートするファイル:"
-
--#: ../clients/cli/connections.c:8886
-+#: ../clients/cli/connections.c:8850
- #, c-format
- msgid "Error: No arguments provided."
- msgstr "エラー: 引数がありません。"
-
--#: ../clients/cli/connections.c:8909
-+#: ../clients/cli/connections.c:8881
- #, c-format
- msgid "Warning: 'type' already specified, ignoring extra one.\n"
- msgstr "警告: 'type' はすでに指定されています。追加のものは無視されます。\n"
-
--#: ../clients/cli/connections.c:8923
-+#: ../clients/cli/connections.c:8895
- #, c-format
- msgid "Warning: 'file' already specified, ignoring extra one.\n"
- msgstr "警告: 'file' はすでに指定されています。追加のものは無視されます。\n"
-
--#: ../clients/cli/connections.c:8925
-+#: ../clients/cli/connections.c:8897
- #, c-format
- msgid "Unknown parameter: %s"
- msgstr "不明なパラメーター: %s"
-
--#: ../clients/cli/connections.c:8936
-+#: ../clients/cli/connections.c:8908
- #, c-format
- msgid "Error: 'type' argument is required."
- msgstr "エラー: 'type' 引数が必要です。"
-
--#: ../clients/cli/connections.c:8940
-+#: ../clients/cli/connections.c:8912
- #, c-format
- msgid "Error: 'file' argument is required."
- msgstr "エラー: 'file' 引数が必要です。"
-
--#: ../clients/cli/connections.c:8946
-+#: ../clients/cli/connections.c:8921
- #, c-format
- msgid "Error: failed to find VPN plugin for %s."
- msgstr "エラー: %s 用の VPN プラグインが見つかりません。"
-
--#: ../clients/cli/connections.c:8953 ../clients/cli/connections.c:9047
-+#: ../clients/cli/connections.c:8928 ../clients/cli/connections.c:9024
- #, c-format
- msgid "Error: failed to load VPN plugin: %s."
- msgstr "エラー: VPN プラグインのロードに失敗しました: %s。"
-
--#: ../clients/cli/connections.c:8960
-+#: ../clients/cli/connections.c:8937
- #, c-format
- msgid "Error: failed to import '%s': %s."
- msgstr "エラー: '%s' のインポートに失敗しました: %s。"
-
--#: ../clients/cli/connections.c:9033
-+#: ../clients/cli/connections.c:9010
- msgid "Output file name: "
- msgstr "出力ファイル名:"
-
--#: ../clients/cli/connections.c:9038
-+#: ../clients/cli/connections.c:9015
- #, c-format
- msgid "Error: the connection is not VPN."
- msgstr "エラー: 接続は VPN ではありません。"
-
--#: ../clients/cli/connections.c:9060
-+#: ../clients/cli/connections.c:9037
- #, c-format
- msgid "Error: failed to create temporary file %s."
- msgstr "エラー: 一時ファイル %s の作成に失敗しました。"
-
--#: ../clients/cli/connections.c:9068
-+#: ../clients/cli/connections.c:9045
- #, c-format
- msgid "Error: failed to export '%s': %s."
- msgstr "エラー: '%s' のエクスポートに失敗しました: %s。"
-
--#: ../clients/cli/connections.c:9080
-+#: ../clients/cli/connections.c:9057
- #, c-format
- msgid "Error: failed to read temporary file '%s': %s."
- msgstr "エラー: 一時ファイル '%s' の読み取りに失敗しました: %s。"
-
- #. define some prompts
--#: ../clients/cli/devices.c:39
-+#: ../clients/cli/devices.c:37
- msgid "Interface: "
- msgstr "インターフェース: "
-
--#: ../clients/cli/devices.c:40
-+#: ../clients/cli/devices.c:38
- msgid "Interface(s): "
- msgstr "インターフェース: "
-
--#: ../clients/cli/devices.c:73 ../clients/cli/devices.c:1235
-+#: ../clients/cli/devices.c:73 ../clients/cli/devices.c:1229
- msgid "(none)"
- msgstr "（なし）"
-
--#: ../clients/cli/devices.c:184 ../clients/cli/devices.c:191
-+#: ../clients/cli/devices.c:178 ../clients/cli/devices.c:185
- msgid "(unknown)"
- msgstr "(不明)"
-
--#: ../clients/cli/devices.c:339
-+#: ../clients/cli/devices.c:333
- #, c-format
- msgid "<invisible> | %s"
- msgstr "<invisible> | %s"
-
--#: ../clients/cli/devices.c:340
-+#: ../clients/cli/devices.c:334
- msgid "<invisible>"
- msgstr "<invisible>"
-
--#: ../clients/cli/devices.c:441
-+#: ../clients/cli/devices.c:435
- #, c-format
- msgid "%u Mb/s"
- msgstr "%u Mb/s"
-
--#: ../clients/cli/devices.c:695
-+#: ../clients/cli/devices.c:689
- #, fuzzy, c-format
- msgid ""
- "Usage: nmcli device { COMMAND | help }\n"
-@@ -2441,7 +2435,7 @@ msgstr ""
- " lldp [list [ifname <ifname>]]\n"
- "\n"
-
--#: ../clients/cli/devices.c:718
-+#: ../clients/cli/devices.c:712
- #, c-format
- msgid ""
- "Usage: nmcli device status { help }\n"
-@@ -2472,7 +2466,7 @@ msgstr ""
- "status' を実行したことになります。\n"
- "\n"
-
--#: ../clients/cli/devices.c:733
-+#: ../clients/cli/devices.c:727
- #, c-format
- msgid ""
- "Usage: nmcli device show { ARGUMENTS | help }\n"
-@@ -2491,7 +2485,7 @@ msgstr ""
- "このコマンドですべてのデバイスまたは指定デバイスの詳細を表示させます。\n"
- "\n"
-
--#: ../clients/cli/devices.c:744
-+#: ../clients/cli/devices.c:738
- #, c-format
- msgid ""
- "Usage: nmcli device connect { ARGUMENTS | help }\n"
-@@ -2513,7 +2507,7 @@ msgstr ""
- "auto-connect に設定されていない接続についても考慮されます。\n"
- "\n"
-
--#: ../clients/cli/devices.c:756
-+#: ../clients/cli/devices.c:750
- #, c-format
- msgid ""
- "Usage: nmcli device reapply { ARGUMENTS | help }\n"
-@@ -2532,7 +2526,7 @@ msgstr ""
- "行った変更で、デバイスの更新を試行します。\n"
- "\n"
-
--#: ../clients/cli/devices.c:767
-+#: ../clients/cli/devices.c:761
- #, c-format
- msgid ""
- "Usage: nmcli device modify { ARGUMENTS | --help }\n"
-@@ -2572,7 +2566,7 @@ msgstr ""
- "nmcli dev mod em1 -ipv4.dns 1\n"
- "nmcli dev mod em1 -ipv6.addr \"abbe::cafe/56\"\n"
-
--#: ../clients/cli/devices.c:787
-+#: ../clients/cli/devices.c:781
- #, c-format
- msgid ""
- "Usage: nmcli device disconnect { ARGUMENTS | help }\n"
-@@ -2593,7 +2587,7 @@ msgstr ""
- "それ以降の接続が自動アクティベートされることがなくなります。\n"
- "\n"
-
--#: ../clients/cli/devices.c:799
-+#: ../clients/cli/devices.c:793
- #, c-format
- msgid ""
- "Usage: nmcli device delete { ARGUMENTS | help }\n"
-@@ -2616,7 +2610,7 @@ msgstr ""
- "コマンドで削除できません。\n"
- "\n"
-
--#: ../clients/cli/devices.c:812
-+#: ../clients/cli/devices.c:806
- #, c-format
- msgid ""
- "Usage: nmcli device set { ARGUMENTS | help }\n"
-@@ -2639,7 +2633,7 @@ msgstr ""
- "デバイスプロパティーを変更します。\n"
- "\n"
-
--#: ../clients/cli/devices.c:825
-+#: ../clients/cli/devices.c:819
- #, c-format
- msgid ""
- "Usage: nmcli device monitor { ARGUMENTS | help }\n"
-@@ -2661,7 +2655,7 @@ msgstr ""
- "インターフェースが指定されない場合は、すべてのデバイスを監視します。\n"
- "\n"
-
--#: ../clients/cli/devices.c:837
-+#: ../clients/cli/devices.c:831
- #, fuzzy, c-format
- msgid ""
- "Usage: nmcli device wifi { ARGUMENTS | help }\n"
-@@ -2774,7 +2768,7 @@ msgstr ""
- "表示するためのコマンドは 'nmcli device wifi list' です。\n"
- "\n"
-
--#: ../clients/cli/devices.c:884
-+#: ../clients/cli/devices.c:878
- #, c-format
- msgid ""
- "Usage: nmcli device lldp { ARGUMENTS | help }\n"
-@@ -2795,257 +2789,241 @@ msgstr ""
- "特定のインターフェースの近接デバイスを一覧表示できます。\n"
- "\n"
-
--#: ../clients/cli/devices.c:982
-+#: ../clients/cli/devices.c:976
- #, c-format
- msgid "Error: No interface specified."
- msgstr "エラー: インターフェースが指定されていません。"
-
--#: ../clients/cli/devices.c:1005
-+#: ../clients/cli/devices.c:999
- #, c-format
- msgid "Warning: argument '%s' is duplicated.\n"
- msgstr "警告: 引数 '%s' が重複しています。\n"
-
--#: ../clients/cli/devices.c:1008
-+#: ../clients/cli/devices.c:1002
- #, c-format
- msgid "Error: Device '%s' not found.\n"
- msgstr "エラー: デバイス'%s' が見つかりません。\n"
-
--#: ../clients/cli/devices.c:1009
-+#: ../clients/cli/devices.c:1003
- #, c-format
- msgid "Error: not all devices found."
- msgstr "エラー: 一部のデバイスが見つかりません。"
-
--#: ../clients/cli/devices.c:1040
-+#: ../clients/cli/devices.c:1034
- msgid "No interface specified"
- msgstr "インターフェースが指定されていません"
-
--#: ../clients/cli/devices.c:1059
-+#: ../clients/cli/devices.c:1053
- #, c-format
- msgid "Device '%s' not found"
- msgstr "デバイス'%s' が見つかりません"
-
--#: ../clients/cli/devices.c:1155
-+#: ../clients/cli/devices.c:1149
- #, c-format
- msgid "%u MHz"
- msgstr "%u MHz"
-
--#: ../clients/cli/devices.c:1156
-+#: ../clients/cli/devices.c:1150
- #, c-format
- msgid "%u Mbit/s"
- msgstr "%u Mbit/s"
-
--#: ../clients/cli/devices.c:1167
--msgid "WEP"
--msgstr "WEP"
--
--#: ../clients/cli/devices.c:1171
--msgid "WPA1"
--msgstr "WPA1"
--
--#: ../clients/cli/devices.c:1175
--msgid "WPA2"
--msgstr "WPA2"
--
--#: ../clients/cli/devices.c:1180
--msgid "802.1X"
--msgstr "802.1X"
--
--#: ../clients/cli/devices.c:1195
-+#: ../clients/cli/devices.c:1189
- msgid "Ad-Hoc"
- msgstr "アドホック"
-
--#: ../clients/cli/devices.c:1196
-+#: ../clients/cli/devices.c:1190
- msgid "Infra"
- msgstr "インフラ"
-
--#: ../clients/cli/devices.c:1197
-+#: ../clients/cli/devices.c:1191
- msgid "N/A"
- msgstr "なし"
-
--#: ../clients/cli/devices.c:1392
-+#: ../clients/cli/devices.c:1386
- msgid "Device details"
- msgstr "デバイスの詳細"
-
--#: ../clients/cli/devices.c:1403
-+#: ../clients/cli/devices.c:1397
- #, c-format
- msgid "Error: 'device show': %s"
- msgstr "エラー: 'device show': %s"
-
--#: ../clients/cli/devices.c:1701
-+#: ../clients/cli/devices.c:1695
- msgid "Status of devices"
- msgstr "デバイスの状態"
-
--#: ../clients/cli/devices.c:1705
-+#: ../clients/cli/devices.c:1699
- #, c-format
- msgid "Error: 'device status': %s"
- msgstr "エラー: 'device status': %s"
-
--#: ../clients/cli/devices.c:1732 ../clients/cli/devices.c:2173
--#: ../clients/cli/devices.c:4144
-+#: ../clients/cli/devices.c:1726 ../clients/cli/devices.c:2167
-+#: ../clients/cli/devices.c:4141
- #, c-format
- msgid "Error: invalid extra argument '%s'."
- msgstr "エラー: '%s' は無効な追加引数です。"
-
--#: ../clients/cli/devices.c:1768 ../clients/cli/general.c:518
-+#: ../clients/cli/devices.c:1762 ../clients/cli/general.c:519
- #, c-format
- msgid "Error: Timeout %d sec expired."
- msgstr "エラー: 制限時間の %d 秒が経過"
-
--#: ../clients/cli/devices.c:1817
-+#: ../clients/cli/devices.c:1811
- #, c-format
- msgid "Device '%s' successfully activated with '%s'.\n"
- msgstr "デバイス '%s' が '%s' で正常にアクティベートされました。\n"
-
--#: ../clients/cli/devices.c:1823
-+#: ../clients/cli/devices.c:1817
- #, c-format
- msgid "Error: Connection activation failed: (%d) %s.\n"
- msgstr "エラー: 接続のアクティベーションに失敗しました: (%d) %s.\n"
-
--#: ../clients/cli/devices.c:1862
-+#: ../clients/cli/devices.c:1856
- #, c-format
- msgid "Error: Failed to setup a Wi-Fi hotspot: %s"
- msgstr "エラー: Wi-Fi hotspot の設定に失敗しました: %s"
-
--#: ../clients/cli/devices.c:1865
-+#: ../clients/cli/devices.c:1859
- #, c-format
- msgid "Error: Failed to add/activate new connection: %s"
- msgstr "エラー: 新規接続の追加またはアクティベートに失敗しました: %s"
-
--#: ../clients/cli/devices.c:1868
-+#: ../clients/cli/devices.c:1862
- #, fuzzy, c-format
- msgid "Error: Failed to activate connection: %s"
- msgstr "エラー: 新規接続の追加またはアクティベートに失敗しました: %s"
-
--#: ../clients/cli/devices.c:1938
-+#: ../clients/cli/devices.c:1932
- #, c-format
- msgid "Error: Device activation failed: %s"
- msgstr "エラー: デバイスのアクティベートに失敗しました: %s"
-
--#: ../clients/cli/devices.c:1947
-+#: ../clients/cli/devices.c:1941
- #, c-format
- msgid "Error: Device activation failed: device was disconnected"
- msgstr ""
- "エラー: デバイスのアクティベートに失敗しました: デバイスが切断されました"
-
--#: ../clients/cli/devices.c:2000
-+#: ../clients/cli/devices.c:1994
- #, c-format
- msgid "Error: extra argument not allowed: '%s'."
- msgstr "エラー: 追加の引数は許可されていません: '%s'。"
-
--#: ../clients/cli/devices.c:2073 ../clients/cli/devices.c:2088
--#: ../clients/cli/devices.c:2325
-+#: ../clients/cli/devices.c:2067 ../clients/cli/devices.c:2082
-+#: ../clients/cli/devices.c:2319
- #, c-format
- msgid "Device '%s' successfully disconnected.\n"
- msgstr "デバイス '%s' が正常に切断されました。\n"
-
--#: ../clients/cli/devices.c:2076 ../clients/cli/devices.c:2399
-+#: ../clients/cli/devices.c:2070 ../clients/cli/devices.c:2393
- #, c-format
- msgid "Device '%s' successfully removed.\n"
- msgstr "デバイス '%s' が正常に削除されました。\n"
-
--#: ../clients/cli/devices.c:2138 ../clients/cli/devices.c:2208
-+#: ../clients/cli/devices.c:2132 ../clients/cli/devices.c:2202
- #, c-format
- msgid "Error: Reapplying connection to device '%s' (%s) failed: %s"
- msgstr "エラー: デバイス '%s' (%s) への接続の再適用に失敗しました: %s"
-
--#: ../clients/cli/devices.c:2148 ../clients/cli/devices.c:2217
-+#: ../clients/cli/devices.c:2142 ../clients/cli/devices.c:2211
- #, c-format
- msgid "Connection successfully reapplied to device '%s'.\n"
- msgstr "接続がデバイス '%s' に正常に再適用されました。\n"
-
--#: ../clients/cli/devices.c:2242
-+#: ../clients/cli/devices.c:2236
- #, c-format
- msgid "Error: Reading applied connection from device '%s' (%s) failed: %s"
- msgstr ""
- "エラー: デバイス '%s' (%s) からの適用済み接続の読み取りに失敗しました: %s"
-
--#: ../clients/cli/devices.c:2309
-+#: ../clients/cli/devices.c:2303
- #, c-format
- msgid "Error: not all devices disconnected."
- msgstr "エラー: 一部のデバイスが切断されませんでした。"
-
--#: ../clients/cli/devices.c:2310
-+#: ../clients/cli/devices.c:2304
- #, c-format
- msgid "Error: Device '%s' (%s) disconnecting failed: %s\n"
- msgstr "エラー: デバイス '%s' (%s) の切断に失敗しました: %s\n"
-
--#: ../clients/cli/devices.c:2390
-+#: ../clients/cli/devices.c:2384
- #, c-format
- msgid "Error: not all devices deleted."
- msgstr "エラー: 一部のデバイスが削除されませんでした。"
-
--#: ../clients/cli/devices.c:2391
-+#: ../clients/cli/devices.c:2385
- #, c-format
- msgid "Error: Device '%s' (%s) deletion failed: %s\n"
- msgstr "エラー: デバイス '%s' (%s) の削除に失敗しました: %s\n"
-
--#: ../clients/cli/devices.c:2473
-+#: ../clients/cli/devices.c:2467
- #, c-format
- msgid "Error: No property specified."
- msgstr "エラー: プロパティーが指定されていません。"
-
--#: ../clients/cli/devices.c:2488 ../clients/cli/devices.c:2505
--#: ../clients/cli/general.c:691 ../clients/cli/general.c:703
-+#: ../clients/cli/devices.c:2482 ../clients/cli/devices.c:2499
-+#: ../clients/cli/general.c:692 ../clients/cli/general.c:704
- #, c-format
- msgid "Error: '%s' argument is missing."
- msgstr "エラー: '%s' 引数がありません。"
-
--#: ../clients/cli/devices.c:2494
-+#: ../clients/cli/devices.c:2488
- #, c-format
- msgid "Error: 'managed': %s."
- msgstr "エラー: 'managed': %s。"
-
--#: ../clients/cli/devices.c:2511
-+#: ../clients/cli/devices.c:2505
- #, c-format
- msgid "Error: 'autoconnect': %s."
- msgstr "エラー: '自動接続': %s。"
-
--#: ../clients/cli/devices.c:2519 ../clients/cli/general.c:717
-+#: ../clients/cli/devices.c:2513 ../clients/cli/general.c:718
- #, c-format
- msgid "Error: property '%s' is not known."
- msgstr "エラー: プロパティー '%s' が不明です。"
-
--#: ../clients/cli/devices.c:2568
-+#: ../clients/cli/devices.c:2562
- #, c-format
- msgid "%s: using connection '%s'\n"
- msgstr "%s: 接続 '%s' を使用中\n"
-
--#: ../clients/cli/devices.c:2594
-+#: ../clients/cli/devices.c:2588
- #, c-format
- msgid "%s: device created\n"
- msgstr "%s: デバイスが作成されました\n"
-
--#: ../clients/cli/devices.c:2601
-+#: ../clients/cli/devices.c:2595
- #, c-format
- msgid "%s: device removed\n"
- msgstr "%s: デバイスが削除されました\n"
-
--#: ../clients/cli/devices.c:2781
-+#: ../clients/cli/devices.c:2775
- msgid "Wi-Fi scan list"
- msgstr "Wi-Fi スキャン一覧"
-
--#: ../clients/cli/devices.c:2868
-+#: ../clients/cli/devices.c:2862
- #, c-format
- msgid "Error: Access point with bssid '%s' not found."
- msgstr "エラー: bssid '%s' のアクセスポイントが見つかりません。"
-
--#: ../clients/cli/devices.c:3024
-+#: ../clients/cli/devices.c:3018
- #, c-format
- msgid "Error: 'device wifi': %s"
- msgstr "エラー: 'dev wifi': %s"
-
--#: ../clients/cli/devices.c:3042
-+#: ../clients/cli/devices.c:3036
- #, c-format
- msgid "Error: invalid rescan argument: '%s' not among [auto, no, yes]"
- msgstr ""
- "エラー: 無効な再スキャン引数です: '%s' は [auto、no、yes] にはありません"
-
--#: ../clients/cli/devices.c:3049
-+#: ../clients/cli/devices.c:3043
- #, c-format
- msgid "Error: Device '%s' not found."
- msgstr "エラー: デバイス'%s' が見つかりません"
-
--#: ../clients/cli/devices.c:3060
-+#: ../clients/cli/devices.c:3054
- #, c-format
- msgid ""
- "Error: Device '%s' was not recognized as a Wi-Fi device, check "
-@@ -3054,27 +3032,27 @@ msgstr ""
- "エラー: デバイス '%s' が Wi-Fi デバイスとして認識されませんでした。"
- "NetworkManager Wi-Fi プラグインを確認してください。"
-
--#: ../clients/cli/devices.c:3064 ../clients/cli/devices.c:3324
--#: ../clients/cli/devices.c:3823 ../clients/cli/devices.c:3982
-+#: ../clients/cli/devices.c:3058 ../clients/cli/devices.c:3318
-+#: ../clients/cli/devices.c:3819 ../clients/cli/devices.c:3979
- #, c-format
- msgid "Error: Device '%s' is not a Wi-Fi device."
- msgstr "エラー: デバイス '%s' は Wi-Fi デバイスではありません。"
-
--#: ../clients/cli/devices.c:3173
-+#: ../clients/cli/devices.c:3167
- msgid "SSID or BSSID: "
- msgstr "SSID または BSSID: "
-
--#: ../clients/cli/devices.c:3178
-+#: ../clients/cli/devices.c:3172
- #, c-format
- msgid "Error: SSID or BSSID are missing."
- msgstr "エラー: SSID または BSSID がありません。"
-
--#: ../clients/cli/devices.c:3215
-+#: ../clients/cli/devices.c:3209
- #, c-format
- msgid "Error: bssid argument value '%s' is not a valid BSSID."
- msgstr "エラー: bssid の引数値 '%s' は、有効な BSSID ではありません。"
-
--#: ../clients/cli/devices.c:3245
-+#: ../clients/cli/devices.c:3239
- #, c-format
- msgid ""
- "Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
-@@ -3082,182 +3060,182 @@ msgstr ""
- "エラー: wep-key-type の引数値 '%s' は無効です。'key' または 'phrase' を使用し"
- "てください。"
-
--#: ../clients/cli/devices.c:3272 ../clients/cli/devices.c:3290
-+#: ../clients/cli/devices.c:3266 ../clients/cli/devices.c:3284
- #, c-format
- msgid "Error: %s: %s."
- msgstr "エラー: %s: %s。"
-
--#: ../clients/cli/devices.c:3307
-+#: ../clients/cli/devices.c:3301
- #, c-format
- msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
- msgstr ""
- "エラー: (%s) が接続先となる BSSID は、bssid 引数 (%s) により異なります。"
-
--#: ../clients/cli/devices.c:3313
-+#: ../clients/cli/devices.c:3307
- #, c-format
- msgid "Error: Parameter '%s' is neither SSID nor BSSID."
- msgstr "エラー: パラメーター '%s' は、SSID、BSSID のいずれでもありません。"
-
--#: ../clients/cli/devices.c:3326 ../clients/cli/devices.c:3825
--#: ../clients/cli/devices.c:3984
-+#: ../clients/cli/devices.c:3320 ../clients/cli/devices.c:3821
-+#: ../clients/cli/devices.c:3981
- #, c-format
- msgid "Error: No Wi-Fi device found."
- msgstr "エラー: Wi-Fi デバイスが見つかりませんでした。"
-
--#: ../clients/cli/devices.c:3346
-+#: ../clients/cli/devices.c:3340
- #, c-format
- msgid "Error: Failed to scan hidden SSID: %s."
- msgstr "エラー: 非表示の SSID のスキャンに失敗しました: %s。"
-
--#: ../clients/cli/devices.c:3373
-+#: ../clients/cli/devices.c:3367
- #, c-format
- msgid "Error: No network with SSID '%s' found."
- msgstr "エラー: SSID が '%s' のネットワークが見つかりませんでした。"
-
--#: ../clients/cli/devices.c:3375
-+#: ../clients/cli/devices.c:3369
- #, c-format
- msgid "Error: No access point with BSSID '%s' found."
- msgstr "エラー: BSSID が '%s' のアクセスポイントが見つかりませんでした。"
-
--#: ../clients/cli/devices.c:3403
-+#: ../clients/cli/devices.c:3397
- #, c-format
- msgid "Error: Connection '%s' exists but properties don't match."
- msgstr ""
-
--#: ../clients/cli/devices.c:3446
-+#: ../clients/cli/devices.c:3440
- #, 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:3482
-+#: ../clients/cli/devices.c:3477
- msgid "Password: "
- msgstr "パスワード: "
-
--#: ../clients/cli/devices.c:3644
-+#: ../clients/cli/devices.c:3640
- #, c-format
- msgid "'%s' is not valid WPA PSK"
- msgstr "'%s' は有効な WPA PSK ではありません"
-
--#: ../clients/cli/devices.c:3661
-+#: ../clients/cli/devices.c:3657
- #, 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:3673
- #, c-format
- msgid "Hotspot password: %s\n"
- msgstr "ホットスポットのパスワード: %s\n"
-
--#: ../clients/cli/devices.c:3748
-+#: ../clients/cli/devices.c:3744
- #, c-format
- msgid "Error: ssid is too long."
- msgstr "エラー: ssid が長すぎます。"
-
--#: ../clients/cli/devices.c:3762
-+#: ../clients/cli/devices.c:3758
- #, c-format
- msgid "Error: band argument value '%s' is invalid; use 'a' or 'bg'."
- msgstr ""
- "エラー: バンド引数値 '%s' は無効です。'a' または 'bg' を使用してください。"
-
--#: ../clients/cli/devices.c:3787
-+#: ../clients/cli/devices.c:3783
- #, c-format
- msgid "Error: Unknown parameter %s."
- msgstr "エラー: 不明なパラメータ %s です。"
-
--#: ../clients/cli/devices.c:3807
-+#: ../clients/cli/devices.c:3803
- #, c-format
- msgid "Error: channel requires band too."
- msgstr "エラー: チャネルにはバンドも必要です。"
-
--#: ../clients/cli/devices.c:3812
-+#: ../clients/cli/devices.c:3808
- #, c-format
- msgid "Error: channel '%s' not valid for band '%s'."
- msgstr "エラー: チャンネル '%s' は、バンド '%s' に対して有効ではありません。"
-
--#: ../clients/cli/devices.c:3836
-+#: ../clients/cli/devices.c:3832
- #, 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:3866
- #, c-format
- msgid "Error: Invalid 'password': %s."
- msgstr "エラー: 無効なパスワード: %s。"
-
--#: ../clients/cli/devices.c:3945
-+#: ../clients/cli/devices.c:3942
- #, c-format
- msgid "Error: '%s' cannot repeat."
- msgstr "エラー: '%s' を繰り返すことはできません。"
-
- #. Main header name
--#: ../clients/cli/devices.c:4050
-+#: ../clients/cli/devices.c:4047
- msgid "Device LLDP neighbors"
- msgstr "LLDP 近接デバイス"
-
--#: ../clients/cli/devices.c:4160
-+#: ../clients/cli/devices.c:4157
- #, c-format
- msgid "Error: 'device lldp list': %s"
- msgstr "エラー: 'device lldp list': %s"
-
--#: ../clients/cli/general.c:42
-+#: ../clients/cli/general.c:41
- msgid "asleep"
- msgstr "休止中"
-
--#: ../clients/cli/general.c:43
-+#: ../clients/cli/general.c:42
- msgid "connecting"
- msgstr "接続中"
-
--#: ../clients/cli/general.c:44
-+#: ../clients/cli/general.c:43
- msgid "connected (local only)"
- msgstr "接続完了 (ローカルのみ)"
-
--#: ../clients/cli/general.c:45
-+#: ../clients/cli/general.c:44
- msgid "connected (site only)"
- msgstr "接続完了 (サイトのみ)"
-
--#: ../clients/cli/general.c:46 ../clients/common/nm-client-utils.c:270
-+#: ../clients/cli/general.c:45 ../clients/common/nm-client-utils.c:274
- msgid "connected"
- msgstr "接続済み"
-
--#: ../clients/cli/general.c:47
-+#: ../clients/cli/general.c:46
- msgid "disconnecting"
- msgstr "切断中"
-
--#: ../clients/cli/general.c:48 ../clients/common/nm-client-utils.c:263
-+#: ../clients/cli/general.c:47 ../clients/common/nm-client-utils.c:267
- msgid "disconnected"
- msgstr "切断済み"
-
--#: ../clients/cli/general.c:137
-+#: ../clients/cli/general.c:138
- msgid "auth"
- msgstr "認証"
-
--#: ../clients/cli/general.c:165
-+#: ../clients/cli/general.c:166
- msgid "running"
- msgstr "実行中"
-
--#: ../clients/cli/general.c:179
-+#: ../clients/cli/general.c:180
- msgid "starting"
- msgstr "起動中"
-
--#: ../clients/cli/general.c:179
-+#: ../clients/cli/general.c:180
- msgid "started"
- msgstr "起動しました"
-
--#: ../clients/cli/general.c:213
-+#: ../clients/cli/general.c:214
- msgid "enabled"
- msgstr "有効"
-
--#: ../clients/cli/general.c:213
-+#: ../clients/cli/general.c:214
- msgid "disabled"
- msgstr "無効"
-
--#: ../clients/cli/general.c:331
-+#: ../clients/cli/general.c:332
- #, c-format
- msgid ""
- "Usage: nmcli general { COMMAND | help }\n"
-@@ -3286,7 +3264,7 @@ msgstr ""
- " logging [level <ログレベル>] [domains <ログドメイン>]\n"
- "\n"
-
--#: ../clients/cli/general.c:342
-+#: ../clients/cli/general.c:343
- #, c-format
- msgid ""
- "Usage: nmcli general status { help }\n"
-@@ -3303,7 +3281,7 @@ msgstr ""
- "status' を実行したことになります。\n"
- "\n"
-
--#: ../clients/cli/general.c:351
-+#: ../clients/cli/general.c:352
- #, c-format
- msgid ""
- "Usage: nmcli general hostname { ARGUMENTS | help }\n"
-@@ -3326,7 +3304,7 @@ msgstr ""
- "渡すと、そのホスト名をシステムの永続的なホスト名として新たに設定します。\n"
- "\n"
-
--#: ../clients/cli/general.c:363
-+#: ../clients/cli/general.c:364
- #, c-format
- msgid ""
- "Usage: nmcli general permissions { help }\n"
-@@ -3339,7 +3317,7 @@ msgstr ""
- "認証されている操作に対する呼び出し側のパーミッションを表示します。\n"
- "\n"
-
--#: ../clients/cli/general.c:371
-+#: ../clients/cli/general.c:372
- #, c-format
- msgid ""
- "Usage: nmcli general logging { ARGUMENTS | help }\n"
-@@ -3365,7 +3343,7 @@ msgstr ""
- "使用できるログ記録のドメイン一覧については man ページを参照してください。\n"
- "\n"
-
--#: ../clients/cli/general.c:384
-+#: ../clients/cli/general.c:385
- #, c-format
- msgid ""
- "Usage: nmcli networking { COMMAND | help }\n"
-@@ -3390,7 +3368,7 @@ msgstr ""
- " connectivity [check]\n"
- "\n"
-
--#: ../clients/cli/general.c:394
-+#: ../clients/cli/general.c:395
- #, c-format
- msgid ""
- "Usage: nmcli networking on { help }\n"
-@@ -3403,7 +3381,7 @@ msgstr ""
- "ネットワークをオンに切り替えます。\n"
- "\n"
-
--#: ../clients/cli/general.c:402
-+#: ../clients/cli/general.c:403
- #, c-format
- msgid ""
- "Usage: nmcli networking off { help }\n"
-@@ -3416,7 +3394,7 @@ msgstr ""
- "ネットワークをオフに切り替えます。\n"
- "\n"
-
--#: ../clients/cli/general.c:410
-+#: ../clients/cli/general.c:411
- #, c-format
- msgid ""
- "Usage: nmcli networking connectivity { ARGUMENTS | help }\n"
-@@ -3435,7 +3413,7 @@ msgstr ""
- "ネットワークの接続状態を取得します。\n"
- "オプションの 'check' 引数を付けると接続を再チェックします。\n"
-
--#: ../clients/cli/general.c:422
-+#: ../clients/cli/general.c:423
- #, c-format
- msgid ""
- "Usage: nmcli radio { COMMAND | help }\n"
-@@ -3452,7 +3430,7 @@ msgstr ""
- " all | wifi | wwan [ on | off ]\n"
- "\n"
-
--#: ../clients/cli/general.c:431
-+#: ../clients/cli/general.c:432
- #, c-format
- msgid ""
- "Usage: nmcli radio all { ARGUMENTS | help }\n"
-@@ -3469,7 +3447,7 @@ msgstr ""
- "すべてのラジオスイッチの状態を取得、またはオンかオフにします。\n"
- "\n"
-
--#: ../clients/cli/general.c:441
-+#: ../clients/cli/general.c:442
- #, c-format
- msgid ""
- "Usage: nmcli radio wifi { ARGUMENTS | help }\n"
-@@ -3486,7 +3464,7 @@ msgstr ""
- "Wi-Fi ラジオスイッチの状態を取得、またはオンかオフにします。\n"
- "\n"
-
--#: ../clients/cli/general.c:451
-+#: ../clients/cli/general.c:452
- #, c-format
- msgid ""
- "Usage: nmcli radio wwan { ARGUMENTS | help }\n"
-@@ -3504,7 +3482,7 @@ msgstr ""
- "す。\n"
- "\n"
-
--#: ../clients/cli/general.c:461
-+#: ../clients/cli/general.c:462
- #, c-format
- msgid ""
- "Usage: nmcli monitor\n"
-@@ -3519,180 +3497,180 @@ msgstr ""
- "NetworkManager で変更が行われるたびに行を出力します。\n"
- "\n"
-
--#: ../clients/cli/general.c:491
-+#: ../clients/cli/general.c:492
- msgid "NetworkManager status"
- msgstr "NetworkManager のステータス"
-
--#: ../clients/cli/general.c:495
-+#: ../clients/cli/general.c:496
- #, c-format
- msgid "Error: only these fields are allowed: %s"
- msgstr "エラー: 使用できるのは次のフィールドのみです: %s"
-
--#: ../clients/cli/general.c:548
-+#: ../clients/cli/general.c:549
- msgid "NetworkManager permissions"
- msgstr "NetworkManager のパーミッション"
-
--#: ../clients/cli/general.c:552
-+#: ../clients/cli/general.c:553
- #, c-format
- msgid "Error: 'general permissions': %s"
- msgstr "エラー: 'general permissions': %s"
-
--#: ../clients/cli/general.c:641
-+#: ../clients/cli/general.c:642
- msgid "NetworkManager logging"
- msgstr "NetworkManager のロギング"
-
--#: ../clients/cli/general.c:645
-+#: ../clients/cli/general.c:646
- #, c-format
- msgid "Error: 'general logging': %s"
- msgstr "エラー: 'general logging': %s"
-
--#: ../clients/cli/general.c:727
-+#: ../clients/cli/general.c:728
- #, c-format
- msgid "Error: failed to set logging: %s"
- msgstr "エラー: ロギングの設定に失敗しました: %s"
-
--#: ../clients/cli/general.c:744
-+#: ../clients/cli/general.c:745
- #, c-format
- msgid "Error: failed to set hostname: %s"
- msgstr "エラー: ホスト名の設定に失敗しました: %s"
-
--#: ../clients/cli/general.c:813
-+#: ../clients/cli/general.c:814
- #, c-format
- msgid "Error: '--fields' value '%s' is not valid here (allowed field: %s)"
- msgstr ""
- "エラー: '--fields' の値 '%s' はここでは無効です (使用できるフィールド: %s)"
-
--#: ../clients/cli/general.c:838
-+#: ../clients/cli/general.c:839
- #, 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:886 ../clients/cli/general.c:898
-+#: ../clients/cli/general.c:887 ../clients/cli/general.c:899
- msgid "Connectivity"
- msgstr "接続性"
-
--#: ../clients/cli/general.c:901
-+#: ../clients/cli/general.c:902
- #, c-format
- msgid "Error: 'networking' command '%s' is not valid."
- msgstr ""
- "エラー: 'networking' のコマンド '%s' は、有効なコマンドではありません。"
-
--#: ../clients/cli/general.c:915
-+#: ../clients/cli/general.c:916
- msgid "Networking"
- msgstr "ネットワーキング"
-
- #. no argument, show all radio switches
--#: ../clients/cli/general.c:950
-+#: ../clients/cli/general.c:951
- msgid "Radio switches"
- msgstr "ラジオスイッチ"
-
- #. no argument, show current Wi-Fi state
--#: ../clients/cli/general.c:980
-+#: ../clients/cli/general.c:981
- msgid "Wi-Fi radio switch"
- msgstr "Wi-Fi ラジオスイッチ"
-
- #. no argument, show current WWAN (mobile broadband) state
--#: ../clients/cli/general.c:1007
-+#: ../clients/cli/general.c:1008
- msgid "WWAN radio switch"
- msgstr "WWAN ラジオスイッチ"
-
--#: ../clients/cli/general.c:1055
-+#: ../clients/cli/general.c:1056
- msgid "NetworkManager has started"
- msgstr "NetworkManager が起動されました"
-
--#: ../clients/cli/general.c:1055
-+#: ../clients/cli/general.c:1056
- msgid "NetworkManager has stopped"
- msgstr "NetworkManager が停止しました"
-
--#: ../clients/cli/general.c:1066
-+#: ../clients/cli/general.c:1067
- #, c-format
- msgid "Hostname set to '%s'\n"
- msgstr "ホスト名が '%s' に設定されました\n"
-
--#: ../clients/cli/general.c:1081
-+#: ../clients/cli/general.c:1082
- #, c-format
- msgid "'%s' is now the primary connection\n"
- msgstr "'%s' はプライマリー接続です\n"
-
--#: ../clients/cli/general.c:1083
-+#: ../clients/cli/general.c:1084
- #, c-format
- msgid "There's no primary connection\n"
- msgstr "プライマリー接続がありません\n"
-
--#: ../clients/cli/general.c:1095
-+#: ../clients/cli/general.c:1096
- #, c-format
- msgid "Connectivity is now '%s'\n"
- msgstr "接続性は '%s' です\n"
-
--#: ../clients/cli/general.c:1109
-+#: ../clients/cli/general.c:1110
- #, c-format
- msgid "Networkmanager is now in the '%s' state\n"
- msgstr "Networkmanager の状態は '%s' です\n"
-
--#: ../clients/cli/general.c:1129
-+#: ../clients/cli/general.c:1130
- msgid "connection available"
- msgstr "接続が利用可能"
-
--#: ../clients/cli/general.c:1131
-+#: ../clients/cli/general.c:1132
- msgid "connections available"
- msgstr "接続が利用可能"
-
--#: ../clients/cli/general.c:1149
-+#: ../clients/cli/general.c:1150
- msgid "autoconnect"
- msgstr "自動接続"
-
--#: ../clients/cli/general.c:1151
-+#: ../clients/cli/general.c:1152
- msgid "fw missing"
- msgstr "fw がありません"
-
--#: ../clients/cli/general.c:1156
-+#: ../clients/cli/general.c:1157
- msgid "plugin missing"
- msgstr "プラグインがありません"
-
--#: ../clients/cli/general.c:1161
-+#: ../clients/cli/general.c:1162
- msgid "sw"
- msgstr "sw"
-
--#: ../clients/cli/general.c:1163
-+#: ../clients/cli/general.c:1164
- msgid "hw"
- msgstr "hw"
-
--#: ../clients/cli/general.c:1168
-+#: ../clients/cli/general.c:1169
- msgid "iface"
- msgstr "iface"
-
--#: ../clients/cli/general.c:1171
-+#: ../clients/cli/general.c:1172
- msgid "port"
- msgstr "ポート"
-
--#: ../clients/cli/general.c:1174
-+#: ../clients/cli/general.c:1175
- msgid "mtu"
- msgstr "mtu"
-
--#: ../clients/cli/general.c:1191
-+#: ../clients/cli/general.c:1192
- msgid "master"
- msgstr "マスター"
-
--#: ../clients/cli/general.c:1195 ../clients/tui/nm-editor-utils.c:239
-+#: ../clients/cli/general.c:1196 ../clients/tui/nm-editor-utils.c:239
- #: ../clients/tui/nmt-connect-connection-list.c:407
- msgid "VPN"
- msgstr "VPN"
-
--#: ../clients/cli/general.c:1197
-+#: ../clients/cli/general.c:1198
- msgid "ip4 default"
- msgstr "ip4 デフォルト"
-
--#: ../clients/cli/general.c:1199
-+#: ../clients/cli/general.c:1200
- msgid "ip6 default"
- msgstr "ip6 デフォルト"
-
--#: ../clients/cli/general.c:1281
-+#: ../clients/cli/general.c:1282
- #, c-format
- msgid "%s VPN connection"
- msgstr "%s VPN 接続"
-
--#: ../clients/cli/general.c:1349
-+#: ../clients/cli/general.c:1350
- #, c-format
- msgid ""
- "Use \"nmcli device show\" to get complete information about known devices "
-@@ -3710,16 +3688,16 @@ msgstr ""
- "使用方法の詳細情報については、nmcli(1) と nmcli-examples(7) の man ページを参"
- "照してください。\n"
-
--#: ../clients/cli/general.c:1370
-+#: ../clients/cli/general.c:1371
- #, c-format
- msgid "Error: 'monitor' command '%s' is not valid."
- msgstr "エラー: 'monitor' コマンド '%s' は有効ではありません。"
-
--#: ../clients/cli/general.c:1382
-+#: ../clients/cli/general.c:1383
- msgid "Networkmanager is not running (waiting for it)\n"
- msgstr "Networkmanager が実行されていません (待機中)\n"
-
--#: ../clients/cli/nmcli.c:245
-+#: ../clients/cli/nmcli.c:244
- #, fuzzy, c-format
- msgid ""
- "Usage: nmcli [OPTIONS] OBJECT { COMMAND | help }\n"
-@@ -3737,7 +3715,7 @@ msgid ""
- " -p, --pretty pretty output\n"
- " -s, --show-secrets allow displaying passwords\n"
- " -t, --terse terse output\n"
--" -v, --version how program version\n"
-+" -v, --version show program version\n"
- " -w, --wait <seconds> set timeout waiting for finishing "
- "operations\n"
- "\n"
-@@ -3783,96 +3761,96 @@ msgstr ""
- " m[onitor] monitor NetworkManager changes\n"
- "\n"
-
--#: ../clients/cli/nmcli.c:325
-+#: ../clients/cli/nmcli.c:324
- #, c-format
- msgid "Error: missing argument for '%s' option."
- msgstr "エラー: %s オプション用の引数がありません。"
-
--#: ../clients/cli/nmcli.c:626
-+#: ../clients/cli/nmcli.c:625
- #, c-format
- msgid "Unexpected end of file following '%s'\n"
- msgstr "'%s' に続く、予期せぬファイルの終了\n"
-
--#: ../clients/cli/nmcli.c:634
-+#: ../clients/cli/nmcli.c:633
- #, c-format
- msgid "Expected whitespace following '%s'\n"
- msgstr "'%s' に続く、必要なホワイトスペース\n"
-
--#: ../clients/cli/nmcli.c:646
-+#: ../clients/cli/nmcli.c:645
- #, c-format
- msgid "Expected a value for '%s'\n"
- msgstr "'%s' には値が必要です\n"
-
--#: ../clients/cli/nmcli.c:660
-+#: ../clients/cli/nmcli.c:659
- #, c-format
- msgid "Expected a line break following '%s'\n"
- msgstr "'%s' に続く改行が必要です\n"
-
--#: ../clients/cli/nmcli.c:749
-+#: ../clients/cli/nmcli.c:748
- #, c-format
- msgid "Error: Option '--terse' is specified the second time."
- msgstr "エラー: オプション '--terse' が二度指定されています。"
-
--#: ../clients/cli/nmcli.c:754
-+#: ../clients/cli/nmcli.c:753
- #, c-format
- msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
- msgstr "エラー: オプション '--terse' は '--pretty' と相互に排他的です。"
-
--#: ../clients/cli/nmcli.c:762
-+#: ../clients/cli/nmcli.c:761
- #, c-format
- msgid "Error: Option '--pretty' is specified the second time."
- msgstr "エラー: オプション '--pretty' が二度指定されています。"
-
--#: ../clients/cli/nmcli.c:767
-+#: ../clients/cli/nmcli.c:766
- #, c-format
- msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
- msgstr "エラー: オプション '--pretty' は '--terse' と相互に排他的です。"
-
--#: ../clients/cli/nmcli.c:782
-+#: ../clients/cli/nmcli.c:781
- #, c-format
- msgid "Error: '%s' is not a valid argument for '%s' option."
- msgstr "エラー: '%s' は、'%s' オプションの有効な引数ではありません。"
-
--#: ../clients/cli/nmcli.c:796 ../clients/cli/nmcli.c:808
-+#: ../clients/cli/nmcli.c:795 ../clients/cli/nmcli.c:807
- #, c-format
- msgid "Error: '%s' is not valid argument for '%s' option."
- msgstr "エラー: '%s' は、'%s' オプション用の有効な引数ではありません。"
-
--#: ../clients/cli/nmcli.c:832
-+#: ../clients/cli/nmcli.c:831
- #, c-format
- msgid "Error: '%s' is not a valid timeout."
- msgstr "エラー: '%s' は有効なタイムアウトではありません。"
-
--#: ../clients/cli/nmcli.c:839
-+#: ../clients/cli/nmcli.c:838
- #, c-format
- msgid "nmcli tool, version %s\n"
- msgstr "nmcli ツール、バージョン %s\n"
-
--#: ../clients/cli/nmcli.c:847
-+#: ../clients/cli/nmcli.c:846
- #, c-format
- msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
- msgstr "エラー: オプション '%s' は不明です。'nmcli -help' で確認してください。"
-
--#: ../clients/cli/nmcli.c:903 ../clients/cli/nmcli.c:910
-+#: ../clients/cli/nmcli.c:902 ../clients/cli/nmcli.c:909
- #, c-format
- msgid "Error: nmcli terminated by signal %s (%d)"
- msgstr "エラー: nmcli がシグナル %s (%d) で終了しました"
-
--#: ../clients/cli/nmcli.c:1060
-+#: ../clients/cli/nmcli.c:1059
- msgid "Success"
- msgstr "成功"
-
--#: ../clients/cli/polkit-agent.c:69
-+#: ../clients/cli/polkit-agent.c:68
- #, c-format
- msgid "Authentication message: %s\n"
- msgstr "認証メッセージ: %s\n"
-
--#: ../clients/cli/polkit-agent.c:77
-+#: ../clients/cli/polkit-agent.c:76
- #, c-format
- msgid "Authentication error: %s\n"
- msgstr "認証エラー: %s\n"
-
--#: ../clients/cli/polkit-agent.c:137
-+#: ../clients/cli/polkit-agent.c:136
- #, c-format
- msgid "Warning: polkit agent initialization failed: %s\n"
- msgstr "警告: polkit エージェントの初期化に失敗しました: %s\n"
-@@ -3887,7 +3865,7 @@ msgstr "'%s' を '%s' に設定しますか? [yes]: "
- msgid "Do you also want to clear '%s'? [yes]: "
- msgstr "'%s' も消去しますか? [yes]: "
-
--#: ../clients/cli/settings.c:224
-+#: ../clients/cli/settings.c:243
- #, c-format
- msgid ""
- "Warning: %s.%s set to '%s', but it might be ignored in infrastructure mode\n"
-@@ -3895,78 +3873,78 @@ msgstr ""
- "警告: %s.%s が '%s' に設定されましたが、インフラストラクチャモードでは無視さ"
- "れることがあります\n"
-
--#: ../clients/cli/settings.c:243
-+#: ../clients/cli/settings.c:262
- #, c-format
- msgid "Warning: setting %s.%s requires removing ipv4 and ipv6 settings\n"
- msgstr ""
- "警告: %s.%s を設定するには、ipv4 と ipv6 の設定を削除する必要があります\n"
-
--#: ../clients/cli/settings.c:245
-+#: ../clients/cli/settings.c:264
- msgid "Do you want to remove them? [yes] "
- msgstr "削除しますか? [yes] "
-
--#: ../clients/cli/settings.c:333
-+#: ../clients/cli/settings.c:352
- #, c-format
- msgid "Warning: %s is not an UUID of any existing connection profile\n"
- msgstr "警告: %s は既存の接続プロファイルの UUID ではありません\n"
-
--#: ../clients/cli/settings.c:338 ../clients/cli/settings.c:351
-+#: ../clients/cli/settings.c:357 ../clients/cli/settings.c:370
- #, c-format
- msgid "'%s' is not a VPN connection profile"
- msgstr "'%s' は VPN 接続プロファイルではありません"
-
--#: ../clients/cli/settings.c:345
-+#: ../clients/cli/settings.c:364
- #, c-format
- msgid "'%s' is not a name of any exiting profile"
- msgstr "'%s' は既存のプロファイルの名前ではありません"
-
--#: ../clients/cli/settings.c:389
-+#: ../clients/cli/settings.c:408
- #, c-format
- msgid "Warning: %s\n"
- msgstr "警告: %s\n"
-
--#: ../clients/cli/settings.c:392
-+#: ../clients/cli/settings.c:411
- #, c-format
- msgid "Info: %s\n"
- msgstr "情報: %s\n"
-
--#: ../clients/cli/settings.c:485
-+#: ../clients/cli/settings.c:504
- msgid "don't know how to get the property value"
- msgstr "プロパティー値の取得方法がわかりません"
-
--#: ../clients/cli/settings.c:575 ../clients/cli/settings.c:617
-+#: ../clients/cli/settings.c:593
- msgid "the property can't be changed"
- msgstr "このプロパティーは変更できません"
-
--#: ../clients/cli/settings.c:731
-+#: ../clients/cli/settings.c:671
- msgid "[NM property description]"
- msgstr "[NM プロパティーの詳細]"
-
--#: ../clients/cli/settings.c:741
-+#: ../clients/cli/settings.c:681
- msgid "[nmcli specific description]"
- msgstr "[nmcli 固有の詳細]"
-
--#: ../clients/cli/utils.c:320
-+#: ../clients/cli/utils.c:318
- #, c-format
- msgid "Error: Argument '%s' was expected, but '%s' provided."
- msgstr "エラー: 引数 '%s' が必要ですが、'%s' が指定されました。"
-
--#: ../clients/cli/utils.c:323
-+#: ../clients/cli/utils.c:321
- #, c-format
- msgid "Error: Unexpected argument '%s'"
- msgstr "エラー: 予期しない引数 '%s' です"
-
--#: ../clients/cli/utils.c:710
-+#: ../clients/cli/utils.c:709
- #, c-format
- msgid "invalid field '%s%s%s'; no such field"
- msgstr "無効なフィールド '%s%s%s'。そのようなフィールドはありません"
-
--#: ../clients/cli/utils.c:714
-+#: ../clients/cli/utils.c:713
- #, c-format
- msgid "invalid field '%s%s%s'; allowed fields: [%s]"
- msgstr "無効なフィールド '%s%s%s'。使用できるフィールド: [%s]"
-
--#: ../clients/cli/utils.c:810
-+#: ../clients/cli/utils.c:809
- #, c-format
- msgid "failure to select field"
- msgstr "フィールドの選択に失敗しました"
-@@ -3981,26 +3959,26 @@ msgstr "nmcli 出力の読み込み中にエラーが発生しました: %s\n"
- msgid "Error writing nmcli output: %s\n"
- msgstr "nmcli 出力の書き込み中にエラーが発生しました: %s\n"
-
--#: ../clients/cli/utils.c:1467
-+#: ../clients/cli/utils.c:1469
- #, c-format
- msgid "Failed to create pager pipe: %s\n"
- msgstr "ページャーパイプの作成に失敗しました: %s\n"
-
--#: ../clients/cli/utils.c:1475
-+#: ../clients/cli/utils.c:1478
- #, c-format
- msgid "Failed to fork pager: %s\n"
- msgstr "ページャーのフォークに失敗しました: %s\n"
-
--#: ../clients/cli/utils.c:1521 ../clients/cli/utils.c:1523
-+#: ../clients/cli/utils.c:1525 ../clients/cli/utils.c:1529
- #, c-format
- msgid "Failed to duplicate pager pipe: %s\n"
- msgstr "ページャーパイプの複製に失敗しました: %s\n"
-
--#: ../clients/cli/utils.h:302 ../clients/common/nm-meta-setting-desc.c:4949
-+#: ../clients/cli/utils.h:302 ../clients/common/nm-meta-setting-desc.c:4237
- msgid "on"
- msgstr "オン"
-
--#: ../clients/cli/utils.h:302 ../clients/common/nm-meta-setting-desc.c:4951
-+#: ../clients/cli/utils.h:302 ../clients/common/nm-meta-setting-desc.c:4239
- msgid "off"
- msgstr "オフ"
-
-@@ -4017,433 +3995,438 @@ 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:117
--#: ../clients/common/nm-client-utils.c:148
-+#: ../clients/common/nm-client-utils.c:121
-+#: ../clients/common/nm-client-utils.c:152
- #, c-format
- msgid "'%s' is ambiguous (%s)"
- msgstr "'%s' が不明瞭です (%s)"
-
--#: ../clients/common/nm-client-utils.c:127
-+#: ../clients/common/nm-client-utils.c:131
- #, c-format
- msgid "'%s' is not valid; use [%s] or [%s]"
- msgstr "'%s' は無効です。[%s] か [%s] を使用してください"
-
--#: ../clients/common/nm-client-utils.c:160
-+#: ../clients/common/nm-client-utils.c:164
- #, c-format
- msgid "'%s' is not valid; use [%s], [%s] or [%s]"
- msgstr "'%s' は無効です。[%s]、[%s]、または [%s] を使用してください"
-
--#: ../clients/common/nm-client-utils.c:209
-+#: ../clients/common/nm-client-utils.c:213
- #, c-format
- msgid "'%s' is ambiguous: %s"
- msgstr "'%s' が不明瞭です: %s"
-
--#: ../clients/common/nm-client-utils.c:219
-+#: ../clients/common/nm-client-utils.c:223
- #, c-format
- msgid "missing name, try one of [%s]"
- msgstr "名前がありません、[%s] のうちのいずれかで試してみてください"
-
--#: ../clients/common/nm-client-utils.c:261
-+#: ../clients/common/nm-client-utils.c:265
- msgid "unmanaged"
- msgstr "管理無し"
-
--#: ../clients/common/nm-client-utils.c:262
-+#: ../clients/common/nm-client-utils.c:266
- msgid "unavailable"
- msgstr "利用不可"
-
--#: ../clients/common/nm-client-utils.c:264
-+#: ../clients/common/nm-client-utils.c:268
- msgid "connecting (prepare)"
- msgstr "接続中 (準備)"
-
--#: ../clients/common/nm-client-utils.c:265
-+#: ../clients/common/nm-client-utils.c:269
- msgid "connecting (configuring)"
- msgstr "接続中 (設定中)"
-
--#: ../clients/common/nm-client-utils.c:266
-+#: ../clients/common/nm-client-utils.c:270
- msgid "connecting (need authentication)"
- msgstr "接続中 (認証が必要)"
-
--#: ../clients/common/nm-client-utils.c:267
-+#: ../clients/common/nm-client-utils.c:271
- msgid "connecting (getting IP configuration)"
- msgstr "接続中 (IP 設定を取得中)"
-
--#: ../clients/common/nm-client-utils.c:268
-+#: ../clients/common/nm-client-utils.c:272
- msgid "connecting (checking IP connectivity)"
- msgstr "接続中 (IP の接続性チェック)"
-
--#: ../clients/common/nm-client-utils.c:269
-+#: ../clients/common/nm-client-utils.c:273
- msgid "connecting (starting secondary connections)"
- msgstr "接続中 (セカンダリー接続を開始)"
-
--#: ../clients/common/nm-client-utils.c:272
-+#: ../clients/common/nm-client-utils.c:276
- msgid "connection failed"
- msgstr "接続に失敗"
-
--#: ../clients/common/nm-client-utils.c:280
-+#: ../clients/common/nm-client-utils.c:284
- msgid "yes (guessed)"
- msgstr "はい (推測)"
-
--#: ../clients/common/nm-client-utils.c:281
-+#: ../clients/common/nm-client-utils.c:285
- 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:287
--#: ../clients/common/nm-client-utils.c:359 ../libnm-glib/nm-device.c:1859
--#: ../libnm/nm-device.c:1437
-+#: ../clients/common/nm-client-utils.c:291
-+#: ../clients/common/nm-client-utils.c:364 ../libnm-glib/nm-device.c:1859
-+#: ../libnm/nm-device.c:1439
- msgid "Unknown"
- msgstr "不明"
-
--#: ../clients/common/nm-client-utils.c:288
-+#: ../clients/common/nm-client-utils.c:292
- msgid "No reason given"
- msgstr "原因不明"
-
--#: ../clients/common/nm-client-utils.c:290
-+#: ../clients/common/nm-client-utils.c:294
- msgid "Device is now managed"
- msgstr "デバイスが管理下に置かれました"
-
--#: ../clients/common/nm-client-utils.c:291
-+#: ../clients/common/nm-client-utils.c:295
- msgid "Device is now unmanaged"
- msgstr "デバイスが管理下から外れました"
-
--#: ../clients/common/nm-client-utils.c:292
-+#: ../clients/common/nm-client-utils.c:296
- msgid "The device could not be readied for configuration"
- msgstr "デバイスの設定準備ができませんでした"
-
--#: ../clients/common/nm-client-utils.c:293
-+#: ../clients/common/nm-client-utils.c:297
- msgid ""
- "IP configuration could not be reserved (no available address, timeout, etc.)"
- msgstr ""
- "IP 設定を確保できませんでした (利用可能なアドレスがない、タイムアウトなど)"
-
--#: ../clients/common/nm-client-utils.c:294
-+#: ../clients/common/nm-client-utils.c:298
- msgid "The IP configuration is no longer valid"
- msgstr "この IP 設定は無効になりました"
-
--#: ../clients/common/nm-client-utils.c:295
-+#: ../clients/common/nm-client-utils.c:299
- msgid "Secrets were required, but not provided"
- msgstr "シークレットが必要でしたが入力されませんでした"
-
--#: ../clients/common/nm-client-utils.c:296
-+#: ../clients/common/nm-client-utils.c:300
- msgid "802.1X supplicant disconnected"
- msgstr "802.1X サプリカントが切断されました"
-
--#: ../clients/common/nm-client-utils.c:297
-+#: ../clients/common/nm-client-utils.c:301
- msgid "802.1X supplicant configuration failed"
- msgstr "802.1X サプリカントの設定に失敗しました"
-
--#: ../clients/common/nm-client-utils.c:298
-+#: ../clients/common/nm-client-utils.c:302
- msgid "802.1X supplicant failed"
- msgstr "802.1X サプリカントが失敗しました"
-
--#: ../clients/common/nm-client-utils.c:299
-+#: ../clients/common/nm-client-utils.c:303
- msgid "802.1X supplicant took too long to authenticate"
- msgstr "802.1X サプリカントの認証に時間がかかり過ぎました"
-
--#: ../clients/common/nm-client-utils.c:300
-+#: ../clients/common/nm-client-utils.c:304
- msgid "PPP service failed to start"
- msgstr "PPP サービスの開始に失敗しました"
-
--#: ../clients/common/nm-client-utils.c:301
-+#: ../clients/common/nm-client-utils.c:305
- msgid "PPP service disconnected"
- msgstr "PPP サービスの接続が切断されました"
-
--#: ../clients/common/nm-client-utils.c:302
-+#: ../clients/common/nm-client-utils.c:306
- msgid "PPP failed"
- msgstr "PPP の失敗"
-
--#: ../clients/common/nm-client-utils.c:303
-+#: ../clients/common/nm-client-utils.c:307
- msgid "DHCP client failed to start"
- msgstr "DHCP クライアントの開始に失敗しました"
-
--#: ../clients/common/nm-client-utils.c:304
-+#: ../clients/common/nm-client-utils.c:308
- msgid "DHCP client error"
- msgstr "DHCP クライアントエラー"
-
--#: ../clients/common/nm-client-utils.c:305
-+#: ../clients/common/nm-client-utils.c:309
- msgid "DHCP client failed"
- msgstr "DHCP クライアントの失敗"
-
--#: ../clients/common/nm-client-utils.c:306
-+#: ../clients/common/nm-client-utils.c:310
- msgid "Shared connection service failed to start"
- msgstr "共有接続サービスの開始に失敗しました"
-
--#: ../clients/common/nm-client-utils.c:307
-+#: ../clients/common/nm-client-utils.c:311
- msgid "Shared connection service failed"
- msgstr "共有接続サービスの失敗"
-
--#: ../clients/common/nm-client-utils.c:308
-+#: ../clients/common/nm-client-utils.c:312
- msgid "AutoIP service failed to start"
- msgstr "AutoIP サービスの開始に失敗しました"
-
--#: ../clients/common/nm-client-utils.c:309
-+#: ../clients/common/nm-client-utils.c:313
- msgid "AutoIP service error"
- msgstr "AutoIP サービスエラー"
-
--#: ../clients/common/nm-client-utils.c:310
-+#: ../clients/common/nm-client-utils.c:314
- msgid "AutoIP service failed"
- msgstr "AutoIP サービスの失敗"
-
--#: ../clients/common/nm-client-utils.c:311
-+#: ../clients/common/nm-client-utils.c:315
- msgid "The line is busy"
- msgstr "回線が使用中です"
-
--#: ../clients/common/nm-client-utils.c:312
-+#: ../clients/common/nm-client-utils.c:316
- msgid "No dial tone"
- msgstr "ダイアル音がありません"
-
--#: ../clients/common/nm-client-utils.c:313
-+#: ../clients/common/nm-client-utils.c:317
- msgid "No carrier could be established"
- msgstr "確立できるキャリアがありませんでした"
-
--#: ../clients/common/nm-client-utils.c:314
-+#: ../clients/common/nm-client-utils.c:318
- msgid "The dialing request timed out"
- msgstr "ダイアル要求がタイムアウトしました"
-
--#: ../clients/common/nm-client-utils.c:315
-+#: ../clients/common/nm-client-utils.c:319
- msgid "The dialing attempt failed"
- msgstr "ダイアルの試行に失敗しました"
-
--#: ../clients/common/nm-client-utils.c:316
-+#: ../clients/common/nm-client-utils.c:320
- msgid "Modem initialization failed"
- msgstr "モデムの初期化に失敗しました"
-
--#: ../clients/common/nm-client-utils.c:317
-+#: ../clients/common/nm-client-utils.c:321
- msgid "Failed to select the specified APN"
- msgstr "指定された APN の選択に失敗しました"
-
--#: ../clients/common/nm-client-utils.c:318
-+#: ../clients/common/nm-client-utils.c:322
- msgid "Not searching for networks"
- msgstr "ネットワーク検索をしていません"
-
--#: ../clients/common/nm-client-utils.c:319
-+#: ../clients/common/nm-client-utils.c:323
- msgid "Network registration denied"
- msgstr "ネットワークの登録が拒否されました"
-
--#: ../clients/common/nm-client-utils.c:320
-+#: ../clients/common/nm-client-utils.c:324
- msgid "Network registration timed out"
- msgstr "ネットワークの登録がタイムアウトになりました"
-
--#: ../clients/common/nm-client-utils.c:321
-+#: ../clients/common/nm-client-utils.c:325
- msgid "Failed to register with the requested network"
- msgstr "要求されたネットワークへの登録に失敗しました"
-
--#: ../clients/common/nm-client-utils.c:322
-+#: ../clients/common/nm-client-utils.c:326
- msgid "PIN check failed"
- msgstr "PIN 確認に失敗しました"
-
--#: ../clients/common/nm-client-utils.c:323
-+#: ../clients/common/nm-client-utils.c:327
- msgid "Necessary firmware for the device may be missing"
- msgstr "このデバイスに必要なファームウェアがない可能性があります"
-
--#: ../clients/common/nm-client-utils.c:324
-+#: ../clients/common/nm-client-utils.c:328
- msgid "The device was removed"
- msgstr "このデバイスは削除されました"
-
--#: ../clients/common/nm-client-utils.c:325
-+#: ../clients/common/nm-client-utils.c:329
- msgid "NetworkManager went to sleep"
- msgstr "NetworkManager がスリープ状態に入りました"
-
--#: ../clients/common/nm-client-utils.c:326
-+#: ../clients/common/nm-client-utils.c:330
- msgid "The device's active connection disappeared"
- msgstr "このデバイスのアクティブな接続が消滅しました"
-
--#: ../clients/common/nm-client-utils.c:327
-+#: ../clients/common/nm-client-utils.c:331
- msgid "Device disconnected by user or client"
- msgstr "ユーザーまたはクライアントによりデバイスが切断されました"
-
--#: ../clients/common/nm-client-utils.c:328
-+#: ../clients/common/nm-client-utils.c:332
- msgid "Carrier/link changed"
- msgstr "キャリア/リンクが変更されました"
-
--#: ../clients/common/nm-client-utils.c:329
-+#: ../clients/common/nm-client-utils.c:333
- msgid "The device's existing connection was assumed"
- msgstr "デバイスの既存の接続とみなされました"
-
--#: ../clients/common/nm-client-utils.c:330
-+#: ../clients/common/nm-client-utils.c:334
- msgid "The supplicant is now available"
- msgstr "サプリカントが使用できるようになりました"
-
--#: ../clients/common/nm-client-utils.c:331
-+#: ../clients/common/nm-client-utils.c:335
- msgid "The modem could not be found"
- msgstr "モデムが見つかりませんでした"
-
--#: ../clients/common/nm-client-utils.c:332
-+#: ../clients/common/nm-client-utils.c:336
- msgid "The Bluetooth connection failed or timed out"
- msgstr "Bluetooth 接続が失敗またはタイムアウトしました"
-
--#: ../clients/common/nm-client-utils.c:333
-+#: ../clients/common/nm-client-utils.c:337
- msgid "GSM Modem's SIM card not inserted"
- msgstr "GSM モデムの SIM カードが挿入されていません"
-
--#: ../clients/common/nm-client-utils.c:334
-+#: ../clients/common/nm-client-utils.c:338
- msgid "GSM Modem's SIM PIN required"
- msgstr "GSM モデムの SIM PIN が必要です"
-
--#: ../clients/common/nm-client-utils.c:335
-+#: ../clients/common/nm-client-utils.c:339
- msgid "GSM Modem's SIM PUK required"
- msgstr "GSM モデムの SIM PUK が必要です"
-
--#: ../clients/common/nm-client-utils.c:336
-+#: ../clients/common/nm-client-utils.c:340
- msgid "GSM Modem's SIM wrong"
- msgstr "GSM モデムの SIM が間違っています"
-
--#: ../clients/common/nm-client-utils.c:337
-+#: ../clients/common/nm-client-utils.c:341
- msgid "InfiniBand device does not support connected mode"
- msgstr "InfiniBand デバイスでは接続モードに対応していません"
-
--#: ../clients/common/nm-client-utils.c:338
-+#: ../clients/common/nm-client-utils.c:342
- msgid "A dependency of the connection failed"
- msgstr "接続依存性の失敗"
-
--#: ../clients/common/nm-client-utils.c:339
-+#: ../clients/common/nm-client-utils.c:343
- msgid "A problem with the RFC 2684 Ethernet over ADSL bridge"
- msgstr "ADSL ブリッジ経由の RFC 2684 Ethernet に問題が発生しました"
-
--#: ../clients/common/nm-client-utils.c:340
-+#: ../clients/common/nm-client-utils.c:344
- msgid "ModemManager is unavailable"
- msgstr "ModemManager は使用できません"
-
--#: ../clients/common/nm-client-utils.c:341
-+#: ../clients/common/nm-client-utils.c:345
- msgid "The Wi-Fi network could not be found"
- msgstr "Wi-Fi ネットワークが見つかりませんでした"
-
--#: ../clients/common/nm-client-utils.c:342
-+#: ../clients/common/nm-client-utils.c:346
- msgid "A secondary connection of the base connection failed"
- msgstr "ベース接続のセカンダリー接続に失敗しました"
-
--#: ../clients/common/nm-client-utils.c:343
-+#: ../clients/common/nm-client-utils.c:347
- msgid "DCB or FCoE setup failed"
- msgstr "DCB または FCoE のセットアップに失敗しました"
-
--#: ../clients/common/nm-client-utils.c:344
-+#: ../clients/common/nm-client-utils.c:348
- msgid "teamd control failed"
- msgstr "teamd の制御に失敗しました"
-
--#: ../clients/common/nm-client-utils.c:345
-+#: ../clients/common/nm-client-utils.c:349
- msgid "Modem failed or no longer available"
- msgstr "モデムで障害が発生したか、モデムが利用できなくなりました"
-
--#: ../clients/common/nm-client-utils.c:346
-+#: ../clients/common/nm-client-utils.c:350
- msgid "Modem now ready and available"
- msgstr "モデムが準備されましたので利用可能です"
-
--#: ../clients/common/nm-client-utils.c:347
-+#: ../clients/common/nm-client-utils.c:351
- msgid "SIM PIN was incorrect"
- msgstr "SIM PIN が間違っています"
-
--#: ../clients/common/nm-client-utils.c:348
-+#: ../clients/common/nm-client-utils.c:352
- msgid "New connection activation was enqueued"
- msgstr "新規接続アクティベーションがキューに格納されました"
-
--#: ../clients/common/nm-client-utils.c:349
-+#: ../clients/common/nm-client-utils.c:353
- msgid "The device's parent changed"
- msgstr "デバイスの親が変更されました"
-
--#: ../clients/common/nm-client-utils.c:350
-+#: ../clients/common/nm-client-utils.c:354
- msgid "The device parent's management changed"
- msgstr "デバイスの親の管理が変更されました"
-
--#: ../clients/common/nm-client-utils.c:351
-+#: ../clients/common/nm-client-utils.c:355
- #, fuzzy
- msgid "Open vSwitch database connection failed"
- msgstr "Open vSwitch データベースの接続に失敗しました"
-
--#: ../clients/common/nm-client-utils.c:352
-+#: ../clients/common/nm-client-utils.c:356
- msgid "A duplicate IP address was detected"
- msgstr "複製された IP アドレスが検出されました"
-
--#: ../clients/common/nm-client-utils.c:353
-+#: ../clients/common/nm-client-utils.c:357
- msgid "The selected IP method is not supported"
- msgstr "選択された IP メソッドには対応していません"
-
--#: ../clients/common/nm-client-utils.c:354
-+#: ../clients/common/nm-client-utils.c:358
- msgid "Failed to configure SR-IOV parameters"
- msgstr "SR-IOV パラメーターの設定に失敗しました"
-
--#: ../clients/common/nm-client-utils.c:360
-+#: ../clients/common/nm-client-utils.c:359
-+#, fuzzy
-+msgid "The Wi-Fi P2P peer could not be found"
-+msgstr "Wi-Fi ネットワークが見つかりませんでした"
-+
-+#: ../clients/common/nm-client-utils.c:365
- msgid "Unknown reason"
- msgstr "不明な理由"
-
--#: ../clients/common/nm-client-utils.c:361
-+#: ../clients/common/nm-client-utils.c:366
- msgid "The connection was disconnected"
- msgstr "接続が切断されました"
-
--#: ../clients/common/nm-client-utils.c:362
-+#: ../clients/common/nm-client-utils.c:367
- msgid "Disconnected by user"
- msgstr "ユーザーにより切断"
-
--#: ../clients/common/nm-client-utils.c:363
-+#: ../clients/common/nm-client-utils.c:368
- msgid "The base network connection was interrupted"
- msgstr "基本ネットワーク接続が中断されました。"
-
--#: ../clients/common/nm-client-utils.c:364
-+#: ../clients/common/nm-client-utils.c:369
- msgid "The VPN service stopped unexpectedly"
- msgstr "VPN サービスが予期せず停止しました"
-
--#: ../clients/common/nm-client-utils.c:365
-+#: ../clients/common/nm-client-utils.c:370
- msgid "The VPN service returned invalid configuration"
- msgstr "VPN サービスが無効な設定を返しました"
-
--#: ../clients/common/nm-client-utils.c:366
-+#: ../clients/common/nm-client-utils.c:371
- msgid "The connection attempt timed out"
- msgstr "接続試行がタイムアウトしました"
-
--#: ../clients/common/nm-client-utils.c:367
-+#: ../clients/common/nm-client-utils.c:372
- msgid "The VPN service did not start in time"
- msgstr "VPN サービスは時間内に開始しませんでした"
-
--#: ../clients/common/nm-client-utils.c:368
-+#: ../clients/common/nm-client-utils.c:373
- msgid "The VPN service failed to start"
- msgstr "VPN サービスの開始に失敗しました"
-
--#: ../clients/common/nm-client-utils.c:369
-+#: ../clients/common/nm-client-utils.c:374
- msgid "No valid secrets"
- msgstr "有効なシークレットはありません"
-
--#: ../clients/common/nm-client-utils.c:370
-+#: ../clients/common/nm-client-utils.c:375
- msgid "Invalid secrets"
- msgstr "無効なシークレット"
-
--#: ../clients/common/nm-client-utils.c:371
-+#: ../clients/common/nm-client-utils.c:376
- msgid "The connection was removed"
- msgstr "接続は削除されました"
-
--#: ../clients/common/nm-client-utils.c:372
-+#: ../clients/common/nm-client-utils.c:377
- msgid "Master connection failed"
- msgstr "マスター接続に失敗しました"
-
--#: ../clients/common/nm-client-utils.c:373
-+#: ../clients/common/nm-client-utils.c:378
- msgid "Could not create a software link"
- msgstr "ソフトウェアリンクを作成できませんでした"
-
--#: ../clients/common/nm-client-utils.c:374
-+#: ../clients/common/nm-client-utils.c:379
- msgid "The device disappeared"
- msgstr "デバイスが消滅しました"
-
--#: ../clients/common/nm-meta-setting-access.c:492
-+#: ../clients/common/nm-meta-setting-access.c:510
- #, c-format
- msgid "field '%s' has to be alone"
- msgstr "フィールド '%s' は孤立する必要があります"
-
--#: ../clients/common/nm-meta-setting-access.c:507
-+#: ../clients/common/nm-meta-setting-access.c:525
- #, 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:99
--#: ../clients/common/nm-meta-setting-desc.c:161
-+#: ../clients/common/nm-meta-setting-desc.c:291
-+#: ../clients/common/nm-meta-setting-desc.c:352
- #, c-format
- msgid "invalid prefix '%s'; <1-%d> allowed"
- msgstr "無効なプレフィックス '%s'; <1-%d> 許可"
-
--#: ../clients/common/nm-meta-setting-desc.c:107
-+#: ../clients/common/nm-meta-setting-desc.c:299
- #, c-format
- msgid "invalid IP address: %s"
- msgstr "無効な IP アドレス: %s"
-
--#: ../clients/common/nm-meta-setting-desc.c:133
-+#: ../clients/common/nm-meta-setting-desc.c:324
- msgid ""
- "The valid syntax is: 'ip[/prefix] [next-hop] [metric] [attribute=val]... [,"
- "ip[/prefix] ...]'"
-@@ -4451,239 +4434,205 @@ msgstr ""
- "有効な構文は以下のようになります: 'ip[/prefix] [next-hop] [metric] "
- "[attribute=val]... [,ip[/prefix] ...]'"
-
--#: ../clients/common/nm-meta-setting-desc.c:172
-+#: ../clients/common/nm-meta-setting-desc.c:363
- #, c-format
- msgid "the next hop ('%s') must be first"
- msgstr "次のホップ ('%s') が初回である必要があります"
-
--#: ../clients/common/nm-meta-setting-desc.c:178
-+#: ../clients/common/nm-meta-setting-desc.c:369
- #, c-format
- msgid "the metric ('%s') must be before attributes"
- msgstr "メトリック ('%s') が属性の前にある必要があります"
-
--#: ../clients/common/nm-meta-setting-desc.c:227
-+#: ../clients/common/nm-meta-setting-desc.c:417
- #, c-format
- msgid "invalid route: %s. %s"
- msgstr "無効なルート: %s. %s"
-
--#: ../clients/common/nm-meta-setting-desc.c:239
--msgid "default route cannot be added (NetworkManager handles it by itself)"
--msgstr "デフォルトのルートは追加できません (NetworkManager 自体が処理します)"
--
--#: ../clients/common/nm-meta-setting-desc.c:446
--#, c-format
--msgid "invalid priority map '%s'"
--msgstr "無効な優先度マップ '%s'"
--
--#: ../clients/common/nm-meta-setting-desc.c:453
--#: ../clients/common/nm-meta-setting-desc.c:459
--#, c-format
--msgid "priority '%s' is not valid (<0-%ld>)"
--msgstr "'%s' は有効な優先度ではありません (<0-%ld>)"
--
--#: ../clients/common/nm-meta-setting-desc.c:511
-+#: ../clients/common/nm-meta-setting-desc.c:634
- #, c-format
- msgid "cannot read pac-script from file '%s'"
- msgstr "ファイル '%s' から pac-script を読み込めません"
-
--#: ../clients/common/nm-meta-setting-desc.c:518
-+#: ../clients/common/nm-meta-setting-desc.c:641
- #, c-format
- msgid "file '%s' contains non-valid utf-8"
- msgstr "ファイル '%s' には無効な utf-8 が含まれています"
-
--#: ../clients/common/nm-meta-setting-desc.c:531
-+#: ../clients/common/nm-meta-setting-desc.c:654
- #, c-format
- msgid "'%s' does not contain a valid PAC Script"
- msgstr "'%s' には有効な PAC スクリプトが含まれていません"
-
--#: ../clients/common/nm-meta-setting-desc.c:534
-+#: ../clients/common/nm-meta-setting-desc.c:657
- #, c-format
- msgid "Not a valid PAC Script"
- msgstr "有効な PAC スクリプトではありません"
-
--#: ../clients/common/nm-meta-setting-desc.c:588
-+#: ../clients/common/nm-meta-setting-desc.c:711
- #, c-format
- msgid "cannot read team config from file '%s'"
- msgstr "ファイル '%s' からチーム設定を読み込めません"
-
--#: ../clients/common/nm-meta-setting-desc.c:595
-+#: ../clients/common/nm-meta-setting-desc.c:718
- #, c-format
- msgid "team config file '%s' contains non-valid utf-8"
- msgstr "チーム設定ファイル '%s' には無効な utf-8 が含まれています"
-
--#: ../clients/common/nm-meta-setting-desc.c:607
-+#: ../clients/common/nm-meta-setting-desc.c:730
- #, c-format
- msgid "'%s' does not contain a valid team configuration"
- msgstr "'%s' には有効なチーム設定が含まれていません"
-
--#: ../clients/common/nm-meta-setting-desc.c:610
-+#: ../clients/common/nm-meta-setting-desc.c:733
- #, c-format
- msgid "team configuration must be a JSON object"
- msgstr "チーム設定は JSON オブジェクトである必要があります"
-
--#: ../clients/common/nm-meta-setting-desc.c:731
-+#: ../clients/common/nm-meta-setting-desc.c:926
- #: ../clients/tui/nmt-mtu-entry.c:84
- msgid "(default)"
- msgstr "(デフォルト)"
-
--#: ../clients/common/nm-meta-setting-desc.c:885
-+#: ../clients/common/nm-meta-setting-desc.c:1072
- msgid "auto"
- msgstr "自動"
-
--#: ../clients/common/nm-meta-setting-desc.c:1037
-+#: ../clients/common/nm-meta-setting-desc.c:1224
- #, c-format
- msgid "%s (%s)"
- msgstr "%s (%s)"
-
--#: ../clients/common/nm-meta-setting-desc.c:1180
--#: ../clients/common/nm-meta-setting-desc.c:1184
-+#: ../clients/common/nm-meta-setting-desc.c:1372
-+#: ../clients/common/nm-meta-setting-desc.c:1376
- #, fuzzy
- msgid "'%s' is out of range [%"
- msgstr "'%s' は、[0, %u] の範囲外です"
-
--#: ../clients/common/nm-meta-setting-desc.c:1189
-+#: ../clients/common/nm-meta-setting-desc.c:1381
- #, c-format
- msgid "'%s' is not a valid number"
- msgstr "'%s' は有効な数値ではありません"
-
--#: ../clients/common/nm-meta-setting-desc.c:1243
-+#: ../clients/common/nm-meta-setting-desc.c:1438
- #, c-format
- msgid "'%s' is out of range [0, %u]"
- msgstr "'%s' は、[0, %u] の範囲外です"
-
--#: ../clients/common/nm-meta-setting-desc.c:1286
-+#: ../clients/common/nm-meta-setting-desc.c:1484
- #, c-format
- msgid "'%s' is not a valid Ethernet MAC"
- msgstr "'%s' は有効な Ethernet MAC ではありません"
-
--#: ../clients/common/nm-meta-setting-desc.c:1391
-+#: ../clients/common/nm-meta-setting-desc.c:1592
- #, c-format
- msgid "invalid option '%s', use a combination of [%s]"
- msgstr "無効なオプション '%s' です。[%s] の組み合わせを使用してください"
-
--#: ../clients/common/nm-meta-setting-desc.c:1396 ../libnm-core/nm-keyfile.c:780
-+#: ../clients/common/nm-meta-setting-desc.c:1597 ../libnm-core/nm-keyfile.c:884
- #, c-format
- msgid "invalid option '%s', use one of [%s]"
- msgstr "無効なオプション '%s' です。[%s] のいずれかを使用してください"
-
--#: ../clients/common/nm-meta-setting-desc.c:1515
-+#: ../clients/common/nm-meta-setting-desc.c:1716
- #, c-format
- msgid "%d (key)"
- msgstr "%d (key)"
-
--#: ../clients/common/nm-meta-setting-desc.c:1517
-+#: ../clients/common/nm-meta-setting-desc.c:1718
- #, c-format
- msgid "%d (passphrase)"
- msgstr "%d (パスフレーズ)"
-
--#: ../clients/common/nm-meta-setting-desc.c:1520
-+#: ../clients/common/nm-meta-setting-desc.c:1721
- #, c-format
- msgid "%d (unknown)"
- msgstr "%d (不明)"
-
--#: ../clients/common/nm-meta-setting-desc.c:1552
-+#: ../clients/common/nm-meta-setting-desc.c:1751
- msgid "0 (NONE)"
- msgstr "0 (なし)"
-
--#: ../clients/common/nm-meta-setting-desc.c:1558
-+#: ../clients/common/nm-meta-setting-desc.c:1757
- msgid "REORDER_HEADERS, "
- msgstr "ヘッダーの順序変更、"
-
--#: ../clients/common/nm-meta-setting-desc.c:1560
-+#: ../clients/common/nm-meta-setting-desc.c:1759
- msgid "GVRP, "
- msgstr "GVRP、"
-
--#: ../clients/common/nm-meta-setting-desc.c:1562
-+#: ../clients/common/nm-meta-setting-desc.c:1761
- msgid "LOOSE_BINDING, "
- msgstr "ルースバインディング、"
-
--#: ../clients/common/nm-meta-setting-desc.c:1564
-+#: ../clients/common/nm-meta-setting-desc.c:1763
- msgid "MVRP, "
- msgstr "MVRP、"
-
--#: ../clients/common/nm-meta-setting-desc.c:1604
-+#: ../clients/common/nm-meta-setting-desc.c:1784
- msgid "0 (none)"
- msgstr "0 (なし)"
-
--#: ../clients/common/nm-meta-setting-desc.c:1610
-+#: ../clients/common/nm-meta-setting-desc.c:1790
- msgid "agent-owned, "
- msgstr "エージェント所有、 "
-
--#: ../clients/common/nm-meta-setting-desc.c:1612
-+#: ../clients/common/nm-meta-setting-desc.c:1792
- msgid "not saved, "
- msgstr "未保存、 "
-
--#: ../clients/common/nm-meta-setting-desc.c:1614
-+#: ../clients/common/nm-meta-setting-desc.c:1794
- msgid "not required, "
- msgstr "不必要、 "
-
--#: ../clients/common/nm-meta-setting-desc.c:1679
-+#: ../clients/common/nm-meta-setting-desc.c:1983
- #, c-format
- msgid "'%s' is not valid; use <option>=<value>"
- msgstr "'%s' は無効です; <option>=<value> を使用してください"
-
--#: ../clients/common/nm-meta-setting-desc.c:1718
--msgid "no item to remove"
--msgstr "削除するアイテムがありません"
-+#: ../clients/common/nm-meta-setting-desc.c:1993
-+#, fuzzy, c-format
-+msgid "cannot set empty \"%s\" option"
-+msgstr "プロパティーを設定できません: %s"
-
--#: ../clients/common/nm-meta-setting-desc.c:1722
--#, c-format
--msgid "index '%d' is not in range <0-%d>"
--msgstr "インデックス '%d' は範囲内にありません <0-%d>"
--
--#: ../clients/common/nm-meta-setting-desc.c:1737
--#, c-format
--msgid "invalid option '%s'"
--msgstr "無効なオプション '%s'"
--
--#: ../clients/common/nm-meta-setting-desc.c:1739
--msgid "missing option"
--msgstr "足りないオプション"
--
--#: ../clients/common/nm-meta-setting-desc.c:1763
--#, c-format
--msgid "'%s' is not a valid MAC"
--msgstr "'%s' は有効な MAC ではありません"
--
--#: ../clients/common/nm-meta-setting-desc.c:1790
--#: ../clients/common/nm-meta-setting-desc.c:1887
--#: ../clients/common/nm-meta-setting-desc.c:4855 ../src/nm-config.c:547
--#, c-format
--msgid "'%s' is not valid"
--msgstr "'%s' は無効です"
--
--#: ../clients/common/nm-meta-setting-desc.c:1831
-+#: ../clients/common/nm-meta-setting-desc.c:2052
- #, c-format
- msgid "'%u' flags are not valid; use combination of %s"
- msgstr "'%u' フラグは有効ではありません。%s の組み合わせを使用してください"
-
--#: ../clients/common/nm-meta-setting-desc.c:1867
-+#: ../clients/common/nm-meta-setting-desc.c:2069
- #, c-format
- msgid "'%s' is not a valid number (or out of range)"
- msgstr "'%s' は有効な数字ではありません (または範囲外になります)"
-
--#: ../clients/common/nm-meta-setting-desc.c:1985
-+#: ../clients/common/nm-meta-setting-desc.c:2090
-+#: ../clients/common/nm-meta-setting-desc.c:4153 ../src/nm-config.c:546
-+#, c-format
-+msgid "'%s' is not valid"
-+msgstr "'%s' は無効です"
-+
-+#: ../clients/common/nm-meta-setting-desc.c:2187
-+#, fuzzy
-+msgid "not a valid hex-string"
-+msgstr "無効なインターフェース名です"
-+
-+#: ../clients/common/nm-meta-setting-desc.c:2203
- #, c-format
- msgid "'%s' is not a valid hex character"
- msgstr "'%s' は有効な 16 進文字ではありません"
-
--#: ../clients/common/nm-meta-setting-desc.c:2268
--#, c-format
--msgid "the property doesn't contain EAP method '%s'"
--msgstr "プロパティーには EAP メソッド '%s' が含まれません"
--
--#: ../clients/common/nm-meta-setting-desc.c:2291
--#, c-format
--msgid "the property doesn't contain alternative subject match '%s'"
--msgstr "プロパティーには代替のサブジェクトマッチ '%s' が含まれません"
--
--#: ../clients/common/nm-meta-setting-desc.c:2317
--#, c-format
--msgid "the property doesn't contain \"phase2\" alternative subject match '%s'"
-+#: ../clients/common/nm-meta-setting-desc.c:2282
-+msgid ""
-+"too many arguments. Please only specify a private key file and optionally a "
-+"password"
- msgstr ""
--"プロパティーには代替の \"phase2\" サブジェクトマッチ '%s' が含まれません"
-
--#: ../clients/common/nm-meta-setting-desc.c:2439
-+#: ../clients/common/nm-meta-setting-desc.c:2404
-+#, fuzzy, c-format
-+msgid "failed to set bond option \"%s\""
-+msgstr "プロパティーの設定に失敗しました: %s"
-+
-+#: ../clients/common/nm-meta-setting-desc.c:2421
- #, c-format
- msgid ""
- "Enter a list of bonding options formatted as:\n"
-@@ -4721,247 +4670,132 @@ 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:2502
-+#: ../clients/common/nm-meta-setting-desc.c:2486
- #, c-format
- msgid "Can not change the connection type"
- msgstr "接続タイプを変更できません"
-
--#: ../clients/common/nm-meta-setting-desc.c:2605
--#, c-format
--msgid "the property doesn't contain permission '%s'"
--msgstr "プロパティーにはパーミッション '%s' が含まれません"
-+#: ../clients/common/nm-meta-setting-desc.c:2564
-+#, fuzzy, c-format
-+msgid "invalid permission \"%s\""
-+msgstr "無効なランナー \"%s\""
-
--#: ../clients/common/nm-meta-setting-desc.c:2626
-+#: ../clients/common/nm-meta-setting-desc.c:2601
- #, c-format
- msgid "'%s' is not valid master; use ifname or connection UUID"
- msgstr ""
- "'%s' は 有効なマスターではありません: ifname か、接続 UUID を使用してくださ"
- "い。"
-
--#: ../clients/common/nm-meta-setting-desc.c:2723
-+#: ../clients/common/nm-meta-setting-desc.c:2682
- #, c-format
- msgid "the value '%s' is not a valid UUID"
- msgstr "値 '%s' は有効な UUID ではありません"
-
--#: ../clients/common/nm-meta-setting-desc.c:2730
--#, c-format
--msgid "the property doesn't contain UUID '%s'"
--msgstr "プロパティーには UUID '%s' が含まれません"
--
--#: ../clients/common/nm-meta-setting-desc.c:2799
-+#: ../clients/common/nm-meta-setting-desc.c:2753
- msgid "0 (disabled)"
- msgstr "0 (無効)"
-
--#: ../clients/common/nm-meta-setting-desc.c:2805
-+#: ../clients/common/nm-meta-setting-desc.c:2759
- msgid "enabled, "
- msgstr "有効、"
-
--#: ../clients/common/nm-meta-setting-desc.c:2807
-+#: ../clients/common/nm-meta-setting-desc.c:2761
- msgid "advertise, "
- msgstr "公表、"
-
--#: ../clients/common/nm-meta-setting-desc.c:2809
-+#: ../clients/common/nm-meta-setting-desc.c:2763
- msgid "willing, "
- msgstr "用意がある、"
-
--#: ../clients/common/nm-meta-setting-desc.c:2931
-+#: ../clients/common/nm-meta-setting-desc.c:2852
- #, c-format
- msgid "'%s' is not a valid DCB flag"
- msgstr "'%s' は有効な DCB フラグではありません"
-
--#: ../clients/common/nm-meta-setting-desc.c:2960
-+#: ../clients/common/nm-meta-setting-desc.c:2879
- msgid "must contain 8 comma-separated numbers"
- msgstr "コンマで区切った 8 つの番号を含ませてください"
-
--#: ../clients/common/nm-meta-setting-desc.c:2976
-+#: ../clients/common/nm-meta-setting-desc.c:2893
- #, 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:2979
-+#: ../clients/common/nm-meta-setting-desc.c:2896
- #, c-format
- msgid "'%s' not a number between 0 and %u (inclusive)"
- msgstr "'%s' は 0 と %u (含む) の間の数ではありません"
-
--#: ../clients/common/nm-meta-setting-desc.c:3000
-+#: ../clients/common/nm-meta-setting-desc.c:2917
- #, c-format
- msgid "changes will have no effect until '%s' includes 1 (enabled)"
- msgstr "変更は、'%s' に 1 (有効) が含まれるまで効果はありません"
-
--#: ../clients/common/nm-meta-setting-desc.c:3055
-+#: ../clients/common/nm-meta-setting-desc.c:2947
- #, c-format
- msgid "bandwidth percentages must total 100%%"
- msgstr "帯域幅のパーセンテージの合計は 100%% にならなければなりません"
-
--#: ../clients/common/nm-meta-setting-desc.c:3128
--#: ../clients/common/nm-meta-setting-desc.c:3134
-+#: ../clients/common/nm-meta-setting-desc.c:3018
-+#: ../clients/common/nm-meta-setting-desc.c:3024
- 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:3158
-+#: ../clients/common/nm-meta-setting-desc.c:3048
- #, c-format
- msgid "'%s' is not a valid IBoIP P_Key"
- msgstr "'%s' は有効な IBoIP P_Key ではありません"
-
--#: ../clients/common/nm-meta-setting-desc.c:3181
-+#: ../clients/common/nm-meta-setting-desc.c:3071
- msgid "default"
- msgstr "デフォルト"
-
--#: ../clients/common/nm-meta-setting-desc.c:3320
--#: ../clients/common/nm-meta-setting-desc.c:3337
--#, c-format
--msgid "invalid IPv4 address '%s'"
-+#: ../clients/common/nm-meta-setting-desc.c:3235
-+#, fuzzy, c-format
-+msgid "invalid IPv%c address '%s'"
- msgstr "無効な IPv4 アドレス '%s'"
-
--#: ../clients/common/nm-meta-setting-desc.c:3343
--#: ../clients/common/nm-meta-setting-desc.c:3587
--#, c-format
--msgid "the property doesn't contain DNS server '%s'"
--msgstr "プロパティーには DNS サーバー '%s' が含まれません"
--
--#: ../clients/common/nm-meta-setting-desc.c:3381
--#: ../clients/common/nm-meta-setting-desc.c:3625
--#, c-format
--msgid "the property doesn't contain DNS search domain '%s'"
--msgstr "プロパティーには DNS 検索ドメイン '%s' が含まれません"
--
--#: ../clients/common/nm-meta-setting-desc.c:3418
--#: ../clients/common/nm-meta-setting-desc.c:3662
--#, c-format
--msgid "the property doesn't contain DNS option '%s'"
--msgstr "プロパティーには DNS オプション '%s' が含まれません"
--
--#: ../clients/common/nm-meta-setting-desc.c:3461
--#: ../clients/common/nm-meta-setting-desc.c:3711
--#, c-format
--msgid "the property doesn't contain IP address '%s'"
--msgstr "プロパティーには IP アドレス '%s' が含まれません"
--
--#: ../clients/common/nm-meta-setting-desc.c:3481
--#: ../clients/common/nm-meta-setting-desc.c:3730
-+#: ../clients/common/nm-meta-setting-desc.c:3362
- #, c-format
- msgid "invalid gateway address '%s'"
- msgstr "無効なゲートウェイアドレス '%s'"
-
--#: ../clients/common/nm-meta-setting-desc.c:3520
--#: ../clients/common/nm-meta-setting-desc.c:3771
--#, c-format
--msgid "the property doesn't contain route '%s'"
--msgstr "プロパティーにはルート '%s' が含まれません"
--
--#: ../clients/common/nm-meta-setting-desc.c:3564
--#: ../clients/common/nm-meta-setting-desc.c:3581
--#, c-format
--msgid "invalid IPv6 address '%s'"
--msgstr "無効な IPv6 アドレス '%s'"
--
--#: ../clients/common/nm-meta-setting-desc.c:3833
--#, c-format
--msgid "the property doesn't contain interface name '%s'"
--msgstr "プロパティーにはインターフェース名 '%s' が含まれません"
--
--#: ../clients/common/nm-meta-setting-desc.c:3870
-+#: ../clients/common/nm-meta-setting-desc.c:3513
- #, c-format
- msgid "'%s' is not a valid channel; use <1-13>"
- msgstr "'%s' は有効なチャンネルではありません。<1-13> を使用してください"
-
--#: ../clients/common/nm-meta-setting-desc.c:3962
-+#: ../clients/common/nm-meta-setting-desc.c:3593
- 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:3984
-+#: ../clients/common/nm-meta-setting-desc.c:3617
-+#: ../clients/common/nm-meta-setting-desc.c:3697
-+#, fuzzy
- msgid ""
--"The valid syntax is: '[root | parent <handle>] [handle <handle>] <qdisc>'"
-+"The valid syntax is: '[root | parent <handle>] [handle <handle>] <kind>'"
- msgstr "有効な構文: '[root | parent <handle>] [handle <handle>] <qdisc>'"
-
--#: ../clients/common/nm-meta-setting-desc.c:4008
--#, c-format
--msgid "the property doesn't contain vf with index %u"
--msgstr "プロパティーにはインデックス %u を持つ vf が含まれません"
--
--#: ../clients/common/nm-meta-setting-desc.c:4035
--#, c-format
--msgid "the property doesn't contain qdisc '%s'"
--msgstr "プロパティーには qdisc '%s' が含まれません"
--
--#: ../clients/common/nm-meta-setting-desc.c:4089
--msgid ""
--"The valid syntax is: '[root | parent <handle>] [handle <handle>] <tfilter>'"
--msgstr "有効な構文: '[root | parent <handle>] [handle <handle>] <tfilter>'"
--
--#: ../clients/common/nm-meta-setting-desc.c:4112
--#, c-format
--msgid "the property doesn't contain tfilter '%s'"
--msgstr "プロパティーには tfilter '%s' が含まれません"
--
--#: ../clients/common/nm-meta-setting-desc.c:4179
--#, c-format
--msgid "the property doesn't contain string '%s'"
--msgstr "プロパティーには文字列 '%s' が含まれません"
--
--#: ../clients/common/nm-meta-setting-desc.c:4254
--#: ../clients/common/nm-meta-setting-desc.c:4328
--#, c-format
--msgid "the property doesn't contain link watcher '%s'"
--msgstr "プロパティーにはリンクウォッチャー '%s' が含まれません"
--
--#: ../clients/common/nm-meta-setting-desc.c:4434
--#, c-format
--msgid "only one mapping at a time is supported; taking the first one (%s)"
-+#: ../clients/common/nm-meta-setting-desc.c:3642
-+msgid "The valid syntax is: '<vid>[-<vid>] [pvid] [untagged]'"
- msgstr ""
--"マッピングは一度に 1 つだけ行います。最初のマッピング (%s) を行います。"
-
--#: ../clients/common/nm-meta-setting-desc.c:4442
-+#: ../clients/common/nm-meta-setting-desc.c:3917
- #, c-format
--msgid "the property doesn't contain mapping '%s'"
--msgstr "プロパティーにはマッピング '%s' が含まれません"
-+msgid "invalid priority map '%s'"
-+msgstr "無効な優先度マップ '%s'"
-
--#: ../clients/common/nm-meta-setting-desc.c:4450
--msgid "no priority to remove"
--msgstr "削除する優先度がありません"
--
--#: ../clients/common/nm-meta-setting-desc.c:4454
--#, c-format
--msgid "index '%d' is not in the range of <0-%d>"
--msgstr "インデックス '%d' は <0-%d> の範囲内にありません"
--
--#: ../clients/common/nm-meta-setting-desc.c:4523
--#, c-format
--msgid "'%s' cannot be empty"
--msgstr "'%s' を空白にすることはできません"
--
--#: ../clients/common/nm-meta-setting-desc.c:4562
--#: ../clients/common/nm-meta-setting-desc.c:4693
--#: ../libnm-core/nm-setting-sriov.c:446 ../libnm-core/nm-setting-wired.c:662
--#: ../libnm-core/nm-setting-wireless.c:857
--#: ../libnm-core/nm-setting-wireless.c:869 ../libnm-util/nm-setting-wired.c:645
--#: ../libnm-util/nm-setting-wireless.c:858
--#: ../libnm-util/nm-setting-wireless.c:872
--#, c-format
--msgid "'%s' is not a valid MAC address"
--msgstr "'%s' は有効な MAC アドレスではありません"
--
--#: ../clients/common/nm-meta-setting-desc.c:4568
--#: ../clients/common/nm-meta-setting-desc.c:4699
--#, c-format
--msgid "the property doesn't contain MAC address '%s'"
--msgstr "プロパティーには MAC アドレス '%s' が含まれません"
--
--#: ../clients/common/nm-meta-setting-desc.c:4586
-+#: ../clients/common/nm-meta-setting-desc.c:4005
- #, 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:4600
--#, c-format
--msgid "'%s' string value should consist of 1 - 199 characters"
--msgstr "'%s' 文字列値は 1 - 199 の文字で構成される必要があります"
--
--#: ../clients/common/nm-meta-setting-desc.c:4632
-+#: ../clients/common/nm-meta-setting-desc.c:4044
- #, c-format
- msgid ""
- "Enter a list of S/390 options formatted as:\n"
-@@ -4972,24 +4806,27 @@ msgstr ""
- " option = <value>, option = <value>,...\n"
- "次が有効なオプションになります: %s\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:4666
-+#: ../clients/common/nm-meta-setting-desc.c:4079
- #, c-format
- msgid "'%s' is not a valid channel"
- msgstr "'%s' は有効なチャンネルではありません"
-
--#: ../clients/common/nm-meta-setting-desc.c:4672
-+#: ../clients/common/nm-meta-setting-desc.c:4085
- #, c-format
- msgid "'%ld' is not a valid channel"
- msgstr "'%ld' は有効なチャンネルではありません"
-
--#: ../clients/common/nm-meta-setting-desc.c:4755
--#: ../clients/common/nm-meta-setting-desc.c:4791
--#: ../clients/common/nm-meta-setting-desc.c:4827
-+#: ../clients/common/nm-meta-setting-desc.c:4102
-+#: ../libnm-core/nm-setting-sriov.c:443 ../libnm-core/nm-setting-wired.c:646
-+#: ../libnm-core/nm-setting-wireless.c:844
-+#: ../libnm-core/nm-setting-wireless.c:856 ../libnm-util/nm-setting-wired.c:645
-+#: ../libnm-util/nm-setting-wireless.c:858
-+#: ../libnm-util/nm-setting-wireless.c:872
- #, c-format
--msgid "the property doesn't contain protocol '%s'"
--msgstr "プロパティーにはプロトコル '%s' が含まれません"
-+msgid "'%s' is not a valid MAC address"
-+msgstr "'%s' は有効な MAC アドレスではありません"
-
--#: ../clients/common/nm-meta-setting-desc.c:4864
-+#: ../clients/common/nm-meta-setting-desc.c:4162
- #, c-format
- msgid ""
- "'%s' not compatible with %s '%s', please change the key or set the right %s "
-@@ -4998,70 +4835,63 @@ msgstr ""
- "'%s' と %s '%s' は互換性がありません。キーを変更するか、適切な %s を最初に設"
- "定してください。"
-
--#: ../clients/common/nm-meta-setting-desc.c:4874
-+#: ../clients/common/nm-meta-setting-desc.c:4172
- #, c-format
- msgid "WEP key is guessed to be of '%s'"
- msgstr "WEP キーは '%s' であると仮定しています"
-
--#: ../clients/common/nm-meta-setting-desc.c:4879
-+#: ../clients/common/nm-meta-setting-desc.c:4177
- #, c-format
- msgid "WEP key index set to '%d'"
- msgstr "WEP キーインデックスは '%d' に設定されます"
-
--#: ../clients/common/nm-meta-setting-desc.c:4918
-+#: ../clients/common/nm-meta-setting-desc.c:4216
- #, c-format
- msgid "'%s' is not compatible with '%s' type, please change or delete the key."
- msgstr ""
- "'%s' は '%s' タイプと互換性がありません。キーを変更するか、削除してください。"
-
--#: ../clients/common/nm-meta-setting-desc.c:4928
--#, c-format
--msgid "'%s' is not a valid PSK"
--msgstr "'%s' は有効な PSK ではありません"
--
--#: ../clients/common/nm-meta-setting-desc.c:4980
-+#: ../clients/common/nm-meta-setting-desc.c:4273
- #, c-format
- msgid "'%s' is not valid; use 'on', 'off', or 'ignore'"
- msgstr "'%s' は無効です; 'on'、'off'、または 'ignore' を使用してください"
-
--#: ../clients/common/nm-meta-setting-desc.c:5039
-+#: ../clients/common/nm-meta-setting-desc.c:4333
- msgid "Bonding primary interface [none]"
- msgstr "ボンドのプライマリインターフェース [none]"
-
- #. this is a virtual property, only needed during "ask" mode.
--#: ../clients/common/nm-meta-setting-desc.c:5046
-+#: ../clients/common/nm-meta-setting-desc.c:4340
- msgid "Bonding monitoring mode"
- msgstr "ボンディングモニタリングモード"
-
--#: ../clients/common/nm-meta-setting-desc.c:5055
-+#: ../clients/common/nm-meta-setting-desc.c:4349
- msgid "Bonding miimon [100]"
- msgstr "ボンドの miimon [100]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5063
-+#: ../clients/common/nm-meta-setting-desc.c:4357
- msgid "Bonding downdelay [0]"
- msgstr "ボンドの downdelay [0]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5071
-+#: ../clients/common/nm-meta-setting-desc.c:4365
- msgid "Bonding updelay [0]"
- msgstr "ボンドの updelay [0]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5079
-+#: ../clients/common/nm-meta-setting-desc.c:4373
- msgid "Bonding arp-interval [0]"
- msgstr "ボンドの arp-interval [0]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5087
-+#: ../clients/common/nm-meta-setting-desc.c:4381
- msgid "Bonding arp-ip-target [none]"
- msgstr "ボンドの arp-ip-target [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5095
-+#: ../clients/common/nm-meta-setting-desc.c:4389
- msgid "LACP rate ('slow' or 'fast') [slow]"
- msgstr "LACP レート ('slow' または 'fast') [slow]"
-
--#. macro that returns @func as const (gboolean(*)(NMSetting*)) type, but checks
--#. * that the actual type is (gboolean(*)(type *)).
- #. macro that returns @func as const (guint32(*)(NMSetting*)) type, but checks
- #. * that the actual type is (guint32(*)(type *)).
--#: ../clients/common/nm-meta-setting-desc.c:5212
-+#: ../clients/common/nm-meta-setting-desc.c:4553
- 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 "
-@@ -5079,7 +4909,7 @@ msgstr ""
- "\"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n"
- " set team.config /etc/my-team.conf\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5220
-+#: ../clients/common/nm-meta-setting-desc.c:4561
- 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 "
-@@ -5128,7 +4958,11 @@ msgstr ""
- " 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:5270
-+#: ../clients/common/nm-meta-setting-desc.c:4594
-+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:4627
- msgid ""
- "Enter file path to CA certificate (optionally prefixed with file://).\n"
- " [file://]<file path>\n"
-@@ -5142,7 +4976,7 @@ msgstr ""
- "い。\n"
- "例: /home/cimrman/cacert.crt\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5304
-+#: ../clients/common/nm-meta-setting-desc.c:4666
- msgid ""
- "Enter file path to client certificate (optionally prefixed with file://).\n"
- " [file://]<file path>\n"
-@@ -5156,7 +4990,7 @@ msgstr ""
- "い。\n"
- "例: /home/cimrman/jara.crt\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5361
-+#: ../clients/common/nm-meta-setting-desc.c:4723
- msgid ""
- "Enter file path to CA certificate for inner authentication (optionally "
- "prefixed\n"
-@@ -5173,7 +5007,7 @@ msgstr ""
- "い。\n"
- "例: /home/cimrman/ca-zweite-phase.crt\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5396
-+#: ../clients/common/nm-meta-setting-desc.c:4763
- msgid ""
- "Enter file path to client certificate for inner authentication (optionally "
- "prefixed\n"
-@@ -5190,7 +5024,7 @@ msgstr ""
- "い。\n"
- "例: /home/cimrman/jara-zweite-phase.crt\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5423
-+#: ../clients/common/nm-meta-setting-desc.c:4790
- msgid ""
- "Enter bytes as a list of hexadecimal values.\n"
- "Two formats are accepted:\n"
-@@ -5211,8 +5045,8 @@ msgstr ""
- "例: ab0455a6ea3a74C2\n"
- " ab 4 55 0xa6 ea 3a 74 C2\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5440
--#: ../clients/common/nm-meta-setting-desc.c:5458
-+#: ../clients/common/nm-meta-setting-desc.c:4807
-+#: ../clients/common/nm-meta-setting-desc.c:4825
- msgid ""
- "Enter path to a private key and the key password (if not set yet):\n"
- " [file://]<file path> [<password>]\n"
-@@ -5226,84 +5060,84 @@ msgstr ""
- "してください。\n"
- "例: /home/cimrman/jara-priv-key Dardanely\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5497
--#: ../clients/common/nm-secret-agent-simple.c:265
--#: ../clients/common/nm-secret-agent-simple.c:363
-+#: ../clients/common/nm-meta-setting-desc.c:4864
-+#: ../clients/common/nm-secret-agent-simple.c:281
-+#: ../clients/common/nm-secret-agent-simple.c:369
- #: ../clients/tui/nmt-page-dsl.c:66 ../clients/tui/nmt-page-wifi.c:332
- msgid "Username"
- msgstr "ユーザー名"
-
--#: ../clients/common/nm-meta-setting-desc.c:5503
--#: ../clients/common/nm-meta-setting-desc.c:5687
--#: ../clients/common/nm-meta-setting-desc.c:6060
--#: ../clients/common/nm-meta-setting-desc.c:6720
-+#: ../clients/common/nm-meta-setting-desc.c:4870
-+#: ../clients/common/nm-meta-setting-desc.c:5085
-+#: ../clients/common/nm-meta-setting-desc.c:5475
-+#: ../clients/common/nm-meta-setting-desc.c:6378
- msgid "Password [none]"
- msgstr "パスワード [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5549
-+#: ../clients/common/nm-meta-setting-desc.c:4916
- msgid "Bluetooth device address"
- msgstr "Bluetooth デバイスアドレス"
-
--#: ../clients/common/nm-meta-setting-desc.c:5594
--#: ../clients/common/nm-meta-setting-desc.c:6114
--#: ../clients/common/nm-meta-setting-desc.c:7446
--#: ../clients/common/nm-meta-setting-desc.c:7484
--#: ../clients/common/nm-meta-setting-desc.c:7621
--#: ../clients/common/nm-meta-setting-desc.c:7839
-+#: ../clients/common/nm-meta-setting-desc.c:4964
-+#: ../clients/common/nm-meta-setting-desc.c:5528
-+#: ../clients/common/nm-meta-setting-desc.c:7035
-+#: ../clients/common/nm-meta-setting-desc.c:7073
-+#: ../clients/common/nm-meta-setting-desc.c:7248
-+#: ../clients/common/nm-meta-setting-desc.c:7478
- msgid "MAC [none]"
- msgstr "MAC [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5600
-+#: ../clients/common/nm-meta-setting-desc.c:4970
- msgid "Enable STP [no]"
- msgstr "STP の有効化 [no]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5606
-+#: ../clients/common/nm-meta-setting-desc.c:4976
- msgid "STP priority [32768]"
- msgstr "STP の優先度 [32768]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5612
-+#: ../clients/common/nm-meta-setting-desc.c:4982
- msgid "Forward delay [15]"
- msgstr "フォワード遅延 [15]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5618
-+#: ../clients/common/nm-meta-setting-desc.c:4988
- msgid "Hello time [2]"
- msgstr "Hello タイム [2]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5624
-+#: ../clients/common/nm-meta-setting-desc.c:4994
- msgid "Max age [20]"
- msgstr "最大エイジ [20]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5630
-+#: ../clients/common/nm-meta-setting-desc.c:5000
- msgid "MAC address ageing time [300]"
- msgstr "MAC アドレスのエージングタイム [300]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5636
-+#: ../clients/common/nm-meta-setting-desc.c:5006
- msgid "Group forward mask [0]"
- msgstr "グループの前方マスク [0]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5642
-+#: ../clients/common/nm-meta-setting-desc.c:5012
- msgid "Enable IGMP snooping [no]"
- msgstr "IGMP スヌーピングの有効化 [no]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5654
-+#: ../clients/common/nm-meta-setting-desc.c:5041
- msgid "Bridge port priority [32]"
- msgstr "ブリッジポートの優先度 [32]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5660
-+#: ../clients/common/nm-meta-setting-desc.c:5047
- msgid "Bridge port STP path cost [100]"
- msgstr "ブリッジポートの STP パスコスト [100]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5666
-+#: ../clients/common/nm-meta-setting-desc.c:5053
- msgid "Hairpin [no]"
- msgstr "ヘアピン [no]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5681
--#: ../clients/common/nm-meta-setting-desc.c:6054
--#: ../clients/common/nm-meta-setting-desc.c:7336
-+#: ../clients/common/nm-meta-setting-desc.c:5079
-+#: ../clients/common/nm-meta-setting-desc.c:5469
-+#: ../clients/common/nm-meta-setting-desc.c:6893
- msgid "Username [none]"
- msgstr "ユーザー名 [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5784
-+#: ../clients/common/nm-meta-setting-desc.c:5182
- msgid ""
- "Enter a list of user permissions. This is a list of user names formatted "
- "as:\n"
-@@ -5318,7 +5152,7 @@ msgstr ""
- "\n"
- "例: alice bob charlie\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5826
-+#: ../clients/common/nm-meta-setting-desc.c:5234
- msgid ""
- "Enter secondary connections that should be activated when this connection "
- "is\n"
-@@ -5340,7 +5174,7 @@ msgstr ""
- "\n"
- "例: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5843
-+#: ../clients/common/nm-meta-setting-desc.c:5257
- 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"
-@@ -5355,25 +5189,25 @@ msgstr ""
- "NetworkManager でヒューリスティックを使用して値を選択できるようにする場合は "
- "'unknown'\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:6071
-+#: ../clients/common/nm-meta-setting-desc.c:5485
- msgid "APN"
- msgstr "APN"
-
--#: ../clients/common/nm-meta-setting-desc.c:6123
--#: ../clients/common/nm-meta-setting-desc.c:7509
--#: ../clients/common/nm-meta-setting-desc.c:7655
-+#: ../clients/common/nm-meta-setting-desc.c:5537
-+#: ../clients/common/nm-meta-setting-desc.c:7104
-+#: ../clients/common/nm-meta-setting-desc.c:7288
- msgid "MTU [auto]"
- msgstr "MTU [auto]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6142
-+#: ../clients/common/nm-meta-setting-desc.c:5556
- msgid "P_KEY [none]"
- msgstr "P_KEY [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6151
-+#: ../clients/common/nm-meta-setting-desc.c:5565
- msgid "Parent interface [none]"
- msgstr "親インターフェース [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6174
-+#: ../clients/common/nm-meta-setting-desc.c:5592
- msgid ""
- "Enter a list of IPv4 addresses of DNS servers.\n"
- "\n"
-@@ -5383,11 +5217,11 @@ msgstr ""
- "\n"
- "例: 8.8.8.8, 8.8.4.4\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:6206
-+#: ../clients/common/nm-meta-setting-desc.c:5639
- msgid "IPv4 address (IP[/plen]) [none]"
- msgstr "IPv4 アドレス (IP[/plen]) [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6208
-+#: ../clients/common/nm-meta-setting-desc.c:5641
- msgid ""
- "Enter a list of IPv4 addresses formatted as:\n"
- " ip[/prefix], ip[/prefix],...\n"
-@@ -5401,11 +5235,11 @@ msgstr ""
- "\n"
- "例: 192.168.1.5/24, 10.0.0.11/24\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:6221
-+#: ../clients/common/nm-meta-setting-desc.c:5660
- msgid "IPv4 gateway [none]"
- msgstr "IPv4 ゲートウェイ [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6229
-+#: ../clients/common/nm-meta-setting-desc.c:5668
- msgid ""
- "Enter a list of IPv4 routes formatted as:\n"
- " ip[/prefix] [next-hop] [metric],...\n"
-@@ -5428,7 +5262,14 @@ 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:6331
-+#: ../clients/common/nm-meta-setting-desc.c:5708
-+msgid ""
-+"Enter a list of IPv4 routing rules formatted as:\n"
-+" priority [prio] [from [src]] [to [dst]], ,...\n"
-+"\n"
-+msgstr ""
-+
-+#: ../clients/common/nm-meta-setting-desc.c:5798
- 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 "
-@@ -5447,11 +5288,11 @@ msgstr ""
- "\n"
- "例: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:6369
-+#: ../clients/common/nm-meta-setting-desc.c:5851
- msgid "IPv6 address (IP[/plen]) [none]"
- msgstr "IPv6 アドレス (IP[/plen]) [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6371
-+#: ../clients/common/nm-meta-setting-desc.c:5853
- msgid ""
- "Enter a list of IPv6 addresses formatted as:\n"
- " ip[/prefix], ip[/prefix],...\n"
-@@ -5465,11 +5306,11 @@ msgstr ""
- "\n"
- "例: 2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:6384
-+#: ../clients/common/nm-meta-setting-desc.c:5872
- msgid "IPv6 gateway [none]"
- msgstr "IPv6 ゲートウェイ [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6392
-+#: ../clients/common/nm-meta-setting-desc.c:5880
- msgid ""
- "Enter a list of IPv6 routes formatted as:\n"
- " ip[/prefix] [next-hop] [metric],...\n"
-@@ -5494,162 +5335,173 @@ msgstr ""
- "beef::3 2\n"
- " abbe::/64 55\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:6497
--#: ../clients/common/nm-meta-setting-desc.c:7369
-+#: ../clients/common/nm-meta-setting-desc.c:5920
-+msgid ""
-+"Enter a list of IPv6 routing rules formatted as:\n"
-+" priority [prio] [from [src]] [to [dst]], ,...\n"
-+"\n"
-+msgstr ""
-+
-+#: ../clients/common/nm-meta-setting-desc.c:6008
-+#: ../clients/common/nm-meta-setting-desc.c:6934
- msgid "Parent device [none]"
- msgstr "親デバイス [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6503
-+#: ../clients/common/nm-meta-setting-desc.c:6014
- msgid "Local endpoint [none]"
- msgstr "ローカルエンドポイント [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6510
--#: ../clients/common/nm-meta-setting-desc.c:7389
-+#: ../clients/common/nm-meta-setting-desc.c:6021
-+#: ../clients/common/nm-meta-setting-desc.c:6954
- msgid "Remote"
- msgstr "リモート"
-
--#: ../clients/common/nm-meta-setting-desc.c:6555
-+#: ../clients/common/nm-meta-setting-desc.c:6066
- msgid "MACsec parent device or connection UUID"
- msgstr "MACsec 親デバイスまたは接続 UUID"
-
--#: ../clients/common/nm-meta-setting-desc.c:6576
-+#: ../clients/common/nm-meta-setting-desc.c:6087
- msgid "Enable encryption [yes]"
- msgstr "暗号化の有効化 [yes]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6582
--#: ../clients/common/nm-secret-agent-simple.c:835
-+#: ../clients/common/nm-meta-setting-desc.c:6093
-+#: ../clients/common/nm-secret-agent-simple.c:930
- msgid "MKA CAK"
- msgstr "MKA CAK"
-
--#: ../clients/common/nm-meta-setting-desc.c:6592
-+#: ../clients/common/nm-meta-setting-desc.c:6103
- msgid "MKA_CKN"
- msgstr "MKA_CKN"
-
--#: ../clients/common/nm-meta-setting-desc.c:6598
-+#: ../clients/common/nm-meta-setting-desc.c:6109
- msgid "SCI port [1]"
- msgstr "SCI ポート [1]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6624
-+#: ../clients/common/nm-meta-setting-desc.c:6135
- msgid "MACVLAN parent device or connection UUID"
- msgstr "MACVLAN 親デバイスまたは接続 UUID"
-
--#: ../clients/common/nm-meta-setting-desc.c:6645
-+#: ../clients/common/nm-meta-setting-desc.c:6156
- msgid "Tap [no]"
- msgstr "Tap [no]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6671
--#: ../clients/common/nm-meta-setting-desc.c:7576
-+#: ../clients/common/nm-meta-setting-desc.c:6191
-+#: ../clients/common/nm-meta-setting-desc.c:7203
- #: ../clients/tui/nmt-page-wifi.c:224
- msgid "SSID"
- msgstr "SSID"
-
--#: ../clients/common/nm-meta-setting-desc.c:6680
-+#: ../clients/common/nm-meta-setting-desc.c:6200
- msgid "OLPC Mesh channel [1]"
- msgstr "OLPC メッシュチャンネル [1]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6689
-+#: ../clients/common/nm-meta-setting-desc.c:6209
- msgid "DHCP anycast MAC address [none]"
- msgstr "DHCP anycast MAC アドレス [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6701
-+#: ../clients/common/nm-meta-setting-desc.c:6359
- msgid "PPPoE parent device"
- msgstr "PPPoE 親デバイス"
-
--#: ../clients/common/nm-meta-setting-desc.c:6707
-+#: ../clients/common/nm-meta-setting-desc.c:6365
- msgid "Service [none]"
- msgstr "サービス [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6714
-+#: ../clients/common/nm-meta-setting-desc.c:6372
- msgid "PPPoE username"
- msgstr "PPPoE ユーザー名"
-
--#: ../clients/common/nm-meta-setting-desc.c:6888
-+#: ../clients/common/nm-meta-setting-desc.c:6408
- msgid "Browser only [no]"
- msgstr "ブラウザー専用 [no]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6894
-+#: ../clients/common/nm-meta-setting-desc.c:6414
- msgid "PAC URL"
- msgstr "PAC URL"
-
--#: ../clients/common/nm-meta-setting-desc.c:6900
-+#: ../clients/common/nm-meta-setting-desc.c:6420
- msgid "PAC script"
- msgstr "PAC スクリプト"
-
--#: ../clients/common/nm-meta-setting-desc.c:6935
--#: ../clients/common/nm-meta-setting-desc.c:7084
-+#: ../clients/common/nm-meta-setting-desc.c:6544
-+#: ../clients/common/nm-meta-setting-desc.c:6707
- msgid "Team JSON configuration [none]"
- msgstr "team JSON 設定 [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:7239
-+#: ../clients/common/nm-meta-setting-desc.c:6796
- msgid "User ID [none]"
- msgstr "ユーザー ID [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:7245
-+#: ../clients/common/nm-meta-setting-desc.c:6802
- msgid "Group ID [none]"
- msgstr "グループ ID [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:7251
-+#: ../clients/common/nm-meta-setting-desc.c:6808
- msgid "Enable PI [no]"
- msgstr "PI の有効化 [no]"
-
--#: ../clients/common/nm-meta-setting-desc.c:7257
-+#: ../clients/common/nm-meta-setting-desc.c:6814
- msgid "Enable VNET header [no]"
- msgstr "VNET ヘッダー の有効化 [no]"
-
--#: ../clients/common/nm-meta-setting-desc.c:7263
-+#: ../clients/common/nm-meta-setting-desc.c:6820
- msgid "Enable multi queue [no]"
- msgstr "複数のキューの有効化 [no]"
-
--#: ../clients/common/nm-meta-setting-desc.c:7276
-+#: ../clients/common/nm-meta-setting-desc.c:6833
- msgid "VLAN parent device or connection UUID"
- msgstr "VLAN 親デバイスまたは接続 UUID"
-
--#: ../clients/common/nm-meta-setting-desc.c:7283
-+#: ../clients/common/nm-meta-setting-desc.c:6840
- msgid "VLAN ID (<0-4094>)"
- msgstr "VLAN ID (<0-4094>)"
-
--#: ../clients/common/nm-meta-setting-desc.c:7289
-+#: ../clients/common/nm-meta-setting-desc.c:6846
- msgid "VLAN flags (<0-7>) [none]"
- msgstr "VLAN フラグ (<0-7>) [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:7298
-+#: ../clients/common/nm-meta-setting-desc.c:6855
- msgid "Ingress priority maps [none]"
- msgstr "イングレス優先度マップ [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:7308
-+#: ../clients/common/nm-meta-setting-desc.c:6865
- msgid "Egress priority maps [none]"
- msgstr "イーグレス優先度マップ [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:7376
-+#: ../clients/common/nm-meta-setting-desc.c:6941
- msgid "VXLAN ID"
- msgstr "VXLAN ID"
-
--#: ../clients/common/nm-meta-setting-desc.c:7382
-+#: ../clients/common/nm-meta-setting-desc.c:6947
- msgid "Local address [none]"
- msgstr "ローカルアドレス [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:7395
-+#: ../clients/common/nm-meta-setting-desc.c:6960
- msgid "Minimum source port [0]"
- msgstr "最小ソースポート数 [0]"
-
--#: ../clients/common/nm-meta-setting-desc.c:7401
-+#: ../clients/common/nm-meta-setting-desc.c:6966
- msgid "Maximum source port [0]"
- msgstr "最大ソースポート数 [0]"
-
--#: ../clients/common/nm-meta-setting-desc.c:7407
-+#: ../clients/common/nm-meta-setting-desc.c:6972
- msgid "Destination port [8472]"
- msgstr "接続先ポート [8472]"
-
--#: ../clients/common/nm-meta-setting-desc.c:7453
-+#: ../clients/common/nm-meta-setting-desc.c:7012
-+msgid "Peer"
-+msgstr ""
-+
-+#: ../clients/common/nm-meta-setting-desc.c:7042
- msgid "WiMAX NSP name"
- msgstr "WiMAX NSP 名"
-
--#: ../clients/common/nm-meta-setting-desc.c:7490
--#: ../clients/common/nm-meta-setting-desc.c:7626
-+#: ../clients/common/nm-meta-setting-desc.c:7079
-+#: ../clients/common/nm-meta-setting-desc.c:7253
- msgid "Cloned MAC [none]"
- msgstr "クローンした MAC [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:7517
-+#: ../clients/common/nm-meta-setting-desc.c:7112
- msgid ""
- "Enter a list of subchannels (comma or space separated).\n"
- "\n"
-@@ -5659,7 +5511,7 @@ msgstr ""
- "\n"
- "例: 0.0.0e20 0.0.0e21 0.0.0e22\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:7785
-+#: ../clients/common/nm-meta-setting-desc.c:7427
- msgid ""
- "Enter the type of WEP keys. The accepted values are: 0 or unknown, 1 or key, "
- "and 2 or passphrase.\n"
-@@ -5667,264 +5519,285 @@ msgstr ""
- "WEP キーのタイプを入力します。使用できる値は、0 または unknown、1 または "
- "key、2 または passphrase です。\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:7847
-+#: ../clients/common/nm-meta-setting-desc.c:7486
- msgid "Short address (<0x0000-0xffff>)"
- msgstr "ショートアドレス (<0x0000-0xffff>)"
-
--#: ../clients/common/nm-meta-setting-desc.c:7863
-+#: ../clients/common/nm-meta-setting-desc.c:7502
- msgid "PAN Identifier (<0x0000-0xffff>)"
- msgstr "PAN 識別子 (<0x0000-0xffff>)"
-
--#: ../clients/common/nm-meta-setting-desc.c:7878
-+#: ../clients/common/nm-meta-setting-desc.c:7517
- #, fuzzy
- msgid "Page (<default|0-31>)"
- msgstr "(デフォルト)"
-
--#: ../clients/common/nm-meta-setting-desc.c:7892
-+#: ../clients/common/nm-meta-setting-desc.c:7531
- msgid "Channel (<default|0-26>)"
- msgstr ""
-
--#: ../clients/common/nm-meta-setting-desc.c:7913
--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:8040
-+#: ../clients/common/nm-meta-setting-desc.c:7666
-+msgid "6LOWPAN settings"
-+msgstr "6LOWPAN 設定"
-+
-+#: ../clients/common/nm-meta-setting-desc.c:7667
- msgid "802-1x settings"
- msgstr "802-1x 設定"
-
--#: ../clients/common/nm-meta-setting-desc.c:8041
--#: ../src/devices/adsl/nm-device-adsl.c:133
-+#: ../clients/common/nm-meta-setting-desc.c:7668
-+#: ../src/devices/adsl/nm-device-adsl.c:132
- msgid "ADSL connection"
- msgstr "ADSL 接続"
-
--#: ../clients/common/nm-meta-setting-desc.c:8042
-+#: ../clients/common/nm-meta-setting-desc.c:7669
- msgid "bluetooth connection"
- msgstr "bluetooth 接続"
-
--#: ../clients/common/nm-meta-setting-desc.c:8043
-+#: ../clients/common/nm-meta-setting-desc.c:7670
- msgid "Bond device"
- msgstr "Bond デバイス"
-
--#: ../clients/common/nm-meta-setting-desc.c:8044
-+#: ../clients/common/nm-meta-setting-desc.c:7671
- msgid "Bridge device"
- msgstr "ブリッジデバイス"
-
--#: ../clients/common/nm-meta-setting-desc.c:8045
-+#: ../clients/common/nm-meta-setting-desc.c:7672
- msgid "Bridge port"
- msgstr "ブリッジポート"
-
--#: ../clients/common/nm-meta-setting-desc.c:8046
-+#: ../clients/common/nm-meta-setting-desc.c:7673
- msgid "CDMA mobile broadband connection"
- msgstr "CDMA モバイルブロードバンド接続"
-
--#: ../clients/common/nm-meta-setting-desc.c:8047
-+#: ../clients/common/nm-meta-setting-desc.c:7674
- msgid "General settings"
- msgstr "一般設定"
-
--#: ../clients/common/nm-meta-setting-desc.c:8048
-+#: ../clients/common/nm-meta-setting-desc.c:7675
- msgid "DCB settings"
- msgstr "DCB 設定"
-
--#: ../clients/common/nm-meta-setting-desc.c:8049
-+#: ../clients/common/nm-meta-setting-desc.c:7676
- msgid "Dummy settings"
- msgstr "ダミー設定"
-
--#: ../clients/common/nm-meta-setting-desc.c:8050
-+#: ../clients/common/nm-meta-setting-desc.c:7677
- msgid "Ethtool settings"
- msgstr "Ethtool 設定"
-
--#: ../clients/common/nm-meta-setting-desc.c:8051
-+#: ../clients/common/nm-meta-setting-desc.c:7678
- msgid "Generic settings"
- msgstr "汎用設定"
-
--#: ../clients/common/nm-meta-setting-desc.c:8052
-+#: ../clients/common/nm-meta-setting-desc.c:7679
- msgid "GSM mobile broadband connection"
- msgstr "GSM モバイルブロードバンド接続"
-
--#: ../clients/common/nm-meta-setting-desc.c:8053
-+#: ../clients/common/nm-meta-setting-desc.c:7680
- #: ../src/devices/nm-device-infiniband.c:172
- msgid "InfiniBand connection"
- msgstr "InfiniBand 接続"
-
--#: ../clients/common/nm-meta-setting-desc.c:8054
-+#: ../clients/common/nm-meta-setting-desc.c:7681
- msgid "IPv4 protocol"
- msgstr "IPv4 プロトコル"
-
--#: ../clients/common/nm-meta-setting-desc.c:8055
-+#: ../clients/common/nm-meta-setting-desc.c:7682
- msgid "IPv6 protocol"
- msgstr "IPv6 プロトコル"
-
--#: ../clients/common/nm-meta-setting-desc.c:8056
-+#: ../clients/common/nm-meta-setting-desc.c:7683
- msgid "IP-tunnel settings"
- msgstr "IP トンネル設定"
-
--#: ../clients/common/nm-meta-setting-desc.c:8057
-+#: ../clients/common/nm-meta-setting-desc.c:7684
- msgid "MACsec connection"
- msgstr "MACsec 接続"
-
--#: ../clients/common/nm-meta-setting-desc.c:8058
-+#: ../clients/common/nm-meta-setting-desc.c:7685
- msgid "macvlan connection"
- msgstr "macvlan 接続"
-
--#: ../clients/common/nm-meta-setting-desc.c:8059
-+#: ../clients/common/nm-meta-setting-desc.c:7686
- msgid "Match"
- msgstr "一致"
-
--#: ../clients/common/nm-meta-setting-desc.c:8060
-+#: ../clients/common/nm-meta-setting-desc.c:7687
- msgid "OLPC Mesh connection"
- msgstr "OLPC Mesh 接続"
-
--#: ../clients/common/nm-meta-setting-desc.c:8061
-+#: ../clients/common/nm-meta-setting-desc.c:7688
- msgid "Open vSwitch bridge settings"
- msgstr "Open vSwitch ブリッジ設定"
-
--#: ../clients/common/nm-meta-setting-desc.c:8062
-+#: ../clients/common/nm-meta-setting-desc.c:7689
- msgid "Open vSwitch interface settings"
- msgstr "Open vSwitch インターフェース設定"
-
--#: ../clients/common/nm-meta-setting-desc.c:8063
-+#: ../clients/common/nm-meta-setting-desc.c:7690
- msgid "Open vSwitch patch interface settings"
- msgstr "Open vSwitch パッチインターフェース設定"
-
--#: ../clients/common/nm-meta-setting-desc.c:8064
-+#: ../clients/common/nm-meta-setting-desc.c:7691
- msgid "Open vSwitch port settings"
- msgstr "Open vSwitch ポート設定"
-
--#: ../clients/common/nm-meta-setting-desc.c:8065
-+#: ../clients/common/nm-meta-setting-desc.c:7692
- msgid "PPP settings"
- msgstr "PPP 設定"
-
--#: ../clients/common/nm-meta-setting-desc.c:8066
-+#: ../clients/common/nm-meta-setting-desc.c:7693
- msgid "PPPoE"
- msgstr "PPPoE"
-
--#: ../clients/common/nm-meta-setting-desc.c:8067
-+#: ../clients/common/nm-meta-setting-desc.c:7694
- msgid "Proxy"
- msgstr "プロキシ"
-
--#: ../clients/common/nm-meta-setting-desc.c:8068
-+#: ../clients/common/nm-meta-setting-desc.c:7695
- msgid "Serial settings"
- msgstr "シリアル設定"
-
--#: ../clients/common/nm-meta-setting-desc.c:8069
-+#: ../clients/common/nm-meta-setting-desc.c:7696
- msgid "SR-IOV settings"
- msgstr "SR-IOV 設定"
-
--#: ../clients/common/nm-meta-setting-desc.c:8070
-+#: ../clients/common/nm-meta-setting-desc.c:7697
- msgid "Traffic controls"
- msgstr "トラフィックコントロール"
-
--#: ../clients/common/nm-meta-setting-desc.c:8071
-+#: ../clients/common/nm-meta-setting-desc.c:7698
- msgid "Team device"
- msgstr "Team デバイス"
-
--#: ../clients/common/nm-meta-setting-desc.c:8072
-+#: ../clients/common/nm-meta-setting-desc.c:7699
- msgid "Team port"
- msgstr "Team ポート"
-
--#: ../clients/common/nm-meta-setting-desc.c:8073
-+#: ../clients/common/nm-meta-setting-desc.c:7700
- msgid "Tun device"
- msgstr "TUN デバイス"
-
--#: ../clients/common/nm-meta-setting-desc.c:8074
-+#: ../clients/common/nm-meta-setting-desc.c:7701
- msgid "User settings"
- msgstr "ユーザー設定"
-
--#: ../clients/common/nm-meta-setting-desc.c:8075
-+#: ../clients/common/nm-meta-setting-desc.c:7702
- #: ../src/devices/nm-device-vlan.c:400
- msgid "VLAN connection"
- msgstr "VLAN 接続"
-
--#: ../clients/common/nm-meta-setting-desc.c:8076 ../src/nm-manager.c:5488
-+#: ../clients/common/nm-meta-setting-desc.c:7703 ../src/nm-manager.c:5539
- msgid "VPN connection"
- msgstr "VPN 接続"
-
--#: ../clients/common/nm-meta-setting-desc.c:8077
--#: ../src/devices/nm-device-vxlan.c:371
-+#: ../clients/common/nm-meta-setting-desc.c:7704
-+#: ../src/devices/nm-device-vxlan.c:369
- msgid "VXLAN connection"
- msgstr "VXLAN 接続"
-
--#: ../clients/common/nm-meta-setting-desc.c:8078
-+#: ../clients/common/nm-meta-setting-desc.c:7705
-+#, fuzzy
-+msgid "Wi-Fi P2P connection"
-+msgstr "Wi-Fi 接続"
-+
-+#: ../clients/common/nm-meta-setting-desc.c:7706
- msgid "WiMAX connection"
- msgstr "WiMAX 接続"
-
--#: ../clients/common/nm-meta-setting-desc.c:8079
-+#: ../clients/common/nm-meta-setting-desc.c:7707
- msgid "Wired Ethernet"
- msgstr "有線 Ethernet"
-
--#: ../clients/common/nm-meta-setting-desc.c:8080
-+#: ../clients/common/nm-meta-setting-desc.c:7708
-+#, fuzzy
-+msgid "WireGuard VPN settings"
-+msgstr "WPAN 設定"
-+
-+#: ../clients/common/nm-meta-setting-desc.c:7709
- msgid "Wi-Fi connection"
- msgstr "Wi-Fi 接続"
-
--#: ../clients/common/nm-meta-setting-desc.c:8081
-+#: ../clients/common/nm-meta-setting-desc.c:7710
- msgid "Wi-Fi security settings"
- msgstr "Wi-Fi セキュリティー設定"
-
--#: ../clients/common/nm-meta-setting-desc.c:8082
-+#: ../clients/common/nm-meta-setting-desc.c:7711
- msgid "WPAN settings"
- msgstr "WPAN 設定"
-
--#: ../clients/common/nm-meta-setting-desc.c:8083
--msgid "6LOWPAN settings"
--msgstr "6LOWPAN 設定"
--
--#: ../clients/common/nm-meta-setting-desc.c:8434
-+#: ../clients/common/nm-meta-setting-desc.c:8074
- msgid "name"
- msgstr "名前"
-
--#: ../clients/common/nm-polkit-listener.c:239
-+#: ../clients/common/nm-polkit-listener.c:238
- msgid "An authentication session is already underway."
- msgstr "認証セッションはすでに実行されています。"
-
--#: ../clients/common/nm-secret-agent-simple.c:271
--#: ../clients/common/nm-secret-agent-simple.c:311
--#: ../clients/common/nm-secret-agent-simple.c:339
--#: ../clients/common/nm-secret-agent-simple.c:375
--#: ../clients/common/nm-secret-agent-simple.c:820
--#: ../clients/common/nm-secret-agent-simple.c:852
--#: ../clients/common/nm-secret-agent-simple.c:874
--#: ../clients/common/nm-vpn-helpers.c:119
-+#: ../clients/common/nm-secret-agent-simple.c:230
-+#, c-format
-+msgid "Preshared-key for %s"
-+msgstr ""
-+
-+#: ../clients/common/nm-secret-agent-simple.c:286
-+#: ../clients/common/nm-secret-agent-simple.c:323
-+#: ../clients/common/nm-secret-agent-simple.c:346
-+#: ../clients/common/nm-secret-agent-simple.c:379
-+#: ../clients/common/nm-secret-agent-simple.c:916
-+#: ../clients/common/nm-secret-agent-simple.c:951
-+#: ../clients/common/nm-secret-agent-simple.c:974
- #: ../clients/common/nm-vpn-helpers.c:123
--#: ../clients/common/nm-vpn-helpers.c:129
--#: ../clients/common/nm-vpn-helpers.c:134 ../clients/tui/nmt-page-dsl.c:75
-+#: ../clients/common/nm-vpn-helpers.c:127
-+#: ../clients/common/nm-vpn-helpers.c:133
-+#: ../clients/common/nm-vpn-helpers.c:138 ../clients/tui/nmt-page-dsl.c:75
- #: ../clients/tui/nmt-page-wifi.c:277 ../clients/tui/nmt-page-wifi.c:308
- #: ../clients/tui/nmt-page-wifi.c:341
- msgid "Password"
- msgstr "パスワード"
-
--#: ../clients/common/nm-secret-agent-simple.c:281
-+#: ../clients/common/nm-secret-agent-simple.c:295
- msgid "Identity"
- msgstr "ID"
-
--#: ../clients/common/nm-secret-agent-simple.c:287
-+#: ../clients/common/nm-secret-agent-simple.c:300
- msgid "Private key password"
- msgstr "プライベートキーのパスワード"
-
--#: ../clients/common/nm-secret-agent-simple.c:326
-+#: ../clients/common/nm-secret-agent-simple.c:336
- #: ../clients/tui/nmt-page-wifi.c:289
- msgid "Key"
- msgstr "キー"
-
--#: ../clients/common/nm-secret-agent-simple.c:369
-+#: ../clients/common/nm-secret-agent-simple.c:374
- #: ../clients/tui/nmt-page-dsl.c:78
- msgid "Service"
- msgstr "サービス"
-
--#: ../clients/common/nm-secret-agent-simple.c:548
--#: ../clients/common/nm-secret-agent-simple.c:816
--#: ../clients/common/nm-secret-agent-simple.c:848
--#: ../clients/common/nm-secret-agent-simple.c:870
--#: ../clients/common/nm-secret-agent-simple.c:892
-+#: ../clients/common/nm-secret-agent-simple.c:486
-+#, fuzzy
-+msgid "WireGuard private-key"
-+msgstr "無効なプライベートキー"
-+
-+#: ../clients/common/nm-secret-agent-simple.c:527
-+#, fuzzy, c-format
-+msgid "Secrets are required to connect WireGuard VPN '%s'"
-+msgstr "有線ネットワーク '%s' へのアクセスにはシークレットが必要です"
-+
-+#: ../clients/common/nm-secret-agent-simple.c:628
-+#: ../clients/common/nm-secret-agent-simple.c:912
-+#: ../clients/common/nm-secret-agent-simple.c:947
-+#: ../clients/common/nm-secret-agent-simple.c:970
-+#: ../clients/common/nm-secret-agent-simple.c:989
- #, c-format
- msgid "A password is required to connect to '%s'."
- msgstr "'%s' への接続にはパスワードが必要です。"
-
--#: ../clients/common/nm-secret-agent-simple.c:785
-+#: ../clients/common/nm-secret-agent-simple.c:879
- msgid "Authentication required by wireless network"
- msgstr "ワイヤレスネットワークで必要とされる認証"
-
--#: ../clients/common/nm-secret-agent-simple.c:786
-+#: ../clients/common/nm-secret-agent-simple.c:880
- #, c-format
- msgid ""
- "Passwords or encryption keys are required to access the wireless network "
-@@ -5933,70 +5806,75 @@ msgstr ""
- "ワイヤレスネットワーク '%s' へのアクセスには、パスワードまたは暗号キーが必要"
- "です。"
-
--#: ../clients/common/nm-secret-agent-simple.c:790
-+#: ../clients/common/nm-secret-agent-simple.c:885
- msgid "Wired 802.1X authentication"
- msgstr "有線 802.1X の認証"
-
--#: ../clients/common/nm-secret-agent-simple.c:791
-+#: ../clients/common/nm-secret-agent-simple.c:886
- #, c-format
- msgid "Secrets are required to access the wired network '%s'"
- msgstr "有線ネットワーク '%s' へのアクセスにはシークレットが必要です"
-
--#: ../clients/common/nm-secret-agent-simple.c:796
-+#: ../clients/common/nm-secret-agent-simple.c:892
- msgid "DSL authentication"
- msgstr "DSL 認証"
-
--#: ../clients/common/nm-secret-agent-simple.c:797
-+#: ../clients/common/nm-secret-agent-simple.c:893
- #, c-format
- msgid "Secrets are required for the DSL connection '%s'"
- msgstr "DSL 接続 '%s' にはシークレットが必要です"
-
--#: ../clients/common/nm-secret-agent-simple.c:805
-+#: ../clients/common/nm-secret-agent-simple.c:902
- msgid "PIN code required"
- msgstr "PIN コードが必要です"
-
--#: ../clients/common/nm-secret-agent-simple.c:806
-+#: ../clients/common/nm-secret-agent-simple.c:903
- msgid "PIN code is needed for the mobile broadband device"
- msgstr "モバイルブロードバンドのデバイスには PIN コードが必要です"
-
--#: ../clients/common/nm-secret-agent-simple.c:809
-+#: ../clients/common/nm-secret-agent-simple.c:906
- msgid "PIN"
- msgstr "PIN"
-
--#: ../clients/common/nm-secret-agent-simple.c:815
--#: ../clients/common/nm-secret-agent-simple.c:847
--#: ../clients/common/nm-secret-agent-simple.c:869
-+#: ../clients/common/nm-secret-agent-simple.c:911
-+#: ../clients/common/nm-secret-agent-simple.c:946
-+#: ../clients/common/nm-secret-agent-simple.c:969
- msgid "Mobile broadband network password"
- msgstr "モバイルブロードバンドのネットワークパスワード"
-
--#: ../clients/common/nm-secret-agent-simple.c:829
-+#: ../clients/common/nm-secret-agent-simple.c:924
- #, c-format
- msgid "Secrets are required to access the MACsec network '%s'"
- msgstr "MACsec ネットワーク '%s' へのアクセスにはシークレットが必要です"
-
--#: ../clients/common/nm-secret-agent-simple.c:833
-+#: ../clients/common/nm-secret-agent-simple.c:928
- msgid "MACsec PSK authentication"
- msgstr "MACsec PSK 認証"
-
--#: ../clients/common/nm-secret-agent-simple.c:841
-+#: ../clients/common/nm-secret-agent-simple.c:935
- msgid "MACsec EAP authentication"
- msgstr "MACsec EAP 認証"
-
--#: ../clients/common/nm-secret-agent-simple.c:882
-+#: ../clients/common/nm-secret-agent-simple.c:940
-+#, fuzzy
-+msgid "WireGuard VPN secret"
-+msgstr "WireGuard"
-+
-+#: ../clients/common/nm-secret-agent-simple.c:979
- msgid "VPN password required"
- msgstr "VPN パスワードが必要です"
-
--#: ../clients/common/nm-vpn-helpers.c:48
-+#: ../clients/common/nm-vpn-helpers.c:52
- #, c-format
- msgid "unknown VPN plugin \"%s\""
- msgstr "不明な VPN プラグイン '%s'"
-
--#: ../clients/common/nm-vpn-helpers.c:59
-+#: ../clients/common/nm-vpn-helpers.c:63
- #, c-format
- msgid "cannot load legacy-only VPN plugin \"%s\" for \"%s\""
- msgstr "'%s' 向けレガシー専用 VPN プラグイン '%s' を読み込めません"
-
--#: ../clients/common/nm-vpn-helpers.c:64
-+#: ../clients/common/nm-vpn-helpers.c:68
- #, c-format
- msgid ""
- "cannot load VPN plugin \"%s\" due to missing \"%s\". Missing client plugin?"
-@@ -6004,37 +5882,68 @@ msgstr ""
- "'%s' がないため VPN プラグイン '%s' を読み込めません。クライアントプラグイン"
- "がありませんか?"
-
--#: ../clients/common/nm-vpn-helpers.c:69
-+#: ../clients/common/nm-vpn-helpers.c:73
- #, c-format
- msgid "failed to load VPN plugin \"%s\": %s"
- msgstr "VPN プラグイン '%s' の読み込みに失敗しました: %s"
-
--#: ../clients/common/nm-vpn-helpers.c:124
-+#: ../clients/common/nm-vpn-helpers.c:128
- msgid "Certificate password"
- msgstr "証明書のパスワード"
-
--#: ../clients/common/nm-vpn-helpers.c:125
-+#: ../clients/common/nm-vpn-helpers.c:129
- msgid "HTTP proxy password"
- msgstr "HTTP プロキシのパスワード"
-
--#: ../clients/common/nm-vpn-helpers.c:130
--#: ../clients/common/nm-vpn-helpers.c:135
-+#: ../clients/common/nm-vpn-helpers.c:134
-+#: ../clients/common/nm-vpn-helpers.c:139
- msgid "Group password"
- msgstr "グループパスワード"
-
--#: ../clients/common/nm-vpn-helpers.c:139 ../clients/tui/nmt-page-ip4.c:143
-+#: ../clients/common/nm-vpn-helpers.c:143 ../clients/tui/nmt-page-ip4.c:143
- #: ../clients/tui/nmt-page-ip6.c:143
- msgid "Gateway"
- msgstr "ゲートウェイ"
-
--#: ../clients/common/nm-vpn-helpers.c:140
-+#: ../clients/common/nm-vpn-helpers.c:144
- msgid "Cookie"
- msgstr "クッキー"
-
--#: ../clients/common/nm-vpn-helpers.c:141
-+#: ../clients/common/nm-vpn-helpers.c:145
- msgid "Gateway certificate hash"
- msgstr "ゲートウェイ証明書ハッシュ"
-
-+#: ../clients/common/nm-vpn-helpers.c:270
-+#, fuzzy, c-format
-+msgid "Invalid peer starting at %s:%zu: %s"
-+msgstr "無効な設定名 '%s'"
-+
-+#: ../clients/common/nm-vpn-helpers.c:390
-+msgid ""
-+"The WireGuard config file must be a valid interface name followed by \".conf"
-+"\""
-+msgstr ""
-+
-+#: ../clients/common/nm-vpn-helpers.c:678
-+#, c-format
-+msgid "unrecognized line at %s:%zu"
-+msgstr ""
-+
-+#: ../clients/common/nm-vpn-helpers.c:683
-+#, fuzzy, c-format
-+msgid "invalid value for '%s' at %s:%zu"
-+msgstr "'%s' の無効な値: %s"
-+
-+#: ../clients/common/nm-vpn-helpers.c:688
-+#, fuzzy, c-format
-+msgid "invalid secret '%s' at %s:%zu"
-+msgstr "無効なルート: %s. %s"
-+
-+#: ../clients/common/nm-vpn-helpers.c:801
-+#, fuzzy, c-format
-+msgid "Failed to create WireGuard connection: %s"
-+msgstr "エラー: 新規接続の追加またはアクティベートに失敗しました: %s"
-+
- #. Generated file. Do not edit.
- #: ../clients/common/settings-docs.h.in:3
- msgid ""
-@@ -6103,19 +6012,20 @@ msgstr ""
- "ティーを設定する必要があります。"
-
- #: ../clients/common/settings-docs.h.in:10
-+#, fuzzy
- 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 "
--"address, the special values \"preserve\", \"permanent\", \"random\" and "
--"\"stable\" are supported. \"preserve\" means not to touch the MAC address on "
--"activation. \"permanent\" means to use the permanent hardware address of the "
--"device. \"random\" 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 \"cloned-mac-address\"."
-+"If specified, request that the device use this MAC address instead of its "
-+"permanent MAC address. This is known as MAC cloning or spoofing. Beside "
-+"explicitly specifying a MAC address, the special values \"preserve\", "
-+"\"permanent\", \"random\" and \"stable\" are supported. \"preserve\" means "
-+"not to touch the MAC address on activation. \"permanent\" means to use the "
-+"permanent hardware address of the device. \"random\" 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 \"permanent\". On D-Bus, this field is "
-+"expressed as \"assigned-mac-address\" or the deprecated \"cloned-mac-address"
-+"\"."
- msgstr ""
- "指定した場合は、デバイスがこの MAC アドレスを代わりに使用するよう要求します。"
- "これは、MAC クローニングまたはスプーフィングとして知られています。明示的に "
-@@ -6388,11 +6298,12 @@ msgstr ""
- "す。"
-
- #: ../clients/common/settings-docs.h.in:27
-+#, fuzzy
- 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), or \"wpa-eap\" (WPA-Enterprise). This property must be set for "
--"any Wi-Fi connection that uses security."
-+"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)、また"
-@@ -6464,19 +6375,12 @@ msgstr ""
-
- #: ../clients/common/settings-docs.h.in:34
- msgid ""
--"Pre-Shared-Key for WPA networks. If the key is 64-characters long, it must "
--"contain only hexadecimal characters and is interpreted as a hexadecimal WPA "
--"key. Otherwise, the key must be between 8 and 63 ASCII characters (as "
--"specified in the 802.11i standard) and is interpreted as a WPA passphrase, "
--"and is hashed to derive the actual WPA-PSK used when connecting to the Wi-Fi "
--"network."
-+"Pre-Shared-Key for WPA networks. For WPA-PSK, it's either an ASCII "
-+"passphrase of 8 to 63 characters that is (as specified in the 802.11i "
-+"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 ネットワークの共有前のキー。このキーを 64 文字の長さにする場合は、16 進数"
--"の文字でなければならず、16 進数の WPA キーとして解釈されません。それ以外で"
--"は、キーは、(802.11i 仕様で指定されているように) 8 文字から 63 文字の ASCII "
--"文字にする必要があり、WPA パスフレーズとして解釈されます。接続が Wi-Fi ネット"
--"ワークに接続する際に使用される実際の WPA-PSK を取得するためにハッシュ化されま"
--"す。"
-
- #: ../clients/common/settings-docs.h.in:35
- msgid "Flags indicating how to handle the \"psk\" property."
-@@ -6721,9 +6625,9 @@ msgstr ""
-
- #: ../clients/common/settings-docs.h.in:59
- #: ../clients/common/settings-docs.h.in:104
--#: ../clients/common/settings-docs.h.in:127
--#: ../clients/common/settings-docs.h.in:174
--#: ../clients/common/settings-docs.h.in:286
-+#: ../clients/common/settings-docs.h.in:131
-+#: ../clients/common/settings-docs.h.in:178
-+#: ../clients/common/settings-docs.h.in:290
- msgid "Flags indicating how to handle the \"password\" property."
- msgstr "\"password\" プロパティーの処理方法を示すフラグ。"
-
-@@ -7014,7 +6918,7 @@ msgid "PIN used for EAP authentication methods."
- msgstr "EAP 認証方法に使用される PIN"
-
- #: ../clients/common/settings-docs.h.in:82
--#: ../clients/common/settings-docs.h.in:176
-+#: ../clients/common/settings-docs.h.in:180
- msgid "Flags indicating how to handle the \"pin\" property."
- msgstr "\"pin\" プロパティーの処理方法を示すフラグ。"
-
-@@ -7124,20 +7028,20 @@ msgstr ""
- "も設定されるか、リンク設定がスキップされます。"
-
- #: ../clients/common/settings-docs.h.in:89
-+#, fuzzy
- 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 "
--"address, the special values \"preserve\", \"permanent\", \"random\" and "
--"\"stable\" are supported. \"preserve\" means not to touch the MAC address on "
--"activation. \"permanent\" means to use the permanent hardware address if the "
--"device has one (otherwise this is treated as \"preserve\"). \"random\" "
--"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 "
--"\"cloned-mac-address\"."
-+"If specified, request that the device use this MAC address instead of its "
-+"permanent MAC address. This is known as MAC cloning or spoofing. Beside "
-+"explicitly specifying a MAC address, the special values \"preserve\", "
-+"\"permanent\", \"random\" and \"stable\" are supported. \"preserve\" means "
-+"not to touch the MAC address on activation. \"permanent\" means to use the "
-+"permanent hardware address if the device has one (otherwise this is treated "
-+"as \"preserve\"). \"random\" 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 \"permanent\". On D-Bus, this field is expressed as \"assigned-"
-+"mac-address\" or the deprecated \"cloned-mac-address\"."
- msgstr ""
- "指定した場合は、デバイスがこの MAC アドレスを代わりに使用するよう要求します。"
- "これは、MAC クローニングまたはスプーフィングとして知られています。明示的に "
-@@ -7430,25 +7334,58 @@ msgstr ""
-
- #: ../clients/common/settings-docs.h.in:121
- msgid ""
-+"The default PVID for the ports of the bridge, that is the VLAN id assigned "
-+"to incoming untagged frames."
-+msgstr ""
-+
-+#: ../clients/common/settings-docs.h.in:122
-+#, fuzzy
-+msgid "Control whether VLAN filtering is enabled on the bridge."
-+msgstr ""
-+"このブリッジにおいて、スパニングツリープロトコル (STP) が有効かどうかを制御し"
-+"ます。"
-+
-+#: ../clients/common/settings-docs.h.in:123
-+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-"
-+"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 ""
-+
-+#: ../clients/common/settings-docs.h.in:124
-+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:122
-+#: ../clients/common/settings-docs.h.in:125
- msgid ""
- "The Spanning Tree Protocol (STP) port cost for destinations via this port."
- msgstr ""
- "このポートを経由した、宛先のスパニングツリープロトコル (STP) ポートコスト。"
-
--#: ../clients/common/settings-docs.h.in:123
-+#: ../clients/common/settings-docs.h.in:126
- msgid "The Spanning Tree Protocol (STP) priority of this bridge port."
- msgstr "このブリッジポートのスパニングツリープロトコル (STP) の優先度。"
-
--#: ../clients/common/settings-docs.h.in:124
--#: ../clients/common/settings-docs.h.in:170
--#: ../clients/common/settings-docs.h.in:181
-+#: ../clients/common/settings-docs.h.in:127
-+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 ""
-+
-+#: ../clients/common/settings-docs.h.in:128
-+#: ../clients/common/settings-docs.h.in:174
-+#: ../clients/common/settings-docs.h.in:185
- msgid ""
- "If non-zero, only transmit packets of the specified size or smaller, "
- "breaking larger packets up into multiple frames."
-@@ -7456,7 +7393,7 @@ msgstr ""
- "ゼロ以外は、指定したサイズ以下のパケットだけが送信されます。指定したサイズよ"
- "り大きいパケットは、複数のフレームに分割されます。"
-
--#: ../clients/common/settings-docs.h.in:125
-+#: ../clients/common/settings-docs.h.in:129
- 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 "
-@@ -7466,8 +7403,8 @@ msgstr ""
- "号があれば指定します。指定しない場合は、必要に応じてデフォルトの番号 (#777) "
- "が使用されます。"
-
--#: ../clients/common/settings-docs.h.in:126
--#: ../clients/common/settings-docs.h.in:173
-+#: ../clients/common/settings-docs.h.in:130
-+#: ../clients/common/settings-docs.h.in:177
- 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 "
-@@ -7477,8 +7414,8 @@ msgstr ""
- "ダーでパスワードを必要としないか、いかなるパスワードも許可されます。パスワー"
- "ドが必要な場合は、ここで指定します。"
-
--#: ../clients/common/settings-docs.h.in:128
--#: ../clients/common/settings-docs.h.in:179
-+#: ../clients/common/settings-docs.h.in:132
-+#: ../clients/common/settings-docs.h.in:183
- 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 "
-@@ -7488,7 +7425,7 @@ msgstr ""
- "ダーでユーザー名を必要としないか、いかなるユーザー名も許可されます。ユーザー"
- "名が必要な場合は、ここで指定します。"
-
--#: ../clients/common/settings-docs.h.in:129
-+#: ../clients/common/settings-docs.h.in:133
- 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 "
-@@ -7500,7 +7437,7 @@ msgstr ""
- "は、認証を 3 回再試行したら接続に失敗します。現在、これは 802-1x 認証にのみ適"
- "用されます。"
-
--#: ../clients/common/settings-docs.h.in:130
-+#: ../clients/common/settings-docs.h.in:134
- msgid ""
- "Whether or not the connection should be automatically connected by "
- "NetworkManager when the resources for the connection are available. TRUE to "
-@@ -7515,7 +7452,7 @@ msgstr ""
- "プロファイル を自動接続する別の方法として \"secondaries\" を参照してくださ"
- "い。"
-
--#: ../clients/common/settings-docs.h.in:131
-+#: ../clients/common/settings-docs.h.in:135
- msgid ""
- "The autoconnect priority. If the connection is set to autoconnect, "
- "connections with higher priority will be preferred. Defaults to 0. The "
-@@ -7524,7 +7461,7 @@ msgstr ""
- "自動接続の優先度。接続を自動接続に設定すると、優先度の高い接続が優先されま"
- "す。デフォルトは 0 です。数値が高くなると、優先度が高くなります。"
-
--#: ../clients/common/settings-docs.h.in:132
-+#: ../clients/common/settings-docs.h.in:136
- 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 "
-@@ -7537,7 +7474,7 @@ msgstr ""
- "定すると、1 度だけ有効にしてから自動接続をブロックします。タイムアウト後、"
- "NetworkManager が再度、自動接続を試行することに注意してください。"
-
--#: ../clients/common/settings-docs.h.in:133
-+#: ../clients/common/settings-docs.h.in:137
- msgid ""
- "Whether or not slaves of this connection should be automatically brought up "
- "when NetworkManager activates this connection. This only has a real effect "
-@@ -7557,7 +7494,7 @@ msgstr ""
- "autoconnect-slaves が読み込まれて値が決定します。これもデフォルトに設定されて"
- "いる場合は、0 にフォールバックされます。"
-
--#: ../clients/common/settings-docs.h.in:134
-+#: ../clients/common/settings-docs.h.in:138
- msgid ""
- "If greater than zero, delay success of IP addressing until either the "
- "timeout is reached, or an IP gateway replies to a ping."
-@@ -7565,14 +7502,14 @@ msgstr ""
- "ゼロより大きくすると、タイムアウトに到達するか、IP ゲートウェイが ping に応答"
- "するまで、IP アドレスの遅延に成功します。"
-
--#: ../clients/common/settings-docs.h.in:135
-+#: ../clients/common/settings-docs.h.in:139
- 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:136
-+#: ../clients/common/settings-docs.h.in:140
- 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 "
-@@ -7593,11 +7530,11 @@ msgstr ""
- "使用できるインターフェースを制限し、インターフェース名を変更したり、順番を変"
- "更すると、誤ったインターフェースに接続が適用される場合があります。"
-
--#: ../clients/common/settings-docs.h.in:137
-+#: ../clients/common/settings-docs.h.in:141
- msgid "Whether LLDP is enabled for the connection."
- msgstr "この接続に対して LLDP が有効であるかどうか。"
-
--#: ../clients/common/settings-docs.h.in:138
-+#: ../clients/common/settings-docs.h.in:142
- 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 "
-@@ -7616,11 +7553,11 @@ msgstr ""
- "に LLMNR ホスト名の解決を許可、の 3 つになります。この機能には、LLMNR をサ"
- "ポートするプラグインが必要です。たとえば、dns-systemd-resolved などです。"
-
--#: ../clients/common/settings-docs.h.in:139
-+#: ../clients/common/settings-docs.h.in:143
- msgid "Interface name of the master device or UUID of the master connection."
- msgstr "マスター接続のマスターデバイスまたは UUID のインターフェース名。"
-
--#: ../clients/common/settings-docs.h.in:140
-+#: ../clients/common/settings-docs.h.in:144
- #, fuzzy
- msgid ""
- "Whether mDNS is enabled for the connection. The permitted values are: yes: "
-@@ -7636,7 +7573,7 @@ msgstr ""
- "mDNS をサポートするプラグインが必要です。たとえば、dns-systemd-resolved など"
- "です。"
-
--#: ../clients/common/settings-docs.h.in:141
-+#: ../clients/common/settings-docs.h.in:145
- msgid ""
- "Whether the connection is metered. When updating this property on a "
- "currently activated connection, the change takes effect immediately."
-@@ -7644,7 +7581,7 @@ msgstr ""
- "接続を測定するかどうか。現在有効な接続でこのプロパティーをアップデートする"
- "と、変更はすぐに有効になります。"
-
--#: ../clients/common/settings-docs.h.in:142
-+#: ../clients/common/settings-docs.h.in:146
- msgid ""
- "Specifies whether the profile can be active multiple times at a particular "
- "moment. The value is of type NMConnectionMultiConnect."
-@@ -7652,7 +7589,7 @@ msgstr ""
- "プロファイルが、ある特定の時点で複数回アクティブになるかどうかを指定します。"
- "値は NMConnectionMultiConnect タイプになります。"
-
--#: ../clients/common/settings-docs.h.in:143
-+#: ../clients/common/settings-docs.h.in:147
- 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 "
-@@ -7678,7 +7615,7 @@ msgstr ""
- "約される必要があります。[type]、[id]、および [reserved] はすべて有効な UTF-8 "
- "にする必要があります。"
-
--#: ../clients/common/settings-docs.h.in:144
-+#: ../clients/common/settings-docs.h.in:148
- 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 "
-@@ -7687,7 +7624,7 @@ msgstr ""
- "正しい権限で、提供された設定サービスの D-Bus インターフェースを使用して接続が"
- "修正できる場合は FALSE、接続が読み取り専用で修正できない場合は TRUE。"
-
--#: ../clients/common/settings-docs.h.in:145
-+#: ../clients/common/settings-docs.h.in:149
- msgid ""
- "List of connection UUIDs that should be activated when the base connection "
- "itself is activated. Currently only VPN connections are supported."
-@@ -7695,7 +7632,7 @@ msgstr ""
- "ベース接続自身が有効になると有効になる接続の UUID リスト。現時点は、VPN 接続"
- "のみがサポートされます。"
-
--#: ../clients/common/settings-docs.h.in:146
-+#: ../clients/common/settings-docs.h.in:150
- msgid ""
- "Setting name of the device type of this slave's master connection (eg, \"bond"
- "\"), or NULL if this connection is not a slave."
-@@ -7703,7 +7640,7 @@ msgstr ""
- "このスレーブのマスター接続 (\"bond\" など) のデバイスタイプの設定名。この接続"
- "がスレーブではない場合は NULL。"
-
--#: ../clients/common/settings-docs.h.in:147
-+#: ../clients/common/settings-docs.h.in:151
- #, fuzzy
- msgid ""
- "This represents the identity of the connection used for various purposes. It "
-@@ -7723,7 +7660,7 @@ msgid ""
- "treated special to perform dynamic substitutions at runtime. Currently "
- "supported are \"${CONNECTION}\", \"${DEVICE}\", \"${MAC}\", \"${BOOT}\", "
- "\"${RANDOM}\". These effectively create unique IDs per-connection, per-"
--"device, per-boot, or every time. Note that \"${DEVICE}\" corresponds the the "
-+"device, per-boot, or every time. Note that \"${DEVICE}\" corresponds to the "
- "interface name of the device and \"${MAC}\" is the permanent MAC address of "
- "the device. Any unrecognized patterns following '$' are treated verbatim, "
- "however are reserved for future use. You are thus advised to avoid '$' or "
-@@ -7762,7 +7699,7 @@ msgstr ""
- "合は、デフォルトは \"${CONNECTION}\" と類似し、接続に固有の固定 ID を使用しま"
- "す。"
-
--#: ../clients/common/settings-docs.h.in:148
-+#: ../clients/common/settings-docs.h.in:152
- msgid ""
- "The time, in seconds since the Unix Epoch, that the connection was last "
- "_successfully_ fully activated. NetworkManager updates the connection "
-@@ -7776,7 +7713,7 @@ msgstr ""
- "のプロパティーは読み込みのためにのみ使用されます (このプロパティーへの変更は"
- "保存されません)。"
-
--#: ../clients/common/settings-docs.h.in:149
-+#: ../clients/common/settings-docs.h.in:153
- msgid ""
- "Base type of the connection. For hardware-dependent connections, should "
- "contain the setting name of the hardware-type specific setting (ie, \"802-3-"
-@@ -7790,7 +7727,7 @@ msgstr ""
- "存しない接続には、その設定のタイプ名 (つまり \"vpn\"、\"bridge\" など) が含ま"
- "れる必要があります。"
-
--#: ../clients/common/settings-docs.h.in:150
-+#: ../clients/common/settings-docs.h.in:154
- msgid ""
- "A universally unique identifier for the connection, for example generated "
- "with libuuid. It should be assigned when the connection is created, and "
-@@ -7810,7 +7747,7 @@ msgstr ""
- "\"2815492f-7e56-435e-b2e9-246bd7cdc664\" (16 進数の文字と \"-\" だけが含まれ"
- "る) になります。"
-
--#: ../clients/common/settings-docs.h.in:151
-+#: ../clients/common/settings-docs.h.in:155
- msgid ""
- "The trust level of a the connection. Free form case-insensitive string (for "
- "example \"Home\", \"Work\", \"Public\"). NULL or unspecified zone means the "
-@@ -7823,7 +7760,7 @@ msgstr ""
- "は、ファイアウォールで定義したデフォルトゾーンに設定されます。現在アクティブ"
- "な接続でこのプロパティーをアップデートすると、接続はすぐに有効になります。"
-
--#: ../clients/common/settings-docs.h.in:152
-+#: ../clients/common/settings-docs.h.in:156
- msgid ""
- "Specifies the NMSettingDcbFlags for the DCB FCoE application. Flags may be "
- "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
-@@ -7833,13 +7770,13 @@ msgstr ""
- "NM_SETTING_DCB_FLAG_ENABLE (0x1)、NM_SETTING_DCB_FLAG_ADVERTISE (0x2)、およ"
- "び NM_SETTING_DCB_FLAG_WILLING (0x4) から組み合わせることができます。"
-
--#: ../clients/common/settings-docs.h.in:153
-+#: ../clients/common/settings-docs.h.in:157
- msgid "The FCoE controller mode; either \"fabric\" (default) or \"vn2vn\"."
- msgstr ""
- "FCoE コントローラーモード; \"fabric\" (デフォルト) または \"vn2vn\" のいずれ"
- "か。"
-
--#: ../clients/common/settings-docs.h.in:154
-+#: ../clients/common/settings-docs.h.in:158
- 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 "
-@@ -7849,7 +7786,7 @@ msgstr ""
- "の優先度)。\"app-fcoe-flags\" プロパティーには NM_SETTING_DCB_FLAG_ENABLE "
- "(0x1) フラグを含む場合に限り使用されます。"
-
--#: ../clients/common/settings-docs.h.in:155
-+#: ../clients/common/settings-docs.h.in:159
- msgid ""
- "Specifies the NMSettingDcbFlags for the DCB FIP application. Flags may be "
- "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
-@@ -7859,7 +7796,7 @@ msgstr ""
- "NM_SETTING_DCB_FLAG_ENABLE (0x1)、NM_SETTING_DCB_FLAG_ADVERTISE (0x2)、およ"
- "び NM_SETTING_DCB_FLAG_WILLING (0x4) から組み合わせることができます。"
-
--#: ../clients/common/settings-docs.h.in:156
-+#: ../clients/common/settings-docs.h.in:160
- 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 "
-@@ -7869,7 +7806,7 @@ msgstr ""
- "優先度)。\"app-fip-flags\" プロパティーに NM_SETTING_DCB_FLAG_ENABLE (0x1) フ"
- "ラグを含める場合に限り使用します。"
-
--#: ../clients/common/settings-docs.h.in:157
-+#: ../clients/common/settings-docs.h.in:161
- msgid ""
- "Specifies the NMSettingDcbFlags for the DCB iSCSI application. Flags may be "
- "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
-@@ -7879,7 +7816,7 @@ msgstr ""
- "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:162
- 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 "
-@@ -7889,7 +7826,7 @@ msgstr ""
- "の優先度)。\"app-iscsi-flags\" プロパティーに NM_SETTING_DCB_FLAG_ENABLE "
- "(0x1) フラグを追加する場合に限り使用します。"
-
--#: ../clients/common/settings-docs.h.in:159
-+#: ../clients/common/settings-docs.h.in:163
- 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 "
-@@ -7902,7 +7839,7 @@ msgstr ""
- "用するパーセンテージを示します。グループ内の合計を 100% にする必要がありま"
- "す。"
-
--#: ../clients/common/settings-docs.h.in:160
-+#: ../clients/common/settings-docs.h.in:164
- 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 "
-@@ -7911,7 +7848,7 @@ msgstr ""
- "8 個のブール値の配列。配列のインデックスは、ユーザーの優先度 (0 - 7) に対応し"
- "ます。値は、対応する優先度が、優先度の停止を送信するかどうかを示します。"
-
--#: ../clients/common/settings-docs.h.in:161
-+#: ../clients/common/settings-docs.h.in:165
- msgid ""
- "Specifies the NMSettingDcbFlags for DCB Priority Flow Control (PFC). Flags "
- "may be any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
-@@ -7921,7 +7858,7 @@ msgstr ""
- "NM_SETTING_DCB_FLAG_ENABLE (0x1)、NM_SETTING_DCB_FLAG_ADVERTISE (0x2)、およ"
- "び NM_SETTING_DCB_FLAG_WILLING (0x4) から組み合わせることができます。"
-
--#: ../clients/common/settings-docs.h.in:162
-+#: ../clients/common/settings-docs.h.in:166
- 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 "
-@@ -7932,7 +7869,7 @@ msgstr ""
- "します。値は、そのグループに割り当てられたリンク帯域幅のパーセンテージを示し"
- "ます。使用できる値は 0 - 100 で、合計を 100 パーセントにする必要があります。"
-
--#: ../clients/common/settings-docs.h.in:163
-+#: ../clients/common/settings-docs.h.in:167
- msgid ""
- "Specifies the NMSettingDcbFlags for DCB Priority Groups. Flags may be any "
- "combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
-@@ -7942,7 +7879,7 @@ msgstr ""
- "NM_SETTING_DCB_FLAG_ENABLE (0x1)、NM_SETTING_DCB_FLAG_ADVERTISE (0x2)、およ"
- "び NM_SETTING_DCB_FLAG_WILLING (0x4) から組み合わせることができます。"
-
--#: ../clients/common/settings-docs.h.in:164
-+#: ../clients/common/settings-docs.h.in:168
- 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 "
-@@ -7952,7 +7889,7 @@ msgstr ""
- "す。値は優先度グループ ID を示します。使用できる優先度グループ ID の値は 0 - "
- "7 で、15 にすると無制限グループになります。"
-
--#: ../clients/common/settings-docs.h.in:165
-+#: ../clients/common/settings-docs.h.in:169
- 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 "
-@@ -7962,7 +7899,7 @@ msgstr ""
- "す。値は、その優先度を割り当てたグループに割り当てられたすべての帯域幅を、そ"
- "の優先度が使用するかどうかを示します。"
-
--#: ../clients/common/settings-docs.h.in:166
-+#: ../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 traffic class (0 - 7) to which "
-@@ -7971,7 +7908,7 @@ msgstr ""
- "8 uint 値の配列。配列のインデックスはユーザーの優先度 (0 - 7) に対応します。"
- "値は、優先度がマッピングされるトラフィッククラス (0 - 7) を示しています。"
-
--#: ../clients/common/settings-docs.h.in:167
-+#: ../clients/common/settings-docs.h.in:171
- 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 "
-@@ -7988,7 +7925,7 @@ msgstr ""
- "ロードバンドプランに対して正しい APN を使用することが重要です。APN の文字列"
- "は、a- z と 0 - 9 だけが使用でき、GSM 03.60 セクション 14.9 に準拠します。"
-
--#: ../clients/common/settings-docs.h.in:168
-+#: ../clients/common/settings-docs.h.in:172
- 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 "
-@@ -7997,7 +7934,7 @@ msgstr ""
- "(WWAN 管理サービスで指定されたように) この接続が適用されるデバイスの一意識別"
- "子。これを指定すると、接続は、指定したデバイスにのみ適用されます。"
-
--#: ../clients/common/settings-docs.h.in:169
-+#: ../clients/common/settings-docs.h.in:173
- msgid ""
- "When TRUE, only connections to the home network will be allowed. Connections "
- "to roaming networks will not be made."
-@@ -8005,7 +7942,7 @@ msgstr ""
- "TRUE にすると、ホームネットワークへの接続だけが可能になります。ローミングネッ"
- "トワークへの接続は作成されません。"
-
--#: ../clients/common/settings-docs.h.in:171
-+#: ../clients/common/settings-docs.h.in:175
- msgid ""
- "The Network ID (GSM LAI format, ie MCC-MNC) to force specific network "
- "registration. If the Network ID is specified, NetworkManager will attempt "
-@@ -8018,13 +7955,13 @@ msgstr ""
- "のみデバイスの登録を強制しようとします。これは、デバイスのローミングを阻止す"
- "るために使用できます。 これ以外に、ローミングを直接制御することはできません。"
-
--#: ../clients/common/settings-docs.h.in:172
-+#: ../clients/common/settings-docs.h.in:176
- msgid ""
- "Legacy setting that used to help establishing PPP data sessions for GSM-"
- "based modems. Deprecated: 1"
- msgstr ""
-
--#: ../clients/common/settings-docs.h.in:175
-+#: ../clients/common/settings-docs.h.in:179
- 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 "
-@@ -8033,7 +7970,7 @@ msgstr ""
- "PIN で SIM がロックされた場合は、その他の操作を行う前にアンロックする必要があ"
- "ります。ここで PIN を指定すると、デバイスの操作が可能になります。"
-
--#: ../clients/common/settings-docs.h.in:177
-+#: ../clients/common/settings-docs.h.in:181
- 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 "
-@@ -8044,7 +7981,7 @@ msgstr ""
- "一意識別子。これを指定すると、接続は、\"device-id\" にも許可されているデバイ"
- "スに適用されます。これには、指定した識別子に一致する SIM カードが含まれます。"
-
--#: ../clients/common/settings-docs.h.in:178
-+#: ../clients/common/settings-docs.h.in:182
- msgid ""
- "A MCC/MNC string like \"310260\" or \"21601\" identifying the specific "
- "mobile network operator which this connection applies to. If given, the "
-@@ -8056,7 +7993,7 @@ msgstr ""
- "\" および \"sim-id\" で許可されるデバイスにも適用されます。これには、指定した"
- "オペレーターから提供される SIM カードが含まれます。"
-
--#: ../clients/common/settings-docs.h.in:180
-+#: ../clients/common/settings-docs.h.in:184
- 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 "
-@@ -8066,7 +8003,7 @@ msgstr ""
- "用されます。このプロパティーはデバイスの MAC アドレスを変更しません (MAC ス"
- "プーフィング)。"
-
--#: ../clients/common/settings-docs.h.in:182
-+#: ../clients/common/settings-docs.h.in:186
- 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 "
-@@ -8077,7 +8014,7 @@ msgstr ""
- "署名なし整数です。\"完全メンバーシップ\" の P_Key の場合は、その高ビットが設"
- "定されます。"
-
--#: ../clients/common/settings-docs.h.in:183
-+#: ../clients/common/settings-docs.h.in:187
- 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 "
-@@ -8087,13 +8024,13 @@ msgstr ""
- "プロパティーが設定されると、このプロパティーまたは \"mac-address\" のいずれか"
- "を設定して、ベースデバイスを指定する必要があります。"
-
--#: ../clients/common/settings-docs.h.in:184
-+#: ../clients/common/settings-docs.h.in:188
- msgid ""
- "The IP-over-InfiniBand transport mode. Either \"datagram\" or \"connected\"."
- msgstr ""
- "IPoIB トランスポートモード。\"datagram\" または \"connected\" のいずれか。"
-
--#: ../clients/common/settings-docs.h.in:185
-+#: ../clients/common/settings-docs.h.in:189
- msgid ""
- "How many additional levels of encapsulation are permitted to be prepended to "
- "packets. This property applies only to IPv6 tunnels."
-@@ -8101,7 +8038,7 @@ msgstr ""
- "パケットの先頭にカプセル化レベルをどのぐらい追加できるか。このプロパティー"
- "は、IPv6 トンネルにのみ適用されます。"
-
--#: ../clients/common/settings-docs.h.in:186
-+#: ../clients/common/settings-docs.h.in:190
- msgid ""
- "Tunnel flags. Currently the following values are supported: "
- "NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT (0x1), "
-@@ -8119,7 +8056,7 @@ msgstr ""
- "(0x10), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK (0x20). これらは、IPv6 トンネル"
- "のみに有効です。"
-
--#: ../clients/common/settings-docs.h.in:187
-+#: ../clients/common/settings-docs.h.in:191
- msgid ""
- "The flow label to assign to tunnel packets. This property applies only to "
- "IPv6 tunnels."
-@@ -8127,7 +8064,7 @@ msgstr ""
- "トンネルパケットに割り当てるフローラベル。このプロパティーは、IPv6 にのみ適用"
- "されます。"
-
--#: ../clients/common/settings-docs.h.in:188
-+#: ../clients/common/settings-docs.h.in:192
- 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."
-@@ -8135,7 +8072,7 @@ msgstr ""
- "トンネル入力パケットに使用されるキー。このプロパティーは、特定のトンネルモー"
- "ド (GRE、IP6GRE) に対してのみ有効です。空にすると、キーは使用されません。"
-
--#: ../clients/common/settings-docs.h.in:189
-+#: ../clients/common/settings-docs.h.in:193
- msgid ""
- "The local endpoint of the tunnel; the value can be empty, otherwise it must "
- "contain an IPv4 or IPv6 address."
-@@ -8143,7 +8080,7 @@ msgstr ""
- "トンネルのローカルエンドポイント。値は空にできます。もしくは、IPv4 アドレスま"
- "たは IPv6 アドレスを含む必要があります。"
-
--#: ../clients/common/settings-docs.h.in:190
-+#: ../clients/common/settings-docs.h.in:194
- msgid ""
- "The tunneling mode, for example NM_IP_TUNNEL_MODE_IPIP (1) or "
- "NM_IP_TUNNEL_MODE_GRE (2)."
-@@ -8151,7 +8088,7 @@ msgstr ""
- "トンネリングモード。たとえば NM_IP_TUNNEL_MODE_IPIP (1) や "
- "NM_IP_TUNNEL_MODE_GRE (2)。"
-
--#: ../clients/common/settings-docs.h.in:191
-+#: ../clients/common/settings-docs.h.in:195
- msgid ""
- "If non-zero, only transmit packets of the specified size or smaller, "
- "breaking larger packets up into multiple fragments."
-@@ -8159,7 +8096,7 @@ msgstr ""
- "ゼロ以外は、指定したサイズ以下のパケットだけが送信されます。指定より大きいパ"
- "ケットは、複数のフラグメントに分割されます。"
-
--#: ../clients/common/settings-docs.h.in:192
-+#: ../clients/common/settings-docs.h.in:196
- 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."
-@@ -8167,7 +8104,7 @@ msgstr ""
- "トンネル出力パケットに使用されるキー。このプロパティーは、特定のトンネルモー"
- "ド (GRE、IP6GRE) に対してのみ有効です。空にすると、キーは使用されません。"
-
--#: ../clients/common/settings-docs.h.in:193
-+#: ../clients/common/settings-docs.h.in:197
- 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 "
-@@ -8177,11 +8114,11 @@ msgstr ""
- "うに、新しいデバイスがバインドされる親インターフェース名または親接続の UUID "
- "を指定します。"
-
--#: ../clients/common/settings-docs.h.in:194
-+#: ../clients/common/settings-docs.h.in:198
- msgid "Whether to enable Path MTU Discovery on this tunnel."
- msgstr "このトンネルで、パス MTU 検出を有効にするかどうか。"
-
--#: ../clients/common/settings-docs.h.in:195
-+#: ../clients/common/settings-docs.h.in:199
- msgid ""
- "The remote endpoint of the tunnel; the value must contain an IPv4 or IPv6 "
- "address."
-@@ -8189,7 +8126,7 @@ msgstr ""
- "トンネルのリモートエンドポイント。この値には、IPv4 アドレスまたは IPv6 アドレ"
- "スを含める必要があります。"
-
--#: ../clients/common/settings-docs.h.in:196
-+#: ../clients/common/settings-docs.h.in:200
- msgid ""
- "The type of service (IPv4) or traffic class (IPv6) field to be set on "
- "tunneled packets."
-@@ -8197,7 +8134,7 @@ msgstr ""
- "トンネル化パケットに設定されるサービスのタイプ (IPv4) またはトラフィッククラ"
- "ス (IPv6) フィールド。"
-
--#: ../clients/common/settings-docs.h.in:197
-+#: ../clients/common/settings-docs.h.in:201
- msgid ""
- "The TTL to assign to tunneled packets. 0 is a special value meaning that "
- "packets inherit the TTL value."
-@@ -8205,13 +8142,13 @@ msgstr ""
- "トンネル化パケットに割り当てる TTL。0 は特別な値で、パケットが TTL 値を継承す"
- "ることを示しています。"
-
--#: ../clients/common/settings-docs.h.in:198
--#: ../clients/common/settings-docs.h.in:219
-+#: ../clients/common/settings-docs.h.in:202
-+#: ../clients/common/settings-docs.h.in:223
- msgid "Array of IP addresses."
- msgstr "IP アドレスの配列。"
-
--#: ../clients/common/settings-docs.h.in:199
--#: ../clients/common/settings-docs.h.in:220
-+#: ../clients/common/settings-docs.h.in:203
-+#: ../clients/common/settings-docs.h.in:224
- msgid ""
- "Timeout in milliseconds used to check for the presence of duplicate IP "
- "addresses on the network. If an address conflict is detected, the "
-@@ -8227,7 +8164,7 @@ msgstr ""
- "り大きい場合はタイムアウト (ミリ秒) になります。現在、このプロパティーは "
- "IPv4 にのみ実装されています。"
-
--#: ../clients/common/settings-docs.h.in:200
-+#: ../clients/common/settings-docs.h.in:204
- #, fuzzy
- msgid ""
- "A string sent to the DHCP server to identify the local machine which the "
-@@ -8266,7 +8203,7 @@ msgstr ""
- "定されない場合は、グローバルに設定されたデフォルトが使用されます。引き続き値"
- "が設定されない場合は、最後のリースのクライアント ID が再利用されます。"
-
--#: ../clients/common/settings-docs.h.in:201
-+#: ../clients/common/settings-docs.h.in:205
- 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-"
-@@ -8276,8 +8213,8 @@ msgstr ""
- "定した FQDN が DHCP サーバーに送られます。この優先度および \"dhcp-hostname\" "
- "は相互に排他的で、同時に設定できません。"
-
--#: ../clients/common/settings-docs.h.in:202
--#: ../clients/common/settings-docs.h.in:222
-+#: ../clients/common/settings-docs.h.in:206
-+#: ../clients/common/settings-docs.h.in:226
- 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-"
-@@ -8287,8 +8224,8 @@ msgstr ""
- "定した名前が DHCP サーバーに送られます。このプロパティーと \"dhcp-fqdn\" は相"
- "互に排他的で、同時に設定できません。"
-
--#: ../clients/common/settings-docs.h.in:203
--#: ../clients/common/settings-docs.h.in:223
-+#: ../clients/common/settings-docs.h.in:207
-+#: ../clients/common/settings-docs.h.in:227
- 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 "
-@@ -8302,18 +8239,18 @@ msgstr ""
- "NULL で、このプロパティーが TRUE の場合は、そのコンピューターの現在の永続ホス"
- "ト名が送られます。"
-
--#: ../clients/common/settings-docs.h.in:204
--#: ../clients/common/settings-docs.h.in:224
-+#: ../clients/common/settings-docs.h.in:208
-+#: ../clients/common/settings-docs.h.in:228
- msgid "A timeout for a DHCP transaction in seconds."
- msgstr "DHCP トランザクションのタイムアウト (秒単位)。"
-
--#: ../clients/common/settings-docs.h.in:205
--#: ../clients/common/settings-docs.h.in:225
-+#: ../clients/common/settings-docs.h.in:209
-+#: ../clients/common/settings-docs.h.in:229
- msgid "Array of IP addresses of DNS servers."
- msgstr "DNS サーバーの IP アドレス配列。"
-
--#: ../clients/common/settings-docs.h.in:206
--#: ../clients/common/settings-docs.h.in:226
-+#: ../clients/common/settings-docs.h.in:210
-+#: ../clients/common/settings-docs.h.in:230
- 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 "
-@@ -8324,8 +8261,8 @@ msgstr ""
- "NetworkManager はデフォルトのオプションを使用し、プロパティーのリストが空に"
- "なっている場合とは区別されます。"
-
--#: ../clients/common/settings-docs.h.in:207
--#: ../clients/common/settings-docs.h.in:227
-+#: ../clients/common/settings-docs.h.in:211
-+#: ../clients/common/settings-docs.h.in:231
- #, fuzzy
- msgid ""
- "DNS servers priority. The relative priority for DNS servers specified by "
-@@ -8370,8 +8307,8 @@ msgstr ""
- "続がドメインを指定し、そのドメインが、DNS の優先度の値が負である別のドメイン"
- "のサブドメインである場合、そのサブドメインは無視されます。"
-
--#: ../clients/common/settings-docs.h.in:208
--#: ../clients/common/settings-docs.h.in:228
-+#: ../clients/common/settings-docs.h.in:212
-+#: ../clients/common/settings-docs.h.in:232
- msgid ""
- "Array of DNS search domains. Domains starting with a tilde ('~') are "
- "considered 'routing' domains and are used only to decide the interface over "
-@@ -8383,8 +8320,8 @@ msgstr ""
- "決める際にのみ使用されます。これらは、非修飾ホスト名を完成させるためには使用"
- "されません。"
-
--#: ../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:233
- msgid ""
- "The gateway associated with this configuration. This is only meaningful if "
- "\"addresses\" is also set."
-@@ -8392,8 +8329,8 @@ msgstr ""
- "ゲートウェイは、この設定に関連付けられています。\"アドレス\" とともに設定した"
- "場合に限り有効になります。"
-
--#: ../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:234
- msgid ""
- "When \"method\" is set to \"auto\" and this property to TRUE, automatically "
- "configured nameservers and search domains are ignored and only nameservers "
-@@ -8405,8 +8342,8 @@ msgstr ""
- "と \"dns-search\" プロパティーに指定したネームサーバーと検索ドメインだけが使"
- "用されます。"
-
--#: ../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:235
- msgid ""
- "When \"method\" is set to \"auto\" and this property to TRUE, automatically "
- "configured routes are ignored and only routes specified in the \"routes\" "
-@@ -8416,8 +8353,8 @@ msgstr ""
- "に設定したルートは無視され、ルートを \"routes\" プロパティーに指定した場合"
- "は、そのルートだけが使用されます。"
-
--#: ../clients/common/settings-docs.h.in:212
--#: ../clients/common/settings-docs.h.in:233
-+#: ../clients/common/settings-docs.h.in:216
-+#: ../clients/common/settings-docs.h.in:237
- msgid ""
- "If TRUE, allow overall network configuration to proceed even if the "
- "configuration specified by this property times out. Note that at least one "
-@@ -8432,8 +8369,8 @@ msgstr ""
- "おいて、NMSettingIP4Config でこのプロパティーを TRUE に設定すると、IPv4 設定"
- "が失敗し、IPv6 設定が完全に成功しても、全体のネットワーク設定が成功します。"
-
--#: ../clients/common/settings-docs.h.in:213
--#: ../clients/common/settings-docs.h.in:234
-+#: ../clients/common/settings-docs.h.in:217
-+#: ../clients/common/settings-docs.h.in:238
- msgid ""
- "IP configuration method. NMSettingIP4Config and NMSettingIP6Config both "
- "support \"auto\", \"manual\", and \"link-local\". See the subclass-specific "
-@@ -8460,8 +8397,8 @@ msgstr ""
- "れます。\"shared\" は、共有される uplink ではなく、インターネットをサブネット"
- "に共有するインターフェイス上で設定される必要があることに注意してください。"
-
--#: ../clients/common/settings-docs.h.in:214
--#: ../clients/common/settings-docs.h.in:235
-+#: ../clients/common/settings-docs.h.in:218
-+#: ../clients/common/settings-docs.h.in:239
- 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."
-@@ -8469,8 +8406,8 @@ msgstr ""
- "TRUE にすると、この接続はこの IP タイプに対するデフォルトの接続にはならないた"
- "め、NetworkManager によってデフォルトルートに割り当てられません。"
-
--#: ../clients/common/settings-docs.h.in:215
--#: ../clients/common/settings-docs.h.in:236
-+#: ../clients/common/settings-docs.h.in:219
-+#: ../clients/common/settings-docs.h.in:240
- 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 "
-@@ -8488,8 +8425,8 @@ msgstr ""
- "ティーをゼロに設定すると、実際には 1024 になることに注意してください。IPv4 で"
- "は、ゼロはメトリックの正則値となります。"
-
--#: ../clients/common/settings-docs.h.in:216
--#: ../clients/common/settings-docs.h.in:237
-+#: ../clients/common/settings-docs.h.in:220
-+#: ../clients/common/settings-docs.h.in:241
- msgid ""
- "Enable policy routing (source routing) and set the routing table used when "
- "adding routes. This affects all routes, including device-routes, IPv4LL, "
-@@ -8519,12 +8456,12 @@ msgstr ""
- "NetworkManager 以外のルーティングテーブルを管理するための後方互換性を確保しま"
- "す。"
-
--#: ../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:242
- msgid "Array of IP routes."
- msgstr "IP ルートの配列。"
-
--#: ../clients/common/settings-docs.h.in:218
-+#: ../clients/common/settings-docs.h.in:222
- msgid ""
- "Configure method for creating the address for use with RFC4862 IPv6 "
- "Stateless Address Autoconfiguration. The permitted values are: "
-@@ -8562,7 +8499,7 @@ msgstr ""
- "は、\"ip6-privacy\" プロパティーにより設定されたプライバシー拡張とは異なり、"
- "このオプションで設定した一時アドレスには影響しないことに注意してください。"
-
--#: ../clients/common/settings-docs.h.in:221
-+#: ../clients/common/settings-docs.h.in:225
- #, fuzzy
- msgid ""
- "A string containing the DHCPv6 Unique Identifier (DUID) used by the dhcp "
-@@ -8614,7 +8551,7 @@ msgstr ""
- "に提供されるグローバル値が使用されます。グローバル値が提供されない場合は、デ"
- "フォルトの \"lease\" 値が想定されます。 "
-
--#: ../clients/common/settings-docs.h.in:232
-+#: ../clients/common/settings-docs.h.in:236
- msgid ""
- "Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941. If "
- "enabled, it makes the kernel generate a temporary IPv6 address in addition "
-@@ -8643,7 +8580,7 @@ msgstr ""
- "ロパティーの \"stable-privacy\" 設定で有効にできる、安定したプライバシーアド"
- "レスとは区別されます。"
-
--#: ../clients/common/settings-docs.h.in:239
-+#: ../clients/common/settings-docs.h.in:243
- msgid ""
- "Configure the token for draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 "
- "tokenized interface identifiers. Useful with eui64 addr-gen-mode."
-@@ -8651,33 +8588,33 @@ msgstr ""
- "IPv6 トークン化したインターフェース識別子 draft-chown-6man-tokenised-ipv6-"
- "identifiers-02 にトークンを設定します。eui64 addr-gen-mode で行うと便利です。"
-
--#: ../clients/common/settings-docs.h.in:240
-+#: ../clients/common/settings-docs.h.in:244
- msgid "Whether the transmitted traffic must be encrypted."
- msgstr "転送トラフィックの暗号化が必要かどうか。"
-
--#: ../clients/common/settings-docs.h.in:241
-+#: ../clients/common/settings-docs.h.in:245
- msgid ""
- "The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement."
- msgstr "MACsec キー一致における共有前の CAK (接続関連キー)。"
-
--#: ../clients/common/settings-docs.h.in:242
-+#: ../clients/common/settings-docs.h.in:246
- msgid "Flags indicating how to handle the \"mka-cak\" property."
- msgstr "\"mka-cak\" プロパティーの処理方法を示すフラグ。"
-
--#: ../clients/common/settings-docs.h.in:243
-+#: ../clients/common/settings-docs.h.in:247
- msgid ""
- "The pre-shared CKN (Connectivity-association Key Name) for MACsec Key "
- "Agreement."
- msgstr "MACsec キー一致における共有前の CKN (接続に関連するキー名)。"
-
--#: ../clients/common/settings-docs.h.in:244
-+#: ../clients/common/settings-docs.h.in:248
- 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:245
-+#: ../clients/common/settings-docs.h.in:249
- 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 "
-@@ -8689,13 +8626,13 @@ msgstr ""
- "には、\"mac-address\" プロパティーが追加された \"802-3-ethernet\" 設定を含め"
- "る必要があります。"
-
--#: ../clients/common/settings-docs.h.in:246
-+#: ../clients/common/settings-docs.h.in:250
- msgid ""
- "The port component of the SCI (Secure Channel Identifier), between 1 and "
- "65534."
- msgstr "SCI (セキュアチャネル識別子) のポートコンポーネント (1 - 65534)。"
-
--#: ../clients/common/settings-docs.h.in:247
-+#: ../clients/common/settings-docs.h.in:251
- msgid ""
- "Specifies whether the SCI (Secure Channel Identifier) is included in every "
- "packet."
-@@ -8703,11 +8640,11 @@ msgstr ""
- "パケットごとに SCI (セキュアチャネル識別子) が含まれているかどうかを指定しま"
- "す。"
-
--#: ../clients/common/settings-docs.h.in:248
-+#: ../clients/common/settings-docs.h.in:252
- msgid "Specifies the validation mode for incoming frames."
- msgstr "入力フレームの検証モードを指定します。"
-
--#: ../clients/common/settings-docs.h.in:249
-+#: ../clients/common/settings-docs.h.in:253
- msgid ""
- "The macvlan mode, which specifies the communication mechanism between "
- "multiple macvlans on the same lower device."
-@@ -8715,7 +8652,7 @@ msgstr ""
- "同じ低いデバイスで、複数の macvlans 間で通信メカニズムを指定する macvlan モー"
- "ド。"
-
--#: ../clients/common/settings-docs.h.in:250
-+#: ../clients/common/settings-docs.h.in:254
- 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 "
-@@ -8727,15 +8664,15 @@ msgstr ""
- "に、\"mac-address\" プロパティーが追加された \"802-3-ethernet\" 設定を含める"
- "必要があります。"
-
--#: ../clients/common/settings-docs.h.in:251
-+#: ../clients/common/settings-docs.h.in:255
- msgid "Whether the interface should be put in promiscuous mode."
- msgstr "インターフェースをプロミスキャスモードにするべきかどうか。"
-
--#: ../clients/common/settings-docs.h.in:252
-+#: ../clients/common/settings-docs.h.in:256
- msgid "Whether the interface should be a MACVTAP."
- msgstr "インターフェースが MACVTAP にすべきかどうか。"
-
--#: ../clients/common/settings-docs.h.in:253
-+#: ../clients/common/settings-docs.h.in:257
- msgid ""
- "A list of interface names to match. Each element is a shell wildcard "
- "pattern. When an element is prefixed with exclamation mark (!) the "
-@@ -8751,27 +8688,27 @@ msgstr ""
- "はこのような要素がない場合、(b) 感嘆符 (!) が先頭に付いている要素がどれも一致"
- "しない。"
-
--#: ../clients/common/settings-docs.h.in:254
-+#: ../clients/common/settings-docs.h.in:258
- msgid "The bridge failure mode. One of \"secure\", \"standalone\" or empty."
- msgstr "ブリッジの失敗モード。\"secure\"、\"standalone\"、また空のいずれか。"
-
--#: ../clients/common/settings-docs.h.in:255
-+#: ../clients/common/settings-docs.h.in:259
- msgid "Enable or disable multicast snooping."
- msgstr "マルチキャストのスヌーピングを有効化または無効化にします。"
-
--#: ../clients/common/settings-docs.h.in:256
-+#: ../clients/common/settings-docs.h.in:260
- msgid "Enable or disable RSTP."
- msgstr "RSTP を有効化または無効化にします。"
-
--#: ../clients/common/settings-docs.h.in:257
-+#: ../clients/common/settings-docs.h.in:261
- msgid "Enable or disable STP."
- msgstr "STP を有効化または無効化にします。"
-
--#: ../clients/common/settings-docs.h.in:258
-+#: ../clients/common/settings-docs.h.in:262
- msgid "The interface type. Either \"internal\", or empty."
- msgstr "インターフェースのタイプ。\"internal\" または空のいずれかになります。"
-
--#: ../clients/common/settings-docs.h.in:259
-+#: ../clients/common/settings-docs.h.in:263
- msgid ""
- "Specifies the unicast destination IP address of a remote Open vSwitch bridge "
- "port to connect to."
-@@ -8779,34 +8716,34 @@ msgstr ""
- "接続するリモートの Open vSwitch ブリッジポートのユニキャスト宛先 IP アドレス"
- "を指定します。"
-
--#: ../clients/common/settings-docs.h.in:260
-+#: ../clients/common/settings-docs.h.in:264
- msgid "The time port must be inactive in order to be considered down."
- msgstr ""
- "ダウンしたと見なすためには、タイムポートを非アクティブにする必要があります。"
-
--#: ../clients/common/settings-docs.h.in:261
-+#: ../clients/common/settings-docs.h.in:265
- 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:262
-+#: ../clients/common/settings-docs.h.in:266
- msgid "The time port must be active before it starts forwarding traffic."
- msgstr ""
- "トラフィックの転送を始める前に、タイムポートをアクティブにする必要がありま"
- "す。"
-
--#: ../clients/common/settings-docs.h.in:263
-+#: ../clients/common/settings-docs.h.in:267
- msgid "LACP mode. One of \"active\", \"off\", or \"passive\"."
- msgstr ""
- "LACP モード。\"active\"、\"off\"、または \"passive\" のいずれかになります。"
-
--#: ../clients/common/settings-docs.h.in:264
-+#: ../clients/common/settings-docs.h.in:268
- msgid "The VLAN tag in the range 0-4095."
- msgstr "VLAN タグは 0 - 4095 の範囲内にあります。"
-
--#: ../clients/common/settings-docs.h.in:265
-+#: ../clients/common/settings-docs.h.in:269
- msgid ""
- "The VLAN mode. One of \"access\", \"native-tagged\", \"native-untagged\", "
- "\"trunk\" or unset."
-@@ -8814,7 +8751,7 @@ msgstr ""
- "VLAN モード。\"access\"、\"native-tagged\"、\"native-untagged\"、\"trunk\" の"
- "いずれかに設定するか、何も設定しません。"
-
--#: ../clients/common/settings-docs.h.in:266
-+#: ../clients/common/settings-docs.h.in:270
- 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 "
-@@ -8823,7 +8760,7 @@ msgstr ""
- "ゼロ以外は、pppd より指定したボーレートにシリアルポートを設定します。速度が自"
- "動的に選択されるように、通常は、この値を 0 にします。"
-
--#: ../clients/common/settings-docs.h.in:267
-+#: ../clients/common/settings-docs.h.in:271
- 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 "
-@@ -8833,7 +8770,7 @@ msgstr ""
- "フロー制御を使用するシリアルポートを設定する必要があります。この値は、通常は "
- "FALSE に設定する必要があります。"
-
--#: ../clients/common/settings-docs.h.in:268
-+#: ../clients/common/settings-docs.h.in:272
- 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 "
-@@ -8845,7 +8782,7 @@ msgstr ""
- "場合は、\"lcp-echo-interval\" プロパティーもゼロ以外の値に設定する必要があり"
- "ます。"
-
--#: ../clients/common/settings-docs.h.in:269
-+#: ../clients/common/settings-docs.h.in:273
- 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 "
-@@ -8856,7 +8793,7 @@ msgstr ""
- "うになります (n は指定した値)。PPP ピアの一部だけがエコー要求に応答します。こ"
- "れを自動検出することはできません。"
-
--#: ../clients/common/settings-docs.h.in:270
-+#: ../clients/common/settings-docs.h.in:274
- msgid ""
- "If TRUE, stateful MPPE is used. See pppd documentation for more information "
- "on stateful MPPE."
-@@ -8864,7 +8801,7 @@ msgstr ""
- "TRUE の場合は、ステートフル MPPE が使用されます。ステートフル MPPE の詳細は "
- "pppd ドキュメントを参照してください。"
-
--#: ../clients/common/settings-docs.h.in:271
-+#: ../clients/common/settings-docs.h.in:275
- 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 "
-@@ -8873,16 +8810,16 @@ msgstr ""
- "ゼロ以外は、指定したサイズ以下のパケットをピアが送信するように pppd が要求し"
- "ます。ゼロ以外では、MRU は 128 から 16384 の間にする必要があります。"
-
--#: ../clients/common/settings-docs.h.in:272
-+#: ../clients/common/settings-docs.h.in:276
- msgid ""
- "If non-zero, instruct pppd to send packets no larger than the specified size."
- msgstr "ゼロ以外は、pppd により、指定したサイズ以下のパケットが送信されます。"
-
--#: ../clients/common/settings-docs.h.in:273
-+#: ../clients/common/settings-docs.h.in:277
- msgid "If TRUE, Van Jacobsen TCP header compression will not be requested."
- msgstr "TRUE の場合は、Van Jacobsen TCP ヘッダー圧縮が要求されません。"
-
--#: ../clients/common/settings-docs.h.in:274
-+#: ../clients/common/settings-docs.h.in:278
- msgid ""
- "If TRUE, do not require the other side (usually the PPP server) to "
- "authenticate itself to the client. If FALSE, require authentication from "
-@@ -8892,35 +8829,35 @@ msgstr ""
- "されません。FALSE の場合は、リモート側からの認証が必要になります。ほとんどす"
- "べての場合で、これは TRUE にする必要があります。"
-
--#: ../clients/common/settings-docs.h.in:275
-+#: ../clients/common/settings-docs.h.in:279
- msgid "If TRUE, BSD compression will not be requested."
- msgstr "TRUE の場合は、BSD 圧縮が要求されません。"
-
--#: ../clients/common/settings-docs.h.in:276
-+#: ../clients/common/settings-docs.h.in:280
- msgid "If TRUE, \"deflate\" compression will not be requested."
- msgstr "TRUE の場合は、\"deflate\" 圧縮が要求されません。"
-
--#: ../clients/common/settings-docs.h.in:277
-+#: ../clients/common/settings-docs.h.in:281
- msgid "If TRUE, the CHAP authentication method will not be used."
- msgstr "TRUE の場合は、CHAP 認証方法が使用されません。"
-
--#: ../clients/common/settings-docs.h.in:278
-+#: ../clients/common/settings-docs.h.in:282
- msgid "If TRUE, the EAP authentication method will not be used."
- msgstr "TRUE の場合は、EAP 認証方法が使用されません。"
-
--#: ../clients/common/settings-docs.h.in:279
-+#: ../clients/common/settings-docs.h.in:283
- msgid "If TRUE, the MSCHAP authentication method will not be used."
- msgstr "TRUE の場合は、MSCHAP 認証方法が使用されません。"
-
--#: ../clients/common/settings-docs.h.in:280
-+#: ../clients/common/settings-docs.h.in:284
- msgid "If TRUE, the MSCHAPv2 authentication method will not be used."
- msgstr "TRUE の場合は、MSCHAPv2 認証方法が使用されません。"
-
--#: ../clients/common/settings-docs.h.in:281
-+#: ../clients/common/settings-docs.h.in:285
- msgid "If TRUE, the PAP authentication method will not be used."
- msgstr "TRUE の場合は、PAP 認証方法が使用されません。"
-
--#: ../clients/common/settings-docs.h.in:282
-+#: ../clients/common/settings-docs.h.in:286
- 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 "
-@@ -8931,7 +8868,7 @@ msgstr ""
- "なると、セッションは失敗します。MPPE がモバイルブロードバンド接続に使用されな"
- "い点に注意してください。"
-
--#: ../clients/common/settings-docs.h.in:283
-+#: ../clients/common/settings-docs.h.in:287
- 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 "
-@@ -8942,7 +8879,7 @@ msgstr ""
- "定する必要があります。128 ビットの MPPE が利用できないと、セッションは失敗し"
- "ます。"
-
--#: ../clients/common/settings-docs.h.in:284
-+#: ../clients/common/settings-docs.h.in:288
- 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 "
-@@ -8953,11 +8890,11 @@ msgstr ""
- "このプロパティーを指定しないと、この接続は、NMSettingConnection の "
- "\"interface-name\" に指定したインターフェースで接続が有効になります。"
-
--#: ../clients/common/settings-docs.h.in:285
-+#: ../clients/common/settings-docs.h.in:289
- msgid "Password used to authenticate with the PPPoE service."
- msgstr "PPPoE サービスでの認証に使用するパスワード。"
-
--#: ../clients/common/settings-docs.h.in:287
-+#: ../clients/common/settings-docs.h.in:291
- msgid ""
- "If specified, instruct PPPoE to only initiate sessions with access "
- "concentrators that provide the specified service. For most providers, this "
-@@ -8969,29 +8906,29 @@ msgstr ""
- "定を空白のままにする必要があります。これは、アクセス集線装置が複数ある場合"
- "や、特別なサービスが必要であることが分かっている場合に限り必要になります。"
-
--#: ../clients/common/settings-docs.h.in:288
-+#: ../clients/common/settings-docs.h.in:292
- msgid "Username used to authenticate with the PPPoE service."
- msgstr "PPPoE サービスでの認証に使用するユーザー名。"
-
--#: ../clients/common/settings-docs.h.in:289
-+#: ../clients/common/settings-docs.h.in:293
- msgid "Whether the proxy configuration is for browser only."
- msgstr "プロキシー設定がブラウザー専用であるかどうか。"
-
--#: ../clients/common/settings-docs.h.in:290
-+#: ../clients/common/settings-docs.h.in:294
- 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:291
-+#: ../clients/common/settings-docs.h.in:295
- msgid "PAC script for the connection."
- msgstr "接続の PAC スクリプト。"
-
--#: ../clients/common/settings-docs.h.in:292
-+#: ../clients/common/settings-docs.h.in:296
- msgid "PAC URL for obtaining PAC file."
- msgstr "PAC ファイルを取得する PAC URL"
-
--#: ../clients/common/settings-docs.h.in:293
-+#: ../clients/common/settings-docs.h.in:297
- 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 "
-@@ -9001,19 +8938,19 @@ msgstr ""
- "ドモデムには影響しません。通常は速度設定を無視し、利用可能な最高の速度を使用"
- "します。"
-
--#: ../clients/common/settings-docs.h.in:294
-+#: ../clients/common/settings-docs.h.in:298
- msgid "Byte-width of the serial communication. The 8 in \"8n1\" for example."
- msgstr "シリアル接続のバイト幅。たとえば、\"8n1\" の 8 です。"
-
--#: ../clients/common/settings-docs.h.in:295
-+#: ../clients/common/settings-docs.h.in:299
- msgid "Parity setting of the serial port."
- msgstr "シリアルポートのパリティ設定。"
-
--#: ../clients/common/settings-docs.h.in:296
-+#: ../clients/common/settings-docs.h.in:300
- msgid "Time to delay between each byte sent to the modem, in microseconds."
- msgstr "モデムに送信したバイト間の遅延時間 (マイクロ秒単位)。"
-
--#: ../clients/common/settings-docs.h.in:297
-+#: ../clients/common/settings-docs.h.in:301
- msgid ""
- "Number of stop bits for communication on the serial port. Either 1 or 2. "
- "The 1 in \"8n1\" for example."
-@@ -9021,7 +8958,7 @@ msgstr ""
- "シリアルポートで通信するための停止ビットの数。1 または 2 のいずれかになりま"
- "す。たとえば、\"8n1\" の 1 です。"
-
--#: ../clients/common/settings-docs.h.in:298
-+#: ../clients/common/settings-docs.h.in:302
- 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 "
-@@ -9040,7 +8977,7 @@ msgstr ""
- "されます。グローバルデフォルトが指定されていない場合は、NM_TERNARY_TRUE (1) "
- "に設定されていると推測されます。"
-
--#: ../clients/common/settings-docs.h.in:299
-+#: ../clients/common/settings-docs.h.in:303
- msgid ""
- "The total number of virtual functions to create. Note that when the sriov "
- "setting is present NetworkManager enforces the number of virtual functions "
-@@ -9048,7 +8985,7 @@ msgid ""
- "parameters don't add a sriov setting to the connection."
- msgstr ""
-
--#: ../clients/common/settings-docs.h.in:300
-+#: ../clients/common/settings-docs.h.in:304
- #, fuzzy
- msgid ""
- "Array of virtual function descriptors. Each VF descriptor is a dictionary "
-@@ -9070,15 +9007,15 @@ msgstr ""
- "\"ID[.PRIORITY[.PROTO]]\" となります。PROTO は 'q' (802.1Q、デフォルト) また"
- "は 'ad' (802.1ad) のいずれかになります。"
-
--#: ../clients/common/settings-docs.h.in:301
-+#: ../clients/common/settings-docs.h.in:305
- msgid "Array of TC queueing disciplines."
- msgstr "TC キュー処理の配列"
-
--#: ../clients/common/settings-docs.h.in:302
-+#: ../clients/common/settings-docs.h.in:306
- msgid "Array of TC traffic filters."
- msgstr "TC トラフィックフィルターの配列"
-
--#: ../clients/common/settings-docs.h.in:303
-+#: ../clients/common/settings-docs.h.in:307
- msgid ""
- "The JSON configuration for the team network interface. The property should "
- "contain raw JSON configuration data suitable for teamd, because the value is "
-@@ -9090,8 +9027,8 @@ msgstr ""
- "指定しないと、デフォルトの設定が使用されます。フォーマットの詳細は、man "
- "teamd.conf を参照してください。"
-
--#: ../clients/common/settings-docs.h.in:304
--#: ../clients/common/settings-docs.h.in:322
-+#: ../clients/common/settings-docs.h.in:308
-+#: ../clients/common/settings-docs.h.in:326
- #, fuzzy
- msgid ""
- "Link watchers configuration for the connection: each link watcher is defined "
-@@ -9112,23 +9049,23 @@ msgstr ""
- "キーおよび 'source-host'、'validate-active'、'validate-incative'、'send-"
- "always'。詳細は teamd.conf の man ページを参照してください。"
-
--#: ../clients/common/settings-docs.h.in:305
-+#: ../clients/common/settings-docs.h.in:309
- msgid "Corresponds to the teamd mcast_rejoin.count."
- msgstr "teamd mcast_rejoin.count に相当します。"
-
--#: ../clients/common/settings-docs.h.in:306
-+#: ../clients/common/settings-docs.h.in:310
- msgid "Corresponds to the teamd mcast_rejoin.interval."
- msgstr "teamd mcast_rejoin.interval に相当します。"
-
--#: ../clients/common/settings-docs.h.in:307
-+#: ../clients/common/settings-docs.h.in:311
- msgid "Corresponds to the teamd notify_peers.count."
- msgstr "teamd notify_peers.count に相当します。"
-
--#: ../clients/common/settings-docs.h.in:308
-+#: ../clients/common/settings-docs.h.in:312
- msgid "Corresponds to the teamd notify_peers.interval."
- msgstr "teamd notify_peers.interval に相当します。"
-
--#: ../clients/common/settings-docs.h.in:309
-+#: ../clients/common/settings-docs.h.in:313
- msgid ""
- "Corresponds to the teamd runner.name. Permitted values are: \"roundrobin\", "
- "\"broadcast\", \"activebackup\", \"loadbalance\", \"lacp\", \"random\". When "
-@@ -9142,43 +9079,43 @@ msgstr ""
- "す。他のランナー特有のプロパティーはすべて、空の値に設定されます (または、デ"
- "フォルト値に設定されない場合は空の値に設定されます)。"
-
--#: ../clients/common/settings-docs.h.in:310
-+#: ../clients/common/settings-docs.h.in:314
- msgid "Corresponds to the teamd runner.active."
- msgstr "teamd runner.active に相当します。"
-
--#: ../clients/common/settings-docs.h.in:311
-+#: ../clients/common/settings-docs.h.in:315
- msgid "Corresponds to the teamd runner.agg_select_policy."
- msgstr "teamd runner.agg_select_policy に相当します"
-
--#: ../clients/common/settings-docs.h.in:312
-+#: ../clients/common/settings-docs.h.in:316
- msgid "Corresponds to the teamd runner.fast_rate."
- msgstr "teamd runner.fast_rate に相当します。"
-
--#: ../clients/common/settings-docs.h.in:313
-+#: ../clients/common/settings-docs.h.in:317
- msgid "Corresponds to the teamd runner.hwaddr_policy."
- msgstr "teamd runner.hwaddr_policy に相当します。"
-
--#: ../clients/common/settings-docs.h.in:314
-+#: ../clients/common/settings-docs.h.in:318
- msgid "Corresponds to the teamd runner.min_ports."
- msgstr "teamd runner.min_ports に相当します。"
-
--#: ../clients/common/settings-docs.h.in:315
-+#: ../clients/common/settings-docs.h.in:319
- msgid "Corresponds to the teamd runner.sys_prio."
- msgstr "teamd runner.sys_prio に相当します。"
-
--#: ../clients/common/settings-docs.h.in:316
-+#: ../clients/common/settings-docs.h.in:320
- msgid "Corresponds to the teamd runner.tx_balancer.name."
- msgstr "teamd runner.tx_balancer.name に相当します。"
-
--#: ../clients/common/settings-docs.h.in:317
-+#: ../clients/common/settings-docs.h.in:321
- msgid "Corresponds to the teamd runner.tx_balancer.interval."
- msgstr "teamd runner.tx_balancer.interval に相当します。"
-
--#: ../clients/common/settings-docs.h.in:318
-+#: ../clients/common/settings-docs.h.in:322
- msgid "Corresponds to the teamd runner.tx_hash."
- msgstr "teamd runner.tx_hash に相当します。"
-
--#: ../clients/common/settings-docs.h.in:319
-+#: ../clients/common/settings-docs.h.in:323
- msgid ""
- "The JSON configuration for the team port. The property should contain raw "
- "JSON configuration data suitable for teamd, because the value is passed "
-@@ -9190,19 +9127,19 @@ msgstr ""
- "は、デフォルト設定が使用されます。フォーマットの詳細は、man teamd.conf を参照"
- "してください。"
-
--#: ../clients/common/settings-docs.h.in:320
-+#: ../clients/common/settings-docs.h.in:324
- msgid "Corresponds to the teamd ports.PORTIFNAME.lacp_key."
- msgstr "teamd ports.PORTIFNAME.lacp_key に相当します。"
-
--#: ../clients/common/settings-docs.h.in:321
-+#: ../clients/common/settings-docs.h.in:325
- msgid "Corresponds to the teamd ports.PORTIFNAME.lacp_prio."
- msgstr "teamd ports.PORTIFNAME.lacp_prio に相当します。"
-
--#: ../clients/common/settings-docs.h.in:323
-+#: ../clients/common/settings-docs.h.in:327
- msgid "Corresponds to the teamd ports.PORTIFNAME.prio."
- msgstr "teamd ports.PORTIFNAME.prio に相当します。"
-
--#: ../clients/common/settings-docs.h.in:324
-+#: ../clients/common/settings-docs.h.in:328
- msgid ""
- "Corresponds to the teamd ports.PORTIFNAME.queue_id. When set to -1 means the "
- "parameter is skipped from the json config."
-@@ -9210,11 +9147,11 @@ msgstr ""
- "teamd ports.PORTIFNAME.queue_id に相当します。-1 に設定すると、このパラメー"
- "ターは json 設定で無視されます。"
-
--#: ../clients/common/settings-docs.h.in:325
-+#: ../clients/common/settings-docs.h.in:329
- msgid "Corresponds to the teamd ports.PORTIFNAME.sticky."
- msgstr "teamd ports.PORTIFNAME.sticky に相当します。"
-
--#: ../clients/common/settings-docs.h.in:326
-+#: ../clients/common/settings-docs.h.in:330
- msgid ""
- "The group ID which will own the device. If set to NULL everyone will be able "
- "to use the device."
-@@ -9222,7 +9159,7 @@ msgstr ""
- "デバイスを所有するグループ ID。NULL を設定すると、誰でもこのデバイスを使用で"
- "きるようになります。"
-
--#: ../clients/common/settings-docs.h.in:327
-+#: ../clients/common/settings-docs.h.in:331
- msgid ""
- "The operating mode of the virtual device. Allowed values are "
- "NM_SETTING_TUN_MODE_TUN (1) to create a layer 3 device and "
-@@ -9232,7 +9169,7 @@ msgstr ""
- "成する NM_SETTING_TUN_MODE_TUN (1) と、Ethernet のようなレイヤー 2 デバイスを"
- "作成する NM_SETTING_TUN_MODE_TAP (2) です。"
-
--#: ../clients/common/settings-docs.h.in:328
-+#: ../clients/common/settings-docs.h.in:332
- msgid ""
- "If the property is set to TRUE, the interface will support multiple file "
- "descriptors (queues) to parallelize packet sending or receiving. Otherwise, "
-@@ -9242,7 +9179,7 @@ msgstr ""
- "プター (キュー) を使用して、パケットの送受信を並行して処理します。TRUE に設定"
- "しないと、インターフェースは 1 つのキューしかサポートしません。"
-
--#: ../clients/common/settings-docs.h.in:329
-+#: ../clients/common/settings-docs.h.in:333
- msgid ""
- "The user ID which will own the device. If set to NULL everyone will be able "
- "to use the device."
-@@ -9250,7 +9187,7 @@ msgstr ""
- "デバイスを所有するユーザー ID。NULL を設定すると、誰でもこのデバイスを使用で"
- "きるようになります。"
-
--#: ../clients/common/settings-docs.h.in:330
-+#: ../clients/common/settings-docs.h.in:334
- msgid ""
- "If TRUE the interface will prepend a 4 byte header describing the physical "
- "interface to the packets."
-@@ -9258,7 +9195,7 @@ msgstr ""
- "TRUE の場合、インターフェースは、パケットの先頭に、物理インターフェースを接続"
- "する 4 バイトのヘッダーを追加します。"
-
--#: ../clients/common/settings-docs.h.in:331
-+#: ../clients/common/settings-docs.h.in:335
- msgid ""
- "If TRUE the IFF_VNET_HDR the tunnel packets will include a virtio network "
- "header."
-@@ -9266,7 +9203,7 @@ msgstr ""
- "IFF_VNET_HDR を TRUE にすると、トンネルパケットには、virtio ネットワークヘッ"
- "ダーが含まれます。"
-
--#: ../clients/common/settings-docs.h.in:332
-+#: ../clients/common/settings-docs.h.in:336
- 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 "
-@@ -9278,7 +9215,7 @@ msgstr ""
- "ascii フォーマットのみをサポートしますが、値は、指定した長さまでの任意の "
- "UTF8 文字列にできます。"
-
--#: ../clients/common/settings-docs.h.in:333
-+#: ../clients/common/settings-docs.h.in:337
- 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"
-@@ -9288,7 +9225,7 @@ msgstr ""
- "このマッピングは、\"from:to\" の形式で指定し、\"from\" と \"to\" は、\"7:3\" "
- "など、署名なし整数にします。"
-
--#: ../clients/common/settings-docs.h.in:334
-+#: ../clients/common/settings-docs.h.in:338
- 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 "
-@@ -9309,7 +9246,7 @@ msgstr ""
- "た。後方互換性を確保するには D-Bus API のデフォルト値を 0 のままにし、D-Bus "
- "における不明なプロパティーは引き続き 0 と見なされます。"
-
--#: ../clients/common/settings-docs.h.in:335
-+#: ../clients/common/settings-docs.h.in:339
- 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."
-@@ -9317,7 +9254,7 @@ msgstr ""
- "この接続が作成するインターフェースを割り当てる必要がある VLAN 識別子。有効は"
- "範囲は 0 - 4094 となり、予約されている id 4095 は除外されます。"
-
--#: ../clients/common/settings-docs.h.in:336
-+#: ../clients/common/settings-docs.h.in:340
- 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"
-@@ -9327,7 +9264,7 @@ msgstr ""
- "このマッピングは、\"from:to\" の形式で指定し、\"from\" と \"to\" は、\"7:3\" "
- "など、署名なし整数にします。"
-
--#: ../clients/common/settings-docs.h.in:337
-+#: ../clients/common/settings-docs.h.in:341
- 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 "
-@@ -9339,7 +9276,7 @@ msgstr ""
- "に、\"mac-address\" プロパティーが指定されている \"802-3-ethernet\" 設定を含"
- "める必要があります。"
-
--#: ../clients/common/settings-docs.h.in:338
-+#: ../clients/common/settings-docs.h.in:342
- msgid ""
- "Dictionary of key/value pairs of VPN plugin specific data. Both keys and "
- "values must be strings."
-@@ -9347,7 +9284,7 @@ msgstr ""
- "VPN プラグイン特有のデータにおけるキーと値がペアになったディクショナリー。"
- "キーと値の両方を文字列にする必要があります。"
-
--#: ../clients/common/settings-docs.h.in:339
-+#: ../clients/common/settings-docs.h.in:343
- 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 "
-@@ -9357,7 +9294,7 @@ msgstr ""
- "VPN は、明示的に切断されるまで、リンクが変更され、停止しても接続されたままに"
- "なります。"
-
--#: ../clients/common/settings-docs.h.in:340
-+#: ../clients/common/settings-docs.h.in:344
- msgid ""
- "Dictionary of key/value pairs of VPN plugin specific secrets like passwords "
- "or private keys. Both keys and values must be strings."
-@@ -9365,7 +9302,7 @@ msgstr ""
- "パスワードや秘密鍵など、VPN プラグイン特有のシークレットに関するキーと値のペ"
- "アのディクショナリー。キーと値はともに文字列にする必要があります。"
-
--#: ../clients/common/settings-docs.h.in:341
-+#: ../clients/common/settings-docs.h.in:345
- 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."
-@@ -9373,7 +9310,7 @@ msgstr ""
- "この設定がネットワークに接続するのに使用する VPN プラグインの D-Bus サービス"
- "名。vpnc プラグインの場合は org.freedesktop.NetworkManager.vpnc です。"
-
--#: ../clients/common/settings-docs.h.in:342
-+#: ../clients/common/settings-docs.h.in:346
- 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 "
-@@ -9385,7 +9322,7 @@ msgstr ""
- "ファイルで vpn.timeout を上書きしていない場合)。ゼロ以外の値を設定した場合"
- "は、それがタイムアウト (秒単位) となります。"
-
--#: ../clients/common/settings-docs.h.in:343
-+#: ../clients/common/settings-docs.h.in:347
- 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 "
-@@ -9400,11 +9337,11 @@ msgstr ""
- "すると、NetworkManager は、VPN 接続を要求するユーザーのユーザー名を自動的に提"
- "供します。"
-
--#: ../clients/common/settings-docs.h.in:344
-+#: ../clients/common/settings-docs.h.in:348
- msgid "Specifies the lifetime in seconds of FDB entries learnt by the kernel."
- msgstr "カーネルが学習する FDB エントリーの存続時間 (秒単位) を指定します。"
-
--#: ../clients/common/settings-docs.h.in:345
-+#: ../clients/common/settings-docs.h.in:349
- msgid ""
- "Specifies the UDP destination port to communicate to the remote VXLAN tunnel "
- "endpoint."
-@@ -9412,24 +9349,24 @@ msgstr ""
- "リモートの VXLAN トンネルエンドポイントに接続する UDP 宛先ポートを指定しま"
- "す。"
-
--#: ../clients/common/settings-docs.h.in:346
-+#: ../clients/common/settings-docs.h.in:350
- msgid ""
- "Specifies the VXLAN Network Identifier (or VXLAN Segment Identifier) to use."
- msgstr ""
- "使用する VXLAN ネットワーク識別子 (または VXLAN セグメント識別子) を指定しま"
- "す。"
-
--#: ../clients/common/settings-docs.h.in:347
-+#: ../clients/common/settings-docs.h.in:351
- msgid "Specifies whether netlink LL ADDR miss notifications are generated."
- msgstr ""
- "ネットリンク LL ADDR が欠落している通知が生成されるかどうかを指定します。"
-
--#: ../clients/common/settings-docs.h.in:348
-+#: ../clients/common/settings-docs.h.in:352
- msgid "Specifies whether netlink IP ADDR miss notifications are generated."
- msgstr ""
- "ネットリンク IP ADDR が欠落している通知が生成されるかどうかを指定します。"
-
--#: ../clients/common/settings-docs.h.in:349
-+#: ../clients/common/settings-docs.h.in:353
- msgid ""
- "Specifies whether unknown source link layer addresses and IP addresses are "
- "entered into the VXLAN device forwarding database."
-@@ -9437,7 +9374,7 @@ msgstr ""
- "未知のソースリンクレイヤーのアドレスと IP アドレスを、VXLAN デバイス転送デー"
- "タベースに入力するかどうかを指定します。"
-
--#: ../clients/common/settings-docs.h.in:350
-+#: ../clients/common/settings-docs.h.in:354
- msgid ""
- "Specifies the maximum number of FDB entries. A value of zero means that the "
- "kernel will store unlimited entries."
-@@ -9445,21 +9382,21 @@ msgstr ""
- "FDB エントリーの最大数を指定します。値がゼロの場合は、カーネルがエントリーを"
- "無限に保存することを意味します。"
-
--#: ../clients/common/settings-docs.h.in:351
-+#: ../clients/common/settings-docs.h.in:355
- msgid "If given, specifies the source IP address to use in outgoing packets."
- msgstr ""
- "指定した場合は、送信パケットで使用するソースの IP アドレスを指定します。"
-
--#: ../clients/common/settings-docs.h.in:352
-+#: ../clients/common/settings-docs.h.in:356
- msgid ""
- "If given, specifies the parent interface name or parent connection UUID."
- msgstr "指定した場合は、親インターフェース名または親接続の UUID を指定します。"
-
--#: ../clients/common/settings-docs.h.in:353
-+#: ../clients/common/settings-docs.h.in:357
- msgid "Specifies whether ARP proxy is turned on."
- msgstr "ARP プロキシーをオンにするかどうかを指定します"
-
--#: ../clients/common/settings-docs.h.in:354
-+#: ../clients/common/settings-docs.h.in:358
- 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 "
-@@ -9469,11 +9406,11 @@ msgstr ""
- "パケットで使用するユニキャストの宛先 IP アドレス、または参加するマルチキャス"
- "ト IP アドレスを指定します。"
-
--#: ../clients/common/settings-docs.h.in:355
-+#: ../clients/common/settings-docs.h.in:359
- msgid "Specifies whether route short circuit is turned on."
- msgstr "ルートのショートサーキットがオンになっているかどうかを指定します。"
-
--#: ../clients/common/settings-docs.h.in:356
-+#: ../clients/common/settings-docs.h.in:360
- msgid ""
- "Specifies the maximum UDP source port to communicate to the remote VXLAN "
- "tunnel endpoint."
-@@ -9481,7 +9418,7 @@ msgstr ""
- "リモート VXLAN のトンネルエンドポイントに接続する最大 UDP ソースポートを指定"
- "します。"
-
--#: ../clients/common/settings-docs.h.in:357
-+#: ../clients/common/settings-docs.h.in:361
- msgid ""
- "Specifies the minimum UDP source port to communicate to the remote VXLAN "
- "tunnel endpoint."
-@@ -9489,15 +9426,42 @@ msgstr ""
- "リモートの VXLAN トンネルエンドポイントに接続するための最小 UDP ソースポート"
- "を指定します。"
-
--#: ../clients/common/settings-docs.h.in:358
-+#: ../clients/common/settings-docs.h.in:362
- msgid "Specifies the TOS value to use in outgoing packets."
- msgstr "送信パケットで使用する TOS 値を指定します。"
-
--#: ../clients/common/settings-docs.h.in:359
-+#: ../clients/common/settings-docs.h.in:363
- msgid "Specifies the time-to-live value to use in outgoing packets."
- msgstr "送信パケットで使用する生存時間の値を使用します。"
-
--#: ../clients/common/settings-docs.h.in:360
-+#: ../clients/common/settings-docs.h.in:364
-+msgid ""
-+"The P2P device that should be connected to. Currently this is the only way "
-+"to create or join a group."
-+msgstr ""
-+
-+#: ../clients/common/settings-docs.h.in:365
-+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 ""
-+
-+#: ../clients/common/settings-docs.h.in:366
-+#, fuzzy
-+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 のモードが使用される場合に、どのモードが使用されるかを示すフラグ。アクセ"
-+"スポイントの機能から WPS エンロールメントを開始できるかどうかを "
-+"NetworkManager が自動的に決定するため、デフォルト設定の変更をする利点はほと"
-+"んどありません。このプロパティーの値を 1 にすると WPS を無効にできます。"
-+
-+#: ../clients/common/settings-docs.h.in:367
- 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 "
-@@ -9507,7 +9471,7 @@ msgstr ""
- "す。このプロパティーはデバイスの MAC アドレスを変更しません (MAC スプーフィン"
- "グとして知られています)。非推奨: 1"
-
--#: ../clients/common/settings-docs.h.in:361
-+#: ../clients/common/settings-docs.h.in:368
- msgid ""
- "Network Service Provider (NSP) name of the WiMAX network this connection "
- "should use. Deprecated: 1"
-@@ -9515,13 +9479,54 @@ msgstr ""
- "この接続が使用する WiMAX ネットワークのネットワークサービスプロバイダー "
- "(NSP) 名。非推奨: 1"
-
--#: ../clients/common/settings-docs.h.in:362
-+#: ../clients/common/settings-docs.h.in:369
-+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."
-+msgstr ""
-+
-+#: ../clients/common/settings-docs.h.in:370
-+msgid ""
-+"The listen-port. If listen-port is not specified, the port will be chosen "
-+"randomly when the interface comes up."
-+msgstr ""
-+
-+#: ../clients/common/settings-docs.h.in:371
-+#, fuzzy
-+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 ""
-+"ゼロ以外は、指定したサイズ以下のパケットだけが送信されます。指定より大きなパ"
-+"ケットは、複数の Ethernet フレームに分割されます。"
-+
-+#: ../clients/common/settings-docs.h.in:372
-+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 ""
-+
-+#: ../clients/common/settings-docs.h.in:373
-+msgid "The 256 bit private-key in base64 encoding."
-+msgstr ""
-+
-+#: ../clients/common/settings-docs.h.in:374
-+#, fuzzy
-+msgid "Flags indicating how to handle the \"private-key\" property."
-+msgstr "\"private-key-password\" プロパティーの処理方法を示すフラグ。"
-+
-+#: ../clients/common/settings-docs.h.in:375
- msgid ""
- "IEEE 802.15.4 channel. A positive integer or -1, meaning \"do not set, use "
- "whatever the device is already set to\"."
- msgstr ""
-
--#: ../clients/common/settings-docs.h.in:363
-+#: ../clients/common/settings-docs.h.in:376
- msgid ""
- "If specified, this connection will only apply to the IEEE 802.15.4 (WPAN) "
- "MAC layer device whose permanent MAC address matches."
-@@ -9529,17 +9534,17 @@ msgstr ""
- "指定すると、この接続は永続的な MAC アドレスに一致する IEEE 802.15.4 (WPAN) "
- "MAC 層デバイスにのみ適用されます。"
-
--#: ../clients/common/settings-docs.h.in:364
-+#: ../clients/common/settings-docs.h.in:377
- 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 ""
-
--#: ../clients/common/settings-docs.h.in:365
-+#: ../clients/common/settings-docs.h.in:378
- msgid "IEEE 802.15.4 Personal Area Network (PAN) identifier."
- msgstr "IEEE 802.15.4 パーソナルエリアネットワーク (PAN) 識別子。"
-
--#: ../clients/common/settings-docs.h.in:366
-+#: ../clients/common/settings-docs.h.in:379
- msgid "Short IEEE 802.15.4 address to be used within a restricted environment."
- msgstr "限定環境内にて使用される IEEE 802.15.4 のショートアドレス"
-
-@@ -9590,25 +9595,25 @@ msgstr ""
- "無効なオプションです。--help を使用して有効なオプションの一覧を確認してくださ"
- "い。"
-
--#: ../clients/tui/newt/nmt-newt-utils.c:177 ../clients/tui/nmt-editor.c:429
-+#: ../clients/tui/newt/nmt-newt-utils.c:176 ../clients/tui/nmt-editor.c:433
- #: ../clients/tui/nmt-password-dialog.c:174
- #: ../clients/tui/nmt-route-editor.c:122 ../clients/tui/nmtui-hostname.c:69
- #: ../clients/tui/nmtui.c:134
- msgid "OK"
- msgstr "OK"
-
--#: ../clients/tui/newt/nmt-newt-utils.c:325
--#: ../clients/tui/newt/nmt-newt-utils.c:357
-+#: ../clients/tui/newt/nmt-newt-utils.c:324
-+#: ../clients/tui/newt/nmt-newt-utils.c:356
- #, c-format
- msgid "Could not create temporary file: %s"
- msgstr "一時ファイルを作成できませんでした: %s"
-
--#: ../clients/tui/newt/nmt-newt-utils.c:363
-+#: ../clients/tui/newt/nmt-newt-utils.c:362
- #, c-format
- msgid "Editor failed: %s"
- msgstr "エディタが失敗しました: %s"
-
--#: ../clients/tui/newt/nmt-newt-utils.c:369
-+#: ../clients/tui/newt/nmt-newt-utils.c:368
- #, c-format
- msgid "Could not re-read file: %s"
- msgstr "ファイルの再読み込みができませんでした: %s"
-@@ -9633,7 +9638,7 @@ msgstr "Wi-Fi"
- msgid "Wi-Fi connection %d"
- msgstr "Wi-Fi 接続 %d"
-
--#: ../clients/tui/nm-editor-utils.c:161 ../libnm-core/nm-connection.c:2376
-+#: ../clients/tui/nm-editor-utils.c:161 ../libnm-core/nm-connection.c:2517
- #: ../libnm-glib/nm-device.c:1832 ../libnm/nm-device.c:1398
- msgid "InfiniBand"
- msgstr "InfiniBand"
-@@ -9662,10 +9667,10 @@ msgstr "DSL"
- msgid "DSL connection %d"
- msgstr "DSL 接続 %d"
-
--#: ../clients/tui/nm-editor-utils.c:188 ../libnm-core/nm-connection.c:2368
-+#: ../clients/tui/nm-editor-utils.c:188 ../libnm-core/nm-connection.c:2509
- #: ../libnm-glib/nm-device.c:1834 ../libnm-util/nm-connection.c:1623
- #: ../libnm/nm-device.c:1400
--#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4794
-+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4836
- msgid "Bond"
- msgstr "ボンド"
-
-@@ -9674,10 +9679,10 @@ msgstr "ボンド"
- msgid "Bond connection %d"
- msgstr "ボンド接続 %d"
-
--#: ../clients/tui/nm-editor-utils.c:197 ../libnm-core/nm-connection.c:2372
-+#: ../clients/tui/nm-editor-utils.c:197 ../libnm-core/nm-connection.c:2513
- #: ../libnm-glib/nm-device.c:1838 ../libnm-util/nm-connection.c:1627
- #: ../libnm/nm-device.c:1404
--#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5130
-+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5216
- msgid "Bridge"
- msgstr "ブリッジ"
-
-@@ -9686,10 +9691,10 @@ msgstr "ブリッジ"
- msgid "Bridge connection %d"
- msgstr "ブリッジ接続 %d"
-
--#: ../clients/tui/nm-editor-utils.c:206 ../libnm-core/nm-connection.c:2370
-+#: ../clients/tui/nm-editor-utils.c:206 ../libnm-core/nm-connection.c:2511
- #: ../libnm-glib/nm-device.c:1836 ../libnm-util/nm-connection.c:1625
- #: ../libnm/nm-device.c:1402
--#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4897
-+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4939
- msgid "Team"
- msgstr "team "
-
-@@ -9699,7 +9704,7 @@ msgid "Team connection %d"
- msgstr "team 接続 %d"
-
- #: ../clients/tui/nm-editor-utils.c:215 ../clients/tui/nmt-page-vlan.c:82
--#: ../libnm-core/nm-connection.c:2374 ../libnm-glib/nm-device.c:1840
-+#: ../libnm-core/nm-connection.c:2515 ../libnm-glib/nm-device.c:1840
- #: ../libnm-util/nm-connection.c:1629 ../libnm/nm-device.c:1406
- msgid "VLAN"
- msgstr "VLAN"
-@@ -9750,52 +9755,52 @@ msgstr "隠す"
- msgid "Show"
- msgstr "表示する"
-
--#: ../clients/tui/nmt-editor.c:98
-+#: ../clients/tui/nmt-editor.c:100
- #, c-format
- msgid "Could not create editor for connection '%s' of type '%s'."
- msgstr "接続 '%s'、タイプ '%s' 用のエディターを作成できませんでした。"
-
--#: ../clients/tui/nmt-editor.c:102
-+#: ../clients/tui/nmt-editor.c:104
- #, c-format
- msgid "Could not create editor for invalid connection '%s'."
- msgstr "無効な接続 '%s' のエディターを作成できませんでした。"
-
--#: ../clients/tui/nmt-editor.c:112
-+#: ../clients/tui/nmt-editor.c:114
- msgid "Edit Connection"
- msgstr "接続の編集"
-
--#: ../clients/tui/nmt-editor.c:173
-+#: ../clients/tui/nmt-editor.c:175
- #, c-format
- msgid "Unable to save connection: %s"
- msgstr "接続を保存できません: %s"
-
--#: ../clients/tui/nmt-editor.c:187
-+#: ../clients/tui/nmt-editor.c:189
- #, c-format
- msgid "Unable to add new connection: %s"
- msgstr "新しい接続を追加できません: %s"
-
--#: ../clients/tui/nmt-editor.c:332
-+#: ../clients/tui/nmt-editor.c:336
- msgid "Profile name"
- msgstr "プロファイル名"
-
--#: ../clients/tui/nmt-editor.c:343
-+#: ../clients/tui/nmt-editor.c:347
- msgid "Ethernet device"
- msgstr "Ethernet デバイス"
-
--#: ../clients/tui/nmt-editor.c:345
-+#: ../clients/tui/nmt-editor.c:349
- msgid "Device"
- msgstr "デバイス"
-
- #. And finally the bottom widgets
--#: ../clients/tui/nmt-editor.c:405
-+#: ../clients/tui/nmt-editor.c:409
- msgid "Automatically connect"
- msgstr "自動的に接続する"
-
--#: ../clients/tui/nmt-editor.c:411
-+#: ../clients/tui/nmt-editor.c:415
- msgid "Available to all users"
- msgstr "全ユーザーに使用可能"
-
--#: ../clients/tui/nmt-editor.c:426 ../clients/tui/nmt-password-dialog.c:171
-+#: ../clients/tui/nmt-editor.c:430 ../clients/tui/nmt-password-dialog.c:171
- #: ../clients/tui/nmt-route-editor.c:115 ../clients/tui/nmtui-edit.c:220
- #: ../clients/tui/nmtui-edit.c:528 ../clients/tui/nmtui-hostname.c:67
- msgid "Cancel"
-@@ -10505,115 +10510,115 @@ msgstr "NetworkManager に接続できませんでした: %s.\n"
- msgid "NetworkManager is not running."
- msgstr "NetworkManager が実行していません。"
-
--#: ../libnm-core/nm-crypto.c:214
-+#: ../libnm-core/nm-crypto.c:213
- #, c-format
- msgid "PEM key file had no start tag"
- msgstr "PEM キーファイルには開始タグがありません"
-
--#: ../libnm-core/nm-crypto.c:222 ../libnm-util/crypto.c:130
-+#: ../libnm-core/nm-crypto.c:221 ../libnm-util/crypto.c:130
- #, c-format
- msgid "PEM key file had no end tag '%s'."
- msgstr "PEM キーファイルには終了タグ '%s' がありません。"
-
--#: ../libnm-core/nm-crypto.c:249 ../libnm-util/crypto.c:160
-+#: ../libnm-core/nm-crypto.c:248 ../libnm-util/crypto.c:160
- #, c-format
- msgid "Malformed PEM file: Proc-Type was not first tag."
- msgstr "不正形式の PEM ファイル: Proc-Type は最初のタグではありません。"
-
--#: ../libnm-core/nm-crypto.c:257 ../libnm-util/crypto.c:168
-+#: ../libnm-core/nm-crypto.c:256 ../libnm-util/crypto.c:168
- #, c-format
- msgid "Malformed PEM file: unknown Proc-Type tag '%s'."
- msgstr "不正形式の PEM ファイル: 不明な Proc-Type タグ '%s' です。"
-
--#: ../libnm-core/nm-crypto.c:269 ../libnm-util/crypto.c:178
-+#: ../libnm-core/nm-crypto.c:268 ../libnm-util/crypto.c:178
- #, c-format
- msgid "Malformed PEM file: DEK-Info was not the second tag."
- msgstr "不正形式の PEM ファイル: DEK-Info は２つ目のタグではありません。"
-
--#: ../libnm-core/nm-crypto.c:280 ../libnm-util/crypto.c:189
-+#: ../libnm-core/nm-crypto.c:279 ../libnm-util/crypto.c:189
- #, c-format
- msgid "Malformed PEM file: no IV found in DEK-Info tag."
- msgstr "不正形式の PEM ファイル: DEK-Info タグ内に IV が見つかりません。"
-
--#: ../libnm-core/nm-crypto.c:288 ../libnm-util/crypto.c:196
-+#: ../libnm-core/nm-crypto.c:287 ../libnm-util/crypto.c:196
- #, c-format
- msgid "Malformed PEM file: invalid format of IV in DEK-Info tag."
- msgstr "不正形式の PEM ファイル: DEK-Info タグ内に無効な形式の IV"
-
--#: ../libnm-core/nm-crypto.c:299 ../libnm-util/crypto.c:211
-+#: ../libnm-core/nm-crypto.c:298 ../libnm-util/crypto.c:211
- #, c-format
- msgid "Malformed PEM file: unknown private key cipher '%s'."
- msgstr "不正形式の PEM ファイル: 不明なプライベートキー暗号文 '%s'。"
-
--#: ../libnm-core/nm-crypto.c:320 ../libnm-util/crypto.c:230
-+#: ../libnm-core/nm-crypto.c:319 ../libnm-util/crypto.c:230
- #, c-format
- msgid "Could not decode private key."
- msgstr "プライベートキーを復号できませんでした。"
-
--#: ../libnm-core/nm-crypto.c:361 ../libnm-util/crypto.c:282
-+#: ../libnm-core/nm-crypto.c:360 ../libnm-util/crypto.c:282
- msgid "Failed to find expected PKCS#8 start tag."
- msgstr "期待されている PKCS#8 開始タグの検出に失敗しました。"
-
--#: ../libnm-core/nm-crypto.c:369 ../libnm-util/crypto.c:290
-+#: ../libnm-core/nm-crypto.c:368 ../libnm-util/crypto.c:290
- #, c-format
- msgid "Failed to find expected PKCS#8 end tag '%s'."
- msgstr "期待されている PKCS#8 終了タグ '%s' の検出に失敗しました。"
-
--#: ../libnm-core/nm-crypto.c:381 ../libnm-util/crypto.c:309
-+#: ../libnm-core/nm-crypto.c:380 ../libnm-util/crypto.c:309
- msgid "Failed to decode PKCS#8 private key."
- msgstr "PKCS#8 プライベートキーの復号に失敗しました。"
-
--#: ../libnm-core/nm-crypto.c:440 ../libnm-util/crypto.c:351
-+#: ../libnm-core/nm-crypto.c:439 ../libnm-util/crypto.c:351
- #, c-format
- msgid "IV must be an even number of bytes in length."
- msgstr "IV は、その長さで偶数のバイト数でなければなりません。"
-
--#: ../libnm-core/nm-crypto.c:456 ../libnm-util/crypto.c:365
-+#: ../libnm-core/nm-crypto.c:455 ../libnm-util/crypto.c:365
- #, c-format
- msgid "IV contains non-hexadecimal digits."
- msgstr "IV は 16進法でない数字を含んでいます。"
-
--#: ../libnm-core/nm-crypto.c:532
-+#: ../libnm-core/nm-crypto.c:531
- #, c-format
- msgid "IV must contain at least 8 characters"
- msgstr "IV は最低 8 文字が必要"
-
--#: ../libnm-core/nm-crypto.c:580 ../libnm-util/crypto.c:515
-+#: ../libnm-core/nm-crypto.c:579 ../libnm-util/crypto.c:515
- #, c-format
- msgid "Unable to determine private key type."
- msgstr "プライベートキーのタイプを判定できません。"
-
--#: ../libnm-core/nm-crypto.c:592
-+#: ../libnm-core/nm-crypto.c:591
- #, c-format
- msgid "Password provided, but key was not encrypted."
- msgstr "パスワードが提供されましたが、キーは暗号化されませんでした。"
-
--#: ../libnm-core/nm-crypto.c:653 ../libnm-util/crypto.c:570
-+#: ../libnm-core/nm-crypto.c:652 ../libnm-util/crypto.c:570
- #, c-format
- msgid "PEM certificate had no start tag '%s'."
- msgstr "PEM 証明書に終了タグ '%s' がありませんでした。"
-
--#: ../libnm-core/nm-crypto.c:662 ../libnm-util/crypto.c:579
-+#: ../libnm-core/nm-crypto.c:661 ../libnm-util/crypto.c:579
- #, c-format
- msgid "PEM certificate had no end tag '%s'."
- msgstr "PEM 証明書に終了タグ '%s' がありませんでした。"
-
--#: ../libnm-core/nm-crypto.c:674 ../libnm-util/crypto.c:597
-+#: ../libnm-core/nm-crypto.c:673 ../libnm-util/crypto.c:597
- #, c-format
- msgid "Failed to decode certificate."
- msgstr "証明書の復号に失敗しました。"
-
--#: ../libnm-core/nm-crypto.c:703 ../libnm-core/nm-crypto.c:756
-+#: ../libnm-core/nm-crypto.c:702 ../libnm-core/nm-crypto.c:755
- #, c-format
- msgid "Certificate file is empty"
- msgstr "証明書ファイルが空です"
-
--#: ../libnm-core/nm-crypto.c:736
-+#: ../libnm-core/nm-crypto.c:735
- #, c-format
- msgid "Failed to recognize certificate"
- msgstr "証明書の認識に失敗しました"
-
--#: ../libnm-core/nm-crypto.c:846
-+#: ../libnm-core/nm-crypto.c:845
- #, c-format
- msgid "not a valid private key"
- msgstr "無効なプライベートキー"
-@@ -10808,60 +10813,60 @@ msgstr "PKCS#12 ファイルを確証できません: %d"
- msgid "Could not generate random data."
- msgstr "ランダムデータを生成できません。"
-
--#: ../libnm-core/nm-connection.c:301
-+#: ../libnm-core/nm-connection.c:322
- msgid "wrong type; should be a list of strings."
- msgstr "正しくないタイプ; 文字列のリストである必要があります。"
-
--#: ../libnm-core/nm-connection.c:371
-+#: ../libnm-core/nm-connection.c:392
- msgid "unknown setting name"
- msgstr "不明な設定名"
-
--#: ../libnm-core/nm-connection.c:383
-+#: ../libnm-core/nm-connection.c:404
- msgid "duplicate setting name"
- msgstr "重複する設定名"
-
--#: ../libnm-core/nm-connection.c:1366
-+#: ../libnm-core/nm-connection.c:1414
- msgid "setting not found"
- msgstr "設定が見つかりません"
-
--#: ../libnm-core/nm-connection.c:1432 ../libnm-core/nm-connection.c:1457
--#: ../libnm-core/nm-connection.c:1482
-+#: ../libnm-core/nm-connection.c:1480 ../libnm-core/nm-connection.c:1505
-+#: ../libnm-core/nm-connection.c:1530
- msgid "setting is required for non-slave connections"
- msgstr "設定は非スレーブ接続で必要です"
-
--#: ../libnm-core/nm-connection.c:1445 ../libnm-core/nm-connection.c:1470
--#: ../libnm-core/nm-connection.c:1495
-+#: ../libnm-core/nm-connection.c:1493 ../libnm-core/nm-connection.c:1518
-+#: ../libnm-core/nm-connection.c:1543
- msgid "setting not allowed in slave connection"
- msgstr "設定がスレーブ接続で許可されません"
-
--#: ../libnm-core/nm-connection.c:1585
-+#: ../libnm-core/nm-connection.c:1633
- msgid "Unexpected failure to verify the connection"
- msgstr "接続を確認するときの予期しない障害"
-
--#: ../libnm-core/nm-connection.c:1630
-+#: ../libnm-core/nm-connection.c:1680
- msgid "Unexpected failure to normalize the connection"
- msgstr "接続を正規化するときの予期しない障害"
-
--#: ../libnm-core/nm-connection.c:2234 ../libnm-core/nm-setting-8021x.c:2571
--#: ../libnm-core/nm-setting-8021x.c:2588 ../libnm-core/nm-setting-8021x.c:2619
--#: ../libnm-core/nm-setting-8021x.c:2636 ../libnm-core/nm-setting-8021x.c:2678
--#: ../libnm-core/nm-setting-8021x.c:2690 ../libnm-core/nm-setting-8021x.c:2708
--#: ../libnm-core/nm-setting-8021x.c:2720 ../libnm-core/nm-setting-8021x.c:2744
--#: ../libnm-core/nm-setting-8021x.c:2826 ../libnm-core/nm-setting-adsl.c:187
--#: ../libnm-core/nm-setting-bluetooth.c:136
--#: ../libnm-core/nm-setting-bluetooth.c:194
--#: ../libnm-core/nm-setting-bluetooth.c:208 ../libnm-core/nm-setting-cdma.c:157
--#: ../libnm-core/nm-setting-connection.c:947
--#: ../libnm-core/nm-setting-connection.c:990
--#: ../libnm-core/nm-setting-connection.c:1156
--#: ../libnm-core/nm-setting-ip-config.c:2492
--#: ../libnm-core/nm-setting-ip-tunnel.c:373
--#: ../libnm-core/nm-setting-olpc-mesh.c:118
--#: ../libnm-core/nm-setting-ovs-patch.c:92 ../libnm-core/nm-setting-pppoe.c:159
--#: ../libnm-core/nm-setting-vpn.c:550 ../libnm-core/nm-setting-vxlan.c:358
--#: ../libnm-core/nm-setting-wimax.c:124
--#: ../libnm-core/nm-setting-wireless-security.c:918
--#: ../libnm-core/nm-setting-wireless.c:750 ../libnm-util/nm-setting.c:1355
-+#: ../libnm-core/nm-connection.c:2374 ../libnm-core/nm-setting-8021x.c:2569
-+#: ../libnm-core/nm-setting-8021x.c:2586 ../libnm-core/nm-setting-8021x.c:2617
-+#: ../libnm-core/nm-setting-8021x.c:2634 ../libnm-core/nm-setting-8021x.c:2676
-+#: ../libnm-core/nm-setting-8021x.c:2688 ../libnm-core/nm-setting-8021x.c:2706
-+#: ../libnm-core/nm-setting-8021x.c:2718 ../libnm-core/nm-setting-8021x.c:2742
-+#: ../libnm-core/nm-setting-8021x.c:2824 ../libnm-core/nm-setting-adsl.c:174
-+#: ../libnm-core/nm-setting-bluetooth.c:125
-+#: ../libnm-core/nm-setting-bluetooth.c:183
-+#: ../libnm-core/nm-setting-bluetooth.c:197 ../libnm-core/nm-setting-cdma.c:144
-+#: ../libnm-core/nm-setting-connection.c:931
-+#: ../libnm-core/nm-setting-connection.c:974
-+#: ../libnm-core/nm-setting-connection.c:1140
-+#: ../libnm-core/nm-setting-ip-config.c:4816
-+#: ../libnm-core/nm-setting-ip-tunnel.c:374
-+#: ../libnm-core/nm-setting-olpc-mesh.c:99
-+#: ../libnm-core/nm-setting-ovs-patch.c:92 ../libnm-core/nm-setting-pppoe.c:146
-+#: ../libnm-core/nm-setting-vpn.c:531 ../libnm-core/nm-setting-vxlan.c:339
-+#: ../libnm-core/nm-setting-wifi-p2p.c:136 ../libnm-core/nm-setting-wimax.c:110
-+#: ../libnm-core/nm-setting-wireless-security.c:914
-+#: ../libnm-core/nm-setting-wireless.c:737 ../libnm-util/nm-setting.c:1355
- #: ../libnm-util/nm-setting.c:1374 ../libnm-util/nm-setting.c:1392
- #: ../libnm-util/nm-setting-8021x.c:2324 ../libnm-util/nm-setting-8021x.c:2341
- #: ../libnm-util/nm-setting-8021x.c:2382 ../libnm-util/nm-setting-8021x.c:2399
-@@ -10877,18 +10882,18 @@ msgstr "接続を正規化するときの予期しない障害"
- #: ../libnm-util/nm-setting-ip6-config.c:831
- #: ../libnm-util/nm-setting-ip6-config.c:897
- #: ../libnm-util/nm-setting-olpc-mesh.c:123
--#: ../libnm-util/nm-setting-pppoe.c:162 ../libnm-util/nm-setting-vpn.c:422
-+#: ../libnm-util/nm-setting-pppoe.c:162 ../libnm-util/nm-setting-vpn.c:421
- #: ../libnm-util/nm-setting-wimax.c:149
- #: ../libnm-util/nm-setting-wireless-security.c:890
- #: ../libnm-util/nm-setting-wireless.c:768
- msgid "property is missing"
- msgstr "プロパティーがありません"
-
--#: ../libnm-core/nm-connection.c:2379
-+#: ../libnm-core/nm-connection.c:2520
- msgid "IP Tunnel"
- msgstr "IP トンネル"
-
--#: ../libnm-core/nm-dbus-utils.c:202
-+#: ../libnm-core/nm-dbus-utils.c:200
- #, c-format
- msgid "Method returned type '%s', but expected '%s'"
- msgstr "メソッドはタイプ '%s' を返しましたが、'%s' を想定していました"
-@@ -10898,253 +10903,292 @@ msgstr "メソッドはタイプ '%s' を返しましたが、'%s' を想定し
- msgid "value is not an integer in range [%lld, %lld]"
- msgstr "'%s' は、[%lli, %lli] の範囲外です"
-
--#: ../libnm-core/nm-keyfile.c:210
-+#: ../libnm-core/nm-keyfile.c:211
- msgid "ignoring missing number"
- msgstr "不明な数字を無視"
-
--#: ../libnm-core/nm-keyfile.c:218
-+#: ../libnm-core/nm-keyfile.c:219
- #, c-format
- msgid "ignoring invalid number '%s'"
- msgstr "無効な数字 '%s' を無視"
-
--#: ../libnm-core/nm-keyfile.c:239
-+#: ../libnm-core/nm-keyfile.c:240
- #, c-format
- msgid "ignoring invalid %s address: %s"
- msgstr "無効な %s アドレスを無視: %s"
-
--#: ../libnm-core/nm-keyfile.c:281
-+#: ../libnm-core/nm-keyfile.c:282
- #, c-format
- msgid "ignoring invalid gateway '%s' for %s route"
- msgstr "無効なゲートウェイ '%s' (%s ルート用) を無視"
-
--#: ../libnm-core/nm-keyfile.c:302
-+#: ../libnm-core/nm-keyfile.c:303
- #, c-format
- msgid "ignoring invalid %s route: %s"
- msgstr "無効な %s ルートを無視: %s"
-
--#: ../libnm-core/nm-keyfile.c:427
-+#: ../libnm-core/nm-keyfile.c:428
- #, c-format
- msgid "unexpected character '%c' for address %s: '%s' (position %td)"
- msgstr "アドレス %c の予期しない文字 '%s': '%s' (位置 %td)"
-
--#: ../libnm-core/nm-keyfile.c:437
-+#: ../libnm-core/nm-keyfile.c:438
- #, c-format
- msgid "unexpected character '%c' for %s: '%s' (position %td)"
- msgstr "%c の予期しない文字 '%s': '%s' (位置 %td)"
-
--#: ../libnm-core/nm-keyfile.c:446
-+#: ../libnm-core/nm-keyfile.c:447
- #, c-format
- msgid "unexpected character '%c' in prefix length for %s: '%s' (position %td)"
- msgstr "%c の予期しないプレフィックス長の文字 '%s': '%s' (位置 %td)"
-
--#: ../libnm-core/nm-keyfile.c:457
-+#: ../libnm-core/nm-keyfile.c:458
- #, c-format
- msgid "garbage at the end of value %s: '%s'"
- msgstr "値 %s の後のガベッジ: '%s'"
-
--#: ../libnm-core/nm-keyfile.c:463
-+#: ../libnm-core/nm-keyfile.c:464
- #, c-format
- msgid "deprecated semicolon at the end of value %s: '%s'"
- msgstr "値 %s の後の非推奨のセミコロン: '%s'"
-
--#: ../libnm-core/nm-keyfile.c:478
-+#: ../libnm-core/nm-keyfile.c:479
- #, c-format
- msgid "invalid prefix length for %s '%s', defaulting to %d"
- msgstr "%s '%s' の無効なプレフィックス長 (デフォルト値は %d)"
-
--#: ../libnm-core/nm-keyfile.c:485
-+#: ../libnm-core/nm-keyfile.c:486
- #, c-format
- msgid "missing prefix length for %s '%s', defaulting to %d"
- msgstr "%s '%s' の不明なプレフィックス長 (デフォルト値は %d)"
-
--#: ../libnm-core/nm-keyfile.c:748
-+#: ../libnm-core/nm-keyfile.c:814 ../libnm-core/nm-setting-user.c:374
-+#, c-format
-+msgid "invalid value for \"%s\": %s"
-+msgstr "'%s' の無効な値: %s"
-+
-+#: ../libnm-core/nm-keyfile.c:852
- #, c-format
- msgid "ignoring invalid DNS server IPv%c address '%s'"
- msgstr "無効な DNS サーバー IPv%c アドレス '%s' を無視"
-
--#: ../libnm-core/nm-keyfile.c:844 ../libnm-core/nm-keyfile.c:2734
-+#: ../libnm-core/nm-keyfile.c:948 ../libnm-core/nm-keyfile.c:2997
- #, c-format
- msgid "ignoring invalid byte element '%d' (not between 0 and 255 inclusive)"
- msgstr "無効なバイト要素 '%d' (0〜255 以外) を無視"
-
--#: ../libnm-core/nm-keyfile.c:855
-+#: ../libnm-core/nm-keyfile.c:959
- msgid "ignoring invalid MAC address"
- msgstr "有効な MAC アドレスを無視"
-
--#: ../libnm-core/nm-keyfile.c:1105
-+#: ../libnm-core/nm-keyfile.c:1209
- msgid "ignoring invalid SSID"
- msgstr "無効な SSID を無視"
-
--#: ../libnm-core/nm-keyfile.c:1121
-+#: ../libnm-core/nm-keyfile.c:1225
- msgid "ignoring invalid raw password"
- msgstr "無効な生パスワードを無視"
-
--#: ../libnm-core/nm-keyfile.c:1258
-+#: ../libnm-core/nm-keyfile.c:1362
- msgid "invalid key/cert value"
- msgstr "無効なキー/証明書値"
-
--#: ../libnm-core/nm-keyfile.c:1269
-+#: ../libnm-core/nm-keyfile.c:1373
- #, c-format
- msgid "invalid key/cert value path \"%s\""
- msgstr "無効なキー/証明書値パス \"%s\""
-
--#: ../libnm-core/nm-keyfile.c:1285 ../libnm-core/nm-keyfile.c:1368
-+#: ../libnm-core/nm-keyfile.c:1389 ../libnm-core/nm-keyfile.c:1472
- #, c-format
- msgid "certificate or key file '%s' does not exist"
- msgstr "証明書またはキーファイル '%s' が存在しません"
-
--#: ../libnm-core/nm-keyfile.c:1294
-+#: ../libnm-core/nm-keyfile.c:1398
- #, c-format
- msgid "invalid PKCS#11 URI \"%s\""
- msgstr "無効な PKCS#11 URI \"%s\""
-
--#: ../libnm-core/nm-keyfile.c:1338
-+#: ../libnm-core/nm-keyfile.c:1442
- msgid "invalid key/cert value data:;base64, is not base64"
- msgstr "無効なキー/証明書値 data:;base64, が base64 ではありません"
-
--#: ../libnm-core/nm-keyfile.c:1347
-+#: ../libnm-core/nm-keyfile.c:1451
- msgid "invalid key/cert value data:;base64,file://"
- msgstr "無効なキー/証明書値 data:;base64,file://"
-
--#: ../libnm-core/nm-keyfile.c:1380
-+#: ../libnm-core/nm-keyfile.c:1484
- msgid "invalid key/cert value is not a valid blob"
- msgstr "無効なキー/証明書値は、有効なブロブではありません"
-
--#: ../libnm-core/nm-keyfile.c:1482
-+#: ../libnm-core/nm-keyfile.c:1586
- #, c-format
- msgid "invalid parity value '%s'"
- msgstr "無効なパリティー値 '%s'"
-
--#: ../libnm-core/nm-keyfile.c:1499 ../libnm-core/nm-keyfile.c:2789
-+#: ../libnm-core/nm-keyfile.c:1603 ../libnm-core/nm-keyfile.c:3052
- #, fuzzy, c-format
- msgid "invalid setting: %s"
- msgstr "無効な設定名 '%s'"
-
--#: ../libnm-core/nm-keyfile.c:1514
-+#: ../libnm-core/nm-keyfile.c:1618
- #, c-format
- msgid "ignoring invalid team configuration: %s"
- msgstr "無効な team 設定を無視: %s"
-
--#: ../libnm-core/nm-keyfile.c:1557
-+#: ../libnm-core/nm-keyfile.c:1698
- #, c-format
- msgid "invalid qdisc: %s"
- msgstr "無効な qdisc: %s"
-
--#: ../libnm-core/nm-keyfile.c:1605
-+#: ../libnm-core/nm-keyfile.c:1744
- #, c-format
- msgid "invalid tfilter: %s"
- msgstr "無効な tfilter: %s"
-
--#: ../libnm-core/nm-keyfile.c:2634
-+#: ../libnm-core/nm-keyfile.c:2896
- #, c-format
- msgid "error loading setting value: %s"
- msgstr "設定値のロード中にエラーが発生しました: %s"
-
--#: ../libnm-core/nm-keyfile.c:2661 ../libnm-core/nm-keyfile.c:2672
--#: ../libnm-core/nm-keyfile.c:2690 ../libnm-core/nm-keyfile.c:2701
--#: ../libnm-core/nm-keyfile.c:2712 ../libnm-core/nm-keyfile.c:2764
--#: ../libnm-core/nm-keyfile.c:2775
-+#: ../libnm-core/nm-keyfile.c:2924 ../libnm-core/nm-keyfile.c:2935
-+#: ../libnm-core/nm-keyfile.c:2953 ../libnm-core/nm-keyfile.c:2964
-+#: ../libnm-core/nm-keyfile.c:2975 ../libnm-core/nm-keyfile.c:3027
-+#: ../libnm-core/nm-keyfile.c:3038
- msgid "value cannot be interpreted as integer"
- msgstr ""
-
--#: ../libnm-core/nm-keyfile.c:2810
-+#: ../libnm-core/nm-keyfile.c:3073
- #, c-format
- msgid "invalid setting name '%s'"
- msgstr "無効な設定名 '%s'"
-
--#: ../libnm-core/nm-keyfile.c:2855
-+#: ../libnm-core/nm-keyfile.c:3118
- #, c-format
- msgid "invalid key '%s.%s'"
- msgstr "無効なキー '%s.%s'"
-
--#: ../libnm-core/nm-keyfile.c:2870
-+#: ../libnm-core/nm-keyfile.c:3133
- #, c-format
- msgid "key '%s.%s' is not boolean"
- msgstr "キー '%s.%s' はブール値ではありません"
-
--#: ../libnm-core/nm-setting-6lowpan.c:104
-+#: ../libnm-core/nm-keyfile.c:3190
-+#, fuzzy, c-format
-+msgid "invalid peer public key in section '%s'"
-+msgstr "無効なオプション '%s'"
-+
-+#: ../libnm-core/nm-keyfile.c:3202
-+#, c-format
-+msgid "key '%s.%s' is not a valid 256 bit key in base64 encoding"
-+msgstr ""
-+
-+#: ../libnm-core/nm-keyfile.c:3215
-+#, fuzzy, c-format
-+msgid "key '%s.%s' is not a valid secret flag"
-+msgstr "'%s' は有効な DCB フラグではありません"
-+
-+#: ../libnm-core/nm-keyfile.c:3227
-+#, fuzzy, c-format
-+msgid "key '%s.%s' is not a integer in range 0 to 2^32"
-+msgstr "'%s' は、[%lli, %lli] の範囲外です"
-+
-+#: ../libnm-core/nm-keyfile.c:3239
-+#, fuzzy, c-format
-+msgid "key '%s.%s' is not a valid endpoint"
-+msgstr "'%s' は有効ではありません。"
-+
-+#: ../libnm-core/nm-keyfile.c:3261
-+#, c-format
-+msgid "key '%s.%s' has invalid allowed-ips"
-+msgstr ""
-+
-+#: ../libnm-core/nm-keyfile.c:3273
-+#, fuzzy, c-format
-+msgid "peer '%s' is invalid: %s"
-+msgstr "'%s' は無効です"
-+
-+#: ../libnm-core/nm-setting-6lowpan.c:93
- #, c-format
- msgid "property is not specified"
- msgstr "プロパティーは指定されていません"
-
--#: ../libnm-core/nm-setting-6lowpan.c:126 ../libnm-core/nm-setting-macsec.c:314
--#: ../libnm-core/nm-setting-vlan.c:632 ../libnm-util/nm-setting-vlan.c:556
-+#: ../libnm-core/nm-setting-6lowpan.c:115 ../libnm-core/nm-setting-macsec.c:302
-+#: ../libnm-core/nm-setting-vlan.c:615 ../libnm-util/nm-setting-vlan.c:556
- #, c-format
- msgid "'%s' value doesn't match '%s=%s'"
- msgstr "'%s' の値は '%s=%s' と一致しません"
-
--#: ../libnm-core/nm-setting-6lowpan.c:137
--#: ../libnm-core/nm-setting-ip-tunnel.c:351
--#: ../libnm-core/nm-setting-macsec.c:325 ../libnm-core/nm-setting-macvlan.c:161
--#: ../libnm-core/nm-setting-vlan.c:643 ../libnm-core/nm-setting-vxlan.c:401
-+#: ../libnm-core/nm-setting-6lowpan.c:126
-+#: ../libnm-core/nm-setting-ip-tunnel.c:352
-+#: ../libnm-core/nm-setting-macsec.c:313 ../libnm-core/nm-setting-macvlan.c:143
-+#: ../libnm-core/nm-setting-vlan.c:626 ../libnm-core/nm-setting-vxlan.c:382
- #: ../libnm-util/nm-setting-vlan.c:567
- #, c-format
- msgid "'%s' is neither an UUID nor an interface name"
- msgstr "'%s' は UUID、インターフェース名のいずれでもありません"
-
--#: ../libnm-core/nm-setting-8021x.c:229
-+#: ../libnm-core/nm-setting-8021x.c:227
- msgid "binary data missing"
- msgstr "バイナリーデータがありません"
-
--#: ../libnm-core/nm-setting-8021x.c:257
-+#: ../libnm-core/nm-setting-8021x.c:255
- msgid "URI not NUL terminated"
- msgstr "URI が NUL でないため終了しました"
-
--#: ../libnm-core/nm-setting-8021x.c:266
-+#: ../libnm-core/nm-setting-8021x.c:264
- msgid "URI is empty"
- msgstr "URI が空です"
-
--#: ../libnm-core/nm-setting-8021x.c:274
-+#: ../libnm-core/nm-setting-8021x.c:272
- msgid "URI is not valid UTF-8"
- msgstr "URI が有効な UTF-8 ではありません"
-
--#: ../libnm-core/nm-setting-8021x.c:292
-+#: ../libnm-core/nm-setting-8021x.c:290
- msgid "data missing"
- msgstr "データがありません"
-
--#: ../libnm-core/nm-setting-8021x.c:315 ../libnm-core/nm-setting-8021x.c:682
-+#: ../libnm-core/nm-setting-8021x.c:313 ../libnm-core/nm-setting-8021x.c:680
- #, c-format
- msgid "certificate is invalid: %s"
- msgstr "証明書が無効です: %s"
-
--#: ../libnm-core/nm-setting-8021x.c:323
-+#: ../libnm-core/nm-setting-8021x.c:321
- #, c-format
- msgid "certificate detected as invalid scheme"
- msgstr "証明書が無効なスキームと検出されました"
-
--#: ../libnm-core/nm-setting-8021x.c:537 ../libnm-util/nm-setting-8021x.c:639
-+#: ../libnm-core/nm-setting-8021x.c:535 ../libnm-util/nm-setting-8021x.c:639
- msgid "CA certificate must be in X.509 format"
- msgstr "CA 証明書は X.509 形式である必要があります"
-
--#: ../libnm-core/nm-setting-8021x.c:553 ../libnm-util/nm-setting-8021x.c:957
-+#: ../libnm-core/nm-setting-8021x.c:551 ../libnm-util/nm-setting-8021x.c:957
- #: ../libnm-util/nm-setting-8021x.c:1220 ../libnm-util/nm-setting-8021x.c:1542
- msgid "invalid certificate format"
- msgstr "無効な証明書形式"
-
--#: ../libnm-core/nm-setting-8021x.c:692
-+#: ../libnm-core/nm-setting-8021x.c:690
- #, 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:2578 ../libnm-core/nm-setting-8021x.c:2595
--#: ../libnm-core/nm-setting-8021x.c:2626 ../libnm-core/nm-setting-8021x.c:2643
--#: ../libnm-core/nm-setting-8021x.c:2684 ../libnm-core/nm-setting-8021x.c:2696
--#: ../libnm-core/nm-setting-8021x.c:2714 ../libnm-core/nm-setting-8021x.c:2726
--#: ../libnm-core/nm-setting-8021x.c:2751 ../libnm-core/nm-setting-adsl.c:194
--#: ../libnm-core/nm-setting-cdma.c:164 ../libnm-core/nm-setting-cdma.c:173
--#: ../libnm-core/nm-setting-connection.c:954
--#: ../libnm-core/nm-setting-connection.c:1002
--#: ../libnm-core/nm-setting-gsm.c:299 ../libnm-core/nm-setting-gsm.c:356
--#: ../libnm-core/nm-setting-gsm.c:393 ../libnm-core/nm-setting-gsm.c:402
--#: ../libnm-core/nm-setting-ip-config.c:2499
--#: ../libnm-core/nm-setting-ip4-config.c:196
--#: ../libnm-core/nm-setting-ip4-config.c:203
--#: ../libnm-core/nm-setting-pppoe.c:166 ../libnm-core/nm-setting-pppoe.c:175
--#: ../libnm-core/nm-setting-vpn.c:559 ../libnm-core/nm-setting-vpn.c:569
--#: ../libnm-core/nm-setting-wimax.c:133
--#: ../libnm-core/nm-setting-wireless-security.c:948
--#: ../libnm-core/nm-setting-wireless-security.c:972
--#: ../libnm-core/nm-setting.c:1237 ../libnm-util/nm-setting-8021x.c:2331
-+#: ../libnm-core/nm-setting-8021x.c:2576 ../libnm-core/nm-setting-8021x.c:2593
-+#: ../libnm-core/nm-setting-8021x.c:2624 ../libnm-core/nm-setting-8021x.c:2641
-+#: ../libnm-core/nm-setting-8021x.c:2682 ../libnm-core/nm-setting-8021x.c:2694
-+#: ../libnm-core/nm-setting-8021x.c:2712 ../libnm-core/nm-setting-8021x.c:2724
-+#: ../libnm-core/nm-setting-8021x.c:2749 ../libnm-core/nm-setting-adsl.c:181
-+#: ../libnm-core/nm-setting-cdma.c:151 ../libnm-core/nm-setting-cdma.c:160
-+#: ../libnm-core/nm-setting-connection.c:938
-+#: ../libnm-core/nm-setting-connection.c:986 ../libnm-core/nm-setting-gsm.c:286
-+#: ../libnm-core/nm-setting-gsm.c:343 ../libnm-core/nm-setting-gsm.c:380
-+#: ../libnm-core/nm-setting-gsm.c:389 ../libnm-core/nm-setting-ip-config.c:4823
-+#: ../libnm-core/nm-setting-ip4-config.c:183
-+#: ../libnm-core/nm-setting-ip4-config.c:190
-+#: ../libnm-core/nm-setting-pppoe.c:153 ../libnm-core/nm-setting-pppoe.c:162
-+#: ../libnm-core/nm-setting-vpn.c:540 ../libnm-core/nm-setting-vpn.c:550
-+#: ../libnm-core/nm-setting-wimax.c:119
-+#: ../libnm-core/nm-setting-wireless-security.c:944
-+#: ../libnm-core/nm-setting-wireless-security.c:968
-+#: ../libnm-core/nm-setting.c:1278 ../libnm-util/nm-setting-8021x.c:2331
- #: ../libnm-util/nm-setting-8021x.c:2348 ../libnm-util/nm-setting-8021x.c:2389
- #: ../libnm-util/nm-setting-8021x.c:2406 ../libnm-util/nm-setting-8021x.c:2457
- #: ../libnm-util/nm-setting-8021x.c:2469 ../libnm-util/nm-setting-8021x.c:2487
-@@ -11156,45 +11200,44 @@ msgstr "証明書が PKCS#11 トークンにない場合は、パスワードは
- #: ../libnm-util/nm-setting-gsm.c:338 ../libnm-util/nm-setting-ip4-config.c:934
- #: ../libnm-util/nm-setting-ip4-config.c:943
- #: ../libnm-util/nm-setting-pppoe.c:169 ../libnm-util/nm-setting-pppoe.c:178
--#: ../libnm-util/nm-setting-vpn.c:431 ../libnm-util/nm-setting-vpn.c:441
-+#: ../libnm-util/nm-setting-vpn.c:430 ../libnm-util/nm-setting-vpn.c:440
- #: ../libnm-util/nm-setting-wimax.c:158
- #: ../libnm-util/nm-setting-wireless-security.c:920
- #: ../libnm-util/nm-setting-wireless-security.c:944
- msgid "property is empty"
- msgstr "プロパティーが空です"
-
--#: ../libnm-core/nm-setting-8021x.c:2608 ../libnm-core/nm-setting-8021x.c:2656
-+#: ../libnm-core/nm-setting-8021x.c:2606 ../libnm-core/nm-setting-8021x.c:2654
- #: ../libnm-util/nm-setting-8021x.c:2359 ../libnm-util/nm-setting-8021x.c:2371
- #: ../libnm-util/nm-setting-8021x.c:2417 ../libnm-util/nm-setting-8021x.c:2429
- #, c-format
- msgid "has to match '%s' property for PKCS#12"
- msgstr "PKCS#12 の '%s' プロパティーと一致しなければなりません"
-
--#: ../libnm-core/nm-setting-8021x.c:2835
--#: ../libnm-core/nm-setting-bluetooth.c:121
--#: ../libnm-core/nm-setting-infiniband.c:190
--#: ../libnm-core/nm-setting-infiniband.c:205
--#: ../libnm-core/nm-setting-ip4-config.c:187
--#: ../libnm-core/nm-setting-ip6-config.c:235
--#: ../libnm-core/nm-setting-ip6-config.c:246
--#: ../libnm-core/nm-setting-olpc-mesh.c:147
--#: ../libnm-core/nm-setting-wimax.c:142 ../libnm-core/nm-setting-wired.c:676
--#: ../libnm-core/nm-setting-wired.c:686
--#: ../libnm-core/nm-setting-wireless-security.c:991
--#: ../libnm-core/nm-setting-wireless-security.c:1000
--#: ../libnm-core/nm-setting-wireless-security.c:1009
--#: ../libnm-core/nm-setting-wireless-security.c:1045
--#: ../libnm-core/nm-setting-wireless-security.c:1055
--#: ../libnm-core/nm-setting-wireless-security.c:1078
--#: ../libnm-core/nm-setting-wireless-security.c:1103
--#: ../libnm-core/nm-setting-wireless-security.c:1130
--#: ../libnm-core/nm-setting-wireless-security.c:1169
--#: ../libnm-core/nm-setting-wireless.c:811
--#: ../libnm-core/nm-setting-wireless.c:820
--#: ../libnm-core/nm-setting-wireless.c:831 ../libnm-core/nm-setting-wpan.c:173
--#: ../libnm-util/nm-setting.c:1365 ../libnm-util/nm-setting.c:1383
--#: ../libnm-util/nm-setting.c:1402 ../libnm-util/nm-setting-8021x.c:2652
--#: ../libnm-util/nm-setting-8021x.c:2686
-+#: ../libnm-core/nm-setting-8021x.c:2833
-+#: ../libnm-core/nm-setting-bluetooth.c:110
-+#: ../libnm-core/nm-setting-infiniband.c:178
-+#: ../libnm-core/nm-setting-infiniband.c:188
-+#: ../libnm-core/nm-setting-ip4-config.c:174
-+#: ../libnm-core/nm-setting-ip6-config.c:222
-+#: ../libnm-core/nm-setting-ip6-config.c:233
-+#: ../libnm-core/nm-setting-olpc-mesh.c:128
-+#: ../libnm-core/nm-setting-wifi-p2p.c:145 ../libnm-core/nm-setting-wimax.c:128
-+#: ../libnm-core/nm-setting-wired.c:660 ../libnm-core/nm-setting-wired.c:670
-+#: ../libnm-core/nm-setting-wireless-security.c:987
-+#: ../libnm-core/nm-setting-wireless-security.c:996
-+#: ../libnm-core/nm-setting-wireless-security.c:1005
-+#: ../libnm-core/nm-setting-wireless-security.c:1041
-+#: ../libnm-core/nm-setting-wireless-security.c:1051
-+#: ../libnm-core/nm-setting-wireless-security.c:1074
-+#: ../libnm-core/nm-setting-wireless-security.c:1112
-+#: ../libnm-core/nm-setting-wireless-security.c:1153
-+#: ../libnm-core/nm-setting-wireless.c:798
-+#: ../libnm-core/nm-setting-wireless.c:807
-+#: ../libnm-core/nm-setting-wireless.c:818 ../libnm-core/nm-setting-wpan.c:176
-+#: ../libnm-core/nm-utils.c:4509 ../libnm-util/nm-setting.c:1365
-+#: ../libnm-util/nm-setting.c:1383 ../libnm-util/nm-setting.c:1402
-+#: ../libnm-util/nm-setting-8021x.c:2652 ../libnm-util/nm-setting-8021x.c:2686
- #: ../libnm-util/nm-setting-bluetooth.c:150
- #: ../libnm-util/nm-setting-infiniband.c:205
- #: ../libnm-util/nm-setting-infiniband.c:221
-@@ -11214,11 +11257,11 @@ msgstr "PKCS#12 の '%s' プロパティーと一致しなければなりませ
- msgid "property is invalid"
- msgstr "プロパティーが無効です"
-
--#: ../libnm-core/nm-setting-8021x.c:2862 ../libnm-core/nm-setting-8021x.c:2874
--#: ../libnm-core/nm-setting-8021x.c:2888 ../libnm-core/nm-setting-8021x.c:2915
--#: ../libnm-core/nm-setting-8021x.c:2930 ../libnm-core/nm-setting-adsl.c:206
--#: ../libnm-core/nm-setting-adsl.c:218 ../libnm-core/nm-setting-bluetooth.c:149
--#: ../libnm-core/nm-setting-wireless-security.c:927
-+#: ../libnm-core/nm-setting-8021x.c:2860 ../libnm-core/nm-setting-8021x.c:2872
-+#: ../libnm-core/nm-setting-8021x.c:2886 ../libnm-core/nm-setting-8021x.c:2913
-+#: ../libnm-core/nm-setting-8021x.c:2928 ../libnm-core/nm-setting-adsl.c:193
-+#: ../libnm-core/nm-setting-adsl.c:205 ../libnm-core/nm-setting-bluetooth.c:138
-+#: ../libnm-core/nm-setting-wireless-security.c:923
- #: ../libnm-util/nm-setting-8021x.c:2711 ../libnm-util/nm-setting-8021x.c:2721
- #: ../libnm-util/nm-setting-8021x.c:2731 ../libnm-util/nm-setting-8021x.c:2741
- #: ../libnm-util/nm-setting-8021x.c:2751 ../libnm-util/nm-setting-adsl.c:228
-@@ -11228,112 +11271,112 @@ msgstr "プロパティーが無効です"
- msgid "'%s' is not a valid value for the property"
- msgstr "'%s' はプロパティーの有効な値ではありません"
-
--#: ../libnm-core/nm-setting-8021x.c:2898
-+#: ../libnm-core/nm-setting-8021x.c:2896
- msgid "invalid auth flags"
- msgstr "無効な auth フラグ"
-
--#: ../libnm-core/nm-setting-bluetooth.c:171
-+#: ../libnm-core/nm-setting-bluetooth.c:160
- #, c-format
- msgid "'%s' connection requires '%s' or '%s' setting"
- msgstr "'%s' 接続には '%s' または '%s' 設定が必要です"
-
--#: ../libnm-core/nm-setting-bluetooth.c:217
-+#: ../libnm-core/nm-setting-bluetooth.c:206
- #, c-format
- msgid "'%s' connection requires '%s' setting"
- msgstr "'%s' 接続には '%s' 設定が必要です"
-
--#: ../libnm-core/nm-setting-bond.c:564 ../libnm-util/nm-setting-bond.c:516
-+#: ../libnm-core/nm-setting-bond.c:556 ../libnm-util/nm-setting-bond.c:515
- #, c-format
- msgid "invalid option '%s' or its value '%s'"
- msgstr "無効なオプション '%s'、またはその値 '%s' です"
-
--#: ../libnm-core/nm-setting-bond.c:589 ../libnm-util/nm-setting-bond.c:535
-+#: ../libnm-core/nm-setting-bond.c:581 ../libnm-util/nm-setting-bond.c:534
- #, c-format
- msgid "only one of '%s' and '%s' can be set"
- msgstr "設定できるのは '%s' と '%s' の一つのみです"
-
--#: ../libnm-core/nm-setting-bond.c:602 ../libnm-util/nm-setting-bond.c:546
-+#: ../libnm-core/nm-setting-bond.c:594 ../libnm-util/nm-setting-bond.c:545
- #, c-format
- msgid "mandatory option '%s' is missing"
- msgstr "必須オプションの '%s' がありません"
-
--#: ../libnm-core/nm-setting-bond.c:612 ../libnm-util/nm-setting-bond.c:555
-+#: ../libnm-core/nm-setting-bond.c:604 ../libnm-util/nm-setting-bond.c:554
- #, c-format
- msgid "'%s' is not a valid value for '%s'"
- msgstr "'%s' は有効な '%s' の値ではありません"
-
--#: ../libnm-core/nm-setting-bond.c:626 ../libnm-util/nm-setting-bond.c:568
-+#: ../libnm-core/nm-setting-bond.c:618 ../libnm-util/nm-setting-bond.c:567
- #, c-format
- msgid "'%s=%s' is incompatible with '%s > 0'"
- msgstr "'%s=%s' は '%s > 0' とは互換性がありません"
-
--#: ../libnm-core/nm-setting-bond.c:641
-+#: ../libnm-core/nm-setting-bond.c:633
- #, c-format
- msgid "'%s' is not valid for the '%s' option: %s"
- msgstr "'%s' は '%s' オプションに無効です: %s"
-
--#: ../libnm-core/nm-setting-bond.c:652 ../libnm-util/nm-setting-bond.c:591
-+#: ../libnm-core/nm-setting-bond.c:644 ../libnm-util/nm-setting-bond.c:590
- #, c-format
- msgid "'%s' option is only valid for '%s=%s'"
- msgstr "'%s' オプションは '%s=%s' の場合に限り有効です"
-
--#: ../libnm-core/nm-setting-bond.c:665 ../libnm-util/nm-setting-bond.c:604
-+#: ../libnm-core/nm-setting-bond.c:657 ../libnm-util/nm-setting-bond.c:603
- #, c-format
- msgid "'%s=%s' is not a valid configuration for '%s'"
- msgstr "'%s=%s' は '%s' の有効な設定ではありません"
-
--#: ../libnm-core/nm-setting-bond.c:678 ../libnm-core/nm-setting-bond.c:687
--#: ../libnm-core/nm-setting-bond.c:707 ../libnm-core/nm-setting-bond.c:743
--#: ../libnm-util/nm-setting-bond.c:617 ../libnm-util/nm-setting-bond.c:626
--#: ../libnm-util/nm-setting-bond.c:646 ../libnm-util/nm-setting-bond.c:682
-+#: ../libnm-core/nm-setting-bond.c:670 ../libnm-core/nm-setting-bond.c:679
-+#: ../libnm-core/nm-setting-bond.c:699 ../libnm-core/nm-setting-bond.c:735
-+#: ../libnm-util/nm-setting-bond.c:616 ../libnm-util/nm-setting-bond.c:625
-+#: ../libnm-util/nm-setting-bond.c:645 ../libnm-util/nm-setting-bond.c:681
- #, c-format
- msgid "'%s' option requires '%s' option to be set"
- msgstr ""
- "'%s' オプションを使用する場合は、'%s' オプションを設定する必要があります"
-
--#: ../libnm-core/nm-setting-bond.c:718 ../libnm-util/nm-setting-bond.c:657
-+#: ../libnm-core/nm-setting-bond.c:710 ../libnm-util/nm-setting-bond.c:656
- #, c-format
- msgid "'%s' option is empty"
- msgstr "'%s' オプションが空白です"
-
--#: ../libnm-core/nm-setting-bond.c:730 ../libnm-util/nm-setting-bond.c:669
-+#: ../libnm-core/nm-setting-bond.c:722 ../libnm-util/nm-setting-bond.c:668
- #, c-format
- msgid "'%s' is not a valid IPv4 address for '%s' option"
- msgstr "'%s' は '%s' オプション用の有効な IPv4 アドレスではありません"
-
--#: ../libnm-core/nm-setting-bond.c:758 ../libnm-util/nm-setting-bond.c:696
-+#: ../libnm-core/nm-setting-bond.c:750 ../libnm-util/nm-setting-bond.c:695
- #, c-format
- msgid "'%s' option is only valid with mode '%s'"
- msgstr "'%s' オプションはモード '%s' でのみ有効です"
-
--#: ../libnm-core/nm-setting-bond.c:769
-+#: ../libnm-core/nm-setting-bond.c:761
- #, c-format
- msgid "'%s' and '%s' cannot have different values"
- msgstr "'%s' と '%s' の値は同じである必要があります"
-
--#: ../libnm-core/nm-setting-bond.c:785
-+#: ../libnm-core/nm-setting-bond.c:777
- #, c-format
- msgid "'%s' option should be string"
- msgstr "'%s' オプションは文字列である必要があります"
-
--#: ../libnm-core/nm-setting-bond.c:801
-+#: ../libnm-core/nm-setting-bond.c:793
- #, c-format
- msgid "'%s' option is not valid with mode '%s'"
- msgstr "'%s' オプションは、'%s' モードでは有効ではありません。"
-
--#: ../libnm-core/nm-setting-bridge-port.c:125
-+#: ../libnm-core/nm-setting-bridge-port.c:317
-+#: ../libnm-core/nm-setting-ovs-bridge.c:150
- #: ../libnm-core/nm-setting-ovs-interface.c:259
- #: ../libnm-core/nm-setting-ovs-port.c:187
--#: ../libnm-core/nm-setting-ovs-bridge.c:150
--#: ../libnm-core/nm-setting-team-port.c:357
-+#: ../libnm-core/nm-setting-team-port.c:343
- #, c-format
- msgid "missing setting"
- msgstr "不明な設定"
-
--#: ../libnm-core/nm-setting-bridge-port.c:136
-+#: ../libnm-core/nm-setting-bridge-port.c:328
- #: ../libnm-core/nm-setting-ovs-interface.c:280
- #: ../libnm-core/nm-setting-ovs-port.c:208
--#: ../libnm-core/nm-setting-team-port.c:368
-+#: ../libnm-core/nm-setting-team-port.c:354
- #, c-format
- msgid ""
- "A connection with a '%s' setting must have the slave-type set to '%s'. "
-@@ -11342,84 +11385,84 @@ msgstr ""
- "'%s' 設定の接続では、スレーブタイプは '%s' に設定する必要がありますが、'%s' "
- "に設定されています。"
-
--#: ../libnm-core/nm-setting-bridge.c:229 ../libnm-util/nm-setting-bridge.c:268
-+#: ../libnm-core/nm-setting-bridge.c:912 ../libnm-util/nm-setting-bridge.c:268
- #, c-format
- msgid "value '%d' is out of range <%d-%d>"
- msgstr "値 '%d' は <%d-%d> の範囲外です"
-
--#: ../libnm-core/nm-setting-bridge.c:246 ../libnm-core/nm-setting-wired.c:650
--#: ../libnm-core/nm-setting-wired.c:712 ../libnm-core/nm-setting-wired.c:754
-+#: ../libnm-core/nm-setting-bridge.c:929 ../libnm-core/nm-setting-wired.c:634
-+#: ../libnm-core/nm-setting-wired.c:696 ../libnm-core/nm-setting-wired.c:738
- #: ../libnm-util/nm-setting-bridge.c:285 ../libnm-util/nm-setting-wired.c:632
- #: ../libnm-util/nm-setting-wired.c:690
- msgid "is not a valid MAC address"
- msgstr "は有効な MAC アドレスではありません"
-
--#: ../libnm-core/nm-setting-bridge.c:287
-+#: ../libnm-core/nm-setting-bridge.c:970
- 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:924
-+#: ../libnm-core/nm-setting-connection.c:908
- #, c-format
- msgid "setting required for connection of type '%s'"
- msgstr "タイプ '%s' の接続には設定が必要です"
-
--#: ../libnm-core/nm-setting-connection.c:963
-+#: ../libnm-core/nm-setting-connection.c:947
- #: ../libnm-util/nm-setting-connection.c:788
- #, c-format
- msgid "'%s' is not a valid UUID"
- msgstr "'%s' は有効な UUID ではありません"
-
--#: ../libnm-core/nm-setting-connection.c:1013
-+#: ../libnm-core/nm-setting-connection.c:997
- #, c-format
- msgid "connection type '%s' is not valid"
- msgstr "接続タイプ '%s' は無効です"
-
--#: ../libnm-core/nm-setting-connection.c:1049
-+#: ../libnm-core/nm-setting-connection.c:1033
- #: ../libnm-util/nm-setting-connection.c:874
- #, c-format
- msgid "Unknown slave type '%s'"
- msgstr "不明なスレーブタイプ '%s'"
-
--#: ../libnm-core/nm-setting-connection.c:1060
-+#: ../libnm-core/nm-setting-connection.c:1044
- #: ../libnm-util/nm-setting-connection.c:884
- #, c-format
- msgid "Slave connections need a valid '%s' property"
- msgstr "スレーブ接続には有効な '%s' プロパティーが必要です"
-
--#: ../libnm-core/nm-setting-connection.c:1081
-+#: ../libnm-core/nm-setting-connection.c:1065
- #: ../libnm-util/nm-setting-connection.c:894
- #, c-format
- msgid "Cannot set '%s' without '%s'"
- msgstr "'%s' を '%s' なしで設定できません"
-
--#: ../libnm-core/nm-setting-connection.c:1095
-+#: ../libnm-core/nm-setting-connection.c:1079
- #, c-format
- msgid "'%s' connections must be enslaved to '%s', not '%s'"
- msgstr "'%s' 接続は、'%s' ではなく '%s' にスレーブ化される必要があります"
-
--#: ../libnm-core/nm-setting-connection.c:1109
-+#: ../libnm-core/nm-setting-connection.c:1093
- #, c-format
- msgid "metered value %d is not valid"
- msgstr "測定値 %d は無効です"
-
--#: ../libnm-core/nm-setting-connection.c:1120
--#: ../libnm-core/nm-setting-connection.c:1131
--#: ../libnm-core/nm-setting-connection.c:1144
-+#: ../libnm-core/nm-setting-connection.c:1104
-+#: ../libnm-core/nm-setting-connection.c:1115
-+#: ../libnm-core/nm-setting-connection.c:1128
- #, c-format
- msgid "value %d is not valid"
- msgstr "値 %d は無効です"
-
--#: ../libnm-core/nm-setting-connection.c:1165
-+#: ../libnm-core/nm-setting-connection.c:1149
- #, c-format
- msgid "property type should be set to '%s'"
- msgstr "プロパティータイプは '%s' に設定する必要があります"
-
--#: ../libnm-core/nm-setting-connection.c:1180
-+#: ../libnm-core/nm-setting-connection.c:1164
- #, c-format
- msgid "slave-type '%s' requires a '%s' setting in the connection"
- msgstr "スレーブタイプ '%s' の接続には '%s' 設定が必要です"
-
--#: ../libnm-core/nm-setting-connection.c:1190
-+#: ../libnm-core/nm-setting-connection.c:1174
- #, c-format
- msgid ""
- "Detect a slave connection with '%s' set and a port type '%s'. '%s' should be "
-@@ -11428,38 +11471,38 @@ msgstr ""
- "'%s' が設定され、ポートタイプが '%s' のスレーブ接続を検出します。'%s' は "
- "'%s' に設定する必要があります"
-
--#: ../libnm-core/nm-setting-connection.c:1207
-+#: ../libnm-core/nm-setting-connection.c:1191
- #, 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:520 ../libnm-util/nm-setting-dcb.c:593
-+#: ../libnm-core/nm-setting-dcb.c:508 ../libnm-util/nm-setting-dcb.c:593
- msgid "flags invalid"
- msgstr "フラグは無効です"
-
--#: ../libnm-core/nm-setting-dcb.c:529 ../libnm-util/nm-setting-dcb.c:602
-+#: ../libnm-core/nm-setting-dcb.c:517 ../libnm-util/nm-setting-dcb.c:602
- msgid "flags invalid - disabled"
- msgstr "フラグは無効です - 無効"
-
--#: ../libnm-core/nm-setting-dcb.c:555 ../libnm-core/nm-setting-dcb.c:604
-+#: ../libnm-core/nm-setting-dcb.c:543 ../libnm-core/nm-setting-dcb.c:592
- #: ../libnm-util/nm-setting-dcb.c:628 ../libnm-util/nm-setting-dcb.c:677
- msgid "property invalid (not enabled)"
- msgstr "プロパティーは無効です (有効になっていません)"
-
--#: ../libnm-core/nm-setting-dcb.c:564 ../libnm-util/nm-setting-dcb.c:637
-+#: ../libnm-core/nm-setting-dcb.c:552 ../libnm-util/nm-setting-dcb.c:637
- msgid "element invalid"
- msgstr "エレメントは無効です"
-
--#: ../libnm-core/nm-setting-dcb.c:579 ../libnm-util/nm-setting-dcb.c:652
-+#: ../libnm-core/nm-setting-dcb.c:567 ../libnm-util/nm-setting-dcb.c:652
- msgid "sum not 100%"
- msgstr "合計が 100% ではありません"
-
--#: ../libnm-core/nm-setting-dcb.c:613 ../libnm-core/nm-setting-dcb.c:645
-+#: ../libnm-core/nm-setting-dcb.c:601 ../libnm-core/nm-setting-dcb.c:633
- #: ../libnm-util/nm-setting-dcb.c:686 ../libnm-util/nm-setting-dcb.c:718
- msgid "property invalid"
- msgstr "プロパティーは無効です"
-
--#: ../libnm-core/nm-setting-dcb.c:635 ../libnm-util/nm-setting-dcb.c:708
-+#: ../libnm-core/nm-setting-dcb.c:623 ../libnm-util/nm-setting-dcb.c:708
- msgid "property missing"
- msgstr "プロパティーがありません"
-
-@@ -11476,45 +11519,45 @@ msgstr "オフロード機能には、無効のバリアントタイプがあり
- msgid "unknown ethtool option '%s'"
- msgstr "不明な ethtool オプション '%s'"
-
--#: ../libnm-core/nm-setting-gsm.c:312 ../libnm-util/nm-setting-gsm.c:294
-+#: ../libnm-core/nm-setting-gsm.c:299 ../libnm-util/nm-setting-gsm.c:294
- #, c-format
- msgid "property value '%s' is empty or too long (>64)"
- msgstr "プロパティー値 '%s' が空白、または長過ぎます (>64)"
-
--#: ../libnm-core/nm-setting-gsm.c:344 ../libnm-util/nm-setting-gsm.c:326
-+#: ../libnm-core/nm-setting-gsm.c:331 ../libnm-util/nm-setting-gsm.c:326
- #, c-format
- msgid "'%s' contains invalid char(s) (use [A-Za-z._-])"
- msgstr "'%s' に無効な文字が含まれています ([A-Za-z._-] を使用してください)"
-
--#: ../libnm-core/nm-setting-gsm.c:370 ../libnm-util/nm-setting-gsm.c:352
-+#: ../libnm-core/nm-setting-gsm.c:357 ../libnm-util/nm-setting-gsm.c:352
- #, c-format
- msgid "'%s' length is invalid (should be 5 or 6 digits)"
- msgstr "'%s' の長さは無効です (5 桁または 6 桁にしてください)"
-
--#: ../libnm-core/nm-setting-gsm.c:381 ../libnm-util/nm-setting-gsm.c:363
-+#: ../libnm-core/nm-setting-gsm.c:368 ../libnm-util/nm-setting-gsm.c:363
- #, c-format
- msgid "'%s' is not a number"
- msgstr "'%s' は数字ではありません"
-
--#: ../libnm-core/nm-setting-gsm.c:415
-+#: ../libnm-core/nm-setting-gsm.c:402
- msgid "property is empty or wrong size"
- msgstr "プロパティーが空、または間違ったサイズです"
-
--#: ../libnm-core/nm-setting-gsm.c:425
-+#: ../libnm-core/nm-setting-gsm.c:412
- msgid "property must contain only digits"
- msgstr "プロパティーには数字のみ含めることができます"
-
--#: ../libnm-core/nm-setting-infiniband.c:226
-+#: ../libnm-core/nm-setting-infiniband.c:209
- #: ../libnm-util/nm-setting-infiniband.c:239
- msgid "Must specify a P_Key if specifying parent"
- msgstr "親を指定している場合は P_Key を指定する必要があります"
-
--#: ../libnm-core/nm-setting-infiniband.c:236
-+#: ../libnm-core/nm-setting-infiniband.c:219
- #: ../libnm-util/nm-setting-infiniband.c:249
- msgid "InfiniBand P_Key connection did not specify parent interface name"
- msgstr "InfiniBand P_Key 接続で親インターフェース名が指定されていませんでした"
-
--#: ../libnm-core/nm-setting-infiniband.c:274
-+#: ../libnm-core/nm-setting-infiniband.c:257
- #: ../libnm-util/nm-setting-infiniband.c:285
- #, c-format
- msgid ""
-@@ -11524,143 +11567,348 @@ msgstr ""
- "ソフトウェア infiniband デバイスのインターフェース名は '%s' であるか、未設定"
- "である必要があります (実際には '%s')"
-
--#: ../libnm-core/nm-setting-infiniband.c:289
--#, c-format
--msgid "mtu for transport mode '%s' can be at most %d but it is %d"
-+#: ../libnm-core/nm-setting-infiniband.c:281
-+#, fuzzy, c-format
-+msgid "mtu can be at most %u but it is %u"
- msgstr ""
- "トランスポートモード '%s' の mtu は最大で %d にすることができますが、実際に"
- "は %d です"
-
--#: ../libnm-core/nm-setting-ip-config.c:133
-+#: ../libnm-core/nm-setting-ip-config.c:136
- #, c-format
- msgid "Missing IPv4 address"
- msgstr "不明な IPv4 アドレス"
-
--#: ../libnm-core/nm-setting-ip-config.c:133
-+#: ../libnm-core/nm-setting-ip-config.c:136
- #, c-format
- msgid "Missing IPv6 address"
- msgstr "不明な IPv6 アドレス"
-
--#: ../libnm-core/nm-setting-ip-config.c:138
-+#: ../libnm-core/nm-setting-ip-config.c:141
- #, c-format
- msgid "Invalid IPv4 address '%s'"
- msgstr "無効な IPv4 アドレス '%s'"
-
--#: ../libnm-core/nm-setting-ip-config.c:138
-+#: ../libnm-core/nm-setting-ip-config.c:141
- #, c-format
- msgid "Invalid IPv6 address '%s'"
- msgstr "無効な IPv6 アドレス '%s'"
-
--#: ../libnm-core/nm-setting-ip-config.c:153
-+#: ../libnm-core/nm-setting-ip-config.c:156
- #, c-format
- msgid "Invalid IPv4 address prefix '%u'"
- msgstr "無効な IPv4 アドレスプレフィックス '%u'"
-
--#: ../libnm-core/nm-setting-ip-config.c:153
-+#: ../libnm-core/nm-setting-ip-config.c:156
- #, c-format
- msgid "Invalid IPv6 address prefix '%u'"
- msgstr "無効な IPv6 アドレスプレフィックス '%u'"
-
--#: ../libnm-core/nm-setting-ip-config.c:168
-+#: ../libnm-core/nm-setting-ip-config.c:171
- #, c-format
- msgid "Invalid routing metric '%s'"
- msgstr "無効なルーティングメトリック '%s'"
-
--#: ../libnm-core/nm-setting-ip-config.c:1287
--#: ../libnm-core/nm-setting-sriov.c:421
-+#: ../libnm-core/nm-setting-ip-config.c:1289
-+#: ../libnm-core/nm-setting-sriov.c:418
- msgid "unknown attribute"
- msgstr "不明な属性"
-
--#: ../libnm-core/nm-setting-ip-config.c:1297
--#: ../libnm-core/nm-setting-sriov.c:431
-+#: ../libnm-core/nm-setting-ip-config.c:1299
-+#: ../libnm-core/nm-setting-sriov.c:428
- #, c-format
- msgid "invalid attribute type '%s'"
- msgstr "無効な属性タイプ '%s'"
-
--#: ../libnm-core/nm-setting-ip-config.c:1308
-+#: ../libnm-core/nm-setting-ip-config.c:1310
- #, 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:1311
- #, 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:1327
-+#: ../libnm-core/nm-setting-ip-config.c:1351
- #, 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:1328
-+#: ../libnm-core/nm-setting-ip-config.c:1352
- #, 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:1342
- #, c-format
- msgid "invalid prefix %s"
- msgstr "無効なプレフィックス %s"
-
--#: ../libnm-core/nm-setting-ip-config.c:2512
-+#: ../libnm-core/nm-setting-ip-config.c:2479
-+#, fuzzy
-+msgid "invalid priority"
-+msgstr "無効な優先度マップ '%s'"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2490
-+#, fuzzy
-+msgid "missing table"
-+msgstr "キーがみつかりません"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2496
-+#, fuzzy
-+msgid "invalid action"
-+msgstr "無効なアクション: "
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2503
-+msgid "has from/src but the prefix-length is zero"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2510
-+msgid "missing from/src for a non zero prefix-length"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2515
-+#, fuzzy
-+msgid "invalid from/src"
-+msgstr "無効なポート %d"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2520
-+#, fuzzy
-+msgid "invalid prefix length for from/src"
-+msgstr "%s '%s' の無効なプレフィックス長 (デフォルト値は %d)"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2527
-+msgid "has to/dst but the prefix-length is zero"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2534
-+msgid "missing to/dst for a non zero prefix-length"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2539
-+#, fuzzy
-+msgid "invalid to/dst"
-+msgstr "無効なポート %d"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2544
-+#, fuzzy
-+msgid "invalid prefix length for to/dst"
-+msgstr "%s '%s' の無効なプレフィックス長 (デフォルト値は %d)"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2552
-+#, fuzzy
-+msgid "invalid iifname"
-+msgstr "無効な値"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2560
-+#, fuzzy
-+msgid "invalid oifname"
-+msgstr "無効な値"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2566
-+#, fuzzy
-+msgid "invalid source port range"
-+msgstr "最小ソースポート数 [0]"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2572
-+#, fuzzy
-+msgid "invalid destination port range"
-+msgstr "無効なアクション: "
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2676
-+#, fuzzy, c-format
-+msgid "duplicate key %s"
-+msgstr "重複するプロパティー"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2690
-+#, fuzzy, c-format
-+msgid "invalid key \"%s\""
-+msgstr "無効なキー '%s': %s"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2703
-+#, fuzzy, c-format
-+msgid "invalid variant type '%s' for \"%s\""
-+msgstr "無効な属性タイプ '%s'"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2712
-+#, fuzzy
-+msgid "missing \""
-+msgstr "キーがみつかりません"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2718
-+#, fuzzy
-+msgid "invalid \""
-+msgstr "無効な DUID"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2909
-+#, fuzzy
-+msgid "Unsupported to-string-flags argument"
-+msgstr "サポートされていないオフロード機能"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2916
-+msgid "Unsupported extra-argument"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-ip-config.c:3161
-+#, fuzzy, c-format
-+msgid "unsupported key \"%s\""
-+msgstr "サポートされていない tfilter オプション: '%s'."
-+
-+#: ../libnm-core/nm-setting-ip-config.c:3166
-+#, fuzzy, c-format
-+msgid "duplicate key \"%s\""
-+msgstr "VF インデックス %u を複製します"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:3171
-+#, fuzzy, c-format
-+msgid "invalid value for \"%s\""
-+msgstr "'%s' の無効な値: %s"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:3181
-+msgid "empty text does not describe a rule"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-ip-config.c:3187
-+#, fuzzy, c-format
-+msgid "missing argument for \"%s\""
-+msgstr "ターゲットホストがありません"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:3199
-+#, fuzzy
-+msgid "invalid \"from\" part"
-+msgstr "無効なポート %d"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:3213
-+#, fuzzy
-+msgid "invalid \"to\" part"
-+msgstr "無効なポート %d"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:3222
-+#, c-format
-+msgid "cannot detect address family for rule"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-ip-config.c:3279
-+#: ../libnm-core/nm-setting-ip-config.c:3373
-+#, fuzzy, c-format
-+msgid "rule is invalid: %s"
-+msgstr "証明書が無効です: %s"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:3356
-+#, fuzzy
-+msgid "invalid address family"
-+msgstr "無効な IP アドレス: %s"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:4618
-+#, fuzzy, c-format
-+msgid "rule #%u is invalid: %s"
-+msgstr "証明書が無効です: %s"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:4836
- #, c-format
- msgid "%d. DNS server address is invalid"
- msgstr "%d. DNS サーバーアドレスは無効です"
-
--#: ../libnm-core/nm-setting-ip-config.c:2528
-+#: ../libnm-core/nm-setting-ip-config.c:4852
- #, c-format
- msgid "%d. IP address is invalid"
- msgstr "%d. IP アドレスは無効です"
-
--#: ../libnm-core/nm-setting-ip-config.c:2540
-+#: ../libnm-core/nm-setting-ip-config.c:4864
- #, c-format
- msgid "%d. IP address has 'label' property with invalid type"
- msgstr "%d. IP アドレスには、無効なタイプの 'label' プロパティーがあります"
-
--#: ../libnm-core/nm-setting-ip-config.c:2549
-+#: ../libnm-core/nm-setting-ip-config.c:4873
- #, c-format
- msgid "%d. IP address has invalid label '%s'"
- msgstr "%d. IP アドレスには、無効なラベル '%s' があります"
-
--#: ../libnm-core/nm-setting-ip-config.c:2563
-+#: ../libnm-core/nm-setting-ip-config.c:4887
- msgid "gateway cannot be set if there are no addresses configured"
- msgstr "アドレスが設定されない場合は、ゲートウェイを設定できません"
-
--#: ../libnm-core/nm-setting-ip-config.c:2572
-+#: ../libnm-core/nm-setting-ip-config.c:4896
- msgid "gateway is invalid"
- msgstr "ゲートウェイが無効です"
-
--#: ../libnm-core/nm-setting-ip-config.c:2586
-+#: ../libnm-core/nm-setting-ip-config.c:4910
- #, c-format
- msgid "%d. route is invalid"
- msgstr "%d. ルートは無効です"
-
--#: ../libnm-core/nm-setting-ip-config.c:2595
-+#: ../libnm-core/nm-setting-ip-config.c:4919
- #, c-format
- msgid "%d. route cannot be a default route"
- msgstr "%d. ルートをデフォルトルートにすることはできません"
-
--#: ../libnm-core/nm-setting-ip-config.c:2606
-+#: ../libnm-core/nm-setting-ip-config.c:4935
-+#, c-format
-+msgid "%u. rule has wrong address-family"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-ip-config.c:4944
-+#, fuzzy, c-format
-+msgid "%u. rule is invalid: %s"
-+msgstr "%d. ルートは無効です"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:4957
- #, c-format
- msgid "a gateway is incompatible with '%s'"
- msgstr "ゲートウェイは '%s' と互換性がありません"
-
--#: ../libnm-core/nm-setting-ip4-config.c:141
--#: ../libnm-core/nm-setting-ip6-config.c:187
-+#: ../libnm-core/nm-setting-ip-tunnel.c:340
-+#, c-format
-+msgid "'%d' is not a valid tunnel mode"
-+msgstr "'%d' は有効なトンネルモードではありません"
-+
-+#: ../libnm-core/nm-setting-ip-tunnel.c:363
-+#: ../libnm-core/nm-setting-ip-tunnel.c:383
-+#, c-format
-+msgid "'%s' is not a valid IPv%c address"
-+msgstr "'%s' は有効な IPv%c アドレスではありません"
-+
-+#: ../libnm-core/nm-setting-ip-tunnel.c:400
-+msgid "tunnel keys can only be specified for GRE tunnels"
-+msgstr "トンネルキーは GRE トンネルに対してのみ指定できます"
-+
-+#: ../libnm-core/nm-setting-ip-tunnel.c:413
-+#: ../libnm-core/nm-setting-ip-tunnel.c:429
-+#, c-format
-+msgid "'%s' is not a valid tunnel key"
-+msgstr "'%s' は有効なトンネルキーではありません"
-+
-+#: ../libnm-core/nm-setting-ip-tunnel.c:441
-+msgid "a fixed TTL is allowed only when path MTU discovery is enabled"
-+msgstr "固定 TTL は、パス MTU 検出が有効な場合のみ許可されます"
-+
-+#: ../libnm-core/nm-setting-ip-tunnel.c:454
-+#, c-format
-+msgid "some flags are invalid for the select mode: %s"
-+msgstr "選択されたモードに対して一部のフラグは無効です: %s"
-+
-+#: ../libnm-core/nm-setting-ip-tunnel.c:468
-+#, c-format
-+msgid "wired setting not allowed for mode %s"
-+msgstr "モード %s には有線設定が許可されていません"
-+
-+#: ../libnm-core/nm-setting-ip4-config.c:128
-+#: ../libnm-core/nm-setting-ip6-config.c:174
- #: ../libnm-util/nm-setting-ip4-config.c:879
- #: ../libnm-util/nm-setting-ip6-config.c:841
- #, c-format
- msgid "this property cannot be empty for '%s=%s'"
- msgstr "'%s=%s' のこのプロパティーを空にすることはできません"
-
--#: ../libnm-core/nm-setting-ip4-config.c:153
--#: ../libnm-core/nm-setting-ip4-config.c:163
--#: ../libnm-core/nm-setting-ip4-config.c:175
--#: ../libnm-core/nm-setting-ip6-config.c:202
--#: ../libnm-core/nm-setting-ip6-config.c:212
--#: ../libnm-core/nm-setting-ip6-config.c:222
-+#: ../libnm-core/nm-setting-ip4-config.c:140
-+#: ../libnm-core/nm-setting-ip4-config.c:150
-+#: ../libnm-core/nm-setting-ip4-config.c:162
-+#: ../libnm-core/nm-setting-ip6-config.c:189
-+#: ../libnm-core/nm-setting-ip6-config.c:199
-+#: ../libnm-core/nm-setting-ip6-config.c:209
- #: ../libnm-util/nm-setting-ip4-config.c:891
- #: ../libnm-util/nm-setting-ip4-config.c:901
- #: ../libnm-util/nm-setting-ip4-config.c:913
-@@ -11671,135 +11919,110 @@ msgstr "'%s=%s' のこのプロパティーを空にすることはできませ
- msgid "this property is not allowed for '%s=%s'"
- msgstr "このプロパティーは '%s=%s' には許可されていません"
-
--#: ../libnm-core/nm-setting-ip4-config.c:212
-+#: ../libnm-core/nm-setting-ip4-config.c:199
- #, c-format
- msgid "'%s' is not a valid FQDN"
- msgstr "'%s' は有効な FQDN ではありません"
-
--#: ../libnm-core/nm-setting-ip4-config.c:221
-+#: ../libnm-core/nm-setting-ip4-config.c:208
- msgid "property cannot be set when dhcp-hostname is also set"
- msgstr "dhcp-hostname も設定されている場合は、プロパティーを設定できません"
-
--#: ../libnm-core/nm-setting-ip4-config.c:233
-+#: ../libnm-core/nm-setting-ip4-config.c:220
- #, c-format
- msgid "multiple addresses are not allowed for '%s=%s'"
- msgstr "'%s=%s' では複数のアドレスは許可されていません"
-
--#: ../libnm-core/nm-setting-ip4-config.c:247
-+#: ../libnm-core/nm-setting-ip4-config.c:234
- msgid "property should be TRUE when method is set to disabled"
- msgstr "メソッドが無効に設定されている場合は、プロパティーは TRUE にします"
-
--#: ../libnm-core/nm-setting-ip6-config.c:261
-+#: ../libnm-core/nm-setting-ip6-config.c:248
- msgid "value is not a valid token"
- msgstr "値 は有効なトークンではありません"
-
--#: ../libnm-core/nm-setting-ip6-config.c:272
-+#: ../libnm-core/nm-setting-ip6-config.c:259
- msgid "only makes sense with EUI64 address generation mode"
- msgstr "EUI64 アドレス生成モードでのみ、意味が通じます"
-
--#: ../libnm-core/nm-setting-ip6-config.c:283
-+#: ../libnm-core/nm-setting-ip6-config.c:270
- msgid "invalid DUID"
- msgstr "無効な DUID"
-
--#: ../libnm-core/nm-setting-ip6-config.c:295
-+#: ../libnm-core/nm-setting-ip6-config.c:282
- msgid "token is not in canonical form"
- msgstr "トークンが正規形式ではありません"
-
--#: ../libnm-core/nm-setting-ip6-config.c:307
-+#: ../libnm-core/nm-setting-ip6-config.c:294
- msgid "property should be TRUE when method is set to ignore"
- msgstr "メソッドが ignore に設定されている場合は、プロパティーは TRUE にします"
-
--#: ../libnm-core/nm-setting-ip-tunnel.c:339
--#, c-format
--msgid "'%d' is not a valid tunnel mode"
--msgstr "'%d' は有効なトンネルモードではありません"
--
--#: ../libnm-core/nm-setting-ip-tunnel.c:362
--#: ../libnm-core/nm-setting-ip-tunnel.c:382
--#, c-format
--msgid "'%s' is not a valid IPv%c address"
--msgstr "'%s' は有効な IPv%c アドレスではありません"
--
--#: ../libnm-core/nm-setting-ip-tunnel.c:399
--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
--#, c-format
--msgid "'%s' is not a valid tunnel key"
--msgstr "'%s' は有効なトンネルキーではありません"
--
--#: ../libnm-core/nm-setting-ip-tunnel.c:440
--msgid "a fixed TTL is allowed only when path MTU discovery is enabled"
--msgstr "固定 TTL は、パス MTU 検出が有効な場合のみ許可されます"
--
--#: ../libnm-core/nm-setting-ip-tunnel.c:453
--#, c-format
--msgid "some flags are invalid for the select mode: %s"
--msgstr "選択されたモードに対して一部のフラグは無効です: %s"
--
--#: ../libnm-core/nm-setting-ip-tunnel.c:467
--#, c-format
--msgid "wired setting not allowed for mode %s"
--msgstr "モード %s には有線設定が許可されていません"
--
--#: ../libnm-core/nm-setting-macsec.c:258
-+#: ../libnm-core/nm-setting-macsec.c:246
- msgid "the key is empty"
- msgstr "キーが空です"
-
--#: ../libnm-core/nm-setting-macsec.c:269
-+#: ../libnm-core/nm-setting-macsec.c:257
- #, c-format
- msgid "the key must be %d characters"
- msgstr "キーは %d 文字にする必要があります"
-
--#: ../libnm-core/nm-setting-macsec.c:277
-+#: ../libnm-core/nm-setting-macsec.c:265
- msgid "the key contains non-hexadecimal characters"
- msgstr "キーは 16 進数でない文字が含まれています"
-
--#: ../libnm-core/nm-setting-macsec.c:339 ../libnm-core/nm-setting-macvlan.c:175
--#: ../libnm-core/nm-setting-vlan.c:657 ../libnm-util/nm-setting-vlan.c:580
-+#: ../libnm-core/nm-setting-macsec.c:327 ../libnm-core/nm-setting-macvlan.c:157
-+#: ../libnm-core/nm-setting-vlan.c:640 ../libnm-util/nm-setting-vlan.c:580
- #, c-format
- msgid "property is not specified and neither is '%s:%s'"
- msgstr "プロパティーおよび '%s:%s' のいずれも指定されていません"
-
--#: ../libnm-core/nm-setting-macsec.c:360
-+#: ../libnm-core/nm-setting-macsec.c:348
- #, c-format
- msgid "EAP key management requires '%s' setting presence"
- msgstr "EAP キー管理には '%s' 設定が必要です"
-
--#: ../libnm-core/nm-setting-macsec.c:369
-+#: ../libnm-core/nm-setting-macsec.c:357
- msgid "must be either psk (0) or eap (1)"
- msgstr ""
-
--#: ../libnm-core/nm-setting-macsec.c:378
-+#: ../libnm-core/nm-setting-macsec.c:366
- #, c-format
- msgid "invalid port %d"
- msgstr "無効なポート %d"
-
--#: ../libnm-core/nm-setting-macsec.c:389
-+#: ../libnm-core/nm-setting-macsec.c:377
- msgid "only valid for psk mode"
- msgstr ""
-
--#: ../libnm-core/nm-setting-macvlan.c:186
-+#: ../libnm-core/nm-setting-macvlan.c:168
- msgid "non promiscuous operation is allowed only in passthru mode"
- msgstr "非プロミスキャス操作はパススルーモードでのみ許可されます"
-
--#: ../libnm-core/nm-setting-olpc-mesh.c:128
--#: ../libnm-core/nm-setting-wireless.c:760
-+#: ../libnm-core/nm-setting-olpc-mesh.c:109
-+#: ../libnm-core/nm-setting-wireless.c:747
- #: ../libnm-util/nm-setting-olpc-mesh.c:132
- #: ../libnm-util/nm-setting-wireless.c:777
- msgid "SSID length is out of range <1-32> bytes"
- msgstr "SSID の長さは範囲外 <1-32> バイトです"
-
--#: ../libnm-core/nm-setting-olpc-mesh.c:137
--#: ../libnm-core/nm-setting-wireless.c:800
-+#: ../libnm-core/nm-setting-olpc-mesh.c:118
-+#: ../libnm-core/nm-setting-wireless.c:787
- #: ../libnm-util/nm-setting-olpc-mesh.c:141
- #: ../libnm-util/nm-setting-wireless.c:817
- #, c-format
- msgid "'%d' is not a valid channel"
- msgstr "'%d' は無効なチャンネルです"
-
-+#: ../libnm-core/nm-setting-ovs-bridge.c:159
-+#, c-format
-+msgid "A connection with a '%s' setting must not have a master."
-+msgstr "'%s' 設定の接続では、マスターが必要ありません。"
-+
-+#: ../libnm-core/nm-setting-ovs-bridge.c:170
-+#, c-format
-+msgid "'%s' is not allowed in fail_mode"
-+msgstr "'%s' は、fail_mode では利用できません。"
-+
- #: ../libnm-core/nm-setting-ovs-interface.c:111
- #, c-format
- msgid "'%s' is not a valid interface type"
-@@ -11862,7 +12085,7 @@ msgid "A connection with a '%s' setting must have a master."
- msgstr "'%s' 設定の接続ではマスターが必要です。"
-
- #: ../libnm-core/nm-setting-ovs-patch.c:104
--#: ../libnm-core/nm-setting-vxlan.c:373
-+#: ../libnm-core/nm-setting-vxlan.c:354
- #, c-format
- msgid "'%s' is not a valid IP address"
- msgstr "'%s' は、有効な IP アドレスではありません"
-@@ -11887,91 +12110,94 @@ msgstr "'%s' は、lacp では利用できません"
- msgid "'%s' is not allowed in bond_mode"
- msgstr "'%s' は、bond_mode では利用できません"
-
--#: ../libnm-core/nm-setting-ovs-bridge.c:159
--#, c-format
--msgid "A connection with a '%s' setting must not have a master."
--msgstr "'%s' 設定の接続では、マスターが必要ありません。"
--
--#: ../libnm-core/nm-setting-ovs-bridge.c:170
--#, c-format
--msgid "'%s' is not allowed in fail_mode"
--msgstr "'%s' は、fail_mode では利用できません。"
--
--#: ../libnm-core/nm-setting-ppp.c:363 ../libnm-util/nm-setting-ppp.c:386
-+#: ../libnm-core/nm-setting-ppp.c:352 ../libnm-util/nm-setting-ppp.c:386
- #, c-format
- msgid "'%d' is out of valid range <128-16384>"
- msgstr "'%d' は有効な範囲 <128-16384> の外にあります"
-
--#: ../libnm-core/nm-setting-ppp.c:376 ../libnm-util/nm-setting-ppp.c:399
-+#: ../libnm-core/nm-setting-ppp.c:365 ../libnm-util/nm-setting-ppp.c:399
- #, c-format
- msgid "setting this property requires non-zero '%s' property"
- msgstr "このプロパティーを設定するにはゼロ以外の '%s' プロパティーが必要です"
-
--#: ../libnm-core/nm-setting-proxy.c:161
-+#: ../libnm-core/nm-setting-proxy.c:148
- #, c-format
- msgid "invalid proxy method"
- msgstr "無効なプロキシメソッド"
-
--#: ../libnm-core/nm-setting-proxy.c:171 ../libnm-core/nm-setting-proxy.c:180
-+#: ../libnm-core/nm-setting-proxy.c:158 ../libnm-core/nm-setting-proxy.c:167
- #, c-format
- msgid "this property is not allowed for method none"
- msgstr "このプロパティーは、メソッド none には許可されていません"
-
--#: ../libnm-core/nm-setting-proxy.c:191
-+#: ../libnm-core/nm-setting-proxy.c:178
- #, c-format
- msgid "the script is too large"
- msgstr "スクリプトが長すぎます"
-
--#: ../libnm-core/nm-setting-proxy.c:199
-+#: ../libnm-core/nm-setting-proxy.c:186
- #, c-format
- msgid "the script is not valid utf8"
- msgstr "スクリプトは有効な utf8 ではありません"
-
--#: ../libnm-core/nm-setting-proxy.c:207
-+#: ../libnm-core/nm-setting-proxy.c:194
- #, c-format
- msgid "the script lacks FindProxyForURL function"
- msgstr "スクリプトには FindProxyForURL 関数がありません"
-
--#: ../libnm-core/nm-setting-sriov.c:1086
-+#: ../libnm-core/nm-setting-sriov.c:1070
- #, 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:1097
-+#: ../libnm-core/nm-setting-sriov.c:1081
- #, c-format
- msgid "invalid VF %u: %s"
- msgstr "無効な VF %u: %s"
-
--#: ../libnm-core/nm-setting-sriov.c:1109
-+#: ../libnm-core/nm-setting-sriov.c:1093
- #, c-format
- msgid "duplicate VF index %u"
- msgstr "VF インデックス %u を複製します"
-
--#: ../libnm-core/nm-setting-sriov.c:1130
-+#: ../libnm-core/nm-setting-sriov.c:1114
- #, c-format
- msgid "VFs %d and %d are not sorted by ascending index"
- msgstr "VFs %d および %d は、上昇するインデックスでソートされません"
-
--#: ../libnm-core/nm-setting-tc-config.c:68
--#: ../libnm-core/nm-setting-tc-config.c:296
--#: ../libnm-core/nm-setting-tc-config.c:550
-+#: ../libnm-core/nm-setting-tc-config.c:70
-+#: ../libnm-core/nm-setting-tc-config.c:436
-+#: ../libnm-core/nm-setting-tc-config.c:706
-+#, fuzzy, 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
- #, c-format
- msgid "'%s' is not a valid kind"
- msgstr "'%s' は有効ではありません。"
-
--#: ../libnm-core/nm-setting-tc-config.c:76
--#: ../libnm-core/nm-setting-tc-config.c:558
-+#: ../libnm-core/nm-setting-tc-config.c:86
-+#: ../libnm-core/nm-setting-tc-config.c:722
- msgid "parent handle missing"
- msgstr "親ハンドラーがありません。"
-
--#: ../libnm-core/nm-setting-tc-config.c:1203
-+#: ../libnm-core/nm-setting-tc-config.c:1292
- msgid "there are duplicate TC qdiscs"
- msgstr "複製 TC qdiscs があります"
-
--#: ../libnm-core/nm-setting-tc-config.c:1223
-+#: ../libnm-core/nm-setting-tc-config.c:1312
- msgid "there are duplicate TC filters"
- msgstr "複製 TC フィルターがあります"
-
-+#: ../libnm-core/nm-setting-team-port.c:366
-+#: ../libnm-core/nm-setting-team.c:1234
-+#, c-format
-+msgid "team config exceeds size limit"
-+msgstr "team 設定が制限サイズを超えています"
-+
- #: ../libnm-core/nm-setting-team.c:135 ../libnm-core/nm-setting-team.c:194
- #: ../libnm-core/nm-setting-team.c:306
- #, c-format
-@@ -12003,48 +12229,42 @@ msgstr "source-host '%s' に無効な文字が含まれています"
- msgid "vlanid is out of range [-1, 4094]"
- msgstr "%s は [0, %d] の範囲外です"
-
--#: ../libnm-core/nm-setting-team.c:1220
--#: ../libnm-core/nm-setting-team-port.c:380
--#, c-format
--msgid "team config exceeds size limit"
--msgstr "team 設定が制限サイズを超えています"
--
--#: ../libnm-core/nm-setting-team.c:1246
-+#: ../libnm-core/nm-setting-team.c:1260
- #, c-format
- msgid "invalid runner \"%s\""
- msgstr "無効なランナー \"%s\""
-
--#: ../libnm-core/nm-setting-team.c:1259
-+#: ../libnm-core/nm-setting-team.c:1273
- #, c-format
- msgid "missing link watcher name"
- msgstr "リンクウォッチャー名がありません"
-
--#: ../libnm-core/nm-setting-team.c:1269
-+#: ../libnm-core/nm-setting-team.c:1283
- #, c-format
- msgid "unknown link watcher \"%s\""
- msgstr "不明なリンクウォッチャー \"%s\""
-
--#: ../libnm-core/nm-setting-team.c:1280
-+#: ../libnm-core/nm-setting-team.c:1294
- #, c-format
- msgid "missing target host"
- msgstr "ターゲットホストがありません"
-
--#: ../libnm-core/nm-setting-team.c:1288
-+#: ../libnm-core/nm-setting-team.c:1302
- #, c-format
- msgid "missing source address"
- msgstr "ソースアドレスがありません"
-
--#: ../libnm-core/nm-setting-tun.c:185
-+#: ../libnm-core/nm-setting-tun.c:167
- #, c-format
- msgid "'%u': invalid mode"
- msgstr "'%u': 無効なモード"
-
--#: ../libnm-core/nm-setting-tun.c:195
-+#: ../libnm-core/nm-setting-tun.c:177
- #, c-format
- msgid "'%s': invalid user ID"
- msgstr "'%s': 無効なユーザー ID"
-
--#: ../libnm-core/nm-setting-tun.c:206
-+#: ../libnm-core/nm-setting-tun.c:188
- #, c-format
- msgid "'%s': invalid group ID"
- msgstr "'%s': 無効なグループ ID"
-@@ -12094,393 +12314,504 @@ msgstr "ユーザーデータエントリーが最大数に達しました"
- msgid "invalid key \"%s\": %s"
- msgstr "無効なキー '%s': %s"
-
--#: ../libnm-core/nm-setting-user.c:374
--#, c-format
--msgid "invalid value for \"%s\": %s"
--msgstr "'%s' の無効な値: %s"
--
- #: ../libnm-core/nm-setting-user.c:389
- #, c-format
- msgid "maximum number of user data entries reached (%u instead of %u)"
- msgstr "ユーザーデータエントリーが最大数に達しました (%u ではなく %u)"
-
--#: ../libnm-core/nm-setting-vlan.c:668 ../libnm-util/nm-setting-vlan.c:600
-+#: ../libnm-core/nm-setting-vlan.c:651 ../libnm-util/nm-setting-vlan.c:600
- #, 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:678 ../libnm-util/nm-setting-vlan.c:591
-+#: ../libnm-core/nm-setting-vlan.c:661 ../libnm-util/nm-setting-vlan.c:591
- msgid "flags are invalid"
- msgstr "フラグが無効です"
-
--#: ../libnm-core/nm-setting-vlan.c:690
-+#: ../libnm-core/nm-setting-vlan.c:673
- msgid "vlan setting should have a ethernet setting as well"
- msgstr "vlan 設定には Ethernet 設定も必要です"
-
--#: ../libnm-core/nm-setting-vpn.c:580
-+#: ../libnm-core/nm-setting-vpn.c:561
- msgid "cannot set connection.multi-connect for VPN setting"
- msgstr "VPN 設定用に connection.multi-connect を設定できません"
-
--#: ../libnm-core/nm-setting-vpn.c:601
-+#: ../libnm-core/nm-setting-vpn.c:582
- #, c-format
- msgid "secret was empty"
- msgstr "シークレットが空です"
-
--#: ../libnm-core/nm-setting-vpn.c:631
-+#: ../libnm-core/nm-setting-vpn.c:612
- msgid "setting contained a secret with an empty name"
- msgstr "設定に空の名前のシークレットが含まれていました"
-
--#: ../libnm-core/nm-setting-vpn.c:639
-+#: ../libnm-core/nm-setting-vpn.c:620
- #, c-format
- msgid "secret value was empty"
- msgstr "シークレット値が空でした"
-
--#: ../libnm-core/nm-setting-vpn.c:686 ../libnm-core/nm-setting.c:2024
-+#: ../libnm-core/nm-setting-vpn.c:667 ../libnm-core/nm-setting.c:2114
- msgid "not a secret property"
- msgstr "シークレットプロパティーではありません"
-
--#: ../libnm-core/nm-setting-vpn.c:692
-+#: ../libnm-core/nm-setting-vpn.c:673
- msgid "secret is not of correct type"
- msgstr "シークレットのタイプが正しくありません"
-
--#: ../libnm-core/nm-setting-vpn.c:725
-+#: ../libnm-core/nm-setting-vpn.c:757
- #, fuzzy
- msgid "secret flags property not found"
- msgstr "シークレットフラグプロパティー '%s' が見つかりません"
-
--#: ../libnm-core/nm-setting-vxlan.c:386
-+#: ../libnm-core/nm-setting-vxlan.c:367
- #, c-format
- msgid "'%s' is not a valid IP%c address"
- msgstr "'%s' は有効な IP%c アドレスではありません"
-
--#: ../libnm-core/nm-setting-vxlan.c:413
-+#: ../libnm-core/nm-setting-vxlan.c:394
- #, c-format
- msgid "%d is greater than local port max %d"
- msgstr "%d はローカルポートの最大 %d よりも大きいです"
-
--#: ../libnm-core/nm-setting-wired.c:630 ../libnm-util/nm-setting-wired.c:612
-+#: ../libnm-core/nm-setting-wired.c:614 ../libnm-util/nm-setting-wired.c:612
- #, c-format
- msgid "'%s' is not a valid Ethernet port value"
- msgstr "'%s' は有効な Ethernet ポート値ではありません"
-
--#: ../libnm-core/nm-setting-wired.c:640 ../libnm-util/nm-setting-wired.c:622
-+#: ../libnm-core/nm-setting-wired.c:624 ../libnm-util/nm-setting-wired.c:622
- #, c-format
- msgid "'%s' is not a valid duplex value"
- msgstr "'%s' は有効な二重値ではありません"
-
--#: ../libnm-core/nm-setting-wired.c:699 ../libnm-util/nm-setting-wired.c:679
-+#: ../libnm-core/nm-setting-wired.c:683 ../libnm-util/nm-setting-wired.c:679
- #, c-format
- msgid "invalid '%s' or its value '%s'"
- msgstr "無効な '%s' またはその値 '%s' です"
-
--#: ../libnm-core/nm-setting-wired.c:736
-+#: ../libnm-core/nm-setting-wired.c:720
- msgid "Wake-on-LAN mode 'default' and 'ignore' are exclusive flags"
- msgstr "Wake-on-LAN モードの 'default' と 'ignore' は排他的なフラグです"
-
--#: ../libnm-core/nm-setting-wired.c:745
-+#: ../libnm-core/nm-setting-wired.c:729
- msgid "Wake-on-LAN password can only be used with magic packet mode"
- msgstr "Wake-on-LAN パスワードは、マジックパケットモードでのみ使用できます"
-
--#: ../libnm-core/nm-setting-wired.c:770
-+#: ../libnm-core/nm-setting-wired.c:754
- msgid "both speed and duplex should have a valid value or both should be unset"
- msgstr ""
- "速度と二重の両方の値は有効であるべきで、そうでなければ、両方とも未設定でなけ"
- "ればなりません"
-
--#: ../libnm-core/nm-setting-wired.c:771
-+#: ../libnm-core/nm-setting-wired.c:755
- msgid "both speed and duplex are required for static link configuration"
- msgstr "速度と二重の両方が静的リンク設定に必要です"
-
--#: ../libnm-core/nm-setting-wireless-security.c:939
-+#: ../libnm-core/nm-setting-wireguard.c:778
-+msgid "missing public-key for peer"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-wireguard.c:782
-+msgid "invalid public-key for peer"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-wireguard.c:791
-+#, fuzzy
-+msgid "invalid preshared-key for peer"
-+msgstr "無効なプライベートキー"
-+
-+#: ../libnm-core/nm-setting-wireguard.c:809
-+#, fuzzy
-+msgid "invalid endpoint for peer"
-+msgstr "ローカルエンドポイント [none]"
-+
-+#: ../libnm-core/nm-setting-wireguard.c:819
-+#, fuzzy, c-format
-+msgid "invalid IP address \"%s\" for allowed-ip of peer"
-+msgstr "無効な IP アドレス: %s"
-+
-+#: ../libnm-core/nm-setting-wireguard.c:828
-+msgid "invalid preshared-key-flags for peer"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-wireguard.c:1567
-+#, c-format
-+msgid "peer #%u has no public-key"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-wireguard.c:1578
-+#, c-format
-+msgid "peer #%u has invalid public-key"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-wireguard.c:1592
-+#, c-format
-+msgid "peer #%u has invalid endpoint"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-wireguard.c:1622
-+#, c-format
-+msgid "peer #%u has invalid allowed-ips setting"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-wireguard.c:1634
-+#, fuzzy, c-format
-+msgid "peer #%u is invalid: %s"
-+msgstr "証明書が無効です: %s"
-+
-+#: ../libnm-core/nm-setting-wireguard.c:1705
-+#: ../libnm-core/nm-setting-wireguard.c:1719
-+#, c-format
-+msgid "method \"%s\" is not supported for WireGuard"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-wireguard.c:1739
-+msgid "key must be 32 bytes base64 encoded"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-wireguard.c:1875
-+#, fuzzy
-+msgid "invalid peer secrets"
-+msgstr "無効なシークレット"
-+
-+#: ../libnm-core/nm-setting-wireguard.c:1898
-+#, c-format
-+msgid "peer #%u lacks public-key"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-wireguard.c:1912
-+#, c-format
-+msgid "non-existing peer '%s'"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-wireless-security.c:935
- #: ../libnm-util/nm-setting-wireless-security.c:911
- #, c-format
- msgid "'%s' security requires '%s=%s'"
- msgstr "'%s' セキュリティーには、'%s=%s' が必要です"
-
--#: ../libnm-core/nm-setting-wireless-security.c:960
-+#: ../libnm-core/nm-setting-wireless-security.c:956
- #: ../libnm-util/nm-setting-wireless-security.c:932
- #, c-format
- msgid "'%s' security requires '%s' setting presence"
- msgstr "'%s' セキュリティーには、'%s' の設定が必要になります"
-
--#: ../libnm-core/nm-setting-wireless-security.c:981
-+#: ../libnm-core/nm-setting-wireless-security.c:977
- #: ../libnm-util/nm-setting-wireless-security.c:953
- #, c-format
- msgid "'%d' value is out of range <0-3>"
- msgstr "'%d' の値は <0-3> の範囲外になります"
-
--#: ../libnm-core/nm-setting-wireless-security.c:1036
-+#: ../libnm-core/nm-setting-wireless-security.c:1032
- #: ../libnm-util/nm-setting-wireless-security.c:1008
- #, c-format
- msgid "'%s' connections require '%s' in this property"
- msgstr "'%s' の接続の場合、このプロパティーに '%s' が必要になります"
-
--#: ../libnm-core/nm-setting-wireless-security.c:1066
-+#: ../libnm-core/nm-setting-wireless-security.c:1062
- #: ../libnm-util/nm-setting-wireless-security.c:1038
- #, c-format
- msgid "'%s' can only be used with '%s=%s' (WEP)"
- msgstr "'%s' は '%s=%s' (WEP) でしか使用できません"
-
--#: ../libnm-core/nm-setting-wireless-security.c:1090
--#, c-format
--msgid "'%s' can only be used with '%s=%s' or '%s=%s'"
-+#: ../libnm-core/nm-setting-wireless-security.c:1086
-+#, fuzzy, c-format
-+msgid ""
-+"'%s' can only be used with 'wpa-eap', 'wpa-psk' or 'sae' key management "
- msgstr "'%s' は、'%s=%s' または '%s=%s' でしか使用できません"
-
--#: ../libnm-core/nm-setting-wireless-security.c:1112
--msgid "can't be simultaneously disabled and enabled"
--msgstr "同時に無効または有効にすることはできません"
--
--#: ../libnm-core/nm-setting-wireless.c:769
-+#: ../libnm-core/nm-setting-wireless.c:756
- #: ../libnm-util/nm-setting-wireless.c:786
- #, c-format
- msgid "'%s' is not a valid Wi-Fi mode"
- msgstr "'%s' は有効な Wi-Fi モードではありません"
-
--#: ../libnm-core/nm-setting-wireless.c:779
-+#: ../libnm-core/nm-setting-wireless.c:766
- #: ../libnm-util/nm-setting-wireless.c:796
- #, c-format
- msgid "'%s' is not a valid band"
- msgstr "'%s' は有効なバンドではありません"
-
--#: ../libnm-core/nm-setting-wireless.c:789
-+#: ../libnm-core/nm-setting-wireless.c:776
- #, c-format
- msgid "'%s' requires setting '%s' property"
- msgstr "'%s' の場合は、'%s' プロパティーを設定する必要があります"
-
--#: ../libnm-core/nm-setting-wireless.c:883
-+#: ../libnm-core/nm-setting-wireless.c:870
- #, c-format
- msgid "invalid value"
- msgstr "無効な値"
-
--#: ../libnm-core/nm-setting-wireless.c:893
-+#: ../libnm-core/nm-setting-wireless.c:880
- msgid "Wake-on-WLAN mode 'default' and 'ignore' are exclusive flags"
- msgstr "Wake-on-WLAN モードの 'default' と 'ignore' は排他的なフラグです"
-
--#: ../libnm-core/nm-setting-wireless.c:902
-+#: ../libnm-core/nm-setting-wireless.c:889
- msgid "Wake-on-WLAN trying to set unknown flag"
- msgstr "Wake-on-WLAN は、未知のフラグの設定を試みています"
-
--#: ../libnm-core/nm-setting-wireless.c:924
-+#: ../libnm-core/nm-setting-wireless.c:911
- #, 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:182
-+#: ../libnm-core/nm-setting-wpan.c:185
- msgid "page must be defined along with a channel"
- msgstr ""
-
--#: ../libnm-core/nm-setting-wpan.c:191
-+#: ../libnm-core/nm-setting-wpan.c:194
- #, c-format
- msgid "page must be between %d and %d"
- msgstr ""
-
--#: ../libnm-core/nm-setting-wpan.c:202
-+#: ../libnm-core/nm-setting-wpan.c:205
- #, c-format
- msgid "channel must not be between %d and %d"
- msgstr ""
-
--#: ../libnm-core/nm-setting.c:852
-+#: ../libnm-core/nm-setting.c:872
- #, c-format
- msgid "duplicate property"
- msgstr "重複するプロパティー"
-
--#: ../libnm-core/nm-setting.c:900 ../libnm-core/nm-setting.c:947
-+#: ../libnm-core/nm-setting.c:922 ../libnm-core/nm-setting.c:971
- #, c-format
- msgid "can't set property of type '%s' from value of type '%s'"
- msgstr "タイプ '%s' のプロパティーをタイプ '%s' の値から設定できません"
-
--#: ../libnm-core/nm-setting.c:919 ../libnm-core/nm-setting.c:933
-+#: ../libnm-core/nm-setting.c:941 ../libnm-core/nm-setting.c:956
- #, c-format
- msgid "failed to set property: %s"
- msgstr "プロパティーの設定に失敗しました: %s"
-
--#: ../libnm-core/nm-setting.c:961
-+#: ../libnm-core/nm-setting.c:986
- #, c-format
- msgid "can not set property: %s"
- msgstr "プロパティーを設定できません: %s"
-
--#: ../libnm-core/nm-setting.c:977
-+#: ../libnm-core/nm-setting.c:1002
- #, c-format
- msgid "unknown property"
- msgstr "不明なプロパティー"
-
--#: ../libnm-core/nm-setting.c:1935
-+#: ../libnm-core/nm-setting.c:2005
- msgid "secret not found"
- msgstr "シークレットが見つかりません"
-
--#: ../libnm-core/nm-utils.c:2045
-+#: ../libnm-core/nm-utils.c:2317
- #, c-format
- msgid "'%s' is not a valid handle."
- msgstr "'%s' は有効なハンドラーはありません。"
-
--#: ../libnm-core/nm-utils.c:2141
-+#: ../libnm-core/nm-utils.c:2445
- #, c-format
- msgid "'%s' unexpected: parent already specified."
- msgstr "予期せぬ '%s': 親はすでに選択されています。"
-
--#: ../libnm-core/nm-utils.c:2157
-+#: ../libnm-core/nm-utils.c:2461
- #, c-format
- msgid "invalid handle: '%s'"
- msgstr "無効なハンドラー: '%s'"
-
--#: ../libnm-core/nm-utils.c:2179
-+#: ../libnm-core/nm-utils.c:2483
- msgid "parent not specified."
- msgstr "親が指定されていません。"
-
--#: ../libnm-core/nm-utils.c:2226
-+#: ../libnm-core/nm-utils.c:2545
- #, c-format
- msgid "unsupported qdisc option: '%s'."
- msgstr "サポートされていない qdisc オプション: '%s'"
-
--#: ../libnm-core/nm-utils.c:2342
-+#: ../libnm-core/nm-utils.c:2667
- msgid "action name missing."
- msgstr "アクション名がありません。"
-
--#: ../libnm-core/nm-utils.c:2366
-+#: ../libnm-core/nm-utils.c:2693
- #, c-format
- msgid "unsupported action option: '%s'."
- msgstr "サポートされていないアクションのオプション: '%s'"
-
--#: ../libnm-core/nm-utils.c:2504
-+#: ../libnm-core/nm-utils.c:2831
- msgid "invalid action: "
- msgstr "無効なアクション: "
-
--#: ../libnm-core/nm-utils.c:2508
-+#: ../libnm-core/nm-utils.c:2835
- #, c-format
- msgid "unsupported tfilter option: '%s'."
- msgstr "サポートされていない tfilter オプション: '%s'."
-
--#: ../libnm-core/nm-utils.c:3110
-+#: ../libnm-core/nm-utils.c:3436
- #, c-format
- msgid "failed stat file %s: %s"
- msgstr "ファイル %s に対する stat の実行に失敗しました: %s"
-
--#: ../libnm-core/nm-utils.c:3119
-+#: ../libnm-core/nm-utils.c:3445
- #, c-format
- msgid "not a file (%s)"
- msgstr "ファイルではありません (%s)"
-
--#: ../libnm-core/nm-utils.c:3130
-+#: ../libnm-core/nm-utils.c:3456
- #, c-format
- msgid "invalid file owner %d for %s"
- msgstr "%2$s の無効なファイル所有者 %1$d"
-
--#: ../libnm-core/nm-utils.c:3141
-+#: ../libnm-core/nm-utils.c:3467
- #, c-format
- msgid "file permissions for %s"
- msgstr "%s のファイルパーミッション"
-
--#: ../libnm-core/nm-utils.c:3151
-+#: ../libnm-core/nm-utils.c:3477
- #, c-format
- msgid "reject %s"
- msgstr "%s の拒否"
-
--#: ../libnm-core/nm-utils.c:3170
-+#: ../libnm-core/nm-utils.c:3496
- #, c-format
- msgid "path is not absolute (%s)"
- msgstr "パスが絶対パスではありません (%s)"
-
--#: ../libnm-core/nm-utils.c:3184
-+#: ../libnm-core/nm-utils.c:3510
- #, c-format
- msgid "Plugin file does not exist (%s)"
- msgstr "プラグインファイルが存在しません (%s)"
-
--#: ../libnm-core/nm-utils.c:3192
-+#: ../libnm-core/nm-utils.c:3518
- #, c-format
- msgid "Plugin is not a valid file (%s)"
- msgstr "プラグインが有効なファイルではありません (%s)"
-
--#: ../libnm-core/nm-utils.c:3202
-+#: ../libnm-core/nm-utils.c:3528
- #, c-format
- msgid "libtool archives are not supported (%s)"
- msgstr "libtool アーカイブはサポートされていません (%s)"
-
--#: ../libnm-core/nm-utils.c:3284 ../libnm-util/nm-utils.c:1794
-+#: ../libnm-core/nm-utils.c:3610 ../libnm-util/nm-utils.c:1794
- #, c-format
- msgid "Could not find \"%s\" binary"
- msgstr "\"%s\" バイナリーを見つけることができませんでした"
-
--#: ../libnm-core/nm-utils.c:4369
-+#: ../libnm-core/nm-utils.c:4460
-+#, fuzzy
-+msgid "unknown secret flags"
-+msgstr "不明な設定名"
-+
-+#: ../libnm-core/nm-utils.c:4470
-+msgid "conflicting secret flags"
-+msgstr ""
-+
-+#: ../libnm-core/nm-utils.c:4481
-+#, fuzzy
-+msgid "secret flags must not be \"not-required\""
-+msgstr "シークレットフラグプロパティー '%s' が見つかりません"
-+
-+#: ../libnm-core/nm-utils.c:4489
-+#, fuzzy
-+msgid "unsupported secret flags"
-+msgstr "サポートされていない qdisc オプション: '%s'"
-+
-+#: ../libnm-core/nm-utils.c:4519
-+msgid "can't be simultaneously disabled and enabled"
-+msgstr "同時に無効または有効にすることはできません"
-+
-+#: ../libnm-core/nm-utils.c:4527
-+#, fuzzy
-+msgid "WPS is required"
-+msgstr "PIN コードが必要です"
-+
-+#: ../libnm-core/nm-utils.c:4593
- #, c-format
- msgid "not a valid ethernet MAC address for mask at position %lld"
- msgstr "%lld の場所で、マスクに有効な Ethernet MAC アドレスではありません"
-
--#: ../libnm-core/nm-utils.c:4384
-+#: ../libnm-core/nm-utils.c:4608
- #, 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:4420
-+#: ../libnm-core/nm-utils.c:4667
- msgid "interface name is too short"
- msgstr "インターフェース名が短すぎます"
-
--#: ../libnm-core/nm-utils.c:4429
-+#: ../libnm-core/nm-utils.c:4676
- msgid "interface name is reserved"
- msgstr "インターフェース名が予約されています"
-
--#: ../libnm-core/nm-utils.c:4441
-+#: ../libnm-core/nm-utils.c:4688
- msgid "interface name contains an invalid character"
- msgstr "インターフェース名に無効な文字が含まれています"
-
--#: ../libnm-core/nm-utils.c:4447
-+#: ../libnm-core/nm-utils.c:4694
- msgid "interface name is longer than 15 characters"
- msgstr "インターフェース名が 15 文字を超えています"
-
--#: ../libnm-core/nm-utils.c:5107
-+#: ../libnm-core/nm-utils.c:5354
- msgid "not valid utf-8"
- msgstr "utf-8 ではありません"
-
--#: ../libnm-core/nm-utils.c:5128 ../libnm-core/nm-utils.c:5601
-+#: ../libnm-core/nm-utils.c:5375 ../libnm-core/nm-utils.c:5850
- msgid "is not a JSON object"
- msgstr "JSON オブジェクトではありません"
-
--#: ../libnm-core/nm-utils.c:5577 ../libnm-core/nm-utils.c:5917
-+#: ../libnm-core/nm-utils.c:5826 ../libnm-core/nm-utils.c:6161
- msgid "value is NULL"
- msgstr "値が NULL です"
-
--#: ../libnm-core/nm-utils.c:5577 ../libnm-core/nm-utils.c:5917
-+#: ../libnm-core/nm-utils.c:5826 ../libnm-core/nm-utils.c:6161
- msgid "value is empty"
- msgstr "値が空です"
-
--#: ../libnm-core/nm-utils.c:5589
-+#: ../libnm-core/nm-utils.c:5838
- #, c-format
- msgid "invalid JSON at position %d (%s)"
- msgstr "%d (%s) で無効な JSON"
-
--#: ../libnm-core/nm-utils.c:6244 ../libnm-core/nm-utils.c:6264
-+#: ../libnm-core/nm-utils.c:6488 ../libnm-core/nm-utils.c:6508
- msgid "unterminated escape sequence"
- msgstr "未終了のエスケープシーケンス"
-
--#: ../libnm-core/nm-utils.c:6289
-+#: ../libnm-core/nm-utils.c:6533
- #, c-format
- msgid "unknown attribute '%s'"
- msgstr "不明な属性 '%s'"
-
--#: ../libnm-core/nm-utils.c:6304
-+#: ../libnm-core/nm-utils.c:6548
- #, fuzzy, c-format
- msgid "missing key-value separator '%c' after '%s'"
- msgstr "'%s' の後に、キー/値のセパレーター '%c' がありません"
-
--#: ../libnm-core/nm-utils.c:6320
-+#: ../libnm-core/nm-utils.c:6564
- #, c-format
- msgid "invalid uint32 value '%s' for attribute '%s'"
- msgstr "属性 '%s' の無効な uint32 値 '%s'"
-
--#: ../libnm-core/nm-utils.c:6329
-+#: ../libnm-core/nm-utils.c:6573
- #, c-format
- msgid "invalid uint8 value '%s' for attribute '%s'"
- msgstr "属性 '%s' の無効な uint8 値 '%s'"
-
--#: ../libnm-core/nm-utils.c:6339
-+#: ../libnm-core/nm-utils.c:6583
- #, c-format
- msgid "invalid boolean value '%s' for attribute '%s'"
- msgstr "属性 '%s' の無効なブール値 '%s'"
-
--#: ../libnm-core/nm-utils.c:6349
-+#: ../libnm-core/nm-utils.c:6593
- #, c-format
- msgid "unsupported attribute '%s' of type '%s'"
- msgstr "タイプ '%s' のサポートされていない属性 '%s'"
-
-+#: ../libnm-core/nm-utils.c:6935
-+#, fuzzy, c-format
-+msgid "Bridge VLANs %d and %d are not sorted by ascending vid"
-+msgstr "VFs %d および %d は、上昇するインデックスでソートされません"
-+
-+#: ../libnm-core/nm-utils.c:6959
-+#, fuzzy, c-format
-+msgid "duplicate bridge VLAN vid %u"
-+msgstr "VF インデックス %u を複製します"
-+
-+#: ../libnm-core/nm-utils.c:6971
-+msgid "only one VLAN can be the PVID"
-+msgstr ""
-+
- #: ../libnm-core/nm-vpn-editor-plugin.c:296
- #, c-format
- msgid "cannot load plugin \"%s\": %s"
-@@ -12516,50 +12847,50 @@ msgstr "プラグインはインポート機能をサポートしません"
- msgid "the plugin does not support export capability"
- msgstr "プラグインはエクスポート機能をサポートしません"
-
--#: ../libnm-core/nm-vpn-plugin-info.c:110
-+#: ../libnm-core/nm-vpn-plugin-info.c:108
- #, c-format
- msgid "missing filename"
- msgstr "不明なファイル名"
-
--#: ../libnm-core/nm-vpn-plugin-info.c:118
-+#: ../libnm-core/nm-vpn-plugin-info.c:116
- #, c-format
- msgid "filename must be an absolute path (%s)"
- msgstr "ファイル名は絶対パスである必要があります (%s)"
-
--#: ../libnm-core/nm-vpn-plugin-info.c:127
-+#: ../libnm-core/nm-vpn-plugin-info.c:125
- #, c-format
- msgid "filename has invalid format (%s)"
- msgstr "ファイル名の形式が無効です (%s)"
-
--#: ../libnm-core/nm-vpn-plugin-info.c:450
-+#: ../libnm-core/nm-vpn-plugin-info.c:448
- #, 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:488
-+#: ../libnm-core/nm-vpn-plugin-info.c:486
- #, c-format
- msgid "there exists a conflicting plugin with the same name (%s)"
- msgstr "同じ名前 (%s) の競合するプラグインが存在します"
-
--#: ../libnm-core/nm-vpn-plugin-info.c:1070
-+#: ../libnm-core/nm-vpn-plugin-info.c:1068
- #, c-format
- msgid "missing \"plugin\" setting"
- msgstr "不明な \"plugin\" 設定"
-
--#: ../libnm-core/nm-vpn-plugin-info.c:1080
-+#: ../libnm-core/nm-vpn-plugin-info.c:1078
- #, c-format
- msgid "%s: don't retry loading plugin which already failed previously"
- msgstr "%s: 以前に失敗したプラグインのロードは再試行しないでください"
-
--#: ../libnm-core/nm-vpn-plugin-info.c:1174
-+#: ../libnm-core/nm-vpn-plugin-info.c:1154
- msgid "missing filename to load VPN plugin info"
- msgstr "VPN プラグイン情報をロードする不明なファイル名"
-
--#: ../libnm-core/nm-vpn-plugin-info.c:1186
-+#: ../libnm-core/nm-vpn-plugin-info.c:1166
- msgid "missing name for VPN plugin info"
- msgstr "VPN プラグイン情報の不明な名前"
-
--#: ../libnm-core/nm-vpn-plugin-info.c:1195
-+#: ../libnm-core/nm-vpn-plugin-info.c:1175
- msgid "missing service for VPN plugin info"
- msgstr "VPN プラグイン情報の不明なサービス"
-
-@@ -12599,15 +12930,15 @@ msgstr "Tun"
- msgid "Veth"
- msgstr "Veth"
-
--#: ../libnm-glib/nm-device.c:1884 ../libnm/nm-device.c:1462
-+#: ../libnm-glib/nm-device.c:1884 ../libnm/nm-device.c:1464
- msgid "Wired"
- msgstr "有線"
-
--#: ../libnm-glib/nm-device.c:1915 ../libnm/nm-device.c:1493
-+#: ../libnm-glib/nm-device.c:1915 ../libnm/nm-device.c:1495
- msgid "PCI"
- msgstr "PCI"
-
--#: ../libnm-glib/nm-device.c:1917 ../libnm/nm-device.c:1495
-+#: ../libnm-glib/nm-device.c:1917 ../libnm/nm-device.c:1497
- msgid "USB"
- msgstr "USB"
-
-@@ -12618,7 +12949,7 @@ msgstr "USB"
- #. * the strings otherwise.
- #.
- #: ../libnm-glib/nm-device.c:2014 ../libnm-glib/nm-device.c:2033
--#: ../libnm/nm-device.c:1808 ../libnm/nm-device.c:1827
-+#: ../libnm/nm-device.c:1810 ../libnm/nm-device.c:1829
- #, c-format
- msgctxt "long device name"
- msgid "%s %s"
-@@ -12683,7 +13014,7 @@ msgstr "無効な phase2 プライベートキー"
- msgid "requires '%s' or '%s' setting"
- msgstr "'%s' または '%s' の設定が必要です"
-
--#: ../libnm-util/nm-setting-bond.c:581
-+#: ../libnm-util/nm-setting-bond.c:580
- #, c-format
- msgid "'%s' is not a valid interface name for '%s' option"
- msgstr "'%s' は、'%s' オプションの有効なインターフェース名ではありません"
-@@ -12729,12 +13060,12 @@ msgstr "%d. IPv6 アドレスは無効です"
- msgid "%d. IPv6 address has invalid prefix"
- msgstr "%d. IPv6 アドレスのプレフィックスが無効です"
-
--#: ../libnm-util/nm-setting-vpn.c:581
-+#: ../libnm-util/nm-setting-vpn.c:580
- #, c-format
- msgid "Failed to convert '%s' value '%s' to uint"
- msgstr "'%s' 値 '%s' を uint に変換するのに失敗しました"
-
--#: ../libnm-util/nm-setting-vpn.c:588
-+#: ../libnm-util/nm-setting-vpn.c:587
- #, c-format
- msgid "Secret flags property '%s' not found"
- msgstr "シークレットフラグプロパティー '%s' が見つかりません"
-@@ -12744,133 +13075,125 @@ msgstr "シークレットフラグプロパティー '%s' が見つかりませ
- msgid "requires setting '%s' property"
- msgstr "'%s' プロパティーの設定が必要です"
-
--#: ../libnm/nm-device-adsl.c:72
-+#: ../libnm/nm-device-adsl.c:69
- msgid "The connection was not an ADSL connection."
- msgstr "接続は、ADSL 接続ではありませんでした。"
-
--#: ../libnm/nm-device-bond.c:111
-+#: ../libnm/nm-device-bond.c:109
- msgid "The connection was not a bond connection."
- msgstr "接続は、ボンド接続ではありませんでした。"
-
--#: ../libnm/nm-device-bridge.c:115
-+#: ../libnm/nm-device-bridge.c:113
- msgid "The connection was not a bridge connection."
- msgstr "接続は、ブリッジ接続ではありませんでした。"
-
--#: ../libnm/nm-device-bt.c:137
-+#: ../libnm/nm-device-bt.c:135
- #, c-format
- msgid "The connection was not a Bluetooth connection."
- msgstr "接続は、Bluetooth 接続ではありませんでした。"
-
--#: ../libnm/nm-device-bt.c:143
-+#: ../libnm/nm-device-bt.c:141
- #, c-format
- msgid "The connection is of Bluetooth NAP type."
- msgstr "接続は、Bluetooth NAP タイプです。"
-
--#: ../libnm/nm-device-bt.c:152
-+#: ../libnm/nm-device-bt.c:150
- msgid "Invalid device Bluetooth address."
- msgstr "無効なデバイス Bluetooth アドレスです。"
-
--#: ../libnm/nm-device-bt.c:158
-+#: ../libnm/nm-device-bt.c:156
- msgid "The Bluetooth addresses of the device and the connection didn't match."
- msgstr "デバイスと接続の Bluetooth アドレスが一致しませんでした。"
-
--#: ../libnm/nm-device-bt.c:167
-+#: ../libnm/nm-device-bt.c:165
- msgid ""
- "The device is lacking Bluetooth capabilities required by the connection."
- msgstr "デバイスには、接続に必要な Bluetooth 機能がありません。"
-
--#: ../libnm/nm-device-dummy.c:76
-+#: ../libnm/nm-device-dummy.c:75
- msgid "The connection was not a dummy connection."
- msgstr "接続は、ダミー接続ではありませんでした。"
-
--#: ../libnm/nm-device-dummy.c:83 ../libnm/nm-device-generic.c:97
--#: ../libnm/nm-device-ovs-bridge.c:97 ../libnm/nm-device-ovs-interface.c:68
-+#: ../libnm/nm-device-dummy.c:82 ../libnm/nm-device-generic.c:96
-+#: ../libnm/nm-device-ovs-bridge.c:96 ../libnm/nm-device-ovs-interface.c:67
- #: ../libnm/nm-device-ovs-port.c:96
- msgid "The connection did not specify an interface name."
- msgstr "接続で、インターフェース名が指定されませんでした。"
-
--#: ../libnm/nm-device-ethernet.c:206
-+#: ../libnm/nm-device-ethernet.c:204
- msgid "The connection was not an Ethernet or PPPoE connection."
- msgstr "接続は、Ethernet または PPPoE 接続ではありませんでした。"
-
--#: ../libnm/nm-device-ethernet.c:221
-+#: ../libnm/nm-device-ethernet.c:219
- msgid "The connection and device differ in S390 subchannels."
- msgstr "接続とデバイスは、S390 サブチャネルで異なります。"
-
--#: ../libnm/nm-device-ethernet.c:236
-+#: ../libnm/nm-device-ethernet.c:234
- #, c-format
- msgid "Invalid device MAC address %s."
- msgstr "無効なデバイス MAC アドレス %s。"
-
--#: ../libnm/nm-device-ethernet.c:241
-+#: ../libnm/nm-device-ethernet.c:239
- msgid "The MACs of the device and the connection do not match."
- msgstr "デバイスと接続の MAC アドレスが一致しませんでした。"
-
--#: ../libnm/nm-device-ethernet.c:251
-+#: ../libnm/nm-device-ethernet.c:249
- #, c-format
- msgid "Invalid MAC in the blacklist: %s."
- msgstr "ブラックリストの無効な MAC: %s。"
-
--#: ../libnm/nm-device-ethernet.c:257
-+#: ../libnm/nm-device-ethernet.c:255
- #, c-format
- msgid "Device MAC (%s) is blacklisted by the connection."
- msgstr "デバイス MAC (%s) は、接続によりブラックリスト化されています。"
-
--#: ../libnm/nm-device-generic.c:90
-+#: ../libnm/nm-device-generic.c:89
- msgid "The connection was not a generic connection."
- msgstr "接続は汎用的な接続ではありませんでした。"
-
--#: ../libnm/nm-device-tun.c:208
--msgid "The connection was not a tun connection."
--msgstr "接続は tun 接続ではありませんでした。"
--
--#: ../libnm/nm-device-tun.c:217
--msgid "The mode of the device and the connection didn't match"
--msgstr "デバイスと接続のモードが一致しませんでした"
--
--#: ../libnm/nm-device-infiniband.c:93
-+#: ../libnm/nm-device-infiniband.c:91
- msgid "The connection was not an InfiniBand connection."
- msgstr "接続は InfiniBand 接続ではありませんでした。"
-
--#: ../libnm/nm-device-infiniband.c:101 ../libnm/nm-device-wifi.c:625
--#: ../libnm/nm-device-wimax.c:324
-+#: ../libnm/nm-device-infiniband.c:99 ../libnm/nm-device-wifi.c:622
-+#: ../libnm/nm-device-wimax.c:322
- msgid "Invalid device MAC address."
- msgstr "無効なデバイス MAC アドレスです。"
-
--#: ../libnm/nm-device-infiniband.c:109 ../libnm/nm-device-wifi.c:632
--#: ../libnm/nm-device-wimax.c:331
-+#: ../libnm/nm-device-infiniband.c:107 ../libnm/nm-device-wifi.c:629
-+#: ../libnm/nm-device-wimax.c:329
- msgid "The MACs of the device and the connection didn't match."
- msgstr "デバイスと接続の MAC アドレスが一致しませんでした。"
-
--#: ../libnm/nm-device-ip-tunnel.c:271
-+#: ../libnm/nm-device-ip-tunnel.c:269
- msgid "The connection was not an IP tunnel connection."
- msgstr "接続は IP トンネル接続ではありませんでした。"
-
--#: ../libnm/nm-device-macvlan.c:157
-+#: ../libnm/nm-device-macvlan.c:155
- msgid "The connection was not a MAC-VLAN connection."
- msgstr "接続は MAC-VLAN 接続ではありませんでした。"
-
--#: ../libnm/nm-device-modem.c:119
-+#: ../libnm/nm-device-modem.c:117
- msgid "The connection was not a modem connection."
- msgstr "接続はモデム接続ではありませんでした。"
-
--#: ../libnm/nm-device-modem.c:127
-+#: ../libnm/nm-device-modem.c:125
- msgid "The connection was not a valid modem connection."
- msgstr "接続は有効なモデム接続ではありませんでした。"
-
--#: ../libnm/nm-device-modem.c:134
-+#: ../libnm/nm-device-modem.c:132
- msgid "The device is lacking capabilities required by the connection."
- msgstr "デバイスには接続に必要な機能がありません。"
-
--#: ../libnm/nm-device-olpc-mesh.c:114
-+#: ../libnm/nm-device-olpc-mesh.c:112
- msgid "The connection was not an OLPC Mesh connection."
- msgstr "接続は OLPC メッシュ接続ではありませんでした。"
-
--#: ../libnm/nm-device-ovs-bridge.c:90
-+#: ../libnm/nm-device-ovs-bridge.c:89
- msgid "The connection was not a ovs_bridge connection."
- msgstr "接続は、ovs_bridge 接続ではありませんでした。"
-
--#: ../libnm/nm-device-ovs-interface.c:61
-+#: ../libnm/nm-device-ovs-interface.c:60
- msgid "The connection was not a ovs_interface connection."
- msgstr "接続は、ovs_interface 接続ではありませんでした。"
-
-@@ -12878,47 +13201,60 @@ msgstr "接続は、ovs_interface 接続ではありませんでした。"
- msgid "The connection was not a ovs_port connection."
- msgstr "接続は、ovs_port 接続ではありませんでした。"
-
--#: ../libnm/nm-device-team.c:138
-+#: ../libnm/nm-device-team.c:136
- msgid "The connection was not a team connection."
- msgstr "接続は team 接続ではありませんでした。"
-
--#: ../libnm/nm-device-vlan.c:128
-+#: ../libnm/nm-device-tun.c:207
-+msgid "The connection was not a tun connection."
-+msgstr "接続は tun 接続ではありませんでした。"
-+
-+#: ../libnm/nm-device-tun.c:216
-+msgid "The mode of the device and the connection didn't match"
-+msgstr "デバイスと接続のモードが一致しませんでした"
-+
-+#: ../libnm/nm-device-vlan.c:126
- msgid "The connection was not a VLAN connection."
- msgstr "接続は VLAN 接続ではありませんでした。"
-
--#: ../libnm/nm-device-vlan.c:135
-+#: ../libnm/nm-device-vlan.c:133
- msgid "The VLAN identifiers of the device and the connection didn't match."
- msgstr "デバイスと接続の VLAN ID が一致しませんでした。"
-
--#: ../libnm/nm-device-vlan.c:150
-+#: ../libnm/nm-device-vlan.c:148
- msgid "The hardware address of the device and the connection didn't match."
- msgstr "デバイスと接続のハードウェアアドレスが一致しませんでした。"
-
--#: ../libnm/nm-device-vxlan.c:386
-+#: ../libnm/nm-device-vxlan.c:384
- msgid "The connection was not a VXLAN connection."
- msgstr "接続は VXLAN 接続ではありませんでした。"
-
--#: ../libnm/nm-device-vxlan.c:393
-+#: ../libnm/nm-device-vxlan.c:391
- msgid "The VXLAN identifiers of the device and the connection didn't match."
- msgstr "デバイスと接続の VXLAN ID が一致しませんでした。"
-
--#: ../libnm/nm-device-wifi.c:616
-+#: ../libnm/nm-device-wifi-p2p.c:326
-+#, fuzzy
-+msgid "The connection was not a Wi-Fi P2P connection."
-+msgstr "接続は Wi-Fi 接続ではありませんでした。"
-+
-+#: ../libnm/nm-device-wifi.c:613
- msgid "The connection was not a Wi-Fi connection."
- msgstr "接続は Wi-Fi 接続ではありませんでした。"
-
--#: ../libnm/nm-device-wifi.c:652
-+#: ../libnm/nm-device-wifi.c:649
- msgid "The device is lacking WPA capabilities required by the connection."
- msgstr "デバイスには接続に必要な WPA 機能がありません。"
-
--#: ../libnm/nm-device-wifi.c:659
-+#: ../libnm/nm-device-wifi.c:656
- msgid "The device is lacking WPA2/RSN capabilities required by the connection."
- msgstr "デバイスには接続に必要な WPA2/RSN 機能がありません。"
-
--#: ../libnm/nm-device-wimax.c:315
-+#: ../libnm/nm-device-wimax.c:313
- msgid "The connection was not a WiMAX connection."
- msgstr "接続は WiMAX 接続ではありませんでした。"
-
--#: ../libnm/nm-device-wpan.c:82
-+#: ../libnm/nm-device-wpan.c:81
- msgid "The connection was not a wpan connection."
- msgstr "接続は WPAN 接続ではありませんでした。"
-
-@@ -12958,29 +13294,34 @@ msgstr "6LoWPAN"
- msgid "WireGuard"
- msgstr "WireGuard"
-
--#: ../libnm/nm-device.c:2549
-+#: ../libnm/nm-device.c:1432
-+#, fuzzy
-+msgid "Wi-Fi P2P"
-+msgstr "Wi-Fi"
-+
-+#: ../libnm/nm-device.c:2551
- #, c-format
- msgid "The connection was not valid: %s"
- msgstr "接続は有効ではありませんでした: %s"
-
--#: ../libnm/nm-device.c:2558
-+#: ../libnm/nm-device.c:2560
- #, c-format
- msgid "The interface names of the device and the connection didn't match."
- msgstr "デバイスと接続のインターフェース名が一致しませんでした。"
-
--#: ../libnm/nm-manager.c:274
-+#: ../libnm/nm-manager.c:272
- msgid "Checkpoint was removed before it was initialized"
- msgstr "チェックポイントが初期化前に削除されました"
-
--#: ../libnm/nm-manager.c:953
-+#: ../libnm/nm-manager.c:993
- msgid "Active connection removed before it was initialized"
- msgstr "アクティブな接続が初期化前に削除されました"
-
--#: ../libnm/nm-remote-settings.c:256
-+#: ../libnm/nm-remote-settings.c:253
- msgid "Connection removed before it was initialized"
- msgstr "接続が初期化前に削除されました"
-
--#: ../libnm/nm-vpn-plugin-old.c:847 ../libnm/nm-vpn-service-plugin.c:1051
-+#: ../libnm/nm-vpn-plugin-old.c:846 ../libnm/nm-vpn-service-plugin.c:1049
- msgid "No service name specified"
- msgstr "サービス名が指定されていません"
-
-@@ -13055,99 +13396,110 @@ msgid "System policy prevents control of network connections"
- msgstr "システムポリシーによりネットワーク接続の制御が阻止されます"
-
- #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:15
-+#, fuzzy
-+msgid "Allow control of Wi-Fi scans"
-+msgstr "ネットワーク接続の制御を許可"
-+
-+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:16
-+#, fuzzy
-+msgid "System policy prevents Wi-Fi scans"
-+msgstr ""
-+"システムポリシーにより Wi-Fi デバイスの有効化または無効化が阻止されます"
-+
-+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:17
- msgid "Connection sharing via a protected Wi-Fi network"
- msgstr "保護された Wi-Fi ネットワーク経由の接続共有"
-
--#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:16
-+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:18
- msgid ""
- "System policy prevents sharing connections via a protected Wi-Fi network"
- msgstr ""
- "システムポリシーにより、保護された Wi-Fi ネットワーク経由の接続共有が阻止され"
- "ます。"
-
--#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:17
-+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:19
- msgid "Connection sharing via an open Wi-Fi network"
- msgstr "保護されていない Wi-Fi ネットワーク経由の接続共有"
-
--#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:18
-+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:20
- msgid "System policy prevents sharing connections via an open Wi-Fi network"
- msgstr ""
- "システムポリシーにより、保護されていない Wi-Fi ネットワーク経由の接続共有が阻"
- "止されます。"
-
--#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:19
-+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:21
- msgid "Modify personal network connections"
- msgstr "個人のネットワーク接続を編集"
-
--#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:20
-+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:22
- msgid "System policy prevents modification of personal network settings"
- msgstr "システムポリシーにより個人のネットワーク設定の変更が阻止されます"
-
--#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:21
-+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:23
- msgid "Modify network connections for all users"
- msgstr "全ユーザーのネットワーク接続を編集"
-
--#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:22
-+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:24
- msgid "System policy prevents modification of network settings for all users"
- msgstr "システムポリシーにより、全ユーザーでネットワーク設定を編集できません"
-
--#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:23
-+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:25
- msgid "Modify persistent system hostname"
- msgstr "永続的なシステムのホスト名を修正"
-
--#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:24
-+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:26
- msgid "System policy prevents modification of the persistent system hostname"
- msgstr "システムポリシーにより、永続的なシステムのホスト名が修正できません"
-
--#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:25
-+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:27
- msgid "Modify persistent global DNS configuration"
- msgstr "永続的なグローバル DNS 設定の変更"
-
--#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:26
-+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:28
- msgid ""
- "System policy prevents modification of the persistent global DNS "
- "configuration"
- msgstr "システムポリシーにより、永続的なグローバル DNS 設定を変更できません"
-
--#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:27
-+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:29
- msgid "Perform a checkpoint or rollback of interfaces configuration"
- msgstr "インターフェース設定のチェックポイントまたはロールバックを実行"
-
--#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:28
-+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:30
- msgid "System policy prevents the creation of a checkpoint or its rollback"
- msgstr ""
- "システムポリシーによりチェックポイントまたはそのロールバックの作成が回避され"
- "ます"
-
--#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:29
-+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:31
- msgid "Enable or disable device statistics"
- msgstr "デバイスの統計値を有効または無効にする"
-
--#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:30
-+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:32
- msgid "System policy prevents enabling or disabling device statistics"
- msgstr "システムポリシーにより、デバイス統計値を有効化または無効化できません"
-
--#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:31
-+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:33
- msgid "Enable or disable connectivity checking"
- msgstr "接続確認を有効または無効にする"
-
--#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:32
-+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:34
- msgid "System policy prevents enabling or disabling connectivity checking"
- msgstr "システムポリシーにより、接続確認を有効化または無効化できません"
-
--#: ../shared/nm-utils/nm-shared-utils.c:1130
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:1481
- #, c-format
- msgid "object class '%s' has no property named '%s'"
- msgstr ""
- "オブジェクトクラス '%s' には、'%s' という名前のプロパティーがありません"
-
--#: ../shared/nm-utils/nm-shared-utils.c:1137
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:1488
- #, c-format
- msgid "property '%s' of object class '%s' is not writable"
- msgstr ""
- "プロパティー '%s' (オブジェクトクラス '%s') が書き込み可能ではありません"
-
--#: ../shared/nm-utils/nm-shared-utils.c:1144
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:1495
- #, c-format
- msgid ""
- "construct property \"%s\" for object '%s' can't be set after construction"
-@@ -13155,19 +13507,19 @@ msgstr ""
- "コンストラクトプロパティー \"%s\" (オブジェクト '%s') は構築後に設定できませ"
- "ん"
-
--#: ../shared/nm-utils/nm-shared-utils.c:1152
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:1503
- #, c-format
- msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
- msgstr ""
- "'%s::%s' は有効なプロパティー名ではありません。'%s' は GObject サブタイプでは"
- "ありません"
-
--#: ../shared/nm-utils/nm-shared-utils.c:1161
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:1512
- #, c-format
- msgid "unable to set property '%s' of type '%s' from value of type '%s'"
- msgstr "プロパティー '%s' (タイプ '%s') をタイプ '%s' の値から設定できません"
-
--#: ../shared/nm-utils/nm-shared-utils.c:1172
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:1523
- #, c-format
- msgid ""
- "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
-@@ -13180,49 +13532,49 @@ msgstr ""
- #. * as "Wired Connection" or "VPN Connection". The %d is a number
- #. * that is combined with the first argument to create a unique
- #. * connection id.
--#: ../src/NetworkManagerUtils.c:120
-+#: ../src/NetworkManagerUtils.c:122
- #, c-format
- msgctxt "connection id fallback"
- msgid "%s %u"
- msgstr "%s %u"
-
--#: ../src/main.c:180 ../src/main.c:315
-+#: ../src/main.c:177 ../src/main.c:313
- #, c-format
- msgid "Failed to read configuration: %s\n"
- msgstr "設定の読み込みに失敗しました: %s\n"
-
- #. Logging/debugging
--#: ../src/main.c:194 ../src/nm-iface-helper.c:297
-+#: ../src/main.c:191 ../src/nm-iface-helper.c:293
- msgid "Print NetworkManager version and exit"
- msgstr "NetworkManager のバージョンを表示して終了する"
-
--#: ../src/main.c:195 ../src/nm-iface-helper.c:298
-+#: ../src/main.c:192 ../src/nm-iface-helper.c:294
- msgid "Don't become a daemon"
- msgstr "デーモンにしない"
-
--#: ../src/main.c:196 ../src/nm-iface-helper.c:300
-+#: ../src/main.c:193 ../src/nm-iface-helper.c:296
- #, c-format
- msgid "Log level: one of [%s]"
- msgstr "ログレベル: [%s] のいずれか"
-
--#: ../src/main.c:198 ../src/nm-iface-helper.c:302
-+#: ../src/main.c:195 ../src/nm-iface-helper.c:298
- #, c-format
- msgid "Log domains separated by ',': any combination of [%s]"
- msgstr "',' で区切ったログドメイン: [%s] の組み合わせ"
-
--#: ../src/main.c:200 ../src/nm-iface-helper.c:304
-+#: ../src/main.c:197 ../src/nm-iface-helper.c:300
- msgid "Make all warnings fatal"
- msgstr "すべての警告を致命的にする"
-
--#: ../src/main.c:201
-+#: ../src/main.c:198
- msgid "Specify the location of a PID file"
- msgstr "PID ファイルの場所を指定する"
-
--#: ../src/main.c:203
-+#: ../src/main.c:200
- msgid "Print NetworkManager configuration and exit"
- msgstr "NetworkManager の設定を表示して終了する"
-
--#: ../src/main.c:213
-+#: ../src/main.c:210
- msgid ""
- "NetworkManager monitors all network connections and automatically\n"
- "chooses the best connection to use. It also allows the user to\n"
-@@ -13234,51 +13586,51 @@ msgstr ""
- "ワイヤレスカードを関連付けるべきワイヤレスアクセスポイントの\n"
- "ユーザーによる指定も許可されます。"
-
--#: ../src/main.c:305 ../src/main-utils.c:286 ../src/nm-iface-helper.c:441
-+#: ../src/main.c:303 ../src/main-utils.c:290 ../src/nm-iface-helper.c:439
- #, c-format
- msgid "%s. Please use --help to see a list of valid options.\n"
- msgstr "%s --help を使用して有効なオプションの一覧を確認してください。\n"
-
--#: ../src/main.c:340 ../src/nm-iface-helper.c:456
-+#: ../src/main.c:336 ../src/nm-iface-helper.c:452
- #, c-format
- msgid "Could not daemonize: %s [error %u]\n"
- msgstr "デーモン化できませんでした: %s [エラー %u]\n"
-
--#: ../src/main-utils.c:99
-+#: ../src/main-utils.c:100
- #, c-format
- msgid "Opening %s failed: %s\n"
- msgstr "%s のオープンに失敗しました: %s\n"
-
--#: ../src/main-utils.c:105
-+#: ../src/main-utils.c:107
- #, c-format
- msgid "Writing to %s failed: %s\n"
- msgstr "%s への書き込みに失敗しました: %s\n"
-
--#: ../src/main-utils.c:110
-+#: ../src/main-utils.c:113
- #, c-format
- msgid "Closing %s failed: %s\n"
- msgstr "%s のクローズに失敗しました: %s\n"
-
--#: ../src/main-utils.c:148 ../src/main-utils.c:159
-+#: ../src/main-utils.c:152 ../src/main-utils.c:163
- #, c-format
- msgid "Cannot create '%s': %s"
- msgstr "'%s' を作成できません: %s"
-
--#: ../src/main-utils.c:212
-+#: ../src/main-utils.c:216
- #, c-format
- msgid "%s is already running (pid %ld)\n"
- msgstr "%s はすでに実行中です (pid %ld)\n"
-
--#: ../src/main-utils.c:222
-+#: ../src/main-utils.c:226
- #, c-format
- msgid "You must be root to run %s!\n"
- msgstr "%s を実行するには root になる必要があります!\n"
-
--#: ../src/dhcp/nm-dhcp-dhclient-utils.c:291
-+#: ../src/dhcp/nm-dhcp-dhclient-utils.c:272
- msgid "# Created by NetworkManager\n"
- msgstr "# NetworkManager で作成されています\n"
-
--#: ../src/dhcp/nm-dhcp-dhclient-utils.c:302
-+#: ../src/dhcp/nm-dhcp-dhclient-utils.c:283
- #, c-format
- msgid ""
- "# Merged from %s\n"
-@@ -13287,7 +13639,7 @@ msgstr ""
- "# %s からマージされています\n"
- "\n"
-
--#: ../src/devices/bluetooth/nm-bluez-device.c:212
-+#: ../src/devices/bluetooth/nm-bluez-device.c:210
- #, c-format
- msgid "%s Network"
- msgstr "%s ネットワーク"
-@@ -13313,12 +13665,12 @@ msgid "DUN connection must include a GSM or CDMA setting"
- msgstr "DUN 接続には、GSM または CDMA 設定が含まれる必要があります"
-
- #: ../src/devices/bluetooth/nm-device-bt.c:322
--#: ../src/devices/wwan/nm-modem-broadband.c:696
-+#: ../src/devices/wwan/nm-modem-broadband.c:687
- msgid "GSM connection"
- msgstr "GSM 接続"
-
- #: ../src/devices/bluetooth/nm-device-bt.c:324
--#: ../src/devices/wwan/nm-modem-broadband.c:720
-+#: ../src/devices/wwan/nm-modem-broadband.c:711
- msgid "CDMA connection"
- msgstr "CDMA 接続"
-
-@@ -13329,7 +13681,7 @@ msgstr "不明な/未処理の Bluetooth 接続タイプ"
- #: ../src/devices/bluetooth/nm-device-bt.c:353
- #: ../src/devices/nm-device-ethernet.c:1432
- #: ../src/devices/nm-device-infiniband.c:190
--#: ../src/devices/wifi/nm-device-wifi.c:908
-+#: ../src/devices/wifi/nm-device-wifi.c:925
- msgid "connection does not match device"
- msgstr "接続がデバイスに一致しません"
-
-@@ -13337,15 +13689,15 @@ msgstr "接続がデバイスに一致しません"
- msgid "6LOWPAN connection"
- msgstr "6LOWPAN 接続"
-
--#: ../src/devices/nm-device-bond.c:72
-+#: ../src/devices/nm-device-bond.c:71
- msgid "Bond connection"
- msgstr "ボンド接続"
-
--#: ../src/devices/nm-device-bridge.c:153
-+#: ../src/devices/nm-device-bridge.c:154
- msgid "Bridge connection"
- msgstr "ブリッジ接続"
-
--#: ../src/devices/nm-device-dummy.c:68
-+#: ../src/devices/nm-device-dummy.c:67
- msgid "Dummy connection"
- msgstr "ダミー接続"
-
-@@ -13362,19 +13714,19 @@ msgstr "有線接続"
- msgid "Wired connection %d"
- msgstr "有線接続 %d"
-
--#: ../src/devices/nm-device-ip-tunnel.c:419
-+#: ../src/devices/nm-device-ip-tunnel.c:422
- msgid "IP tunnel connection"
- msgstr "IP トンネル接続"
-
--#: ../src/devices/nm-device-macvlan.c:366
-+#: ../src/devices/nm-device-macvlan.c:365
- msgid "MACVLAN connection"
- msgstr "MACVLAN 接続"
-
--#: ../src/devices/nm-device-tun.c:158
-+#: ../src/devices/nm-device-tun.c:157
- msgid "TUN connection"
- msgstr "TUN 接続"
-
--#: ../src/devices/nm-device-wpan.c:69
-+#: ../src/devices/nm-device-wpan.c:68
- msgid "WPAN connection"
- msgstr "WPAN 接続"
-
-@@ -13382,317 +13734,313 @@ msgstr "WPAN 接続"
- msgid "Team connection"
- msgstr "team 接続"
-
--#: ../src/devices/wifi/nm-device-olpc-mesh.c:136
-+#: ../src/devices/wifi/nm-device-olpc-mesh.c:134
- msgid "Mesh"
- msgstr "メッシュ"
-
--#: ../src/devices/wifi/nm-device-wifi.c:881
-+#: ../src/devices/wifi/nm-device-wifi.c:898
- msgid "WPA Ad-Hoc disabled due to kernel bugs"
- msgstr "WPA アドホックはカーネルバグのため無効になりました"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:43
-+#: ../src/devices/wifi/nm-wifi-utils.c:42
- #, c-format
- msgid "%s is incompatible with static WEP keys"
- msgstr "%s は静的 WEP キーと互換性がありません"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:77
-+#: ../src/devices/wifi/nm-wifi-utils.c:76
- msgid "LEAP authentication requires a LEAP username"
- msgstr "LEAP 認証には LEAP ユーザー名が必要です"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:87
-+#: ../src/devices/wifi/nm-wifi-utils.c:86
- msgid "LEAP username requires 'leap' authentication"
- msgstr "LEAP ユーザー名には 'leap' 認証が必要です"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:100
-+#: ../src/devices/wifi/nm-wifi-utils.c:99
- msgid "LEAP authentication requires IEEE 802.1x key management"
- msgstr "LEAP 認証には IEEE 802.1x キー管理が必要です"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:120
-+#: ../src/devices/wifi/nm-wifi-utils.c:119
- msgid "LEAP authentication is incompatible with Ad-Hoc mode"
- msgstr "LEAP 認証はアドホックモードと互換性がありません"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:132
-+#: ../src/devices/wifi/nm-wifi-utils.c:131
- msgid "LEAP authentication is incompatible with 802.1x setting"
- msgstr "LEAP 認証は 802.1x 設定と互換性がありません"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:154
-+#: ../src/devices/wifi/nm-wifi-utils.c:153
- #, c-format
- msgid "a connection using '%s' authentication cannot use WPA key management"
- msgstr "'%s' 認証を使用している接続は WPA キー管理を使用できません"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:165
-+#: ../src/devices/wifi/nm-wifi-utils.c:164
- #, c-format
- msgid "a connection using '%s' authentication cannot specify WPA protocols"
- msgstr "'%s' 認証を使用している接続は WPA プロトコルを指定できません"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:181
--#: ../src/devices/wifi/nm-wifi-utils.c:198
-+#: ../src/devices/wifi/nm-wifi-utils.c:180
-+#: ../src/devices/wifi/nm-wifi-utils.c:197
- #, c-format
- msgid "a connection using '%s' authentication cannot specify WPA ciphers"
- msgstr "'%s' 認証を使用している接続は WPA 暗号を指定できません"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:210
-+#: ../src/devices/wifi/nm-wifi-utils.c:209
- #, c-format
- msgid "a connection using '%s' authentication cannot specify a WPA password"
- msgstr "'%s' 認証を使用している接続は WPA パスワードを指定できません"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:241
-+#: ../src/devices/wifi/nm-wifi-utils.c:240
- msgid "Dynamic WEP requires an 802.1x setting"
- msgstr "動的 WEP には 802.1x 設定が必要です"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:251
--#: ../src/devices/wifi/nm-wifi-utils.c:279
-+#: ../src/devices/wifi/nm-wifi-utils.c:250
-+#: ../src/devices/wifi/nm-wifi-utils.c:278
- msgid "Dynamic WEP requires 'open' authentication"
- msgstr "動的 WEP には 'open' 認証が必要です"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:266
-+#: ../src/devices/wifi/nm-wifi-utils.c:265
- msgid "Dynamic WEP requires 'ieee8021x' key management"
- msgstr "動的 WEP には 'ieee8021x' キー管理が必要です"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:313
-+#: ../src/devices/wifi/nm-wifi-utils.c:312
- msgid "WPA-PSK authentication is incompatible with 802.1x"
- msgstr "WPA-PSK 認証は 802.1x と互換性がありません"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:323
-+#: ../src/devices/wifi/nm-wifi-utils.c:322
- msgid "WPA-PSK requires 'open' authentication"
- msgstr "WPA-PSK には 'open' 認証が必要です"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:335
-+#: ../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:348
-+#: ../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:360
-+#: ../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:372
-+#: ../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:386
-+#: ../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:416
-+#: ../src/devices/wifi/nm-wifi-utils.c:415
- msgid "WPA-EAP authentication requires an 802.1x setting"
- msgstr "WPA-EAP 認証には 802.1x 設定が必要です"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:426
-+#: ../src/devices/wifi/nm-wifi-utils.c:425
- msgid "WPA-EAP requires 'open' authentication"
- msgstr "WPA-EAP には 'open' 認証が必要です"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:437
-+#: ../src/devices/wifi/nm-wifi-utils.c:436
- msgid "802.1x setting requires 'wpa-eap' key management"
- msgstr "802.1x 設定には 'wpa-eap' キー管理が必要です"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:450
-+#: ../src/devices/wifi/nm-wifi-utils.c:449
- msgid "Access point does not support 802.1x but setting requires it"
- msgstr ""
- "アクセスポイントは 802.1x をサポートしませんが、設定では 802.1x 必要です"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:478
-+#: ../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:488
-+#: ../src/devices/wifi/nm-wifi-utils.c:487
- msgid "Ad-Hoc mode is incompatible with 802.1x security"
- msgstr "アドホックモードは 802.1x セキュリティーと互換性がありません"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:497
-+#: ../src/devices/wifi/nm-wifi-utils.c:496
- msgid "Ad-Hoc mode is incompatible with LEAP security"
- msgstr "アドホックモードは LEAP セキュリティーと互換性がありません"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:507
-+#: ../src/devices/wifi/nm-wifi-utils.c:506
- msgid "Ad-Hoc mode requires 'open' authentication"
- msgstr "アドホックモードには 'open' 認証が必要です"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:517
-+#: ../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:558
--#: ../src/devices/wifi/nm-wifi-utils.c:586
-+#: ../src/devices/wifi/nm-wifi-utils.c:557
-+#: ../src/devices/wifi/nm-wifi-utils.c:585
- #, c-format
- msgid "connection does not match access point"
- msgstr "接続がアクセスポイントに一致しません"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:610
-+#: ../src/devices/wifi/nm-wifi-utils.c:609
- msgid "Access point is unencrypted but setting specifies security"
- msgstr ""
- "アクセスポイントは暗号化されていませんが、設定ではセキュリティーが指定されて"
- "います"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:699
-+#: ../src/devices/wifi/nm-wifi-utils.c:698
- 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:709
-+#: ../src/devices/wifi/nm-wifi-utils.c:708
- msgid "WPA authentication is incompatible with Shared Key authentication"
- msgstr "WPA 認証は、共有キー認証と互換性がありません"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:756
-+#: ../src/devices/wifi/nm-wifi-utils.c:761
- msgid "Failed to determine AP security information"
- msgstr "AP セキュリティー情報の決定に失敗しました。"
-
--#: ../src/devices/wwan/nm-modem-broadband.c:686
--msgid "GSM mobile broadband connection requires a 'gsm' setting"
--msgstr "GSM モバイルブロードバンド接続には 'gsm' 設定が必要です"
--
--#: ../src/nm-config.c:563
-+#: ../src/nm-config.c:562
- #, fuzzy, c-format
- msgid "Bad '%s' option: "
- msgstr "'%s' オプションが空白です"
-
--#: ../src/nm-config.c:576
-+#: ../src/nm-config.c:575
- msgid "Config file location"
- msgstr "設定ファイルの場所"
-
--#: ../src/nm-config.c:577
-+#: ../src/nm-config.c:576
- msgid "Config directory location"
- msgstr "設定ディレクトリの場所"
-
--#: ../src/nm-config.c:578
-+#: ../src/nm-config.c:577
- msgid "System config directory location"
- msgstr "システム設定ディレクトリーの場所"
-
--#: ../src/nm-config.c:579
-+#: ../src/nm-config.c:578
- msgid "Internal config file location"
- msgstr "内部設定ファイルの場所"
-
--#: ../src/nm-config.c:580
-+#: ../src/nm-config.c:579
- msgid "State file location"
- msgstr "状態ファイルの場所"
-
--#: ../src/nm-config.c:581
-+#: ../src/nm-config.c:580
- msgid "State file for no-auto-default devices"
- msgstr "no-auto-default デバイスの状態ファイル"
-
--#: ../src/nm-config.c:582
-+#: ../src/nm-config.c:581
- msgid "List of plugins separated by ','"
- msgstr "複数のプラグインを ',' で区切った一覧"
-
--#: ../src/nm-config.c:583
-+#: ../src/nm-config.c:582
- msgid "Quit after initial configuration"
- msgstr "初期設定後に終了する"
-
--#: ../src/nm-config.c:584 ../src/nm-iface-helper.c:299
-+#: ../src/nm-config.c:583 ../src/nm-iface-helper.c:295
- 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:587
-+#: ../src/nm-config.c:586
- msgid "An http(s) address for checking internet connectivity"
- msgstr "インターネットの接続性を確認するための http(s) アドレス"
-
--#: ../src/nm-config.c:588
-+#: ../src/nm-config.c:587
- msgid "The interval between connectivity checks (in seconds)"
- msgstr "接続性チェックの間隔 (秒単位)"
-
--#: ../src/nm-config.c:589
-+#: ../src/nm-config.c:588
- msgid "The expected start of the response"
- msgstr "期待されている応答の開始点"
-
--#: ../src/nm-config.c:596
-+#: ../src/nm-config.c:595
- #, fuzzy
- msgid "NetworkManager options"
- msgstr "NetworkManager のパーミッション"
-
--#: ../src/nm-config.c:596
-+#: ../src/nm-config.c:595
- #, fuzzy
- msgid "Show NetworkManager options"
- msgstr "NetworkManager のパーミッション"
-
- #. Interface/IP config
--#: ../src/nm-iface-helper.c:279
-+#: ../src/nm-iface-helper.c:275
- msgid "The interface to manage"
- msgstr "管理するインターフェース"
-
--#: ../src/nm-iface-helper.c:280
-+#: ../src/nm-iface-helper.c:276
- msgid "Connection UUID"
- msgstr "接続 UUID"
-
--#: ../src/nm-iface-helper.c:281
-+#: ../src/nm-iface-helper.c:277
- msgid "Connection Token for Stable IDs"
- msgstr "安定 ID の接続トークン"
-
--#: ../src/nm-iface-helper.c:282
-+#: ../src/nm-iface-helper.c:278
- msgid "Whether to manage IPv6 SLAAC"
- msgstr "IPv6 SLAAC を管理するかどうか"
-
--#: ../src/nm-iface-helper.c:283
-+#: ../src/nm-iface-helper.c:279
- msgid "Whether SLAAC must be successful"
- msgstr "SLAAC が成功する必要があるかどうか"
-
--#: ../src/nm-iface-helper.c:284
-+#: ../src/nm-iface-helper.c:280
- msgid "Use an IPv6 temporary privacy address"
- msgstr "IPv6 一時プライバシーアドレスの使用"
-
--#: ../src/nm-iface-helper.c:285
-+#: ../src/nm-iface-helper.c:281
- msgid "Current DHCPv4 address"
- msgstr "現在の DHCPv4 アドレス"
-
--#: ../src/nm-iface-helper.c:286
-+#: ../src/nm-iface-helper.c:282
- msgid "Whether DHCPv4 must be successful"
- msgstr "DHCPv4 が成功する必要があるかどうか"
-
--#: ../src/nm-iface-helper.c:287
-+#: ../src/nm-iface-helper.c:283
- msgid "Hex-encoded DHCPv4 client ID"
- msgstr "16 進エンコードされた DHCPv4 クライアント ID"
-
--#: ../src/nm-iface-helper.c:288
-+#: ../src/nm-iface-helper.c:284
- msgid "Hostname to send to DHCP server"
- msgstr "DHCP サーバーに送信するホスト名"
-
--#: ../src/nm-iface-helper.c:288
-+#: ../src/nm-iface-helper.c:284
- msgid "barbar"
- msgstr "barbar"
-
--#: ../src/nm-iface-helper.c:289
-+#: ../src/nm-iface-helper.c:285
- msgid "FQDN to send to DHCP server"
- msgstr "DHCP サーバーに送信する FQDN"
-
--#: ../src/nm-iface-helper.c:289
-+#: ../src/nm-iface-helper.c:285
- msgid "host.domain.org"
- msgstr "host.domain.org"
-
--#: ../src/nm-iface-helper.c:290
-+#: ../src/nm-iface-helper.c:286
- msgid "Route priority for IPv4"
- msgstr "IPv4 のルート優先度"
-
--#: ../src/nm-iface-helper.c:290
-+#: ../src/nm-iface-helper.c:286
- msgid "0"
- msgstr "0"
-
--#: ../src/nm-iface-helper.c:291
-+#: ../src/nm-iface-helper.c:287
- msgid "Route priority for IPv6"
- msgstr "IPv6 のルート優先度"
-
--#: ../src/nm-iface-helper.c:291
-+#: ../src/nm-iface-helper.c:287
- msgid "1024"
- msgstr "1024"
-
--#: ../src/nm-iface-helper.c:292
-+#: ../src/nm-iface-helper.c:288
- msgid "Hex-encoded Interface Identifier"
- msgstr "16 進エンコードされたインターフェース ID"
-
--#: ../src/nm-iface-helper.c:293
-+#: ../src/nm-iface-helper.c:289
- msgid "IPv6 SLAAC address generation mode"
- msgstr "IPv6 SLAAC アドレス生成モード"
-
--#: ../src/nm-iface-helper.c:294
-+#: ../src/nm-iface-helper.c:290
- msgid ""
- "The logging backend configuration value. See logging.backend in "
- "NetworkManager.conf"
-@@ -13700,7 +14048,7 @@ msgstr ""
- "ロギングバックエンド設定値。NetworkManager.conf の logging.backend を参照して"
- "ください"
-
--#: ../src/nm-iface-helper.c:314
-+#: ../src/nm-iface-helper.c:310
- msgid ""
- "nm-iface-helper is a small, standalone process that manages a single network "
- "interface."
-@@ -13708,41 +14056,179 @@ msgstr ""
- "nm-iface-helper は、単一のネットワークインターフェースを管理する小さいスタン"
- "ドアロンプロセスです。"
-
--#: ../src/nm-iface-helper.c:422
-+#: ../src/nm-iface-helper.c:419
- #, c-format
- msgid "An interface name and UUID are required\n"
- msgstr "インターフェース名と UUID が’必要です\n"
-
--#: ../src/nm-iface-helper.c:428
-+#: ../src/nm-iface-helper.c:426
- #, c-format
- msgid "Failed to find interface index for %s (%s)\n"
- msgstr "%s (%s) のインターフェースインデックスの検出に失敗しました\n"
-
--#: ../src/nm-iface-helper.c:446
-+#: ../src/nm-iface-helper.c:444
- #, c-format
- msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n"
- msgstr "コマンドラインに渡された未認識のログドメイン '%s' を無視します。\n"
-
--#: ../src/nm-iface-helper.c:485
-+#: ../src/nm-iface-helper.c:481
- #, c-format
- msgid "(%s): Invalid IID %s\n"
- msgstr "(%s): 無効な IID %s\n"
-
--#: ../src/nm-iface-helper.c:496
-+#: ../src/nm-iface-helper.c:492
- #, c-format
- msgid "(%s): Invalid DHCP client-id %s\n"
- msgstr "(%s): 無効な DHCP client-id %s\n"
-
--#: ../src/nm-logging.c:275
-+#: ../src/nm-logging.c:290
- #, c-format
- msgid "Unknown log level '%s'"
- msgstr "不明なログレベル '%s'"
-
--#: ../src/nm-logging.c:377
-+#: ../src/nm-logging.c:400
- #, c-format
- msgid "Unknown log domain '%s'"
- msgstr "不明なログドメイン '%s'"
-
-+#~ msgid "Error: failed to remove a value from %s.%s: %s."
-+#~ msgstr "エラー: '%s' の値の削除に失敗しました、%s: %s。"
-+
-+#~ msgid "WEP"
-+#~ msgstr "WEP"
-+
-+#~ msgid "WPA1"
-+#~ msgstr "WPA1"
-+
-+#~ msgid "WPA2"
-+#~ msgstr "WPA2"
-+
-+#~ msgid "802.1X"
-+#~ msgstr "802.1X"
-+
-+#~ msgid "default route cannot be added (NetworkManager handles it by itself)"
-+#~ msgstr ""
-+#~ "デフォルトのルートは追加できません (NetworkManager 自体が処理します)"
-+
-+#~ msgid "priority '%s' is not valid (<0-%ld>)"
-+#~ msgstr "'%s' は有効な優先度ではありません (<0-%ld>)"
-+
-+#~ msgid "no item to remove"
-+#~ msgstr "削除するアイテムがありません"
-+
-+#~ msgid "index '%d' is not in range <0-%d>"
-+#~ msgstr "インデックス '%d' は範囲内にありません <0-%d>"
-+
-+#~ msgid "missing option"
-+#~ msgstr "足りないオプション"
-+
-+#~ msgid "'%s' is not a valid MAC"
-+#~ msgstr "'%s' は有効な MAC ではありません"
-+
-+#~ msgid "the property doesn't contain EAP method '%s'"
-+#~ msgstr "プロパティーには EAP メソッド '%s' が含まれません"
-+
-+#~ msgid "the property doesn't contain alternative subject match '%s'"
-+#~ msgstr "プロパティーには代替のサブジェクトマッチ '%s' が含まれません"
-+
-+#~ msgid ""
-+#~ "the property doesn't contain \"phase2\" alternative subject match '%s'"
-+#~ msgstr ""
-+#~ "プロパティーには代替の \"phase2\" サブジェクトマッチ '%s' が含まれません"
-+
-+#~ msgid "the property doesn't contain permission '%s'"
-+#~ msgstr "プロパティーにはパーミッション '%s' が含まれません"
-+
-+#~ msgid "the property doesn't contain UUID '%s'"
-+#~ msgstr "プロパティーには UUID '%s' が含まれません"
-+
-+#~ msgid "the property doesn't contain DNS server '%s'"
-+#~ msgstr "プロパティーには DNS サーバー '%s' が含まれません"
-+
-+#~ msgid "the property doesn't contain DNS search domain '%s'"
-+#~ msgstr "プロパティーには DNS 検索ドメイン '%s' が含まれません"
-+
-+#~ msgid "the property doesn't contain DNS option '%s'"
-+#~ msgstr "プロパティーには DNS オプション '%s' が含まれません"
-+
-+#~ msgid "the property doesn't contain IP address '%s'"
-+#~ msgstr "プロパティーには IP アドレス '%s' が含まれません"
-+
-+#~ msgid "the property doesn't contain route '%s'"
-+#~ msgstr "プロパティーにはルート '%s' が含まれません"
-+
-+#~ msgid "invalid IPv6 address '%s'"
-+#~ msgstr "無効な IPv6 アドレス '%s'"
-+
-+#~ msgid "the property doesn't contain interface name '%s'"
-+#~ msgstr "プロパティーにはインターフェース名 '%s' が含まれません"
-+
-+#~ msgid "the property doesn't contain vf with index %u"
-+#~ msgstr "プロパティーにはインデックス %u を持つ vf が含まれません"
-+
-+#~ msgid "the property doesn't contain qdisc '%s'"
-+#~ msgstr "プロパティーには qdisc '%s' が含まれません"
-+
-+#~ msgid ""
-+#~ "The valid syntax is: '[root | parent <handle>] [handle <handle>] "
-+#~ "<tfilter>'"
-+#~ msgstr "有効な構文: '[root | parent <handle>] [handle <handle>] <tfilter>'"
-+
-+#~ msgid "the property doesn't contain tfilter '%s'"
-+#~ msgstr "プロパティーには tfilter '%s' が含まれません"
-+
-+#~ msgid "the property doesn't contain string '%s'"
-+#~ msgstr "プロパティーには文字列 '%s' が含まれません"
-+
-+#~ msgid "the property doesn't contain link watcher '%s'"
-+#~ msgstr "プロパティーにはリンクウォッチャー '%s' が含まれません"
-+
-+#~ msgid "only one mapping at a time is supported; taking the first one (%s)"
-+#~ msgstr ""
-+#~ "マッピングは一度に 1 つだけ行います。最初のマッピング (%s) を行います。"
-+
-+#~ msgid "the property doesn't contain mapping '%s'"
-+#~ msgstr "プロパティーにはマッピング '%s' が含まれません"
-+
-+#~ msgid "no priority to remove"
-+#~ msgstr "削除する優先度がありません"
-+
-+#~ msgid "index '%d' is not in the range of <0-%d>"
-+#~ msgstr "インデックス '%d' は <0-%d> の範囲内にありません"
-+
-+#~ msgid "'%s' cannot be empty"
-+#~ msgstr "'%s' を空白にすることはできません"
-+
-+#~ msgid "the property doesn't contain MAC address '%s'"
-+#~ msgstr "プロパティーには MAC アドレス '%s' が含まれません"
-+
-+#~ msgid "'%s' string value should consist of 1 - 199 characters"
-+#~ msgstr "'%s' 文字列値は 1 - 199 の文字で構成される必要があります"
-+
-+#~ msgid "the property doesn't contain protocol '%s'"
-+#~ msgstr "プロパティーにはプロトコル '%s' が含まれません"
-+
-+#~ msgid "'%s' is not a valid PSK"
-+#~ msgstr "'%s' は有効な PSK ではありません"
-+
-+#~ msgid ""
-+#~ "Pre-Shared-Key for WPA networks. If the key is 64-characters long, it "
-+#~ "must contain only hexadecimal characters and is interpreted as a "
-+#~ "hexadecimal WPA key. Otherwise, the key must be between 8 and 63 ASCII "
-+#~ "characters (as specified in the 802.11i standard) and is interpreted as a "
-+#~ "WPA passphrase, and is hashed to derive the actual WPA-PSK used when "
-+#~ "connecting to the Wi-Fi network."
-+#~ msgstr ""
-+#~ "WPA ネットワークの共有前のキー。このキーを 64 文字の長さにする場合は、16 "
-+#~ "進数の文字でなければならず、16 進数の WPA キーとして解釈されません。それ以"
-+#~ "外では、キーは、(802.11i 仕様で指定されているように) 8 文字から 63 文字の "
-+#~ "ASCII 文字にする必要があり、WPA パスフレーズとして解釈されます。接続が Wi-"
-+#~ "Fi ネットワークに接続する際に使用される実際の WPA-PSK を取得するためにハッ"
-+#~ "シュ化されます。"
-+
-+#~ msgid "GSM mobile broadband connection requires a 'gsm' setting"
-+#~ msgstr "GSM モバイルブロードバンド接続には 'gsm' 設定が必要です"
-+
- #~ msgid "Error: Failed to setup a Wi-Fi hotspot"
- #~ msgstr "エラー: Wi-Fi hotspot の設定に失敗しました"
-
-diff --git a/po/zh_CN.po b/po/zh_CN.po
-index 585a2ff2e3..6652b5b585 100644
---- a/po/zh_CN.po
-+++ b/po/zh_CN.po
-@@ -17,7 +17,7 @@ msgid ""
- msgstr ""
- "Project-Id-Version: NetworkManager master\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2019-01-08 18:22+0100\n"
-+"POT-Creation-Date: 2019-05-21 09:59+0200\n"
- "PO-Revision-Date: 2018-08-30 12:00+0800\n"
- "Last-Translator: Dingzhong Chen <wsxy162@gmail.com>\n"
- "Language-Team: Chinese (China) <i18n-zh@googlegroups.com>\n"
-@@ -28,7 +28,7 @@ msgstr ""
- "Plural-Forms: nplurals=1; plural=0;\n"
- "X-Generator: Poedit 2.1.1\n"
-
--#: ../clients/cli/agent.c:40
-+#: ../clients/cli/agent.c:39
- #, c-format
- msgid ""
- "Usage: nmcli agent { COMMAND | help }\n"
-@@ -41,7 +41,7 @@ msgstr ""
- "命令 := { secret | polkit | all }\n"
- "\n"
-
--#: ../clients/cli/agent.c:48
-+#: ../clients/cli/agent.c:47
- #, c-format
- msgid ""
- "Usage: nmcli agent secret { help }\n"
-@@ -60,7 +60,7 @@ msgstr ""
- "\n"
- "\n"
-
--#: ../clients/cli/agent.c:58
-+#: ../clients/cli/agent.c:57
- #, c-format
- msgid ""
- "Usage: nmcli agent polkit { help }\n"
-@@ -77,7 +77,7 @@ msgstr ""
- "当 polkit 守护进程要求授权时，nmcli 询问用户后将其响应返回 polkit。\n"
- "\n"
-
--#: ../clients/cli/agent.c:68
-+#: ../clients/cli/agent.c:67
- #, c-format
- msgid ""
- "Usage: nmcli agent all { help }\n"
-@@ -91,49 +91,49 @@ msgstr ""
- "理运行。\n"
- "\n"
-
--#: ../clients/cli/agent.c:157
-+#: ../clients/cli/agent.c:159
- #, c-format
- msgid "nmcli successfully registered as a NetworkManager's secret agent.\n"
- msgstr ""
- "nmcli 已成功地注册为网络管理器（NetworkManager）的密钥（secret）代理。\n"
-
--#: ../clients/cli/agent.c:159
-+#: ../clients/cli/agent.c:161
- #, c-format
- msgid "Error: secret agent initialization failed"
- msgstr "错误：密钥（secret）代理初始化失败"
-
--#: ../clients/cli/agent.c:178
-+#: ../clients/cli/agent.c:180
- #, c-format
- msgid "Error: polkit agent initialization failed: %s"
- msgstr "错误：polkit 代理初始化失败：%s"
-
--#: ../clients/cli/agent.c:186
-+#: ../clients/cli/agent.c:188
- #, c-format
- msgid "nmcli successfully registered as a polkit agent.\n"
- msgstr "nmcli 已成功地注册为 polkit 代理。\n"
-
--#: ../clients/cli/common.c:361 ../clients/cli/common.c:362
--#: ../clients/cli/common.c:393 ../clients/cli/common.c:394
--#: ../clients/cli/connections.c:1454
-+#: ../clients/cli/common.c:360 ../clients/cli/common.c:361
-+#: ../clients/cli/common.c:392 ../clients/cli/common.c:393
-+#: ../clients/cli/connections.c:1460
- msgid "GROUP"
- msgstr "组"
-
--#: ../clients/cli/common.c:621
-+#: ../clients/cli/common.c:620
- #, c-format
- msgid "Error: openconnect failed: %s\n"
- msgstr "错误：openconnect 失败：%s\n"
-
--#: ../clients/cli/common.c:628
-+#: ../clients/cli/common.c:627
- #, c-format
- msgid "Error: openconnect failed with status %d\n"
- msgstr "错误：openconnect 失败，状态为 %d\n"
-
--#: ../clients/cli/common.c:630
-+#: ../clients/cli/common.c:629
- #, c-format
- msgid "Error: openconnect failed with signal %d\n"
- msgstr "错误：openconnect 失败，信号为 %d\n"
-
--#: ../clients/cli/common.c:711
-+#: ../clients/cli/common.c:717
- #, c-format
- msgid ""
- "Warning: password for '%s' not given in 'passwd-file' and nmcli cannot ask "
-@@ -143,135 +143,135 @@ msgstr ""
- "就无法进行\n"
- "询问。\n"
-
--#: ../clients/cli/common.c:1211
-+#: ../clients/cli/common.c:1217
- #, c-format
- msgid "Error: Could not create NMClient object: %s."
- msgstr "错误：无法创建 NMClient 对象：%s。"
-
--#: ../clients/cli/common.c:1231
-+#: ../clients/cli/common.c:1237
- msgid "Error: NetworkManager is not running."
- msgstr "错误：网络管理器（NetworkManager）未运行。"
-
--#: ../clients/cli/common.c:1327
-+#: ../clients/cli/common.c:1333
- #, c-format
- msgid "Error: argument '%s' not understood. Try passing --help instead."
- msgstr "错误：不能理解参数 \"%s\"。试下换成传递 --help 参数。"
-
--#: ../clients/cli/common.c:1337
-+#: ../clients/cli/common.c:1343
- msgid "Error: missing argument. Try passing --help."
- msgstr "错误：缺少参数。试下传递 --help 参数。"
-
--#: ../clients/cli/common.c:1390
-+#: ../clients/cli/common.c:1412
- msgid "access denied"
- msgstr "访问遭到拒绝"
-
--#: ../clients/cli/common.c:1398 ../clients/cli/connections.c:81
--#: ../clients/cli/connections.c:90 ../clients/cli/devices.c:444
--#: ../clients/cli/devices.c:536 ../clients/cli/devices.c:543
--#: ../clients/cli/general.c:41 ../clients/cli/general.c:129
--#: ../clients/cli/general.c:134 ../clients/common/nm-client-utils.c:260
--#: ../clients/common/nm-client-utils.c:273
-+#: ../clients/cli/common.c:1420 ../clients/cli/connections.c:79
-+#: ../clients/cli/connections.c:88 ../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:282
--#: ../clients/common/nm-meta-setting-desc.c:1567
--#: ../clients/common/nm-meta-setting-desc.c:1617
--#: ../clients/common/nm-meta-setting-desc.c:2757
--#: ../clients/common/nm-meta-setting-desc.c:2812
-+#: ../clients/common/nm-client-utils.c:281
-+#: ../clients/common/nm-client-utils.c:286
-+#: ../clients/common/nm-meta-setting-desc.c:1766
-+#: ../clients/common/nm-meta-setting-desc.c:1797
-+#: ../clients/common/nm-meta-setting-desc.c:2708
-+#: ../clients/common/nm-meta-setting-desc.c:2766
- msgid "unknown"
- msgstr "未知"
-
--#: ../clients/cli/common.c:1399
-+#: ../clients/cli/common.c:1421
- msgid "none"
- msgstr "无"
-
--#: ../clients/cli/common.c:1400
-+#: ../clients/cli/common.c:1422
- msgid "portal"
- msgstr "入口"
-
--#: ../clients/cli/common.c:1401
-+#: ../clients/cli/common.c:1423
- msgid "limited"
- msgstr "受限"
-
--#: ../clients/cli/common.c:1402
-+#: ../clients/cli/common.c:1424
- msgid "full"
- msgstr "完全"
-
- #. define some prompts for connection editor
--#: ../clients/cli/connections.c:65
-+#: ../clients/cli/connections.c:63
- msgid "Setting name? "
- msgstr "设置名称？"
-
--#: ../clients/cli/connections.c:66
-+#: ../clients/cli/connections.c:64
- msgid "Property name? "
- msgstr "属性名称？"
-
--#: ../clients/cli/connections.c:67
-+#: ../clients/cli/connections.c:65
- msgid "Enter connection type: "
- msgstr "输入连接类型："
-
- #. define some other prompts
--#: ../clients/cli/connections.c:71
-+#: ../clients/cli/connections.c:69
- msgid "Connection (name, UUID, or path): "
- msgstr "连接（名称、UUID 或路径）："
-
--#: ../clients/cli/connections.c:72
-+#: ../clients/cli/connections.c:70
- msgid "VPN connection (name, UUID, or path): "
- msgstr "VPN 连接（名称、UUID 或路径）："
-
--#: ../clients/cli/connections.c:73
-+#: ../clients/cli/connections.c:71
- msgid "Connection(s) (name, UUID, or path): "
- msgstr "连接（名称、UUID 或路径）："
-
- # apath = active path
--#: ../clients/cli/connections.c:74
-+#: ../clients/cli/connections.c:72
- msgid "Connection(s) (name, UUID, path or apath): "
- msgstr "连接（名称、UUID、路径或活动路径）："
-
--#: ../clients/cli/connections.c:82
-+#: ../clients/cli/connections.c:80
- msgid "activating"
- msgstr "激活中"
-
--#: ../clients/cli/connections.c:83
-+#: ../clients/cli/connections.c:81
- msgid "activated"
- msgstr "已激活"
-
--#: ../clients/cli/connections.c:84 ../clients/common/nm-client-utils.c:271
-+#: ../clients/cli/connections.c:82 ../clients/common/nm-client-utils.c:275
- msgid "deactivating"
- msgstr "停用中"
-
--#: ../clients/cli/connections.c:85
-+#: ../clients/cli/connections.c:83
- msgid "deactivated"
- msgstr "已停用"
-
--#: ../clients/cli/connections.c:91
-+#: ../clients/cli/connections.c:89
- msgid "VPN connecting (prepare)"
- msgstr "VPN 连接中（准备）"
-
--#: ../clients/cli/connections.c:92
-+#: ../clients/cli/connections.c:90
- msgid "VPN connecting (need authentication)"
- msgstr "VPN 连接中（需要验证）"
-
--#: ../clients/cli/connections.c:93
-+#: ../clients/cli/connections.c:91
- msgid "VPN connecting"
- msgstr "VPN 连接中"
-
--#: ../clients/cli/connections.c:94
-+#: ../clients/cli/connections.c:92
- msgid "VPN connecting (getting IP configuration)"
- msgstr "VPN 连接中（获取 IP 配置中）"
-
--#: ../clients/cli/connections.c:95
-+#: ../clients/cli/connections.c:93
- msgid "VPN connected"
- msgstr "VPN 已连接"
-
--#: ../clients/cli/connections.c:96
-+#: ../clients/cli/connections.c:94
- msgid "VPN connection failed"
- msgstr "VPN 连接失败"
-
--#: ../clients/cli/connections.c:97
-+#: ../clients/cli/connections.c:95
- msgid "VPN disconnected"
- msgstr "VPN 已断开"
-
--#: ../clients/cli/connections.c:518
-+#: ../clients/cli/connections.c:516
- msgid "never"
- msgstr "从不"
-
-@@ -986,339 +986,334 @@ msgstr ""
- msgid "Error updating secrets for %s: %s\n"
- msgstr "更新 %s 的密钥时出错：%s\n"
-
--#: ../clients/cli/connections.c:1307
-+#: ../clients/cli/connections.c:1313
- msgid "Connection profile details"
- msgstr "连接配置集详情"
-
--#: ../clients/cli/connections.c:1320 ../clients/cli/connections.c:1405
-+#: ../clients/cli/connections.c:1326 ../clients/cli/connections.c:1411
- #, c-format
- msgid "Error: 'connection show': %s"
- msgstr "错误：\"connection show\"：%s"
-
--#: ../clients/cli/connections.c:1395
-+#: ../clients/cli/connections.c:1401
- msgid "Activate connection details"
- msgstr "激活连接详情"
-
--#: ../clients/cli/connections.c:1503 ../clients/cli/devices.c:1453
--#: ../clients/cli/devices.c:1467 ../clients/cli/devices.c:1482
--#: ../clients/cli/devices.c:1540 ../clients/cli/devices.c:1642
-+#: ../clients/cli/connections.c:1509 ../clients/cli/devices.c:1447
-+#: ../clients/cli/devices.c:1461 ../clients/cli/devices.c:1476
-+#: ../clients/cli/devices.c:1534 ../clients/cli/devices.c:1636
- msgid "NAME"
- msgstr "名称"
-
--#: ../clients/cli/connections.c:1591
-+#: ../clients/cli/connections.c:1602
- #, c-format
- msgid "invalid field '%s'; allowed fields: %s and %s, or %s,%s"
- msgstr "无效字段 \"%s\"；允许的字段为 %s 和 %s，或 %s,%s"
-
--#: ../clients/cli/connections.c:1606 ../clients/cli/connections.c:1614
-+#: ../clients/cli/connections.c:1612 ../clients/cli/connections.c:1620
- #, c-format
- msgid "'%s' has to be alone"
- msgstr "\"%s\" 必须是单独的"
-
--#: ../clients/cli/connections.c:1876
-+#: ../clients/cli/connections.c:1880
- #, c-format
- msgid "incorrect string '%s' of '--order' option"
- msgstr "\"--order\" 选项的字符串 \"%s\" 错误"
-
--#: ../clients/cli/connections.c:1901
-+#: ../clients/cli/connections.c:1905
- #, c-format
- msgid "incorrect item '%s' in '--order' option"
- msgstr "\"--order\" 选项里有错误项 \"%s\""
-
--#: ../clients/cli/connections.c:1939
-+#: ../clients/cli/connections.c:1943
- msgid "No connection specified"
- msgstr "未指定连接"
-
--#: ../clients/cli/connections.c:1950
-+#: ../clients/cli/connections.c:1954
- #, c-format
- msgid "%s argument is missing"
- msgstr "缺少 %s 参数"
-
--#: ../clients/cli/connections.c:1968
-+#: ../clients/cli/connections.c:1972
- #, c-format
- msgid "unknown connection '%s'"
- msgstr "未知的连接 \"%s\""
-
--#: ../clients/cli/connections.c:1997
-+#: ../clients/cli/connections.c:2001
- msgid "'--order' argument is missing"
- msgstr "缺少 \"--order\" 参数"
-
--#: ../clients/cli/connections.c:2057
-+#: ../clients/cli/connections.c:2061
- msgid "NetworkManager active profiles"
- msgstr "网络管理器活动的配置集"
-
--#: ../clients/cli/connections.c:2058
-+#: ../clients/cli/connections.c:2062
- msgid "NetworkManager connection profiles"
- msgstr "网络管理器连接配置集"
-
--#: ../clients/cli/connections.c:2110 ../clients/cli/connections.c:2856
--#: ../clients/cli/connections.c:2868 ../clients/cli/connections.c:2880
--#: ../clients/cli/connections.c:3109 ../clients/cli/connections.c:8899
--#: ../clients/cli/connections.c:8915 ../clients/cli/devices.c:2976
--#: ../clients/cli/devices.c:2988 ../clients/cli/devices.c:3001
--#: ../clients/cli/devices.c:3195 ../clients/cli/devices.c:3206
--#: ../clients/cli/devices.c:3224 ../clients/cli/devices.c:3233
--#: ../clients/cli/devices.c:3254 ../clients/cli/devices.c:3265
--#: ../clients/cli/devices.c:3283 ../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:3952
--#: ../clients/cli/devices.c:3963 ../clients/cli/devices.c:4134
-+#: ../clients/cli/connections.c:2114 ../clients/cli/connections.c:2859
-+#: ../clients/cli/connections.c:2871 ../clients/cli/connections.c:2883
-+#: ../clients/cli/connections.c:3112 ../clients/cli/connections.c:8866
-+#: ../clients/cli/connections.c:8887 ../clients/cli/devices.c:2970
-+#: ../clients/cli/devices.c:2982 ../clients/cli/devices.c:2995
-+#: ../clients/cli/devices.c:3189 ../clients/cli/devices.c:3200
-+#: ../clients/cli/devices.c:3218 ../clients/cli/devices.c:3227
-+#: ../clients/cli/devices.c:3248 ../clients/cli/devices.c:3259
-+#: ../clients/cli/devices.c:3277 ../clients/cli/devices.c:3721
-+#: ../clients/cli/devices.c:3731 ../clients/cli/devices.c:3739
-+#: ../clients/cli/devices.c:3751 ../clients/cli/devices.c:3766
-+#: ../clients/cli/devices.c:3774 ../clients/cli/devices.c:3949
-+#: ../clients/cli/devices.c:3960 ../clients/cli/devices.c:4131
- #, c-format
- msgid "Error: %s argument is missing."
- msgstr "错误：缺少 %s 参数。"
-
--#: ../clients/cli/connections.c:2138
-+#: ../clients/cli/connections.c:2142
- #, c-format
- msgid "Error: %s - no such connection profile."
- msgstr "错误：%s - 没有这样的连接配置集。"
-
--#: ../clients/cli/connections.c:2229 ../clients/cli/connections.c:2843
--#: ../clients/cli/connections.c:2907 ../clients/cli/connections.c:8419
--#: ../clients/cli/connections.c:8525 ../clients/cli/connections.c:9015
--#: ../clients/cli/devices.c:1727 ../clients/cli/devices.c:1995
--#: ../clients/cli/devices.c:2168 ../clients/cli/devices.c:2276
--#: ../clients/cli/devices.c:2468 ../clients/cli/devices.c:3915
--#: ../clients/cli/devices.c:4140 ../clients/cli/general.c:895
-+#: ../clients/cli/connections.c:2233 ../clients/cli/connections.c:2846
-+#: ../clients/cli/connections.c:2910 ../clients/cli/connections.c:8383
-+#: ../clients/cli/connections.c:8489 ../clients/cli/connections.c:8992
-+#: ../clients/cli/devices.c:1721 ../clients/cli/devices.c:1989
-+#: ../clients/cli/devices.c:2162 ../clients/cli/devices.c:2270
-+#: ../clients/cli/devices.c:2462 ../clients/cli/devices.c:3912
-+#: ../clients/cli/devices.c:4137 ../clients/cli/general.c:896
- #, c-format
- msgid "Error: %s."
- msgstr "错误：%s。"
-
--#: ../clients/cli/connections.c:2322
-+#: ../clients/cli/connections.c:2326
- #, c-format
- msgid "no active connection on device '%s'"
- msgstr "设备 \"%s\" 上没有活动的连接"
-
--#: ../clients/cli/connections.c:2330
-+#: ../clients/cli/connections.c:2334
- msgid "no active connection or device"
- msgstr "没有活动的连接或设备"
-
--#: ../clients/cli/connections.c:2350
-+#: ../clients/cli/connections.c:2354
- #, fuzzy, c-format
- msgid "device '%s' not compatible with connection '%s': "
- msgstr "设备 \"%s\" 与连接 \"%s\" 不兼容："
-
--#: ../clients/cli/connections.c:2383
-+#: ../clients/cli/connections.c:2387
- #, c-format
- msgid "device '%s' not compatible with connection '%s'"
- msgstr "设备 \"%s\" 与连接 \"%s\" 不兼容"
-
--#: ../clients/cli/connections.c:2386
-+#: ../clients/cli/connections.c:2390
- #, c-format
- msgid "no device found for connection '%s'"
- msgstr "没有找到可用于连接 \"%s\" 的设备"
-
--#: ../clients/cli/connections.c:2437
-+#: ../clients/cli/connections.c:2441
- #, c-format
- msgid "Hint: use '%s' to get more details."
- msgstr ""
-
--#: ../clients/cli/connections.c:2455
-+#: ../clients/cli/connections.c:2459
- #, c-format
- msgid "Connection successfully activated (%s) (D-Bus active path: %s)\n"
- msgstr "连接已成功激活（%s）（D-Bus 活动路径：%s）\n"
-
--#: ../clients/cli/connections.c:2459 ../clients/cli/connections.c:2609
--#: ../clients/cli/connections.c:6716
-+#: ../clients/cli/connections.c:2463 ../clients/cli/connections.c:2613
-+#: ../clients/cli/connections.c:6701
- #, c-format
- msgid "Connection successfully activated (D-Bus active path: %s)\n"
- msgstr "连接已成功激活（D-Bus 活动路径：%s）\n"
-
--#: ../clients/cli/connections.c:2466 ../clients/cli/connections.c:2588
-+#: ../clients/cli/connections.c:2470 ../clients/cli/connections.c:2592
- #, c-format
- msgid "Error: Connection activation failed: %s"
- msgstr "错误：连接激活失败：%s"
-
--#: ../clients/cli/connections.c:2503
-+#: ../clients/cli/connections.c:2507
- #, c-format
- msgid "Error: Timeout expired (%d seconds)"
- msgstr "错误：超时时间已到（%d 秒）"
-
--#: ../clients/cli/connections.c:2671
-+#: ../clients/cli/connections.c:2675
- #, c-format
- msgid "failed to read passwd-file '%s': %s"
- msgstr "读取 passwd-file \"%s\" 失败：%s"
-
--#: ../clients/cli/connections.c:2684
-+#: ../clients/cli/connections.c:2688
- #, c-format
- msgid "missing colon in 'password' entry '%s'"
- msgstr "\"password\" 条目 \"%s\" 缺失了冒号"
-
--#: ../clients/cli/connections.c:2692
-+#: ../clients/cli/connections.c:2696
- #, c-format
- msgid "missing dot in 'password' entry '%s'"
- msgstr "\"password\" 条目 \"%s\" 缺失了点号"
-
--#: ../clients/cli/connections.c:2705
-+#: ../clients/cli/connections.c:2709
- #, c-format
- msgid "invalid setting name in 'password' entry '%s'"
- msgstr "\"password\" 条目 \"%s\" 里出现无效的设置名称"
-
--#: ../clients/cli/connections.c:2759
-+#: ../clients/cli/connections.c:2763
- #, c-format
- msgid "unknown device '%s'."
- msgstr "未知设备 \"%s\"。"
-
--#: ../clients/cli/connections.c:2764
-+#: ../clients/cli/connections.c:2768
- msgid "neither a valid connection nor device given"
- msgstr "没有给定有效的连接或设备"
-
--#: ../clients/cli/connections.c:2890 ../clients/cli/devices.c:1686
--#: ../clients/cli/devices.c:3033 ../clients/cli/devices.c:3296
--#: ../clients/cli/devices.c:3969
-+#: ../clients/cli/connections.c:2893 ../clients/cli/devices.c:1680
-+#: ../clients/cli/devices.c:3027 ../clients/cli/devices.c:3290
-+#: ../clients/cli/devices.c:3966
- #, c-format
- msgid "Unknown parameter: %s\n"
- msgstr "未知参数：%s\n"
-
--#: ../clients/cli/connections.c:2915
-+#: ../clients/cli/connections.c:2918
- msgid "preparing"
- msgstr "准备中"
-
--#: ../clients/cli/connections.c:3024
-+#: ../clients/cli/connections.c:3027
- #, c-format
- msgid "Connection '%s' (%s) successfully deleted.\n"
- msgstr "成功删除连接 \"%s\" (%s)。\n"
-
--#: ../clients/cli/connections.c:3040
-+#: ../clients/cli/connections.c:3043
- #, c-format
- msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n"
- msgstr ""
- "成功停用连接 \"%s\"（D-Bus 活动路径：%s）\n"
- "\n"
-
--#: ../clients/cli/connections.c:3091 ../clients/cli/connections.c:8633
--#: ../clients/cli/connections.c:8664 ../clients/cli/connections.c:8822
-+#: ../clients/cli/connections.c:3094 ../clients/cli/connections.c:8597
-+#: ../clients/cli/connections.c:8628 ../clients/cli/connections.c:8786
- #, c-format
- msgid "Error: No connection specified."
- msgstr "错误：未指定连接。"
-
--#: ../clients/cli/connections.c:3121
-+#: ../clients/cli/connections.c:3124
- #, c-format
- msgid "Error: '%s' is not an active connection.\n"
- msgstr "错误：\"%s\" 不是活动的连接。\n"
-
--#: ../clients/cli/connections.c:3122
-+#: ../clients/cli/connections.c:3125
- #, c-format
- msgid "Error: not all active connections found."
- msgstr "错误：未找到所有的活动连接。"
-
--#: ../clients/cli/connections.c:3130
-+#: ../clients/cli/connections.c:3133
- #, c-format
- msgid "Error: no active connection provided."
- msgstr "错误：未提供活动连接。"
-
--#: ../clients/cli/connections.c:3161
-+#: ../clients/cli/connections.c:3164
- #, c-format
- msgid "Connection '%s' deactivation failed: %s\n"
- msgstr "错误：停用连接 \"%s\" 失败：%s\n"
-
--#: ../clients/cli/connections.c:3412 ../clients/cli/connections.c:3469
--#: ../clients/common/nm-client-utils.c:221
-+#: ../clients/cli/connections.c:3415 ../clients/cli/connections.c:3472
-+#: ../clients/common/nm-client-utils.c:225
- #, c-format
- msgid "'%s' not among [%s]"
- msgstr "\"%s\" 不在 [%s] 中"
-
- #. We should not really come here
--#: ../clients/cli/connections.c:3432 ../clients/cli/connections.c:3492
--#: ../clients/common/nm-client-utils.c:289
-+#: ../clients/cli/connections.c:3435 ../clients/cli/connections.c:3495
-+#: ../clients/common/nm-client-utils.c:293
- #, c-format
- msgid "Unknown error"
- msgstr "未知错误"
-
--#: ../clients/cli/connections.c:3626
-+#: ../clients/cli/connections.c:3629
- #, c-format
- msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
- msgstr "警告：master=\"%s\" 没有引用任何现有的配置集。\n"
-
--#: ../clients/cli/connections.c:3979
-+#: ../clients/cli/connections.c:3984
- #, c-format
- msgid "Error: invalid property '%s': %s."
- msgstr "错误：无效的属性 \"%s\"：%s。"
-
--#: ../clients/cli/connections.c:3996
--#, c-format
--msgid "Error: failed to modify %s.%s: %s."
-+#: ../clients/cli/connections.c:3998
-+#, fuzzy, c-format
-+msgid "Error: failed to %s %s.%s: %s."
- msgstr "错误：修改 %s.%s 失败：%s。"
-
--#: ../clients/cli/connections.c:4016
--#, c-format
--msgid "Error: failed to remove a value from %s.%s: %s."
--msgstr "错误：从 %s.%s 删除值失败：%s。"
--
--#: ../clients/cli/connections.c:4050
-+#: ../clients/cli/connections.c:4033
- #, c-format
- msgid "Error: '%s' is mandatory."
- msgstr "错误：设置 \"%s\" 是必填的。"
-
--#: ../clients/cli/connections.c:4077
-+#: ../clients/cli/connections.c:4060
- #, c-format
- msgid "Error: invalid slave type; %s."
- msgstr "错误：无效的从属类型；%s。"
-
--#: ../clients/cli/connections.c:4085
-+#: ../clients/cli/connections.c:4068
- #, c-format
- msgid "Error: invalid connection type; %s."
- msgstr "错误：无效的连接类型；%s。"
-
--#: ../clients/cli/connections.c:4162
-+#: ../clients/cli/connections.c:4145
- #, c-format
- msgid "Error: bad connection type: %s"
- msgstr "错误：错误的连接类型：%s"
-
--#: ../clients/cli/connections.c:4208
-+#: ../clients/cli/connections.c:4191
- #, c-format
- msgid "Error: '%s': %s"
- msgstr "错误：\"%s\"：%s"
-
--#: ../clients/cli/connections.c:4229
-+#: ../clients/cli/connections.c:4212
- msgid "Error: master is required"
- msgstr "错误：需要主连接"
-
--#: ../clients/cli/connections.c:4288
-+#: ../clients/cli/connections.c:4271
- #, c-format
- msgid "Error: error adding bond option '%s=%s'."
- msgstr "错误：添加绑定（bond）选项 \"%s=%s\" 时出错。"
-
--#: ../clients/cli/connections.c:4319
-+#: ../clients/cli/connections.c:4302
- #, 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:4350
-+#: ../clients/cli/connections.c:4333
- #, 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:4599
-+#: ../clients/cli/connections.c:4582
- #, c-format
- msgid "Error: value for '%s' is missing."
- msgstr "错误：缺少 \"%s\" 的值。"
-
--#: ../clients/cli/connections.c:4645
-+#: ../clients/cli/connections.c:4628
- msgid "Error: <setting>.<property> argument is missing."
- msgstr "错误：缺少 <设置>.<属性> 参数。"
-
--#: ../clients/cli/connections.c:4668
-+#: ../clients/cli/connections.c:4651
- #, c-format
- msgid "Error: invalid or not allowed setting '%s': %s."
- msgstr "错误：无效或不允许的设置 \"%s\"：%s。"
-
--#: ../clients/cli/connections.c:4714 ../clients/cli/connections.c:4730
-+#: ../clients/cli/connections.c:4699 ../clients/cli/connections.c:4715
- #, c-format
- msgid "Error: '%s' is ambiguous (%s.%s or %s.%s)."
- msgstr "错误：\"%s\" 不明确（%s.%s 或 %s.%s）。"
-
--#: ../clients/cli/connections.c:4748
-+#: ../clients/cli/connections.c:4733
- #, c-format
- msgid "Error: invalid <setting>.<property> '%s'."
- msgstr "Error: invalid <setting>.<property> '%s'."
-
--#: ../clients/cli/connections.c:4792 ../clients/cli/connections.c:8465
-+#: ../clients/cli/connections.c:4777 ../clients/cli/connections.c:8429
- #, c-format
- msgid "Error: Failed to add '%s' connection: %s"
- msgstr "错误：添加 \"%s\" 连接失败：%s"
-
--#: ../clients/cli/connections.c:4810
-+#: ../clients/cli/connections.c:4795
- #, fuzzy, c-format
- msgid ""
- "Warning: There is another connection with the name '%1$s'. Reference the "
-@@ -1328,66 +1323,66 @@ msgid_plural ""
- "the connection by its uuid '%2$s'\n"
- msgstr[0] "警告：存在名为 '%1$s' 的连接。这个连接由它的 uuid '%2$s' 指代\n"
-
--#: ../clients/cli/connections.c:4819
-+#: ../clients/cli/connections.c:4804
- #, c-format
- msgid "Connection '%s' (%s) successfully added.\n"
- msgstr "连接 \"%s\" (%s) 已成功添加。\n"
-
--#: ../clients/cli/connections.c:4872 ../clients/cli/connections.c:6839
--#: ../clients/cli/connections.c:6840 ../clients/cli/devices.c:535
--#: ../clients/cli/devices.c:542 ../clients/cli/devices.c:1207
--#: ../clients/cli/general.c:136 ../clients/cli/utils.h:296
--#: ../clients/common/nm-client-utils.c:279
--#: ../clients/common/nm-meta-setting-desc.c:771
--#: ../clients/common/nm-meta-setting-desc.c:2752
-+#: ../clients/cli/connections.c:4857 ../clients/cli/connections.c:6824
-+#: ../clients/cli/connections.c:6825 ../clients/cli/devices.c:529
-+#: ../clients/cli/devices.c:536 ../clients/cli/devices.c:1201
-+#: ../clients/cli/general.c:137 ../clients/cli/utils.h:296
-+#: ../clients/common/nm-client-utils.c:283
-+#: ../clients/common/nm-meta-setting-desc.c:939
-+#: ../clients/common/nm-meta-setting-desc.c:2703
- msgid "no"
- msgstr "否"
-
--#: ../clients/cli/connections.c:4873 ../clients/cli/connections.c:6839
--#: ../clients/cli/connections.c:6840 ../clients/cli/devices.c:534
--#: ../clients/cli/devices.c:541 ../clients/cli/devices.c:1207
--#: ../clients/cli/general.c:135 ../clients/cli/utils.h:296
--#: ../clients/common/nm-client-utils.c:278
--#: ../clients/common/nm-meta-setting-desc.c:771
--#: ../clients/common/nm-meta-setting-desc.c:2749
-+#: ../clients/cli/connections.c:4858 ../clients/cli/connections.c:6824
-+#: ../clients/cli/connections.c:6825 ../clients/cli/devices.c:528
-+#: ../clients/cli/devices.c:535 ../clients/cli/devices.c:1201
-+#: ../clients/cli/general.c:136 ../clients/cli/utils.h:296
-+#: ../clients/common/nm-client-utils.c:282
-+#: ../clients/common/nm-meta-setting-desc.c:939
-+#: ../clients/common/nm-meta-setting-desc.c:2700
- msgid "yes"
- msgstr "是"
-
--#: ../clients/cli/connections.c:4959
-+#: ../clients/cli/connections.c:4944
- #, c-format
- msgid ""
- "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:5061
-+#: ../clients/cli/connections.c:5046
- #, 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:5067
-+#: ../clients/cli/connections.c:5052
- #, 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:5200 ../clients/cli/utils.c:295
-+#: ../clients/cli/connections.c:5185 ../clients/cli/utils.c:293
- #, c-format
- msgid "Error: value for '%s' argument is required."
- msgstr "错误：需要 \"%s\" 参数的值。"
-
--#: ../clients/cli/connections.c:5207
-+#: ../clients/cli/connections.c:5192
- #, c-format
- msgid "Error: 'save': %s."
- msgstr "错误：\"save\"：%s。"
-
--#: ../clients/cli/connections.c:5293 ../clients/cli/connections.c:5304
-+#: ../clients/cli/connections.c:5278 ../clients/cli/connections.c:5289
- #, c-format
- msgid "Error: '%s' argument is required."
- msgstr "错误：需要 \"%s\" 参数。"
-
--#: ../clients/cli/connections.c:6269
-+#: ../clients/cli/connections.c:6254
- #, c-format
- msgid "['%s' setting values]\n"
- msgstr "[\"%s\" 设置值]\n"
-@@ -1395,7 +1390,7 @@ msgstr "[\"%s\" 设置值]\n"
- #. TRANSLATORS: do not translate command names and keywords before ::
- #. * However, you should translate terms enclosed in <>.
- #.
--#: ../clients/cli/connections.c:6378
-+#: ../clients/cli/connections.c:6363
- #, c-format
- msgid ""
- "---[ Main menu ]---\n"
-@@ -1427,7 +1422,7 @@ msgstr ""
- "nmcli <配置选项> <值> :: nmcli configuration\n"
- "quit :: 退出 nmcli\n"
-
--#: ../clients/cli/connections.c:6405
-+#: ../clients/cli/connections.c:6390
- #, c-format
- msgid ""
- "goto <setting>[.<prop>] | <prop> :: enter setting/property for editing\n"
-@@ -1446,7 +1441,7 @@ msgstr ""
- " nmcli connection> goto secondaries\n"
- " nmcli> goto ipv4.addresses\n"
-
--#: ../clients/cli/connections.c:6412
-+#: ../clients/cli/connections.c:6397
- #, c-format
- msgid ""
- "remove <setting>[.<prop>] :: remove setting or reset property value\n"
-@@ -1465,7 +1460,7 @@ msgstr ""
- "示例：nmcli> remove wifi-sec\n"
- " nmcli> remove eth.mtu\n"
-
--#: ../clients/cli/connections.c:6419
-+#: ../clients/cli/connections.c:6404
- #, c-format
- msgid ""
- "set [<setting>.<prop> <value>] :: set property value\n"
-@@ -1480,7 +1475,7 @@ msgstr ""
- "\n"
- "示例：nmcli> set con.id 我的连接\n"
-
--#: ../clients/cli/connections.c:6424
-+#: ../clients/cli/connections.c:6409
- #, c-format
- msgid ""
- "describe [<setting>.<prop>] :: describe property\n"
-@@ -1493,7 +1488,7 @@ msgstr ""
- "显示属性描述。您可以参阅 nm-settings(5) 手册页来查看全部的网络管理器"
- "（NetworkManager）设置和属性。\n"
-
--#: ../clients/cli/connections.c:6429
-+#: ../clients/cli/connections.c:6414
- #, c-format
- msgid ""
- "print [all] :: print setting or connection values\n"
-@@ -1508,7 +1503,7 @@ msgstr ""
- "\n"
- "示例：nmcli ipv4> print all\n"
-
--#: ../clients/cli/connections.c:6434
-+#: ../clients/cli/connections.c:6419
- #, c-format
- msgid ""
- "verify [all | fix] :: verify setting or connection validity\n"
-@@ -1532,7 +1527,7 @@ msgstr ""
- " nmcli> verify fix\n"
- " nmcli bond> verify\n"
-
--#: ../clients/cli/connections.c:6443
-+#: ../clients/cli/connections.c:6428
- #, c-format
- msgid ""
- "save [persistent|temporary] :: save the connection\n"
-@@ -1558,7 +1553,7 @@ msgstr ""
- "删\n"
- "除永久性连接，连接配置集就必须被删除。\n"
-
--#: ../clients/cli/connections.c:6454
-+#: ../clients/cli/connections.c:6439
- #, c-format
- msgid ""
- "activate [<ifname>] [/<ap>|<nsp>] :: activate the connection\n"
-@@ -1579,7 +1574,7 @@ msgstr ""
- "/<ap>|<nsp> - AP (Wi-Fi) 或者 NSP (WiMAX)（未指定 <接口名> 时前置 / 符"
- "号。）\n"
-
--#: ../clients/cli/connections.c:6461 ../clients/cli/connections.c:6619
-+#: ../clients/cli/connections.c:6446 ../clients/cli/connections.c:6604
- #, c-format
- msgid ""
- "back :: go to upper menu level\n"
-@@ -1588,7 +1583,7 @@ msgstr ""
- "back :: 转到上层菜单\n"
- "\n"
-
--#: ../clients/cli/connections.c:6464
-+#: ../clients/cli/connections.c:6449
- #, c-format
- msgid ""
- "help/? [<command>] :: help for the nmcli commands\n"
-@@ -1597,7 +1592,7 @@ msgstr ""
- "help/? [<命令>] :: nmcli 命令的帮助\n"
- "\n"
-
--#: ../clients/cli/connections.c:6467
-+#: ../clients/cli/connections.c:6452
- #, c-format
- msgid ""
- "nmcli [<conf-option> <value>] :: nmcli configuration\n"
-@@ -1624,7 +1619,7 @@ msgstr ""
- " nmcli> nmcli save-confirmation no\n"
- " nmcli> nmcli prompt-color 3\n"
-
--#: ../clients/cli/connections.c:6489 ../clients/cli/connections.c:6625
-+#: ../clients/cli/connections.c:6474 ../clients/cli/connections.c:6610
- #, c-format
- msgid ""
- "quit :: exit nmcli\n"
-@@ -1636,8 +1631,8 @@ msgstr ""
- "\n"
- "此命令用于退出 nmcli。当被编辑的连接没有保存时，会询问用户确定操作。\n"
-
--#: ../clients/cli/connections.c:6494 ../clients/cli/connections.c:6630
--#: ../clients/cli/connections.c:7065 ../clients/cli/connections.c:8048
-+#: ../clients/cli/connections.c:6479 ../clients/cli/connections.c:6615
-+#: ../clients/cli/connections.c:7024 ../clients/cli/connections.c:8009
- #, c-format
- msgid "Unknown command: '%s'\n"
- msgstr "未知命令：\"%s\"\n"
-@@ -1645,7 +1640,7 @@ msgstr "未知命令：\"%s\"\n"
- #. TRANSLATORS: do not translate command names and keywords before ::
- #. * However, you should translate terms enclosed in <>.
- #.
--#: ../clients/cli/connections.c:6559
-+#: ../clients/cli/connections.c:6544
- #, c-format
- msgid ""
- "---[ Property menu ]---\n"
-@@ -1671,7 +1666,7 @@ msgstr ""
- "help/? [<命令>] :: 输出该帮助或命令描述\n"
- "quit :: 退出 nmcli\n"
-
--#: ../clients/cli/connections.c:6584
-+#: ../clients/cli/connections.c:6569
- #, c-format
- msgid ""
- "set [<value>] :: set new value\n"
-@@ -1682,7 +1677,7 @@ msgstr ""
- "\n"
- "此命令用于设置提供的 <值> 到该属性\n"
-
--#: ../clients/cli/connections.c:6588
-+#: ../clients/cli/connections.c:6573
- #, c-format
- msgid ""
- "add [<value>] :: append new value to the property\n"
-@@ -1697,7 +1692,7 @@ msgstr ""
- "会替换该值（和 \"set\" 一样）。\n"
- "\n"
-
--#: ../clients/cli/connections.c:6594
-+#: ../clients/cli/connections.c:6579
- #, c-format
- msgid ""
- "change :: change current value\n"
-@@ -1708,7 +1703,7 @@ msgstr ""
- "\n"
- "显示当前值并允许编辑它。\n"
-
--#: ../clients/cli/connections.c:6598
-+#: ../clients/cli/connections.c:6583
- #, c-format
- msgid ""
- "remove [<value>|<index>|<option name>] :: delete the value\n"
-@@ -1740,7 +1735,7 @@ msgstr ""
- " nmcli bond.options> remove downdelay\n"
- "\n"
-
--#: ../clients/cli/connections.c:6609
-+#: ../clients/cli/connections.c:6594
- #, c-format
- msgid ""
- "describe :: describe property\n"
-@@ -1753,7 +1748,7 @@ msgstr ""
- "显示属性描述。您可以参阅 nm-settings(5) 手册页来查看所有的网络管理器"
- "（NetworkManager）设置和属性。\n"
-
--#: ../clients/cli/connections.c:6614
-+#: ../clients/cli/connections.c:6599
- #, c-format
- msgid ""
- "print [property|setting|connection] :: print property (setting, connection) "
-@@ -1766,7 +1761,7 @@ msgstr ""
- "\n"
- "显示属性。提供参数您也可以显示整个设置或连接的值。\n"
-
--#: ../clients/cli/connections.c:6622
-+#: ../clients/cli/connections.c:6607
- #, c-format
- msgid ""
- "help/? [<command>] :: help for nmcli commands\n"
-@@ -1775,28 +1770,28 @@ msgstr ""
- "help/? [<命令>] :: nmcli 命令的帮助\n"
- "\n"
-
--#: ../clients/cli/connections.c:6722
-+#: ../clients/cli/connections.c:6707
- #, c-format
- msgid "Error: Connection activation failed.\n"
- msgstr "错误：连接激活失败。\n"
-
--#: ../clients/cli/connections.c:6819
-+#: ../clients/cli/connections.c:6804
- #, 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:6837
-+#: ../clients/cli/connections.c:6822
- #, 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:6873
-+#: ../clients/cli/connections.c:6858
- #, c-format
- msgid "The connection is not saved. Do you really want to quit? %s"
- msgstr "连接未保存。您真的要退出吗？%s"
-
--#: ../clients/cli/connections.c:6915
-+#: ../clients/cli/connections.c:6899
- #, c-format
- msgid ""
- "The connection profile has been removed from another client. You may type "
-@@ -1804,66 +1799,60 @@ msgid ""
- msgstr ""
- "此连接配置集已被其他客户端移除了。您可以在主菜单中输入 \"save\" 来还原它。\n"
-
--#: ../clients/cli/connections.c:6949 ../clients/cli/connections.c:7364
--#: ../clients/cli/connections.c:7424
-+#: ../clients/cli/connections.c:6933 ../clients/cli/connections.c:7323
-+#: ../clients/cli/connections.c:7382
- #, c-format
- msgid "Allowed values for '%s' property: %s\n"
- msgstr "\"%s\" 属性允许的值：%s\n"
-
--#: ../clients/cli/connections.c:6953 ../clients/cli/connections.c:7368
--#: ../clients/cli/connections.c:7428
-+#: ../clients/cli/connections.c:6937 ../clients/cli/connections.c:7327
-+#: ../clients/cli/connections.c:7386
- #, c-format
- msgid "Enter '%s' value: "
- msgstr "输入 \"%s\" 值："
-
--#: ../clients/cli/connections.c:6968 ../clients/cli/connections.c:6990
--#: ../clients/cli/connections.c:7373 ../clients/cli/connections.c:7434
-+#: ../clients/cli/connections.c:6951 ../clients/cli/connections.c:6964
-+#: ../clients/cli/connections.c:7331 ../clients/cli/connections.c:7397
- #, c-format
- msgid "Error: failed to set '%s' property: %s\n"
- msgstr "错误：设置 \"%s\" 属性失败：%s\n"
-
--#: ../clients/cli/connections.c:6983
-+#: ../clients/cli/connections.c:6960
- #, c-format
- msgid "Edit '%s' value: "
- msgstr "编辑 \"%s\" 值："
-
--#: ../clients/cli/connections.c:7012 ../clients/cli/settings.c:395
-+#: ../clients/cli/connections.c:6978 ../clients/cli/settings.c:414
- #, c-format
- msgid "Error: %s\n"
- msgstr "错误：%s\n"
-
--#: ../clients/cli/connections.c:7017 ../clients/cli/connections.c:7532
--#: ../clients/cli/connections.c:7583
--#, c-format
--msgid "Error: failed to remove value of '%s': %s\n"
--msgstr "错误：移除 \"%s\" 的值失败：%s\n"
--
--#: ../clients/cli/connections.c:7038
-+#: ../clients/cli/connections.c:6997
- #, c-format
- msgid "Unknown command argument: '%s'\n"
- msgstr "未知的命令参数：\"%s\"\n"
-
--#: ../clients/cli/connections.c:7129
-+#: ../clients/cli/connections.c:7088
- #, c-format
- msgid "Available settings: %s\n"
- msgstr "有效设置：%s\n"
-
--#: ../clients/cli/connections.c:7141
-+#: ../clients/cli/connections.c:7100
- #, c-format
- msgid "Error: invalid setting name; %s\n"
- msgstr "错误：无效的设置名称；%s\n"
-
--#: ../clients/cli/connections.c:7159
-+#: ../clients/cli/connections.c:7118
- #, c-format
- msgid "Available properties: %s\n"
- msgstr "有效属性：%s\n"
-
--#: ../clients/cli/connections.c:7167
-+#: ../clients/cli/connections.c:7126
- #, c-format
- msgid "Error: property %s\n"
- msgstr "错误：属性 %s\n"
-
--#: ../clients/cli/connections.c:7212
-+#: ../clients/cli/connections.c:7171
- #, c-format
- msgid ""
- "Saving the connection with 'autoconnect=yes'. That might result in an "
-@@ -1873,458 +1862,463 @@ msgstr ""
- "使用 \"autoconnect=yes\" 保存该连接。这样会立即激活该连接。\n"
- "您仍要保存吗？ %s"
-
--#: ../clients/cli/connections.c:7298
-+#: ../clients/cli/connections.c:7257
- #, c-format
- msgid "You may edit the following settings: %s\n"
- msgstr "您可编辑下列设置：%s\n"
-
--#: ../clients/cli/connections.c:7329
-+#: ../clients/cli/connections.c:7288
- #, 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:7377 ../clients/cli/connections.c:7628
--#: ../clients/cli/connections.c:7660
-+#: ../clients/cli/connections.c:7335 ../clients/cli/connections.c:7589
-+#: ../clients/cli/connections.c:7621
- #, c-format
- msgid "Error: no setting selected; valid are [%s]\n"
- msgstr "错误：未选择设置；有效的为 [%s]\n"
-
--#: ../clients/cli/connections.c:7378
-+#: ../clients/cli/connections.c:7336
- #, c-format
- msgid "use 'goto <setting>' first, or 'set <setting>.<property>'\n"
- msgstr "先使用 \"goto <设置>\"，或 \"set <设置>.<属性>\"\n"
-
--#: ../clients/cli/connections.c:7393 ../clients/cli/connections.c:7559
--#: ../clients/cli/connections.c:7650
-+#: ../clients/cli/connections.c:7351 ../clients/cli/connections.c:7521
-+#: ../clients/cli/connections.c:7611
- #, c-format
- msgid "Error: invalid setting argument '%s'; valid are [%s]\n"
- msgstr "错误：无效的设置参数 \"%s\"；有效的为 [%s]\n"
-
--#: ../clients/cli/connections.c:7402
-+#: ../clients/cli/connections.c:7360
- #, c-format
- msgid "Error: missing setting for '%s' property\n"
- msgstr "错误：缺少 \"%s\" 属性的设置\n"
-
--#: ../clients/cli/connections.c:7409
-+#: ../clients/cli/connections.c:7367
- #, c-format
- msgid "Error: invalid property: %s\n"
- msgstr "错误：无效的属性：%s\n"
-
--#: ../clients/cli/connections.c:7466
-+#: ../clients/cli/connections.c:7429
- #, c-format
- msgid "Error: unknown setting '%s'\n"
- msgstr "错误：未知的设置 \"%s\"\n"
-
--#: ../clients/cli/connections.c:7491
-+#: ../clients/cli/connections.c:7454
- #, c-format
- msgid "You may edit the following properties: %s\n"
- msgstr "您可以编辑下列属性：%s\n"
-
--#: ../clients/cli/connections.c:7537
-+#: ../clients/cli/connections.c:7494 ../clients/cli/connections.c:7544
-+#, c-format
-+msgid "Error: failed to remove value of '%s': %s\n"
-+msgstr "错误：移除 \"%s\" 的值失败：%s\n"
-+
-+#: ../clients/cli/connections.c:7499
- #, c-format
- msgid "Error: no argument given; valid are [%s]\n"
- msgstr "错误：未给定参数：有效的为 [%s]\n"
-
--#: ../clients/cli/connections.c:7556
-+#: ../clients/cli/connections.c:7518
- #, c-format
- msgid "Setting '%s' is not present in the connection.\n"
- msgstr "设置 \"%s\" 在连接里未提供。\n"
-
--#: ../clients/cli/connections.c:7604
-+#: ../clients/cli/connections.c:7565
- #, c-format
- msgid "Error: %s properties, nor it is a setting name.\n"
- msgstr "错误：%s 属性，也不是设置名称。\n"
-
--#: ../clients/cli/connections.c:7629 ../clients/cli/connections.c:7661
-+#: ../clients/cli/connections.c:7590 ../clients/cli/connections.c:7622
- #, c-format
- msgid "use 'goto <setting>' first, or 'describe <setting>.<property>'\n"
- msgstr "先使用 \"goto <设置>\"，或 \"describe <设置>.<属性>\"\n"
-
--#: ../clients/cli/connections.c:7684
-+#: ../clients/cli/connections.c:7645
- #, c-format
- msgid "Error: invalid property: %s, neither a valid setting name.\n"
- msgstr "错误：无效的属性：%s，也不是有效的设置名称。\n"
-
--#: ../clients/cli/connections.c:7714
-+#: ../clients/cli/connections.c:7675
- #, c-format
- msgid "Error: unknown setting: '%s'\n"
- msgstr "错误：未知的设置：\"%s\"\n"
-
--#: ../clients/cli/connections.c:7719
-+#: ../clients/cli/connections.c:7680
- #, c-format
- msgid "Error: '%s' setting not present in the connection\n"
- msgstr "错误：设置 \"%s\" 在连接里未提供。\n"
-
--#: ../clients/cli/connections.c:7750
-+#: ../clients/cli/connections.c:7711
- #, c-format
- msgid "Error: invalid property: %s%s\n"
- msgstr "错误：无效的属性：%s%s\n"
-
--#: ../clients/cli/connections.c:7752
-+#: ../clients/cli/connections.c:7713
- msgid ", neither a valid setting name"
- msgstr "，也不是有效的设置名称"
-
--#: ../clients/cli/connections.c:7768
-+#: ../clients/cli/connections.c:7729
- #, c-format
- msgid "Invalid verify option: %s\n"
- msgstr "无效的验证选项：%s\n"
-
--#: ../clients/cli/connections.c:7776
-+#: ../clients/cli/connections.c:7737
- #, c-format
- msgid "Verify setting '%s': %s\n"
- msgstr "验证设置 \"%s\"：%s\n"
-
--#: ../clients/cli/connections.c:7791
-+#: ../clients/cli/connections.c:7752
- #, c-format
- msgid "Verify connection: %s\n"
- msgstr "验证连接：%s\n"
-
--#: ../clients/cli/connections.c:7794
-+#: ../clients/cli/connections.c:7755
- #, c-format
- msgid "The error cannot be fixed automatically.\n"
- msgstr "错误无法自动修复。\n"
-
--#: ../clients/cli/connections.c:7815
-+#: ../clients/cli/connections.c:7776
- #, c-format
- msgid "Error: invalid argument '%s'\n"
- msgstr "错误：无效的参数 \"%s\"\n"
-
--#: ../clients/cli/connections.c:7867
-+#: ../clients/cli/connections.c:7828
- #, c-format
- msgid "Error: Failed to save '%s' (%s) connection: %s\n"
- msgstr "错误：保存 \"%s\" (%s) 连接失败：%s\n"
-
--#: ../clients/cli/connections.c:7873
-+#: ../clients/cli/connections.c:7834
- #, fuzzy, c-format
- msgid "Error: Timeout saving '%s' (%s) connection\n"
- msgstr "错误：保存 \"%s\" (%s) 连接失败：%s\n"
-
--#: ../clients/cli/connections.c:7878
-+#: ../clients/cli/connections.c:7839
- #, c-format
- msgid "Connection '%s' (%s) successfully saved.\n"
- msgstr "连接 \"%s\" (%s) 已成功保存。\n"
-
--#: ../clients/cli/connections.c:7879
-+#: ../clients/cli/connections.c:7840
- #, c-format
- msgid "Connection '%s' (%s) successfully updated.\n"
- msgstr "成功地更新了连接 \"%s\" (%s)。\n"
-
--#: ../clients/cli/connections.c:7912
-+#: ../clients/cli/connections.c:7873
- #, c-format
- msgid "Error: connection verification failed: %s\n"
- msgstr "错误：连接验证失败：%s。\n"
-
--#: ../clients/cli/connections.c:7913
-+#: ../clients/cli/connections.c:7874
- msgid "(unknown error)"
- msgstr "（未知错误）"
-
--#: ../clients/cli/connections.c:7914
-+#: ../clients/cli/connections.c:7875
- #, c-format
- msgid "You may try running 'verify fix' to fix errors.\n"
- msgstr "您可以运行 \"verify fix\" 来修复错误。\n"
-
--#: ../clients/cli/connections.c:7936
-+#: ../clients/cli/connections.c:7897
- #, c-format
- msgid "Error: connection is not saved. Type 'save' first.\n"
- msgstr "错误：连接还未保存。先输入 \"save\"。\n"
-
--#: ../clients/cli/connections.c:7940
-+#: ../clients/cli/connections.c:7901
- #, c-format
- msgid "Error: connection is not valid: %s\n"
- msgstr "错误：连接是无效的：%s\n"
-
--#: ../clients/cli/connections.c:7950
-+#: ../clients/cli/connections.c:7911
- #, c-format
- msgid "Error: Cannot activate connection: %s.\n"
- msgstr "错误：无法激活连接：%s。\n"
-
--#: ../clients/cli/connections.c:7959
-+#: ../clients/cli/connections.c:7920
- #, c-format
- msgid "Error: Failed to activate '%s' (%s) connection: %s\n"
- msgstr "错误：激活 \"%s\" (%s) 连接失败：%s\n"
-
--#: ../clients/cli/connections.c:7966
-+#: ../clients/cli/connections.c:7927
- msgid "Monitoring connection activation (press any key to continue)\n"
- msgstr "正在监视连接激活（按任意键继续）\n"
-
--#: ../clients/cli/connections.c:8002
-+#: ../clients/cli/connections.c:7963
- #, c-format
- msgid "Error: status-line: %s\n"
- msgstr "错误：status-line：%s\n"
-
--#: ../clients/cli/connections.c:8010
-+#: ../clients/cli/connections.c:7971
- #, c-format
- msgid "Error: save-confirmation: %s\n"
- msgstr "错误：save-confirmation：%s\n"
-
--#: ../clients/cli/connections.c:8018
-+#: ../clients/cli/connections.c:7979
- #, c-format
- msgid "Error: show-secrets: %s\n"
- msgstr "错误：show-secrets：%s\n"
-
--#: ../clients/cli/connections.c:8025
-+#: ../clients/cli/connections.c:7986
- #, c-format
- msgid "Current nmcli configuration:\n"
- msgstr "当前 nmcli 配置：\n"
-
--#: ../clients/cli/connections.c:8033
-+#: ../clients/cli/connections.c:7994
- #, c-format
- msgid "Invalid configuration option '%s'; allowed [%s]\n"
- msgstr "无效的配置选项 \"%s\"；允许 [%s]\n"
-
--#: ../clients/cli/connections.c:8251
-+#: ../clients/cli/connections.c:8215
- #, c-format
- msgid "Error: only one of 'id', 'filename', uuid, or 'path' can be provided."
- msgstr "错误：只能提供 \"id\"、\"filename\"、\"uuid\" 或 \"path\" 之一。"
-
--#: ../clients/cli/connections.c:8265 ../clients/cli/connections.c:8426
-+#: ../clients/cli/connections.c:8229 ../clients/cli/connections.c:8390
- #, c-format
- msgid "Error: Unknown connection '%s'."
- msgstr "错误：未知连接 \"%s\"。"
-
--#: ../clients/cli/connections.c:8281
-+#: ../clients/cli/connections.c:8245
- #, c-format
- msgid "Warning: editing existing connection '%s'; 'type' argument is ignored\n"
- msgstr "警告：正在编辑已有的连接 \"%s\"；\"type\" 参数已忽略\n"
-
--#: ../clients/cli/connections.c:8284
-+#: ../clients/cli/connections.c:8248
- #, c-format
- msgid ""
- "Warning: editing existing connection '%s'; 'con-name' argument is ignored\n"
- msgstr "警告：正在编辑已有的连接 \"%s\"；\"con-name\" 参数已忽略\n"
-
--#: ../clients/cli/connections.c:8311
-+#: ../clients/cli/connections.c:8275
- #, c-format
- msgid "Valid connection types: %s\n"
- msgstr "有效的连接类型：%s\n"
-
--#: ../clients/cli/connections.c:8313
-+#: ../clients/cli/connections.c:8277
- #, c-format
- msgid "Error: invalid connection type; %s\n"
- msgstr "错误：无效的连接类型；%s\n"
-
--#: ../clients/cli/connections.c:8349
-+#: ../clients/cli/connections.c:8313
- #, c-format
- msgid "===| nmcli interactive connection editor |==="
- msgstr "===| nmcli 交互式连接编辑器 |==="
-
--#: ../clients/cli/connections.c:8352
-+#: ../clients/cli/connections.c:8316
- #, c-format
- msgid "Editing existing '%s' connection: '%s'"
- msgstr "正在编辑已有的连接 \"%s\"：\"%s\""
-
--#: ../clients/cli/connections.c:8354
-+#: ../clients/cli/connections.c:8318
- #, c-format
- msgid "Adding a new '%s' connection"
- msgstr "正在添加新的 \"%s\" 连接"
-
--#: ../clients/cli/connections.c:8356
-+#: ../clients/cli/connections.c:8320
- #, c-format
- msgid "Type 'help' or '?' for available commands."
- msgstr "输入 \"help\" 或 \"?\" 查看可用的命令。"
-
--#: ../clients/cli/connections.c:8358
-+#: ../clients/cli/connections.c:8322
- #, c-format
- msgid "Type 'print' to show all the connection properties."
- msgstr "输入 \"print\" 来显示所有的连接属性。"
-
--#: ../clients/cli/connections.c:8360
-+#: ../clients/cli/connections.c:8324
- #, c-format
- msgid "Type 'describe [<setting>.<prop>]' for detailed property description."
- msgstr "输入 \"describe [<设置>.<属性>]\" 来获得详细的属性描述。"
-
--#: ../clients/cli/connections.c:8388
-+#: ../clients/cli/connections.c:8352
- #, c-format
- msgid "Error: Failed to modify connection '%s': %s"
- msgstr "错误：修改连接 \"%s\" 失败：%s"
-
--#: ../clients/cli/connections.c:8394
-+#: ../clients/cli/connections.c:8358
- #, c-format
- msgid "Connection '%s' (%s) successfully modified.\n"
- msgstr "连接 \"%s\" (%s) 已成功修改。\n"
-
--#: ../clients/cli/connections.c:8470
-+#: ../clients/cli/connections.c:8434
- #, c-format
- msgid "%s (%s) cloned as %s (%s).\n"
- msgstr "%s (%s) 已克隆为 %s (%s)。\n"
-
--#: ../clients/cli/connections.c:8536
-+#: ../clients/cli/connections.c:8500
- msgid "New connection name: "
- msgstr "新连接名称："
-
--#: ../clients/cli/connections.c:8538
-+#: ../clients/cli/connections.c:8502
- #, c-format
- msgid "Error: <new name> argument is missing."
- msgstr "错误：缺少 <新名称> 参数。"
-
--#: ../clients/cli/connections.c:8543 ../clients/cli/connections.c:9026
-+#: ../clients/cli/connections.c:8507 ../clients/cli/connections.c:9003
- #, c-format
- msgid "Error: unknown extra argument: '%s'."
- msgstr "错误：未知的额外参数：\"%s\"。"
-
--#: ../clients/cli/connections.c:8588
-+#: ../clients/cli/connections.c:8552
- #, c-format
- msgid "Error: not all connections deleted."
- msgstr "错误：未删除所有的连接。"
-
--#: ../clients/cli/connections.c:8589
--#, c-format
--msgid "Error: Connection deletion failed: %s"
-+#: ../clients/cli/connections.c:8553
-+#, fuzzy, c-format
-+msgid "Error: Connection deletion failed: %s\n"
- msgstr "错误：连接删除失败：%s"
-
--#: ../clients/cli/connections.c:8645 ../clients/cli/connections.c:8766
-+#: ../clients/cli/connections.c:8609 ../clients/cli/connections.c:8730
- #, c-format
- msgid "Error: %s.\n"
- msgstr "错误：%s。\n"
-
--#: ../clients/cli/connections.c:8646 ../clients/cli/connections.c:8767
-+#: ../clients/cli/connections.c:8610 ../clients/cli/connections.c:8731
- #, c-format
- msgid "Error: not all connections found."
- msgstr "错误：未找到所有连接。"
-
- #. truncate trailing ", "
--#: ../clients/cli/connections.c:8697
-+#: ../clients/cli/connections.c:8661
- #, c-format
- msgid "Error: cannot delete unknown connection(s): %s."
- msgstr "错误：无法删除未知连接：%s。"
-
--#: ../clients/cli/connections.c:8707
-+#: ../clients/cli/connections.c:8671
- #, c-format
- msgid "%s: connection profile changed\n"
- msgstr "%s：连接配置集已改动\n"
-
--#: ../clients/cli/connections.c:8733
-+#: ../clients/cli/connections.c:8697
- #, c-format
- msgid "%s: connection profile created\n"
- msgstr "%s：连接配置集已创建\n"
-
--#: ../clients/cli/connections.c:8742
-+#: ../clients/cli/connections.c:8706
- #, c-format
- msgid "%s: connection profile removed\n"
- msgstr "%s：连接配置集已移除\n"
-
--#: ../clients/cli/connections.c:8804
-+#: ../clients/cli/connections.c:8768
- #, c-format
- msgid "Error: failed to reload connections: %s."
- msgstr "错误：重新加载连接失败：%s。"
-
--#: ../clients/cli/connections.c:8837
-+#: ../clients/cli/connections.c:8801
- #, c-format
- msgid "Error: failed to load connection: %s."
- msgstr "错误：加载连接失败：%s。"
-
--#: ../clients/cli/connections.c:8845
-+#: ../clients/cli/connections.c:8809
- #, c-format
- msgid "Could not load file '%s'\n"
- msgstr "无法加载文件 \"%s\"\n"
-
--#: ../clients/cli/connections.c:8852
-+#: ../clients/cli/connections.c:8816
- msgid "File to import: "
- msgstr "要导入的文件："
-
--#: ../clients/cli/connections.c:8886
-+#: ../clients/cli/connections.c:8850
- #, c-format
- msgid "Error: No arguments provided."
- msgstr "错误：未提供参数。"
-
--#: ../clients/cli/connections.c:8909
-+#: ../clients/cli/connections.c:8881
- #, c-format
- msgid "Warning: 'type' already specified, ignoring extra one.\n"
- msgstr "警告：已指定 \"type\"，忽略额外的参数。\n"
-
--#: ../clients/cli/connections.c:8923
-+#: ../clients/cli/connections.c:8895
- #, c-format
- msgid "Warning: 'file' already specified, ignoring extra one.\n"
- msgstr "警告：已指定 \"file\"，忽略额外的参数。\n"
-
--#: ../clients/cli/connections.c:8925
-+#: ../clients/cli/connections.c:8897
- #, c-format
- msgid "Unknown parameter: %s"
- msgstr "未知参数：%s"
-
--#: ../clients/cli/connections.c:8936
-+#: ../clients/cli/connections.c:8908
- #, c-format
- msgid "Error: 'type' argument is required."
- msgstr "错误：需要 \"type\" 参数。"
-
--#: ../clients/cli/connections.c:8940
-+#: ../clients/cli/connections.c:8912
- #, c-format
- msgid "Error: 'file' argument is required."
- msgstr "错误：需要 \"file\" 参数。"
-
--#: ../clients/cli/connections.c:8946
-+#: ../clients/cli/connections.c:8921
- #, c-format
- msgid "Error: failed to find VPN plugin for %s."
- msgstr "错误：查找用于 %s 的 VPN 插件失败。"
-
--#: ../clients/cli/connections.c:8953 ../clients/cli/connections.c:9047
-+#: ../clients/cli/connections.c:8928 ../clients/cli/connections.c:9024
- #, c-format
- msgid "Error: failed to load VPN plugin: %s."
- msgstr "错误：加载 VPN 插件失败：%s。"
-
--#: ../clients/cli/connections.c:8960
-+#: ../clients/cli/connections.c:8937
- #, c-format
- msgid "Error: failed to import '%s': %s."
- msgstr "错误：导入 \"%s\" 失败失败失败失败失败失败失败失败失败失败失败：%s。"
-
--#: ../clients/cli/connections.c:9033
-+#: ../clients/cli/connections.c:9010
- msgid "Output file name: "
- msgstr "输出文件名称："
-
--#: ../clients/cli/connections.c:9038
-+#: ../clients/cli/connections.c:9015
- #, c-format
- msgid "Error: the connection is not VPN."
- msgstr "错误：连接不是 VPN。"
-
--#: ../clients/cli/connections.c:9060
-+#: ../clients/cli/connections.c:9037
- #, c-format
- msgid "Error: failed to create temporary file %s."
- msgstr "错误：创建临时文件 %s 失败。"
-
--#: ../clients/cli/connections.c:9068
-+#: ../clients/cli/connections.c:9045
- #, c-format
- msgid "Error: failed to export '%s': %s."
- msgstr "错误：导出 \"%s\" 失败：%s。"
-
--#: ../clients/cli/connections.c:9080
-+#: ../clients/cli/connections.c:9057
- #, c-format
- msgid "Error: failed to read temporary file '%s': %s."
- msgstr "错误：读取临时文件 \"%s\" 失败：%s。"
-
- #. define some prompts
--#: ../clients/cli/devices.c:39
-+#: ../clients/cli/devices.c:37
- msgid "Interface: "
- msgstr "接口："
-
--#: ../clients/cli/devices.c:40
-+#: ../clients/cli/devices.c:38
- msgid "Interface(s): "
- msgstr "接口："
-
--#: ../clients/cli/devices.c:73 ../clients/cli/devices.c:1235
-+#: ../clients/cli/devices.c:73 ../clients/cli/devices.c:1229
- msgid "(none)"
- msgstr "（无）"
-
--#: ../clients/cli/devices.c:184 ../clients/cli/devices.c:191
-+#: ../clients/cli/devices.c:178 ../clients/cli/devices.c:185
- msgid "(unknown)"
- msgstr "（未知）"
-
--#: ../clients/cli/devices.c:339
-+#: ../clients/cli/devices.c:333
- #, c-format
- msgid "<invisible> | %s"
- msgstr "<invisible> | %s"
-
--#: ../clients/cli/devices.c:340
-+#: ../clients/cli/devices.c:334
- msgid "<invisible>"
- msgstr "<invisible>"
-
--#: ../clients/cli/devices.c:441
-+#: ../clients/cli/devices.c:435
- #, c-format
- msgid "%u Mb/s"
- msgstr "%u Mb/s"
-
--#: ../clients/cli/devices.c:695
-+#: ../clients/cli/devices.c:689
- #, fuzzy, c-format
- msgid ""
- "Usage: nmcli device { COMMAND | help }\n"
-@@ -2404,7 +2398,7 @@ msgstr ""
- "\n"
-
- # 大写的 DEVICE、TYPE、STATE、CONNECTION 找不到具体对应的翻译位置，这是在 CLI 是显示的列表项，所以没有翻译。
--#: ../clients/cli/devices.c:718
-+#: ../clients/cli/devices.c:712
- #, c-format
- msgid ""
- "Usage: nmcli device status { help }\n"
-@@ -2433,7 +2427,7 @@ msgstr ""
- "说 \n"
- "\"nmcli device\" 会调用 \"nmcli device status\"。\n"
-
--#: ../clients/cli/devices.c:733
-+#: ../clients/cli/devices.c:727
- #, c-format
- msgid ""
- "Usage: nmcli device show { ARGUMENTS | help }\n"
-@@ -2452,7 +2446,7 @@ msgstr ""
- "该命令列出所有设备或者给定设备的详情。\n"
- "\n"
-
--#: ../clients/cli/devices.c:744
-+#: ../clients/cli/devices.c:738
- #, c-format
- msgid ""
- "Usage: nmcli device connect { ARGUMENTS | help }\n"
-@@ -2474,7 +2468,7 @@ msgstr ""
- "动连接的连接。\n"
- "\n"
-
--#: ../clients/cli/devices.c:756
-+#: ../clients/cli/devices.c:750
- #, c-format
- msgid ""
- "Usage: nmcli device reapply { ARGUMENTS | help }\n"
-@@ -2492,7 +2486,7 @@ msgstr ""
- "尝试将自上次应用以后对当前活跃连接所做出的改变应用到设备中。\n"
- "\n"
-
--#: ../clients/cli/devices.c:767
-+#: ../clients/cli/devices.c:761
- #, c-format
- msgid ""
- "Usage: nmcli device modify { ARGUMENTS | --help }\n"
-@@ -2529,7 +2523,7 @@ msgstr ""
- "nmcli dev mod em1 -ipv4.dns 1\n"
- "nmcli dev mod em1 -ipv6.addr \"abbe::cafe/56\"\n"
-
--#: ../clients/cli/devices.c:787
-+#: ../clients/cli/devices.c:781
- #, c-format
- msgid ""
- "Usage: nmcli device disconnect { ARGUMENTS | help }\n"
-@@ -2549,7 +2543,7 @@ msgstr ""
- "该命令断开设备的连接并阻止其在没有用户/手动干预的情况下继续自动激活连接。\n"
- "\n"
-
--#: ../clients/cli/devices.c:799
-+#: ../clients/cli/devices.c:793
- #, c-format
- msgid ""
- "Usage: nmcli device delete { ARGUMENTS | help }\n"
-@@ -2572,7 +2566,7 @@ msgstr ""
- "令来删除。\n"
- "\n"
-
--#: ../clients/cli/devices.c:812
-+#: ../clients/cli/devices.c:806
- #, c-format
- msgid ""
- "Usage: nmcli device set { ARGUMENTS | help }\n"
-@@ -2595,7 +2589,7 @@ msgstr ""
- "修改设备属性。\n"
- "\n"
-
--#: ../clients/cli/devices.c:825
-+#: ../clients/cli/devices.c:819
- #, c-format
- msgid ""
- "Usage: nmcli device monitor { ARGUMENTS | help }\n"
-@@ -2616,7 +2610,7 @@ msgstr ""
- "接。\n"
- "\n"
-
--#: ../clients/cli/devices.c:837
-+#: ../clients/cli/devices.c:831
- #, fuzzy, c-format
- msgid ""
- "Usage: nmcli device wifi { ARGUMENTS | help }\n"
-@@ -2711,7 +2705,7 @@ msgstr ""
- "意，这个命令不会显示 AP，需要使用 'nmcli device wifi list' 来实现这个功能。\n"
- "\n"
-
--#: ../clients/cli/devices.c:884
-+#: ../clients/cli/devices.c:878
- #, c-format
- msgid ""
- "Usage: nmcli device lldp { ARGUMENTS | help }\n"
-@@ -2731,256 +2725,240 @@ msgstr ""
- "备。\n"
- "\n"
-
--#: ../clients/cli/devices.c:982
-+#: ../clients/cli/devices.c:976
- #, c-format
- msgid "Error: No interface specified."
- msgstr "错误：没有指定接口。"
-
--#: ../clients/cli/devices.c:1005
-+#: ../clients/cli/devices.c:999
- #, c-format
- msgid "Warning: argument '%s' is duplicated.\n"
- msgstr "警告：重复的参数 \"%s\"。\n"
-
--#: ../clients/cli/devices.c:1008
-+#: ../clients/cli/devices.c:1002
- #, c-format
- msgid "Error: Device '%s' not found.\n"
- msgstr "错误：没有找到设备 \"%s\"。\n"
-
--#: ../clients/cli/devices.c:1009
-+#: ../clients/cli/devices.c:1003
- #, c-format
- msgid "Error: not all devices found."
- msgstr "错误：未找到所有设备。"
-
--#: ../clients/cli/devices.c:1040
-+#: ../clients/cli/devices.c:1034
- msgid "No interface specified"
- msgstr "没有指定接口"
-
--#: ../clients/cli/devices.c:1059
-+#: ../clients/cli/devices.c:1053
- #, c-format
- msgid "Device '%s' not found"
- msgstr "未找到设备 \"%s\""
-
--#: ../clients/cli/devices.c:1155
-+#: ../clients/cli/devices.c:1149
- #, c-format
- msgid "%u MHz"
- msgstr "%u MHz"
-
--#: ../clients/cli/devices.c:1156
-+#: ../clients/cli/devices.c:1150
- #, c-format
- msgid "%u Mbit/s"
- msgstr "%u Mbit/s"
-
--#: ../clients/cli/devices.c:1167
--msgid "WEP"
--msgstr "WEP"
--
--#: ../clients/cli/devices.c:1171
--msgid "WPA1"
--msgstr "WPA1"
--
--#: ../clients/cli/devices.c:1175
--msgid "WPA2"
--msgstr "WPA2"
--
--#: ../clients/cli/devices.c:1180
--msgid "802.1X"
--msgstr "802.1X"
--
--#: ../clients/cli/devices.c:1195
-+#: ../clients/cli/devices.c:1189
- msgid "Ad-Hoc"
- msgstr "Ad-Hoc"
-
--#: ../clients/cli/devices.c:1196
-+#: ../clients/cli/devices.c:1190
- msgid "Infra"
- msgstr "Infra"
-
--#: ../clients/cli/devices.c:1197
-+#: ../clients/cli/devices.c:1191
- msgid "N/A"
- msgstr "不可用"
-
--#: ../clients/cli/devices.c:1392
-+#: ../clients/cli/devices.c:1386
- msgid "Device details"
- msgstr "设备详情"
-
--#: ../clients/cli/devices.c:1403
-+#: ../clients/cli/devices.c:1397
- #, c-format
- msgid "Error: 'device show': %s"
- msgstr "错误：\"device show\"：%s"
-
--#: ../clients/cli/devices.c:1701
-+#: ../clients/cli/devices.c:1695
- msgid "Status of devices"
- msgstr "设备状态"
-
--#: ../clients/cli/devices.c:1705
-+#: ../clients/cli/devices.c:1699
- #, c-format
- msgid "Error: 'device status': %s"
- msgstr "错误：\"dev status\": %s"
-
--#: ../clients/cli/devices.c:1732 ../clients/cli/devices.c:2173
--#: ../clients/cli/devices.c:4144
-+#: ../clients/cli/devices.c:1726 ../clients/cli/devices.c:2167
-+#: ../clients/cli/devices.c:4141
- #, c-format
- msgid "Error: invalid extra argument '%s'."
- msgstr "错误：无效的额外参数 \"%s\"。"
-
--#: ../clients/cli/devices.c:1768 ../clients/cli/general.c:518
-+#: ../clients/cli/devices.c:1762 ../clients/cli/general.c:519
- #, c-format
- msgid "Error: Timeout %d sec expired."
- msgstr "错误：超时时间 %d 秒已到。"
-
--#: ../clients/cli/devices.c:1817
-+#: ../clients/cli/devices.c:1811
- #, c-format
- msgid "Device '%s' successfully activated with '%s'.\n"
- msgstr "成功用 \"%s%s\" 激活了设备 \"\"。\n"
-
--#: ../clients/cli/devices.c:1823
-+#: ../clients/cli/devices.c:1817
- #, c-format
- msgid "Error: Connection activation failed: (%d) %s.\n"
- msgstr "错误：连接激活失败：(%d) %s。\n"
-
--#: ../clients/cli/devices.c:1862
-+#: ../clients/cli/devices.c:1856
- #, c-format
- msgid "Error: Failed to setup a Wi-Fi hotspot: %s"
- msgstr "错误：建立 Wi-Fi 热点失败：%s"
-
--#: ../clients/cli/devices.c:1865
-+#: ../clients/cli/devices.c:1859
- #, c-format
- msgid "Error: Failed to add/activate new connection: %s"
- msgstr "错误：添加/激活新连接失败：%s"
-
--#: ../clients/cli/devices.c:1868
-+#: ../clients/cli/devices.c:1862
- #, fuzzy, c-format
- msgid "Error: Failed to activate connection: %s"
- msgstr "错误：添加/激活新连接失败：%s"
-
--#: ../clients/cli/devices.c:1938
-+#: ../clients/cli/devices.c:1932
- #, c-format
- msgid "Error: Device activation failed: %s"
- msgstr "错误：激活设备失败：%s"
-
--#: ../clients/cli/devices.c:1947
-+#: ../clients/cli/devices.c:1941
- #, c-format
- msgid "Error: Device activation failed: device was disconnected"
- msgstr "错误：设备激活失败：设备已断开连接"
-
--#: ../clients/cli/devices.c:2000
-+#: ../clients/cli/devices.c:1994
- #, c-format
- msgid "Error: extra argument not allowed: '%s'."
- msgstr "错误：不允许的额外参数：\"%s\"。"
-
--#: ../clients/cli/devices.c:2073 ../clients/cli/devices.c:2088
--#: ../clients/cli/devices.c:2325
-+#: ../clients/cli/devices.c:2067 ../clients/cli/devices.c:2082
-+#: ../clients/cli/devices.c:2319
- #, c-format
- msgid "Device '%s' successfully disconnected.\n"
- msgstr "成功断开设备 \"%s\"。\n"
-
--#: ../clients/cli/devices.c:2076 ../clients/cli/devices.c:2399
-+#: ../clients/cli/devices.c:2070 ../clients/cli/devices.c:2393
- #, c-format
- msgid "Device '%s' successfully removed.\n"
- msgstr "成功移除设备 \"%s\"。\n"
-
--#: ../clients/cli/devices.c:2138 ../clients/cli/devices.c:2208
-+#: ../clients/cli/devices.c:2132 ../clients/cli/devices.c:2202
- #, c-format
- msgid "Error: Reapplying connection to device '%s' (%s) failed: %s"
- msgstr "错误：重新应用连接到 \"%s\" (%s) 失败：%s"
-
--#: ../clients/cli/devices.c:2148 ../clients/cli/devices.c:2217
-+#: ../clients/cli/devices.c:2142 ../clients/cli/devices.c:2211
- #, c-format
- msgid "Connection successfully reapplied to device '%s'.\n"
- msgstr "成功重新应用连接到设备 \"%s\"。\n"
-
--#: ../clients/cli/devices.c:2242
-+#: ../clients/cli/devices.c:2236
- #, c-format
- msgid "Error: Reading applied connection from device '%s' (%s) failed: %s"
- msgstr "错误：从设备 \"%s\" (%s) 读取已应用的连接失败：%s"
-
--#: ../clients/cli/devices.c:2309
-+#: ../clients/cli/devices.c:2303
- #, c-format
- msgid "Error: not all devices disconnected."
- msgstr "错误：未断开所有设备的连接。"
-
--#: ../clients/cli/devices.c:2310
-+#: ../clients/cli/devices.c:2304
- #, c-format
- msgid "Error: Device '%s' (%s) disconnecting failed: %s\n"
- msgstr "错误：断开设备 \"%s\" (%s) 的连接失败：%s\n"
-
--#: ../clients/cli/devices.c:2390
-+#: ../clients/cli/devices.c:2384
- #, c-format
- msgid "Error: not all devices deleted."
- msgstr "错误：未删除所有设备。"
-
--#: ../clients/cli/devices.c:2391
-+#: ../clients/cli/devices.c:2385
- #, c-format
- msgid "Error: Device '%s' (%s) deletion failed: %s\n"
- msgstr "错误：删除设备 \"%s\" (%s) 失败：%s\n"
-
--#: ../clients/cli/devices.c:2473
-+#: ../clients/cli/devices.c:2467
- #, c-format
- msgid "Error: No property specified."
- msgstr "错误：未指定属性。"
-
--#: ../clients/cli/devices.c:2488 ../clients/cli/devices.c:2505
--#: ../clients/cli/general.c:691 ../clients/cli/general.c:703
-+#: ../clients/cli/devices.c:2482 ../clients/cli/devices.c:2499
-+#: ../clients/cli/general.c:692 ../clients/cli/general.c:704
- #, c-format
- msgid "Error: '%s' argument is missing."
- msgstr "错误：缺少 \"%s\" 参数。"
-
--#: ../clients/cli/devices.c:2494
-+#: ../clients/cli/devices.c:2488
- #, c-format
- msgid "Error: 'managed': %s."
- msgstr "错误：\"managed\"：%s。"
-
--#: ../clients/cli/devices.c:2511
-+#: ../clients/cli/devices.c:2505
- #, c-format
- msgid "Error: 'autoconnect': %s."
- msgstr "错误：\"autoconnect\"：%s。"
-
--#: ../clients/cli/devices.c:2519 ../clients/cli/general.c:717
-+#: ../clients/cli/devices.c:2513 ../clients/cli/general.c:718
- #, c-format
- msgid "Error: property '%s' is not known."
- msgstr "错误：属性 \"%s\" 是未知的。"
-
--#: ../clients/cli/devices.c:2568
-+#: ../clients/cli/devices.c:2562
- #, c-format
- msgid "%s: using connection '%s'\n"
- msgstr ""
- "%s：正使用连接 \"%s\"\n"
- "\n"
-
--#: ../clients/cli/devices.c:2594
-+#: ../clients/cli/devices.c:2588
- #, c-format
- msgid "%s: device created\n"
- msgstr "%s：设备已创建\n"
-
--#: ../clients/cli/devices.c:2601
-+#: ../clients/cli/devices.c:2595
- #, c-format
- msgid "%s: device removed\n"
- msgstr "%s：设备已移除\n"
-
--#: ../clients/cli/devices.c:2781
-+#: ../clients/cli/devices.c:2775
- msgid "Wi-Fi scan list"
- msgstr "Wi-Fi 扫描列表"
-
--#: ../clients/cli/devices.c:2868
-+#: ../clients/cli/devices.c:2862
- #, c-format
- msgid "Error: Access point with bssid '%s' not found."
- msgstr "错误：未找到 bssid 为 \"%s\" 的接入点。"
-
--#: ../clients/cli/devices.c:3024
-+#: ../clients/cli/devices.c:3018
- #, c-format
- msgid "Error: 'device wifi': %s"
- msgstr "错误：\"device wifi\"：%s"
-
--#: ../clients/cli/devices.c:3042
-+#: ../clients/cli/devices.c:3036
- #, c-format
- msgid "Error: invalid rescan argument: '%s' not among [auto, no, yes]"
- msgstr "错误：无效的重新扫描参数：\"%s\" 未在 [auto, no, yes] 之中"
-
--#: ../clients/cli/devices.c:3049
-+#: ../clients/cli/devices.c:3043
- #, c-format
- msgid "Error: Device '%s' not found."
- msgstr "错误：没有找到设备 \"%s\"。"
-
--#: ../clients/cli/devices.c:3060
-+#: ../clients/cli/devices.c:3054
- #, c-format
- msgid ""
- "Error: Device '%s' was not recognized as a Wi-Fi device, check "
-@@ -2989,202 +2967,202 @@ msgstr ""
- "错误：设备 \"%s\" 没有被识别为 Wi-Fi 设备，请检查网络管理器（NetworkManager）"
- "的 Wi-Fi 插件。"
-
--#: ../clients/cli/devices.c:3064 ../clients/cli/devices.c:3324
--#: ../clients/cli/devices.c:3823 ../clients/cli/devices.c:3982
-+#: ../clients/cli/devices.c:3058 ../clients/cli/devices.c:3318
-+#: ../clients/cli/devices.c:3819 ../clients/cli/devices.c:3979
- #, c-format
- msgid "Error: Device '%s' is not a Wi-Fi device."
- msgstr "错误：设备 \"%s\" 不是 Wi-Fi 设备。"
-
--#: ../clients/cli/devices.c:3173
-+#: ../clients/cli/devices.c:3167
- msgid "SSID or BSSID: "
- msgstr "SSID 或 BSSID："
-
--#: ../clients/cli/devices.c:3178
-+#: ../clients/cli/devices.c:3172
- #, c-format
- msgid "Error: SSID or BSSID are missing."
- msgstr "错误：缺少 SSID/BSSID。"
-
--#: ../clients/cli/devices.c:3215
-+#: ../clients/cli/devices.c:3209
- #, c-format
- msgid "Error: bssid argument value '%s' is not a valid BSSID."
- msgstr "错误：bssid 参数值\"%s\"为无效 BSSID。"
-
--#: ../clients/cli/devices.c:3245
-+#: ../clients/cli/devices.c:3239
- #, 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:3272 ../clients/cli/devices.c:3290
-+#: ../clients/cli/devices.c:3266 ../clients/cli/devices.c:3284
- #, c-format
- msgid "Error: %s: %s."
- msgstr "错误：%s：%s。"
-
--#: ../clients/cli/devices.c:3307
-+#: ../clients/cli/devices.c:3301
- #, c-format
- msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
- msgstr "错误：要连接的 BSSID (%s) 与 bssid 参数 (%s) 不同。"
-
--#: ../clients/cli/devices.c:3313
-+#: ../clients/cli/devices.c:3307
- #, c-format
- msgid "Error: Parameter '%s' is neither SSID nor BSSID."
- msgstr "错误：参数 \"%s\" 不是 SSID 或 BSSID。"
-
--#: ../clients/cli/devices.c:3326 ../clients/cli/devices.c:3825
--#: ../clients/cli/devices.c:3984
-+#: ../clients/cli/devices.c:3320 ../clients/cli/devices.c:3821
-+#: ../clients/cli/devices.c:3981
- #, c-format
- msgid "Error: No Wi-Fi device found."
- msgstr "错误：未发现 Wi-Fi 设备。"
-
--#: ../clients/cli/devices.c:3346
-+#: ../clients/cli/devices.c:3340
- #, c-format
- msgid "Error: Failed to scan hidden SSID: %s."
- msgstr "错误：扫描隐藏的 SSID 失败：%s。"
-
--#: ../clients/cli/devices.c:3373
-+#: ../clients/cli/devices.c:3367
- #, c-format
- msgid "Error: No network with SSID '%s' found."
- msgstr "错误：未发现 SSID 为 \"%s\" 的网络。"
-
--#: ../clients/cli/devices.c:3375
-+#: ../clients/cli/devices.c:3369
- #, c-format
- msgid "Error: No access point with BSSID '%s' found."
- msgstr "错误：未找到 BSSID 为 \"%s\" 的接入点。"
-
--#: ../clients/cli/devices.c:3403
-+#: ../clients/cli/devices.c:3397
- #, c-format
- msgid "Error: Connection '%s' exists but properties don't match."
- msgstr ""
-
--#: ../clients/cli/devices.c:3446
-+#: ../clients/cli/devices.c:3440
- #, 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:3482
-+#: ../clients/cli/devices.c:3477
- msgid "Password: "
- msgstr "密码："
-
--#: ../clients/cli/devices.c:3644
-+#: ../clients/cli/devices.c:3640
- #, c-format
- msgid "'%s' is not valid WPA PSK"
- msgstr "\"%s\" 不是有效的 WPA PSK"
-
--#: ../clients/cli/devices.c:3661
-+#: ../clients/cli/devices.c:3657
- #, 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:3673
- #, c-format
- msgid "Hotspot password: %s\n"
- msgstr "热点密码：%s\n"
-
--#: ../clients/cli/devices.c:3748
-+#: ../clients/cli/devices.c:3744
- #, c-format
- msgid "Error: ssid is too long."
- msgstr "错误：SSID 太长。"
-
- # 这里 channel/band 开头不大写，表示其是命令行选项，所以不译。下面的同理。
--#: ../clients/cli/devices.c:3762
-+#: ../clients/cli/devices.c:3758
- #, c-format
- msgid "Error: band argument value '%s' is invalid; use 'a' or 'bg'."
- msgstr "错误：band 参数值 \"%s\" 无效，请使用 \"a\" 或 \"bg\"。"
-
--#: ../clients/cli/devices.c:3787
-+#: ../clients/cli/devices.c:3783
- #, c-format
- msgid "Error: Unknown parameter %s."
- msgstr "错误：未知参数 %s。"
-
--#: ../clients/cli/devices.c:3807
-+#: ../clients/cli/devices.c:3803
- #, c-format
- msgid "Error: channel requires band too."
- msgstr "错误：channal 也需要 band。"
-
--#: ../clients/cli/devices.c:3812
-+#: ../clients/cli/devices.c:3808
- #, 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:3832
- #, 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:3866
- #, c-format
- msgid "Error: Invalid 'password': %s."
- msgstr "错误：无效的 \"password\"：%s。"
-
--#: ../clients/cli/devices.c:3945
-+#: ../clients/cli/devices.c:3942
- #, c-format
- msgid "Error: '%s' cannot repeat."
- msgstr "错误：\"%s\" 不能重复。"
-
- #. Main header name
--#: ../clients/cli/devices.c:4050
-+#: ../clients/cli/devices.c:4047
- msgid "Device LLDP neighbors"
- msgstr "设备 LLDP 邻居"
-
--#: ../clients/cli/devices.c:4160
-+#: ../clients/cli/devices.c:4157
- #, c-format
- msgid "Error: 'device lldp list': %s"
- msgstr "错误：\"device lldp list\"：%s"
-
--#: ../clients/cli/general.c:42
-+#: ../clients/cli/general.c:41
- msgid "asleep"
- msgstr "睡眠中"
-
--#: ../clients/cli/general.c:43
-+#: ../clients/cli/general.c:42
- msgid "connecting"
- msgstr "连接中"
-
--#: ../clients/cli/general.c:44
-+#: ../clients/cli/general.c:43
- msgid "connected (local only)"
- msgstr "已连接（仅本地）"
-
--#: ../clients/cli/general.c:45
-+#: ../clients/cli/general.c:44
- msgid "connected (site only)"
- msgstr "已连接（仅站点）"
-
--#: ../clients/cli/general.c:46 ../clients/common/nm-client-utils.c:270
-+#: ../clients/cli/general.c:45 ../clients/common/nm-client-utils.c:274
- msgid "connected"
- msgstr "已连接"
-
--#: ../clients/cli/general.c:47
-+#: ../clients/cli/general.c:46
- msgid "disconnecting"
- msgstr "断开中"
-
--#: ../clients/cli/general.c:48 ../clients/common/nm-client-utils.c:263
-+#: ../clients/cli/general.c:47 ../clients/common/nm-client-utils.c:267
- msgid "disconnected"
- msgstr "已断开"
-
--#: ../clients/cli/general.c:137
-+#: ../clients/cli/general.c:138
- msgid "auth"
- msgstr "验证"
-
--#: ../clients/cli/general.c:165
-+#: ../clients/cli/general.c:166
- msgid "running"
- msgstr "运行中"
-
--#: ../clients/cli/general.c:179
-+#: ../clients/cli/general.c:180
- msgid "starting"
- msgstr "启动中"
-
--#: ../clients/cli/general.c:179
-+#: ../clients/cli/general.c:180
- msgid "started"
- msgstr "已启动"
-
--#: ../clients/cli/general.c:213
-+#: ../clients/cli/general.c:214
- msgid "enabled"
- msgstr "已启用"
-
--#: ../clients/cli/general.c:213
-+#: ../clients/cli/general.c:214
- msgid "disabled"
- msgstr "已禁用"
-
--#: ../clients/cli/general.c:331
-+#: ../clients/cli/general.c:332
- #, c-format
- msgid ""
- "Usage: nmcli general { COMMAND | help }\n"
-@@ -3213,7 +3191,7 @@ msgstr ""
- " logging [level <日志级别>] [domains <日志域>]\n"
- "\n"
-
--#: ../clients/cli/general.c:342
-+#: ../clients/cli/general.c:343
- #, c-format
- msgid ""
- "Usage: nmcli general status { help }\n"
-@@ -3229,7 +3207,7 @@ msgstr ""
- "\"status\" 是默认操作，即 \"nmcli gen\" 调用 \"nmcli gen status\"\n"
- "\n"
-
--#: ../clients/cli/general.c:351
-+#: ../clients/cli/general.c:352
- #, c-format
- msgid ""
- "Usage: nmcli general hostname { ARGUMENTS | help }\n"
-@@ -3252,7 +3230,7 @@ msgstr ""
- "新的永久系统主机名。\n"
- "\n"
-
--#: ../clients/cli/general.c:363
-+#: ../clients/cli/general.c:364
- #, c-format
- msgid ""
- "Usage: nmcli general permissions { help }\n"
-@@ -3265,7 +3243,7 @@ msgstr ""
- "显示验证操作的调用程序权限。\n"
- "\n"
-
--#: ../clients/cli/general.c:371
-+#: ../clients/cli/general.c:372
- #, c-format
- msgid ""
- "Usage: nmcli general logging { ARGUMENTS | help }\n"
-@@ -3290,7 +3268,7 @@ msgstr ""
- "可能的日志域列表请参阅手册页。\n"
- "\n"
-
--#: ../clients/cli/general.c:384
-+#: ../clients/cli/general.c:385
- #, c-format
- msgid ""
- "Usage: nmcli networking { COMMAND | help }\n"
-@@ -3315,7 +3293,7 @@ msgstr ""
- " connectivity [check]\n"
- "\n"
-
--#: ../clients/cli/general.c:394
-+#: ../clients/cli/general.c:395
- #, c-format
- msgid ""
- "Usage: nmcli networking on { help }\n"
-@@ -3328,7 +3306,7 @@ msgstr ""
- "打开联网。\n"
- "\n"
-
--#: ../clients/cli/general.c:402
-+#: ../clients/cli/general.c:403
- #, c-format
- msgid ""
- "Usage: nmcli networking off { help }\n"
-@@ -3341,7 +3319,7 @@ msgstr ""
- "关闭联网。\n"
- "\n"
-
--#: ../clients/cli/general.c:410
-+#: ../clients/cli/general.c:411
- #, c-format
- msgid ""
- "Usage: nmcli networking connectivity { ARGUMENTS | help }\n"
-@@ -3361,7 +3339,7 @@ msgstr ""
- "可选的 \"check\" 参数可让网络管理器（NetworkManager）重新检查连接性。\n"
- "\n"
-
--#: ../clients/cli/general.c:422
-+#: ../clients/cli/general.c:423
- #, c-format
- msgid ""
- "Usage: nmcli radio { COMMAND | help }\n"
-@@ -3378,7 +3356,7 @@ msgstr ""
- " all | wifi | wwan [ on | off ]\n"
- "\n"
-
--#: ../clients/cli/general.c:431
-+#: ../clients/cli/general.c:432
- #, c-format
- msgid ""
- "Usage: nmcli radio all { ARGUMENTS | help }\n"
-@@ -3395,7 +3373,7 @@ msgstr ""
- "获取所有无线电开关的状态，或者打开/关闭它们。\n"
- "\n"
-
--#: ../clients/cli/general.c:441
-+#: ../clients/cli/general.c:442
- #, c-format
- msgid ""
- "Usage: nmcli radio wifi { ARGUMENTS | help }\n"
-@@ -3412,7 +3390,7 @@ msgstr ""
- "获取 Wi-Fi 无线电开关的状态，或者打开/关闭它。\n"
- "\n"
-
--#: ../clients/cli/general.c:451
-+#: ../clients/cli/general.c:452
- #, c-format
- msgid ""
- "Usage: nmcli radio wwan { ARGUMENTS | help }\n"
-@@ -3429,7 +3407,7 @@ msgstr ""
- "获取移动宽带无线电开关的状态，或者打开/关闭它。\n"
- "\n"
-
--#: ../clients/cli/general.c:461
-+#: ../clients/cli/general.c:462
- #, c-format
- msgid ""
- "Usage: nmcli monitor\n"
-@@ -3444,180 +3422,180 @@ msgstr ""
- "每当 NetworkManager 出现更改时打印一行信息。\n"
- "\n"
-
--#: ../clients/cli/general.c:491
-+#: ../clients/cli/general.c:492
- msgid "NetworkManager status"
- msgstr "网络管理器状态"
-
--#: ../clients/cli/general.c:495
-+#: ../clients/cli/general.c:496
- #, c-format
- msgid "Error: only these fields are allowed: %s"
- msgstr "错误：只允许使用这些字段：%s"
-
--#: ../clients/cli/general.c:548
-+#: ../clients/cli/general.c:549
- msgid "NetworkManager permissions"
- msgstr "网络管理器权限"
-
- # XXX: 这里考虑一下要不要翻译
- # XXX: Should we translate this?
--#: ../clients/cli/general.c:552
-+#: ../clients/cli/general.c:553
- #, c-format
- msgid "Error: 'general permissions': %s"
- msgstr "错误：\"常规权限\"：%s"
-
--#: ../clients/cli/general.c:641
-+#: ../clients/cli/general.c:642
- msgid "NetworkManager logging"
- msgstr "网络管理器日志"
-
--#: ../clients/cli/general.c:645
-+#: ../clients/cli/general.c:646
- #, c-format
- msgid "Error: 'general logging': %s"
- msgstr "错误：\"常规日志\"：%s"
-
--#: ../clients/cli/general.c:727
-+#: ../clients/cli/general.c:728
- #, c-format
- msgid "Error: failed to set logging: %s"
- msgstr "错误：设置日志失败：%s"
-
--#: ../clients/cli/general.c:744
-+#: ../clients/cli/general.c:745
- #, c-format
- msgid "Error: failed to set hostname: %s"
- msgstr "错误：设置主机名失败：%s"
-
--#: ../clients/cli/general.c:813
-+#: ../clients/cli/general.c:814
- #, c-format
- msgid "Error: '--fields' value '%s' is not valid here (allowed field: %s)"
- msgstr "错误：\"--fields\" 值 \"%s\" 在此无效（允许的字段：%s）"
-
--#: ../clients/cli/general.c:838
-+#: ../clients/cli/general.c:839
- #, 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:886 ../clients/cli/general.c:898
-+#: ../clients/cli/general.c:887 ../clients/cli/general.c:899
- msgid "Connectivity"
- msgstr "连接性"
-
--#: ../clients/cli/general.c:901
-+#: ../clients/cli/general.c:902
- #, c-format
- msgid "Error: 'networking' command '%s' is not valid."
- msgstr "错误：\"networking\" 命令 \"%s\" 无效。"
-
--#: ../clients/cli/general.c:915
-+#: ../clients/cli/general.c:916
- msgid "Networking"
- msgstr "联网"
-
- #. no argument, show all radio switches
--#: ../clients/cli/general.c:950
-+#: ../clients/cli/general.c:951
- msgid "Radio switches"
- msgstr "无线电开关"
-
- #. no argument, show current Wi-Fi state
--#: ../clients/cli/general.c:980
-+#: ../clients/cli/general.c:981
- msgid "Wi-Fi radio switch"
- msgstr "Wi-Fi 无线电开关"
-
- #. no argument, show current WWAN (mobile broadband) state
--#: ../clients/cli/general.c:1007
-+#: ../clients/cli/general.c:1008
- msgid "WWAN radio switch"
- msgstr "WWAN 无线电开关"
-
--#: ../clients/cli/general.c:1055
-+#: ../clients/cli/general.c:1056
- msgid "NetworkManager has started"
- msgstr "网络管理器已启动"
-
--#: ../clients/cli/general.c:1055
-+#: ../clients/cli/general.c:1056
- msgid "NetworkManager has stopped"
- msgstr "网络管理器已停止"
-
--#: ../clients/cli/general.c:1066
-+#: ../clients/cli/general.c:1067
- #, c-format
- msgid "Hostname set to '%s'\n"
- msgstr "主机名已设为 \"%s\"\n"
-
--#: ../clients/cli/general.c:1081
-+#: ../clients/cli/general.c:1082
- #, c-format
- msgid "'%s' is now the primary connection\n"
- msgstr "\"%s\" 现在是主连接\n"
-
--#: ../clients/cli/general.c:1083
-+#: ../clients/cli/general.c:1084
- #, c-format
- msgid "There's no primary connection\n"
- msgstr "没有主连接\n"
-
--#: ../clients/cli/general.c:1095
-+#: ../clients/cli/general.c:1096
- #, c-format
- msgid "Connectivity is now '%s'\n"
- msgstr "连接性现在是 \"%s\"\n"
-
--#: ../clients/cli/general.c:1109
-+#: ../clients/cli/general.c:1110
- #, c-format
- msgid "Networkmanager is now in the '%s' state\n"
- msgstr "网络管理器现在处于 \"%s\" 状态\n"
-
--#: ../clients/cli/general.c:1129
-+#: ../clients/cli/general.c:1130
- msgid "connection available"
- msgstr "连接可用"
-
--#: ../clients/cli/general.c:1131
-+#: ../clients/cli/general.c:1132
- msgid "connections available"
- msgstr "连接可用"
-
--#: ../clients/cli/general.c:1149
-+#: ../clients/cli/general.c:1150
- msgid "autoconnect"
- msgstr "自动连接"
-
--#: ../clients/cli/general.c:1151
-+#: ../clients/cli/general.c:1152
- msgid "fw missing"
- msgstr "缺失固件"
-
--#: ../clients/cli/general.c:1156
-+#: ../clients/cli/general.c:1157
- msgid "plugin missing"
- msgstr "缺失插件"
-
--#: ../clients/cli/general.c:1161
-+#: ../clients/cli/general.c:1162
- msgid "sw"
- msgstr "软件"
-
--#: ../clients/cli/general.c:1163
-+#: ../clients/cli/general.c:1164
- msgid "hw"
- msgstr "硬件"
-
--#: ../clients/cli/general.c:1168
-+#: ../clients/cli/general.c:1169
- msgid "iface"
- msgstr "接口"
-
--#: ../clients/cli/general.c:1171
-+#: ../clients/cli/general.c:1172
- msgid "port"
- msgstr "端口"
-
--#: ../clients/cli/general.c:1174
-+#: ../clients/cli/general.c:1175
- msgid "mtu"
- msgstr "mtu"
-
--#: ../clients/cli/general.c:1191
-+#: ../clients/cli/general.c:1192
- msgid "master"
- msgstr "主连接"
-
--#: ../clients/cli/general.c:1195 ../clients/tui/nm-editor-utils.c:239
-+#: ../clients/cli/general.c:1196 ../clients/tui/nm-editor-utils.c:239
- #: ../clients/tui/nmt-connect-connection-list.c:407
- msgid "VPN"
- msgstr "VPN"
-
--#: ../clients/cli/general.c:1197
-+#: ../clients/cli/general.c:1198
- msgid "ip4 default"
- msgstr "ip4 默认"
-
--#: ../clients/cli/general.c:1199
-+#: ../clients/cli/general.c:1200
- msgid "ip6 default"
- msgstr "ip6 默认"
-
--#: ../clients/cli/general.c:1281
-+#: ../clients/cli/general.c:1282
- #, c-format
- msgid "%s VPN connection"
- msgstr "%s VPN 连接"
-
--#: ../clients/cli/general.c:1349
-+#: ../clients/cli/general.c:1350
- #, c-format
- msgid ""
- "Use \"nmcli device show\" to get complete information about known devices "
-@@ -3632,16 +3610,16 @@ msgstr ""
- "\n"
- "完整的用法细节，可参考 nmcli(1) 和 nmcli-examples(7) 手册页。\n"
-
--#: ../clients/cli/general.c:1370
-+#: ../clients/cli/general.c:1371
- #, c-format
- msgid "Error: 'monitor' command '%s' is not valid."
- msgstr "错误：\"monitor\" 命令 \"%s\" 无效。"
-
--#: ../clients/cli/general.c:1382
-+#: ../clients/cli/general.c:1383
- msgid "Networkmanager is not running (waiting for it)\n"
- msgstr "网络管理器未运行（等待中）。\n"
-
--#: ../clients/cli/nmcli.c:245
-+#: ../clients/cli/nmcli.c:244
- #, fuzzy, c-format
- msgid ""
- "Usage: nmcli [OPTIONS] OBJECT { COMMAND | help }\n"
-@@ -3659,7 +3637,7 @@ msgid ""
- " -p, --pretty pretty output\n"
- " -s, --show-secrets allow displaying passwords\n"
- " -t, --terse terse output\n"
--" -v, --version how program version\n"
-+" -v, --version show program version\n"
- " -w, --wait <seconds> set timeout waiting for finishing "
- "operations\n"
- "\n"
-@@ -3700,96 +3678,96 @@ msgstr ""
- " m[onitor] 监视网络管理器更改\n"
- "\n"
-
--#: ../clients/cli/nmcli.c:325
-+#: ../clients/cli/nmcli.c:324
- #, c-format
- msgid "Error: missing argument for '%s' option."
- msgstr "错误：\"%s\" 选项缺少参数。"
-
--#: ../clients/cli/nmcli.c:626
-+#: ../clients/cli/nmcli.c:625
- #, c-format
- msgid "Unexpected end of file following '%s'\n"
- msgstr "\"%s\" 后更随着意外的文件尾\n"
-
--#: ../clients/cli/nmcli.c:634
-+#: ../clients/cli/nmcli.c:633
- #, c-format
- msgid "Expected whitespace following '%s'\n"
- msgstr "期望 \"%s\" 后更随空白\n"
-
--#: ../clients/cli/nmcli.c:646
-+#: ../clients/cli/nmcli.c:645
- #, c-format
- msgid "Expected a value for '%s'\n"
- msgstr "期望一个 \"%s\" 的值\n"
-
--#: ../clients/cli/nmcli.c:660
-+#: ../clients/cli/nmcli.c:659
- #, c-format
- msgid "Expected a line break following '%s'\n"
- msgstr "期望 \"%s\" 后更随换行符\n"
-
--#: ../clients/cli/nmcli.c:749
-+#: ../clients/cli/nmcli.c:748
- #, c-format
- msgid "Error: Option '--terse' is specified the second time."
- msgstr "错误：第二次指定了选项 \"--terse\"。"
-
--#: ../clients/cli/nmcli.c:754
-+#: ../clients/cli/nmcli.c:753
- #, c-format
- msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
- msgstr "错误：选项 \"--terse\" 与 \"--pretty\" 相互排斥。"
-
--#: ../clients/cli/nmcli.c:762
-+#: ../clients/cli/nmcli.c:761
- #, c-format
- msgid "Error: Option '--pretty' is specified the second time."
- msgstr "错误：第二次指定了选项 \"--pretty\"。"
-
--#: ../clients/cli/nmcli.c:767
-+#: ../clients/cli/nmcli.c:766
- #, c-format
- msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
- msgstr "错误：选项 \"--pretty\" 与 \"--terse\" 相互排斥。"
-
--#: ../clients/cli/nmcli.c:782
-+#: ../clients/cli/nmcli.c:781
- #, c-format
- msgid "Error: '%s' is not a valid argument for '%s' option."
- msgstr "错误：\"%s\" 不是 \"%s\" 选项的有效参数。"
-
--#: ../clients/cli/nmcli.c:796 ../clients/cli/nmcli.c:808
-+#: ../clients/cli/nmcli.c:795 ../clients/cli/nmcli.c:807
- #, c-format
- msgid "Error: '%s' is not valid argument for '%s' option."
- msgstr "错误：\"%s\" 不是 \"%s\" 选项的有效参数。"
-
--#: ../clients/cli/nmcli.c:832
-+#: ../clients/cli/nmcli.c:831
- #, c-format
- msgid "Error: '%s' is not a valid timeout."
- msgstr "错误：\"%s\" 不是有效的超时时间。"
-
--#: ../clients/cli/nmcli.c:839
-+#: ../clients/cli/nmcli.c:838
- #, c-format
- msgid "nmcli tool, version %s\n"
- msgstr "nmcli 工具，版本 %s\n"
-
--#: ../clients/cli/nmcli.c:847
-+#: ../clients/cli/nmcli.c:846
- #, c-format
- msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
- msgstr "错误：选项 \"%s\" 未知，尝试 \"nmcli -help\"。"
-
--#: ../clients/cli/nmcli.c:903 ../clients/cli/nmcli.c:910
-+#: ../clients/cli/nmcli.c:902 ../clients/cli/nmcli.c:909
- #, c-format
- msgid "Error: nmcli terminated by signal %s (%d)"
- msgstr "错误：nmcli 被信号 %s (%d) 终止了"
-
--#: ../clients/cli/nmcli.c:1060
-+#: ../clients/cli/nmcli.c:1059
- msgid "Success"
- msgstr "成功"
-
--#: ../clients/cli/polkit-agent.c:69
-+#: ../clients/cli/polkit-agent.c:68
- #, c-format
- msgid "Authentication message: %s\n"
- msgstr "验证消息：%s\n"
-
--#: ../clients/cli/polkit-agent.c:77
-+#: ../clients/cli/polkit-agent.c:76
- #, c-format
- msgid "Authentication error: %s\n"
- msgstr "验证错误：%s\n"
-
--#: ../clients/cli/polkit-agent.c:137
-+#: ../clients/cli/polkit-agent.c:136
- #, c-format
- msgid "Warning: polkit agent initialization failed: %s\n"
- msgstr "警告：polkit 代理初始化失败：%s\n"
-@@ -3804,7 +3782,7 @@ msgstr "您是否也要将 \"%s\" 设为 \"%s\"？[yes]："
- msgid "Do you also want to clear '%s'? [yes]: "
- msgstr "您是否也要清除 \"%s\"？[yes]："
-
--#: ../clients/cli/settings.c:224
-+#: ../clients/cli/settings.c:243
- #, c-format
- msgid ""
- "Warning: %s.%s set to '%s', but it might be ignored in infrastructure mode\n"
-@@ -3812,77 +3790,77 @@ msgstr ""
- "警告：%s.%s 已设为 \"%s\"，但在基础结构（infrastructure）模式下它可能会被忽"
- "略。\n"
-
--#: ../clients/cli/settings.c:243
-+#: ../clients/cli/settings.c:262
- #, c-format
- msgid "Warning: setting %s.%s requires removing ipv4 and ipv6 settings\n"
- msgstr "警告： 设置 %s.%s 需要删除 ipv4 和 ipv6 设置\n"
-
--#: ../clients/cli/settings.c:245
-+#: ../clients/cli/settings.c:264
- msgid "Do you want to remove them? [yes] "
- msgstr "您要删除它们吗？[yes]："
-
--#: ../clients/cli/settings.c:333
-+#: ../clients/cli/settings.c:352
- #, c-format
- msgid "Warning: %s is not an UUID of any existing connection profile\n"
- msgstr "警告：%s 不是任何现有连接配置集的 UUID\n"
-
--#: ../clients/cli/settings.c:338 ../clients/cli/settings.c:351
-+#: ../clients/cli/settings.c:357 ../clients/cli/settings.c:370
- #, c-format
- msgid "'%s' is not a VPN connection profile"
- msgstr "\"%s\" 不是 VPN 连接配置集"
-
--#: ../clients/cli/settings.c:345
-+#: ../clients/cli/settings.c:364
- #, c-format
- msgid "'%s' is not a name of any exiting profile"
- msgstr "\"%s\" 不是任何现有配置集的名称"
-
--#: ../clients/cli/settings.c:389
-+#: ../clients/cli/settings.c:408
- #, c-format
- msgid "Warning: %s\n"
- msgstr "警告：%s\n"
-
--#: ../clients/cli/settings.c:392
-+#: ../clients/cli/settings.c:411
- #, c-format
- msgid "Info: %s\n"
- msgstr "信息：%s\n"
-
--#: ../clients/cli/settings.c:485
-+#: ../clients/cli/settings.c:504
- msgid "don't know how to get the property value"
- msgstr "不知道如何获取属性值"
-
--#: ../clients/cli/settings.c:575 ../clients/cli/settings.c:617
-+#: ../clients/cli/settings.c:593
- msgid "the property can't be changed"
- msgstr "无法更改该属性"
-
--#: ../clients/cli/settings.c:731
-+#: ../clients/cli/settings.c:671
- msgid "[NM property description]"
- msgstr "[NM 属性描述]"
-
--#: ../clients/cli/settings.c:741
-+#: ../clients/cli/settings.c:681
- msgid "[nmcli specific description]"
- msgstr "[nmcli 特定描述]"
-
--#: ../clients/cli/utils.c:320
-+#: ../clients/cli/utils.c:318
- #, c-format
- msgid "Error: Argument '%s' was expected, but '%s' provided."
- msgstr "错误：需要参数 \"%s\" 但提供的是 \"%s\"。"
-
--#: ../clients/cli/utils.c:323
-+#: ../clients/cli/utils.c:321
- #, c-format
- msgid "Error: Unexpected argument '%s'"
- msgstr "错误：意外参数 \"%s\""
-
--#: ../clients/cli/utils.c:710
-+#: ../clients/cli/utils.c:709
- #, c-format
- msgid "invalid field '%s%s%s'; no such field"
- msgstr "无效字段 \"%s%s%s\"；没有此类字段"
-
--#: ../clients/cli/utils.c:714
-+#: ../clients/cli/utils.c:713
- #, c-format
- msgid "invalid field '%s%s%s'; allowed fields: [%s]"
- msgstr "无效字段 \"%s%s%s\";允许的字段：[%s]"
-
--#: ../clients/cli/utils.c:810
-+#: ../clients/cli/utils.c:809
- #, c-format
- msgid "failure to select field"
- msgstr "选择字段失败"
-@@ -3897,26 +3875,26 @@ msgstr "读取 nmcli 输出时出错：%s\n"
- msgid "Error writing nmcli output: %s\n"
- msgstr "写入 nmcli 输出时出错：%s\n"
-
--#: ../clients/cli/utils.c:1467
-+#: ../clients/cli/utils.c:1469
- #, c-format
- msgid "Failed to create pager pipe: %s\n"
- msgstr "创建与子进程通讯的管道失败：%s\n"
-
--#: ../clients/cli/utils.c:1475
-+#: ../clients/cli/utils.c:1478
- #, c-format
- msgid "Failed to fork pager: %s\n"
- msgstr "fork 子进程失败：%s\n"
-
--#: ../clients/cli/utils.c:1521 ../clients/cli/utils.c:1523
-+#: ../clients/cli/utils.c:1525 ../clients/cli/utils.c:1529
- #, c-format
- msgid "Failed to duplicate pager pipe: %s\n"
- msgstr "复制与子进程通讯的管道失败：%s\n"
-
--#: ../clients/cli/utils.h:302 ../clients/common/nm-meta-setting-desc.c:4949
-+#: ../clients/cli/utils.h:302 ../clients/common/nm-meta-setting-desc.c:4237
- msgid "on"
- msgstr "开"
-
--#: ../clients/cli/utils.h:302 ../clients/common/nm-meta-setting-desc.c:4951
-+#: ../clients/cli/utils.h:302 ../clients/common/nm-meta-setting-desc.c:4239
- msgid "off"
- msgstr "关"
-
-@@ -3933,435 +3911,440 @@ 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:117
--#: ../clients/common/nm-client-utils.c:148
-+#: ../clients/common/nm-client-utils.c:121
-+#: ../clients/common/nm-client-utils.c:152
- #, c-format
- msgid "'%s' is ambiguous (%s)"
- msgstr "\"%s\" 不明确（%s）"
-
--#: ../clients/common/nm-client-utils.c:127
-+#: ../clients/common/nm-client-utils.c:131
- #, c-format
- msgid "'%s' is not valid; use [%s] or [%s]"
- msgstr "\"%s\" 无效，请使用 [%s] 或 [%s]"
-
--#: ../clients/common/nm-client-utils.c:160
-+#: ../clients/common/nm-client-utils.c:164
- #, c-format
- msgid "'%s' is not valid; use [%s], [%s] or [%s]"
- msgstr "\"%s\" 无效，请使用 [%s]、[%s] 或 [%s]"
-
--#: ../clients/common/nm-client-utils.c:209
-+#: ../clients/common/nm-client-utils.c:213
- #, c-format
- msgid "'%s' is ambiguous: %s"
- msgstr "\"%s\" 不明确：%s"
-
--#: ../clients/common/nm-client-utils.c:219
-+#: ../clients/common/nm-client-utils.c:223
- #, c-format
- msgid "missing name, try one of [%s]"
- msgstr "缺少名称，请尝试使用 [%s] 之一。"
-
--#: ../clients/common/nm-client-utils.c:261
-+#: ../clients/common/nm-client-utils.c:265
- msgid "unmanaged"
- msgstr "未托管"
-
--#: ../clients/common/nm-client-utils.c:262
-+#: ../clients/common/nm-client-utils.c:266
- msgid "unavailable"
- msgstr "不可用"
-
--#: ../clients/common/nm-client-utils.c:264
-+#: ../clients/common/nm-client-utils.c:268
- msgid "connecting (prepare)"
- msgstr "连接中（准备）"
-
--#: ../clients/common/nm-client-utils.c:265
-+#: ../clients/common/nm-client-utils.c:269
- msgid "connecting (configuring)"
- msgstr "连接中（正在配置）"
-
--#: ../clients/common/nm-client-utils.c:266
-+#: ../clients/common/nm-client-utils.c:270
- msgid "connecting (need authentication)"
- msgstr "连接中（需要验证）"
-
--#: ../clients/common/nm-client-utils.c:267
-+#: ../clients/common/nm-client-utils.c:271
- msgid "connecting (getting IP configuration)"
- msgstr "连接中（正在获取 IP 配置）"
-
--#: ../clients/common/nm-client-utils.c:268
-+#: ../clients/common/nm-client-utils.c:272
- msgid "connecting (checking IP connectivity)"
- msgstr "连接中（正在检查 IP 连接性）"
-
--#: ../clients/common/nm-client-utils.c:269
-+#: ../clients/common/nm-client-utils.c:273
- msgid "connecting (starting secondary connections)"
- msgstr "连接中（正在启动次级连接）"
-
--#: ../clients/common/nm-client-utils.c:272
-+#: ../clients/common/nm-client-utils.c:276
- msgid "connection failed"
- msgstr "连接失败"
-
--#: ../clients/common/nm-client-utils.c:280
-+#: ../clients/common/nm-client-utils.c:284
- msgid "yes (guessed)"
- msgstr "是（猜测）"
-
--#: ../clients/common/nm-client-utils.c:281
-+#: ../clients/common/nm-client-utils.c:285
- 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:287
--#: ../clients/common/nm-client-utils.c:359 ../libnm-glib/nm-device.c:1859
--#: ../libnm/nm-device.c:1437
-+#: ../clients/common/nm-client-utils.c:291
-+#: ../clients/common/nm-client-utils.c:364 ../libnm-glib/nm-device.c:1859
-+#: ../libnm/nm-device.c:1439
- msgid "Unknown"
- msgstr "未知"
-
--#: ../clients/common/nm-client-utils.c:288
-+#: ../clients/common/nm-client-utils.c:292
- msgid "No reason given"
- msgstr "未给出原因"
-
--#: ../clients/common/nm-client-utils.c:290
-+#: ../clients/common/nm-client-utils.c:294
- msgid "Device is now managed"
- msgstr "设备现在已托管"
-
--#: ../clients/common/nm-client-utils.c:291
-+#: ../clients/common/nm-client-utils.c:295
- msgid "Device is now unmanaged"
- msgstr "设备现在未托管"
-
--#: ../clients/common/nm-client-utils.c:292
-+#: ../clients/common/nm-client-utils.c:296
- msgid "The device could not be readied for configuration"
- msgstr "设备配置未就绪"
-
--#: ../clients/common/nm-client-utils.c:293
-+#: ../clients/common/nm-client-utils.c:297
- msgid ""
- "IP configuration could not be reserved (no available address, timeout, etc.)"
- msgstr "IP 配置无法保留（无可用地址、超时等）"
-
--#: ../clients/common/nm-client-utils.c:294
-+#: ../clients/common/nm-client-utils.c:298
- msgid "The IP configuration is no longer valid"
- msgstr "IP 配置不再有效"
-
--#: ../clients/common/nm-client-utils.c:295
-+#: ../clients/common/nm-client-utils.c:299
- msgid "Secrets were required, but not provided"
- msgstr "需要密钥，但未提供"
-
--#: ../clients/common/nm-client-utils.c:296
-+#: ../clients/common/nm-client-utils.c:300
- msgid "802.1X supplicant disconnected"
- msgstr "802.1X 请求方已断开连接"
-
--#: ../clients/common/nm-client-utils.c:297
-+#: ../clients/common/nm-client-utils.c:301
- msgid "802.1X supplicant configuration failed"
- msgstr "802.1X 请求方配置失败"
-
--#: ../clients/common/nm-client-utils.c:298
-+#: ../clients/common/nm-client-utils.c:302
- msgid "802.1X supplicant failed"
- msgstr "802.1X 请求方失败"
-
--#: ../clients/common/nm-client-utils.c:299
-+#: ../clients/common/nm-client-utils.c:303
- msgid "802.1X supplicant took too long to authenticate"
- msgstr "802.1X 请求方验证时间过长"
-
--#: ../clients/common/nm-client-utils.c:300
-+#: ../clients/common/nm-client-utils.c:304
- msgid "PPP service failed to start"
- msgstr "PPP 服务无法启动"
-
--#: ../clients/common/nm-client-utils.c:301
-+#: ../clients/common/nm-client-utils.c:305
- 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:302
-+#: ../clients/common/nm-client-utils.c:306
- msgid "PPP failed"
- msgstr "PPP 失败"
-
--#: ../clients/common/nm-client-utils.c:303
-+#: ../clients/common/nm-client-utils.c:307
- 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:304
-+#: ../clients/common/nm-client-utils.c:308
- msgid "DHCP client error"
- msgstr "DHCP 客户端错误"
-
--#: ../clients/common/nm-client-utils.c:305
-+#: ../clients/common/nm-client-utils.c:309
- msgid "DHCP client failed"
- msgstr "DHCP 客户端失败"
-
--#: ../clients/common/nm-client-utils.c:306
-+#: ../clients/common/nm-client-utils.c:310
- msgid "Shared connection service failed to start"
- msgstr "共享连接服务启动失败"
-
--#: ../clients/common/nm-client-utils.c:307
-+#: ../clients/common/nm-client-utils.c:311
- msgid "Shared connection service failed"
- msgstr "共享连接服务失败"
-
--#: ../clients/common/nm-client-utils.c:308
-+#: ../clients/common/nm-client-utils.c:312
- msgid "AutoIP service failed to start"
- msgstr "自动 IP（AutoIP）服务无法启动"
-
--#: ../clients/common/nm-client-utils.c:309
-+#: ../clients/common/nm-client-utils.c:313
- msgid "AutoIP service error"
- msgstr "自动 IP（AutoIP）服务出错"
-
--#: ../clients/common/nm-client-utils.c:310
-+#: ../clients/common/nm-client-utils.c:314
- msgid "AutoIP service failed"
- msgstr "自动 IP（AutoIP）服务失败"
-
--#: ../clients/common/nm-client-utils.c:311
-+#: ../clients/common/nm-client-utils.c:315
- msgid "The line is busy"
- msgstr "线路正忙"
-
--#: ../clients/common/nm-client-utils.c:312
-+#: ../clients/common/nm-client-utils.c:316
- msgid "No dial tone"
- msgstr "无拨号音"
-
--#: ../clients/common/nm-client-utils.c:313
-+#: ../clients/common/nm-client-utils.c:317
- msgid "No carrier could be established"
- msgstr "无法建立载波"
-
--#: ../clients/common/nm-client-utils.c:314
-+#: ../clients/common/nm-client-utils.c:318
- msgid "The dialing request timed out"
- msgstr "拨号请求超时"
-
--#: ../clients/common/nm-client-utils.c:315
-+#: ../clients/common/nm-client-utils.c:319
- msgid "The dialing attempt failed"
- msgstr "拨号尝试失败"
-
--#: ../clients/common/nm-client-utils.c:316
-+#: ../clients/common/nm-client-utils.c:320
- msgid "Modem initialization failed"
- msgstr "调制解调器初始化失败"
-
--#: ../clients/common/nm-client-utils.c:317
-+#: ../clients/common/nm-client-utils.c:321
- msgid "Failed to select the specified APN"
- msgstr "无法选择指定的 APN"
-
--#: ../clients/common/nm-client-utils.c:318
-+#: ../clients/common/nm-client-utils.c:322
- msgid "Not searching for networks"
- msgstr "不搜索网络"
-
--#: ../clients/common/nm-client-utils.c:319
-+#: ../clients/common/nm-client-utils.c:323
- msgid "Network registration denied"
- msgstr "网络注册遭拒绝"
-
--#: ../clients/common/nm-client-utils.c:320
-+#: ../clients/common/nm-client-utils.c:324
- msgid "Network registration timed out"
- msgstr "网络注册超时"
-
--#: ../clients/common/nm-client-utils.c:321
-+#: ../clients/common/nm-client-utils.c:325
- msgid "Failed to register with the requested network"
- msgstr "注册请求的网络失败"
-
--#: ../clients/common/nm-client-utils.c:322
-+#: ../clients/common/nm-client-utils.c:326
- msgid "PIN check failed"
- msgstr "PIN 检查失败"
-
--#: ../clients/common/nm-client-utils.c:323
-+#: ../clients/common/nm-client-utils.c:327
- msgid "Necessary firmware for the device may be missing"
- msgstr "该设备所需固件可能缺失"
-
--#: ../clients/common/nm-client-utils.c:324
-+#: ../clients/common/nm-client-utils.c:328
- msgid "The device was removed"
- msgstr "设备已被移除"
-
--#: ../clients/common/nm-client-utils.c:325
-+#: ../clients/common/nm-client-utils.c:329
- msgid "NetworkManager went to sleep"
- msgstr "网络管理器已挂起"
-
--#: ../clients/common/nm-client-utils.c:326
-+#: ../clients/common/nm-client-utils.c:330
- msgid "The device's active connection disappeared"
- msgstr "设备的活动连接已消失"
-
--#: ../clients/common/nm-client-utils.c:327
-+#: ../clients/common/nm-client-utils.c:331
- msgid "Device disconnected by user or client"
- msgstr "用户或客户端断开了设备连接"
-
--#: ../clients/common/nm-client-utils.c:328
-+#: ../clients/common/nm-client-utils.c:332
- msgid "Carrier/link changed"
- msgstr "载波/链路已更改"
-
--#: ../clients/common/nm-client-utils.c:329
-+#: ../clients/common/nm-client-utils.c:333
- msgid "The device's existing connection was assumed"
- msgstr "假定设备已有连接"
-
--#: ../clients/common/nm-client-utils.c:330
-+#: ../clients/common/nm-client-utils.c:334
- msgid "The supplicant is now available"
- msgstr "客户端目前可用"
-
--#: ../clients/common/nm-client-utils.c:331
-+#: ../clients/common/nm-client-utils.c:335
- msgid "The modem could not be found"
- msgstr "未找到调制解调器"
-
--#: ../clients/common/nm-client-utils.c:332
-+#: ../clients/common/nm-client-utils.c:336
- msgid "The Bluetooth connection failed or timed out"
- msgstr "蓝牙连接失败或超时"
-
--#: ../clients/common/nm-client-utils.c:333
-+#: ../clients/common/nm-client-utils.c:337
- msgid "GSM Modem's SIM card not inserted"
- msgstr "GSM 调制解调器的 SIM 卡未插入"
-
--#: ../clients/common/nm-client-utils.c:334
-+#: ../clients/common/nm-client-utils.c:338
- msgid "GSM Modem's SIM PIN required"
- msgstr "GSM 调制解调器的 SIM 需要 PIN 码"
-
--#: ../clients/common/nm-client-utils.c:335
-+#: ../clients/common/nm-client-utils.c:339
- msgid "GSM Modem's SIM PUK required"
- msgstr "GSM 调制解调器的 SIM 需要 PUK 码"
-
--#: ../clients/common/nm-client-utils.c:336
-+#: ../clients/common/nm-client-utils.c:340
- msgid "GSM Modem's SIM wrong"
- msgstr "GSM 调制解调器的 SIM 错误"
-
--#: ../clients/common/nm-client-utils.c:337
-+#: ../clients/common/nm-client-utils.c:341
- msgid "InfiniBand device does not support connected mode"
- msgstr "InfiniBand 设备不支持已连接的模式"
-
--#: ../clients/common/nm-client-utils.c:338
-+#: ../clients/common/nm-client-utils.c:342
- msgid "A dependency of the connection failed"
- msgstr "连接的依赖关系失败"
-
--#: ../clients/common/nm-client-utils.c:339
-+#: ../clients/common/nm-client-utils.c:343
- msgid "A problem with the RFC 2684 Ethernet over ADSL bridge"
- msgstr "ADSL 网桥上的 RFC 2684 以太网出现问题"
-
--#: ../clients/common/nm-client-utils.c:340
-+#: ../clients/common/nm-client-utils.c:344
- msgid "ModemManager is unavailable"
- msgstr "ModemManager 不可用"
-
--#: ../clients/common/nm-client-utils.c:341
-+#: ../clients/common/nm-client-utils.c:345
- msgid "The Wi-Fi network could not be found"
- msgstr "未找到 Wi-Fi 网络"
-
--#: ../clients/common/nm-client-utils.c:342
-+#: ../clients/common/nm-client-utils.c:346
- msgid "A secondary connection of the base connection failed"
- msgstr "基础连接的次级连接失败"
-
--#: ../clients/common/nm-client-utils.c:343
-+#: ../clients/common/nm-client-utils.c:347
- msgid "DCB or FCoE setup failed"
- msgstr "DCB 或 FCoE 设置失败"
-
--#: ../clients/common/nm-client-utils.c:344
-+#: ../clients/common/nm-client-utils.c:348
- 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:345
-+#: ../clients/common/nm-client-utils.c:349
- 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:346
-+#: ../clients/common/nm-client-utils.c:350
- msgid "Modem now ready and available"
- msgstr "调制解调器现已就绪且可用"
-
--#: ../clients/common/nm-client-utils.c:347
-+#: ../clients/common/nm-client-utils.c:351
- msgid "SIM PIN was incorrect"
- msgstr "SIM PIN 不正确"
-
--#: ../clients/common/nm-client-utils.c:348
-+#: ../clients/common/nm-client-utils.c:352
- msgid "New connection activation was enqueued"
- msgstr "新连接激活已排队"
-
--#: ../clients/common/nm-client-utils.c:349
-+#: ../clients/common/nm-client-utils.c:353
- msgid "The device's parent changed"
- msgstr "设备的上级已更改"
-
--#: ../clients/common/nm-client-utils.c:350
-+#: ../clients/common/nm-client-utils.c:354
- msgid "The device parent's management changed"
- msgstr "设备的上级管理已更改"
-
--#: ../clients/common/nm-client-utils.c:351
-+#: ../clients/common/nm-client-utils.c:355
- msgid "Open vSwitch database connection failed"
- msgstr "Open vSwitch 数据库连接失败"
-
--#: ../clients/common/nm-client-utils.c:352
-+#: ../clients/common/nm-client-utils.c:356
- msgid "A duplicate IP address was detected"
- msgstr "检测到重复的 IP 地址"
-
--#: ../clients/common/nm-client-utils.c:353
-+#: ../clients/common/nm-client-utils.c:357
- msgid "The selected IP method is not supported"
- msgstr "选中的 IP 方法未支持"
-
--#: ../clients/common/nm-client-utils.c:354
-+#: ../clients/common/nm-client-utils.c:358
- msgid "Failed to configure SR-IOV parameters"
- msgstr "配置 SR-IOV 参数失败"
-
--#: ../clients/common/nm-client-utils.c:360
-+#: ../clients/common/nm-client-utils.c:359
-+#, fuzzy
-+msgid "The Wi-Fi P2P peer could not be found"
-+msgstr "未找到 Wi-Fi 网络"
-+
-+#: ../clients/common/nm-client-utils.c:365
- msgid "Unknown reason"
- msgstr "未知原因"
-
--#: ../clients/common/nm-client-utils.c:361
-+#: ../clients/common/nm-client-utils.c:366
- msgid "The connection was disconnected"
- msgstr "连接已断开"
-
--#: ../clients/common/nm-client-utils.c:362
-+#: ../clients/common/nm-client-utils.c:367
- msgid "Disconnected by user"
- msgstr "已被用户断开连接"
-
--#: ../clients/common/nm-client-utils.c:363
-+#: ../clients/common/nm-client-utils.c:368
- msgid "The base network connection was interrupted"
- msgstr "基础网络连接已中断"
-
--#: ../clients/common/nm-client-utils.c:364
-+#: ../clients/common/nm-client-utils.c:369
- msgid "The VPN service stopped unexpectedly"
- msgstr "VPN 服务意外停止"
-
--#: ../clients/common/nm-client-utils.c:365
-+#: ../clients/common/nm-client-utils.c:370
- msgid "The VPN service returned invalid configuration"
- msgstr "VPN 服务返回了无效配置"
-
--#: ../clients/common/nm-client-utils.c:366
-+#: ../clients/common/nm-client-utils.c:371
- msgid "The connection attempt timed out"
- msgstr "连接尝试超时"
-
--#: ../clients/common/nm-client-utils.c:367
-+#: ../clients/common/nm-client-utils.c:372
- msgid "The VPN service did not start in time"
- msgstr "VPN 连接没有及时启动"
-
--#: ../clients/common/nm-client-utils.c:368
-+#: ../clients/common/nm-client-utils.c:373
- msgid "The VPN service failed to start"
- msgstr "VPN 服务启动失败"
-
--#: ../clients/common/nm-client-utils.c:369
-+#: ../clients/common/nm-client-utils.c:374
- msgid "No valid secrets"
- msgstr "没有有效的密钥"
-
--#: ../clients/common/nm-client-utils.c:370
-+#: ../clients/common/nm-client-utils.c:375
- msgid "Invalid secrets"
- msgstr "无效的密钥"
-
--#: ../clients/common/nm-client-utils.c:371
-+#: ../clients/common/nm-client-utils.c:376
- msgid "The connection was removed"
- msgstr "连接已被移除"
-
--#: ../clients/common/nm-client-utils.c:372
-+#: ../clients/common/nm-client-utils.c:377
- msgid "Master connection failed"
- msgstr "主连接失败"
-
--#: ../clients/common/nm-client-utils.c:373
-+#: ../clients/common/nm-client-utils.c:378
- msgid "Could not create a software link"
- msgstr "无法创建软件链路："
-
--#: ../clients/common/nm-client-utils.c:374
-+#: ../clients/common/nm-client-utils.c:379
- msgid "The device disappeared"
- msgstr "设备已消失"
-
--#: ../clients/common/nm-meta-setting-access.c:492
-+#: ../clients/common/nm-meta-setting-access.c:510
- #, c-format
- msgid "field '%s' has to be alone"
- msgstr "字段 \"%s\" 必须是单独的"
-
--#: ../clients/common/nm-meta-setting-access.c:507
-+#: ../clients/common/nm-meta-setting-access.c:525
- #, 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:99
--#: ../clients/common/nm-meta-setting-desc.c:161
-+#: ../clients/common/nm-meta-setting-desc.c:291
-+#: ../clients/common/nm-meta-setting-desc.c:352
- #, c-format
- msgid "invalid prefix '%s'; <1-%d> allowed"
- msgstr "无效的前缀 '%s'; 只允许 <1-%d>"
-
--#: ../clients/common/nm-meta-setting-desc.c:107
-+#: ../clients/common/nm-meta-setting-desc.c:299
- #, c-format
- msgid "invalid IP address: %s"
- msgstr "无效的 IP 地址：%s"
-
--#: ../clients/common/nm-meta-setting-desc.c:133
-+#: ../clients/common/nm-meta-setting-desc.c:324
- msgid ""
- "The valid syntax is: 'ip[/prefix] [next-hop] [metric] [attribute=val]... [,"
- "ip[/prefix] ...]'"
-@@ -4369,238 +4352,205 @@ msgstr ""
- "有效语法为：\"ip[/prefix] [next-hop] [metric] [attribute=val]... [,ip[/"
- "prefix] ...]\""
-
--#: ../clients/common/nm-meta-setting-desc.c:172
-+#: ../clients/common/nm-meta-setting-desc.c:363
- #, c-format
- msgid "the next hop ('%s') must be first"
- msgstr "下一跳（\"%s\"）必须在首位"
-
--#: ../clients/common/nm-meta-setting-desc.c:178
-+#: ../clients/common/nm-meta-setting-desc.c:369
- #, c-format
- msgid "the metric ('%s') must be before attributes"
- msgstr "跃点数（\"%s\"）必需在属性前"
-
--#: ../clients/common/nm-meta-setting-desc.c:227
-+#: ../clients/common/nm-meta-setting-desc.c:417
- #, c-format
- msgid "invalid route: %s. %s"
- msgstr "无效路由：%s。%s"
-
--#: ../clients/common/nm-meta-setting-desc.c:239
--msgid "default route cannot be added (NetworkManager handles it by itself)"
--msgstr "无法添加默认路由（网络管理器自己进行处理）"
--
--#: ../clients/common/nm-meta-setting-desc.c:446
--#, c-format
--msgid "invalid priority map '%s'"
--msgstr "无效的优先级映射 \"%s\""
--
--#: ../clients/common/nm-meta-setting-desc.c:453
--#: ../clients/common/nm-meta-setting-desc.c:459
--#, c-format
--msgid "priority '%s' is not valid (<0-%ld>)"
--msgstr "优先级 '%s' 无效 (<0-%ld>)"
--
--#: ../clients/common/nm-meta-setting-desc.c:511
-+#: ../clients/common/nm-meta-setting-desc.c:634
- #, c-format
- msgid "cannot read pac-script from file '%s'"
- msgstr "无法从文件 \"%s\" 读取 PAC 脚本"
-
--#: ../clients/common/nm-meta-setting-desc.c:518
-+#: ../clients/common/nm-meta-setting-desc.c:641
- #, c-format
- msgid "file '%s' contains non-valid utf-8"
- msgstr "文件 \"%s\" 包含无效的 utf-8"
-
--#: ../clients/common/nm-meta-setting-desc.c:531
-+#: ../clients/common/nm-meta-setting-desc.c:654
- #, c-format
- msgid "'%s' does not contain a valid PAC Script"
- msgstr "\"%s\" 没有包含有效的 PAC 脚本"
-
--#: ../clients/common/nm-meta-setting-desc.c:534
-+#: ../clients/common/nm-meta-setting-desc.c:657
- #, c-format
- msgid "Not a valid PAC Script"
- msgstr "不是有效的 PAC 脚本"
-
--#: ../clients/common/nm-meta-setting-desc.c:588
-+#: ../clients/common/nm-meta-setting-desc.c:711
- #, c-format
- msgid "cannot read team config from file '%s'"
- msgstr "无法从文件 \"%s\" 读取组合（team）配置"
-
--#: ../clients/common/nm-meta-setting-desc.c:595
-+#: ../clients/common/nm-meta-setting-desc.c:718
- #, c-format
- msgid "team config file '%s' contains non-valid utf-8"
- msgstr "组合（team）配置文件 \"%s\" 包含无效的 utf-8"
-
--#: ../clients/common/nm-meta-setting-desc.c:607
-+#: ../clients/common/nm-meta-setting-desc.c:730
- #, c-format
- msgid "'%s' does not contain a valid team configuration"
- msgstr "\"%s\" 没有包含有效的组合（team）配置"
-
--#: ../clients/common/nm-meta-setting-desc.c:610
-+#: ../clients/common/nm-meta-setting-desc.c:733
- #, c-format
- msgid "team configuration must be a JSON object"
- msgstr "组合（team）配置必须为 JSON 目标"
-
--#: ../clients/common/nm-meta-setting-desc.c:731
-+#: ../clients/common/nm-meta-setting-desc.c:926
- #: ../clients/tui/nmt-mtu-entry.c:84
- msgid "(default)"
- msgstr "（默认）"
-
--#: ../clients/common/nm-meta-setting-desc.c:885
-+#: ../clients/common/nm-meta-setting-desc.c:1072
- msgid "auto"
- msgstr "自动"
-
--#: ../clients/common/nm-meta-setting-desc.c:1037
-+#: ../clients/common/nm-meta-setting-desc.c:1224
- #, c-format
- msgid "%s (%s)"
- msgstr "%s（%s）"
-
--#: ../clients/common/nm-meta-setting-desc.c:1180
--#: ../clients/common/nm-meta-setting-desc.c:1184
-+#: ../clients/common/nm-meta-setting-desc.c:1372
-+#: ../clients/common/nm-meta-setting-desc.c:1376
- #, fuzzy
- msgid "'%s' is out of range [%"
- msgstr "\"%s\" 超出范围 [0, %u]"
-
--#: ../clients/common/nm-meta-setting-desc.c:1189
-+#: ../clients/common/nm-meta-setting-desc.c:1381
- #, c-format
- msgid "'%s' is not a valid number"
- msgstr "\"%s\" 不是有效的数字"
-
--#: ../clients/common/nm-meta-setting-desc.c:1243
-+#: ../clients/common/nm-meta-setting-desc.c:1438
- #, c-format
- msgid "'%s' is out of range [0, %u]"
- msgstr "\"%s\" 超出范围 [0, %u]"
-
--#: ../clients/common/nm-meta-setting-desc.c:1286
-+#: ../clients/common/nm-meta-setting-desc.c:1484
- #, c-format
- msgid "'%s' is not a valid Ethernet MAC"
- msgstr "\"%s\" 不是有效的以太网 MAC"
-
--#: ../clients/common/nm-meta-setting-desc.c:1391
-+#: ../clients/common/nm-meta-setting-desc.c:1592
- #, c-format
- msgid "invalid option '%s', use a combination of [%s]"
- msgstr "无效选项 \"%s\"，请使用 [%s] 的组合"
-
--#: ../clients/common/nm-meta-setting-desc.c:1396 ../libnm-core/nm-keyfile.c:780
-+#: ../clients/common/nm-meta-setting-desc.c:1597 ../libnm-core/nm-keyfile.c:884
- #, c-format
- msgid "invalid option '%s', use one of [%s]"
- msgstr "无效选项 \"%s\"，请使用 [%s] 中的一个。"
-
--#: ../clients/common/nm-meta-setting-desc.c:1515
-+#: ../clients/common/nm-meta-setting-desc.c:1716
- #, c-format
- msgid "%d (key)"
- msgstr "%d（密钥）"
-
--#: ../clients/common/nm-meta-setting-desc.c:1517
-+#: ../clients/common/nm-meta-setting-desc.c:1718
- #, c-format
- msgid "%d (passphrase)"
- msgstr "%d（密码）"
-
--#: ../clients/common/nm-meta-setting-desc.c:1520
-+#: ../clients/common/nm-meta-setting-desc.c:1721
- #, c-format
- msgid "%d (unknown)"
- msgstr "%d（未知）"
-
--#: ../clients/common/nm-meta-setting-desc.c:1552
-+#: ../clients/common/nm-meta-setting-desc.c:1751
- msgid "0 (NONE)"
- msgstr "0（无）"
-
--#: ../clients/common/nm-meta-setting-desc.c:1558
-+#: ../clients/common/nm-meta-setting-desc.c:1757
- msgid "REORDER_HEADERS, "
- msgstr "记录头、"
-
--#: ../clients/common/nm-meta-setting-desc.c:1560
-+#: ../clients/common/nm-meta-setting-desc.c:1759
- msgid "GVRP, "
- msgstr "GVRP、"
-
--#: ../clients/common/nm-meta-setting-desc.c:1562
-+#: ../clients/common/nm-meta-setting-desc.c:1761
- msgid "LOOSE_BINDING, "
- msgstr "松散绑定、"
-
--#: ../clients/common/nm-meta-setting-desc.c:1564
-+#: ../clients/common/nm-meta-setting-desc.c:1763
- msgid "MVRP, "
- msgstr "MVRP、"
-
--#: ../clients/common/nm-meta-setting-desc.c:1604
-+#: ../clients/common/nm-meta-setting-desc.c:1784
- msgid "0 (none)"
- msgstr "0（无）"
-
--#: ../clients/common/nm-meta-setting-desc.c:1610
-+#: ../clients/common/nm-meta-setting-desc.c:1790
- msgid "agent-owned, "
- msgstr "为代理拥有、"
-
--#: ../clients/common/nm-meta-setting-desc.c:1612
-+#: ../clients/common/nm-meta-setting-desc.c:1792
- msgid "not saved, "
- msgstr "未保存、"
-
--#: ../clients/common/nm-meta-setting-desc.c:1614
-+#: ../clients/common/nm-meta-setting-desc.c:1794
- msgid "not required, "
- msgstr "不必需、"
-
--#: ../clients/common/nm-meta-setting-desc.c:1679
-+#: ../clients/common/nm-meta-setting-desc.c:1983
- #, c-format
- msgid "'%s' is not valid; use <option>=<value>"
- msgstr "'%s' 无效; 使用 <option>=<value>"
-
--#: ../clients/common/nm-meta-setting-desc.c:1718
--msgid "no item to remove"
--msgstr "没有要移除的项"
-+#: ../clients/common/nm-meta-setting-desc.c:1993
-+#, fuzzy, c-format
-+msgid "cannot set empty \"%s\" option"
-+msgstr "无法设定属性：%s"
-
--#: ../clients/common/nm-meta-setting-desc.c:1722
--#, c-format
--msgid "index '%d' is not in range <0-%d>"
--msgstr "索引 '%d' 超出了范围 <0-%d>"
--
--#: ../clients/common/nm-meta-setting-desc.c:1737
--#, c-format
--msgid "invalid option '%s'"
--msgstr "无效选项 \"%s\""
--
--#: ../clients/common/nm-meta-setting-desc.c:1739
--msgid "missing option"
--msgstr "缺少选项"
--
--#: ../clients/common/nm-meta-setting-desc.c:1763
--#, c-format
--msgid "'%s' is not a valid MAC"
--msgstr "\"%s\" 不是有效的 MAC"
--
--#: ../clients/common/nm-meta-setting-desc.c:1790
--#: ../clients/common/nm-meta-setting-desc.c:1887
--#: ../clients/common/nm-meta-setting-desc.c:4855 ../src/nm-config.c:547
--#, c-format
--msgid "'%s' is not valid"
--msgstr "\"%s\" 无效"
--
--#: ../clients/common/nm-meta-setting-desc.c:1831
-+#: ../clients/common/nm-meta-setting-desc.c:2052
- #, c-format
- msgid "'%u' flags are not valid; use combination of %s"
- msgstr "\"%u\" 标记无效；请使用 %s 的组合"
-
--#: ../clients/common/nm-meta-setting-desc.c:1867
-+#: ../clients/common/nm-meta-setting-desc.c:2069
- #, c-format
- msgid "'%s' is not a valid number (or out of range)"
- msgstr "\"%s\" 不是有效的数字（或超出范围）"
-
--#: ../clients/common/nm-meta-setting-desc.c:1985
-+#: ../clients/common/nm-meta-setting-desc.c:2090
-+#: ../clients/common/nm-meta-setting-desc.c:4153 ../src/nm-config.c:546
-+#, c-format
-+msgid "'%s' is not valid"
-+msgstr "\"%s\" 无效"
-+
-+#: ../clients/common/nm-meta-setting-desc.c:2187
-+#, fuzzy
-+msgid "not a valid hex-string"
-+msgstr "不是有效的接口名称"
-+
-+#: ../clients/common/nm-meta-setting-desc.c:2203
- #, c-format
- msgid "'%s' is not a valid hex character"
- msgstr "\"%s\" 不是有效十六进制字符"
-
--#: ../clients/common/nm-meta-setting-desc.c:2268
--#, c-format
--msgid "the property doesn't contain EAP method '%s'"
--msgstr "属性没有包含 EAP 方法 \"%s\""
-+#: ../clients/common/nm-meta-setting-desc.c:2282
-+msgid ""
-+"too many arguments. Please only specify a private key file and optionally a "
-+"password"
-+msgstr ""
-
--#: ../clients/common/nm-meta-setting-desc.c:2291
--#, c-format
--msgid "the property doesn't contain alternative subject match '%s'"
--msgstr "属性没有包含符合 \"%s\" 的替换者"
-+#: ../clients/common/nm-meta-setting-desc.c:2404
-+#, fuzzy, c-format
-+msgid "failed to set bond option \"%s\""
-+msgstr "设定属性失败：%s"
-
--#: ../clients/common/nm-meta-setting-desc.c:2317
--#, c-format
--msgid "the property doesn't contain \"phase2\" alternative subject match '%s'"
--msgstr "属性没有包含符合 \"%s\" 的 \"phase2\" 替换者"
--
--#: ../clients/common/nm-meta-setting-desc.c:2439
-+#: ../clients/common/nm-meta-setting-desc.c:2421
- #, c-format
- msgid ""
- "Enter a list of bonding options formatted as:\n"
-@@ -4638,240 +4588,126 @@ 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:2502
-+#: ../clients/common/nm-meta-setting-desc.c:2486
- #, c-format
- msgid "Can not change the connection type"
- msgstr "无法更改连接类型"
-
--#: ../clients/common/nm-meta-setting-desc.c:2605
--#, c-format
--msgid "the property doesn't contain permission '%s'"
--msgstr "属性没有包含权限 \"%s\""
-+#: ../clients/common/nm-meta-setting-desc.c:2564
-+#, fuzzy, c-format
-+msgid "invalid permission \"%s\""
-+msgstr "无效的运行程序（runner）\"%s\""
-
--#: ../clients/common/nm-meta-setting-desc.c:2626
-+#: ../clients/common/nm-meta-setting-desc.c:2601
- #, c-format
- msgid "'%s' is not valid master; use ifname or connection UUID"
- msgstr "\"%s\" 不是有效的主连接；使用接口名或连接的 UUID"
-
--#: ../clients/common/nm-meta-setting-desc.c:2723
-+#: ../clients/common/nm-meta-setting-desc.c:2682
- #, c-format
- msgid "the value '%s' is not a valid UUID"
- msgstr "值 \"%s\" 不是有效的 UUID"
-
--#: ../clients/common/nm-meta-setting-desc.c:2730
--#, c-format
--msgid "the property doesn't contain UUID '%s'"
--msgstr "属性没有包含 UUID \"%s\""
--
--#: ../clients/common/nm-meta-setting-desc.c:2799
-+#: ../clients/common/nm-meta-setting-desc.c:2753
- msgid "0 (disabled)"
- msgstr "0（禁用）"
-
--#: ../clients/common/nm-meta-setting-desc.c:2805
-+#: ../clients/common/nm-meta-setting-desc.c:2759
- msgid "enabled, "
- msgstr "启用、"
-
--#: ../clients/common/nm-meta-setting-desc.c:2807
-+#: ../clients/common/nm-meta-setting-desc.c:2761
- msgid "advertise, "
- msgstr "通告、"
-
--#: ../clients/common/nm-meta-setting-desc.c:2809
-+#: ../clients/common/nm-meta-setting-desc.c:2763
- msgid "willing, "
- msgstr "愿意、"
-
--#: ../clients/common/nm-meta-setting-desc.c:2931
-+#: ../clients/common/nm-meta-setting-desc.c:2852
- #, c-format
- msgid "'%s' is not a valid DCB flag"
- msgstr "\"%s\" 不是有效的 DCB 标记"
-
--#: ../clients/common/nm-meta-setting-desc.c:2960
-+#: ../clients/common/nm-meta-setting-desc.c:2879
- msgid "must contain 8 comma-separated numbers"
- msgstr "必须包含 8 个用逗号分隔的数字"
-
--#: ../clients/common/nm-meta-setting-desc.c:2976
-+#: ../clients/common/nm-meta-setting-desc.c:2893
- #, 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:2979
-+#: ../clients/common/nm-meta-setting-desc.c:2896
- #, c-format
- msgid "'%s' not a number between 0 and %u (inclusive)"
- msgstr "\"%s\" 不是 0 和 %u（包括）之间的数字"
-
--#: ../clients/common/nm-meta-setting-desc.c:3000
-+#: ../clients/common/nm-meta-setting-desc.c:2917
- #, c-format
- msgid "changes will have no effect until '%s' includes 1 (enabled)"
- msgstr "除非 \"%s\" 包含 1（启用），否则更改无法生效"
-
--#: ../clients/common/nm-meta-setting-desc.c:3055
-+#: ../clients/common/nm-meta-setting-desc.c:2947
- #, c-format
- msgid "bandwidth percentages must total 100%%"
- msgstr "带宽百分比总和必须为 100%%"
-
--#: ../clients/common/nm-meta-setting-desc.c:3128
--#: ../clients/common/nm-meta-setting-desc.c:3134
-+#: ../clients/common/nm-meta-setting-desc.c:3018
-+#: ../clients/common/nm-meta-setting-desc.c:3024
- 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:3158
-+#: ../clients/common/nm-meta-setting-desc.c:3048
- #, c-format
- msgid "'%s' is not a valid IBoIP P_Key"
- msgstr "\"%s\" 不是有效的 IBoIP P_Key"
-
--#: ../clients/common/nm-meta-setting-desc.c:3181
-+#: ../clients/common/nm-meta-setting-desc.c:3071
- msgid "default"
- msgstr "默认"
-
--#: ../clients/common/nm-meta-setting-desc.c:3320
--#: ../clients/common/nm-meta-setting-desc.c:3337
--#, c-format
--msgid "invalid IPv4 address '%s'"
-+#: ../clients/common/nm-meta-setting-desc.c:3235
-+#, fuzzy, c-format
-+msgid "invalid IPv%c address '%s'"
- msgstr "无效的 IPv4 地址\"%s\""
-
--#: ../clients/common/nm-meta-setting-desc.c:3343
--#: ../clients/common/nm-meta-setting-desc.c:3587
--#, c-format
--msgid "the property doesn't contain DNS server '%s'"
--msgstr "属性没有包含 DNS 服务器 \"%s\""
--
--#: ../clients/common/nm-meta-setting-desc.c:3381
--#: ../clients/common/nm-meta-setting-desc.c:3625
--#, c-format
--msgid "the property doesn't contain DNS search domain '%s'"
--msgstr "属性没有包含 DNS 搜索域 \"%s\""
--
--#: ../clients/common/nm-meta-setting-desc.c:3418
--#: ../clients/common/nm-meta-setting-desc.c:3662
--#, c-format
--msgid "the property doesn't contain DNS option '%s'"
--msgstr "属性没有包含 DNS 选项 \"%s\""
--
--#: ../clients/common/nm-meta-setting-desc.c:3461
--#: ../clients/common/nm-meta-setting-desc.c:3711
--#, c-format
--msgid "the property doesn't contain IP address '%s'"
--msgstr "属性没有包含 IP 地址 \"%s\""
--
--#: ../clients/common/nm-meta-setting-desc.c:3481
--#: ../clients/common/nm-meta-setting-desc.c:3730
-+#: ../clients/common/nm-meta-setting-desc.c:3362
- #, c-format
- msgid "invalid gateway address '%s'"
- msgstr "无效的网关地址 \"%s\""
-
--#: ../clients/common/nm-meta-setting-desc.c:3520
--#: ../clients/common/nm-meta-setting-desc.c:3771
--#, c-format
--msgid "the property doesn't contain route '%s'"
--msgstr "属性没有包含路由 \"%s\""
--
--#: ../clients/common/nm-meta-setting-desc.c:3564
--#: ../clients/common/nm-meta-setting-desc.c:3581
--#, c-format
--msgid "invalid IPv6 address '%s'"
--msgstr "无效的 IPv6 地址 \"%s\""
--
--#: ../clients/common/nm-meta-setting-desc.c:3833
--#, c-format
--msgid "the property doesn't contain interface name '%s'"
--msgstr "属性没有包含接口名 \"%s\""
--
--#: ../clients/common/nm-meta-setting-desc.c:3870
-+#: ../clients/common/nm-meta-setting-desc.c:3513
- #, c-format
- msgid "'%s' is not a valid channel; use <1-13>"
- msgstr "'%s' 不是一个有效的 channel; 使用 <1-13>"
-
--#: ../clients/common/nm-meta-setting-desc.c:3962
-+#: ../clients/common/nm-meta-setting-desc.c:3593
- 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:3984
-+#: ../clients/common/nm-meta-setting-desc.c:3617
-+#: ../clients/common/nm-meta-setting-desc.c:3697
-+#, fuzzy
- msgid ""
--"The valid syntax is: '[root | parent <handle>] [handle <handle>] <qdisc>'"
-+"The valid syntax is: '[root | parent <handle>] [handle <handle>] <kind>'"
- msgstr "有效的语法是：'[root | parent <handle>] [handle <handle>] <qdisc>'"
-
--#: ../clients/common/nm-meta-setting-desc.c:4008
-+#: ../clients/common/nm-meta-setting-desc.c:3642
-+msgid "The valid syntax is: '<vid>[-<vid>] [pvid] [untagged]'"
-+msgstr ""
-+
-+#: ../clients/common/nm-meta-setting-desc.c:3917
- #, c-format
--msgid "the property doesn't contain vf with index %u"
--msgstr "属性没有包含索引为 %u 的虚拟功能（vf）"
-+msgid "invalid priority map '%s'"
-+msgstr "无效的优先级映射 \"%s\""
-
--#: ../clients/common/nm-meta-setting-desc.c:4035
--#, c-format
--msgid "the property doesn't contain qdisc '%s'"
--msgstr "属性没有包含排队规则（qdisc） \"%s\""
--
--#: ../clients/common/nm-meta-setting-desc.c:4089
--msgid ""
--"The valid syntax is: '[root | parent <handle>] [handle <handle>] <tfilter>'"
--msgstr "有效的语法是：'[root | parent <handle>] [handle <handle>] <tfilter>'"
--
--#: ../clients/common/nm-meta-setting-desc.c:4112
--#, c-format
--msgid "the property doesn't contain tfilter '%s'"
--msgstr "属性没有包含流量过滤器（tfilter）\"%s\""
--
--#: ../clients/common/nm-meta-setting-desc.c:4179
--#, c-format
--msgid "the property doesn't contain string '%s'"
--msgstr "属性没有包含字符串 \"%s\""
--
--#: ../clients/common/nm-meta-setting-desc.c:4254
--#: ../clients/common/nm-meta-setting-desc.c:4328
--#, c-format
--msgid "the property doesn't contain link watcher '%s'"
--msgstr "属性没有包含链路监视器 \"%s\""
--
--#: ../clients/common/nm-meta-setting-desc.c:4434
--#, c-format
--msgid "only one mapping at a time is supported; taking the first one (%s)"
--msgstr "警告：一次只支持映射一个；使用第一个（%s）"
--
--#: ../clients/common/nm-meta-setting-desc.c:4442
--#, c-format
--msgid "the property doesn't contain mapping '%s'"
--msgstr "属性没有包含映射 \"%s\""
--
--#: ../clients/common/nm-meta-setting-desc.c:4450
--msgid "no priority to remove"
--msgstr "没有要删除的优先级"
--
--#: ../clients/common/nm-meta-setting-desc.c:4454
--#, c-format
--msgid "index '%d' is not in the range of <0-%d>"
--msgstr "索引 '%d' 不在 <0-%d> 范围内"
--
--#: ../clients/common/nm-meta-setting-desc.c:4523
--#, c-format
--msgid "'%s' cannot be empty"
--msgstr "\"%s\" 不能为空"
--
--#: ../clients/common/nm-meta-setting-desc.c:4562
--#: ../clients/common/nm-meta-setting-desc.c:4693
--#: ../libnm-core/nm-setting-sriov.c:446 ../libnm-core/nm-setting-wired.c:662
--#: ../libnm-core/nm-setting-wireless.c:857
--#: ../libnm-core/nm-setting-wireless.c:869 ../libnm-util/nm-setting-wired.c:645
--#: ../libnm-util/nm-setting-wireless.c:858
--#: ../libnm-util/nm-setting-wireless.c:872
--#, c-format
--msgid "'%s' is not a valid MAC address"
--msgstr "\"%s\" 不是有效的 MAC 地址"
--
--#: ../clients/common/nm-meta-setting-desc.c:4568
--#: ../clients/common/nm-meta-setting-desc.c:4699
--#, c-format
--msgid "the property doesn't contain MAC address '%s'"
--msgstr "属性没有包含 MAC 地址 \"%s\""
--
--#: ../clients/common/nm-meta-setting-desc.c:4586
-+#: ../clients/common/nm-meta-setting-desc.c:4005
- #, c-format
- msgid "'%s' is not valid; 2 or 3 strings should be provided"
- msgstr "\"%s\" 无效；应提供两至三个字符串"
-
--#: ../clients/common/nm-meta-setting-desc.c:4600
--#, c-format
--msgid "'%s' string value should consist of 1 - 199 characters"
--msgstr "\"%s\" 字符串值应该由 1～199 个字符组成"
--
--#: ../clients/common/nm-meta-setting-desc.c:4632
-+#: ../clients/common/nm-meta-setting-desc.c:4044
- #, c-format
- msgid ""
- "Enter a list of S/390 options formatted as:\n"
-@@ -4882,95 +4718,91 @@ msgstr ""
- " option = <value>, option = <value>,...\n"
- "有效选项为: %s\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:4666
-+#: ../clients/common/nm-meta-setting-desc.c:4079
- #, c-format
- msgid "'%s' is not a valid channel"
- msgstr "\"%s\" 不是有效的信道"
-
--#: ../clients/common/nm-meta-setting-desc.c:4672
-+#: ../clients/common/nm-meta-setting-desc.c:4085
- #, c-format
- msgid "'%ld' is not a valid channel"
- msgstr "\"%ld\" 不是有效的信道"
-
--#: ../clients/common/nm-meta-setting-desc.c:4755
--#: ../clients/common/nm-meta-setting-desc.c:4791
--#: ../clients/common/nm-meta-setting-desc.c:4827
-+#: ../clients/common/nm-meta-setting-desc.c:4102
-+#: ../libnm-core/nm-setting-sriov.c:443 ../libnm-core/nm-setting-wired.c:646
-+#: ../libnm-core/nm-setting-wireless.c:844
-+#: ../libnm-core/nm-setting-wireless.c:856 ../libnm-util/nm-setting-wired.c:645
-+#: ../libnm-util/nm-setting-wireless.c:858
-+#: ../libnm-util/nm-setting-wireless.c:872
- #, c-format
--msgid "the property doesn't contain protocol '%s'"
--msgstr "属性没有包含协议 \"%s\""
-+msgid "'%s' is not a valid MAC address"
-+msgstr "\"%s\" 不是有效的 MAC 地址"
-
--#: ../clients/common/nm-meta-setting-desc.c:4864
-+#: ../clients/common/nm-meta-setting-desc.c:4162
- #, 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:4874
-+#: ../clients/common/nm-meta-setting-desc.c:4172
- #, c-format
- msgid "WEP key is guessed to be of '%s'"
- msgstr "猜测 WEP 密钥为 \"%s\" 类型"
-
--#: ../clients/common/nm-meta-setting-desc.c:4879
-+#: ../clients/common/nm-meta-setting-desc.c:4177
- #, c-format
- msgid "WEP key index set to '%d'"
- msgstr "WEP 密钥索引已设为 \"%d\""
-
--#: ../clients/common/nm-meta-setting-desc.c:4918
-+#: ../clients/common/nm-meta-setting-desc.c:4216
- #, c-format
- msgid "'%s' is not compatible with '%s' type, please change or delete the key."
- msgstr "\"%s\" 和 \"%s\" 类型不兼容，请修改或删除密钥。"
-
--#: ../clients/common/nm-meta-setting-desc.c:4928
--#, c-format
--msgid "'%s' is not a valid PSK"
--msgstr "\"%s\" 不是有效的 PSK"
--
--#: ../clients/common/nm-meta-setting-desc.c:4980
-+#: ../clients/common/nm-meta-setting-desc.c:4273
- #, c-format
- msgid "'%s' is not valid; use 'on', 'off', or 'ignore'"
- msgstr "\"%s\" 无效；请使用 \"on\"、\"off\" 或 \"ignore\""
-
--#: ../clients/common/nm-meta-setting-desc.c:5039
-+#: ../clients/common/nm-meta-setting-desc.c:4333
- msgid "Bonding primary interface [none]"
- msgstr "绑定主要接口 [无]"
-
- #. this is a virtual property, only needed during "ask" mode.
--#: ../clients/common/nm-meta-setting-desc.c:5046
-+#: ../clients/common/nm-meta-setting-desc.c:4340
- 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:5055
-+#: ../clients/common/nm-meta-setting-desc.c:4349
- msgid "Bonding miimon [100]"
- msgstr "绑定 miimon [100]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5063
-+#: ../clients/common/nm-meta-setting-desc.c:4357
- msgid "Bonding downdelay [0]"
- msgstr "绑定 downdelay [0]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5071
-+#: ../clients/common/nm-meta-setting-desc.c:4365
- msgid "Bonding updelay [0]"
- msgstr "绑定 updelay [0]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5079
-+#: ../clients/common/nm-meta-setting-desc.c:4373
- msgid "Bonding arp-interval [0]"
- msgstr "绑定 arp-interval [0]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5087
-+#: ../clients/common/nm-meta-setting-desc.c:4381
- msgid "Bonding arp-ip-target [none]"
- msgstr "绑定 arp-ip-target [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5095
-+#: ../clients/common/nm-meta-setting-desc.c:4389
- msgid "LACP rate ('slow' or 'fast') [slow]"
- msgstr "LACP 速率（\"slow\" 或 \"fast\"）[slow]"
-
--#. macro that returns @func as const (gboolean(*)(NMSetting*)) type, but checks
--#. * that the actual type is (gboolean(*)(type *)).
- #. macro that returns @func as const (guint32(*)(NMSetting*)) type, but checks
- #. * that the actual type is (guint32(*)(type *)).
--#: ../clients/common/nm-meta-setting-desc.c:5212
-+#: ../clients/common/nm-meta-setting-desc.c:4553
- 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 "
-@@ -4987,7 +4819,7 @@ msgstr ""
- "\"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n"
- " set team.config /etc/my-team.conf\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5220
-+#: ../clients/common/nm-meta-setting-desc.c:4561
- 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 "
-@@ -5034,7 +4866,11 @@ msgstr ""
- " 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:5270
-+#: ../clients/common/nm-meta-setting-desc.c:4594
-+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:4627
- msgid ""
- "Enter file path to CA certificate (optionally prefixed with file://).\n"
- " [file://]<file path>\n"
-@@ -5046,7 +4882,7 @@ msgstr ""
- "请注意，nmcli 不支持将证书指定为原始比特块（blob）数据。\n"
- "示例：/home/cimrman/cacert.crt\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5304
-+#: ../clients/common/nm-meta-setting-desc.c:4666
- msgid ""
- "Enter file path to client certificate (optionally prefixed with file://).\n"
- " [file://]<file path>\n"
-@@ -5058,7 +4894,7 @@ msgstr ""
- "请注意，nmcli 不支持将证书指定为原始比特块（blob）数据。\n"
- "示例：/home/cimrman/jara.crt\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5361
-+#: ../clients/common/nm-meta-setting-desc.c:4723
- msgid ""
- "Enter file path to CA certificate for inner authentication (optionally "
- "prefixed\n"
-@@ -5072,7 +4908,7 @@ msgstr ""
- "请注意，nmcli 不支持将证书指定为原始比特块（blob）数据。\n"
- "示例：/home/cimrman/ca-zweite-phase.crt\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5396
-+#: ../clients/common/nm-meta-setting-desc.c:4763
- msgid ""
- "Enter file path to client certificate for inner authentication (optionally "
- "prefixed\n"
-@@ -5086,7 +4922,7 @@ msgstr ""
- "请注意，nmcli 不支持将证书指定为原始比特块（blob）数据。\n"
- "示例：/home/cimrman/jara-zweite-phase.crt\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5423
-+#: ../clients/common/nm-meta-setting-desc.c:4790
- msgid ""
- "Enter bytes as a list of hexadecimal values.\n"
- "Two formats are accepted:\n"
-@@ -5107,8 +4943,8 @@ msgstr ""
- "例如：ab0455a6ea3a74C2\n"
- " ab 4 55 0xa6 ea 3a 74 C2\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5440
--#: ../clients/common/nm-meta-setting-desc.c:5458
-+#: ../clients/common/nm-meta-setting-desc.c:4807
-+#: ../clients/common/nm-meta-setting-desc.c:4825
- msgid ""
- "Enter path to a private key and the key password (if not set yet):\n"
- " [file://]<file path> [<password>]\n"
-@@ -5120,84 +4956,84 @@ msgstr ""
- "请注意，nmcli 不支持将私有密钥指定为原始比特块（blob）数据。\n"
- "示例：/home/cimrman/jara-priv-key Dardanely\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5497
--#: ../clients/common/nm-secret-agent-simple.c:265
--#: ../clients/common/nm-secret-agent-simple.c:363
-+#: ../clients/common/nm-meta-setting-desc.c:4864
-+#: ../clients/common/nm-secret-agent-simple.c:281
-+#: ../clients/common/nm-secret-agent-simple.c:369
- #: ../clients/tui/nmt-page-dsl.c:66 ../clients/tui/nmt-page-wifi.c:332
- msgid "Username"
- msgstr "用户名"
-
--#: ../clients/common/nm-meta-setting-desc.c:5503
--#: ../clients/common/nm-meta-setting-desc.c:5687
--#: ../clients/common/nm-meta-setting-desc.c:6060
--#: ../clients/common/nm-meta-setting-desc.c:6720
-+#: ../clients/common/nm-meta-setting-desc.c:4870
-+#: ../clients/common/nm-meta-setting-desc.c:5085
-+#: ../clients/common/nm-meta-setting-desc.c:5475
-+#: ../clients/common/nm-meta-setting-desc.c:6378
- msgid "Password [none]"
- msgstr "密码 [无]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5549
-+#: ../clients/common/nm-meta-setting-desc.c:4916
- msgid "Bluetooth device address"
- msgstr "蓝牙设备地址"
-
--#: ../clients/common/nm-meta-setting-desc.c:5594
--#: ../clients/common/nm-meta-setting-desc.c:6114
--#: ../clients/common/nm-meta-setting-desc.c:7446
--#: ../clients/common/nm-meta-setting-desc.c:7484
--#: ../clients/common/nm-meta-setting-desc.c:7621
--#: ../clients/common/nm-meta-setting-desc.c:7839
-+#: ../clients/common/nm-meta-setting-desc.c:4964
-+#: ../clients/common/nm-meta-setting-desc.c:5528
-+#: ../clients/common/nm-meta-setting-desc.c:7035
-+#: ../clients/common/nm-meta-setting-desc.c:7073
-+#: ../clients/common/nm-meta-setting-desc.c:7248
-+#: ../clients/common/nm-meta-setting-desc.c:7478
- msgid "MAC [none]"
- msgstr "MAC [无]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5600
-+#: ../clients/common/nm-meta-setting-desc.c:4970
- msgid "Enable STP [no]"
- msgstr "启用 STP [否]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5606
-+#: ../clients/common/nm-meta-setting-desc.c:4976
- msgid "STP priority [32768]"
- msgstr "STP 优先级 [32768]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5612
-+#: ../clients/common/nm-meta-setting-desc.c:4982
- msgid "Forward delay [15]"
- msgstr "转发延时 [15]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5618
-+#: ../clients/common/nm-meta-setting-desc.c:4988
- msgid "Hello time [2]"
- msgstr "呼叫时间 [2]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5624
-+#: ../clients/common/nm-meta-setting-desc.c:4994
- msgid "Max age [20]"
- msgstr "最大寿命 [20]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5630
-+#: ../clients/common/nm-meta-setting-desc.c:5000
- msgid "MAC address ageing time [300]"
- msgstr "MAC 地址老化时间 [300]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5636
-+#: ../clients/common/nm-meta-setting-desc.c:5006
- msgid "Group forward mask [0]"
- msgstr "组前向掩码 [0]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5642
-+#: ../clients/common/nm-meta-setting-desc.c:5012
- msgid "Enable IGMP snooping [no]"
- msgstr "启用 IGMP 监听 [否]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5654
-+#: ../clients/common/nm-meta-setting-desc.c:5041
- msgid "Bridge port priority [32]"
- msgstr "网桥端口优先级 [32]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5660
-+#: ../clients/common/nm-meta-setting-desc.c:5047
- msgid "Bridge port STP path cost [100]"
- msgstr "网桥端口 STP 路径开销 [100]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5666
-+#: ../clients/common/nm-meta-setting-desc.c:5053
- msgid "Hairpin [no]"
- msgstr "Hairpin [否]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5681
--#: ../clients/common/nm-meta-setting-desc.c:6054
--#: ../clients/common/nm-meta-setting-desc.c:7336
-+#: ../clients/common/nm-meta-setting-desc.c:5079
-+#: ../clients/common/nm-meta-setting-desc.c:5469
-+#: ../clients/common/nm-meta-setting-desc.c:6893
- msgid "Username [none]"
- msgstr "用户名 [无]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5784
-+#: ../clients/common/nm-meta-setting-desc.c:5182
- msgid ""
- "Enter a list of user permissions. This is a list of user names formatted "
- "as:\n"
-@@ -5212,7 +5048,7 @@ msgstr ""
- "\n"
- "例如：alice bob charlie\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5826
-+#: ../clients/common/nm-meta-setting-desc.c:5234
- msgid ""
- "Enter secondary connections that should be activated when this connection "
- "is\n"
-@@ -5232,7 +5068,7 @@ msgstr ""
- "\n"
- "示例：private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5843
-+#: ../clients/common/nm-meta-setting-desc.c:5257
- 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"
-@@ -5246,25 +5082,25 @@ msgstr ""
- "\"false\"、\"no\"、\"off\"，设置连接为不计流量的\n"
- "\"unknown\"，让网络管理器（NetworkManager）使用一些启发式算法来选择值\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:6071
-+#: ../clients/common/nm-meta-setting-desc.c:5485
- msgid "APN"
- msgstr "APN"
-
--#: ../clients/common/nm-meta-setting-desc.c:6123
--#: ../clients/common/nm-meta-setting-desc.c:7509
--#: ../clients/common/nm-meta-setting-desc.c:7655
-+#: ../clients/common/nm-meta-setting-desc.c:5537
-+#: ../clients/common/nm-meta-setting-desc.c:7104
-+#: ../clients/common/nm-meta-setting-desc.c:7288
- msgid "MTU [auto]"
- msgstr "MTU [自动]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6142
-+#: ../clients/common/nm-meta-setting-desc.c:5556
- msgid "P_KEY [none]"
- msgstr "P_KEY [无]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6151
-+#: ../clients/common/nm-meta-setting-desc.c:5565
- msgid "Parent interface [none]"
- msgstr "上级接口 [无]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6174
-+#: ../clients/common/nm-meta-setting-desc.c:5592
- msgid ""
- "Enter a list of IPv4 addresses of DNS servers.\n"
- "\n"
-@@ -5274,11 +5110,11 @@ msgstr ""
- "\n"
- "示例：8.8.8.8, 8.8.4.4\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:6206
-+#: ../clients/common/nm-meta-setting-desc.c:5639
- msgid "IPv4 address (IP[/plen]) [none]"
- msgstr "IPv4 地址（IP[/plen]）[无]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6208
-+#: ../clients/common/nm-meta-setting-desc.c:5641
- msgid ""
- "Enter a list of IPv4 addresses formatted as:\n"
- " ip[/prefix], ip[/prefix],...\n"
-@@ -5292,11 +5128,11 @@ msgstr ""
- "\n"
- "示例：192.168.1.5/24, 10.0.0.11/24\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:6221
-+#: ../clients/common/nm-meta-setting-desc.c:5660
- msgid "IPv4 gateway [none]"
- msgstr "IPv4 网关 [无]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6229
-+#: ../clients/common/nm-meta-setting-desc.c:5668
- msgid ""
- "Enter a list of IPv4 routes formatted as:\n"
- " ip[/prefix] [next-hop] [metric],...\n"
-@@ -5317,7 +5153,14 @@ 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:6331
-+#: ../clients/common/nm-meta-setting-desc.c:5708
-+msgid ""
-+"Enter a list of IPv4 routing rules formatted as:\n"
-+" priority [prio] [from [src]] [to [dst]], ,...\n"
-+"\n"
-+msgstr ""
-+
-+#: ../clients/common/nm-meta-setting-desc.c:5798
- 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 "
-@@ -5335,11 +5178,11 @@ msgstr ""
- "\n"
- "示例：2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:6369
-+#: ../clients/common/nm-meta-setting-desc.c:5851
- msgid "IPv6 address (IP[/plen]) [none]"
- msgstr "IPv6 地址（IP[/plen]）[无]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6371
-+#: ../clients/common/nm-meta-setting-desc.c:5853
- msgid ""
- "Enter a list of IPv6 addresses formatted as:\n"
- " ip[/prefix], ip[/prefix],...\n"
-@@ -5353,11 +5196,11 @@ msgstr ""
- "\n"
- "示例：2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:6384
-+#: ../clients/common/nm-meta-setting-desc.c:5872
- msgid "IPv6 gateway [none]"
- msgstr "IPv6 网关 [无]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6392
-+#: ../clients/common/nm-meta-setting-desc.c:5880
- msgid ""
- "Enter a list of IPv6 routes formatted as:\n"
- " ip[/prefix] [next-hop] [metric],...\n"
-@@ -5380,162 +5223,173 @@ msgstr ""
- "beef::3 2\n"
- " abbe::/64 55\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:6497
--#: ../clients/common/nm-meta-setting-desc.c:7369
-+#: ../clients/common/nm-meta-setting-desc.c:5920
-+msgid ""
-+"Enter a list of IPv6 routing rules formatted as:\n"
-+" priority [prio] [from [src]] [to [dst]], ,...\n"
-+"\n"
-+msgstr ""
-+
-+#: ../clients/common/nm-meta-setting-desc.c:6008
-+#: ../clients/common/nm-meta-setting-desc.c:6934
- msgid "Parent device [none]"
- msgstr "上级设备 [无]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6503
-+#: ../clients/common/nm-meta-setting-desc.c:6014
- msgid "Local endpoint [none]"
- msgstr "本地端点 [无]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6510
--#: ../clients/common/nm-meta-setting-desc.c:7389
-+#: ../clients/common/nm-meta-setting-desc.c:6021
-+#: ../clients/common/nm-meta-setting-desc.c:6954
- msgid "Remote"
- msgstr "远程"
-
--#: ../clients/common/nm-meta-setting-desc.c:6555
-+#: ../clients/common/nm-meta-setting-desc.c:6066
- msgid "MACsec parent device or connection UUID"
- msgstr "MACsec 上级设备或连接 UUID"
-
--#: ../clients/common/nm-meta-setting-desc.c:6576
-+#: ../clients/common/nm-meta-setting-desc.c:6087
- msgid "Enable encryption [yes]"
- msgstr "启用加密 [是]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6582
--#: ../clients/common/nm-secret-agent-simple.c:835
-+#: ../clients/common/nm-meta-setting-desc.c:6093
-+#: ../clients/common/nm-secret-agent-simple.c:930
- msgid "MKA CAK"
- msgstr "MKA CAK"
-
--#: ../clients/common/nm-meta-setting-desc.c:6592
-+#: ../clients/common/nm-meta-setting-desc.c:6103
- msgid "MKA_CKN"
- msgstr "MKA_CKN"
-
--#: ../clients/common/nm-meta-setting-desc.c:6598
-+#: ../clients/common/nm-meta-setting-desc.c:6109
- msgid "SCI port [1]"
- msgstr "SCI 端口 [1]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6624
-+#: ../clients/common/nm-meta-setting-desc.c:6135
- msgid "MACVLAN parent device or connection UUID"
- msgstr "MACVLAN 上级设备或连接 UUID"
-
--#: ../clients/common/nm-meta-setting-desc.c:6645
-+#: ../clients/common/nm-meta-setting-desc.c:6156
- msgid "Tap [no]"
- msgstr "Tap [否]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6671
--#: ../clients/common/nm-meta-setting-desc.c:7576
-+#: ../clients/common/nm-meta-setting-desc.c:6191
-+#: ../clients/common/nm-meta-setting-desc.c:7203
- #: ../clients/tui/nmt-page-wifi.c:224
- msgid "SSID"
- msgstr "SSID"
-
--#: ../clients/common/nm-meta-setting-desc.c:6680
-+#: ../clients/common/nm-meta-setting-desc.c:6200
- msgid "OLPC Mesh channel [1]"
- msgstr "OLPC Mesh 信道 [1]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6689
-+#: ../clients/common/nm-meta-setting-desc.c:6209
- msgid "DHCP anycast MAC address [none]"
- msgstr "DHCP 任意广播 MAC 地址 [无]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6701
-+#: ../clients/common/nm-meta-setting-desc.c:6359
- msgid "PPPoE parent device"
- msgstr "PPPoE 上级设备"
-
--#: ../clients/common/nm-meta-setting-desc.c:6707
-+#: ../clients/common/nm-meta-setting-desc.c:6365
- msgid "Service [none]"
- msgstr "服务 [无]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6714
-+#: ../clients/common/nm-meta-setting-desc.c:6372
- msgid "PPPoE username"
- msgstr "PPPoE 用户名"
-
--#: ../clients/common/nm-meta-setting-desc.c:6888
-+#: ../clients/common/nm-meta-setting-desc.c:6408
- msgid "Browser only [no]"
- msgstr "仅浏览器 [否]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6894
-+#: ../clients/common/nm-meta-setting-desc.c:6414
- msgid "PAC URL"
- msgstr "PAC URL"
-
--#: ../clients/common/nm-meta-setting-desc.c:6900
-+#: ../clients/common/nm-meta-setting-desc.c:6420
- msgid "PAC script"
- msgstr "PAC 脚本"
-
--#: ../clients/common/nm-meta-setting-desc.c:6935
--#: ../clients/common/nm-meta-setting-desc.c:7084
-+#: ../clients/common/nm-meta-setting-desc.c:6544
-+#: ../clients/common/nm-meta-setting-desc.c:6707
- msgid "Team JSON configuration [none]"
- msgstr "组合 JSON 配置 [无]"
-
--#: ../clients/common/nm-meta-setting-desc.c:7239
-+#: ../clients/common/nm-meta-setting-desc.c:6796
- msgid "User ID [none]"
- msgstr "用户 ID [无]"
-
--#: ../clients/common/nm-meta-setting-desc.c:7245
-+#: ../clients/common/nm-meta-setting-desc.c:6802
- msgid "Group ID [none]"
- msgstr "分组 ID [无]"
-
--#: ../clients/common/nm-meta-setting-desc.c:7251
-+#: ../clients/common/nm-meta-setting-desc.c:6808
- msgid "Enable PI [no]"
- msgstr "启用 PI [否]"
-
--#: ../clients/common/nm-meta-setting-desc.c:7257
-+#: ../clients/common/nm-meta-setting-desc.c:6814
- msgid "Enable VNET header [no]"
- msgstr "启用 VNET 首部 [否]"
-
--#: ../clients/common/nm-meta-setting-desc.c:7263
-+#: ../clients/common/nm-meta-setting-desc.c:6820
- msgid "Enable multi queue [no]"
- msgstr "启用多队列 [否]"
-
--#: ../clients/common/nm-meta-setting-desc.c:7276
-+#: ../clients/common/nm-meta-setting-desc.c:6833
- msgid "VLAN parent device or connection UUID"
- msgstr "VLAN 上级设备或连接 UUID"
-
--#: ../clients/common/nm-meta-setting-desc.c:7283
-+#: ../clients/common/nm-meta-setting-desc.c:6840
- msgid "VLAN ID (<0-4094>)"
- msgstr "VLAN ID <0-4095>"
-
--#: ../clients/common/nm-meta-setting-desc.c:7289
-+#: ../clients/common/nm-meta-setting-desc.c:6846
- msgid "VLAN flags (<0-7>) [none]"
- msgstr "VLAN 标记（<0-7>）[无]"
-
--#: ../clients/common/nm-meta-setting-desc.c:7298
-+#: ../clients/common/nm-meta-setting-desc.c:6855
- msgid "Ingress priority maps [none]"
- msgstr "入口优先级映射 [无]"
-
--#: ../clients/common/nm-meta-setting-desc.c:7308
-+#: ../clients/common/nm-meta-setting-desc.c:6865
- msgid "Egress priority maps [none]"
- msgstr "出口优先级映射 [无]"
-
--#: ../clients/common/nm-meta-setting-desc.c:7376
-+#: ../clients/common/nm-meta-setting-desc.c:6941
- msgid "VXLAN ID"
- msgstr "VXLAN ID"
-
--#: ../clients/common/nm-meta-setting-desc.c:7382
-+#: ../clients/common/nm-meta-setting-desc.c:6947
- msgid "Local address [none]"
- msgstr "本地地址 [无]"
-
--#: ../clients/common/nm-meta-setting-desc.c:7395
-+#: ../clients/common/nm-meta-setting-desc.c:6960
- msgid "Minimum source port [0]"
- msgstr "最小来源端口 [0]"
-
--#: ../clients/common/nm-meta-setting-desc.c:7401
-+#: ../clients/common/nm-meta-setting-desc.c:6966
- msgid "Maximum source port [0]"
- msgstr "最大来源端口 [0]"
-
--#: ../clients/common/nm-meta-setting-desc.c:7407
-+#: ../clients/common/nm-meta-setting-desc.c:6972
- msgid "Destination port [8472]"
- msgstr "目标端口 [8472]"
-
--#: ../clients/common/nm-meta-setting-desc.c:7453
-+#: ../clients/common/nm-meta-setting-desc.c:7012
-+msgid "Peer"
-+msgstr ""
-+
-+#: ../clients/common/nm-meta-setting-desc.c:7042
- msgid "WiMAX NSP name"
- msgstr "WiMAX NSP 名称"
-
--#: ../clients/common/nm-meta-setting-desc.c:7490
--#: ../clients/common/nm-meta-setting-desc.c:7626
-+#: ../clients/common/nm-meta-setting-desc.c:7079
-+#: ../clients/common/nm-meta-setting-desc.c:7253
- msgid "Cloned MAC [none]"
- msgstr "克隆的 MAC 地址 [无]"
-
--#: ../clients/common/nm-meta-setting-desc.c:7517
-+#: ../clients/common/nm-meta-setting-desc.c:7112
- msgid ""
- "Enter a list of subchannels (comma or space separated).\n"
- "\n"
-@@ -5545,7 +5399,7 @@ msgstr ""
- "\n"
- "示例：0.0.0e20 0.0.0e21 0.0.0e22\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:7785
-+#: ../clients/common/nm-meta-setting-desc.c:7427
- msgid ""
- "Enter the type of WEP keys. The accepted values are: 0 or unknown, 1 or key, "
- "and 2 or passphrase.\n"
-@@ -5553,370 +5407,427 @@ msgstr ""
- "输入 WEP 密钥类型。可接受的值为：0 或者 unknown、1 或者 key, 以及 2 或者 "
- "passphrase。\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:7847
-+#: ../clients/common/nm-meta-setting-desc.c:7486
- msgid "Short address (<0x0000-0xffff>)"
- msgstr "短地址（<0x0000-0xffff>）"
-
--#: ../clients/common/nm-meta-setting-desc.c:7863
-+#: ../clients/common/nm-meta-setting-desc.c:7502
- msgid "PAN Identifier (<0x0000-0xffff>)"
- msgstr "PAN 标识符（<0x0000-0xffff>）"
-
--#: ../clients/common/nm-meta-setting-desc.c:7878
-+#: ../clients/common/nm-meta-setting-desc.c:7517
- #, fuzzy
- msgid "Page (<default|0-31>)"
- msgstr "（默认）"
-
--#: ../clients/common/nm-meta-setting-desc.c:7892
-+#: ../clients/common/nm-meta-setting-desc.c:7531
- msgid "Channel (<default|0-26>)"
- msgstr ""
-
--#: ../clients/common/nm-meta-setting-desc.c:7913
--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:8040
-+#: ../clients/common/nm-meta-setting-desc.c:7666
-+msgid "6LOWPAN settings"
-+msgstr "6LOWPAN 设置"
-+
-+#: ../clients/common/nm-meta-setting-desc.c:7667
- msgid "802-1x settings"
- msgstr "802-1x 设置"
-
--#: ../clients/common/nm-meta-setting-desc.c:8041
--#: ../src/devices/adsl/nm-device-adsl.c:133
-+#: ../clients/common/nm-meta-setting-desc.c:7668
-+#: ../src/devices/adsl/nm-device-adsl.c:132
- msgid "ADSL connection"
- msgstr "ADSL 连接"
-
--#: ../clients/common/nm-meta-setting-desc.c:8042
-+#: ../clients/common/nm-meta-setting-desc.c:7669
- msgid "bluetooth connection"
- msgstr "蓝牙连接"
-
--#: ../clients/common/nm-meta-setting-desc.c:8043
-+#: ../clients/common/nm-meta-setting-desc.c:7670
- msgid "Bond device"
- msgstr "绑定设备"
-
--#: ../clients/common/nm-meta-setting-desc.c:8044
-+#: ../clients/common/nm-meta-setting-desc.c:7671
- msgid "Bridge device"
- msgstr "网桥设备"
-
--#: ../clients/common/nm-meta-setting-desc.c:8045
-+#: ../clients/common/nm-meta-setting-desc.c:7672
- msgid "Bridge port"
- msgstr "网桥端口"
-
--#: ../clients/common/nm-meta-setting-desc.c:8046
-+#: ../clients/common/nm-meta-setting-desc.c:7673
- msgid "CDMA mobile broadband connection"
- msgstr "CDMA 移动宽带连接"
-
--#: ../clients/common/nm-meta-setting-desc.c:8047
-+#: ../clients/common/nm-meta-setting-desc.c:7674
- msgid "General settings"
- msgstr "常规设置"
-
--#: ../clients/common/nm-meta-setting-desc.c:8048
-+#: ../clients/common/nm-meta-setting-desc.c:7675
- msgid "DCB settings"
- msgstr "DCB 设置"
-
--#: ../clients/common/nm-meta-setting-desc.c:8049
-+#: ../clients/common/nm-meta-setting-desc.c:7676
- msgid "Dummy settings"
- msgstr "虚拟设置"
-
--#: ../clients/common/nm-meta-setting-desc.c:8050
-+#: ../clients/common/nm-meta-setting-desc.c:7677
- msgid "Ethtool settings"
- msgstr "Ethtool 设置"
-
--#: ../clients/common/nm-meta-setting-desc.c:8051
-+#: ../clients/common/nm-meta-setting-desc.c:7678
- msgid "Generic settings"
- msgstr "通用设置"
-
--#: ../clients/common/nm-meta-setting-desc.c:8052
-+#: ../clients/common/nm-meta-setting-desc.c:7679
- msgid "GSM mobile broadband connection"
- msgstr "GSM 移动宽带连接"
-
--#: ../clients/common/nm-meta-setting-desc.c:8053
-+#: ../clients/common/nm-meta-setting-desc.c:7680
- #: ../src/devices/nm-device-infiniband.c:172
- msgid "InfiniBand connection"
- msgstr "InfiniBand 连接"
-
--#: ../clients/common/nm-meta-setting-desc.c:8054
-+#: ../clients/common/nm-meta-setting-desc.c:7681
- msgid "IPv4 protocol"
- msgstr "IPv4 协议"
-
--#: ../clients/common/nm-meta-setting-desc.c:8055
-+#: ../clients/common/nm-meta-setting-desc.c:7682
- msgid "IPv6 protocol"
- msgstr "IPv6 协议"
-
--#: ../clients/common/nm-meta-setting-desc.c:8056
-+#: ../clients/common/nm-meta-setting-desc.c:7683
- msgid "IP-tunnel settings"
- msgstr "IP 隧道设置"
-
--#: ../clients/common/nm-meta-setting-desc.c:8057
-+#: ../clients/common/nm-meta-setting-desc.c:7684
- msgid "MACsec connection"
- msgstr "MACsec 连接"
-
--#: ../clients/common/nm-meta-setting-desc.c:8058
-+#: ../clients/common/nm-meta-setting-desc.c:7685
- msgid "macvlan connection"
- msgstr "macvlan 连接"
-
--#: ../clients/common/nm-meta-setting-desc.c:8059
-+#: ../clients/common/nm-meta-setting-desc.c:7686
- msgid "Match"
- msgstr "匹配"
-
--#: ../clients/common/nm-meta-setting-desc.c:8060
-+#: ../clients/common/nm-meta-setting-desc.c:7687
- msgid "OLPC Mesh connection"
- msgstr "OLPC Mesh 连接"
-
--#: ../clients/common/nm-meta-setting-desc.c:8061
-+#: ../clients/common/nm-meta-setting-desc.c:7688
- msgid "Open vSwitch bridge settings"
- msgstr "Open vSwitch 网桥设置"
-
--#: ../clients/common/nm-meta-setting-desc.c:8062
-+#: ../clients/common/nm-meta-setting-desc.c:7689
- msgid "Open vSwitch interface settings"
- msgstr "Open vSwitch 接口设置"
-
--#: ../clients/common/nm-meta-setting-desc.c:8063
-+#: ../clients/common/nm-meta-setting-desc.c:7690
- msgid "Open vSwitch patch interface settings"
- msgstr "Open vSwitch 插线接口设置"
-
--#: ../clients/common/nm-meta-setting-desc.c:8064
-+#: ../clients/common/nm-meta-setting-desc.c:7691
- msgid "Open vSwitch port settings"
- msgstr "Open vSwitch 端口设置"
-
--#: ../clients/common/nm-meta-setting-desc.c:8065
-+#: ../clients/common/nm-meta-setting-desc.c:7692
- msgid "PPP settings"
- msgstr "PPP 设置"
-
--#: ../clients/common/nm-meta-setting-desc.c:8066
-+#: ../clients/common/nm-meta-setting-desc.c:7693
- msgid "PPPoE"
- msgstr "PPPoE"
-
--#: ../clients/common/nm-meta-setting-desc.c:8067
-+#: ../clients/common/nm-meta-setting-desc.c:7694
- msgid "Proxy"
- msgstr "代理"
-
--#: ../clients/common/nm-meta-setting-desc.c:8068
-+#: ../clients/common/nm-meta-setting-desc.c:7695
- msgid "Serial settings"
- msgstr "串行设置"
-
--#: ../clients/common/nm-meta-setting-desc.c:8069
-+#: ../clients/common/nm-meta-setting-desc.c:7696
- msgid "SR-IOV settings"
- msgstr "SR-IOV 设置"
-
--#: ../clients/common/nm-meta-setting-desc.c:8070
-+#: ../clients/common/nm-meta-setting-desc.c:7697
- msgid "Traffic controls"
- msgstr "流量控制"
-
--#: ../clients/common/nm-meta-setting-desc.c:8071
-+#: ../clients/common/nm-meta-setting-desc.c:7698
- msgid "Team device"
- msgstr "组合设备"
-
--#: ../clients/common/nm-meta-setting-desc.c:8072
-+#: ../clients/common/nm-meta-setting-desc.c:7699
- msgid "Team port"
- msgstr "组合端口"
-
--#: ../clients/common/nm-meta-setting-desc.c:8073
-+#: ../clients/common/nm-meta-setting-desc.c:7700
- msgid "Tun device"
- msgstr "Tun 设备"
-
--#: ../clients/common/nm-meta-setting-desc.c:8074
-+#: ../clients/common/nm-meta-setting-desc.c:7701
- msgid "User settings"
- msgstr "用户设置"
-
--#: ../clients/common/nm-meta-setting-desc.c:8075
-+#: ../clients/common/nm-meta-setting-desc.c:7702
- #: ../src/devices/nm-device-vlan.c:400
- msgid "VLAN connection"
- msgstr "VLAN 连接"
-
--#: ../clients/common/nm-meta-setting-desc.c:8076 ../src/nm-manager.c:5488
-+#: ../clients/common/nm-meta-setting-desc.c:7703 ../src/nm-manager.c:5539
- msgid "VPN connection"
- msgstr "VPN 连接"
-
--#: ../clients/common/nm-meta-setting-desc.c:8077
--#: ../src/devices/nm-device-vxlan.c:371
-+#: ../clients/common/nm-meta-setting-desc.c:7704
-+#: ../src/devices/nm-device-vxlan.c:369
- msgid "VXLAN connection"
- msgstr "VXLAN 连接"
-
--#: ../clients/common/nm-meta-setting-desc.c:8078
-+#: ../clients/common/nm-meta-setting-desc.c:7705
-+#, fuzzy
-+msgid "Wi-Fi P2P connection"
-+msgstr "Wi-Fi 连接"
-+
-+#: ../clients/common/nm-meta-setting-desc.c:7706
- msgid "WiMAX connection"
- msgstr "WiMAX 连接"
-
--#: ../clients/common/nm-meta-setting-desc.c:8079
-+#: ../clients/common/nm-meta-setting-desc.c:7707
- msgid "Wired Ethernet"
- msgstr "有线以太网"
-
--#: ../clients/common/nm-meta-setting-desc.c:8080
-+#: ../clients/common/nm-meta-setting-desc.c:7708
-+#, fuzzy
-+msgid "WireGuard VPN settings"
-+msgstr "WPAN 设置"
-+
-+#: ../clients/common/nm-meta-setting-desc.c:7709
- msgid "Wi-Fi connection"
- msgstr "Wi-Fi 连接"
-
--#: ../clients/common/nm-meta-setting-desc.c:8081
-+#: ../clients/common/nm-meta-setting-desc.c:7710
- msgid "Wi-Fi security settings"
- msgstr "Wi-Fi 安全设置"
-
--#: ../clients/common/nm-meta-setting-desc.c:8082
-+#: ../clients/common/nm-meta-setting-desc.c:7711
- msgid "WPAN settings"
- msgstr "WPAN 设置"
-
--#: ../clients/common/nm-meta-setting-desc.c:8083
--msgid "6LOWPAN settings"
--msgstr "6LOWPAN 设置"
--
--#: ../clients/common/nm-meta-setting-desc.c:8434
-+#: ../clients/common/nm-meta-setting-desc.c:8074
- msgid "name"
- msgstr "名称"
-
--#: ../clients/common/nm-polkit-listener.c:239
-+#: ../clients/common/nm-polkit-listener.c:238
- msgid "An authentication session is already underway."
- msgstr "验证会话已在进行。"
-
--#: ../clients/common/nm-secret-agent-simple.c:271
--#: ../clients/common/nm-secret-agent-simple.c:311
--#: ../clients/common/nm-secret-agent-simple.c:339
--#: ../clients/common/nm-secret-agent-simple.c:375
--#: ../clients/common/nm-secret-agent-simple.c:820
--#: ../clients/common/nm-secret-agent-simple.c:852
--#: ../clients/common/nm-secret-agent-simple.c:874
--#: ../clients/common/nm-vpn-helpers.c:119
-+#: ../clients/common/nm-secret-agent-simple.c:230
-+#, c-format
-+msgid "Preshared-key for %s"
-+msgstr ""
-+
-+#: ../clients/common/nm-secret-agent-simple.c:286
-+#: ../clients/common/nm-secret-agent-simple.c:323
-+#: ../clients/common/nm-secret-agent-simple.c:346
-+#: ../clients/common/nm-secret-agent-simple.c:379
-+#: ../clients/common/nm-secret-agent-simple.c:916
-+#: ../clients/common/nm-secret-agent-simple.c:951
-+#: ../clients/common/nm-secret-agent-simple.c:974
- #: ../clients/common/nm-vpn-helpers.c:123
--#: ../clients/common/nm-vpn-helpers.c:129
--#: ../clients/common/nm-vpn-helpers.c:134 ../clients/tui/nmt-page-dsl.c:75
-+#: ../clients/common/nm-vpn-helpers.c:127
-+#: ../clients/common/nm-vpn-helpers.c:133
-+#: ../clients/common/nm-vpn-helpers.c:138 ../clients/tui/nmt-page-dsl.c:75
- #: ../clients/tui/nmt-page-wifi.c:277 ../clients/tui/nmt-page-wifi.c:308
- #: ../clients/tui/nmt-page-wifi.c:341
- msgid "Password"
- msgstr "密码"
-
--#: ../clients/common/nm-secret-agent-simple.c:281
-+#: ../clients/common/nm-secret-agent-simple.c:295
- msgid "Identity"
- msgstr "身份"
-
--#: ../clients/common/nm-secret-agent-simple.c:287
-+#: ../clients/common/nm-secret-agent-simple.c:300
- msgid "Private key password"
- msgstr "私钥密码"
-
--#: ../clients/common/nm-secret-agent-simple.c:326
-+#: ../clients/common/nm-secret-agent-simple.c:336
- #: ../clients/tui/nmt-page-wifi.c:289
- msgid "Key"
- msgstr "密钥"
-
--#: ../clients/common/nm-secret-agent-simple.c:369
-+#: ../clients/common/nm-secret-agent-simple.c:374
- #: ../clients/tui/nmt-page-dsl.c:78
- msgid "Service"
- msgstr "服务"
-
--#: ../clients/common/nm-secret-agent-simple.c:548
--#: ../clients/common/nm-secret-agent-simple.c:816
--#: ../clients/common/nm-secret-agent-simple.c:848
--#: ../clients/common/nm-secret-agent-simple.c:870
--#: ../clients/common/nm-secret-agent-simple.c:892
-+#: ../clients/common/nm-secret-agent-simple.c:486
-+#, fuzzy
-+msgid "WireGuard private-key"
-+msgstr "无效的私有密钥"
-+
-+#: ../clients/common/nm-secret-agent-simple.c:527
-+#, fuzzy, c-format
-+msgid "Secrets are required to connect WireGuard VPN '%s'"
-+msgstr "需要密钥来访问有线网络 \"%s\"。"
-+
-+#: ../clients/common/nm-secret-agent-simple.c:628
-+#: ../clients/common/nm-secret-agent-simple.c:912
-+#: ../clients/common/nm-secret-agent-simple.c:947
-+#: ../clients/common/nm-secret-agent-simple.c:970
-+#: ../clients/common/nm-secret-agent-simple.c:989
- #, c-format
- msgid "A password is required to connect to '%s'."
- msgstr "需要密码来连接到 \"%s\"。"
-
--#: ../clients/common/nm-secret-agent-simple.c:785
-+#: ../clients/common/nm-secret-agent-simple.c:879
- msgid "Authentication required by wireless network"
- msgstr "无线网络要求身份验证"
-
--#: ../clients/common/nm-secret-agent-simple.c:786
-+#: ../clients/common/nm-secret-agent-simple.c:880
- #, c-format
- msgid ""
- "Passwords or encryption keys are required to access the wireless network "
- "'%s'."
- msgstr "需要密码或密钥来访问无线网络 \"%s\"。"
-
--#: ../clients/common/nm-secret-agent-simple.c:790
-+#: ../clients/common/nm-secret-agent-simple.c:885
- msgid "Wired 802.1X authentication"
- msgstr "有线 802.1X 身份验证"
-
--#: ../clients/common/nm-secret-agent-simple.c:791
-+#: ../clients/common/nm-secret-agent-simple.c:886
- #, c-format
- msgid "Secrets are required to access the wired network '%s'"
- msgstr "需要密钥来访问有线网络 \"%s\"。"
-
--#: ../clients/common/nm-secret-agent-simple.c:796
-+#: ../clients/common/nm-secret-agent-simple.c:892
- msgid "DSL authentication"
- msgstr "DSL 身份验证"
-
--#: ../clients/common/nm-secret-agent-simple.c:797
-+#: ../clients/common/nm-secret-agent-simple.c:893
- #, c-format
- msgid "Secrets are required for the DSL connection '%s'"
- msgstr "DSL 连接 \"%s\" 需要密钥。"
-
--#: ../clients/common/nm-secret-agent-simple.c:805
-+#: ../clients/common/nm-secret-agent-simple.c:902
- msgid "PIN code required"
- msgstr "需要 PIN 码"
-
--#: ../clients/common/nm-secret-agent-simple.c:806
-+#: ../clients/common/nm-secret-agent-simple.c:903
- msgid "PIN code is needed for the mobile broadband device"
- msgstr "移动宽带设备需要 PIN 码"
-
--#: ../clients/common/nm-secret-agent-simple.c:809
-+#: ../clients/common/nm-secret-agent-simple.c:906
- msgid "PIN"
- msgstr "PIN"
-
--#: ../clients/common/nm-secret-agent-simple.c:815
--#: ../clients/common/nm-secret-agent-simple.c:847
--#: ../clients/common/nm-secret-agent-simple.c:869
-+#: ../clients/common/nm-secret-agent-simple.c:911
-+#: ../clients/common/nm-secret-agent-simple.c:946
-+#: ../clients/common/nm-secret-agent-simple.c:969
- msgid "Mobile broadband network password"
- msgstr "移动宽带网络密码"
-
--#: ../clients/common/nm-secret-agent-simple.c:829
-+#: ../clients/common/nm-secret-agent-simple.c:924
- #, c-format
- msgid "Secrets are required to access the MACsec network '%s'"
- msgstr "需要密钥来访问 MACsec 网络 \"%s\"。"
-
--#: ../clients/common/nm-secret-agent-simple.c:833
-+#: ../clients/common/nm-secret-agent-simple.c:928
- msgid "MACsec PSK authentication"
- msgstr "MACsec PSK 身份验证"
-
--#: ../clients/common/nm-secret-agent-simple.c:841
-+#: ../clients/common/nm-secret-agent-simple.c:935
- msgid "MACsec EAP authentication"
- msgstr "MACsec EAP 身份验证"
-
--#: ../clients/common/nm-secret-agent-simple.c:882
-+#: ../clients/common/nm-secret-agent-simple.c:940
-+#, fuzzy
-+msgid "WireGuard VPN secret"
-+msgstr "WireGuard"
-+
-+#: ../clients/common/nm-secret-agent-simple.c:979
- msgid "VPN password required"
- msgstr "需要 VPN 密码"
-
--#: ../clients/common/nm-vpn-helpers.c:48
-+#: ../clients/common/nm-vpn-helpers.c:52
- #, c-format
- msgid "unknown VPN plugin \"%s\""
- msgstr "未知的 VPN 插件 \"%s\""
-
--#: ../clients/common/nm-vpn-helpers.c:59
-+#: ../clients/common/nm-vpn-helpers.c:63
- #, c-format
- msgid "cannot load legacy-only VPN plugin \"%s\" for \"%s\""
- msgstr "无法为 \"%s%s\" 加载旧版限定的 VPN 插件 \"\""
-
--#: ../clients/common/nm-vpn-helpers.c:64
-+#: ../clients/common/nm-vpn-helpers.c:68
- #, 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:69
-+#: ../clients/common/nm-vpn-helpers.c:73
- #, c-format
- msgid "failed to load VPN plugin \"%s\": %s"
- msgstr "加载 VPN 插件 \"%s\" 失败：%s"
-
--#: ../clients/common/nm-vpn-helpers.c:124
-+#: ../clients/common/nm-vpn-helpers.c:128
- msgid "Certificate password"
- msgstr "证书密码"
-
--#: ../clients/common/nm-vpn-helpers.c:125
-+#: ../clients/common/nm-vpn-helpers.c:129
- msgid "HTTP proxy password"
- msgstr "HTTP 代理密码"
-
--#: ../clients/common/nm-vpn-helpers.c:130
--#: ../clients/common/nm-vpn-helpers.c:135
-+#: ../clients/common/nm-vpn-helpers.c:134
-+#: ../clients/common/nm-vpn-helpers.c:139
- msgid "Group password"
- msgstr "组密码"
-
--#: ../clients/common/nm-vpn-helpers.c:139 ../clients/tui/nmt-page-ip4.c:143
-+#: ../clients/common/nm-vpn-helpers.c:143 ../clients/tui/nmt-page-ip4.c:143
- #: ../clients/tui/nmt-page-ip6.c:143
- msgid "Gateway"
- msgstr "网关"
-
--#: ../clients/common/nm-vpn-helpers.c:140
-+#: ../clients/common/nm-vpn-helpers.c:144
- msgid "Cookie"
- msgstr "Cookie"
-
--#: ../clients/common/nm-vpn-helpers.c:141
-+#: ../clients/common/nm-vpn-helpers.c:145
- msgid "Gateway certificate hash"
- msgstr "网关证书散列"
-
-+#: ../clients/common/nm-vpn-helpers.c:270
-+#, fuzzy, c-format
-+msgid "Invalid peer starting at %s:%zu: %s"
-+msgstr "无效的设置名称 \"%s\""
-+
-+#: ../clients/common/nm-vpn-helpers.c:390
-+msgid ""
-+"The WireGuard config file must be a valid interface name followed by \".conf"
-+"\""
-+msgstr ""
-+
-+#: ../clients/common/nm-vpn-helpers.c:678
-+#, c-format
-+msgid "unrecognized line at %s:%zu"
-+msgstr ""
-+
-+#: ../clients/common/nm-vpn-helpers.c:683
-+#, fuzzy, c-format
-+msgid "invalid value for '%s' at %s:%zu"
-+msgstr "对 \"%s\" 无效的值：%s"
-+
-+#: ../clients/common/nm-vpn-helpers.c:688
-+#, fuzzy, c-format
-+msgid "invalid secret '%s' at %s:%zu"
-+msgstr "无效路由：%s。%s"
-+
-+#: ../clients/common/nm-vpn-helpers.c:801
-+#, fuzzy, c-format
-+msgid "Failed to create WireGuard connection: %s"
-+msgstr "错误：添加/激活新连接失败：%s"
-+
- #. Generated file. Do not edit.
- #: ../clients/common/settings-docs.h.in:3
- msgid ""
-@@ -5977,19 +5888,20 @@ msgstr ""
- "Wi-Fi 网络。因为信道号码在不同频段间重复，此属性也需要设定 \"band\" 属性。"
-
- #: ../clients/common/settings-docs.h.in:10
-+#, fuzzy
- 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 "
--"address, the special values \"preserve\", \"permanent\", \"random\" and "
--"\"stable\" are supported. \"preserve\" means not to touch the MAC address on "
--"activation. \"permanent\" means to use the permanent hardware address of the "
--"device. \"random\" 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 \"cloned-mac-address\"."
-+"If specified, request that the device use this MAC address instead of its "
-+"permanent MAC address. This is known as MAC cloning or spoofing. Beside "
-+"explicitly specifying a MAC address, the special values \"preserve\", "
-+"\"permanent\", \"random\" and \"stable\" are supported. \"preserve\" means "
-+"not to touch the MAC address on activation. \"permanent\" means to use the "
-+"permanent hardware address of the device. \"random\" 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 \"permanent\". On D-Bus, this field is "
-+"expressed as \"assigned-mac-address\" or the deprecated \"cloned-mac-address"
-+"\"."
- msgstr ""
- "如指定了，则请求该设备使用此 MAC 地址来代替。这个可被称为 MAC 克隆或欺骗。除"
- "了明确地指定 MAC 地址，也支持 \"preserve\"、\"permanent\"、\"random\" 和 "
-@@ -6231,11 +6143,12 @@ msgstr ""
- "\"wep40\"、\"wep104\"、\"tkip\" 或 \"ccmp\" 中的一个。"
-
- #: ../clients/common/settings-docs.h.in:27
-+#, fuzzy
- 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), or \"wpa-eap\" (WPA-Enterprise). This property must be set for "
--"any Wi-Fi connection that uses security."
-+"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 企"
-@@ -6301,17 +6214,12 @@ msgstr ""
-
- #: ../clients/common/settings-docs.h.in:34
- msgid ""
--"Pre-Shared-Key for WPA networks. If the key is 64-characters long, it must "
--"contain only hexadecimal characters and is interpreted as a hexadecimal WPA "
--"key. Otherwise, the key must be between 8 and 63 ASCII characters (as "
--"specified in the 802.11i standard) and is interpreted as a WPA passphrase, "
--"and is hashed to derive the actual WPA-PSK used when connecting to the Wi-Fi "
--"network."
-+"Pre-Shared-Key for WPA networks. For WPA-PSK, it's either an ASCII "
-+"passphrase of 8 to 63 characters that is (as specified in the 802.11i "
-+"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 网络的预共享密钥。如果密钥时 64 字符长，它必须只能包含十六进制的字"
--"符，并且被解释为十六进制的 WPA 密钥。否则，该密钥必须在 8 到 63 ASCII 字符之"
--"间（如 802.11i 标准所规定）并被解释为 WPA 密码；而且当连接到 Wi-Fi 网络时，该"
--"密钥被散列以衍生实际的 WPA-PSK。"
-
- #: ../clients/common/settings-docs.h.in:35
- msgid "Flags indicating how to handle the \"psk\" property."
-@@ -6534,9 +6442,9 @@ msgstr ""
-
- #: ../clients/common/settings-docs.h.in:59
- #: ../clients/common/settings-docs.h.in:104
--#: ../clients/common/settings-docs.h.in:127
--#: ../clients/common/settings-docs.h.in:174
--#: ../clients/common/settings-docs.h.in:286
-+#: ../clients/common/settings-docs.h.in:131
-+#: ../clients/common/settings-docs.h.in:178
-+#: ../clients/common/settings-docs.h.in:290
- msgid "Flags indicating how to handle the \"password\" property."
- msgstr "指示如何处理 \"password\" 属性的标志。"
-
-@@ -6795,7 +6703,7 @@ msgid "PIN used for EAP authentication methods."
- msgstr "用于 EAP 验证方法的 PIN。"
-
- #: ../clients/common/settings-docs.h.in:82
--#: ../clients/common/settings-docs.h.in:176
-+#: ../clients/common/settings-docs.h.in:180
- msgid "Flags indicating how to handle the \"pin\" property."
- msgstr "指示如何处理 \"pin\" 属性的标志。"
-
-@@ -6890,20 +6798,20 @@ msgstr ""
- "FALSE 时，\"speed\" 和 \"duplex\" 属性应该都设置，否则链路配置将被忽略。"
-
- #: ../clients/common/settings-docs.h.in:89
-+#, fuzzy
- 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 "
--"address, the special values \"preserve\", \"permanent\", \"random\" and "
--"\"stable\" are supported. \"preserve\" means not to touch the MAC address on "
--"activation. \"permanent\" means to use the permanent hardware address if the "
--"device has one (otherwise this is treated as \"preserve\"). \"random\" "
--"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 "
--"\"cloned-mac-address\"."
-+"If specified, request that the device use this MAC address instead of its "
-+"permanent MAC address. This is known as MAC cloning or spoofing. Beside "
-+"explicitly specifying a MAC address, the special values \"preserve\", "
-+"\"permanent\", \"random\" and \"stable\" are supported. \"preserve\" means "
-+"not to touch the MAC address on activation. \"permanent\" means to use the "
-+"permanent hardware address if the device has one (otherwise this is treated "
-+"as \"preserve\"). \"random\" 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 \"permanent\". On D-Bus, this field is expressed as \"assigned-"
-+"mac-address\" or the deprecated \"cloned-mac-address\"."
- msgstr ""
- "如果指定了，则请求设备改成使用此 MAC 地址。这被称为 MAC 克隆或欺骗。除了明确"
- "地指定个 MAC 地址，也支持特殊值 \"preserve\"、\"permanent\"、\"random\" 和 "
-@@ -7165,28 +7073,59 @@ msgstr "控制是否为此网桥启用生成树协议（STP）。"
-
- #: ../clients/common/settings-docs.h.in:121
- msgid ""
-+"The default PVID for the ports of the bridge, that is the VLAN id assigned "
-+"to incoming untagged frames."
-+msgstr ""
-+
-+#: ../clients/common/settings-docs.h.in:122
-+#, fuzzy
-+msgid "Control whether VLAN filtering is enabled on the bridge."
-+msgstr "控制是否为此网桥启用生成树协议（STP）。"
-+
-+#: ../clients/common/settings-docs.h.in:123
-+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-"
-+"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 ""
-+
-+#: ../clients/common/settings-docs.h.in:124
-+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:122
-+#: ../clients/common/settings-docs.h.in:125
- msgid ""
- "The Spanning Tree Protocol (STP) port cost for destinations via this port."
- msgstr "通过此端口的目标的生成树协议（STP）端口开销。"
-
--#: ../clients/common/settings-docs.h.in:123
-+#: ../clients/common/settings-docs.h.in:126
- msgid "The Spanning Tree Protocol (STP) priority of this bridge port."
- msgstr "此网桥端口的生成树协议（STP）优先级。"
-
--#: ../clients/common/settings-docs.h.in:124
--#: ../clients/common/settings-docs.h.in:170
--#: ../clients/common/settings-docs.h.in:181
-+#: ../clients/common/settings-docs.h.in:127
-+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 ""
-+
-+#: ../clients/common/settings-docs.h.in:128
-+#: ../clients/common/settings-docs.h.in:174
-+#: ../clients/common/settings-docs.h.in:185
- 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:125
-+#: ../clients/common/settings-docs.h.in:129
- 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 "
-@@ -7195,8 +7134,8 @@ msgstr ""
- "建立基于 CDMA 移动宽带网络连接的拨号号码，如果有的话。如未指定，需要时默认使"
- "用号码（#777）。"
-
--#: ../clients/common/settings-docs.h.in:126
--#: ../clients/common/settings-docs.h.in:173
-+#: ../clients/common/settings-docs.h.in:130
-+#: ../clients/common/settings-docs.h.in:177
- 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 "
-@@ -7205,8 +7144,8 @@ msgstr ""
- "用于与网络验证的密码，如果需要。很多运营商不需要密码，或是接受任何密码。但是"
- "如果需要密码，可在这里指定。"
-
--#: ../clients/common/settings-docs.h.in:128
--#: ../clients/common/settings-docs.h.in:179
-+#: ../clients/common/settings-docs.h.in:132
-+#: ../clients/common/settings-docs.h.in:183
- 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 "
-@@ -7215,7 +7154,7 @@ msgstr ""
- "用于与网络验证的用户名，如果需要。很多运营商不需要用户名，或是接受任何用户"
- "名。但是如果需要用户名，可在这里指定。"
-
--#: ../clients/common/settings-docs.h.in:129
-+#: ../clients/common/settings-docs.h.in:133
- 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 "
-@@ -7225,7 +7164,7 @@ msgstr ""
- "验证的重试次数。零代表无限次数；-1 代表使用全局默认值。如果全局默认值未设定，"
- "允许连接失败前验证重试 3 次。当前此属性只应用到 802.1x 验证。"
-
--#: ../clients/common/settings-docs.h.in:130
-+#: ../clients/common/settings-docs.h.in:134
- msgid ""
- "Whether or not the connection should be automatically connected by "
- "NetworkManager when the resources for the connection are available. TRUE to "
-@@ -7238,7 +7177,7 @@ msgstr ""
- "接，FALSE 为请求手动介入来激活连接。注意自动连接未实现于 VPN 配置集。要自动连"
- "接 VPN 配置集请参阅作为备用方法的 \"secondaries\"。"
-
--#: ../clients/common/settings-docs.h.in:131
-+#: ../clients/common/settings-docs.h.in:135
- msgid ""
- "The autoconnect priority. If the connection is set to autoconnect, "
- "connections with higher priority will be preferred. Defaults to 0. The "
-@@ -7247,7 +7186,7 @@ msgstr ""
- "自动连接优先级。如果连接设为自动连接时，首选高优先级的连接。默认为 0。数值越"
- "高优先级越高。"
-
--#: ../clients/common/settings-docs.h.in:132
-+#: ../clients/common/settings-docs.h.in:136
- 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 "
-@@ -7259,7 +7198,7 @@ msgstr ""
- "为 4 次）。设定此属性为 1 表示阻止自动连接前只尝试一次激活。注意一段超时时间"
- "后，网络管理器（NetworkManager）将重新尝试自动连接。"
-
--#: ../clients/common/settings-docs.h.in:133
-+#: ../clients/common/settings-docs.h.in:137
- msgid ""
- "Whether or not slaves of this connection should be automatically brought up "
- "when NetworkManager activates this connection. This only has a real effect "
-@@ -7276,20 +7215,20 @@ msgstr ""
- "接；-1：默认。如果设为 -1（默认）时，读取全局 connection.autoconnect-slaves "
- "以确定实际值。如果它也是默认的，此设置回落到 0。"
-
--#: ../clients/common/settings-docs.h.in:134
-+#: ../clients/common/settings-docs.h.in:138
- 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:135
-+#: ../clients/common/settings-docs.h.in:139
- 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:136
-+#: ../clients/common/settings-docs.h.in:140
- 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 "
-@@ -7307,11 +7246,11 @@ msgstr ""
- "限制连接可以使用的接口，而且当接口名改变或重新排序了，连接可能会应用到错误的"
- "接口。"
-
--#: ../clients/common/settings-docs.h.in:137
-+#: ../clients/common/settings-docs.h.in:141
- msgid "Whether LLDP is enabled for the connection."
- msgstr "是否为连接启用 LLDP。"
-
--#: ../clients/common/settings-docs.h.in:138
-+#: ../clients/common/settings-docs.h.in:142
- #, fuzzy
- msgid ""
- "Whether Link-Local Multicast Name Resolution (LLMNR) is enabled for the "
-@@ -7327,11 +7266,11 @@ msgstr ""
- "禁用 mDNS，resolve: 不注册主机名但允许解析 mDNS 主机名。这个功能需要一个支持 "
- "mDNS 的插件。dns-systemd-resolved 就是这样一个插件。"
-
--#: ../clients/common/settings-docs.h.in:139
-+#: ../clients/common/settings-docs.h.in:143
- msgid "Interface name of the master device or UUID of the master connection."
- msgstr "主设备的接口名或 UUID 或主连接。"
-
--#: ../clients/common/settings-docs.h.in:140
-+#: ../clients/common/settings-docs.h.in:144
- #, fuzzy
- msgid ""
- "Whether mDNS is enabled for the connection. The permitted values are: yes: "
-@@ -7344,20 +7283,20 @@ msgstr ""
- "禁用 mDNS，resolve: 不注册主机名但允许解析 mDNS 主机名。这个功能需要一个支持 "
- "mDNS 的插件。dns-systemd-resolved 就是这样一个插件。"
-
--#: ../clients/common/settings-docs.h.in:141
-+#: ../clients/common/settings-docs.h.in:145
- 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:142
-+#: ../clients/common/settings-docs.h.in:146
- 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:143
-+#: ../clients/common/settings-docs.h.in:147
- 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 "
-@@ -7379,7 +7318,7 @@ msgstr ""
- "何 [已保留] 信息都必须被忽略并保留为将来使用。所有的 [类型]、[ID] 和 [已保"
- "留] 都必须为有效的 UTF-8。"
-
--#: ../clients/common/settings-docs.h.in:144
-+#: ../clients/common/settings-docs.h.in:148
- 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 "
-@@ -7388,13 +7327,13 @@ msgstr ""
- "如果连接可以用提供设置服务的 D-Bus 接口以正确的权限来修改，为 FALSE；如果连接"
- "为只读且无法修改，为 TRUE。"
-
--#: ../clients/common/settings-docs.h.in:145
-+#: ../clients/common/settings-docs.h.in:149
- 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:146
-+#: ../clients/common/settings-docs.h.in:150
- msgid ""
- "Setting name of the device type of this slave's master connection (eg, \"bond"
- "\"), or NULL if this connection is not a slave."
-@@ -7402,7 +7341,7 @@ msgstr ""
- "此从连接的主连接设备类型的设置名称（例如 \"bond\"），或者为 NULL 如果此连接不"
- "是从连接。"
-
--#: ../clients/common/settings-docs.h.in:147
-+#: ../clients/common/settings-docs.h.in:151
- #, fuzzy
- msgid ""
- "This represents the identity of the connection used for various purposes. It "
-@@ -7422,7 +7361,7 @@ msgid ""
- "treated special to perform dynamic substitutions at runtime. Currently "
- "supported are \"${CONNECTION}\", \"${DEVICE}\", \"${MAC}\", \"${BOOT}\", "
- "\"${RANDOM}\". These effectively create unique IDs per-connection, per-"
--"device, per-boot, or every time. Note that \"${DEVICE}\" corresponds the the "
-+"device, per-boot, or every time. Note that \"${DEVICE}\" corresponds to the "
- "interface name of the device and \"${MAC}\" is the permanent MAC address of "
- "the device. Any unrecognized patterns following '$' are treated verbatim, "
- "however are reserved for future use. You are thus advised to avoid '$' or "
-@@ -7452,7 +7391,7 @@ msgstr ""
- "使用一个全局默认连接。如果还没有设置，它的默认值会与 \"${CONNECTION}\" 类似，"
- "并为这个连接使用一个唯一的固定 ID。"
-
--#: ../clients/common/settings-docs.h.in:148
-+#: ../clients/common/settings-docs.h.in:152
- msgid ""
- "The time, in seconds since the Unix Epoch, that the connection was last "
- "_successfully_ fully activated. NetworkManager updates the connection "
-@@ -7464,7 +7403,7 @@ msgstr ""
- "（NetworkManager）会定期更新连接的时间戳以确保活动连接有最新的时间戳。该用来"
- "读取（此属性的更改不被保留）。"
-
--#: ../clients/common/settings-docs.h.in:149
-+#: ../clients/common/settings-docs.h.in:153
- msgid ""
- "Base type of the connection. For hardware-dependent connections, should "
- "contain the setting name of the hardware-type specific setting (ie, \"802-3-"
-@@ -7477,7 +7416,7 @@ msgstr ""
- "硬件相关的连接如 VPN 或其他的，应包含该设置类型的设置名称（例如 \"vpn\" 或 "
- "\"bridge\"，等等）。"
-
--#: ../clients/common/settings-docs.h.in:150
-+#: ../clients/common/settings-docs.h.in:154
- msgid ""
- "A universally unique identifier for the connection, for example generated "
- "with libuuid. It should be assigned when the connection is created, and "
-@@ -7494,7 +7433,7 @@ msgstr ""
- "能需要重新创建。UUIS 必须为如 \"2815492f-7e56-435e-b2e9-246bd7cdc664\" 的格式"
- "（示例，只包含十六进制和 \"-\"）。"
-
--#: ../clients/common/settings-docs.h.in:151
-+#: ../clients/common/settings-docs.h.in:155
- msgid ""
- "The trust level of a the connection. Free form case-insensitive string (for "
- "example \"Home\", \"Work\", \"Public\"). NULL or unspecified zone means the "
-@@ -7506,7 +7445,7 @@ msgstr ""
- "共\"）。NULL 或为指定区域表示连接将放置到防火墙定义的默认区域。当在当前激活的"
- "连接上更新此属性时，更改立即生效。"
-
--#: ../clients/common/settings-docs.h.in:152
-+#: ../clients/common/settings-docs.h.in:156
- msgid ""
- "Specifies the NMSettingDcbFlags for the DCB FCoE application. Flags may be "
- "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
-@@ -7516,11 +7455,11 @@ msgstr ""
- "NM_SETTING_DCB_FLAG_ENABLE (0x1)、NM_SETTING_DCB_FLAG_ADVERTISE (0x2) 和 "
- "NM_SETTING_DCB_FLAG_WILLING (0x4) 的任意组合。"
-
--#: ../clients/common/settings-docs.h.in:153
-+#: ../clients/common/settings-docs.h.in:157
- msgid "The FCoE controller mode; either \"fabric\" (default) or \"vn2vn\"."
- msgstr "FCoE 控制器模式；为 \"fabric\"（默认）或 \"vn2vn\"。"
-
--#: ../clients/common/settings-docs.h.in:154
-+#: ../clients/common/settings-docs.h.in:158
- 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 "
-@@ -7529,7 +7468,7 @@ msgstr ""
- "FCoE 帧应使用的最高用户优先级（0～7），或 -1 代表默认优先级。只当 \"app-fcoe-"
- "flags\" 属性包含 NM_SETTING_DCB_FLAG_ENABLE (0x1) 标志时使用。"
-
--#: ../clients/common/settings-docs.h.in:155
-+#: ../clients/common/settings-docs.h.in:159
- msgid ""
- "Specifies the NMSettingDcbFlags for the DCB FIP application. Flags may be "
- "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
-@@ -7539,7 +7478,7 @@ msgstr ""
- "NM_SETTING_DCB_FLAG_ENABLE (0x1)、NM_SETTING_DCB_FLAG_ADVERTISE (0x2) 和 "
- "NM_SETTING_DCB_FLAG_WILLING (0x4) 的任意组合。"
-
--#: ../clients/common/settings-docs.h.in:156
-+#: ../clients/common/settings-docs.h.in:160
- 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 "
-@@ -7548,7 +7487,7 @@ msgstr ""
- "FIP 帧应使用的最高用户优先级（0～7），或 -1 代表默认优先级。只当 \"app-fip-"
- "flags\" 属性包含 NM_SETTING_DCB_FLAG_ENABLE (0x1) 标志时使用。"
-
--#: ../clients/common/settings-docs.h.in:157
-+#: ../clients/common/settings-docs.h.in:161
- msgid ""
- "Specifies the NMSettingDcbFlags for the DCB iSCSI application. Flags may be "
- "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
-@@ -7558,7 +7497,7 @@ msgstr ""
- "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:162
- 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 "
-@@ -7567,7 +7506,7 @@ msgstr ""
- "iSCSI 帧应使用的最高用户优先级（0～7），或 -1 代表默认优先级。只当 \"app-"
- "iscsi-flags\" 属性包含 NM_SETTING_DCB_FLAG_ENABLE (0x1) 标志时使用。"
-
--#: ../clients/common/settings-docs.h.in:159
-+#: ../clients/common/settings-docs.h.in:163
- 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 "
-@@ -7579,7 +7518,7 @@ msgstr ""
- "级可使用的优先级指定组的带宽百分比。属于同个组的所有优先级百分比总和必须为 "
- "100%。"
-
--#: ../clients/common/settings-docs.h.in:160
-+#: ../clients/common/settings-docs.h.in:164
- 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 "
-@@ -7588,7 +7527,7 @@ msgstr ""
- "8 个布尔值组成的数组，其数组索引对应于用户优先级（0～7）而其值指示对应优先级"
- "是否应该传输优先级暂停。"
-
--#: ../clients/common/settings-docs.h.in:161
-+#: ../clients/common/settings-docs.h.in:165
- msgid ""
- "Specifies the NMSettingDcbFlags for DCB Priority Flow Control (PFC). Flags "
- "may be any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
-@@ -7598,7 +7537,7 @@ msgstr ""
- "NM_SETTING_DCB_FLAG_ENABLE (0x1)、NM_SETTING_DCB_FLAG_ADVERTISE (0x2) 和 "
- "NM_SETTING_DCB_FLAG_WILLING (0x4) 的任意组合。"
-
--#: ../clients/common/settings-docs.h.in:162
-+#: ../clients/common/settings-docs.h.in:166
- 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 "
-@@ -7608,7 +7547,7 @@ msgstr ""
- "8 个无符号整数值组成的数组，其数组索引对应于用户优先级（0～7）而其值指示分配"
- "到该组的链路带宽百分比。允许的值为 0～100，且所有值的总和必须为 100%。"
-
--#: ../clients/common/settings-docs.h.in:163
-+#: ../clients/common/settings-docs.h.in:167
- msgid ""
- "Specifies the NMSettingDcbFlags for DCB Priority Groups. Flags may be any "
- "combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
-@@ -7618,7 +7557,7 @@ msgstr ""
- "(0x1)、NM_SETTING_DCB_FLAG_ADVERTISE (0x2) 和 NM_SETTING_DCB_FLAG_WILLING "
- "(0x4) 的任意组合。"
-
--#: ../clients/common/settings-docs.h.in:164
-+#: ../clients/common/settings-docs.h.in:168
- 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 "
-@@ -7627,7 +7566,7 @@ msgstr ""
- "8 个无符号整数值组成的数组，其数组索引对应于用户优先级（0～7）而其值指示优先"
- "级组 ID。允许的优先级组 ID 值为 0～7，或 15 表示无限制组。"
-
--#: ../clients/common/settings-docs.h.in:165
-+#: ../clients/common/settings-docs.h.in:169
- 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 "
-@@ -7636,7 +7575,7 @@ msgstr ""
- "8 个布尔值组成的数组，其数组索引对应于用户优先级（0～7）而其值指示优先级是否"
- "可以使用分配到它指定组的全部带宽。"
-
--#: ../clients/common/settings-docs.h.in:166
-+#: ../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 traffic class (0 - 7) to which "
-@@ -7645,7 +7584,7 @@ msgstr ""
- "8 个无符号整数值组成的数组，其数组索引对应于用户优先级（0～7）而其值指示该优"
- "先级映射的流量等级（0～7）。"
-
--#: ../clients/common/settings-docs.h.in:167
-+#: ../clients/common/settings-docs.h.in:171
- 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 "
-@@ -7660,7 +7599,7 @@ msgstr ""
- "平台，因此为用户的移动带宽套餐使用正确的 APN 很重要。根据 GSM 03.60 章节 "
- "14.9，APN 只能由字符 a～z、0～9、. 和 - 组成。"
-
--#: ../clients/common/settings-docs.h.in:168
-+#: ../clients/common/settings-docs.h.in:172
- 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 "
-@@ -7669,13 +7608,13 @@ msgstr ""
- "此连接要应用的设备唯一标识符（由 WWAN 管理服务给定）。如果给定了，连接将只应"
- "用到指定的设备。"
-
--#: ../clients/common/settings-docs.h.in:169
-+#: ../clients/common/settings-docs.h.in:173
- 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:171
-+#: ../clients/common/settings-docs.h.in:175
- msgid ""
- "The Network ID (GSM LAI format, ie MCC-MNC) to force specific network "
- "registration. If the Network ID is specified, NetworkManager will attempt "
-@@ -7687,13 +7626,13 @@ msgstr ""
- "网络管理器（NetworkManager）将尝试强制设备只在指定的网络注册。当设备不能直接"
- "控制漫游时，这可以用于确保设备不漫游。"
-
--#: ../clients/common/settings-docs.h.in:172
-+#: ../clients/common/settings-docs.h.in:176
- msgid ""
- "Legacy setting that used to help establishing PPP data sessions for GSM-"
- "based modems. Deprecated: 1"
- msgstr ""
-
--#: ../clients/common/settings-docs.h.in:175
-+#: ../clients/common/settings-docs.h.in:179
- 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 "
-@@ -7702,7 +7641,7 @@ msgstr ""
- "如果 SIM 被 PIN 锁住了，在请求任何其他操作前必须解锁。在这里指定 PIN 以允许设"
- "备的操作。"
-
--#: ../clients/common/settings-docs.h.in:177
-+#: ../clients/common/settings-docs.h.in:181
- 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 "
-@@ -7712,7 +7651,7 @@ msgstr ""
- "此连接应用的 SIM 卡的唯一标识符（由 WWAN 管理服务给定）。如果给定了，此连接将"
- "应用到包含匹配给定标识符 SIM 卡的 \"device-id\" 所允许的任何设备。"
-
--#: ../clients/common/settings-docs.h.in:178
-+#: ../clients/common/settings-docs.h.in:182
- msgid ""
- "A MCC/MNC string like \"310260\" or \"21601\" identifying the specific "
- "mobile network operator which this connection applies to. If given, the "
-@@ -7723,7 +7662,7 @@ msgstr ""
- "移动网络运营商。如果给定了，连接将应用到包含给定运营商提供 SIM 卡的 \"device-"
- "id\" 和 \"sim-id\" 所允许的任何设备。"
-
--#: ../clients/common/settings-docs.h.in:180
-+#: ../clients/common/settings-docs.h.in:184
- 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 "
-@@ -7732,7 +7671,7 @@ msgstr ""
- "如指定了，此连接将只应用到符合永久 MAC 地址的 IPoIB 设备。此属性不会改变设备"
- "的 MAC 地址（例如 MAC 欺骗）。"
-
--#: ../clients/common/settings-docs.h.in:182
-+#: ../clients/common/settings-docs.h.in:186
- 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 "
-@@ -7742,7 +7681,7 @@ msgstr ""
- "P_Key\"）。否则它是个 16 位无符号整数，其高位已设定如果它是个 \"正式会员\" "
- "P_Key。"
-
--#: ../clients/common/settings-docs.h.in:183
-+#: ../clients/common/settings-docs.h.in:187
- 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 "
-@@ -7751,19 +7690,19 @@ msgstr ""
- "此设备的上级设备的接口名称。一般是 NULL，但如果 \"p_key\" 已设定，您必须通过"
- "设置此属性或 \"mac-address\" 来指定基础设备。"
-
--#: ../clients/common/settings-docs.h.in:184
-+#: ../clients/common/settings-docs.h.in:188
- msgid ""
- "The IP-over-InfiniBand transport mode. Either \"datagram\" or \"connected\"."
- msgstr ""
- "IP-over-InfiniBand 传输模式。要么为 \"datagram\" 要么为 \"connected\"。"
-
--#: ../clients/common/settings-docs.h.in:185
-+#: ../clients/common/settings-docs.h.in:189
- 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:186
-+#: ../clients/common/settings-docs.h.in:190
- msgid ""
- "Tunnel flags. Currently the following values are supported: "
- "NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT (0x1), "
-@@ -7780,13 +7719,13 @@ msgstr ""
- "(0x10)、NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK (0x20)。它们只对 IPv6 隧道有"
- "效。"
-
--#: ../clients/common/settings-docs.h.in:187
-+#: ../clients/common/settings-docs.h.in:191
- msgid ""
- "The flow label to assign to tunnel packets. This property applies only to "
- "IPv6 tunnels."
- msgstr "要分配到隧道数据包的流量标签。此属性只应用到 IPv6 隧道。"
-
--#: ../clients/common/settings-docs.h.in:188
-+#: ../clients/common/settings-docs.h.in:192
- 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."
-@@ -7794,26 +7733,26 @@ msgstr ""
- "用于隧道输入数据包的密钥。该属性值对某些隧道模式有效（GRE、IP6GRE）。如果留空"
- "则不使用密钥。"
-
--#: ../clients/common/settings-docs.h.in:189
-+#: ../clients/common/settings-docs.h.in:193
- 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:190
-+#: ../clients/common/settings-docs.h.in:194
- 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:191
-+#: ../clients/common/settings-docs.h.in:195
- 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:192
-+#: ../clients/common/settings-docs.h.in:196
- 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."
-@@ -7821,7 +7760,7 @@ msgstr ""
- "用于隧道输出数据包的密钥。该属性值对某些隧道模式有效（GRE、IP6GRE）。如果留空"
- "则不使用密钥。"
-
--#: ../clients/common/settings-docs.h.in:193
-+#: ../clients/common/settings-docs.h.in:197
- 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 "
-@@ -7830,35 +7769,35 @@ msgstr ""
- "如果给定了，指定新设备将绑定到的上级接口名或上级连接 UUID，以让隧道的数据包只"
- "能通过该接口进行路由。"
-
--#: ../clients/common/settings-docs.h.in:194
-+#: ../clients/common/settings-docs.h.in:198
- msgid "Whether to enable Path MTU Discovery on this tunnel."
- msgstr "是否在此隧道启用路径 MTU 发现。"
-
--#: ../clients/common/settings-docs.h.in:195
-+#: ../clients/common/settings-docs.h.in:199
- 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:196
-+#: ../clients/common/settings-docs.h.in:200
- 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:197
-+#: ../clients/common/settings-docs.h.in:201
- 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:198
--#: ../clients/common/settings-docs.h.in:219
-+#: ../clients/common/settings-docs.h.in:202
-+#: ../clients/common/settings-docs.h.in:223
- msgid "Array of IP addresses."
- msgstr "IP 地址数组。"
-
--#: ../clients/common/settings-docs.h.in:199
--#: ../clients/common/settings-docs.h.in:220
-+#: ../clients/common/settings-docs.h.in:203
-+#: ../clients/common/settings-docs.h.in:224
- msgid ""
- "Timeout in milliseconds used to check for the presence of duplicate IP "
- "addresses on the network. If an address conflict is detected, the "
-@@ -7871,7 +7810,7 @@ msgstr ""
- "零值表示不执行重复 IP 检查，-1 表示默认值（配置 ipvx.dad-timeout 覆盖或 3 "
- "秒）。大于零的值为以毫秒计算的超时时间。该属性当前只实现于 IPv4。"
-
--#: ../clients/common/settings-docs.h.in:200
-+#: ../clients/common/settings-docs.h.in:204
- #, fuzzy
- msgid ""
- "A string sent to the DHCP server to identify the local machine which the "
-@@ -7905,7 +7844,7 @@ msgstr ""
- "型 0 的客户端标识符（参见 connection.stable-id）。如果未设，使用全局默认值。"
- "如果仍未设定，重新使用来自上个租约的 client-id。"
-
--#: ../clients/common/settings-docs.h.in:201
-+#: ../clients/common/settings-docs.h.in:205
- 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-"
-@@ -7914,8 +7853,8 @@ msgstr ""
- "如果 \"dhcp-send-hostname\" 属性为 TRUE，当获取租约时指定的 FQDN 将被发送到 "
- "DHCP 服务器。此属性与 \"dhcp-hostname\" 相互排斥而且无法被同时设定。"
-
--#: ../clients/common/settings-docs.h.in:202
--#: ../clients/common/settings-docs.h.in:222
-+#: ../clients/common/settings-docs.h.in:206
-+#: ../clients/common/settings-docs.h.in:226
- 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-"
-@@ -7924,8 +7863,8 @@ msgstr ""
- "如果 \"dhcp-send-hostname\" 属性为 TRUE，当获取租约时指定的名称将被发送到 "
- "DHCP 服务器。此属性与 \"dhcp-fqdn\" 相互排斥而且无法被同时设定。"
-
--#: ../clients/common/settings-docs.h.in:203
--#: ../clients/common/settings-docs.h.in:223
-+#: ../clients/common/settings-docs.h.in:207
-+#: ../clients/common/settings-docs.h.in:227
- 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 "
-@@ -7937,18 +7876,18 @@ msgstr ""
- "机名来更新 DNS 数据库，实质上为计算机提供了个静态的主机名。如果 \"dhcp-"
- "hostname\" 属性为 NULL 且此属性为 TRUE，以计算机的当前永久主机。"
-
--#: ../clients/common/settings-docs.h.in:204
--#: ../clients/common/settings-docs.h.in:224
-+#: ../clients/common/settings-docs.h.in:208
-+#: ../clients/common/settings-docs.h.in:228
- msgid "A timeout for a DHCP transaction in seconds."
- msgstr "DHCP 事务的超时时间，以秒计。"
-
--#: ../clients/common/settings-docs.h.in:205
--#: ../clients/common/settings-docs.h.in:225
-+#: ../clients/common/settings-docs.h.in:209
-+#: ../clients/common/settings-docs.h.in:229
- msgid "Array of IP addresses of DNS servers."
- msgstr "DNS 服务器的 IP 地址数组。"
-
--#: ../clients/common/settings-docs.h.in:206
--#: ../clients/common/settings-docs.h.in:226
-+#: ../clients/common/settings-docs.h.in:210
-+#: ../clients/common/settings-docs.h.in:230
- 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 "
-@@ -7957,8 +7896,8 @@ msgstr ""
- "在 man 5 resolv.conf 中描述的 DNS 选项数组。NULL 代表选项未设定并保留默认值。"
- "此情况下网络管理器（NetworkManager）将使用默认选项。这跟空列表的属性不同。"
-
--#: ../clients/common/settings-docs.h.in:207
--#: ../clients/common/settings-docs.h.in:227
-+#: ../clients/common/settings-docs.h.in:211
-+#: ../clients/common/settings-docs.h.in:231
- #, fuzzy
- msgid ""
- "DNS servers priority. The relative priority for DNS servers specified by "
-@@ -7999,8 +7938,8 @@ msgstr ""
- "个连接将获选。如果连接指定了个域，其为具有负 DNS 优先级值的另一域的子域，那这"
- "个子域会被忽略。"
-
--#: ../clients/common/settings-docs.h.in:208
--#: ../clients/common/settings-docs.h.in:228
-+#: ../clients/common/settings-docs.h.in:212
-+#: ../clients/common/settings-docs.h.in:232
- msgid ""
- "Array of DNS search domains. Domains starting with a tilde ('~') are "
- "considered 'routing' domains and are used only to decide the interface over "
-@@ -8010,15 +7949,15 @@ msgstr ""
- "DNS 搜索域的数组。域以半角波浪号（\"~\"）开头的视为 \"路由\" 域并只用于确定查"
- "询必须转发的接口；它们不用于完全未限定的主机名。"
-
--#: ../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:233
- msgid ""
- "The gateway associated with this configuration. This is only meaningful if "
- "\"addresses\" is also set."
- msgstr "与此配置关联的网关。这只在 \"addresses\" 也设定的时候有意义。"
-
--#: ../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:234
- msgid ""
- "When \"method\" is set to \"auto\" and this property to TRUE, automatically "
- "configured nameservers and search domains are ignored and only nameservers "
-@@ -8029,8 +7968,8 @@ msgstr ""
- "被忽略且只有 \"dns\" 和 \"dns-search\" 属性中指定的名称服务器和搜索域被使用，"
- "如果有的话。"
-
--#: ../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:235
- msgid ""
- "When \"method\" is set to \"auto\" and this property to TRUE, automatically "
- "configured routes are ignored and only routes specified in the \"routes\" "
-@@ -8039,8 +7978,8 @@ msgstr ""
- "当 \"method\" 设为 \"auto\" 且此属性为 TRUE 时，自动配置的路由被忽略且只有 "
- "\"routes\" 属性中指定的路由被使用，如果有的话。"
-
--#: ../clients/common/settings-docs.h.in:212
--#: ../clients/common/settings-docs.h.in:233
-+#: ../clients/common/settings-docs.h.in:216
-+#: ../clients/common/settings-docs.h.in:237
- msgid ""
- "If TRUE, allow overall network configuration to proceed even if the "
- "configuration specified by this property times out. Note that at least one "
-@@ -8054,8 +7993,8 @@ msgstr ""
- "NMSettingIP4Config 设置此属性为 TRUE 时允许整体网络配置在 IPv4 配置失败但 "
- "IPv6 配置成功完成时成功。"
-
--#: ../clients/common/settings-docs.h.in:213
--#: ../clients/common/settings-docs.h.in:234
-+#: ../clients/common/settings-docs.h.in:217
-+#: ../clients/common/settings-docs.h.in:238
- #, fuzzy
- msgid ""
- "IP configuration method. NMSettingIP4Config and NMSettingIP6Config both "
-@@ -8080,8 +8019,8 @@ msgstr ""
- "x.0/24 来配置。注意，shared 的方法必须在这个子网中的用来共享互联网的接口中进"
- "行配置，而不是在共享的上部连接中进行配置。"
-
--#: ../clients/common/settings-docs.h.in:214
--#: ../clients/common/settings-docs.h.in:235
-+#: ../clients/common/settings-docs.h.in:218
-+#: ../clients/common/settings-docs.h.in:239
- 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."
-@@ -8089,8 +8028,8 @@ msgstr ""
- "如果为 TRUE，此连接将永不成为此 IP 类型的默认连接，这表示网络管理器"
- "（NetworkManager）永远不会为其分配默认路由。"
-
--#: ../clients/common/settings-docs.h.in:215
--#: ../clients/common/settings-docs.h.in:236
-+#: ../clients/common/settings-docs.h.in:219
-+#: ../clients/common/settings-docs.h.in:240
- 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 "
-@@ -8105,8 +8044,8 @@ msgstr ""
- "默认路由。注意对于 IPv6，内核接受零值（0）但会将其转为 1024（用户默认）。因"
- "此，设置此属性为零等于设置它为 1024。对于 IPv4，零是跃点的常规值。"
-
--#: ../clients/common/settings-docs.h.in:216
--#: ../clients/common/settings-docs.h.in:237
-+#: ../clients/common/settings-docs.h.in:220
-+#: ../clients/common/settings-docs.h.in:241
- msgid ""
- "Enable policy routing (source routing) and set the routing table used when "
- "adding routes. This affects all routes, including device-routes, IPv4LL, "
-@@ -8130,12 +8069,12 @@ msgstr ""
- "同路由表的静态路由）。另外，网络管理器将不会从表中删除任何外部路由，除了主路"
- "由。这是为了给用网络管理器之外工具管理路由表的用户保持后向兼容性。"
-
--#: ../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:242
- msgid "Array of IP routes."
- msgstr "IP 路由数组。"
-
--#: ../clients/common/settings-docs.h.in:218
-+#: ../clients/common/settings-docs.h.in:222
- msgid ""
- "Configure method for creating the address for use with RFC4862 IPv6 "
- "Stateless Address Autoconfiguration. The permitted values are: "
-@@ -8168,7 +8107,7 @@ msgstr ""
- "置与由 \"ip6-privacy\" 配置的隐私扩展不同，而且它不会影响此选项配置的临时地"
- "址。"
-
--#: ../clients/common/settings-docs.h.in:221
-+#: ../clients/common/settings-docs.h.in:225
- #, fuzzy
- msgid ""
- "A string containing the DHCPv6 Unique Identifier (DUID) used by the dhcp "
-@@ -8213,7 +8152,7 @@ msgstr ""
- "戳相同）。当属性未设定时，使用 \"ipv6.dhcp-duid\" 提供的全局值。如果未提供全"
- "局值，认定为默认的 \"lease\" 值。"
-
--#: ../clients/common/settings-docs.h.in:232
-+#: ../clients/common/settings-docs.h.in:236
- msgid ""
- "Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941. If "
- "enabled, it makes the kernel generate a temporary IPv6 address in addition "
-@@ -8238,7 +8177,7 @@ msgstr ""
- "意此设置与固定隐私地址不同，后者可通过 \"addr-gen-mode\" 属性的 \"stable-"
- "privacy\" 设置启用，可作为避免 IPv6 地址追踪的另一种方法。"
-
--#: ../clients/common/settings-docs.h.in:239
-+#: ../clients/common/settings-docs.h.in:243
- msgid ""
- "Configure the token for draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 "
- "tokenized interface identifiers. Useful with eui64 addr-gen-mode."
-@@ -8246,32 +8185,32 @@ msgstr ""
- "配置用于 draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 令牌化接口标识符"
- "的令牌。对 eui64 addr-gen-mode 有用。"
-
--#: ../clients/common/settings-docs.h.in:240
-+#: ../clients/common/settings-docs.h.in:244
- msgid "Whether the transmitted traffic must be encrypted."
- msgstr "是否加密传输的流量。"
-
--#: ../clients/common/settings-docs.h.in:241
-+#: ../clients/common/settings-docs.h.in:245
- msgid ""
- "The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement."
- msgstr "用于 MACsec 密钥协商的预共享 CAK。"
-
--#: ../clients/common/settings-docs.h.in:242
-+#: ../clients/common/settings-docs.h.in:246
- msgid "Flags indicating how to handle the \"mka-cak\" property."
- msgstr "指示如何处理 \"mka-cak\" 属性的标志。"
-
--#: ../clients/common/settings-docs.h.in:243
-+#: ../clients/common/settings-docs.h.in:247
- msgid ""
- "The pre-shared CKN (Connectivity-association Key Name) for MACsec Key "
- "Agreement."
- msgstr "用于 MACsec 密钥协商的预共享 CKN（连接关联密钥名称）。"
-
--#: ../clients/common/settings-docs.h.in:244
-+#: ../clients/common/settings-docs.h.in:248
- 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:245
-+#: ../clients/common/settings-docs.h.in:249
- 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 "
-@@ -8282,29 +8221,29 @@ msgstr ""
- "如果此属性未指定，该连接必须包含具有 \"mac-address\" 属性的 \"802-3-ethernet"
- "\" 设置。"
-
--#: ../clients/common/settings-docs.h.in:246
-+#: ../clients/common/settings-docs.h.in:250
- msgid ""
- "The port component of the SCI (Secure Channel Identifier), between 1 and "
- "65534."
- msgstr "SCI（安全信道标识符）的端口组件，介于 1 和 65534 之间。"
-
--#: ../clients/common/settings-docs.h.in:247
-+#: ../clients/common/settings-docs.h.in:251
- msgid ""
- "Specifies whether the SCI (Secure Channel Identifier) is included in every "
- "packet."
- msgstr "指定 SCI（安全信道标识符）是否包括在每个数据包中。"
-
--#: ../clients/common/settings-docs.h.in:248
-+#: ../clients/common/settings-docs.h.in:252
- msgid "Specifies the validation mode for incoming frames."
- msgstr "指定传入帧的验证模式。"
-
--#: ../clients/common/settings-docs.h.in:249
-+#: ../clients/common/settings-docs.h.in:253
- 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:250
-+#: ../clients/common/settings-docs.h.in:254
- 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 "
-@@ -8315,15 +8254,15 @@ msgstr ""
- "UUID。如果此属性未指定，该连接必须包含具有 \"mac-address\" 属性的 \"802-3-"
- "ethernet\" 设置。"
-
--#: ../clients/common/settings-docs.h.in:251
-+#: ../clients/common/settings-docs.h.in:255
- msgid "Whether the interface should be put in promiscuous mode."
- msgstr "是否应将接口置于混杂模式。"
-
--#: ../clients/common/settings-docs.h.in:252
-+#: ../clients/common/settings-docs.h.in:256
- msgid "Whether the interface should be a MACVTAP."
- msgstr "接口是否应为 MACVTAP。"
-
--#: ../clients/common/settings-docs.h.in:253
-+#: ../clients/common/settings-docs.h.in:257
- msgid ""
- "A list of interface names to match. Each element is a shell wildcard "
- "pattern. When an element is prefixed with exclamation mark (!) the "
-@@ -8336,56 +8275,56 @@ msgstr ""
- "时，条件反转。当满足下列条件时，视为匹配的候选接口名：(a) 未前插 \"!\" 的任意"
- "元素匹配或不存此类元素；(b) 无前插 \"!\" 的元素匹配。"
-
--#: ../clients/common/settings-docs.h.in:254
-+#: ../clients/common/settings-docs.h.in:258
- msgid "The bridge failure mode. One of \"secure\", \"standalone\" or empty."
- msgstr "网桥失败模式。\"secure\"、\"standalone\" 之一或留空。"
-
--#: ../clients/common/settings-docs.h.in:255
-+#: ../clients/common/settings-docs.h.in:259
- msgid "Enable or disable multicast snooping."
- msgstr "启用或禁用多播监听。"
-
--#: ../clients/common/settings-docs.h.in:256
-+#: ../clients/common/settings-docs.h.in:260
- msgid "Enable or disable RSTP."
- msgstr "启用或禁用 RSTP。"
-
--#: ../clients/common/settings-docs.h.in:257
-+#: ../clients/common/settings-docs.h.in:261
- msgid "Enable or disable STP."
- msgstr "启用或禁用 STP。"
-
--#: ../clients/common/settings-docs.h.in:258
-+#: ../clients/common/settings-docs.h.in:262
- msgid "The interface type. Either \"internal\", or empty."
- msgstr "接口类型。要么为 \"internal\"，要么留空。"
-
--#: ../clients/common/settings-docs.h.in:259
-+#: ../clients/common/settings-docs.h.in:263
- 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:260
-+#: ../clients/common/settings-docs.h.in:264
- msgid "The time port must be inactive in order to be considered down."
- msgstr "端口被视为关闭所需停用的时间。"
-
--#: ../clients/common/settings-docs.h.in:261
-+#: ../clients/common/settings-docs.h.in:265
- 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:262
-+#: ../clients/common/settings-docs.h.in:266
- msgid "The time port must be active before it starts forwarding traffic."
- msgstr "端口开始流量转发所需激活的时间。"
-
--#: ../clients/common/settings-docs.h.in:263
-+#: ../clients/common/settings-docs.h.in:267
- msgid "LACP mode. One of \"active\", \"off\", or \"passive\"."
- msgstr "LACP 模式。\"active\"、\"off\" 或 \"passive\" 之一。"
-
--#: ../clients/common/settings-docs.h.in:264
-+#: ../clients/common/settings-docs.h.in:268
- msgid "The VLAN tag in the range 0-4095."
- msgstr "VLAN 标记在 0～4095 范围内。"
-
--#: ../clients/common/settings-docs.h.in:265
-+#: ../clients/common/settings-docs.h.in:269
- msgid ""
- "The VLAN mode. One of \"access\", \"native-tagged\", \"native-untagged\", "
- "\"trunk\" or unset."
-@@ -8393,7 +8332,7 @@ msgstr ""
- "VLAN 模式。\"access\"、\"native-tagged\"、\"native-untagged\"、\"trunk\" 之一"
- "或不设定。"
-
--#: ../clients/common/settings-docs.h.in:266
-+#: ../clients/common/settings-docs.h.in:270
- 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 "
-@@ -8402,7 +8341,7 @@ msgstr ""
- "如果非零，指示 pppd 设定串口到指定的波特率。要自动选择速度时此值通常保留为 "
- "0。"
-
--#: ../clients/common/settings-docs.h.in:267
-+#: ../clients/common/settings-docs.h.in:271
- 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 "
-@@ -8411,7 +8350,7 @@ msgstr ""
- "如果为 TRUE，指定 pppd 应设定串口以使用通过 RTS 和 CTS 信号的硬件流量控制。此"
- "值通常应设为 FALSE。"
-
--#: ../clients/common/settings-docs.h.in:268
-+#: ../clients/common/settings-docs.h.in:272
- 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 "
-@@ -8421,7 +8360,7 @@ msgstr ""
- "如果非零，指示如果指定的 LCP 回响请求号码未被节点回应时 pppd 就认定到节点的连"
- "接失败了。如果要使用此属性，\"lcp-echo-interval\" 属性也必须设为非零值。"
-
--#: ../clients/common/settings-docs.h.in:269
-+#: ../clients/common/settings-docs.h.in:273
- 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 "
-@@ -8431,14 +8370,14 @@ msgstr ""
- "如果非零，指示 pppd 每几秒发送一个 LCP 回响请求帧到节点（几秒为该属性指定）。"
- "注意有些 PPP 节点将响应回响请求而有些不会，并且无法自动检测此行为。"
-
--#: ../clients/common/settings-docs.h.in:270
-+#: ../clients/common/settings-docs.h.in:274
- 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:271
-+#: ../clients/common/settings-docs.h.in:275
- 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 "
-@@ -8447,16 +8386,16 @@ msgstr ""
- "如果非零，指示 pppd 请求节点发送的数据包不要超过指定的大小。如果非零，MRU 应"
- "在 128 和 16384 之间。"
-
--#: ../clients/common/settings-docs.h.in:272
-+#: ../clients/common/settings-docs.h.in:276
- msgid ""
- "If non-zero, instruct pppd to send packets no larger than the specified size."
- msgstr "如果非零，指示 pppd 不要发送超过指定大小的数据包。"
-
--#: ../clients/common/settings-docs.h.in:273
-+#: ../clients/common/settings-docs.h.in:277
- msgid "If TRUE, Van Jacobsen TCP header compression will not be requested."
- msgstr "如果为 TRUE，将不请求压缩 Van Jacobsen TCP 首部。"
-
--#: ../clients/common/settings-docs.h.in:274
-+#: ../clients/common/settings-docs.h.in:278
- msgid ""
- "If TRUE, do not require the other side (usually the PPP server) to "
- "authenticate itself to the client. If FALSE, require authentication from "
-@@ -8465,35 +8404,35 @@ msgstr ""
- "如果为 TRUE，不需要其他方（通常是 PPP 服务器）验证自己到客户端。如果为 "
- "FALSE，需要来自远端的验证。在大多数情况下，此属性应为 TRUE。"
-
--#: ../clients/common/settings-docs.h.in:275
-+#: ../clients/common/settings-docs.h.in:279
- msgid "If TRUE, BSD compression will not be requested."
- msgstr "如果为 TURE，将不会请求 BSD 压缩。"
-
--#: ../clients/common/settings-docs.h.in:276
-+#: ../clients/common/settings-docs.h.in:280
- msgid "If TRUE, \"deflate\" compression will not be requested."
- msgstr "如果为 TURE，将不会请求 \"deflate\" 压缩。"
-
--#: ../clients/common/settings-docs.h.in:277
-+#: ../clients/common/settings-docs.h.in:281
- msgid "If TRUE, the CHAP authentication method will not be used."
- msgstr "如果为 TRUE，将不会使用 CHAP 验证方法。"
-
--#: ../clients/common/settings-docs.h.in:278
-+#: ../clients/common/settings-docs.h.in:282
- msgid "If TRUE, the EAP authentication method will not be used."
- msgstr "如果为 TRUE，将不会使用 EAP 验证方法。"
-
--#: ../clients/common/settings-docs.h.in:279
-+#: ../clients/common/settings-docs.h.in:283
- msgid "If TRUE, the MSCHAP authentication method will not be used."
- msgstr "如果为 TRUE，将不会使用 MSCHAP 验证方法。"
-
--#: ../clients/common/settings-docs.h.in:280
-+#: ../clients/common/settings-docs.h.in:284
- msgid "If TRUE, the MSCHAPv2 authentication method will not be used."
- msgstr "如果为 TRUE，将不会使用 MSCHAPv2 验证方法。"
-
--#: ../clients/common/settings-docs.h.in:281
-+#: ../clients/common/settings-docs.h.in:285
- msgid "If TRUE, the PAP authentication method will not be used."
- msgstr "如果为 TRUE，将不会使用 PAP 验证方法。"
-
--#: ../clients/common/settings-docs.h.in:282
-+#: ../clients/common/settings-docs.h.in:286
- 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 "
-@@ -8502,7 +8441,7 @@ msgstr ""
- "如果为 TRUE，PPP 会话将需要 MPPE（微软点对点加密）。如果 64 位或 128 位的 "
- "MPPE 都不可用，会话将失败。注意 MPPE 不用在移动宽带连接。"
-
--#: ../clients/common/settings-docs.h.in:283
-+#: ../clients/common/settings-docs.h.in:287
- 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 "
-@@ -8511,7 +8450,7 @@ msgstr ""
- "如果为 TRUE，PPP 会话将需要 MPPE（微软点对点加密）且 \"require-mppe\" 也必须"
- "设为 TRUE。如果 128 位的 MPPE 不可用，会话将失败。"
-
--#: ../clients/common/settings-docs.h.in:284
-+#: ../clients/common/settings-docs.h.in:288
- 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 "
-@@ -8521,11 +8460,11 @@ msgstr ""
- "如果给定了，指定此 PPPoE 连接应被创建在的上级接口名。如果此属性未指定，连接将"
- "激活到 NMSettingConnection 的 \"interface-name\" 所指定的接口。"
-
--#: ../clients/common/settings-docs.h.in:285
-+#: ../clients/common/settings-docs.h.in:289
- msgid "Password used to authenticate with the PPPoE service."
- msgstr "用于 PPPoE 服务验证的密码。"
-
--#: ../clients/common/settings-docs.h.in:287
-+#: ../clients/common/settings-docs.h.in:291
- msgid ""
- "If specified, instruct PPPoE to only initiate sessions with access "
- "concentrators that provide the specified service. For most providers, this "
-@@ -8535,28 +8474,28 @@ msgstr ""
- "如果指定了，指示 PPPoE 只启动与提供了指定服务的集线器的会话。对于大多数运营"
- "商，此属性应留空。如果有多个集线器存在或者特定服务需要时，此属性才需要设定。"
-
--#: ../clients/common/settings-docs.h.in:288
-+#: ../clients/common/settings-docs.h.in:292
- msgid "Username used to authenticate with the PPPoE service."
- msgstr "用于 PPPoE 服务验证的用户名。"
-
--#: ../clients/common/settings-docs.h.in:289
-+#: ../clients/common/settings-docs.h.in:293
- msgid "Whether the proxy configuration is for browser only."
- msgstr "代理配置是否只用于浏览器。"
-
--#: ../clients/common/settings-docs.h.in:290
-+#: ../clients/common/settings-docs.h.in:294
- 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:291
-+#: ../clients/common/settings-docs.h.in:295
- msgid "PAC script for the connection."
- msgstr "用于连接的 PAC 脚本。"
-
--#: ../clients/common/settings-docs.h.in:292
-+#: ../clients/common/settings-docs.h.in:296
- msgid "PAC URL for obtaining PAC file."
- msgstr "用户获取 PAC 文件的 PAC URL。"
-
--#: ../clients/common/settings-docs.h.in:293
-+#: ../clients/common/settings-docs.h.in:297
- 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 "
-@@ -8565,25 +8504,25 @@ msgstr ""
- "通过串口通信使用的速度。注意该值一般对移动宽带调制解调器没有效果，因为它们通"
- "常忽略速度设置并使用最高的可用速度。"
-
--#: ../clients/common/settings-docs.h.in:294
-+#: ../clients/common/settings-docs.h.in:298
- msgid "Byte-width of the serial communication. The 8 in \"8n1\" for example."
- msgstr "串口通信的字节宽度。以 \"8n1\" 中的 8 为例。"
-
--#: ../clients/common/settings-docs.h.in:295
-+#: ../clients/common/settings-docs.h.in:299
- msgid "Parity setting of the serial port."
- msgstr "串口的奇偶校验设置。"
-
--#: ../clients/common/settings-docs.h.in:296
-+#: ../clients/common/settings-docs.h.in:300
- msgid "Time to delay between each byte sent to the modem, in microseconds."
- msgstr "每次发送字节到调制解调器的延迟时间，以微秒计。"
-
--#: ../clients/common/settings-docs.h.in:297
-+#: ../clients/common/settings-docs.h.in:301
- 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:298
-+#: ../clients/common/settings-docs.h.in:302
- 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 "
-@@ -8599,7 +8538,7 @@ msgstr ""
- "被声明且不会为它们创建网络接口。当设为 NM_TERNARY_DEFAULT (-1) 时，使用全局默"
- "认值；全局默认未指定的情况下则假定为 NM_TERNARY_TRUE (1)。"
-
--#: ../clients/common/settings-docs.h.in:299
-+#: ../clients/common/settings-docs.h.in:303
- msgid ""
- "The total number of virtual functions to create. Note that when the sriov "
- "setting is present NetworkManager enforces the number of virtual functions "
-@@ -8607,7 +8546,7 @@ msgid ""
- "parameters don't add a sriov setting to the connection."
- msgstr ""
-
--#: ../clients/common/settings-docs.h.in:300
-+#: ../clients/common/settings-docs.h.in:304
- #, fuzzy
- msgid ""
- "Array of virtual function descriptors. Each VF descriptor is a dictionary "
-@@ -8628,15 +8567,15 @@ msgstr ""
- "描述符的格式为 \"ID[.PRIORITY[.PROTO]]\"。PROTO 可以是用于 802.1Q（默认）的 "
- "\"q\" 或用于 802.1ad 的 \"ad\"。"
-
--#: ../clients/common/settings-docs.h.in:301
-+#: ../clients/common/settings-docs.h.in:305
- msgid "Array of TC queueing disciplines."
- msgstr "TC 排队规则阵列。"
-
--#: ../clients/common/settings-docs.h.in:302
-+#: ../clients/common/settings-docs.h.in:306
- msgid "Array of TC traffic filters."
- msgstr "TC 流量过滤器阵列。"
-
--#: ../clients/common/settings-docs.h.in:303
-+#: ../clients/common/settings-docs.h.in:307
- msgid ""
- "The JSON configuration for the team network interface. The property should "
- "contain raw JSON configuration data suitable for teamd, because the value is "
-@@ -8647,8 +8586,8 @@ msgstr ""
- "因为该值直接传递给 teamd。如果未指定则使用默认的配置。格式详情请参阅 teamd."
- "conf 手册。"
-
--#: ../clients/common/settings-docs.h.in:304
--#: ../clients/common/settings-docs.h.in:322
-+#: ../clients/common/settings-docs.h.in:308
-+#: ../clients/common/settings-docs.h.in:326
- #, fuzzy
- msgid ""
- "Link watchers configuration for the connection: each link watcher is defined "
-@@ -8667,23 +8606,23 @@ msgstr ""
- "\"、\"target-host\"；arp_ping：包括 nsna_ping 中的和 \"source-host"
- "\"、\"validate-active\"、\"validate-incative\"、\"send-always\"。"
-
--#: ../clients/common/settings-docs.h.in:305
-+#: ../clients/common/settings-docs.h.in:309
- msgid "Corresponds to the teamd mcast_rejoin.count."
- msgstr "对应于 teamd mcast_rejoin.count。"
-
--#: ../clients/common/settings-docs.h.in:306
-+#: ../clients/common/settings-docs.h.in:310
- msgid "Corresponds to the teamd mcast_rejoin.interval."
- msgstr "对应于 teamd mcast_rejoin.interval。"
-
--#: ../clients/common/settings-docs.h.in:307
-+#: ../clients/common/settings-docs.h.in:311
- msgid "Corresponds to the teamd notify_peers.count."
- msgstr "对应于 teamd notify_peers.count。"
-
--#: ../clients/common/settings-docs.h.in:308
-+#: ../clients/common/settings-docs.h.in:312
- msgid "Corresponds to the teamd notify_peers.interval."
- msgstr "对应于 teamd notify_peers.interval。"
-
--#: ../clients/common/settings-docs.h.in:309
-+#: ../clients/common/settings-docs.h.in:313
- msgid ""
- "Corresponds to the teamd runner.name. Permitted values are: \"roundrobin\", "
- "\"broadcast\", \"activebackup\", \"loadbalance\", \"lacp\", \"random\". When "
-@@ -8696,43 +8635,43 @@ msgstr ""
- "时，所有指定到运行程序的属性都将充值为默认值；所有指定到其他运行程序的属性都"
- "将设为空值（或者不可能时设为默认值）。"
-
--#: ../clients/common/settings-docs.h.in:310
-+#: ../clients/common/settings-docs.h.in:314
- msgid "Corresponds to the teamd runner.active."
- msgstr "对应于 teamd runner.active。"
-
--#: ../clients/common/settings-docs.h.in:311
-+#: ../clients/common/settings-docs.h.in:315
- msgid "Corresponds to the teamd runner.agg_select_policy."
- msgstr "对应于 teamd runner.agg_select_policy。"
-
--#: ../clients/common/settings-docs.h.in:312
-+#: ../clients/common/settings-docs.h.in:316
- msgid "Corresponds to the teamd runner.fast_rate."
- msgstr "对应于 teamd runner.fast_rate。"
-
--#: ../clients/common/settings-docs.h.in:313
-+#: ../clients/common/settings-docs.h.in:317
- msgid "Corresponds to the teamd runner.hwaddr_policy."
- msgstr "对应于 teamd runner.hwaddr_policy。"
-
--#: ../clients/common/settings-docs.h.in:314
-+#: ../clients/common/settings-docs.h.in:318
- msgid "Corresponds to the teamd runner.min_ports."
- msgstr "对应于 teamd runner.min_ports。"
-
--#: ../clients/common/settings-docs.h.in:315
-+#: ../clients/common/settings-docs.h.in:319
- msgid "Corresponds to the teamd runner.sys_prio."
- msgstr "对应于 teamd runner.sys_prio。"
-
--#: ../clients/common/settings-docs.h.in:316
-+#: ../clients/common/settings-docs.h.in:320
- msgid "Corresponds to the teamd runner.tx_balancer.name."
- msgstr "对应于 teamd runner.tx_balancer.name。"
-
--#: ../clients/common/settings-docs.h.in:317
-+#: ../clients/common/settings-docs.h.in:321
- msgid "Corresponds to the teamd runner.tx_balancer.interval."
- msgstr "对应于 teamd runner.tx_balancer.interval。"
-
--#: ../clients/common/settings-docs.h.in:318
-+#: ../clients/common/settings-docs.h.in:322
- msgid "Corresponds to the teamd runner.tx_hash."
- msgstr "对应于 teamd runner.tx_hash。"
-
--#: ../clients/common/settings-docs.h.in:319
-+#: ../clients/common/settings-docs.h.in:323
- msgid ""
- "The JSON configuration for the team port. The property should contain raw "
- "JSON configuration data suitable for teamd, because the value is passed "
-@@ -8743,19 +8682,19 @@ msgstr ""
- "该值直接传递给 teamd。如果未指定则使用默认的配置。格式详情请参阅 teamd.conf "
- "手册。"
-
--#: ../clients/common/settings-docs.h.in:320
-+#: ../clients/common/settings-docs.h.in:324
- msgid "Corresponds to the teamd ports.PORTIFNAME.lacp_key."
- msgstr "对应于 teamd ports.PORTIFNAME.lacp_key。"
-
--#: ../clients/common/settings-docs.h.in:321
-+#: ../clients/common/settings-docs.h.in:325
- msgid "Corresponds to the teamd ports.PORTIFNAME.lacp_prio."
- msgstr "对应于 teamd ports.PORTIFNAME.lacp_prio。"
-
--#: ../clients/common/settings-docs.h.in:323
-+#: ../clients/common/settings-docs.h.in:327
- msgid "Corresponds to the teamd ports.PORTIFNAME.prio."
- msgstr "对应于 teamd ports.PORTIFNAME.prio。"
-
--#: ../clients/common/settings-docs.h.in:324
-+#: ../clients/common/settings-docs.h.in:328
- msgid ""
- "Corresponds to the teamd ports.PORTIFNAME.queue_id. When set to -1 means the "
- "parameter is skipped from the json config."
-@@ -8763,17 +8702,17 @@ msgstr ""
- "对应于 teamd ports.PORTIFNAME.queue_id。设定为 -1 时表示参数从 json 配置忽"
- "略。"
-
--#: ../clients/common/settings-docs.h.in:325
-+#: ../clients/common/settings-docs.h.in:329
- msgid "Corresponds to the teamd ports.PORTIFNAME.sticky."
- msgstr "对应于 teamd ports.PORTIFNAME.sticky。"
-
--#: ../clients/common/settings-docs.h.in:326
-+#: ../clients/common/settings-docs.h.in:330
- 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:327
-+#: ../clients/common/settings-docs.h.in:331
- msgid ""
- "The operating mode of the virtual device. Allowed values are "
- "NM_SETTING_TUN_MODE_TUN (1) to create a layer 3 device and "
-@@ -8782,7 +8721,7 @@ msgstr ""
- "虚拟设备的操作模式。允许值有 NM_SETTING_TUN_MODE_TUN (1) 以创建第三层设备和 "
- "NM_SETTING_TUN_MODE_TAP (2) 以创建类以太网的第二层设备。"
-
--#: ../clients/common/settings-docs.h.in:328
-+#: ../clients/common/settings-docs.h.in:332
- msgid ""
- "If the property is set to TRUE, the interface will support multiple file "
- "descriptors (queues) to parallelize packet sending or receiving. Otherwise, "
-@@ -8791,25 +8730,25 @@ msgstr ""
- "如果属性设为 TRUE，接口将支持多个文件描述符（队列）以并行化数据包的发送和接"
- "收，接口将只支持单个队列。"
-
--#: ../clients/common/settings-docs.h.in:329
-+#: ../clients/common/settings-docs.h.in:333
- 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:330
-+#: ../clients/common/settings-docs.h.in:334
- 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:331
-+#: ../clients/common/settings-docs.h.in:335
- 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:332
-+#: ../clients/common/settings-docs.h.in:336
- 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 "
-@@ -8819,7 +8758,7 @@ msgstr ""
- "包含用户数据的键/值对字典。此数据被网络管理器（NetworkManager）忽略且可被用户"
- "随意使用。键只支持严格的 ASCII 格式，但是值可以为长度有限的任意 UTF8 字符串。"
-
--#: ../clients/common/settings-docs.h.in:333
-+#: ../clients/common/settings-docs.h.in:337
- 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"
-@@ -8828,7 +8767,7 @@ msgstr ""
- "用于传出的数据包，从 Linux SKB 优先级到 802.1p 优先级的映射列表。映射以 \"从:"
- "到\" 的格式给定，其中 \"从\" 和 \"到\" 都是无符号整数，如 \"7:3\"。"
-
--#: ../clients/common/settings-docs.h.in:334
-+#: ../clients/common/settings-docs.h.in:338
- 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 "
-@@ -8847,7 +8786,7 @@ msgstr ""
- "议）。此属性的默认值为 NM_VLAN_FLAG_REORDER_HEADERS，但它以前是 0。为了保持后"
- "向兼容性，D-Bus API 里的默认值继续为 0 而且 D-Bus 上缺少属性时仍视为 0。"
-
--#: ../clients/common/settings-docs.h.in:335
-+#: ../clients/common/settings-docs.h.in:339
- 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."
-@@ -8855,7 +8794,7 @@ msgstr ""
- "由此连接创建的接口应该分配的 VLAN 标识符。有效范围为从 0 到 4094，不包括保留"
- "的 ID 4095。"
-
--#: ../clients/common/settings-docs.h.in:336
-+#: ../clients/common/settings-docs.h.in:340
- 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"
-@@ -8864,7 +8803,7 @@ msgstr ""
- "用于传入的数据包，从 802.1p 优先级到 Linux SKB 优先级的映射列表。映射以 \"从:"
- "到\" 的格式给定，其中 \"从\" 和 \"到\" 都是无符号整数，如 \"7:3\"。"
-
--#: ../clients/common/settings-docs.h.in:337
-+#: ../clients/common/settings-docs.h.in:341
- 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 "
-@@ -8875,13 +8814,13 @@ msgstr ""
- "果此属性未指定，该连接必须包含具有 \"mac-address\" 属性的 \"802-3-ethernet\" "
- "设置。"
-
--#: ../clients/common/settings-docs.h.in:338
-+#: ../clients/common/settings-docs.h.in:342
- 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:339
-+#: ../clients/common/settings-docs.h.in:343
- 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 "
-@@ -8890,14 +8829,14 @@ msgstr ""
- "如果 VPN 服务支持持久连接，并且此属性为 TRUE，VPN 将尝试在链路更改和中断的整"
- "个期间都保持连接，直到手动断开连接。"
-
--#: ../clients/common/settings-docs.h.in:340
-+#: ../clients/common/settings-docs.h.in:344
- 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:341
-+#: ../clients/common/settings-docs.h.in:345
- 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."
-@@ -8905,7 +8844,7 @@ msgstr ""
- "此连接用于连接到它网络的 VPN 插件的 D-Bus 服务名。例如 org.freedesktop."
- "NetworkManager.vpnc 用于 vpnc 插件。"
-
--#: ../clients/common/settings-docs.h.in:342
-+#: ../clients/common/settings-docs.h.in:346
- 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 "
-@@ -8916,7 +8855,7 @@ msgstr ""
- "超时，即 60 秒（除非被配置文件中的 vpn.timeout 覆盖）。大于零的值表示以秒计算"
- "的超时时间。"
-
--#: ../clients/common/settings-docs.h.in:343
-+#: ../clients/common/settings-docs.h.in:347
- 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 "
-@@ -8929,55 +8868,55 @@ msgstr ""
- "VPN 需要每个用户提供个不同的名称，那么让此属性留空。如果此属性留空，网络管理"
- "器（NetworkManager）将自动提供 VPN 连接所需要用户的用户名。"
-
--#: ../clients/common/settings-docs.h.in:344
-+#: ../clients/common/settings-docs.h.in:348
- msgid "Specifies the lifetime in seconds of FDB entries learnt by the kernel."
- msgstr "指定内核已获知 FDB 条目的生存期，以秒计。"
-
--#: ../clients/common/settings-docs.h.in:345
-+#: ../clients/common/settings-docs.h.in:349
- msgid ""
- "Specifies the UDP destination port to communicate to the remote VXLAN tunnel "
- "endpoint."
- msgstr "指定连接到远程 VXLAN 隧道端点的 UDP 目标端口。"
-
--#: ../clients/common/settings-docs.h.in:346
-+#: ../clients/common/settings-docs.h.in:350
- msgid ""
- "Specifies the VXLAN Network Identifier (or VXLAN Segment Identifier) to use."
- msgstr "指定要使用的 VXLAN 网络标识符（或 VXLAN 分段标识符）。"
-
--#: ../clients/common/settings-docs.h.in:347
-+#: ../clients/common/settings-docs.h.in:351
- msgid "Specifies whether netlink LL ADDR miss notifications are generated."
- msgstr "指定是否生成网络链路 LL ADDR 未命中通知。"
-
--#: ../clients/common/settings-docs.h.in:348
-+#: ../clients/common/settings-docs.h.in:352
- msgid "Specifies whether netlink IP ADDR miss notifications are generated."
- msgstr "指定是否生成网络链路 IP ADDR 未命中通知。"
-
--#: ../clients/common/settings-docs.h.in:349
-+#: ../clients/common/settings-docs.h.in:353
- 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:350
-+#: ../clients/common/settings-docs.h.in:354
- 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:351
-+#: ../clients/common/settings-docs.h.in:355
- msgid "If given, specifies the source IP address to use in outgoing packets."
- msgstr "如果给定，指定要在传出数据包使用的来源 IP 地址。"
-
--#: ../clients/common/settings-docs.h.in:352
-+#: ../clients/common/settings-docs.h.in:356
- msgid ""
- "If given, specifies the parent interface name or parent connection UUID."
- msgstr "如果给定了，其指定上级接口名称或上级连接的 UUID。"
-
--#: ../clients/common/settings-docs.h.in:353
-+#: ../clients/common/settings-docs.h.in:357
- msgid "Specifies whether ARP proxy is turned on."
- msgstr "指定是否打开 ARP 代理。"
-
--#: ../clients/common/settings-docs.h.in:354
-+#: ../clients/common/settings-docs.h.in:358
- 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 "
-@@ -8986,31 +8925,57 @@ msgstr ""
- "指定当目标链路层地址在 VXLAN 设备转发数据库中未知时要在传出数据包中使用的单播"
- "目标 IP 地址，或者要加入的多播 IP 地址。"
-
--#: ../clients/common/settings-docs.h.in:355
-+#: ../clients/common/settings-docs.h.in:359
- msgid "Specifies whether route short circuit is turned on."
- msgstr "指定是否打开路由短路。"
-
--#: ../clients/common/settings-docs.h.in:356
-+#: ../clients/common/settings-docs.h.in:360
- msgid ""
- "Specifies the maximum UDP source port to communicate to the remote VXLAN "
- "tunnel endpoint."
- msgstr "指定连接到远程 VXLAN 隧道端点的最大 UDP 来源端口。"
-
--#: ../clients/common/settings-docs.h.in:357
-+#: ../clients/common/settings-docs.h.in:361
- msgid ""
- "Specifies the minimum UDP source port to communicate to the remote VXLAN "
- "tunnel endpoint."
- msgstr "指定连接到远程 VXLAN 隧道端点的最小 UDP 来源端口。"
-
--#: ../clients/common/settings-docs.h.in:358
-+#: ../clients/common/settings-docs.h.in:362
- msgid "Specifies the TOS value to use in outgoing packets."
- msgstr "指定要在传出数据包使用的 TOS 值。"
-
--#: ../clients/common/settings-docs.h.in:359
-+#: ../clients/common/settings-docs.h.in:363
- msgid "Specifies the time-to-live value to use in outgoing packets."
- msgstr "指定要在传出数据包使用的存活时间值。"
-
--#: ../clients/common/settings-docs.h.in:360
-+#: ../clients/common/settings-docs.h.in:364
-+msgid ""
-+"The P2P device that should be connected to. Currently this is the only way "
-+"to create or join a group."
-+msgstr ""
-+
-+#: ../clients/common/settings-docs.h.in:365
-+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 ""
-+
-+#: ../clients/common/settings-docs.h.in:366
-+#, fuzzy
-+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）会自"
-+"动从接入点功能确定启动 WPS 注册是否可行，因此改变默认设置几乎没有意义。可以通"
-+"过设置此属性值为 1 来禁用 WPS。"
-+
-+#: ../clients/common/settings-docs.h.in:367
- 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 "
-@@ -9019,19 +8984,59 @@ msgstr ""
- "如指定了，此连接将只应用到其 MAC 地址符合的 WiMAX 设备。此属性不会改变设备的 "
- "MAC 地址（又名 MAC 欺骗）。已弃用：1"
-
--#: ../clients/common/settings-docs.h.in:361
-+#: ../clients/common/settings-docs.h.in:368
- 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:362
-+#: ../clients/common/settings-docs.h.in:369
-+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."
-+msgstr ""
-+
-+#: ../clients/common/settings-docs.h.in:370
-+msgid ""
-+"The listen-port. If listen-port is not specified, the port will be chosen "
-+"randomly when the interface comes up."
-+msgstr ""
-+
-+#: ../clients/common/settings-docs.h.in:371
-+#, fuzzy
-+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 ""
-+"如果非零，只传输指定大小或更小的数据包，将较大的数据包分成多个以太网帧。"
-+
-+#: ../clients/common/settings-docs.h.in:372
-+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 ""
-+
-+#: ../clients/common/settings-docs.h.in:373
-+msgid "The 256 bit private-key in base64 encoding."
-+msgstr ""
-+
-+#: ../clients/common/settings-docs.h.in:374
-+#, fuzzy
-+msgid "Flags indicating how to handle the \"private-key\" property."
-+msgstr "指示如何处理 \"private-key-password\" 属性的标志。"
-+
-+#: ../clients/common/settings-docs.h.in:375
- msgid ""
- "IEEE 802.15.4 channel. A positive integer or -1, meaning \"do not set, use "
- "whatever the device is already set to\"."
- msgstr ""
-
--#: ../clients/common/settings-docs.h.in:363
-+#: ../clients/common/settings-docs.h.in:376
- msgid ""
- "If specified, this connection will only apply to the IEEE 802.15.4 (WPAN) "
- "MAC layer device whose permanent MAC address matches."
-@@ -9039,17 +9044,17 @@ msgstr ""
- "如果指定了，此连接将只应用到其永久 MAC 地址匹配的 IEEE 802.15.4 (WPAN) MAC 层"
- "设备。"
-
--#: ../clients/common/settings-docs.h.in:364
-+#: ../clients/common/settings-docs.h.in:377
- 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 ""
-
--#: ../clients/common/settings-docs.h.in:365
-+#: ../clients/common/settings-docs.h.in:378
- msgid "IEEE 802.15.4 Personal Area Network (PAN) identifier."
- msgstr "IEEE 802.15.4 个人区域网络（PAN）标识符。"
-
--#: ../clients/common/settings-docs.h.in:366
-+#: ../clients/common/settings-docs.h.in:379
- msgid "Short IEEE 802.15.4 address to be used within a restricted environment."
- msgstr "在受限环境中使用的短 IEEE 802.15.4 地址。"
-
-@@ -9094,25 +9099,25 @@ msgstr "等待网络管理完成激活启动网络连接。"
- msgid "Invalid option. Please use --help to see a list of valid options."
- msgstr "无效选项。请使用 --help 查看有效选项列表。"
-
--#: ../clients/tui/newt/nmt-newt-utils.c:177 ../clients/tui/nmt-editor.c:429
-+#: ../clients/tui/newt/nmt-newt-utils.c:176 ../clients/tui/nmt-editor.c:433
- #: ../clients/tui/nmt-password-dialog.c:174
- #: ../clients/tui/nmt-route-editor.c:122 ../clients/tui/nmtui-hostname.c:69
- #: ../clients/tui/nmtui.c:134
- msgid "OK"
- msgstr "确定"
-
--#: ../clients/tui/newt/nmt-newt-utils.c:325
--#: ../clients/tui/newt/nmt-newt-utils.c:357
-+#: ../clients/tui/newt/nmt-newt-utils.c:324
-+#: ../clients/tui/newt/nmt-newt-utils.c:356
- #, c-format
- msgid "Could not create temporary file: %s"
- msgstr "无法创建临时文件：%s"
-
--#: ../clients/tui/newt/nmt-newt-utils.c:363
-+#: ../clients/tui/newt/nmt-newt-utils.c:362
- #, c-format
- msgid "Editor failed: %s"
- msgstr "编辑器失败：%s"
-
--#: ../clients/tui/newt/nmt-newt-utils.c:369
-+#: ../clients/tui/newt/nmt-newt-utils.c:368
- #, c-format
- msgid "Could not re-read file: %s"
- msgstr "无法重新读取文件：%s"
-@@ -9137,7 +9142,7 @@ msgstr "Wi-Fi"
- msgid "Wi-Fi connection %d"
- msgstr "Wi-Fi 连接 %d"
-
--#: ../clients/tui/nm-editor-utils.c:161 ../libnm-core/nm-connection.c:2376
-+#: ../clients/tui/nm-editor-utils.c:161 ../libnm-core/nm-connection.c:2517
- #: ../libnm-glib/nm-device.c:1832 ../libnm/nm-device.c:1398
- msgid "InfiniBand"
- msgstr "InfiniBand"
-@@ -9166,10 +9171,10 @@ msgstr "DSL"
- msgid "DSL connection %d"
- msgstr "DSL 连接 %d"
-
--#: ../clients/tui/nm-editor-utils.c:188 ../libnm-core/nm-connection.c:2368
-+#: ../clients/tui/nm-editor-utils.c:188 ../libnm-core/nm-connection.c:2509
- #: ../libnm-glib/nm-device.c:1834 ../libnm-util/nm-connection.c:1623
- #: ../libnm/nm-device.c:1400
--#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4794
-+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4836
- msgid "Bond"
- msgstr "绑定"
-
-@@ -9178,10 +9183,10 @@ msgstr "绑定"
- msgid "Bond connection %d"
- msgstr "绑定连接 %d"
-
--#: ../clients/tui/nm-editor-utils.c:197 ../libnm-core/nm-connection.c:2372
-+#: ../clients/tui/nm-editor-utils.c:197 ../libnm-core/nm-connection.c:2513
- #: ../libnm-glib/nm-device.c:1838 ../libnm-util/nm-connection.c:1627
- #: ../libnm/nm-device.c:1404
--#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5130
-+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5216
- msgid "Bridge"
- msgstr "网桥"
-
-@@ -9190,10 +9195,10 @@ msgstr "网桥"
- msgid "Bridge connection %d"
- msgstr "网桥连接 %d"
-
--#: ../clients/tui/nm-editor-utils.c:206 ../libnm-core/nm-connection.c:2370
-+#: ../clients/tui/nm-editor-utils.c:206 ../libnm-core/nm-connection.c:2511
- #: ../libnm-glib/nm-device.c:1836 ../libnm-util/nm-connection.c:1625
- #: ../libnm/nm-device.c:1402
--#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4897
-+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4939
- msgid "Team"
- msgstr "组合"
-
-@@ -9203,7 +9208,7 @@ msgid "Team connection %d"
- msgstr "组合连接 %d"
-
- #: ../clients/tui/nm-editor-utils.c:215 ../clients/tui/nmt-page-vlan.c:82
--#: ../libnm-core/nm-connection.c:2374 ../libnm-glib/nm-device.c:1840
-+#: ../libnm-core/nm-connection.c:2515 ../libnm-glib/nm-device.c:1840
- #: ../libnm-util/nm-connection.c:1629 ../libnm/nm-device.c:1406
- msgid "VLAN"
- msgstr "VLAN"
-@@ -9254,52 +9259,52 @@ msgstr "隐藏"
- msgid "Show"
- msgstr "显示"
-
--#: ../clients/tui/nmt-editor.c:98
-+#: ../clients/tui/nmt-editor.c:100
- #, c-format
- msgid "Could not create editor for connection '%s' of type '%s'."
- msgstr "无法为类型 \"%s\" 的连接 \"%s\" 创建编辑器。"
-
--#: ../clients/tui/nmt-editor.c:102
-+#: ../clients/tui/nmt-editor.c:104
- #, c-format
- msgid "Could not create editor for invalid connection '%s'."
- msgstr "无法为无效的连接 \"%s\" 创建编辑器。"
-
--#: ../clients/tui/nmt-editor.c:112
-+#: ../clients/tui/nmt-editor.c:114
- msgid "Edit Connection"
- msgstr "编辑连接"
-
--#: ../clients/tui/nmt-editor.c:173
-+#: ../clients/tui/nmt-editor.c:175
- #, c-format
- msgid "Unable to save connection: %s"
- msgstr "无法保存连接：%s"
-
--#: ../clients/tui/nmt-editor.c:187
-+#: ../clients/tui/nmt-editor.c:189
- #, c-format
- msgid "Unable to add new connection: %s"
- msgstr "无法添加新连接：%s"
-
--#: ../clients/tui/nmt-editor.c:332
-+#: ../clients/tui/nmt-editor.c:336
- msgid "Profile name"
- msgstr "配置集名称"
-
--#: ../clients/tui/nmt-editor.c:343
-+#: ../clients/tui/nmt-editor.c:347
- msgid "Ethernet device"
- msgstr "以太网设备"
-
--#: ../clients/tui/nmt-editor.c:345
-+#: ../clients/tui/nmt-editor.c:349
- msgid "Device"
- msgstr "设备"
-
- #. And finally the bottom widgets
--#: ../clients/tui/nmt-editor.c:405
-+#: ../clients/tui/nmt-editor.c:409
- msgid "Automatically connect"
- msgstr "自动连接"
-
--#: ../clients/tui/nmt-editor.c:411
-+#: ../clients/tui/nmt-editor.c:415
- msgid "Available to all users"
- msgstr "对所有用户有效"
-
--#: ../clients/tui/nmt-editor.c:426 ../clients/tui/nmt-password-dialog.c:171
-+#: ../clients/tui/nmt-editor.c:430 ../clients/tui/nmt-password-dialog.c:171
- #: ../clients/tui/nmt-route-editor.c:115 ../clients/tui/nmtui-edit.c:220
- #: ../clients/tui/nmtui-edit.c:528 ../clients/tui/nmtui-hostname.c:67
- msgid "Cancel"
-@@ -10007,115 +10012,115 @@ msgstr "无法联系网络管理器：%s\n"
- msgid "NetworkManager is not running."
- msgstr "NetworkManaer 未运行。"
-
--#: ../libnm-core/nm-crypto.c:214
-+#: ../libnm-core/nm-crypto.c:213
- #, fuzzy, c-format
- msgid "PEM key file had no start tag"
- msgstr "PEM 密钥文件没有结束标记 \"%s\"。"
-
--#: ../libnm-core/nm-crypto.c:222 ../libnm-util/crypto.c:130
-+#: ../libnm-core/nm-crypto.c:221 ../libnm-util/crypto.c:130
- #, c-format
- msgid "PEM key file had no end tag '%s'."
- msgstr "PEM 密钥文件没有结束标记 \"%s\"。"
-
--#: ../libnm-core/nm-crypto.c:249 ../libnm-util/crypto.c:160
-+#: ../libnm-core/nm-crypto.c:248 ../libnm-util/crypto.c:160
- #, c-format
- msgid "Malformed PEM file: Proc-Type was not first tag."
- msgstr "错误的 PEM 文件格式：Proc-Type 不是第一个标记。"
-
--#: ../libnm-core/nm-crypto.c:257 ../libnm-util/crypto.c:168
-+#: ../libnm-core/nm-crypto.c:256 ../libnm-util/crypto.c:168
- #, c-format
- msgid "Malformed PEM file: unknown Proc-Type tag '%s'."
- msgstr "错误的 PEM 文件格式：未知的 Proc-Type 标记 \"%s\"。"
-
--#: ../libnm-core/nm-crypto.c:269 ../libnm-util/crypto.c:178
-+#: ../libnm-core/nm-crypto.c:268 ../libnm-util/crypto.c:178
- #, c-format
- msgid "Malformed PEM file: DEK-Info was not the second tag."
- msgstr "错误的 PEM 文件格式：DEK-Info 不是第二个标记。"
-
--#: ../libnm-core/nm-crypto.c:280 ../libnm-util/crypto.c:189
-+#: ../libnm-core/nm-crypto.c:279 ../libnm-util/crypto.c:189
- #, c-format
- msgid "Malformed PEM file: no IV found in DEK-Info tag."
- msgstr "错误的 PEM 文件格式：没有在 DEK-Info 标记找到初始向量。"
-
--#: ../libnm-core/nm-crypto.c:288 ../libnm-util/crypto.c:196
-+#: ../libnm-core/nm-crypto.c:287 ../libnm-util/crypto.c:196
- #, c-format
- msgid "Malformed PEM file: invalid format of IV in DEK-Info tag."
- msgstr "错误的 PEM 文件格式：DEK-Info 标签中的初始向量格式无效。"
-
--#: ../libnm-core/nm-crypto.c:299 ../libnm-util/crypto.c:211
-+#: ../libnm-core/nm-crypto.c:298 ../libnm-util/crypto.c:211
- #, c-format
- msgid "Malformed PEM file: unknown private key cipher '%s'."
- msgstr "错误的 PEM 文件格式：未知的私钥密码 \"%s\"。"
-
--#: ../libnm-core/nm-crypto.c:320 ../libnm-util/crypto.c:230
-+#: ../libnm-core/nm-crypto.c:319 ../libnm-util/crypto.c:230
- #, c-format
- msgid "Could not decode private key."
- msgstr "无法解码私钥。"
-
--#: ../libnm-core/nm-crypto.c:361 ../libnm-util/crypto.c:282
-+#: ../libnm-core/nm-crypto.c:360 ../libnm-util/crypto.c:282
- msgid "Failed to find expected PKCS#8 start tag."
- msgstr "无法找到预期的 PKCS#8 起始标记。"
-
--#: ../libnm-core/nm-crypto.c:369 ../libnm-util/crypto.c:290
-+#: ../libnm-core/nm-crypto.c:368 ../libnm-util/crypto.c:290
- #, c-format
- msgid "Failed to find expected PKCS#8 end tag '%s'."
- msgstr "无法找到预期的 PKCS#8 结束标记\"%s\"。"
-
--#: ../libnm-core/nm-crypto.c:381 ../libnm-util/crypto.c:309
-+#: ../libnm-core/nm-crypto.c:380 ../libnm-util/crypto.c:309
- msgid "Failed to decode PKCS#8 private key."
- msgstr "无法解码 PKCS#8 私钥。"
-
--#: ../libnm-core/nm-crypto.c:440 ../libnm-util/crypto.c:351
-+#: ../libnm-core/nm-crypto.c:439 ../libnm-util/crypto.c:351
- #, c-format
- msgid "IV must be an even number of bytes in length."
- msgstr "初始向量长度必须是偶数字节。"
-
--#: ../libnm-core/nm-crypto.c:456 ../libnm-util/crypto.c:365
-+#: ../libnm-core/nm-crypto.c:455 ../libnm-util/crypto.c:365
- #, c-format
- msgid "IV contains non-hexadecimal digits."
- msgstr "初始向量中包含非十六进制数字。"
-
--#: ../libnm-core/nm-crypto.c:532
-+#: ../libnm-core/nm-crypto.c:531
- #, fuzzy, c-format
- msgid "IV must contain at least 8 characters"
- msgstr "密钥包含无效的字符"
-
--#: ../libnm-core/nm-crypto.c:580 ../libnm-util/crypto.c:515
-+#: ../libnm-core/nm-crypto.c:579 ../libnm-util/crypto.c:515
- #, c-format
- msgid "Unable to determine private key type."
- msgstr "无法确定私钥类型。"
-
--#: ../libnm-core/nm-crypto.c:592
-+#: ../libnm-core/nm-crypto.c:591
- #, c-format
- msgid "Password provided, but key was not encrypted."
- msgstr "已提供密码，但密钥没有加密。"
-
--#: ../libnm-core/nm-crypto.c:653 ../libnm-util/crypto.c:570
-+#: ../libnm-core/nm-crypto.c:652 ../libnm-util/crypto.c:570
- #, c-format
- msgid "PEM certificate had no start tag '%s'."
- msgstr "PEM 证书没有起始标记 \"%s\"。"
-
--#: ../libnm-core/nm-crypto.c:662 ../libnm-util/crypto.c:579
-+#: ../libnm-core/nm-crypto.c:661 ../libnm-util/crypto.c:579
- #, c-format
- msgid "PEM certificate had no end tag '%s'."
- msgstr "PEM 证书没有结束标记 \"%s\"。"
-
--#: ../libnm-core/nm-crypto.c:674 ../libnm-util/crypto.c:597
-+#: ../libnm-core/nm-crypto.c:673 ../libnm-util/crypto.c:597
- #, c-format
- msgid "Failed to decode certificate."
- msgstr "无法解码证书。"
-
--#: ../libnm-core/nm-crypto.c:703 ../libnm-core/nm-crypto.c:756
-+#: ../libnm-core/nm-crypto.c:702 ../libnm-core/nm-crypto.c:755
- #, fuzzy, c-format
- msgid "Certificate file is empty"
- msgstr "密钥为空"
-
--#: ../libnm-core/nm-crypto.c:736
-+#: ../libnm-core/nm-crypto.c:735
- #, fuzzy, c-format
- msgid "Failed to recognize certificate"
- msgstr "无法解码证书。"
-
--#: ../libnm-core/nm-crypto.c:846
-+#: ../libnm-core/nm-crypto.c:845
- #, fuzzy, c-format
- msgid "not a valid private key"
- msgstr "无效的私有密钥"
-@@ -10310,60 +10315,60 @@ msgstr "无法校验 PKCS#12 文件：%d"
- msgid "Could not generate random data."
- msgstr "无法生成随机数据。"
-
--#: ../libnm-core/nm-connection.c:301
-+#: ../libnm-core/nm-connection.c:322
- msgid "wrong type; should be a list of strings."
- msgstr "错误的类型；应为一个字符串列表。"
-
--#: ../libnm-core/nm-connection.c:371
-+#: ../libnm-core/nm-connection.c:392
- msgid "unknown setting name"
- msgstr "未知的设置名称"
-
--#: ../libnm-core/nm-connection.c:383
-+#: ../libnm-core/nm-connection.c:404
- msgid "duplicate setting name"
- msgstr "重复的设置名称"
-
--#: ../libnm-core/nm-connection.c:1366
-+#: ../libnm-core/nm-connection.c:1414
- msgid "setting not found"
- msgstr "未找到设置"
-
--#: ../libnm-core/nm-connection.c:1432 ../libnm-core/nm-connection.c:1457
--#: ../libnm-core/nm-connection.c:1482
-+#: ../libnm-core/nm-connection.c:1480 ../libnm-core/nm-connection.c:1505
-+#: ../libnm-core/nm-connection.c:1530
- msgid "setting is required for non-slave connections"
- msgstr "对于非从连接，设置是必需的"
-
--#: ../libnm-core/nm-connection.c:1445 ../libnm-core/nm-connection.c:1470
--#: ../libnm-core/nm-connection.c:1495
-+#: ../libnm-core/nm-connection.c:1493 ../libnm-core/nm-connection.c:1518
-+#: ../libnm-core/nm-connection.c:1543
- msgid "setting not allowed in slave connection"
- msgstr "从连接中不允许设置"
-
--#: ../libnm-core/nm-connection.c:1585
-+#: ../libnm-core/nm-connection.c:1633
- msgid "Unexpected failure to verify the connection"
- msgstr "检验连接意外地失败"
-
--#: ../libnm-core/nm-connection.c:1630
-+#: ../libnm-core/nm-connection.c:1680
- msgid "Unexpected failure to normalize the connection"
- msgstr "正常化连接意外地失败"
-
--#: ../libnm-core/nm-connection.c:2234 ../libnm-core/nm-setting-8021x.c:2571
--#: ../libnm-core/nm-setting-8021x.c:2588 ../libnm-core/nm-setting-8021x.c:2619
--#: ../libnm-core/nm-setting-8021x.c:2636 ../libnm-core/nm-setting-8021x.c:2678
--#: ../libnm-core/nm-setting-8021x.c:2690 ../libnm-core/nm-setting-8021x.c:2708
--#: ../libnm-core/nm-setting-8021x.c:2720 ../libnm-core/nm-setting-8021x.c:2744
--#: ../libnm-core/nm-setting-8021x.c:2826 ../libnm-core/nm-setting-adsl.c:187
--#: ../libnm-core/nm-setting-bluetooth.c:136
--#: ../libnm-core/nm-setting-bluetooth.c:194
--#: ../libnm-core/nm-setting-bluetooth.c:208 ../libnm-core/nm-setting-cdma.c:157
--#: ../libnm-core/nm-setting-connection.c:947
--#: ../libnm-core/nm-setting-connection.c:990
--#: ../libnm-core/nm-setting-connection.c:1156
--#: ../libnm-core/nm-setting-ip-config.c:2492
--#: ../libnm-core/nm-setting-ip-tunnel.c:373
--#: ../libnm-core/nm-setting-olpc-mesh.c:118
--#: ../libnm-core/nm-setting-ovs-patch.c:92 ../libnm-core/nm-setting-pppoe.c:159
--#: ../libnm-core/nm-setting-vpn.c:550 ../libnm-core/nm-setting-vxlan.c:358
--#: ../libnm-core/nm-setting-wimax.c:124
--#: ../libnm-core/nm-setting-wireless-security.c:918
--#: ../libnm-core/nm-setting-wireless.c:750 ../libnm-util/nm-setting.c:1355
-+#: ../libnm-core/nm-connection.c:2374 ../libnm-core/nm-setting-8021x.c:2569
-+#: ../libnm-core/nm-setting-8021x.c:2586 ../libnm-core/nm-setting-8021x.c:2617
-+#: ../libnm-core/nm-setting-8021x.c:2634 ../libnm-core/nm-setting-8021x.c:2676
-+#: ../libnm-core/nm-setting-8021x.c:2688 ../libnm-core/nm-setting-8021x.c:2706
-+#: ../libnm-core/nm-setting-8021x.c:2718 ../libnm-core/nm-setting-8021x.c:2742
-+#: ../libnm-core/nm-setting-8021x.c:2824 ../libnm-core/nm-setting-adsl.c:174
-+#: ../libnm-core/nm-setting-bluetooth.c:125
-+#: ../libnm-core/nm-setting-bluetooth.c:183
-+#: ../libnm-core/nm-setting-bluetooth.c:197 ../libnm-core/nm-setting-cdma.c:144
-+#: ../libnm-core/nm-setting-connection.c:931
-+#: ../libnm-core/nm-setting-connection.c:974
-+#: ../libnm-core/nm-setting-connection.c:1140
-+#: ../libnm-core/nm-setting-ip-config.c:4816
-+#: ../libnm-core/nm-setting-ip-tunnel.c:374
-+#: ../libnm-core/nm-setting-olpc-mesh.c:99
-+#: ../libnm-core/nm-setting-ovs-patch.c:92 ../libnm-core/nm-setting-pppoe.c:146
-+#: ../libnm-core/nm-setting-vpn.c:531 ../libnm-core/nm-setting-vxlan.c:339
-+#: ../libnm-core/nm-setting-wifi-p2p.c:136 ../libnm-core/nm-setting-wimax.c:110
-+#: ../libnm-core/nm-setting-wireless-security.c:914
-+#: ../libnm-core/nm-setting-wireless.c:737 ../libnm-util/nm-setting.c:1355
- #: ../libnm-util/nm-setting.c:1374 ../libnm-util/nm-setting.c:1392
- #: ../libnm-util/nm-setting-8021x.c:2324 ../libnm-util/nm-setting-8021x.c:2341
- #: ../libnm-util/nm-setting-8021x.c:2382 ../libnm-util/nm-setting-8021x.c:2399
-@@ -10379,18 +10384,18 @@ msgstr "正常化连接意外地失败"
- #: ../libnm-util/nm-setting-ip6-config.c:831
- #: ../libnm-util/nm-setting-ip6-config.c:897
- #: ../libnm-util/nm-setting-olpc-mesh.c:123
--#: ../libnm-util/nm-setting-pppoe.c:162 ../libnm-util/nm-setting-vpn.c:422
-+#: ../libnm-util/nm-setting-pppoe.c:162 ../libnm-util/nm-setting-vpn.c:421
- #: ../libnm-util/nm-setting-wimax.c:149
- #: ../libnm-util/nm-setting-wireless-security.c:890
- #: ../libnm-util/nm-setting-wireless.c:768
- msgid "property is missing"
- msgstr "缺少属性"
-
--#: ../libnm-core/nm-connection.c:2379
-+#: ../libnm-core/nm-connection.c:2520
- msgid "IP Tunnel"
- msgstr "IP 隧道"
-
--#: ../libnm-core/nm-dbus-utils.c:202
-+#: ../libnm-core/nm-dbus-utils.c:200
- #, c-format
- msgid "Method returned type '%s', but expected '%s'"
- msgstr "方法返回类型 \"%s\"，但期望的是 \"%s\""
-@@ -10400,253 +10405,292 @@ msgstr "方法返回类型 \"%s\"，但期望的是 \"%s\""
- msgid "value is not an integer in range [%lld, %lld]"
- msgstr "\"%s\" 超出范围 [%lli, %lli]"
-
--#: ../libnm-core/nm-keyfile.c:210
-+#: ../libnm-core/nm-keyfile.c:211
- msgid "ignoring missing number"
- msgstr "忽略缺失的数字"
-
--#: ../libnm-core/nm-keyfile.c:218
-+#: ../libnm-core/nm-keyfile.c:219
- #, c-format
- msgid "ignoring invalid number '%s'"
- msgstr "忽略无效的数字 \"%s\""
-
--#: ../libnm-core/nm-keyfile.c:239
-+#: ../libnm-core/nm-keyfile.c:240
- #, c-format
- msgid "ignoring invalid %s address: %s"
- msgstr "忽略无效的 %s 地址：%s"
-
--#: ../libnm-core/nm-keyfile.c:281
-+#: ../libnm-core/nm-keyfile.c:282
- #, c-format
- msgid "ignoring invalid gateway '%s' for %s route"
- msgstr "忽略 %s%s 路由的无效网关 \"\""
-
--#: ../libnm-core/nm-keyfile.c:302
-+#: ../libnm-core/nm-keyfile.c:303
- #, c-format
- msgid "ignoring invalid %s route: %s"
- msgstr "忽略无效的 %s 路由：%s"
-
--#: ../libnm-core/nm-keyfile.c:427
-+#: ../libnm-core/nm-keyfile.c:428
- #, 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:437
-+#: ../libnm-core/nm-keyfile.c:438
- #, 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:446
-+#: ../libnm-core/nm-keyfile.c:447
- #, 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:457
-+#: ../libnm-core/nm-keyfile.c:458
- #, c-format
- msgid "garbage at the end of value %s: '%s'"
- msgstr "值 %s 的末尾有无用信息：\"%s\""
-
--#: ../libnm-core/nm-keyfile.c:463
-+#: ../libnm-core/nm-keyfile.c:464
- #, c-format
- msgid "deprecated semicolon at the end of value %s: '%s'"
- msgstr "值 %s 的末尾有舍弃的分号：\"%s\""
-
--#: ../libnm-core/nm-keyfile.c:478
-+#: ../libnm-core/nm-keyfile.c:479
- #, c-format
- msgid "invalid prefix length for %s '%s', defaulting to %d"
- msgstr "%s 的前缀长度 \"%s\" 无效，默认为 %d"
-
--#: ../libnm-core/nm-keyfile.c:485
-+#: ../libnm-core/nm-keyfile.c:486
- #, c-format
- msgid "missing prefix length for %s '%s', defaulting to %d"
- msgstr "缺少 %s 的前缀长度 \"%s\"，默认为 %d"
-
--#: ../libnm-core/nm-keyfile.c:748
-+#: ../libnm-core/nm-keyfile.c:814 ../libnm-core/nm-setting-user.c:374
-+#, c-format
-+msgid "invalid value for \"%s\": %s"
-+msgstr "对 \"%s\" 无效的值：%s"
-+
-+#: ../libnm-core/nm-keyfile.c:852
- #, c-format
- msgid "ignoring invalid DNS server IPv%c address '%s'"
- msgstr "忽略无效的 DNS 服务器 IPv%c 地址 \"%s\""
-
--#: ../libnm-core/nm-keyfile.c:844 ../libnm-core/nm-keyfile.c:2734
-+#: ../libnm-core/nm-keyfile.c:948 ../libnm-core/nm-keyfile.c:2997
- #, c-format
- msgid "ignoring invalid byte element '%d' (not between 0 and 255 inclusive)"
- msgstr "忽略无效的字节元素 \"%d\"（不在 0 和 255 之间）"
-
--#: ../libnm-core/nm-keyfile.c:855
-+#: ../libnm-core/nm-keyfile.c:959
- msgid "ignoring invalid MAC address"
- msgstr "忽略无效的 MAC 地址"
-
--#: ../libnm-core/nm-keyfile.c:1105
-+#: ../libnm-core/nm-keyfile.c:1209
- msgid "ignoring invalid SSID"
- msgstr "忽略无效的 SSID"
-
--#: ../libnm-core/nm-keyfile.c:1121
-+#: ../libnm-core/nm-keyfile.c:1225
- msgid "ignoring invalid raw password"
- msgstr "忽略无效的原始密码"
-
--#: ../libnm-core/nm-keyfile.c:1258
-+#: ../libnm-core/nm-keyfile.c:1362
- msgid "invalid key/cert value"
- msgstr "无效的密钥/证书值"
-
--#: ../libnm-core/nm-keyfile.c:1269
-+#: ../libnm-core/nm-keyfile.c:1373
- #, c-format
- msgid "invalid key/cert value path \"%s\""
- msgstr "无效的密钥/证书值路径 \"%s\""
-
--#: ../libnm-core/nm-keyfile.c:1285 ../libnm-core/nm-keyfile.c:1368
-+#: ../libnm-core/nm-keyfile.c:1389 ../libnm-core/nm-keyfile.c:1472
- #, c-format
- msgid "certificate or key file '%s' does not exist"
- msgstr "证书或密钥文件 \"%s\" 不存在"
-
--#: ../libnm-core/nm-keyfile.c:1294
-+#: ../libnm-core/nm-keyfile.c:1398
- #, c-format
- msgid "invalid PKCS#11 URI \"%s\""
- msgstr "无效的 PKCS#11 URI \"%s\""
-
--#: ../libnm-core/nm-keyfile.c:1338
-+#: ../libnm-core/nm-keyfile.c:1442
- msgid "invalid key/cert value data:;base64, is not base64"
- msgstr "无效的密钥/证书值 data:;base64，不是 base64"
-
--#: ../libnm-core/nm-keyfile.c:1347
-+#: ../libnm-core/nm-keyfile.c:1451
- msgid "invalid key/cert value data:;base64,file://"
- msgstr "无效的密钥/证书值 data:;base64,file://"
-
--#: ../libnm-core/nm-keyfile.c:1380
-+#: ../libnm-core/nm-keyfile.c:1484
- msgid "invalid key/cert value is not a valid blob"
- msgstr "无效的密钥/证书值，不是有效的比特块（blob）"
-
--#: ../libnm-core/nm-keyfile.c:1482
-+#: ../libnm-core/nm-keyfile.c:1586
- #, c-format
- msgid "invalid parity value '%s'"
- msgstr "无效的奇偶校验值 \"%s\""
-
--#: ../libnm-core/nm-keyfile.c:1499 ../libnm-core/nm-keyfile.c:2789
-+#: ../libnm-core/nm-keyfile.c:1603 ../libnm-core/nm-keyfile.c:3052
- #, fuzzy, c-format
- msgid "invalid setting: %s"
- msgstr "无效的设置名称 \"%s\""
-
--#: ../libnm-core/nm-keyfile.c:1514
-+#: ../libnm-core/nm-keyfile.c:1618
- #, c-format
- msgid "ignoring invalid team configuration: %s"
- msgstr "忽略无效的组合（team）配置：%s"
-
--#: ../libnm-core/nm-keyfile.c:1557
-+#: ../libnm-core/nm-keyfile.c:1698
- #, c-format
- msgid "invalid qdisc: %s"
- msgstr "无效的排队规则（qdisc）：%s"
-
--#: ../libnm-core/nm-keyfile.c:1605
-+#: ../libnm-core/nm-keyfile.c:1744
- #, c-format
- msgid "invalid tfilter: %s"
- msgstr "无效的流量过滤器（tfilter）：%s"
-
--#: ../libnm-core/nm-keyfile.c:2634
-+#: ../libnm-core/nm-keyfile.c:2896
- #, c-format
- msgid "error loading setting value: %s"
- msgstr "加载设置值时出错：%s"
-
--#: ../libnm-core/nm-keyfile.c:2661 ../libnm-core/nm-keyfile.c:2672
--#: ../libnm-core/nm-keyfile.c:2690 ../libnm-core/nm-keyfile.c:2701
--#: ../libnm-core/nm-keyfile.c:2712 ../libnm-core/nm-keyfile.c:2764
--#: ../libnm-core/nm-keyfile.c:2775
-+#: ../libnm-core/nm-keyfile.c:2924 ../libnm-core/nm-keyfile.c:2935
-+#: ../libnm-core/nm-keyfile.c:2953 ../libnm-core/nm-keyfile.c:2964
-+#: ../libnm-core/nm-keyfile.c:2975 ../libnm-core/nm-keyfile.c:3027
-+#: ../libnm-core/nm-keyfile.c:3038
- msgid "value cannot be interpreted as integer"
- msgstr ""
-
--#: ../libnm-core/nm-keyfile.c:2810
-+#: ../libnm-core/nm-keyfile.c:3073
- #, c-format
- msgid "invalid setting name '%s'"
- msgstr "无效的设置名称 \"%s\""
-
--#: ../libnm-core/nm-keyfile.c:2855
-+#: ../libnm-core/nm-keyfile.c:3118
- #, c-format
- msgid "invalid key '%s.%s'"
- msgstr "无效的密钥 \"%s.%s\""
-
--#: ../libnm-core/nm-keyfile.c:2870
-+#: ../libnm-core/nm-keyfile.c:3133
- #, c-format
- msgid "key '%s.%s' is not boolean"
- msgstr "密钥 \"%s.%s\" 不是布尔值"
-
--#: ../libnm-core/nm-setting-6lowpan.c:104
-+#: ../libnm-core/nm-keyfile.c:3190
-+#, fuzzy, c-format
-+msgid "invalid peer public key in section '%s'"
-+msgstr "无效选项 \"%s\""
-+
-+#: ../libnm-core/nm-keyfile.c:3202
-+#, c-format
-+msgid "key '%s.%s' is not a valid 256 bit key in base64 encoding"
-+msgstr ""
-+
-+#: ../libnm-core/nm-keyfile.c:3215
-+#, fuzzy, c-format
-+msgid "key '%s.%s' is not a valid secret flag"
-+msgstr "\"%s\" 不是有效的 DCB 标记"
-+
-+#: ../libnm-core/nm-keyfile.c:3227
-+#, fuzzy, c-format
-+msgid "key '%s.%s' is not a integer in range 0 to 2^32"
-+msgstr "\"%s\" 超出范围 [%lli, %lli]"
-+
-+#: ../libnm-core/nm-keyfile.c:3239
-+#, fuzzy, c-format
-+msgid "key '%s.%s' is not a valid endpoint"
-+msgstr "\"%s\" 不是有效的种类"
-+
-+#: ../libnm-core/nm-keyfile.c:3261
-+#, c-format
-+msgid "key '%s.%s' has invalid allowed-ips"
-+msgstr ""
-+
-+#: ../libnm-core/nm-keyfile.c:3273
-+#, fuzzy, c-format
-+msgid "peer '%s' is invalid: %s"
-+msgstr "\"%s\" 无效"
-+
-+#: ../libnm-core/nm-setting-6lowpan.c:93
- #, c-format
- msgid "property is not specified"
- msgstr "未指定属性"
-
--#: ../libnm-core/nm-setting-6lowpan.c:126 ../libnm-core/nm-setting-macsec.c:314
--#: ../libnm-core/nm-setting-vlan.c:632 ../libnm-util/nm-setting-vlan.c:556
-+#: ../libnm-core/nm-setting-6lowpan.c:115 ../libnm-core/nm-setting-macsec.c:302
-+#: ../libnm-core/nm-setting-vlan.c:615 ../libnm-util/nm-setting-vlan.c:556
- #, c-format
- msgid "'%s' value doesn't match '%s=%s'"
- msgstr "\"%s\" 值与 \"%s=%s\" 不匹配"
-
--#: ../libnm-core/nm-setting-6lowpan.c:137
--#: ../libnm-core/nm-setting-ip-tunnel.c:351
--#: ../libnm-core/nm-setting-macsec.c:325 ../libnm-core/nm-setting-macvlan.c:161
--#: ../libnm-core/nm-setting-vlan.c:643 ../libnm-core/nm-setting-vxlan.c:401
-+#: ../libnm-core/nm-setting-6lowpan.c:126
-+#: ../libnm-core/nm-setting-ip-tunnel.c:352
-+#: ../libnm-core/nm-setting-macsec.c:313 ../libnm-core/nm-setting-macvlan.c:143
-+#: ../libnm-core/nm-setting-vlan.c:626 ../libnm-core/nm-setting-vxlan.c:382
- #: ../libnm-util/nm-setting-vlan.c:567
- #, c-format
- msgid "'%s' is neither an UUID nor an interface name"
- msgstr "\"%s\" 不是 UUID 或接口名称"
-
--#: ../libnm-core/nm-setting-8021x.c:229
-+#: ../libnm-core/nm-setting-8021x.c:227
- msgid "binary data missing"
- msgstr "二进制数据缺失"
-
--#: ../libnm-core/nm-setting-8021x.c:257
-+#: ../libnm-core/nm-setting-8021x.c:255
- msgid "URI not NUL terminated"
- msgstr "URI 非 NUL 终止符"
-
--#: ../libnm-core/nm-setting-8021x.c:266
-+#: ../libnm-core/nm-setting-8021x.c:264
- msgid "URI is empty"
- msgstr "URI 为空"
-
--#: ../libnm-core/nm-setting-8021x.c:274
-+#: ../libnm-core/nm-setting-8021x.c:272
- msgid "URI is not valid UTF-8"
- msgstr "URI 不是有效的 UTF-8"
-
--#: ../libnm-core/nm-setting-8021x.c:292
-+#: ../libnm-core/nm-setting-8021x.c:290
- msgid "data missing"
- msgstr "数据缺失"
-
--#: ../libnm-core/nm-setting-8021x.c:315 ../libnm-core/nm-setting-8021x.c:682
-+#: ../libnm-core/nm-setting-8021x.c:313 ../libnm-core/nm-setting-8021x.c:680
- #, c-format
- msgid "certificate is invalid: %s"
- msgstr "证书是无效的：%s"
-
--#: ../libnm-core/nm-setting-8021x.c:323
-+#: ../libnm-core/nm-setting-8021x.c:321
- #, fuzzy, c-format
- msgid "certificate detected as invalid scheme"
- msgstr "证书是无效的：%s"
-
--#: ../libnm-core/nm-setting-8021x.c:537 ../libnm-util/nm-setting-8021x.c:639
-+#: ../libnm-core/nm-setting-8021x.c:535 ../libnm-util/nm-setting-8021x.c:639
- msgid "CA certificate must be in X.509 format"
- msgstr "CA 证书必须是 X.509 格式"
-
--#: ../libnm-core/nm-setting-8021x.c:553 ../libnm-util/nm-setting-8021x.c:957
-+#: ../libnm-core/nm-setting-8021x.c:551 ../libnm-util/nm-setting-8021x.c:957
- #: ../libnm-util/nm-setting-8021x.c:1220 ../libnm-util/nm-setting-8021x.c:1542
- msgid "invalid certificate format"
- msgstr "无效的证书格式"
-
--#: ../libnm-core/nm-setting-8021x.c:692
-+#: ../libnm-core/nm-setting-8021x.c:690
- #, 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:2578 ../libnm-core/nm-setting-8021x.c:2595
--#: ../libnm-core/nm-setting-8021x.c:2626 ../libnm-core/nm-setting-8021x.c:2643
--#: ../libnm-core/nm-setting-8021x.c:2684 ../libnm-core/nm-setting-8021x.c:2696
--#: ../libnm-core/nm-setting-8021x.c:2714 ../libnm-core/nm-setting-8021x.c:2726
--#: ../libnm-core/nm-setting-8021x.c:2751 ../libnm-core/nm-setting-adsl.c:194
--#: ../libnm-core/nm-setting-cdma.c:164 ../libnm-core/nm-setting-cdma.c:173
--#: ../libnm-core/nm-setting-connection.c:954
--#: ../libnm-core/nm-setting-connection.c:1002
--#: ../libnm-core/nm-setting-gsm.c:299 ../libnm-core/nm-setting-gsm.c:356
--#: ../libnm-core/nm-setting-gsm.c:393 ../libnm-core/nm-setting-gsm.c:402
--#: ../libnm-core/nm-setting-ip-config.c:2499
--#: ../libnm-core/nm-setting-ip4-config.c:196
--#: ../libnm-core/nm-setting-ip4-config.c:203
--#: ../libnm-core/nm-setting-pppoe.c:166 ../libnm-core/nm-setting-pppoe.c:175
--#: ../libnm-core/nm-setting-vpn.c:559 ../libnm-core/nm-setting-vpn.c:569
--#: ../libnm-core/nm-setting-wimax.c:133
--#: ../libnm-core/nm-setting-wireless-security.c:948
--#: ../libnm-core/nm-setting-wireless-security.c:972
--#: ../libnm-core/nm-setting.c:1237 ../libnm-util/nm-setting-8021x.c:2331
-+#: ../libnm-core/nm-setting-8021x.c:2576 ../libnm-core/nm-setting-8021x.c:2593
-+#: ../libnm-core/nm-setting-8021x.c:2624 ../libnm-core/nm-setting-8021x.c:2641
-+#: ../libnm-core/nm-setting-8021x.c:2682 ../libnm-core/nm-setting-8021x.c:2694
-+#: ../libnm-core/nm-setting-8021x.c:2712 ../libnm-core/nm-setting-8021x.c:2724
-+#: ../libnm-core/nm-setting-8021x.c:2749 ../libnm-core/nm-setting-adsl.c:181
-+#: ../libnm-core/nm-setting-cdma.c:151 ../libnm-core/nm-setting-cdma.c:160
-+#: ../libnm-core/nm-setting-connection.c:938
-+#: ../libnm-core/nm-setting-connection.c:986 ../libnm-core/nm-setting-gsm.c:286
-+#: ../libnm-core/nm-setting-gsm.c:343 ../libnm-core/nm-setting-gsm.c:380
-+#: ../libnm-core/nm-setting-gsm.c:389 ../libnm-core/nm-setting-ip-config.c:4823
-+#: ../libnm-core/nm-setting-ip4-config.c:183
-+#: ../libnm-core/nm-setting-ip4-config.c:190
-+#: ../libnm-core/nm-setting-pppoe.c:153 ../libnm-core/nm-setting-pppoe.c:162
-+#: ../libnm-core/nm-setting-vpn.c:540 ../libnm-core/nm-setting-vpn.c:550
-+#: ../libnm-core/nm-setting-wimax.c:119
-+#: ../libnm-core/nm-setting-wireless-security.c:944
-+#: ../libnm-core/nm-setting-wireless-security.c:968
-+#: ../libnm-core/nm-setting.c:1278 ../libnm-util/nm-setting-8021x.c:2331
- #: ../libnm-util/nm-setting-8021x.c:2348 ../libnm-util/nm-setting-8021x.c:2389
- #: ../libnm-util/nm-setting-8021x.c:2406 ../libnm-util/nm-setting-8021x.c:2457
- #: ../libnm-util/nm-setting-8021x.c:2469 ../libnm-util/nm-setting-8021x.c:2487
-@@ -10658,45 +10702,44 @@ msgstr "当证书不在 PKCS#11 令牌上时不支持密码"
- #: ../libnm-util/nm-setting-gsm.c:338 ../libnm-util/nm-setting-ip4-config.c:934
- #: ../libnm-util/nm-setting-ip4-config.c:943
- #: ../libnm-util/nm-setting-pppoe.c:169 ../libnm-util/nm-setting-pppoe.c:178
--#: ../libnm-util/nm-setting-vpn.c:431 ../libnm-util/nm-setting-vpn.c:441
-+#: ../libnm-util/nm-setting-vpn.c:430 ../libnm-util/nm-setting-vpn.c:440
- #: ../libnm-util/nm-setting-wimax.c:158
- #: ../libnm-util/nm-setting-wireless-security.c:920
- #: ../libnm-util/nm-setting-wireless-security.c:944
- msgid "property is empty"
- msgstr "属性为空"
-
--#: ../libnm-core/nm-setting-8021x.c:2608 ../libnm-core/nm-setting-8021x.c:2656
-+#: ../libnm-core/nm-setting-8021x.c:2606 ../libnm-core/nm-setting-8021x.c:2654
- #: ../libnm-util/nm-setting-8021x.c:2359 ../libnm-util/nm-setting-8021x.c:2371
- #: ../libnm-util/nm-setting-8021x.c:2417 ../libnm-util/nm-setting-8021x.c:2429
- #, c-format
- msgid "has to match '%s' property for PKCS#12"
- msgstr "必须匹配 PKCS#12 的 \"%s\" 属性"
-
--#: ../libnm-core/nm-setting-8021x.c:2835
--#: ../libnm-core/nm-setting-bluetooth.c:121
--#: ../libnm-core/nm-setting-infiniband.c:190
--#: ../libnm-core/nm-setting-infiniband.c:205
--#: ../libnm-core/nm-setting-ip4-config.c:187
--#: ../libnm-core/nm-setting-ip6-config.c:235
--#: ../libnm-core/nm-setting-ip6-config.c:246
--#: ../libnm-core/nm-setting-olpc-mesh.c:147
--#: ../libnm-core/nm-setting-wimax.c:142 ../libnm-core/nm-setting-wired.c:676
--#: ../libnm-core/nm-setting-wired.c:686
--#: ../libnm-core/nm-setting-wireless-security.c:991
--#: ../libnm-core/nm-setting-wireless-security.c:1000
--#: ../libnm-core/nm-setting-wireless-security.c:1009
--#: ../libnm-core/nm-setting-wireless-security.c:1045
--#: ../libnm-core/nm-setting-wireless-security.c:1055
--#: ../libnm-core/nm-setting-wireless-security.c:1078
--#: ../libnm-core/nm-setting-wireless-security.c:1103
--#: ../libnm-core/nm-setting-wireless-security.c:1130
--#: ../libnm-core/nm-setting-wireless-security.c:1169
--#: ../libnm-core/nm-setting-wireless.c:811
--#: ../libnm-core/nm-setting-wireless.c:820
--#: ../libnm-core/nm-setting-wireless.c:831 ../libnm-core/nm-setting-wpan.c:173
--#: ../libnm-util/nm-setting.c:1365 ../libnm-util/nm-setting.c:1383
--#: ../libnm-util/nm-setting.c:1402 ../libnm-util/nm-setting-8021x.c:2652
--#: ../libnm-util/nm-setting-8021x.c:2686
-+#: ../libnm-core/nm-setting-8021x.c:2833
-+#: ../libnm-core/nm-setting-bluetooth.c:110
-+#: ../libnm-core/nm-setting-infiniband.c:178
-+#: ../libnm-core/nm-setting-infiniband.c:188
-+#: ../libnm-core/nm-setting-ip4-config.c:174
-+#: ../libnm-core/nm-setting-ip6-config.c:222
-+#: ../libnm-core/nm-setting-ip6-config.c:233
-+#: ../libnm-core/nm-setting-olpc-mesh.c:128
-+#: ../libnm-core/nm-setting-wifi-p2p.c:145 ../libnm-core/nm-setting-wimax.c:128
-+#: ../libnm-core/nm-setting-wired.c:660 ../libnm-core/nm-setting-wired.c:670
-+#: ../libnm-core/nm-setting-wireless-security.c:987
-+#: ../libnm-core/nm-setting-wireless-security.c:996
-+#: ../libnm-core/nm-setting-wireless-security.c:1005
-+#: ../libnm-core/nm-setting-wireless-security.c:1041
-+#: ../libnm-core/nm-setting-wireless-security.c:1051
-+#: ../libnm-core/nm-setting-wireless-security.c:1074
-+#: ../libnm-core/nm-setting-wireless-security.c:1112
-+#: ../libnm-core/nm-setting-wireless-security.c:1153
-+#: ../libnm-core/nm-setting-wireless.c:798
-+#: ../libnm-core/nm-setting-wireless.c:807
-+#: ../libnm-core/nm-setting-wireless.c:818 ../libnm-core/nm-setting-wpan.c:176
-+#: ../libnm-core/nm-utils.c:4509 ../libnm-util/nm-setting.c:1365
-+#: ../libnm-util/nm-setting.c:1383 ../libnm-util/nm-setting.c:1402
-+#: ../libnm-util/nm-setting-8021x.c:2652 ../libnm-util/nm-setting-8021x.c:2686
- #: ../libnm-util/nm-setting-bluetooth.c:150
- #: ../libnm-util/nm-setting-infiniband.c:205
- #: ../libnm-util/nm-setting-infiniband.c:221
-@@ -10716,11 +10759,11 @@ msgstr "必须匹配 PKCS#12 的 \"%s\" 属性"
- msgid "property is invalid"
- msgstr "属性无效"
-
--#: ../libnm-core/nm-setting-8021x.c:2862 ../libnm-core/nm-setting-8021x.c:2874
--#: ../libnm-core/nm-setting-8021x.c:2888 ../libnm-core/nm-setting-8021x.c:2915
--#: ../libnm-core/nm-setting-8021x.c:2930 ../libnm-core/nm-setting-adsl.c:206
--#: ../libnm-core/nm-setting-adsl.c:218 ../libnm-core/nm-setting-bluetooth.c:149
--#: ../libnm-core/nm-setting-wireless-security.c:927
-+#: ../libnm-core/nm-setting-8021x.c:2860 ../libnm-core/nm-setting-8021x.c:2872
-+#: ../libnm-core/nm-setting-8021x.c:2886 ../libnm-core/nm-setting-8021x.c:2913
-+#: ../libnm-core/nm-setting-8021x.c:2928 ../libnm-core/nm-setting-adsl.c:193
-+#: ../libnm-core/nm-setting-adsl.c:205 ../libnm-core/nm-setting-bluetooth.c:138
-+#: ../libnm-core/nm-setting-wireless-security.c:923
- #: ../libnm-util/nm-setting-8021x.c:2711 ../libnm-util/nm-setting-8021x.c:2721
- #: ../libnm-util/nm-setting-8021x.c:2731 ../libnm-util/nm-setting-8021x.c:2741
- #: ../libnm-util/nm-setting-8021x.c:2751 ../libnm-util/nm-setting-adsl.c:228
-@@ -10730,195 +10773,195 @@ msgstr "属性无效"
- msgid "'%s' is not a valid value for the property"
- msgstr "\"%s\" 不是该属性的有效取值"
-
--#: ../libnm-core/nm-setting-8021x.c:2898
-+#: ../libnm-core/nm-setting-8021x.c:2896
- msgid "invalid auth flags"
- msgstr "无效的验证标记"
-
--#: ../libnm-core/nm-setting-bluetooth.c:171
-+#: ../libnm-core/nm-setting-bluetooth.c:160
- #, c-format
- msgid "'%s' connection requires '%s' or '%s' setting"
- msgstr "\"%s\" 连接需要 \"%s\" 或者 \"%s\" 设置"
-
--#: ../libnm-core/nm-setting-bluetooth.c:217
-+#: ../libnm-core/nm-setting-bluetooth.c:206
- #, c-format
- msgid "'%s' connection requires '%s' setting"
- msgstr "\"%s\" 连接需要 \"%s\" 设置"
-
--#: ../libnm-core/nm-setting-bond.c:564 ../libnm-util/nm-setting-bond.c:516
-+#: ../libnm-core/nm-setting-bond.c:556 ../libnm-util/nm-setting-bond.c:515
- #, c-format
- msgid "invalid option '%s' or its value '%s'"
- msgstr "无效的选项 \"%s\" 或其值 \"%s\""
-
--#: ../libnm-core/nm-setting-bond.c:589 ../libnm-util/nm-setting-bond.c:535
-+#: ../libnm-core/nm-setting-bond.c:581 ../libnm-util/nm-setting-bond.c:534
- #, c-format
- msgid "only one of '%s' and '%s' can be set"
- msgstr "只能设置 \"%s\" 和 \"%s\" 中的一个"
-
--#: ../libnm-core/nm-setting-bond.c:602 ../libnm-util/nm-setting-bond.c:546
-+#: ../libnm-core/nm-setting-bond.c:594 ../libnm-util/nm-setting-bond.c:545
- #, c-format
- msgid "mandatory option '%s' is missing"
- msgstr "缺少必填选项 \"%s\""
-
--#: ../libnm-core/nm-setting-bond.c:612 ../libnm-util/nm-setting-bond.c:555
-+#: ../libnm-core/nm-setting-bond.c:604 ../libnm-util/nm-setting-bond.c:554
- #, c-format
- msgid "'%s' is not a valid value for '%s'"
- msgstr "\"%s\" 不是 \"%s\" 的有效取值"
-
--#: ../libnm-core/nm-setting-bond.c:626 ../libnm-util/nm-setting-bond.c:568
-+#: ../libnm-core/nm-setting-bond.c:618 ../libnm-util/nm-setting-bond.c:567
- #, c-format
- msgid "'%s=%s' is incompatible with '%s > 0'"
- msgstr "\"%s=%s\" 与 \"%s > 0\" 不兼容"
-
--#: ../libnm-core/nm-setting-bond.c:641
-+#: ../libnm-core/nm-setting-bond.c:633
- #, c-format
- msgid "'%s' is not valid for the '%s' option: %s"
- msgstr "\"%s\" 对 \"%s\" 选项无效：%s"
-
--#: ../libnm-core/nm-setting-bond.c:652 ../libnm-util/nm-setting-bond.c:591
-+#: ../libnm-core/nm-setting-bond.c:644 ../libnm-util/nm-setting-bond.c:590
- #, c-format
- msgid "'%s' option is only valid for '%s=%s'"
- msgstr "\"%s\" 选项只能在 \"%s=%s\" 中使用"
-
--#: ../libnm-core/nm-setting-bond.c:665 ../libnm-util/nm-setting-bond.c:604
-+#: ../libnm-core/nm-setting-bond.c:657 ../libnm-util/nm-setting-bond.c:603
- #, c-format
- msgid "'%s=%s' is not a valid configuration for '%s'"
- msgstr "\"%s=%s\" 不是 \"%s\" 的有效配置"
-
--#: ../libnm-core/nm-setting-bond.c:678 ../libnm-core/nm-setting-bond.c:687
--#: ../libnm-core/nm-setting-bond.c:707 ../libnm-core/nm-setting-bond.c:743
--#: ../libnm-util/nm-setting-bond.c:617 ../libnm-util/nm-setting-bond.c:626
--#: ../libnm-util/nm-setting-bond.c:646 ../libnm-util/nm-setting-bond.c:682
-+#: ../libnm-core/nm-setting-bond.c:670 ../libnm-core/nm-setting-bond.c:679
-+#: ../libnm-core/nm-setting-bond.c:699 ../libnm-core/nm-setting-bond.c:735
-+#: ../libnm-util/nm-setting-bond.c:616 ../libnm-util/nm-setting-bond.c:625
-+#: ../libnm-util/nm-setting-bond.c:645 ../libnm-util/nm-setting-bond.c:681
- #, c-format
- msgid "'%s' option requires '%s' option to be set"
- msgstr "\"%s\" 选项需要设置 \"%s\" 选项"
-
--#: ../libnm-core/nm-setting-bond.c:718 ../libnm-util/nm-setting-bond.c:657
-+#: ../libnm-core/nm-setting-bond.c:710 ../libnm-util/nm-setting-bond.c:656
- #, c-format
- msgid "'%s' option is empty"
- msgstr "\"%s\"选项为空"
-
--#: ../libnm-core/nm-setting-bond.c:730 ../libnm-util/nm-setting-bond.c:669
-+#: ../libnm-core/nm-setting-bond.c:722 ../libnm-util/nm-setting-bond.c:668
- #, c-format
- msgid "'%s' is not a valid IPv4 address for '%s' option"
- msgstr "\"%s\" 不是 \"%s\" 选项的有效 IPv4 地址"
-
--#: ../libnm-core/nm-setting-bond.c:758 ../libnm-util/nm-setting-bond.c:696
-+#: ../libnm-core/nm-setting-bond.c:750 ../libnm-util/nm-setting-bond.c:695
- #, c-format
- msgid "'%s' option is only valid with mode '%s'"
- msgstr "\"%s\" 选项只在 \"%s\" 模式里有效"
-
--#: ../libnm-core/nm-setting-bond.c:769
-+#: ../libnm-core/nm-setting-bond.c:761
- #, c-format
- msgid "'%s' and '%s' cannot have different values"
- msgstr "\"%s\" 和 \"%s\" 不能有不同的值"
-
--#: ../libnm-core/nm-setting-bond.c:785
-+#: ../libnm-core/nm-setting-bond.c:777
- #, c-format
- msgid "'%s' option should be string"
- msgstr "\"%s\" 选项应该为字符串"
-
--#: ../libnm-core/nm-setting-bond.c:801
-+#: ../libnm-core/nm-setting-bond.c:793
- #, c-format
- msgid "'%s' option is not valid with mode '%s'"
- msgstr "\"%s\" 选项在 \"%s\" 模式里无效"
-
--#: ../libnm-core/nm-setting-bridge-port.c:125
-+#: ../libnm-core/nm-setting-bridge-port.c:317
-+#: ../libnm-core/nm-setting-ovs-bridge.c:150
- #: ../libnm-core/nm-setting-ovs-interface.c:259
- #: ../libnm-core/nm-setting-ovs-port.c:187
--#: ../libnm-core/nm-setting-ovs-bridge.c:150
--#: ../libnm-core/nm-setting-team-port.c:357
-+#: ../libnm-core/nm-setting-team-port.c:343
- #, c-format
- msgid "missing setting"
- msgstr "缺少设置"
-
--#: ../libnm-core/nm-setting-bridge-port.c:136
-+#: ../libnm-core/nm-setting-bridge-port.c:328
- #: ../libnm-core/nm-setting-ovs-interface.c:280
- #: ../libnm-core/nm-setting-ovs-port.c:208
--#: ../libnm-core/nm-setting-team-port.c:368
-+#: ../libnm-core/nm-setting-team-port.c:354
- #, 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:229 ../libnm-util/nm-setting-bridge.c:268
-+#: ../libnm-core/nm-setting-bridge.c:912 ../libnm-util/nm-setting-bridge.c:268
- #, c-format
- msgid "value '%d' is out of range <%d-%d>"
- msgstr "值 '%d' 超出了范围 <%d-%d>"
-
--#: ../libnm-core/nm-setting-bridge.c:246 ../libnm-core/nm-setting-wired.c:650
--#: ../libnm-core/nm-setting-wired.c:712 ../libnm-core/nm-setting-wired.c:754
-+#: ../libnm-core/nm-setting-bridge.c:929 ../libnm-core/nm-setting-wired.c:634
-+#: ../libnm-core/nm-setting-wired.c:696 ../libnm-core/nm-setting-wired.c:738
- #: ../libnm-util/nm-setting-bridge.c:285 ../libnm-util/nm-setting-wired.c:632
- #: ../libnm-util/nm-setting-wired.c:690
- msgid "is not a valid MAC address"
- msgstr "不是有效的 MAC 地址"
-
--#: ../libnm-core/nm-setting-bridge.c:287
-+#: ../libnm-core/nm-setting-bridge.c:970
- 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:924
-+#: ../libnm-core/nm-setting-connection.c:908
- #, c-format
- msgid "setting required for connection of type '%s'"
- msgstr "类型为 \"%s\" 的连接需要设置"
-
--#: ../libnm-core/nm-setting-connection.c:963
-+#: ../libnm-core/nm-setting-connection.c:947
- #: ../libnm-util/nm-setting-connection.c:788
- #, c-format
- msgid "'%s' is not a valid UUID"
- msgstr "\"%s\"不是有效的 UUID"
-
--#: ../libnm-core/nm-setting-connection.c:1013
-+#: ../libnm-core/nm-setting-connection.c:997
- #, c-format
- msgid "connection type '%s' is not valid"
- msgstr "连接类型 \"%s\" 无效"
-
--#: ../libnm-core/nm-setting-connection.c:1049
-+#: ../libnm-core/nm-setting-connection.c:1033
- #: ../libnm-util/nm-setting-connection.c:874
- #, c-format
- msgid "Unknown slave type '%s'"
- msgstr "未知的从类型 \"%s\""
-
--#: ../libnm-core/nm-setting-connection.c:1060
-+#: ../libnm-core/nm-setting-connection.c:1044
- #: ../libnm-util/nm-setting-connection.c:884
- #, c-format
- msgid "Slave connections need a valid '%s' property"
- msgstr "从连接需要有效的 \"%s\" 属性"
-
--#: ../libnm-core/nm-setting-connection.c:1081
-+#: ../libnm-core/nm-setting-connection.c:1065
- #: ../libnm-util/nm-setting-connection.c:894
- #, c-format
- msgid "Cannot set '%s' without '%s'"
- msgstr "没有 \"%s\" 无法设置 \"%s\""
-
--#: ../libnm-core/nm-setting-connection.c:1095
-+#: ../libnm-core/nm-setting-connection.c:1079
- #, c-format
- msgid "'%s' connections must be enslaved to '%s', not '%s'"
- msgstr "\"%s\" 连接必须从属于 \"%s\"，而不是 \"%s\""
-
--#: ../libnm-core/nm-setting-connection.c:1109
-+#: ../libnm-core/nm-setting-connection.c:1093
- #, c-format
- msgid "metered value %d is not valid"
- msgstr "计量值 %d 无效"
-
--#: ../libnm-core/nm-setting-connection.c:1120
--#: ../libnm-core/nm-setting-connection.c:1131
--#: ../libnm-core/nm-setting-connection.c:1144
-+#: ../libnm-core/nm-setting-connection.c:1104
-+#: ../libnm-core/nm-setting-connection.c:1115
-+#: ../libnm-core/nm-setting-connection.c:1128
- #, c-format
- msgid "value %d is not valid"
- msgstr "值 %d 无效"
-
--#: ../libnm-core/nm-setting-connection.c:1165
-+#: ../libnm-core/nm-setting-connection.c:1149
- #, c-format
- msgid "property type should be set to '%s'"
- msgstr "属性类型应该设置为 \"%s\""
-
--#: ../libnm-core/nm-setting-connection.c:1180
-+#: ../libnm-core/nm-setting-connection.c:1164
- #, c-format
- msgid "slave-type '%s' requires a '%s' setting in the connection"
- msgstr "slave-type \"%s\" 要求连接中有 \"%s\" 设置"
-
--#: ../libnm-core/nm-setting-connection.c:1190
-+#: ../libnm-core/nm-setting-connection.c:1174
- #, c-format
- msgid ""
- "Detect a slave connection with '%s' set and a port type '%s'. '%s' should be "
-@@ -10926,38 +10969,38 @@ msgid ""
- msgstr ""
- "检测到设置了 \"%s\" 和端口类型为 \"%s\" 的从连接。\"%s\" 应该设置为 \"%s\""
-
--#: ../libnm-core/nm-setting-connection.c:1207
-+#: ../libnm-core/nm-setting-connection.c:1191
- #, 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:520 ../libnm-util/nm-setting-dcb.c:593
-+#: ../libnm-core/nm-setting-dcb.c:508 ../libnm-util/nm-setting-dcb.c:593
- msgid "flags invalid"
- msgstr "标志无效"
-
--#: ../libnm-core/nm-setting-dcb.c:529 ../libnm-util/nm-setting-dcb.c:602
-+#: ../libnm-core/nm-setting-dcb.c:517 ../libnm-util/nm-setting-dcb.c:602
- msgid "flags invalid - disabled"
- msgstr "标志无效 — 已禁用"
-
--#: ../libnm-core/nm-setting-dcb.c:555 ../libnm-core/nm-setting-dcb.c:604
-+#: ../libnm-core/nm-setting-dcb.c:543 ../libnm-core/nm-setting-dcb.c:592
- #: ../libnm-util/nm-setting-dcb.c:628 ../libnm-util/nm-setting-dcb.c:677
- msgid "property invalid (not enabled)"
- msgstr "属性无效（未启用）"
-
--#: ../libnm-core/nm-setting-dcb.c:564 ../libnm-util/nm-setting-dcb.c:637
-+#: ../libnm-core/nm-setting-dcb.c:552 ../libnm-util/nm-setting-dcb.c:637
- msgid "element invalid"
- msgstr "元素无效"
-
--#: ../libnm-core/nm-setting-dcb.c:579 ../libnm-util/nm-setting-dcb.c:652
-+#: ../libnm-core/nm-setting-dcb.c:567 ../libnm-util/nm-setting-dcb.c:652
- msgid "sum not 100%"
- msgstr "总和不是 100%"
-
--#: ../libnm-core/nm-setting-dcb.c:613 ../libnm-core/nm-setting-dcb.c:645
-+#: ../libnm-core/nm-setting-dcb.c:601 ../libnm-core/nm-setting-dcb.c:633
- #: ../libnm-util/nm-setting-dcb.c:686 ../libnm-util/nm-setting-dcb.c:718
- msgid "property invalid"
- msgstr "属性无效"
-
--#: ../libnm-core/nm-setting-dcb.c:635 ../libnm-util/nm-setting-dcb.c:708
-+#: ../libnm-core/nm-setting-dcb.c:623 ../libnm-util/nm-setting-dcb.c:708
- msgid "property missing"
- msgstr "缺少属性"
-
-@@ -10974,45 +11017,45 @@ msgstr "卸载功能有无效的变种类型"
- msgid "unknown ethtool option '%s'"
- msgstr "未知的 ethtool 选项 \"%s\""
-
--#: ../libnm-core/nm-setting-gsm.c:312 ../libnm-util/nm-setting-gsm.c:294
-+#: ../libnm-core/nm-setting-gsm.c:299 ../libnm-util/nm-setting-gsm.c:294
- #, c-format
- msgid "property value '%s' is empty or too long (>64)"
- msgstr "属性值 \"%s\" 为空或过长（>64）"
-
--#: ../libnm-core/nm-setting-gsm.c:344 ../libnm-util/nm-setting-gsm.c:326
-+#: ../libnm-core/nm-setting-gsm.c:331 ../libnm-util/nm-setting-gsm.c:326
- #, c-format
- msgid "'%s' contains invalid char(s) (use [A-Za-z._-])"
- msgstr "\"%s\" 包含无效字符（请使用 [A-Za-z._-]）"
-
--#: ../libnm-core/nm-setting-gsm.c:370 ../libnm-util/nm-setting-gsm.c:352
-+#: ../libnm-core/nm-setting-gsm.c:357 ../libnm-util/nm-setting-gsm.c:352
- #, c-format
- msgid "'%s' length is invalid (should be 5 or 6 digits)"
- msgstr "\"%s\" 长度无效（应为 5 位或 6 位数）"
-
--#: ../libnm-core/nm-setting-gsm.c:381 ../libnm-util/nm-setting-gsm.c:363
-+#: ../libnm-core/nm-setting-gsm.c:368 ../libnm-util/nm-setting-gsm.c:363
- #, c-format
- msgid "'%s' is not a number"
- msgstr "\"%s\" 不是数字"
-
--#: ../libnm-core/nm-setting-gsm.c:415
-+#: ../libnm-core/nm-setting-gsm.c:402
- msgid "property is empty or wrong size"
- msgstr "属性为空或大小错误"
-
--#: ../libnm-core/nm-setting-gsm.c:425
-+#: ../libnm-core/nm-setting-gsm.c:412
- msgid "property must contain only digits"
- msgstr "属性必须只包含数字"
-
--#: ../libnm-core/nm-setting-infiniband.c:226
-+#: ../libnm-core/nm-setting-infiniband.c:209
- #: ../libnm-util/nm-setting-infiniband.c:239
- msgid "Must specify a P_Key if specifying parent"
- msgstr "如果指定上级接口，则必须指定 P_Key"
-
--#: ../libnm-core/nm-setting-infiniband.c:236
-+#: ../libnm-core/nm-setting-infiniband.c:219
- #: ../libnm-util/nm-setting-infiniband.c:249
- msgid "InfiniBand P_Key connection did not specify parent interface name"
- msgstr "InfiniBand P_Key 连接未指定上级接口名"
-
--#: ../libnm-core/nm-setting-infiniband.c:274
-+#: ../libnm-core/nm-setting-infiniband.c:257
- #: ../libnm-util/nm-setting-infiniband.c:285
- #, c-format
- msgid ""
-@@ -11020,141 +11063,346 @@ msgid ""
- "it is '%s')"
- msgstr "软件 infiniband 设备的接口名必须为 \"%s\" 或未设置（但现在是 \"%s\"）"
-
--#: ../libnm-core/nm-setting-infiniband.c:289
--#, c-format
--msgid "mtu for transport mode '%s' can be at most %d but it is %d"
-+#: ../libnm-core/nm-setting-infiniband.c:281
-+#, fuzzy, c-format
-+msgid "mtu can be at most %u but it is %u"
- msgstr "传输模式 \"%s\" 的 MTU 最多为 %d，但现在是 %d"
-
--#: ../libnm-core/nm-setting-ip-config.c:133
-+#: ../libnm-core/nm-setting-ip-config.c:136
- #, c-format
- msgid "Missing IPv4 address"
- msgstr "缺失 IPv4 地址"
-
--#: ../libnm-core/nm-setting-ip-config.c:133
-+#: ../libnm-core/nm-setting-ip-config.c:136
- #, c-format
- msgid "Missing IPv6 address"
- msgstr "缺失 IPv6 地址"
-
--#: ../libnm-core/nm-setting-ip-config.c:138
-+#: ../libnm-core/nm-setting-ip-config.c:141
- #, c-format
- msgid "Invalid IPv4 address '%s'"
- msgstr "无效的 IPv4 地址 \"%s\""
-
--#: ../libnm-core/nm-setting-ip-config.c:138
-+#: ../libnm-core/nm-setting-ip-config.c:141
- #, c-format
- msgid "Invalid IPv6 address '%s'"
- msgstr "无效的 IPv6 地址 \"%s\""
-
--#: ../libnm-core/nm-setting-ip-config.c:153
-+#: ../libnm-core/nm-setting-ip-config.c:156
- #, c-format
- msgid "Invalid IPv4 address prefix '%u'"
- msgstr "无效 IPv4 地址前缀 \"%u\""
-
--#: ../libnm-core/nm-setting-ip-config.c:153
-+#: ../libnm-core/nm-setting-ip-config.c:156
- #, c-format
- msgid "Invalid IPv6 address prefix '%u'"
- msgstr "无效 IPv6 地址前缀 \"%u\""
-
--#: ../libnm-core/nm-setting-ip-config.c:168
-+#: ../libnm-core/nm-setting-ip-config.c:171
- #, c-format
- msgid "Invalid routing metric '%s'"
- msgstr "无效的路由度量 \"%s\""
-
--#: ../libnm-core/nm-setting-ip-config.c:1287
--#: ../libnm-core/nm-setting-sriov.c:421
-+#: ../libnm-core/nm-setting-ip-config.c:1289
-+#: ../libnm-core/nm-setting-sriov.c:418
- msgid "unknown attribute"
- msgstr "未知属性"
-
--#: ../libnm-core/nm-setting-ip-config.c:1297
--#: ../libnm-core/nm-setting-sriov.c:431
-+#: ../libnm-core/nm-setting-ip-config.c:1299
-+#: ../libnm-core/nm-setting-sriov.c:428
- #, c-format
- msgid "invalid attribute type '%s'"
- msgstr "无效的属性类型 \"%s\""
-
--#: ../libnm-core/nm-setting-ip-config.c:1308
-+#: ../libnm-core/nm-setting-ip-config.c:1310
- #, 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:1311
- #, 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:1327
-+#: ../libnm-core/nm-setting-ip-config.c:1351
- #, 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:1328
-+#: ../libnm-core/nm-setting-ip-config.c:1352
- #, 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:1342
- #, c-format
- msgid "invalid prefix %s"
- msgstr "无效的前缀 %s"
-
--#: ../libnm-core/nm-setting-ip-config.c:2512
-+#: ../libnm-core/nm-setting-ip-config.c:2479
-+#, fuzzy
-+msgid "invalid priority"
-+msgstr "无效的优先级映射 \"%s\""
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2490
-+#, fuzzy
-+msgid "missing table"
-+msgstr "缺少密钥"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2496
-+#, fuzzy
-+msgid "invalid action"
-+msgstr "无效操作："
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2503
-+msgid "has from/src but the prefix-length is zero"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2510
-+msgid "missing from/src for a non zero prefix-length"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2515
-+#, fuzzy
-+msgid "invalid from/src"
-+msgstr "无效的端口 %d"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2520
-+#, fuzzy
-+msgid "invalid prefix length for from/src"
-+msgstr "%s 的前缀长度 \"%s\" 无效，默认为 %d"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2527
-+msgid "has to/dst but the prefix-length is zero"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2534
-+msgid "missing to/dst for a non zero prefix-length"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2539
-+#, fuzzy
-+msgid "invalid to/dst"
-+msgstr "无效的端口 %d"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2544
-+#, fuzzy
-+msgid "invalid prefix length for to/dst"
-+msgstr "%s 的前缀长度 \"%s\" 无效，默认为 %d"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2552
-+#, fuzzy
-+msgid "invalid iifname"
-+msgstr "无效值"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2560
-+#, fuzzy
-+msgid "invalid oifname"
-+msgstr "无效值"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2566
-+#, fuzzy
-+msgid "invalid source port range"
-+msgstr "最小来源端口 [0]"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2572
-+#, fuzzy
-+msgid "invalid destination port range"
-+msgstr "无效操作："
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2676
-+#, fuzzy, c-format
-+msgid "duplicate key %s"
-+msgstr "重复的属性"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2690
-+#, fuzzy, c-format
-+msgid "invalid key \"%s\""
-+msgstr "无效的密钥 \"%s\"：%s"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2703
-+#, fuzzy, c-format
-+msgid "invalid variant type '%s' for \"%s\""
-+msgstr "无效的属性类型 \"%s\""
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2712
-+#, fuzzy
-+msgid "missing \""
-+msgstr "缺少密钥"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2718
-+#, fuzzy
-+msgid "invalid \""
-+msgstr "无效的 DUID"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2909
-+#, fuzzy
-+msgid "Unsupported to-string-flags argument"
-+msgstr "不支持的卸载功能"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2916
-+msgid "Unsupported extra-argument"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-ip-config.c:3161
-+#, fuzzy, c-format
-+msgid "unsupported key \"%s\""
-+msgstr "不支持的流量过滤器（tfilter）选项：\"%s\"。"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:3166
-+#, fuzzy, c-format
-+msgid "duplicate key \"%s\""
-+msgstr "重复的虚拟功能索引 %u"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:3171
-+#, fuzzy, c-format
-+msgid "invalid value for \"%s\""
-+msgstr "对 \"%s\" 无效的值：%s"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:3181
-+msgid "empty text does not describe a rule"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-ip-config.c:3187
-+#, fuzzy, c-format
-+msgid "missing argument for \"%s\""
-+msgstr "缺少目标主机"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:3199
-+#, fuzzy
-+msgid "invalid \"from\" part"
-+msgstr "无效的端口 %d"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:3213
-+#, fuzzy
-+msgid "invalid \"to\" part"
-+msgstr "无效的端口 %d"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:3222
-+#, c-format
-+msgid "cannot detect address family for rule"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-ip-config.c:3279
-+#: ../libnm-core/nm-setting-ip-config.c:3373
-+#, fuzzy, c-format
-+msgid "rule is invalid: %s"
-+msgstr "证书是无效的：%s"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:3356
-+#, fuzzy
-+msgid "invalid address family"
-+msgstr "无效的 IP 地址：%s"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:4618
-+#, fuzzy, c-format
-+msgid "rule #%u is invalid: %s"
-+msgstr "证书是无效的：%s"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:4836
- #, c-format
- msgid "%d. DNS server address is invalid"
- msgstr "%d。DNS 服务器地址无效"
-
--#: ../libnm-core/nm-setting-ip-config.c:2528
-+#: ../libnm-core/nm-setting-ip-config.c:4852
- #, c-format
- msgid "%d. IP address is invalid"
- msgstr "%d。IP 地址无效"
-
--#: ../libnm-core/nm-setting-ip-config.c:2540
-+#: ../libnm-core/nm-setting-ip-config.c:4864
- #, c-format
- msgid "%d. IP address has 'label' property with invalid type"
- msgstr "%d。IP 地址有无效类型的 \"label\" 属性"
-
--#: ../libnm-core/nm-setting-ip-config.c:2549
-+#: ../libnm-core/nm-setting-ip-config.c:4873
- #, c-format
- msgid "%d. IP address has invalid label '%s'"
- msgstr "%d。IP 地址有无效标签 \"%s\""
-
--#: ../libnm-core/nm-setting-ip-config.c:2563
-+#: ../libnm-core/nm-setting-ip-config.c:4887
- msgid "gateway cannot be set if there are no addresses configured"
- msgstr "如果没有配置地址，网关会无法设置"
-
--#: ../libnm-core/nm-setting-ip-config.c:2572
-+#: ../libnm-core/nm-setting-ip-config.c:4896
- msgid "gateway is invalid"
- msgstr "网关无效"
-
--#: ../libnm-core/nm-setting-ip-config.c:2586
-+#: ../libnm-core/nm-setting-ip-config.c:4910
- #, c-format
- msgid "%d. route is invalid"
- msgstr "%d。路由无效"
-
--#: ../libnm-core/nm-setting-ip-config.c:2595
-+#: ../libnm-core/nm-setting-ip-config.c:4919
- #, c-format
- msgid "%d. route cannot be a default route"
- msgstr "%d。路由不能是默认路由"
-
--#: ../libnm-core/nm-setting-ip-config.c:2606
-+#: ../libnm-core/nm-setting-ip-config.c:4935
-+#, c-format
-+msgid "%u. rule has wrong address-family"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-ip-config.c:4944
-+#, fuzzy, c-format
-+msgid "%u. rule is invalid: %s"
-+msgstr "%d。路由无效"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:4957
- #, c-format
- msgid "a gateway is incompatible with '%s'"
- msgstr "网关与 \"%s\" 不兼容"
-
--#: ../libnm-core/nm-setting-ip4-config.c:141
--#: ../libnm-core/nm-setting-ip6-config.c:187
-+#: ../libnm-core/nm-setting-ip-tunnel.c:340
-+#, c-format
-+msgid "'%d' is not a valid tunnel mode"
-+msgstr "\"%d\" 是无效的隧道模式"
-+
-+#: ../libnm-core/nm-setting-ip-tunnel.c:363
-+#: ../libnm-core/nm-setting-ip-tunnel.c:383
-+#, c-format
-+msgid "'%s' is not a valid IPv%c address"
-+msgstr "\"%s\" 不是有效的 IPv%c 地址"
-+
-+#: ../libnm-core/nm-setting-ip-tunnel.c:400
-+msgid "tunnel keys can only be specified for GRE tunnels"
-+msgstr "只能为 GRE 隧道指定隧道密钥"
-+
-+#: ../libnm-core/nm-setting-ip-tunnel.c:413
-+#: ../libnm-core/nm-setting-ip-tunnel.c:429
-+#, c-format
-+msgid "'%s' is not a valid tunnel key"
-+msgstr "\"%s\" 不是有效的隧道密钥"
-+
-+#: ../libnm-core/nm-setting-ip-tunnel.c:441
-+msgid "a fixed TTL is allowed only when path MTU discovery is enabled"
-+msgstr "只有启用路径 MTU 发现时才允许固定的 TTL"
-+
-+#: ../libnm-core/nm-setting-ip-tunnel.c:454
-+#, c-format
-+msgid "some flags are invalid for the select mode: %s"
-+msgstr "有些标记对所选模式无效：%s"
-+
-+#: ../libnm-core/nm-setting-ip-tunnel.c:468
-+#, c-format
-+msgid "wired setting not allowed for mode %s"
-+msgstr "模式 %s 不允许有线设置"
-+
-+#: ../libnm-core/nm-setting-ip4-config.c:128
-+#: ../libnm-core/nm-setting-ip6-config.c:174
- #: ../libnm-util/nm-setting-ip4-config.c:879
- #: ../libnm-util/nm-setting-ip6-config.c:841
- #, c-format
- msgid "this property cannot be empty for '%s=%s'"
- msgstr "\"%s=%s\" 不允许这个属性为空"
-
--#: ../libnm-core/nm-setting-ip4-config.c:153
--#: ../libnm-core/nm-setting-ip4-config.c:163
--#: ../libnm-core/nm-setting-ip4-config.c:175
--#: ../libnm-core/nm-setting-ip6-config.c:202
--#: ../libnm-core/nm-setting-ip6-config.c:212
--#: ../libnm-core/nm-setting-ip6-config.c:222
-+#: ../libnm-core/nm-setting-ip4-config.c:140
-+#: ../libnm-core/nm-setting-ip4-config.c:150
-+#: ../libnm-core/nm-setting-ip4-config.c:162
-+#: ../libnm-core/nm-setting-ip6-config.c:189
-+#: ../libnm-core/nm-setting-ip6-config.c:199
-+#: ../libnm-core/nm-setting-ip6-config.c:209
- #: ../libnm-util/nm-setting-ip4-config.c:891
- #: ../libnm-util/nm-setting-ip4-config.c:901
- #: ../libnm-util/nm-setting-ip4-config.c:913
-@@ -11165,135 +11413,110 @@ msgstr "\"%s=%s\" 不允许这个属性为空"
- msgid "this property is not allowed for '%s=%s'"
- msgstr "此属性不允许用于\"%s=%s\""
-
--#: ../libnm-core/nm-setting-ip4-config.c:212
-+#: ../libnm-core/nm-setting-ip4-config.c:199
- #, c-format
- msgid "'%s' is not a valid FQDN"
- msgstr "\"%s\" 不是有效的 FQDN"
-
--#: ../libnm-core/nm-setting-ip4-config.c:221
-+#: ../libnm-core/nm-setting-ip4-config.c:208
- msgid "property cannot be set when dhcp-hostname is also set"
- msgstr "当设置了 dhcp-hostname 则不能设置属性"
-
--#: ../libnm-core/nm-setting-ip4-config.c:233
-+#: ../libnm-core/nm-setting-ip4-config.c:220
- #, c-format
- msgid "multiple addresses are not allowed for '%s=%s'"
- msgstr "\"%s=%s\" 不允许多个地址"
-
--#: ../libnm-core/nm-setting-ip4-config.c:247
-+#: ../libnm-core/nm-setting-ip4-config.c:234
- msgid "property should be TRUE when method is set to disabled"
- msgstr "方法设为禁用时属性应该是 TRUE"
-
--#: ../libnm-core/nm-setting-ip6-config.c:261
-+#: ../libnm-core/nm-setting-ip6-config.c:248
- msgid "value is not a valid token"
- msgstr "值不是有效的令牌"
-
--#: ../libnm-core/nm-setting-ip6-config.c:272
-+#: ../libnm-core/nm-setting-ip6-config.c:259
- msgid "only makes sense with EUI64 address generation mode"
- msgstr "只有 EUI64 地址生成模式才有意义"
-
--#: ../libnm-core/nm-setting-ip6-config.c:283
-+#: ../libnm-core/nm-setting-ip6-config.c:270
- msgid "invalid DUID"
- msgstr "无效的 DUID"
-
--#: ../libnm-core/nm-setting-ip6-config.c:295
-+#: ../libnm-core/nm-setting-ip6-config.c:282
- msgid "token is not in canonical form"
- msgstr "令牌不是规范形式"
-
--#: ../libnm-core/nm-setting-ip6-config.c:307
-+#: ../libnm-core/nm-setting-ip6-config.c:294
- msgid "property should be TRUE when method is set to ignore"
- msgstr "方法设为忽略时属性应该是 TRUE"
-
--#: ../libnm-core/nm-setting-ip-tunnel.c:339
--#, c-format
--msgid "'%d' is not a valid tunnel mode"
--msgstr "\"%d\" 是无效的隧道模式"
--
--#: ../libnm-core/nm-setting-ip-tunnel.c:362
--#: ../libnm-core/nm-setting-ip-tunnel.c:382
--#, c-format
--msgid "'%s' is not a valid IPv%c address"
--msgstr "\"%s\" 不是有效的 IPv%c 地址"
--
--#: ../libnm-core/nm-setting-ip-tunnel.c:399
--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
--#, c-format
--msgid "'%s' is not a valid tunnel key"
--msgstr "\"%s\" 不是有效的隧道密钥"
--
--#: ../libnm-core/nm-setting-ip-tunnel.c:440
--msgid "a fixed TTL is allowed only when path MTU discovery is enabled"
--msgstr "只有启用路径 MTU 发现时才允许固定的 TTL"
--
--#: ../libnm-core/nm-setting-ip-tunnel.c:453
--#, c-format
--msgid "some flags are invalid for the select mode: %s"
--msgstr "有些标记对所选模式无效：%s"
--
--#: ../libnm-core/nm-setting-ip-tunnel.c:467
--#, c-format
--msgid "wired setting not allowed for mode %s"
--msgstr "模式 %s 不允许有线设置"
--
--#: ../libnm-core/nm-setting-macsec.c:258
-+#: ../libnm-core/nm-setting-macsec.c:246
- msgid "the key is empty"
- msgstr "密钥为空"
-
--#: ../libnm-core/nm-setting-macsec.c:269
-+#: ../libnm-core/nm-setting-macsec.c:257
- #, c-format
- msgid "the key must be %d characters"
- msgstr "密钥必须是 %d 个字符"
-
--#: ../libnm-core/nm-setting-macsec.c:277
-+#: ../libnm-core/nm-setting-macsec.c:265
- msgid "the key contains non-hexadecimal characters"
- msgstr "密钥包含非十六进制字符"
-
--#: ../libnm-core/nm-setting-macsec.c:339 ../libnm-core/nm-setting-macvlan.c:175
--#: ../libnm-core/nm-setting-vlan.c:657 ../libnm-util/nm-setting-vlan.c:580
-+#: ../libnm-core/nm-setting-macsec.c:327 ../libnm-core/nm-setting-macvlan.c:157
-+#: ../libnm-core/nm-setting-vlan.c:640 ../libnm-util/nm-setting-vlan.c:580
- #, c-format
- msgid "property is not specified and neither is '%s:%s'"
- msgstr "属性未指定，也不是 \"%s:%s\""
-
--#: ../libnm-core/nm-setting-macsec.c:360
-+#: ../libnm-core/nm-setting-macsec.c:348
- #, c-format
- msgid "EAP key management requires '%s' setting presence"
- msgstr "EAP 密钥管理需要 \"%s\" 设置存在"
-
--#: ../libnm-core/nm-setting-macsec.c:369
-+#: ../libnm-core/nm-setting-macsec.c:357
- msgid "must be either psk (0) or eap (1)"
- msgstr ""
-
--#: ../libnm-core/nm-setting-macsec.c:378
-+#: ../libnm-core/nm-setting-macsec.c:366
- #, c-format
- msgid "invalid port %d"
- msgstr "无效的端口 %d"
-
--#: ../libnm-core/nm-setting-macsec.c:389
-+#: ../libnm-core/nm-setting-macsec.c:377
- msgid "only valid for psk mode"
- msgstr ""
-
--#: ../libnm-core/nm-setting-macvlan.c:186
-+#: ../libnm-core/nm-setting-macvlan.c:168
- msgid "non promiscuous operation is allowed only in passthru mode"
- msgstr "只有通过（passthru）模式才允许无混杂操作"
-
--#: ../libnm-core/nm-setting-olpc-mesh.c:128
--#: ../libnm-core/nm-setting-wireless.c:760
-+#: ../libnm-core/nm-setting-olpc-mesh.c:109
-+#: ../libnm-core/nm-setting-wireless.c:747
- #: ../libnm-util/nm-setting-olpc-mesh.c:132
- #: ../libnm-util/nm-setting-wireless.c:777
- msgid "SSID length is out of range <1-32> bytes"
- msgstr "SSID 长度超出 <1-32> 字节范围"
-
--#: ../libnm-core/nm-setting-olpc-mesh.c:137
--#: ../libnm-core/nm-setting-wireless.c:800
-+#: ../libnm-core/nm-setting-olpc-mesh.c:118
-+#: ../libnm-core/nm-setting-wireless.c:787
- #: ../libnm-util/nm-setting-olpc-mesh.c:141
- #: ../libnm-util/nm-setting-wireless.c:817
- #, c-format
- msgid "'%d' is not a valid channel"
- msgstr "\"%d\" 不是有效的信道"
-
-+#: ../libnm-core/nm-setting-ovs-bridge.c:159
-+#, c-format
-+msgid "A connection with a '%s' setting must not have a master."
-+msgstr "有 \"%s\" 设置的连接不能有主连接。"
-+
-+#: ../libnm-core/nm-setting-ovs-bridge.c:170
-+#, c-format
-+msgid "'%s' is not allowed in fail_mode"
-+msgstr "\"%s\" 在 fail_mode 里不允许"
-+
- #: ../libnm-core/nm-setting-ovs-interface.c:111
- #, c-format
- msgid "'%s' is not a valid interface type"
-@@ -11352,7 +11575,7 @@ msgid "A connection with a '%s' setting must have a master."
- msgstr "有 \"%s\" 设置的连接必须有个主连接。"
-
- #: ../libnm-core/nm-setting-ovs-patch.c:104
--#: ../libnm-core/nm-setting-vxlan.c:373
-+#: ../libnm-core/nm-setting-vxlan.c:354
- #, c-format
- msgid "'%s' is not a valid IP address"
- msgstr "\"%s\" 不是有效的 IP 地址"
-@@ -11377,91 +11600,94 @@ msgstr "\"%s\" 在 lacp 里不允许"
- msgid "'%s' is not allowed in bond_mode"
- msgstr "\"%s\" 在 bond_mode 里不允许"
-
--#: ../libnm-core/nm-setting-ovs-bridge.c:159
--#, c-format
--msgid "A connection with a '%s' setting must not have a master."
--msgstr "有 \"%s\" 设置的连接不能有主连接。"
--
--#: ../libnm-core/nm-setting-ovs-bridge.c:170
--#, c-format
--msgid "'%s' is not allowed in fail_mode"
--msgstr "\"%s\" 在 fail_mode 里不允许"
--
--#: ../libnm-core/nm-setting-ppp.c:363 ../libnm-util/nm-setting-ppp.c:386
-+#: ../libnm-core/nm-setting-ppp.c:352 ../libnm-util/nm-setting-ppp.c:386
- #, c-format
- msgid "'%d' is out of valid range <128-16384>"
- msgstr "'%d' 超出了有效范围 <128-16384>"
-
--#: ../libnm-core/nm-setting-ppp.c:376 ../libnm-util/nm-setting-ppp.c:399
-+#: ../libnm-core/nm-setting-ppp.c:365 ../libnm-util/nm-setting-ppp.c:399
- #, c-format
- msgid "setting this property requires non-zero '%s' property"
- msgstr "设置此属性要求 \"%s\" 属性不为零"
-
--#: ../libnm-core/nm-setting-proxy.c:161
-+#: ../libnm-core/nm-setting-proxy.c:148
- #, c-format
- msgid "invalid proxy method"
- msgstr "无效的代理方法"
-
--#: ../libnm-core/nm-setting-proxy.c:171 ../libnm-core/nm-setting-proxy.c:180
-+#: ../libnm-core/nm-setting-proxy.c:158 ../libnm-core/nm-setting-proxy.c:167
- #, c-format
- msgid "this property is not allowed for method none"
- msgstr "无方法时不允许此属性"
-
--#: ../libnm-core/nm-setting-proxy.c:191
-+#: ../libnm-core/nm-setting-proxy.c:178
- #, c-format
- msgid "the script is too large"
- msgstr "脚本太大"
-
--#: ../libnm-core/nm-setting-proxy.c:199
-+#: ../libnm-core/nm-setting-proxy.c:186
- #, c-format
- msgid "the script is not valid utf8"
- msgstr "脚本不是有效的 utf8"
-
--#: ../libnm-core/nm-setting-proxy.c:207
-+#: ../libnm-core/nm-setting-proxy.c:194
- #, c-format
- msgid "the script lacks FindProxyForURL function"
- msgstr "脚本缺少 FindProxyForURL 功能"
-
--#: ../libnm-core/nm-setting-sriov.c:1086
-+#: ../libnm-core/nm-setting-sriov.c:1070
- #, c-format
- msgid "VF with index %u, but the total number of VFs is %u"
- msgstr "有索引为 %u 的虚拟功能，但虚拟功能总数为 %u"
-
--#: ../libnm-core/nm-setting-sriov.c:1097
-+#: ../libnm-core/nm-setting-sriov.c:1081
- #, c-format
- msgid "invalid VF %u: %s"
- msgstr "无效的虚拟功能 %u：%s"
-
--#: ../libnm-core/nm-setting-sriov.c:1109
-+#: ../libnm-core/nm-setting-sriov.c:1093
- #, c-format
- msgid "duplicate VF index %u"
- msgstr "重复的虚拟功能索引 %u"
-
--#: ../libnm-core/nm-setting-sriov.c:1130
-+#: ../libnm-core/nm-setting-sriov.c:1114
- #, c-format
- msgid "VFs %d and %d are not sorted by ascending index"
- msgstr "虚拟功能 %d 和 %d 未按升序排列"
-
--#: ../libnm-core/nm-setting-tc-config.c:68
--#: ../libnm-core/nm-setting-tc-config.c:296
--#: ../libnm-core/nm-setting-tc-config.c:550
-+#: ../libnm-core/nm-setting-tc-config.c:70
-+#: ../libnm-core/nm-setting-tc-config.c:436
-+#: ../libnm-core/nm-setting-tc-config.c:706
-+#, fuzzy, 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
- #, c-format
- msgid "'%s' is not a valid kind"
- msgstr "\"%s\" 不是有效的种类"
-
--#: ../libnm-core/nm-setting-tc-config.c:76
--#: ../libnm-core/nm-setting-tc-config.c:558
-+#: ../libnm-core/nm-setting-tc-config.c:86
-+#: ../libnm-core/nm-setting-tc-config.c:722
- msgid "parent handle missing"
- msgstr "缺少上级处理模块"
-
--#: ../libnm-core/nm-setting-tc-config.c:1203
-+#: ../libnm-core/nm-setting-tc-config.c:1292
- msgid "there are duplicate TC qdiscs"
- msgstr "存在重复的 TC 排队规则"
-
--#: ../libnm-core/nm-setting-tc-config.c:1223
-+#: ../libnm-core/nm-setting-tc-config.c:1312
- msgid "there are duplicate TC filters"
- msgstr "存在重复的 TC 过滤器"
-
-+#: ../libnm-core/nm-setting-team-port.c:366
-+#: ../libnm-core/nm-setting-team.c:1234
-+#, c-format
-+msgid "team config exceeds size limit"
-+msgstr "组合（team）配置超过大小限制"
-+
- #: ../libnm-core/nm-setting-team.c:135 ../libnm-core/nm-setting-team.c:194
- #: ../libnm-core/nm-setting-team.c:306
- #, c-format
-@@ -11493,48 +11719,42 @@ msgstr "来源主机 \"%s\" 包含无效的字符"
- msgid "vlanid is out of range [-1, 4094]"
- msgstr "%s 超出了范围 [0, %d]"
-
--#: ../libnm-core/nm-setting-team.c:1220
--#: ../libnm-core/nm-setting-team-port.c:380
--#, c-format
--msgid "team config exceeds size limit"
--msgstr "组合（team）配置超过大小限制"
--
--#: ../libnm-core/nm-setting-team.c:1246
-+#: ../libnm-core/nm-setting-team.c:1260
- #, c-format
- msgid "invalid runner \"%s\""
- msgstr "无效的运行程序（runner）\"%s\""
-
--#: ../libnm-core/nm-setting-team.c:1259
-+#: ../libnm-core/nm-setting-team.c:1273
- #, c-format
- msgid "missing link watcher name"
- msgstr "缺少链路监视器名称"
-
--#: ../libnm-core/nm-setting-team.c:1269
-+#: ../libnm-core/nm-setting-team.c:1283
- #, c-format
- msgid "unknown link watcher \"%s\""
- msgstr "未知的链路监视器 \"%s\""
-
--#: ../libnm-core/nm-setting-team.c:1280
-+#: ../libnm-core/nm-setting-team.c:1294
- #, c-format
- msgid "missing target host"
- msgstr "缺少目标主机"
-
--#: ../libnm-core/nm-setting-team.c:1288
-+#: ../libnm-core/nm-setting-team.c:1302
- #, c-format
- msgid "missing source address"
- msgstr "缺少来源地址"
-
--#: ../libnm-core/nm-setting-tun.c:185
-+#: ../libnm-core/nm-setting-tun.c:167
- #, c-format
- msgid "'%u': invalid mode"
- msgstr "\"%u\"：无效模式"
-
--#: ../libnm-core/nm-setting-tun.c:195
-+#: ../libnm-core/nm-setting-tun.c:177
- #, c-format
- msgid "'%s': invalid user ID"
- msgstr "\"%s\"：无效的用户 ID"
-
--#: ../libnm-core/nm-setting-tun.c:206
-+#: ../libnm-core/nm-setting-tun.c:188
- #, c-format
- msgid "'%s': invalid group ID"
- msgstr "\"%s\"：无效的组 ID"
-@@ -11584,391 +11804,502 @@ msgstr "已达到最大的用户数据输入项"
- msgid "invalid key \"%s\": %s"
- msgstr "无效的密钥 \"%s\"：%s"
-
--#: ../libnm-core/nm-setting-user.c:374
--#, c-format
--msgid "invalid value for \"%s\": %s"
--msgstr "对 \"%s\" 无效的值：%s"
--
- #: ../libnm-core/nm-setting-user.c:389
- #, c-format
- msgid "maximum number of user data entries reached (%u instead of %u)"
- msgstr "已达到最大的用户数据输入项（现为 %u，最大只有 %u ）"
-
--#: ../libnm-core/nm-setting-vlan.c:668 ../libnm-util/nm-setting-vlan.c:600
-+#: ../libnm-core/nm-setting-vlan.c:651 ../libnm-util/nm-setting-vlan.c:600
- #, 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:678 ../libnm-util/nm-setting-vlan.c:591
-+#: ../libnm-core/nm-setting-vlan.c:661 ../libnm-util/nm-setting-vlan.c:591
- msgid "flags are invalid"
- msgstr "标记无效"
-
--#: ../libnm-core/nm-setting-vlan.c:690
-+#: ../libnm-core/nm-setting-vlan.c:673
- msgid "vlan setting should have a ethernet setting as well"
- msgstr "vlan 设置也应该有以太网设置"
-
--#: ../libnm-core/nm-setting-vpn.c:580
-+#: ../libnm-core/nm-setting-vpn.c:561
- msgid "cannot set connection.multi-connect for VPN setting"
- msgstr "无法为 VPN 设置设定 connection.multi-connect"
-
--#: ../libnm-core/nm-setting-vpn.c:601
-+#: ../libnm-core/nm-setting-vpn.c:582
- #, c-format
- msgid "secret was empty"
- msgstr "密钥为空"
-
--#: ../libnm-core/nm-setting-vpn.c:631
-+#: ../libnm-core/nm-setting-vpn.c:612
- msgid "setting contained a secret with an empty name"
- msgstr "设置包含具有空名称的密钥"
-
--#: ../libnm-core/nm-setting-vpn.c:639
-+#: ../libnm-core/nm-setting-vpn.c:620
- #, c-format
- msgid "secret value was empty"
- msgstr "密钥值为空"
-
--#: ../libnm-core/nm-setting-vpn.c:686 ../libnm-core/nm-setting.c:2024
-+#: ../libnm-core/nm-setting-vpn.c:667 ../libnm-core/nm-setting.c:2114
- msgid "not a secret property"
- msgstr "不是密钥（secret）属性"
-
--#: ../libnm-core/nm-setting-vpn.c:692
-+#: ../libnm-core/nm-setting-vpn.c:673
- msgid "secret is not of correct type"
- msgstr "密钥（secret）不是正确的类型"
-
--#: ../libnm-core/nm-setting-vpn.c:725
-+#: ../libnm-core/nm-setting-vpn.c:757
- #, fuzzy
- msgid "secret flags property not found"
- msgstr "未找到密钥（secret）标记属性 \"%s\""
-
--#: ../libnm-core/nm-setting-vxlan.c:386
-+#: ../libnm-core/nm-setting-vxlan.c:367
- #, c-format
- msgid "'%s' is not a valid IP%c address"
- msgstr "\"%s\" 不是有效的 IP%c 地址"
-
--#: ../libnm-core/nm-setting-vxlan.c:413
-+#: ../libnm-core/nm-setting-vxlan.c:394
- #, c-format
- msgid "%d is greater than local port max %d"
- msgstr "%d 大于本地端口最大值 %d"
-
--#: ../libnm-core/nm-setting-wired.c:630 ../libnm-util/nm-setting-wired.c:612
-+#: ../libnm-core/nm-setting-wired.c:614 ../libnm-util/nm-setting-wired.c:612
- #, c-format
- msgid "'%s' is not a valid Ethernet port value"
- msgstr "\"%s\" 不是有效的以太网端口值"
-
--#: ../libnm-core/nm-setting-wired.c:640 ../libnm-util/nm-setting-wired.c:622
-+#: ../libnm-core/nm-setting-wired.c:624 ../libnm-util/nm-setting-wired.c:622
- #, c-format
- msgid "'%s' is not a valid duplex value"
- msgstr "\"%s\"不是有效的双工值"
-
--#: ../libnm-core/nm-setting-wired.c:699 ../libnm-util/nm-setting-wired.c:679
-+#: ../libnm-core/nm-setting-wired.c:683 ../libnm-util/nm-setting-wired.c:679
- #, c-format
- msgid "invalid '%s' or its value '%s'"
- msgstr "\"%s\" 或其值 \"%s\" 无效"
-
--#: ../libnm-core/nm-setting-wired.c:736
-+#: ../libnm-core/nm-setting-wired.c:720
- msgid "Wake-on-LAN mode 'default' and 'ignore' are exclusive flags"
- msgstr "LAN 唤醒模式 \"default\" 和 \"ignore\" 是相互排斥的标记"
-
--#: ../libnm-core/nm-setting-wired.c:745
-+#: ../libnm-core/nm-setting-wired.c:729
- msgid "Wake-on-LAN password can only be used with magic packet mode"
- msgstr "LAN 唤醒密码只能在幻数据包模式使用"
-
--#: ../libnm-core/nm-setting-wired.c:770
-+#: ../libnm-core/nm-setting-wired.c:754
- msgid "both speed and duplex should have a valid value or both should be unset"
- msgstr "速度和双工都应设定有效值或者都保持未设定"
-
--#: ../libnm-core/nm-setting-wired.c:771
-+#: ../libnm-core/nm-setting-wired.c:755
- msgid "both speed and duplex are required for static link configuration"
- msgstr "静态链路配置需要设置速度和双工"
-
--#: ../libnm-core/nm-setting-wireless-security.c:939
-+#: ../libnm-core/nm-setting-wireguard.c:778
-+msgid "missing public-key for peer"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-wireguard.c:782
-+msgid "invalid public-key for peer"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-wireguard.c:791
-+#, fuzzy
-+msgid "invalid preshared-key for peer"
-+msgstr "无效的私有密钥"
-+
-+#: ../libnm-core/nm-setting-wireguard.c:809
-+#, fuzzy
-+msgid "invalid endpoint for peer"
-+msgstr "本地端点 [无]"
-+
-+#: ../libnm-core/nm-setting-wireguard.c:819
-+#, fuzzy, c-format
-+msgid "invalid IP address \"%s\" for allowed-ip of peer"
-+msgstr "无效的 IP 地址：%s"
-+
-+#: ../libnm-core/nm-setting-wireguard.c:828
-+msgid "invalid preshared-key-flags for peer"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-wireguard.c:1567
-+#, c-format
-+msgid "peer #%u has no public-key"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-wireguard.c:1578
-+#, c-format
-+msgid "peer #%u has invalid public-key"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-wireguard.c:1592
-+#, c-format
-+msgid "peer #%u has invalid endpoint"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-wireguard.c:1622
-+#, c-format
-+msgid "peer #%u has invalid allowed-ips setting"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-wireguard.c:1634
-+#, fuzzy, c-format
-+msgid "peer #%u is invalid: %s"
-+msgstr "证书是无效的：%s"
-+
-+#: ../libnm-core/nm-setting-wireguard.c:1705
-+#: ../libnm-core/nm-setting-wireguard.c:1719
-+#, c-format
-+msgid "method \"%s\" is not supported for WireGuard"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-wireguard.c:1739
-+msgid "key must be 32 bytes base64 encoded"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-wireguard.c:1875
-+#, fuzzy
-+msgid "invalid peer secrets"
-+msgstr "无效的密钥"
-+
-+#: ../libnm-core/nm-setting-wireguard.c:1898
-+#, c-format
-+msgid "peer #%u lacks public-key"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-wireguard.c:1912
-+#, c-format
-+msgid "non-existing peer '%s'"
-+msgstr ""
-+
-+#: ../libnm-core/nm-setting-wireless-security.c:935
- #: ../libnm-util/nm-setting-wireless-security.c:911
- #, c-format
- msgid "'%s' security requires '%s=%s'"
- msgstr "\"%s\" 安全需要 \"%s=%s\""
-
--#: ../libnm-core/nm-setting-wireless-security.c:960
-+#: ../libnm-core/nm-setting-wireless-security.c:956
- #: ../libnm-util/nm-setting-wireless-security.c:932
- #, c-format
- msgid "'%s' security requires '%s' setting presence"
- msgstr "\"%s\" 安全需要 \"%s\" 设置存在"
-
--#: ../libnm-core/nm-setting-wireless-security.c:981
-+#: ../libnm-core/nm-setting-wireless-security.c:977
- #: ../libnm-util/nm-setting-wireless-security.c:953
- #, c-format
- msgid "'%d' value is out of range <0-3>"
- msgstr "'%d' 值超出了 范围 <0-3>"
-
--#: ../libnm-core/nm-setting-wireless-security.c:1036
-+#: ../libnm-core/nm-setting-wireless-security.c:1032
- #: ../libnm-util/nm-setting-wireless-security.c:1008
- #, c-format
- msgid "'%s' connections require '%s' in this property"
- msgstr "\"%s\" 连接需要此属性中的 \"%s\""
-
--#: ../libnm-core/nm-setting-wireless-security.c:1066
-+#: ../libnm-core/nm-setting-wireless-security.c:1062
- #: ../libnm-util/nm-setting-wireless-security.c:1038
- #, c-format
- msgid "'%s' can only be used with '%s=%s' (WEP)"
- msgstr "\"%s\" 只能与 \"%s=%s\"（WEP）共用"
-
--#: ../libnm-core/nm-setting-wireless-security.c:1090
--#, c-format
--msgid "'%s' can only be used with '%s=%s' or '%s=%s'"
-+#: ../libnm-core/nm-setting-wireless-security.c:1086
-+#, fuzzy, c-format
-+msgid ""
-+"'%s' can only be used with 'wpa-eap', 'wpa-psk' or 'sae' key management "
- msgstr "\"%s\" 只能与 \"%s=%s\" 或 \"%s=%s\"共用"
-
--#: ../libnm-core/nm-setting-wireless-security.c:1112
--msgid "can't be simultaneously disabled and enabled"
--msgstr "不能同时启用和禁用"
--
--#: ../libnm-core/nm-setting-wireless.c:769
-+#: ../libnm-core/nm-setting-wireless.c:756
- #: ../libnm-util/nm-setting-wireless.c:786
- #, c-format
- msgid "'%s' is not a valid Wi-Fi mode"
- msgstr "\"%s\" 不是有效的 Wi-Fi 模式"
-
--#: ../libnm-core/nm-setting-wireless.c:779
-+#: ../libnm-core/nm-setting-wireless.c:766
- #: ../libnm-util/nm-setting-wireless.c:796
- #, c-format
- msgid "'%s' is not a valid band"
- msgstr "\"%s\" 不是有效频段"
-
--#: ../libnm-core/nm-setting-wireless.c:789
-+#: ../libnm-core/nm-setting-wireless.c:776
- #, c-format
- msgid "'%s' requires setting '%s' property"
- msgstr "\"%s\" 需要设置 \"%s\" 属性"
-
--#: ../libnm-core/nm-setting-wireless.c:883
-+#: ../libnm-core/nm-setting-wireless.c:870
- #, c-format
- msgid "invalid value"
- msgstr "无效值"
-
--#: ../libnm-core/nm-setting-wireless.c:893
-+#: ../libnm-core/nm-setting-wireless.c:880
- msgid "Wake-on-WLAN mode 'default' and 'ignore' are exclusive flags"
- msgstr "WLAN 唤醒模式 \"default\" 和 \"ignore\" 是相互排斥的标记"
-
--#: ../libnm-core/nm-setting-wireless.c:902
-+#: ../libnm-core/nm-setting-wireless.c:889
- msgid "Wake-on-WLAN trying to set unknown flag"
- msgstr "WLAN 唤醒正在尝试设定未知的标记"
-
--#: ../libnm-core/nm-setting-wireless.c:924
-+#: ../libnm-core/nm-setting-wireless.c:911
- #, 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:182
-+#: ../libnm-core/nm-setting-wpan.c:185
- msgid "page must be defined along with a channel"
- msgstr ""
-
--#: ../libnm-core/nm-setting-wpan.c:191
-+#: ../libnm-core/nm-setting-wpan.c:194
- #, c-format
- msgid "page must be between %d and %d"
- msgstr ""
-
--#: ../libnm-core/nm-setting-wpan.c:202
-+#: ../libnm-core/nm-setting-wpan.c:205
- #, c-format
- msgid "channel must not be between %d and %d"
- msgstr ""
-
--#: ../libnm-core/nm-setting.c:852
-+#: ../libnm-core/nm-setting.c:872
- #, c-format
- msgid "duplicate property"
- msgstr "重复的属性"
-
--#: ../libnm-core/nm-setting.c:900 ../libnm-core/nm-setting.c:947
-+#: ../libnm-core/nm-setting.c:922 ../libnm-core/nm-setting.c:971
- #, c-format
- msgid "can't set property of type '%s' from value of type '%s'"
- msgstr "无法从类型为 \"%s%s\" 的值设置类型为 \"\" 的属性"
-
--#: ../libnm-core/nm-setting.c:919 ../libnm-core/nm-setting.c:933
-+#: ../libnm-core/nm-setting.c:941 ../libnm-core/nm-setting.c:956
- #, c-format
- msgid "failed to set property: %s"
- msgstr "设定属性失败：%s"
-
--#: ../libnm-core/nm-setting.c:961
-+#: ../libnm-core/nm-setting.c:986
- #, c-format
- msgid "can not set property: %s"
- msgstr "无法设定属性：%s"
-
--#: ../libnm-core/nm-setting.c:977
-+#: ../libnm-core/nm-setting.c:1002
- #, c-format
- msgid "unknown property"
- msgstr "未知属性"
-
--#: ../libnm-core/nm-setting.c:1935
-+#: ../libnm-core/nm-setting.c:2005
- msgid "secret not found"
- msgstr "未找到密钥"
-
--#: ../libnm-core/nm-utils.c:2045
-+#: ../libnm-core/nm-utils.c:2317
- #, c-format
- msgid "'%s' is not a valid handle."
- msgstr "\"%s\" 不是有效的处理模块。"
-
--#: ../libnm-core/nm-utils.c:2141
-+#: ../libnm-core/nm-utils.c:2445
- #, c-format
- msgid "'%s' unexpected: parent already specified."
- msgstr "意外的 \"%s\"：已指定上级。"
-
--#: ../libnm-core/nm-utils.c:2157
-+#: ../libnm-core/nm-utils.c:2461
- #, c-format
- msgid "invalid handle: '%s'"
- msgstr "无效的句柄：\"%s\""
-
--#: ../libnm-core/nm-utils.c:2179
-+#: ../libnm-core/nm-utils.c:2483
- msgid "parent not specified."
- msgstr "未指定上级。"
-
--#: ../libnm-core/nm-utils.c:2226
-+#: ../libnm-core/nm-utils.c:2545
- #, c-format
- msgid "unsupported qdisc option: '%s'."
- msgstr "不支持的排队规则（qdisc）选项：\"%s\"。"
-
--#: ../libnm-core/nm-utils.c:2342
-+#: ../libnm-core/nm-utils.c:2667
- msgid "action name missing."
- msgstr "操作名缺失。"
-
--#: ../libnm-core/nm-utils.c:2366
-+#: ../libnm-core/nm-utils.c:2693
- #, c-format
- msgid "unsupported action option: '%s'."
- msgstr "不支持的操作选项：\"%s\"。"
-
--#: ../libnm-core/nm-utils.c:2504
-+#: ../libnm-core/nm-utils.c:2831
- msgid "invalid action: "
- msgstr "无效操作："
-
--#: ../libnm-core/nm-utils.c:2508
-+#: ../libnm-core/nm-utils.c:2835
- #, c-format
- msgid "unsupported tfilter option: '%s'."
- msgstr "不支持的流量过滤器（tfilter）选项：\"%s\"。"
-
--#: ../libnm-core/nm-utils.c:3110
-+#: ../libnm-core/nm-utils.c:3436
- #, c-format
- msgid "failed stat file %s: %s"
- msgstr "统计文件 %s 失败：%s"
-
--#: ../libnm-core/nm-utils.c:3119
-+#: ../libnm-core/nm-utils.c:3445
- #, c-format
- msgid "not a file (%s)"
- msgstr "不是一个文件（%s）"
-
--#: ../libnm-core/nm-utils.c:3130
-+#: ../libnm-core/nm-utils.c:3456
- #, c-format
- msgid "invalid file owner %d for %s"
- msgstr "对 %d%s 无效的文件所有者 "
-
--#: ../libnm-core/nm-utils.c:3141
-+#: ../libnm-core/nm-utils.c:3467
- #, c-format
- msgid "file permissions for %s"
- msgstr "%s 的文件权限"
-
--#: ../libnm-core/nm-utils.c:3151
-+#: ../libnm-core/nm-utils.c:3477
- #, c-format
- msgid "reject %s"
- msgstr "拒绝 %s"
-
--#: ../libnm-core/nm-utils.c:3170
-+#: ../libnm-core/nm-utils.c:3496
- #, c-format
- msgid "path is not absolute (%s)"
- msgstr "路径不是绝对路径（%s）"
-
--#: ../libnm-core/nm-utils.c:3184
-+#: ../libnm-core/nm-utils.c:3510
- #, c-format
- msgid "Plugin file does not exist (%s)"
- msgstr "插件文件不存在（%s）"
-
--#: ../libnm-core/nm-utils.c:3192
-+#: ../libnm-core/nm-utils.c:3518
- #, c-format
- msgid "Plugin is not a valid file (%s)"
- msgstr "插件不是有效的文件（%s）"
-
--#: ../libnm-core/nm-utils.c:3202
-+#: ../libnm-core/nm-utils.c:3528
- #, c-format
- msgid "libtool archives are not supported (%s)"
- msgstr "不支持 libtool 归档（%s）"
-
--#: ../libnm-core/nm-utils.c:3284 ../libnm-util/nm-utils.c:1794
-+#: ../libnm-core/nm-utils.c:3610 ../libnm-util/nm-utils.c:1794
- #, c-format
- msgid "Could not find \"%s\" binary"
- msgstr "无法找到 \"%s\" 二进制文件"
-
--#: ../libnm-core/nm-utils.c:4369
-+#: ../libnm-core/nm-utils.c:4460
-+#, fuzzy
-+msgid "unknown secret flags"
-+msgstr "未知的设置名称"
-+
-+#: ../libnm-core/nm-utils.c:4470
-+msgid "conflicting secret flags"
-+msgstr ""
-+
-+#: ../libnm-core/nm-utils.c:4481
-+#, fuzzy
-+msgid "secret flags must not be \"not-required\""
-+msgstr "未找到密钥（secret）标记属性 \"%s\""
-+
-+#: ../libnm-core/nm-utils.c:4489
-+#, fuzzy
-+msgid "unsupported secret flags"
-+msgstr "不支持的排队规则（qdisc）选项：\"%s\"。"
-+
-+#: ../libnm-core/nm-utils.c:4519
-+msgid "can't be simultaneously disabled and enabled"
-+msgstr "不能同时启用和禁用"
-+
-+#: ../libnm-core/nm-utils.c:4527
-+#, fuzzy
-+msgid "WPS is required"
-+msgstr "需要 PIN 码"
-+
-+#: ../libnm-core/nm-utils.c:4593
- #, c-format
- msgid "not a valid ethernet MAC address for mask at position %lld"
- msgstr "对于 %lld 位置的掩码，该以太网 MAC 地址无效"
-
--#: ../libnm-core/nm-utils.c:4384
-+#: ../libnm-core/nm-utils.c:4608
- #, c-format
- msgid "not a valid ethernet MAC address #%u at position %lld"
- msgstr "在位置 %u%lld，该以太网 MAC 地址 # 无效"
-
--#: ../libnm-core/nm-utils.c:4420
-+#: ../libnm-core/nm-utils.c:4667
- msgid "interface name is too short"
- msgstr "接口名太短"
-
--#: ../libnm-core/nm-utils.c:4429
-+#: ../libnm-core/nm-utils.c:4676
- msgid "interface name is reserved"
- msgstr "接口名被保留"
-
--#: ../libnm-core/nm-utils.c:4441
-+#: ../libnm-core/nm-utils.c:4688
- msgid "interface name contains an invalid character"
- msgstr "接口名包含无效字符"
-
--#: ../libnm-core/nm-utils.c:4447
-+#: ../libnm-core/nm-utils.c:4694
- msgid "interface name is longer than 15 characters"
- msgstr "接口名长度超过 15 字符"
-
--#: ../libnm-core/nm-utils.c:5107
-+#: ../libnm-core/nm-utils.c:5354
- msgid "not valid utf-8"
- msgstr "不是有效的 utf-8"
-
--#: ../libnm-core/nm-utils.c:5128 ../libnm-core/nm-utils.c:5601
-+#: ../libnm-core/nm-utils.c:5375 ../libnm-core/nm-utils.c:5850
- msgid "is not a JSON object"
- msgstr "不是 JSON 对象"
-
--#: ../libnm-core/nm-utils.c:5577 ../libnm-core/nm-utils.c:5917
-+#: ../libnm-core/nm-utils.c:5826 ../libnm-core/nm-utils.c:6161
- msgid "value is NULL"
- msgstr "值为 NULL"
-
--#: ../libnm-core/nm-utils.c:5577 ../libnm-core/nm-utils.c:5917
-+#: ../libnm-core/nm-utils.c:5826 ../libnm-core/nm-utils.c:6161
- msgid "value is empty"
- msgstr "值为空"
-
--#: ../libnm-core/nm-utils.c:5589
-+#: ../libnm-core/nm-utils.c:5838
- #, c-format
- msgid "invalid JSON at position %d (%s)"
- msgstr "位置 %d 有无效的 JSON（%s）"
-
--#: ../libnm-core/nm-utils.c:6244 ../libnm-core/nm-utils.c:6264
-+#: ../libnm-core/nm-utils.c:6488 ../libnm-core/nm-utils.c:6508
- msgid "unterminated escape sequence"
- msgstr "未结束的转义序列"
-
--#: ../libnm-core/nm-utils.c:6289
-+#: ../libnm-core/nm-utils.c:6533
- #, c-format
- msgid "unknown attribute '%s'"
- msgstr "未知属性 \"%s\""
-
--#: ../libnm-core/nm-utils.c:6304
-+#: ../libnm-core/nm-utils.c:6548
- #, c-format
- msgid "missing key-value separator '%c' after '%s'"
- msgstr "在 \"%2$s\" 后缺少键值对分隔符 \"%1$c\""
-
--#: ../libnm-core/nm-utils.c:6320
-+#: ../libnm-core/nm-utils.c:6564
- #, c-format
- msgid "invalid uint32 value '%s' for attribute '%s'"
- msgstr "uint32 值 \"%1$s\" 对属性 \"%2$s\" 无效"
-
--#: ../libnm-core/nm-utils.c:6329
-+#: ../libnm-core/nm-utils.c:6573
- #, c-format
- msgid "invalid uint8 value '%s' for attribute '%s'"
- msgstr "uint8 值 \"%1$s\" 对属性 \"%2$s\" 无效"
-
--#: ../libnm-core/nm-utils.c:6339
-+#: ../libnm-core/nm-utils.c:6583
- #, c-format
- msgid "invalid boolean value '%s' for attribute '%s'"
- msgstr "布尔值 \"%1$s\" 对属性 \"%2$s\" 无效"
-
--#: ../libnm-core/nm-utils.c:6349
-+#: ../libnm-core/nm-utils.c:6593
- #, c-format
- msgid "unsupported attribute '%s' of type '%s'"
- msgstr "不支持类型 \"%2$s\" 的属性 \"%1$s\""
-
-+#: ../libnm-core/nm-utils.c:6935
-+#, fuzzy, c-format
-+msgid "Bridge VLANs %d and %d are not sorted by ascending vid"
-+msgstr "虚拟功能 %d 和 %d 未按升序排列"
-+
-+#: ../libnm-core/nm-utils.c:6959
-+#, fuzzy, c-format
-+msgid "duplicate bridge VLAN vid %u"
-+msgstr "重复的虚拟功能索引 %u"
-+
-+#: ../libnm-core/nm-utils.c:6971
-+msgid "only one VLAN can be the PVID"
-+msgstr ""
-+
- #: ../libnm-core/nm-vpn-editor-plugin.c:296
- #, c-format
- msgid "cannot load plugin \"%s\": %s"
-@@ -12004,50 +12335,50 @@ msgstr "插件不支持导入功能"
- msgid "the plugin does not support export capability"
- msgstr "插件不支持导出功能"
-
--#: ../libnm-core/nm-vpn-plugin-info.c:110
-+#: ../libnm-core/nm-vpn-plugin-info.c:108
- #, c-format
- msgid "missing filename"
- msgstr "缺少文件名"
-
--#: ../libnm-core/nm-vpn-plugin-info.c:118
-+#: ../libnm-core/nm-vpn-plugin-info.c:116
- #, c-format
- msgid "filename must be an absolute path (%s)"
- msgstr "文件名必须为绝对路径（%s）"
-
--#: ../libnm-core/nm-vpn-plugin-info.c:127
-+#: ../libnm-core/nm-vpn-plugin-info.c:125
- #, c-format
- msgid "filename has invalid format (%s)"
- msgstr "文件名具有无效的格式（%s）"
-
--#: ../libnm-core/nm-vpn-plugin-info.c:450
-+#: ../libnm-core/nm-vpn-plugin-info.c:448
- #, 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:488
-+#: ../libnm-core/nm-vpn-plugin-info.c:486
- #, c-format
- msgid "there exists a conflicting plugin with the same name (%s)"
- msgstr "已存在具有相同名称（%s）的冲突插件"
-
--#: ../libnm-core/nm-vpn-plugin-info.c:1070
-+#: ../libnm-core/nm-vpn-plugin-info.c:1068
- #, c-format
- msgid "missing \"plugin\" setting"
- msgstr "缺少 \"plugin\" 设置"
-
--#: ../libnm-core/nm-vpn-plugin-info.c:1080
-+#: ../libnm-core/nm-vpn-plugin-info.c:1078
- #, c-format
- msgid "%s: don't retry loading plugin which already failed previously"
- msgstr "%s：不要重试加载之前已失败的插件"
-
--#: ../libnm-core/nm-vpn-plugin-info.c:1174
-+#: ../libnm-core/nm-vpn-plugin-info.c:1154
- msgid "missing filename to load VPN plugin info"
- msgstr "缺少文件名来加载 VPN 插件信息"
-
--#: ../libnm-core/nm-vpn-plugin-info.c:1186
-+#: ../libnm-core/nm-vpn-plugin-info.c:1166
- msgid "missing name for VPN plugin info"
- msgstr "缺少 VPN 插件信息的名称"
-
--#: ../libnm-core/nm-vpn-plugin-info.c:1195
-+#: ../libnm-core/nm-vpn-plugin-info.c:1175
- msgid "missing service for VPN plugin info"
- msgstr "缺少 VPN 插件信息的服务"
-
-@@ -12087,15 +12418,15 @@ msgstr "Tun"
- msgid "Veth"
- msgstr "Veth"
-
--#: ../libnm-glib/nm-device.c:1884 ../libnm/nm-device.c:1462
-+#: ../libnm-glib/nm-device.c:1884 ../libnm/nm-device.c:1464
- msgid "Wired"
- msgstr "有线"
-
--#: ../libnm-glib/nm-device.c:1915 ../libnm/nm-device.c:1493
-+#: ../libnm-glib/nm-device.c:1915 ../libnm/nm-device.c:1495
- msgid "PCI"
- msgstr "PCI"
-
--#: ../libnm-glib/nm-device.c:1917 ../libnm/nm-device.c:1495
-+#: ../libnm-glib/nm-device.c:1917 ../libnm/nm-device.c:1497
- msgid "USB"
- msgstr "USB"
-
-@@ -12106,7 +12437,7 @@ msgstr "USB"
- #. * the strings otherwise.
- #.
- #: ../libnm-glib/nm-device.c:2014 ../libnm-glib/nm-device.c:2033
--#: ../libnm/nm-device.c:1808 ../libnm/nm-device.c:1827
-+#: ../libnm/nm-device.c:1810 ../libnm/nm-device.c:1829
- #, c-format
- msgctxt "long device name"
- msgid "%s %s"
-@@ -12171,7 +12502,7 @@ msgstr "无效的二阶段私钥"
- msgid "requires '%s' or '%s' setting"
- msgstr "需要 \"%s\" 或 \"%s\" 设置"
-
--#: ../libnm-util/nm-setting-bond.c:581
-+#: ../libnm-util/nm-setting-bond.c:580
- #, c-format
- msgid "'%s' is not a valid interface name for '%s' option"
- msgstr "\"%s\" 不是 \"%s\" 选项的有效接口名"
-@@ -12217,12 +12548,12 @@ msgstr "%d。IPv6 地址无效"
- msgid "%d. IPv6 address has invalid prefix"
- msgstr "%d。IPv6 地址前缀无效"
-
--#: ../libnm-util/nm-setting-vpn.c:581
-+#: ../libnm-util/nm-setting-vpn.c:580
- #, c-format
- msgid "Failed to convert '%s' value '%s' to uint"
- msgstr "转换 \"%s\" 值 \"%s\" 为 uint 失败"
-
--#: ../libnm-util/nm-setting-vpn.c:588
-+#: ../libnm-util/nm-setting-vpn.c:587
- #, c-format
- msgid "Secret flags property '%s' not found"
- msgstr "未找到密钥（secret）标记属性 \"%s\""
-@@ -12232,133 +12563,125 @@ msgstr "未找到密钥（secret）标记属性 \"%s\""
- msgid "requires setting '%s' property"
- msgstr "需要设置 \"%s\" 属性"
-
--#: ../libnm/nm-device-adsl.c:72
-+#: ../libnm/nm-device-adsl.c:69
- msgid "The connection was not an ADSL connection."
- msgstr "此连接不是 ADSL 连接。"
-
--#: ../libnm/nm-device-bond.c:111
-+#: ../libnm/nm-device-bond.c:109
- msgid "The connection was not a bond connection."
- msgstr "此连接不是绑定（bond）连接。"
-
--#: ../libnm/nm-device-bridge.c:115
-+#: ../libnm/nm-device-bridge.c:113
- msgid "The connection was not a bridge connection."
- msgstr "此连接不是网桥连接。"
-
--#: ../libnm/nm-device-bt.c:137
-+#: ../libnm/nm-device-bt.c:135
- #, c-format
- msgid "The connection was not a Bluetooth connection."
- msgstr "此连接不是蓝牙连接。"
-
--#: ../libnm/nm-device-bt.c:143
-+#: ../libnm/nm-device-bt.c:141
- #, c-format
- msgid "The connection is of Bluetooth NAP type."
- msgstr "此连接为蓝牙 NAP 类型。"
-
--#: ../libnm/nm-device-bt.c:152
-+#: ../libnm/nm-device-bt.c:150
- msgid "Invalid device Bluetooth address."
- msgstr "无效的设备蓝牙地址。"
-
--#: ../libnm/nm-device-bt.c:158
-+#: ../libnm/nm-device-bt.c:156
- msgid "The Bluetooth addresses of the device and the connection didn't match."
- msgstr "设备和连接的蓝牙地址不匹配。"
-
--#: ../libnm/nm-device-bt.c:167
-+#: ../libnm/nm-device-bt.c:165
- msgid ""
- "The device is lacking Bluetooth capabilities required by the connection."
- msgstr "设备缺少连接所要求的蓝牙功能。"
-
--#: ../libnm/nm-device-dummy.c:76
-+#: ../libnm/nm-device-dummy.c:75
- msgid "The connection was not a dummy connection."
- msgstr "此连接不是虚拟（dummy）连接。"
-
--#: ../libnm/nm-device-dummy.c:83 ../libnm/nm-device-generic.c:97
--#: ../libnm/nm-device-ovs-bridge.c:97 ../libnm/nm-device-ovs-interface.c:68
-+#: ../libnm/nm-device-dummy.c:82 ../libnm/nm-device-generic.c:96
-+#: ../libnm/nm-device-ovs-bridge.c:96 ../libnm/nm-device-ovs-interface.c:67
- #: ../libnm/nm-device-ovs-port.c:96
- msgid "The connection did not specify an interface name."
- msgstr "此连接未指定接口名。"
-
--#: ../libnm/nm-device-ethernet.c:206
-+#: ../libnm/nm-device-ethernet.c:204
- msgid "The connection was not an Ethernet or PPPoE connection."
- msgstr "此连接不是以太网或 PPPoE 连接。"
-
--#: ../libnm/nm-device-ethernet.c:221
-+#: ../libnm/nm-device-ethernet.c:219
- msgid "The connection and device differ in S390 subchannels."
- msgstr "此连接和设备在 S390 子信道不相同。"
-
--#: ../libnm/nm-device-ethernet.c:236
-+#: ../libnm/nm-device-ethernet.c:234
- #, c-format
- msgid "Invalid device MAC address %s."
- msgstr "无效的设备 MAC 地址 %s。"
-
--#: ../libnm/nm-device-ethernet.c:241
-+#: ../libnm/nm-device-ethernet.c:239
- msgid "The MACs of the device and the connection do not match."
- msgstr "设备和连接的 MAC 地址不匹配。"
-
--#: ../libnm/nm-device-ethernet.c:251
-+#: ../libnm/nm-device-ethernet.c:249
- #, c-format
- msgid "Invalid MAC in the blacklist: %s."
- msgstr "黑名单里无效的 MAC 地址：%s。"
-
--#: ../libnm/nm-device-ethernet.c:257
-+#: ../libnm/nm-device-ethernet.c:255
- #, c-format
- msgid "Device MAC (%s) is blacklisted by the connection."
- msgstr "设备 MAC（%s）被连接列入了黑名单。"
-
--#: ../libnm/nm-device-generic.c:90
-+#: ../libnm/nm-device-generic.c:89
- msgid "The connection was not a generic connection."
- msgstr "此连接不是通用的连接。"
-
--#: ../libnm/nm-device-tun.c:208
--msgid "The connection was not a tun connection."
--msgstr "此连接不是 tun 连接。"
--
--#: ../libnm/nm-device-tun.c:217
--msgid "The mode of the device and the connection didn't match"
--msgstr "设备和连接的模式不匹配"
--
--#: ../libnm/nm-device-infiniband.c:93
-+#: ../libnm/nm-device-infiniband.c:91
- msgid "The connection was not an InfiniBand connection."
- msgstr "此连接不是 InfiniBand 连接。"
-
--#: ../libnm/nm-device-infiniband.c:101 ../libnm/nm-device-wifi.c:625
--#: ../libnm/nm-device-wimax.c:324
-+#: ../libnm/nm-device-infiniband.c:99 ../libnm/nm-device-wifi.c:622
-+#: ../libnm/nm-device-wimax.c:322
- msgid "Invalid device MAC address."
- msgstr "无效的设备 MAC 地址。"
-
--#: ../libnm/nm-device-infiniband.c:109 ../libnm/nm-device-wifi.c:632
--#: ../libnm/nm-device-wimax.c:331
-+#: ../libnm/nm-device-infiniband.c:107 ../libnm/nm-device-wifi.c:629
-+#: ../libnm/nm-device-wimax.c:329
- msgid "The MACs of the device and the connection didn't match."
- msgstr "设备和连接的 MAC 地址不匹配。"
-
--#: ../libnm/nm-device-ip-tunnel.c:271
-+#: ../libnm/nm-device-ip-tunnel.c:269
- msgid "The connection was not an IP tunnel connection."
- msgstr "此连接不是 IP 隧道连接。"
-
--#: ../libnm/nm-device-macvlan.c:157
-+#: ../libnm/nm-device-macvlan.c:155
- msgid "The connection was not a MAC-VLAN connection."
- msgstr "此连接不是 MAC-VLAN 连接。"
-
--#: ../libnm/nm-device-modem.c:119
-+#: ../libnm/nm-device-modem.c:117
- msgid "The connection was not a modem connection."
- msgstr "此连接不是调制解调器连接。"
-
--#: ../libnm/nm-device-modem.c:127
-+#: ../libnm/nm-device-modem.c:125
- msgid "The connection was not a valid modem connection."
- msgstr "此连接不是有效的调制解调器连接。"
-
--#: ../libnm/nm-device-modem.c:134
-+#: ../libnm/nm-device-modem.c:132
- msgid "The device is lacking capabilities required by the connection."
- msgstr "设备缺少连接所要求的功能。"
-
--#: ../libnm/nm-device-olpc-mesh.c:114
-+#: ../libnm/nm-device-olpc-mesh.c:112
- msgid "The connection was not an OLPC Mesh connection."
- msgstr "此连接不是 OLPC Mesh 连接。"
-
--#: ../libnm/nm-device-ovs-bridge.c:90
-+#: ../libnm/nm-device-ovs-bridge.c:89
- msgid "The connection was not a ovs_bridge connection."
- msgstr "此连接不是 ovs 网桥连接。"
-
--#: ../libnm/nm-device-ovs-interface.c:61
-+#: ../libnm/nm-device-ovs-interface.c:60
- msgid "The connection was not a ovs_interface connection."
- msgstr "此连接不是 ovs 接口连接。"
-
-@@ -12366,47 +12689,60 @@ msgstr "此连接不是 ovs 接口连接。"
- msgid "The connection was not a ovs_port connection."
- msgstr "此连接不是 ovs 端口连接。"
-
--#: ../libnm/nm-device-team.c:138
-+#: ../libnm/nm-device-team.c:136
- msgid "The connection was not a team connection."
- msgstr "此连接不是组合（team）连接。"
-
--#: ../libnm/nm-device-vlan.c:128
-+#: ../libnm/nm-device-tun.c:207
-+msgid "The connection was not a tun connection."
-+msgstr "此连接不是 tun 连接。"
-+
-+#: ../libnm/nm-device-tun.c:216
-+msgid "The mode of the device and the connection didn't match"
-+msgstr "设备和连接的模式不匹配"
-+
-+#: ../libnm/nm-device-vlan.c:126
- msgid "The connection was not a VLAN connection."
- msgstr "此连接不是 VLAN 连接。"
-
--#: ../libnm/nm-device-vlan.c:135
-+#: ../libnm/nm-device-vlan.c:133
- msgid "The VLAN identifiers of the device and the connection didn't match."
- msgstr "设备和连接的 VLAN 标识符不匹配。"
-
--#: ../libnm/nm-device-vlan.c:150
-+#: ../libnm/nm-device-vlan.c:148
- msgid "The hardware address of the device and the connection didn't match."
- msgstr "设备和连接的硬件地址不匹配。"
-
--#: ../libnm/nm-device-vxlan.c:386
-+#: ../libnm/nm-device-vxlan.c:384
- msgid "The connection was not a VXLAN connection."
- msgstr "此连接不是 VXLAN 连接。"
-
--#: ../libnm/nm-device-vxlan.c:393
-+#: ../libnm/nm-device-vxlan.c:391
- msgid "The VXLAN identifiers of the device and the connection didn't match."
- msgstr "设备和连接的 VXLAN 标识符不匹配。"
-
--#: ../libnm/nm-device-wifi.c:616
-+#: ../libnm/nm-device-wifi-p2p.c:326
-+#, fuzzy
-+msgid "The connection was not a Wi-Fi P2P connection."
-+msgstr "此连接不是 Wi-Fi 连接。"
-+
-+#: ../libnm/nm-device-wifi.c:613
- msgid "The connection was not a Wi-Fi connection."
- msgstr "此连接不是 Wi-Fi 连接。"
-
--#: ../libnm/nm-device-wifi.c:652
-+#: ../libnm/nm-device-wifi.c:649
- msgid "The device is lacking WPA capabilities required by the connection."
- msgstr "设备缺少连接所要求的 WPA 功能。"
-
--#: ../libnm/nm-device-wifi.c:659
-+#: ../libnm/nm-device-wifi.c:656
- msgid "The device is lacking WPA2/RSN capabilities required by the connection."
- msgstr "设备缺少连接所要求的 WPA2/RSN 功能。"
-
--#: ../libnm/nm-device-wimax.c:315
-+#: ../libnm/nm-device-wimax.c:313
- msgid "The connection was not a WiMAX connection."
- msgstr "此连接不是 WiMAX 连接。"
-
--#: ../libnm/nm-device-wpan.c:82
-+#: ../libnm/nm-device-wpan.c:81
- msgid "The connection was not a wpan connection."
- msgstr "此连接不是 wpan 连接。"
-
-@@ -12446,29 +12782,34 @@ msgstr "6LoWPAN"
- msgid "WireGuard"
- msgstr "WireGuard"
-
--#: ../libnm/nm-device.c:2549
-+#: ../libnm/nm-device.c:1432
-+#, fuzzy
-+msgid "Wi-Fi P2P"
-+msgstr "Wi-Fi"
-+
-+#: ../libnm/nm-device.c:2551
- #, c-format
- msgid "The connection was not valid: %s"
- msgstr "连接无效：%s"
-
--#: ../libnm/nm-device.c:2558
-+#: ../libnm/nm-device.c:2560
- #, c-format
- msgid "The interface names of the device and the connection didn't match."
- msgstr "这个设备的接口名和连接不匹配。"
-
--#: ../libnm/nm-manager.c:274
-+#: ../libnm/nm-manager.c:272
- msgid "Checkpoint was removed before it was initialized"
- msgstr "检查点在初始化之前被删除"
-
--#: ../libnm/nm-manager.c:953
-+#: ../libnm/nm-manager.c:993
- msgid "Active connection removed before it was initialized"
- msgstr "活动连接在初始化之前被删除"
-
--#: ../libnm/nm-remote-settings.c:256
-+#: ../libnm/nm-remote-settings.c:253
- msgid "Connection removed before it was initialized"
- msgstr "连接在初始化之前被删除"
-
--#: ../libnm/nm-vpn-plugin-old.c:847 ../libnm/nm-vpn-service-plugin.c:1051
-+#: ../libnm/nm-vpn-plugin-old.c:846 ../libnm/nm-vpn-service-plugin.c:1049
- msgid "No service name specified"
- msgstr "未指定服务"
-
-@@ -12532,107 +12873,117 @@ msgid "System policy prevents control of network connections"
- msgstr "系统策略阻止网络连接的控制"
-
- #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:15
-+#, fuzzy
-+msgid "Allow control of Wi-Fi scans"
-+msgstr "允许控制网络连接"
-+
-+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:16
-+#, fuzzy
-+msgid "System policy prevents Wi-Fi scans"
-+msgstr "系统策略阻止启用或禁用 Wi-Fi 设备"
-+
-+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:17
- msgid "Connection sharing via a protected Wi-Fi network"
- msgstr "通过受保护的 Wi-Fi 网络共享连接"
-
--#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:16
-+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:18
- msgid ""
- "System policy prevents sharing connections via a protected Wi-Fi network"
- msgstr "系统策略阻止使用受保护的 Wi-Fi 网络共享连接"
-
--#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:17
-+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:19
- msgid "Connection sharing via an open Wi-Fi network"
- msgstr "通过开放 Wi-Fi 网络共享连接"
-
--#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:18
-+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:20
- msgid "System policy prevents sharing connections via an open Wi-Fi network"
- msgstr "系统策略阻止使用开放 Wi-Fi 网络共享连接"
-
--#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:19
-+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:21
- msgid "Modify personal network connections"
- msgstr "更改个人网络连接"
-
--#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:20
-+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:22
- msgid "System policy prevents modification of personal network settings"
- msgstr "系统策略阻止更改个人网络设置"
-
--#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:21
-+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:23
- msgid "Modify network connections for all users"
- msgstr "修改所有用户的网络连接"
-
--#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:22
-+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:24
- msgid "System policy prevents modification of network settings for all users"
- msgstr "系统策略阻止徐该全部用户的共用网络设置"
-
--#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:23
-+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:25
- msgid "Modify persistent system hostname"
- msgstr "修改系统固有主机名"
-
--#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:24
-+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:26
- msgid "System policy prevents modification of the persistent system hostname"
- msgstr "系统策略阻止修改系统固有主机名"
-
--#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:25
-+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:27
- msgid "Modify persistent global DNS configuration"
- msgstr "修改持久性全局 DNS 配置"
-
--#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:26
-+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:28
- msgid ""
- "System policy prevents modification of the persistent global DNS "
- "configuration"
- msgstr "系统策略阻止修改持久性全局 DNS 配置"
-
--#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:27
-+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:29
- msgid "Perform a checkpoint or rollback of interfaces configuration"
- msgstr "执行接口配置的检查点或回滚"
-
--#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:28
-+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:30
- msgid "System policy prevents the creation of a checkpoint or its rollback"
- msgstr "系统策略阻止检查点的创建或其回滚"
-
--#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:29
-+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:31
- msgid "Enable or disable device statistics"
- msgstr "启用或禁用设备统计"
-
--#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:30
-+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:32
- msgid "System policy prevents enabling or disabling device statistics"
- msgstr "系统策略阻止启用或禁用设备统计"
-
--#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:31
-+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:33
- msgid "Enable or disable connectivity checking"
- msgstr "启用或禁用连接性检查"
-
--#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:32
-+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:34
- msgid "System policy prevents enabling or disabling connectivity checking"
- msgstr "系统策略阻止启用或禁用连接性检查"
-
--#: ../shared/nm-utils/nm-shared-utils.c:1130
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:1481
- #, c-format
- msgid "object class '%s' has no property named '%s'"
- msgstr "对象类 \"%s\" 没有名为 \"%s\" 的属性"
-
--#: ../shared/nm-utils/nm-shared-utils.c:1137
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:1488
- #, c-format
- msgid "property '%s' of object class '%s' is not writable"
- msgstr "对象类 \"%2$s\" 的 \"%1$s\" 属性是不可写的"
-
--#: ../shared/nm-utils/nm-shared-utils.c:1144
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:1495
- #, c-format
- msgid ""
- "construct property \"%s\" for object '%s' can't be set after construction"
- msgstr "对象 \"%2$s\" 的构造属性 \"%1$s\" 在构造后不能被设定"
-
--#: ../shared/nm-utils/nm-shared-utils.c:1152
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:1503
- #, c-format
- msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
- msgstr "\"%s::%s\" 不是有效的属性名；\"%s\" 不是 GObject 子类型"
-
--#: ../shared/nm-utils/nm-shared-utils.c:1161
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:1512
- #, 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-utils/nm-shared-utils.c:1172
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:1523
- #, c-format
- msgid ""
- "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
-@@ -12644,49 +12995,49 @@ msgstr ""
- #. * as "Wired Connection" or "VPN Connection". The %d is a number
- #. * that is combined with the first argument to create a unique
- #. * connection id.
--#: ../src/NetworkManagerUtils.c:120
-+#: ../src/NetworkManagerUtils.c:122
- #, c-format
- msgctxt "connection id fallback"
- msgid "%s %u"
- msgstr "%s %u"
-
--#: ../src/main.c:180 ../src/main.c:315
-+#: ../src/main.c:177 ../src/main.c:313
- #, c-format
- msgid "Failed to read configuration: %s\n"
- msgstr "读取配置失败：%s\n"
-
- #. Logging/debugging
--#: ../src/main.c:194 ../src/nm-iface-helper.c:297
-+#: ../src/main.c:191 ../src/nm-iface-helper.c:293
- msgid "Print NetworkManager version and exit"
- msgstr "输出网络管理器版本并退出"
-
--#: ../src/main.c:195 ../src/nm-iface-helper.c:298
-+#: ../src/main.c:192 ../src/nm-iface-helper.c:294
- msgid "Don't become a daemon"
- msgstr "不成为守护进程"
-
--#: ../src/main.c:196 ../src/nm-iface-helper.c:300
-+#: ../src/main.c:193 ../src/nm-iface-helper.c:296
- #, c-format
- msgid "Log level: one of [%s]"
- msgstr "日志级别：取 [%s] 之一"
-
--#: ../src/main.c:198 ../src/nm-iface-helper.c:302
-+#: ../src/main.c:195 ../src/nm-iface-helper.c:298
- #, c-format
- msgid "Log domains separated by ',': any combination of [%s]"
- msgstr "以 \",\" 分开的日志域：可以是 [%s] 的任意组合"
-
--#: ../src/main.c:200 ../src/nm-iface-helper.c:304
-+#: ../src/main.c:197 ../src/nm-iface-helper.c:300
- msgid "Make all warnings fatal"
- msgstr "视所有警告为致命错误"
-
--#: ../src/main.c:201
-+#: ../src/main.c:198
- msgid "Specify the location of a PID file"
- msgstr "指定一个 PID 文件的位置"
-
--#: ../src/main.c:203
-+#: ../src/main.c:200
- msgid "Print NetworkManager configuration and exit"
- msgstr "输出网络管理器配置并退出"
-
--#: ../src/main.c:213
-+#: ../src/main.c:210
- msgid ""
- "NetworkManager monitors all network connections and automatically\n"
- "chooses the best connection to use. It also allows the user to\n"
-@@ -12696,51 +13047,51 @@ msgstr ""
- "网络管理器（NetworkManager）监视所有网络连接，并自动选择要使用的最佳连接。\n"
- "它还允许用户指定计算机无线网卡连接的无线访问点。"
-
--#: ../src/main.c:305 ../src/main-utils.c:286 ../src/nm-iface-helper.c:441
-+#: ../src/main.c:303 ../src/main-utils.c:290 ../src/nm-iface-helper.c:439
- #, c-format
- msgid "%s. Please use --help to see a list of valid options.\n"
- msgstr "%s。请使用 --help 查看有效选项列表。\n"
-
--#: ../src/main.c:340 ../src/nm-iface-helper.c:456
-+#: ../src/main.c:336 ../src/nm-iface-helper.c:452
- #, c-format
- msgid "Could not daemonize: %s [error %u]\n"
- msgstr "无法设为守护进程：%s [错误 %u]\n"
-
--#: ../src/main-utils.c:99
-+#: ../src/main-utils.c:100
- #, c-format
- msgid "Opening %s failed: %s\n"
- msgstr "打开 %s 失败：%s\n"
-
--#: ../src/main-utils.c:105
-+#: ../src/main-utils.c:107
- #, c-format
- msgid "Writing to %s failed: %s\n"
- msgstr "写入 %s 失败：%s\n"
-
--#: ../src/main-utils.c:110
-+#: ../src/main-utils.c:113
- #, c-format
- msgid "Closing %s failed: %s\n"
- msgstr "关闭 %s 失败：%s\n"
-
--#: ../src/main-utils.c:148 ../src/main-utils.c:159
-+#: ../src/main-utils.c:152 ../src/main-utils.c:163
- #, c-format
- msgid "Cannot create '%s': %s"
- msgstr "无法创建 \"%s\"：%s"
-
--#: ../src/main-utils.c:212
-+#: ../src/main-utils.c:216
- #, c-format
- msgid "%s is already running (pid %ld)\n"
- msgstr "%s 已在运行中（pid %ld）\n"
-
--#: ../src/main-utils.c:222
-+#: ../src/main-utils.c:226
- #, c-format
- msgid "You must be root to run %s!\n"
- msgstr "运行 %s 必须是根用户！\n"
-
--#: ../src/dhcp/nm-dhcp-dhclient-utils.c:291
-+#: ../src/dhcp/nm-dhcp-dhclient-utils.c:272
- msgid "# Created by NetworkManager\n"
- msgstr "# 由 NetworkManger 创建\n"
-
--#: ../src/dhcp/nm-dhcp-dhclient-utils.c:302
-+#: ../src/dhcp/nm-dhcp-dhclient-utils.c:283
- #, c-format
- msgid ""
- "# Merged from %s\n"
-@@ -12749,7 +13100,7 @@ msgstr ""
- "# 合并自 %s\n"
- "\n"
-
--#: ../src/devices/bluetooth/nm-bluez-device.c:212
-+#: ../src/devices/bluetooth/nm-bluez-device.c:210
- #, c-format
- msgid "%s Network"
- msgstr "%s 网络"
-@@ -12775,12 +13126,12 @@ msgid "DUN connection must include a GSM or CDMA setting"
- msgstr "DUN 连接必须包含 GSM 或 CDMA 设置"
-
- #: ../src/devices/bluetooth/nm-device-bt.c:322
--#: ../src/devices/wwan/nm-modem-broadband.c:696
-+#: ../src/devices/wwan/nm-modem-broadband.c:687
- msgid "GSM connection"
- msgstr "GSM 连接"
-
- #: ../src/devices/bluetooth/nm-device-bt.c:324
--#: ../src/devices/wwan/nm-modem-broadband.c:720
-+#: ../src/devices/wwan/nm-modem-broadband.c:711
- msgid "CDMA connection"
- msgstr "CDMA 连接"
-
-@@ -12791,7 +13142,7 @@ msgstr "未知的/未处理的蓝牙连接类型"
- #: ../src/devices/bluetooth/nm-device-bt.c:353
- #: ../src/devices/nm-device-ethernet.c:1432
- #: ../src/devices/nm-device-infiniband.c:190
--#: ../src/devices/wifi/nm-device-wifi.c:908
-+#: ../src/devices/wifi/nm-device-wifi.c:925
- msgid "connection does not match device"
- msgstr "连接不匹配设备"
-
-@@ -12799,15 +13150,15 @@ msgstr "连接不匹配设备"
- msgid "6LOWPAN connection"
- msgstr "6LOWPAN 连接"
-
--#: ../src/devices/nm-device-bond.c:72
-+#: ../src/devices/nm-device-bond.c:71
- msgid "Bond connection"
- msgstr "绑定连接"
-
--#: ../src/devices/nm-device-bridge.c:153
-+#: ../src/devices/nm-device-bridge.c:154
- msgid "Bridge connection"
- msgstr "网桥连接"
-
--#: ../src/devices/nm-device-dummy.c:68
-+#: ../src/devices/nm-device-dummy.c:67
- msgid "Dummy connection"
- msgstr "虚拟连接"
-
-@@ -12824,19 +13175,19 @@ msgstr "有线连接"
- msgid "Wired connection %d"
- msgstr "有线连接 %d"
-
--#: ../src/devices/nm-device-ip-tunnel.c:419
-+#: ../src/devices/nm-device-ip-tunnel.c:422
- msgid "IP tunnel connection"
- msgstr "IP 隧道连接"
-
--#: ../src/devices/nm-device-macvlan.c:366
-+#: ../src/devices/nm-device-macvlan.c:365
- msgid "MACVLAN connection"
- msgstr "MACVLAN 连接"
-
--#: ../src/devices/nm-device-tun.c:158
-+#: ../src/devices/nm-device-tun.c:157
- msgid "TUN connection"
- msgstr "TUN 连接"
-
--#: ../src/devices/nm-device-wpan.c:69
-+#: ../src/devices/nm-device-wpan.c:68
- msgid "WPAN connection"
- msgstr "WPAN 连接"
-
-@@ -12844,355 +13195,485 @@ msgstr "WPAN 连接"
- msgid "Team connection"
- msgstr "组合连接"
-
--#: ../src/devices/wifi/nm-device-olpc-mesh.c:136
-+#: ../src/devices/wifi/nm-device-olpc-mesh.c:134
- msgid "Mesh"
- msgstr "Mesh"
-
--#: ../src/devices/wifi/nm-device-wifi.c:881
-+#: ../src/devices/wifi/nm-device-wifi.c:898
- msgid "WPA Ad-Hoc disabled due to kernel bugs"
- msgstr "由于内核程序错误禁用了 WPA Ad-Hoc"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:43
-+#: ../src/devices/wifi/nm-wifi-utils.c:42
- #, c-format
- msgid "%s is incompatible with static WEP keys"
- msgstr "%s 不兼容静态 WEP 密钥"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:77
-+#: ../src/devices/wifi/nm-wifi-utils.c:76
- msgid "LEAP authentication requires a LEAP username"
- msgstr "LEAP 验证要求 LEAP 用户名"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:87
-+#: ../src/devices/wifi/nm-wifi-utils.c:86
- msgid "LEAP username requires 'leap' authentication"
- msgstr "LEAP 用户名要求 \"leap\" 验证"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:100
-+#: ../src/devices/wifi/nm-wifi-utils.c:99
- msgid "LEAP authentication requires IEEE 802.1x key management"
- msgstr "LEAP 验证要求 IEEE 802.1x 密钥管理"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:120
-+#: ../src/devices/wifi/nm-wifi-utils.c:119
- msgid "LEAP authentication is incompatible with Ad-Hoc mode"
- msgstr "LEAP 验证和 Ad-Hoc 模式不兼容"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:132
-+#: ../src/devices/wifi/nm-wifi-utils.c:131
- msgid "LEAP authentication is incompatible with 802.1x setting"
- msgstr "LEAP 验证和 802.1x 设置不兼容"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:154
-+#: ../src/devices/wifi/nm-wifi-utils.c:153
- #, c-format
- msgid "a connection using '%s' authentication cannot use WPA key management"
- msgstr "使用 \"%s\" 验证的连接无法使用 WPA 密钥管理"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:165
-+#: ../src/devices/wifi/nm-wifi-utils.c:164
- #, c-format
- msgid "a connection using '%s' authentication cannot specify WPA protocols"
- msgstr "使用 \"%s\" 验证的连接无法指定 WPA 协议"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:181
--#: ../src/devices/wifi/nm-wifi-utils.c:198
-+#: ../src/devices/wifi/nm-wifi-utils.c:180
-+#: ../src/devices/wifi/nm-wifi-utils.c:197
- #, c-format
- msgid "a connection using '%s' authentication cannot specify WPA ciphers"
- msgstr "使用 \"%s\" 验证的连接无法指定 WPA 密文"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:210
-+#: ../src/devices/wifi/nm-wifi-utils.c:209
- #, c-format
- msgid "a connection using '%s' authentication cannot specify a WPA password"
- msgstr "使用 \"%s\" 验证的连接无法指定 WPA 密码"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:241
-+#: ../src/devices/wifi/nm-wifi-utils.c:240
- msgid "Dynamic WEP requires an 802.1x setting"
- msgstr "动态 WEP 要求 802.1x 设置"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:251
--#: ../src/devices/wifi/nm-wifi-utils.c:279
-+#: ../src/devices/wifi/nm-wifi-utils.c:250
-+#: ../src/devices/wifi/nm-wifi-utils.c:278
- msgid "Dynamic WEP requires 'open' authentication"
- msgstr "动态 WEP 要求 \"open\" 验证"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:266
-+#: ../src/devices/wifi/nm-wifi-utils.c:265
- msgid "Dynamic WEP requires 'ieee8021x' key management"
- msgstr "动态 WEP 要求 \"ieee8021x\" 密钥管理"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:313
-+#: ../src/devices/wifi/nm-wifi-utils.c:312
- msgid "WPA-PSK authentication is incompatible with 802.1x"
- msgstr "WPA-PSK 验证和 802.1x 兼容"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:323
-+#: ../src/devices/wifi/nm-wifi-utils.c:322
- msgid "WPA-PSK requires 'open' authentication"
- msgstr "WPA-PSK 要求 \"open\" 验证"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:335
-+#: ../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:348
-+#: ../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:360
-+#: ../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:372
-+#: ../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:386
-+#: ../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:416
-+#: ../src/devices/wifi/nm-wifi-utils.c:415
- msgid "WPA-EAP authentication requires an 802.1x setting"
- msgstr "WPA-EAP 验证要求 802.1x 设置"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:426
-+#: ../src/devices/wifi/nm-wifi-utils.c:425
- msgid "WPA-EAP requires 'open' authentication"
- msgstr "WPA-EAP 要求 \"open\" 验证"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:437
-+#: ../src/devices/wifi/nm-wifi-utils.c:436
- msgid "802.1x setting requires 'wpa-eap' key management"
- msgstr "802.1x 设置要求 \"wpa-eap\" 密钥管理"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:450
-+#: ../src/devices/wifi/nm-wifi-utils.c:449
- msgid "Access point does not support 802.1x but setting requires it"
- msgstr "接入点不支持 802.1x 但设置要求它"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:478
-+#: ../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:488
-+#: ../src/devices/wifi/nm-wifi-utils.c:487
- msgid "Ad-Hoc mode is incompatible with 802.1x security"
- msgstr "Ad-Hoc 模式和 802.1x 安全性不兼容"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:497
-+#: ../src/devices/wifi/nm-wifi-utils.c:496
- msgid "Ad-Hoc mode is incompatible with LEAP security"
- msgstr "Ad-Hoc 模式和 LEAP 安全性不兼容"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:507
-+#: ../src/devices/wifi/nm-wifi-utils.c:506
- msgid "Ad-Hoc mode requires 'open' authentication"
- msgstr "Ad-Hoc 模式要求 \"open\" 验证"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:517
-+#: ../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:558
--#: ../src/devices/wifi/nm-wifi-utils.c:586
-+#: ../src/devices/wifi/nm-wifi-utils.c:557
-+#: ../src/devices/wifi/nm-wifi-utils.c:585
- #, c-format
- msgid "connection does not match access point"
- msgstr "连接和接入点不匹配"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:610
-+#: ../src/devices/wifi/nm-wifi-utils.c:609
- msgid "Access point is unencrypted but setting specifies security"
- msgstr "接入点未加密但设置指定了安全性"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:699
-+#: ../src/devices/wifi/nm-wifi-utils.c:698
- 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:709
-+#: ../src/devices/wifi/nm-wifi-utils.c:708
- msgid "WPA authentication is incompatible with Shared Key authentication"
- msgstr "WPA 验证和共享密钥（Shared Key）验证不兼容"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:756
-+#: ../src/devices/wifi/nm-wifi-utils.c:761
- msgid "Failed to determine AP security information"
- msgstr "确定 AP 安全信息失败"
-
--#: ../src/devices/wwan/nm-modem-broadband.c:686
--msgid "GSM mobile broadband connection requires a 'gsm' setting"
--msgstr "GSM 移动宽带连接要求 \"gsm\" 设置"
--
--#: ../src/nm-config.c:563
-+#: ../src/nm-config.c:562
- #, fuzzy, c-format
- msgid "Bad '%s' option: "
- msgstr "\"%s\"选项为空"
-
--#: ../src/nm-config.c:576
-+#: ../src/nm-config.c:575
- msgid "Config file location"
- msgstr "配置文件位置"
-
--#: ../src/nm-config.c:577
-+#: ../src/nm-config.c:576
- msgid "Config directory location"
- msgstr "配置目录位置"
-
--#: ../src/nm-config.c:578
-+#: ../src/nm-config.c:577
- msgid "System config directory location"
- msgstr "系统配置目录位置"
-
--#: ../src/nm-config.c:579
-+#: ../src/nm-config.c:578
- msgid "Internal config file location"
- msgstr "内部配置文件位置"
-
--#: ../src/nm-config.c:580
-+#: ../src/nm-config.c:579
- msgid "State file location"
- msgstr "状态文件位置"
-
--#: ../src/nm-config.c:581
-+#: ../src/nm-config.c:580
- msgid "State file for no-auto-default devices"
- msgstr "no-auto-default 设备的状态文件"
-
--#: ../src/nm-config.c:582
-+#: ../src/nm-config.c:581
- msgid "List of plugins separated by ','"
- msgstr "插件列表，以 \",\" 隔开"
-
--#: ../src/nm-config.c:583
-+#: ../src/nm-config.c:582
- msgid "Quit after initial configuration"
- msgstr "初始化配置后退出"
-
--#: ../src/nm-config.c:584 ../src/nm-iface-helper.c:299
-+#: ../src/nm-config.c:583 ../src/nm-iface-helper.c:295
- 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:587
-+#: ../src/nm-config.c:586
- msgid "An http(s) address for checking internet connectivity"
- msgstr "检查网络连通用的 http(s) 地址"
-
--#: ../src/nm-config.c:588
-+#: ../src/nm-config.c:587
- msgid "The interval between connectivity checks (in seconds)"
- msgstr "连接性检查间隔（以秒计）"
-
--#: ../src/nm-config.c:589
-+#: ../src/nm-config.c:588
- msgid "The expected start of the response"
- msgstr "预期的响应开头"
-
--#: ../src/nm-config.c:596
-+#: ../src/nm-config.c:595
- #, fuzzy
- msgid "NetworkManager options"
- msgstr "网络管理器权限"
-
--#: ../src/nm-config.c:596
-+#: ../src/nm-config.c:595
- #, fuzzy
- msgid "Show NetworkManager options"
- msgstr "网络管理器权限"
-
- #. Interface/IP config
--#: ../src/nm-iface-helper.c:279
-+#: ../src/nm-iface-helper.c:275
- msgid "The interface to manage"
- msgstr "要管理的接口"
-
--#: ../src/nm-iface-helper.c:280
-+#: ../src/nm-iface-helper.c:276
- msgid "Connection UUID"
- msgstr "连接 UUID"
-
--#: ../src/nm-iface-helper.c:281
-+#: ../src/nm-iface-helper.c:277
- msgid "Connection Token for Stable IDs"
- msgstr "固定 ID 的连接令牌"
-
--#: ../src/nm-iface-helper.c:282
-+#: ../src/nm-iface-helper.c:278
- msgid "Whether to manage IPv6 SLAAC"
- msgstr "是否管理 IPv6 SLAAC"
-
--#: ../src/nm-iface-helper.c:283
-+#: ../src/nm-iface-helper.c:279
- msgid "Whether SLAAC must be successful"
- msgstr "SLAAC 是否必须是成功的"
-
--#: ../src/nm-iface-helper.c:284
-+#: ../src/nm-iface-helper.c:280
- msgid "Use an IPv6 temporary privacy address"
- msgstr "使用 IPv6 临时私有地址"
-
--#: ../src/nm-iface-helper.c:285
-+#: ../src/nm-iface-helper.c:281
- msgid "Current DHCPv4 address"
- msgstr "当前的 DHCPv4 地址"
-
--#: ../src/nm-iface-helper.c:286
-+#: ../src/nm-iface-helper.c:282
- msgid "Whether DHCPv4 must be successful"
- msgstr "DHCPv4 是否必须是成功的"
-
--#: ../src/nm-iface-helper.c:287
-+#: ../src/nm-iface-helper.c:283
- msgid "Hex-encoded DHCPv4 client ID"
- msgstr "十六进制编码的 DHCPv4 客户 ID"
-
--#: ../src/nm-iface-helper.c:288
-+#: ../src/nm-iface-helper.c:284
- msgid "Hostname to send to DHCP server"
- msgstr "发送至 DHCP 服务器的主机名"
-
--#: ../src/nm-iface-helper.c:288
-+#: ../src/nm-iface-helper.c:284
- msgid "barbar"
- msgstr "barbar"
-
--#: ../src/nm-iface-helper.c:289
-+#: ../src/nm-iface-helper.c:285
- msgid "FQDN to send to DHCP server"
- msgstr "发送至 DHCP 服务器的 FQDN"
-
--#: ../src/nm-iface-helper.c:289
-+#: ../src/nm-iface-helper.c:285
- msgid "host.domain.org"
- msgstr "host.domain.org"
-
--#: ../src/nm-iface-helper.c:290
-+#: ../src/nm-iface-helper.c:286
- msgid "Route priority for IPv4"
- msgstr "IPv4 的路由优先级"
-
--#: ../src/nm-iface-helper.c:290
-+#: ../src/nm-iface-helper.c:286
- msgid "0"
- msgstr "0"
-
--#: ../src/nm-iface-helper.c:291
-+#: ../src/nm-iface-helper.c:287
- msgid "Route priority for IPv6"
- msgstr "IPv6 的路由优先级"
-
--#: ../src/nm-iface-helper.c:291
-+#: ../src/nm-iface-helper.c:287
- msgid "1024"
- msgstr "1024"
-
--#: ../src/nm-iface-helper.c:292
-+#: ../src/nm-iface-helper.c:288
- msgid "Hex-encoded Interface Identifier"
- msgstr "十六进制编码的接口标识符"
-
--#: ../src/nm-iface-helper.c:293
-+#: ../src/nm-iface-helper.c:289
- msgid "IPv6 SLAAC address generation mode"
- msgstr "IPv6 SLAAC 地址生成模式"
-
--#: ../src/nm-iface-helper.c:294
-+#: ../src/nm-iface-helper.c:290
- msgid ""
- "The logging backend configuration value. See logging.backend in "
- "NetworkManager.conf"
- msgstr "日志后台的配置值。请参考 NetworkManager.conf 里的 logging.backend"
-
--#: ../src/nm-iface-helper.c:314
-+#: ../src/nm-iface-helper.c:310
- msgid ""
- "nm-iface-helper is a small, standalone process that manages a single network "
- "interface."
- msgstr "nm-iface-helper 是一个管理单个网络接口的小型独立进程。"
-
--#: ../src/nm-iface-helper.c:422
-+#: ../src/nm-iface-helper.c:419
- #, c-format
- msgid "An interface name and UUID are required\n"
- msgstr "接口名称和 UUID 是必需的\n"
-
--#: ../src/nm-iface-helper.c:428
-+#: ../src/nm-iface-helper.c:426
- #, c-format
- msgid "Failed to find interface index for %s (%s)\n"
- msgstr "寻找 %s(%s) 的接口索引失败\n"
-
--#: ../src/nm-iface-helper.c:446
-+#: ../src/nm-iface-helper.c:444
- #, c-format
- msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n"
- msgstr "正在忽略传给命令行的未识别日志域 \"%s\"。\n"
-
--#: ../src/nm-iface-helper.c:485
-+#: ../src/nm-iface-helper.c:481
- #, c-format
- msgid "(%s): Invalid IID %s\n"
- msgstr "（%s）：无效的 IID %s\n"
-
--#: ../src/nm-iface-helper.c:496
-+#: ../src/nm-iface-helper.c:492
- #, c-format
- msgid "(%s): Invalid DHCP client-id %s\n"
- msgstr "（%s）：无效的 DHCP 客户端 ID %s\n"
-
--#: ../src/nm-logging.c:275
-+#: ../src/nm-logging.c:290
- #, c-format
- msgid "Unknown log level '%s'"
- msgstr "未知的日志等级 \"%s\""
-
--#: ../src/nm-logging.c:377
-+#: ../src/nm-logging.c:400
- #, c-format
- msgid "Unknown log domain '%s'"
- msgstr "未知的日志域 \"%s\""
-
-+#~ msgid "Error: failed to remove a value from %s.%s: %s."
-+#~ msgstr "错误：从 %s.%s 删除值失败：%s。"
-+
-+#~ msgid "WEP"
-+#~ msgstr "WEP"
-+
-+#~ msgid "WPA1"
-+#~ msgstr "WPA1"
-+
-+#~ msgid "WPA2"
-+#~ msgstr "WPA2"
-+
-+#~ msgid "802.1X"
-+#~ msgstr "802.1X"
-+
-+#~ msgid "default route cannot be added (NetworkManager handles it by itself)"
-+#~ msgstr "无法添加默认路由（网络管理器自己进行处理）"
-+
-+#~ msgid "priority '%s' is not valid (<0-%ld>)"
-+#~ msgstr "优先级 '%s' 无效 (<0-%ld>)"
-+
-+#~ msgid "no item to remove"
-+#~ msgstr "没有要移除的项"
-+
-+#~ msgid "index '%d' is not in range <0-%d>"
-+#~ msgstr "索引 '%d' 超出了范围 <0-%d>"
-+
-+#~ msgid "missing option"
-+#~ msgstr "缺少选项"
-+
-+#~ msgid "'%s' is not a valid MAC"
-+#~ msgstr "\"%s\" 不是有效的 MAC"
-+
-+#~ msgid "the property doesn't contain EAP method '%s'"
-+#~ msgstr "属性没有包含 EAP 方法 \"%s\""
-+
-+#~ msgid "the property doesn't contain alternative subject match '%s'"
-+#~ msgstr "属性没有包含符合 \"%s\" 的替换者"
-+
-+#~ msgid ""
-+#~ "the property doesn't contain \"phase2\" alternative subject match '%s'"
-+#~ msgstr "属性没有包含符合 \"%s\" 的 \"phase2\" 替换者"
-+
-+#~ msgid "the property doesn't contain permission '%s'"
-+#~ msgstr "属性没有包含权限 \"%s\""
-+
-+#~ msgid "the property doesn't contain UUID '%s'"
-+#~ msgstr "属性没有包含 UUID \"%s\""
-+
-+#~ msgid "the property doesn't contain DNS server '%s'"
-+#~ msgstr "属性没有包含 DNS 服务器 \"%s\""
-+
-+#~ msgid "the property doesn't contain DNS search domain '%s'"
-+#~ msgstr "属性没有包含 DNS 搜索域 \"%s\""
-+
-+#~ msgid "the property doesn't contain DNS option '%s'"
-+#~ msgstr "属性没有包含 DNS 选项 \"%s\""
-+
-+#~ msgid "the property doesn't contain IP address '%s'"
-+#~ msgstr "属性没有包含 IP 地址 \"%s\""
-+
-+#~ msgid "the property doesn't contain route '%s'"
-+#~ msgstr "属性没有包含路由 \"%s\""
-+
-+#~ msgid "invalid IPv6 address '%s'"
-+#~ msgstr "无效的 IPv6 地址 \"%s\""
-+
-+#~ msgid "the property doesn't contain interface name '%s'"
-+#~ msgstr "属性没有包含接口名 \"%s\""
-+
-+#~ msgid "the property doesn't contain vf with index %u"
-+#~ msgstr "属性没有包含索引为 %u 的虚拟功能（vf）"
-+
-+#~ msgid "the property doesn't contain qdisc '%s'"
-+#~ msgstr "属性没有包含排队规则（qdisc） \"%s\""
-+
-+#~ msgid ""
-+#~ "The valid syntax is: '[root | parent <handle>] [handle <handle>] "
-+#~ "<tfilter>'"
-+#~ msgstr ""
-+#~ "有效的语法是：'[root | parent <handle>] [handle <handle>] <tfilter>'"
-+
-+#~ msgid "the property doesn't contain tfilter '%s'"
-+#~ msgstr "属性没有包含流量过滤器（tfilter）\"%s\""
-+
-+#~ msgid "the property doesn't contain string '%s'"
-+#~ msgstr "属性没有包含字符串 \"%s\""
-+
-+#~ msgid "the property doesn't contain link watcher '%s'"
-+#~ msgstr "属性没有包含链路监视器 \"%s\""
-+
-+#~ msgid "only one mapping at a time is supported; taking the first one (%s)"
-+#~ msgstr "警告：一次只支持映射一个；使用第一个（%s）"
-+
-+#~ msgid "the property doesn't contain mapping '%s'"
-+#~ msgstr "属性没有包含映射 \"%s\""
-+
-+#~ msgid "no priority to remove"
-+#~ msgstr "没有要删除的优先级"
-+
-+#~ msgid "index '%d' is not in the range of <0-%d>"
-+#~ msgstr "索引 '%d' 不在 <0-%d> 范围内"
-+
-+#~ msgid "'%s' cannot be empty"
-+#~ msgstr "\"%s\" 不能为空"
-+
-+#~ msgid "the property doesn't contain MAC address '%s'"
-+#~ msgstr "属性没有包含 MAC 地址 \"%s\""
-+
-+#~ msgid "'%s' string value should consist of 1 - 199 characters"
-+#~ msgstr "\"%s\" 字符串值应该由 1～199 个字符组成"
-+
-+#~ msgid "the property doesn't contain protocol '%s'"
-+#~ msgstr "属性没有包含协议 \"%s\""
-+
-+#~ msgid "'%s' is not a valid PSK"
-+#~ msgstr "\"%s\" 不是有效的 PSK"
-+
-+#~ msgid ""
-+#~ "Pre-Shared-Key for WPA networks. If the key is 64-characters long, it "
-+#~ "must contain only hexadecimal characters and is interpreted as a "
-+#~ "hexadecimal WPA key. Otherwise, the key must be between 8 and 63 ASCII "
-+#~ "characters (as specified in the 802.11i standard) and is interpreted as a "
-+#~ "WPA passphrase, and is hashed to derive the actual WPA-PSK used when "
-+#~ "connecting to the Wi-Fi network."
-+#~ msgstr ""
-+#~ "用于 WPA 网络的预共享密钥。如果密钥时 64 字符长，它必须只能包含十六进制的"
-+#~ "字符，并且被解释为十六进制的 WPA 密钥。否则，该密钥必须在 8 到 63 ASCII 字"
-+#~ "符之间（如 802.11i 标准所规定）并被解释为 WPA 密码；而且当连接到 Wi-Fi 网"
-+#~ "络时，该密钥被散列以衍生实际的 WPA-PSK。"
-+
-+#~ msgid "GSM mobile broadband connection requires a 'gsm' setting"
-+#~ msgstr "GSM 移动宽带连接要求 \"gsm\" 设置"
-+
- #~ msgid "Error: Failed to setup a Wi-Fi hotspot"
- #~ msgstr "错误：建立 Wi-Fi 热点失败"
-
-From 548bacd24e1b7d1d5b37dd83768c1e425a6b5cee Mon Sep 17 00:00:00 2001
-From: Ludek Janda <ljanda@redhat.com>
-Date: Fri, 24 May 2019 12:50:06 +0200
-Subject: [PATCH 2/2] po: RHEL 7.7 translations - fr,ja,zh-CN
-
-[lkundrak@v3.sk: make update-po]
----
- po/fr.po | 867 ++++++++++++++++++--------------------------
- po/ja.po | 996 +++++++++++++++++++++-----------------------------
- po/zh_CN.po | 1006 ++++++++++++++++++---------------------------------
- 3 files changed, 1102 insertions(+), 1767 deletions(-)
-
-diff --git a/po/fr.po b/po/fr.po
-index 4c13083f08..165fab266f 100644
---- a/po/fr.po
-+++ b/po/fr.po
-@@ -9,19 +9,16 @@
- # Sam Friedmann <sam.friedmann@redhat.com>, 2010.
- # Claude Paroz <claude@2xlibre.net>, 2011
- # Sam Friedmann <sfriedma@redhat.com>, 2010, 2014.
--# lrintel <lrintel@redhat.com>, 2017. #zanata
--# tchuang <tchuang@redhat.com>, 2017. #zanata
--# croe <croe@redhat.com>, 2018. #zanata
--# ljanda <ljanda@redhat.com>, 2018. #zanata
--# lrintel <lrintel@redhat.com>, 2018. #zanata
--# tchuang <tchuang@redhat.com>, 2018. #zanata
-+# croe <croe@redhat.com>, 2019. #zanata
-+# ljanda <ljanda@redhat.com>, 2019. #zanata
-+# lrintel <lrintel@redhat.com>, 2019. #zanata
- msgid ""
- msgstr ""
- "Project-Id-Version: PACKAGE VERSION\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2019-05-21 09:59+0200\n"
--"PO-Revision-Date: 2017-11-07 06:49+0000\n"
--"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
-+"POT-Creation-Date: 2019-05-28 14:18+0200\n"
-+"PO-Revision-Date: 2019-05-21 11:52+0000\n"
-+"Last-Translator: croe <croe@redhat.com>\n"
- "Language-Team: French <trans-fr@lists.fedoraproject.org>\n"
- "Language: fr\n"
- "MIME-Version: 1.0\n"
-@@ -772,9 +769,9 @@ msgstr ""
- " [destination-port <0-65535>]\n"
- "\n"
- " wpan: [short-addr <0x0000-0xffff>]\n"
--"\n"
- " [pan-id <0x0000-0xffff>]\n"
--"\n"
-+" [page <default|0-31>]\n"
-+" [channel <default|0-26>]\n"
- " [mac <MAC address>]\n"
- "\n"
- " 6lowpan: dev <parent device (connection UUID, ifname, or MAC)>\n"
-@@ -1130,7 +1127,7 @@ msgid "no active connection or device"
- msgstr "aucune connexion ou périphérique actif"
-
- #: ../clients/cli/connections.c:2354
--#, fuzzy, c-format
-+#, c-format
- msgid "device '%s' not compatible with connection '%s': "
- msgstr "périphérique « %s » incompatible avec la connexion « %s » :"
-
-@@ -1147,7 +1144,7 @@ msgstr "aucun périphérique trouvé pour la connexion « %s »"
- #: ../clients/cli/connections.c:2441
- #, c-format
- msgid "Hint: use '%s' to get more details."
--msgstr ""
-+msgstr "Astuce : utiliser « %s » pour obtenir plus d'informations."
-
- #: ../clients/cli/connections.c:2459
- #, c-format
-@@ -1271,9 +1268,9 @@ msgid "Error: invalid property '%s': %s."
- msgstr "Erreur : propriété « %s » non valide : %s."
-
- #: ../clients/cli/connections.c:3998
--#, fuzzy, c-format
-+#, c-format
- msgid "Error: failed to %s %s.%s: %s."
--msgstr "Erreur : échec de la modification de %s.%s : %s."
-+msgstr "Erreur : échec %s %s.%s: %s."
-
- #: ../clients/cli/connections.c:4033
- #, c-format
-@@ -2075,9 +2072,10 @@ 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:7834
--#, fuzzy, c-format
-+#, c-format
- msgid "Error: Timeout saving '%s' (%s) connection\n"
--msgstr "Erreur : échec de l'enregistrement de la connexion « %s » (%s) : %s\n"
-+msgstr ""
-+"Erreur : échec lors de l'enregistrement de la connexion « %s » (%s) : %s\n"
-
- #: ../clients/cli/connections.c:7839
- #, c-format
-@@ -2253,7 +2251,7 @@ msgstr "Erreur : le paramètre <new name> est manquant."
- #: ../clients/cli/connections.c:8507 ../clients/cli/connections.c:9003
- #, c-format
- msgid "Error: unknown extra argument: '%s'."
--msgstr "Erreur : argument supplémentaire « %s » inconnu"
-+msgstr "Erreur : argument supplémentaire « %s » inconnu."
-
- #: ../clients/cli/connections.c:8552
- #, c-format
-@@ -2261,9 +2259,9 @@ msgid "Error: not all connections deleted."
- msgstr "Erreur : les connexions n'ont pas toutes été supprimées."
-
- #: ../clients/cli/connections.c:8553
--#, fuzzy, c-format
-+#, c-format
- msgid "Error: Connection deletion failed: %s\n"
--msgstr "Erreur : la suppression de la connexion a échoué : %s"
-+msgstr "Erreur : la suppression de la connexion a échoué : %s\n"
-
- #: ../clients/cli/connections.c:8609 ../clients/cli/connections.c:8730
- #, c-format
-@@ -2723,7 +2721,7 @@ msgstr ""
- "\n"
-
- #: ../clients/cli/devices.c:831
--#, fuzzy, c-format
-+#, c-format
- msgid ""
- "Usage: nmcli device wifi { ARGUMENTS | help }\n"
- "\n"
-@@ -2779,30 +2777,27 @@ msgstr ""
- "\n"
- "Effectue des opérations sur des périphériques Wi-Fi.\n"
- "\n"
--"ARGUMENTS := [list [ifname <ifname>] [bssid <BSSID>]]\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 »\n"
--"peuvent être utilisées pour répertorier les points d'accès pour une "
--"interface en particulier, ou avec un BSSID spécifique.\n"
-+"« 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"
- "\n"
--"Se connecte à un réseau Wi-Fi spécifié par SSID ou BSSID. La commande crée\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\n"
--"à un clic sur un SSID dans un client GUI. La commande crée toujours une "
--"nouvelle connexion\n"
--"et est donc principalement utile pour effectuer des connexions sur de "
--"nouveaux réseaux Wi-Fi.\n"
-+"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\n"
--"les réseaux ouverts, WEP et WPA-PSK sont pris en charge pour le moment. Il "
--"est aussi\n"
--"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"
-@@ -2825,11 +2820,10 @@ msgstr ""
- "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\n"
--"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,\n"
-+"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"
-
-@@ -2956,10 +2950,9 @@ msgstr ""
- "Erreur : échec de l'ajout ou de l'activation de la nouvelle connexion : %s"
-
- #: ../clients/cli/devices.c:1862
--#, fuzzy, c-format
-+#, c-format
- msgid "Error: Failed to activate connection: %s"
--msgstr ""
--"Erreur : échec de l'ajout ou de l'activation de la nouvelle connexion : %s"
-+msgstr "Erreur : échec d'activation de la connexion : %s"
-
- #: ../clients/cli/devices.c:1932
- #, c-format
-@@ -3174,6 +3167,7 @@ msgstr "Erreur : aucun point d'accès avec le BSSID « %s » trouvé."
- #, c-format
- msgid "Error: Connection '%s' exists but properties don't match."
- msgstr ""
-+"Erreur : la connexion « % » existe mais les propriétés ne correspondent pas."
-
- #: ../clients/cli/devices.c:3440
- #, c-format
-@@ -3776,7 +3770,7 @@ 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
--#, fuzzy, c-format
-+#, c-format
- msgid ""
- "Usage: nmcli [OPTIONS] OBJECT { COMMAND | help }\n"
- "\n"
-@@ -3807,27 +3801,24 @@ msgid ""
- " m[onitor] monitor NetworkManager changes\n"
- "\n"
- msgstr ""
--"Usage: nmcli [OPTIONS] OBJECT { COMMAND | help }\n"
-+"Usage : nmcli [OPTIONS] OBJECT { COMMAND | help }\n"
- "\n"
- "OPTIONS\n"
--" -o[verview] overview mode (hide default "
--"values)\n"
--" -t[erse] terse output\n"
--" -p[retty] pretty output\n"
--" -m[ode] tabular|multiline output mode\n"
--" -c[olors] auto|yes|no whether to use colors in "
--"output\n"
--" -f[ields] <field1,field2,...>|all|common specify fields to output\n"
--" -g[et-values] <field1,field2,...>|all|common shortcut for -m tabular -t -"
--"f\n"
--" -e[scape] yes|no escape columns separators "
--"in values\n"
--" -a[sk] ask for missing parameters\n"
--" -s[how-secrets] allow displaying passwords\n"
--" -w[ait] <seconds> set timeout waiting for "
--"finishing operations\n"
--" -v[ersion] show program version\n"
--" -h[elp] print this help\n"
-+" -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"
-+" -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"
-+" -m, --mode tabular|multiline output mode\n"
-+" -o, --overview overview mode\n"
-+" -p, --pretty pretty output\n"
-+" -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"
- "\n"
- "OBJECT\n"
- " g[eneral] NetworkManager's general status and operations\n"
-@@ -4474,11 +4465,9 @@ msgstr "La méthode IP sélectionnée n'est pas prise en charge"
- msgid "Failed to configure SR-IOV parameters"
- msgstr "Échec de la configuration des paramètres SR-IOV"
-
--# auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
- #: ../clients/common/nm-client-utils.c:359
--#, fuzzy
- msgid "The Wi-Fi P2P peer could not be found"
--msgstr "Le réseau Wi-Fi est introuvable"
-+msgstr "L'homologue Wi-Fi P2P n'a pas pu être trouvé"
-
- #: ../clients/common/nm-client-utils.c:365
- msgid "Unknown reason"
-@@ -4643,9 +4632,8 @@ msgstr "%s (%s)"
-
- #: ../clients/common/nm-meta-setting-desc.c:1372
- #: ../clients/common/nm-meta-setting-desc.c:1376
--#, fuzzy
- msgid "'%s' is out of range [%"
--msgstr "« %s » est en dehors de la plage [0, %u]"
-+msgstr "« %s » est en dehors de la plage [%"
-
- #: ../clients/common/nm-meta-setting-desc.c:1381
- #, c-format
-@@ -4729,9 +4717,9 @@ msgid "'%s' is not valid; use <option>=<value>"
- msgstr "« %s » n'est pas valide ; utiliser <option>=<valeur>"
-
- #: ../clients/common/nm-meta-setting-desc.c:1993
--#, fuzzy, c-format
-+#, c-format
- msgid "cannot set empty \"%s\" option"
--msgstr "n'a pas pu définir la propriété : %s"
-+msgstr "l'option « %s » ne peut pas rester vide"
-
- #: ../clients/common/nm-meta-setting-desc.c:2052
- #, c-format
-@@ -4751,9 +4739,8 @@ msgid "'%s' is not valid"
- msgstr "« %s » n'est pas valide"
-
- #: ../clients/common/nm-meta-setting-desc.c:2187
--#, fuzzy
- msgid "not a valid hex-string"
--msgstr "nom d'interface non valide"
-+msgstr "hex-string non valide"
-
- #: ../clients/common/nm-meta-setting-desc.c:2203
- #, c-format
-@@ -4765,11 +4752,13 @@ 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)"
-
- #: ../clients/common/nm-meta-setting-desc.c:2404
--#, fuzzy, c-format
-+#, c-format
- msgid "failed to set bond option \"%s\""
--msgstr "n'a pas pu définir la propriété : %s"
-+msgstr "N'a pas pu définir liaison \"%s\""
-
- #: ../clients/common/nm-meta-setting-desc.c:2421
- #, c-format
-@@ -4815,9 +4804,9 @@ msgid "Can not change the connection type"
- msgstr "Impossible de changer le type de connexion"
-
- #: ../clients/common/nm-meta-setting-desc.c:2564
--#, fuzzy, c-format
-+#, c-format
- msgid "invalid permission \"%s\""
--msgstr "runner non valide : « %s »"
-+msgstr "permission non valide \"%s\""
-
- #: ../clients/common/nm-meta-setting-desc.c:2601
- #, c-format
-@@ -4893,9 +4882,9 @@ msgid "default"
- msgstr "par défaut"
-
- #: ../clients/common/nm-meta-setting-desc.c:3235
--#, fuzzy, c-format
-+#, c-format
- msgid "invalid IPv%c address '%s'"
--msgstr "adresse IPv4 « %s » non valide"
-+msgstr "adresse IPv%c « %s » non valide"
-
- #: ../clients/common/nm-meta-setting-desc.c:3362
- #, c-format
-@@ -4914,15 +4903,14 @@ msgstr ""
-
- #: ../clients/common/nm-meta-setting-desc.c:3617
- #: ../clients/common/nm-meta-setting-desc.c:3697
--#, fuzzy
- msgid ""
- "The valid syntax is: '[root | parent <handle>] [handle <handle>] <kind>'"
- msgstr ""
--"La syntaxe valide est : '[root | parent <handle>][handle <handle>] <qdisc>’"
-+"La syntaxe valide est : '[root | parent <handle>][handle <handle>] <kind>'"
-
- #: ../clients/common/nm-meta-setting-desc.c:3642
- msgid "The valid syntax is: '<vid>[-<vid>] [pvid] [untagged]'"
--msgstr ""
-+msgstr "La syntaxe valide est : '<vid>[-<vid>] [pvid] [untagged]'"
-
- #: ../clients/common/nm-meta-setting-desc.c:3917
- #, c-format
-@@ -5410,6 +5398,8 @@ msgid ""
- " priority [prio] [from [src]] [to [dst]], ,...\n"
- "\n"
- msgstr ""
-+"Saisissez une liste des adresses IPv4 formatées comme suit :\n"
-+" priority [prio] [from [src]] [to [dst]], ,...\n"
-
- #: ../clients/common/nm-meta-setting-desc.c:5798
- msgid ""
-@@ -5485,6 +5475,8 @@ msgid ""
- " priority [prio] [from [src]] [to [dst]], ,...\n"
- "\n"
- msgstr ""
-+"Saisissez une liste des adresses IPv6 formatées comme suit :\n"
-+" priority [prio] [from [src]] [to [dst]], ,...\n"
-
- #: ../clients/common/nm-meta-setting-desc.c:6008
- #: ../clients/common/nm-meta-setting-desc.c:6934
-@@ -5602,7 +5594,7 @@ msgstr "VLAN ID (<0-4094>)"
-
- #: ../clients/common/nm-meta-setting-desc.c:6846
- msgid "VLAN flags (<0-7>) [none]"
--msgstr "Drapeaux VLAN (<0-7>) [none]"
-+msgstr "Marqueurs VLAN (<0-7>) [none]"
-
- #: ../clients/common/nm-meta-setting-desc.c:6855
- msgid "Ingress priority maps [none]"
-@@ -5634,7 +5626,7 @@ msgstr "Port de destination [8472]"
-
- #: ../clients/common/nm-meta-setting-desc.c:7012
- msgid "Peer"
--msgstr ""
-+msgstr "Peer"
-
- #: ../clients/common/nm-meta-setting-desc.c:7042
- msgid "WiMAX NSP name"
-@@ -5665,20 +5657,19 @@ msgstr ""
-
- #: ../clients/common/nm-meta-setting-desc.c:7486
- msgid "Short address (<0x0000-0xffff>)"
--msgstr "Adresse courte (<0x000000-0xffffff>)"
-+msgstr "Adresse courte (<0x0000-0xffff>)"
-
- #: ../clients/common/nm-meta-setting-desc.c:7502
- msgid "PAN Identifier (<0x0000-0xffff>)"
--msgstr "Identificateur PAN (<0x000000-0xffffff>)"
-+msgstr "Identificateur PAN (<0x0000-0xffff>)"
-
- #: ../clients/common/nm-meta-setting-desc.c:7517
--#, fuzzy
- msgid "Page (<default|0-31>)"
--msgstr "(par défaut)"
-+msgstr "Page (<default|0-31>)"
-
- #: ../clients/common/nm-meta-setting-desc.c:7531
- msgid "Channel (<default|0-26>)"
--msgstr ""
-+msgstr "Canal (<default|0-26>)"
-
- #. ***************************************************************************
- #: ../clients/common/nm-meta-setting-desc.c:7666
-@@ -5834,7 +5825,7 @@ msgstr "Configuration utilisateur"
- msgid "VLAN connection"
- msgstr "Connexion VLAN"
-
--#: ../clients/common/nm-meta-setting-desc.c:7703 ../src/nm-manager.c:5539
-+#: ../clients/common/nm-meta-setting-desc.c:7703 ../src/nm-manager.c:5536
- msgid "VPN connection"
- msgstr "Connexion VPN"
-
-@@ -5844,9 +5835,8 @@ msgid "VXLAN connection"
- msgstr "Connexion VXLAN"
-
- #: ../clients/common/nm-meta-setting-desc.c:7705
--#, fuzzy
- msgid "Wi-Fi P2P connection"
--msgstr "Connexion Wi-Fi "
-+msgstr "Connexion Wi-Fi P2P "
-
- #: ../clients/common/nm-meta-setting-desc.c:7706
- msgid "WiMAX connection"
-@@ -5857,9 +5847,8 @@ msgid "Wired Ethernet"
- msgstr "Ethernet filaire"
-
- #: ../clients/common/nm-meta-setting-desc.c:7708
--#, fuzzy
- msgid "WireGuard VPN settings"
--msgstr "Configuration WPAN"
-+msgstr "Configuration VPN WireGuard"
-
- #: ../clients/common/nm-meta-setting-desc.c:7709
- msgid "Wi-Fi connection"
-@@ -5884,7 +5873,7 @@ msgstr "Il y a déjà une session d'authentification en cours."
- #: ../clients/common/nm-secret-agent-simple.c:230
- #, c-format
- msgid "Preshared-key for %s"
--msgstr ""
-+msgstr "Clé pré-partagée pour %s"
-
- #: ../clients/common/nm-secret-agent-simple.c:286
- #: ../clients/common/nm-secret-agent-simple.c:323
-@@ -5921,14 +5910,13 @@ msgid "Service"
- msgstr "Service"
-
- #: ../clients/common/nm-secret-agent-simple.c:486
--#, fuzzy
- msgid "WireGuard private-key"
--msgstr "clé privée non valide"
-+msgstr "Clé privée WireGuard"
-
- #: ../clients/common/nm-secret-agent-simple.c:527
--#, fuzzy, c-format
-+#, c-format
- msgid "Secrets are required to connect WireGuard VPN '%s'"
--msgstr "Il faut un secret pour accéder au réseau sans fil « %s »"
-+msgstr "Il faut des secrets pour vous connecter au VPN WireGuard « %s »"
-
- #: ../clients/common/nm-secret-agent-simple.c:628
- #: ../clients/common/nm-secret-agent-simple.c:912
-@@ -6002,9 +5990,8 @@ msgid "MACsec EAP authentication"
- msgstr "Authentification MACsec EAP"
-
- #: ../clients/common/nm-secret-agent-simple.c:940
--#, fuzzy
- msgid "WireGuard VPN secret"
--msgstr "WireGuard"
-+msgstr "Secret VPN WireGuard"
-
- #: ../clients/common/nm-secret-agent-simple.c:979
- msgid "VPN password required"
-@@ -6061,36 +6048,37 @@ msgid "Gateway certificate hash"
- msgstr "Hachage de certificat de passerelle"
-
- #: ../clients/common/nm-vpn-helpers.c:270
--#, fuzzy, c-format
-+#, c-format
- msgid "Invalid peer starting at %s:%zu: %s"
--msgstr "nom de configuration non valide « %s »"
-+msgstr "Homologue non valide commençant à %s:%zu: %s"
-
- #: ../clients/common/nm-vpn-helpers.c:390
- 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\""
-
- #: ../clients/common/nm-vpn-helpers.c:678
- #, c-format
- msgid "unrecognized line at %s:%zu"
--msgstr ""
-+msgstr "ligne non reconnue à %s:%zu"
-
- #: ../clients/common/nm-vpn-helpers.c:683
--#, fuzzy, c-format
-+#, c-format
- msgid "invalid value for '%s' at %s:%zu"
--msgstr "valeur non valide pour \"%s\": %s"
-+msgstr "valeur non reconnue pour '%s' at %s:%zu"
-
- #: ../clients/common/nm-vpn-helpers.c:688
--#, fuzzy, c-format
-+#, c-format
- msgid "invalid secret '%s' at %s:%zu"
--msgstr "route non valide : %s. %s"
-+msgstr "secret non valide '%s' à %s:%zu"
-
- #: ../clients/common/nm-vpn-helpers.c:801
--#, fuzzy, c-format
-+#, c-format
- msgid "Failed to create WireGuard connection: %s"
--msgstr ""
--"Erreur : échec de l'ajout ou de l'activation de la nouvelle connexion : %s"
-+msgstr "N'a pas pu créer de connexion WireGuard : %s"
-
- #. Generated file. Do not edit.
- #: ../clients/common/settings-docs.h.in:3
-@@ -6164,18 +6152,18 @@ msgstr ""
- #: ../clients/common/settings-docs.h.in:10
- #, fuzzy
- msgid ""
--"If specified, request that the device use this MAC address instead of its "
--"permanent MAC address. This is known as MAC cloning or spoofing. Beside "
--"explicitly specifying a MAC address, the special values \"preserve\", "
--"\"permanent\", \"random\" and \"stable\" are supported. \"preserve\" means "
--"not to touch the MAC address on activation. \"permanent\" means to use the "
--"permanent hardware address of the device. \"random\" 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 \"permanent\". On D-Bus, this field is "
--"expressed as \"assigned-mac-address\" or the deprecated \"cloned-mac-address"
--"\"."
-+"If specified, request that the device use this MAC address instead. This is "
-+"known as MAC cloning or spoofing. Beside explicitly specifying a MAC "
-+"address, the special values \"preserve\", \"permanent\", \"random\" and "
-+"\"stable\" are supported. \"preserve\" means not to touch the MAC address on "
-+"activation. \"permanent\" means to use the permanent hardware address of the "
-+"device. \"random\" 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 \"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. "
-@@ -6188,9 +6176,8 @@ msgstr ""
- "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 à "
--"\"preserve\" par défaut (les anciennes versions de NetworkManager peuvent "
--"utiliser une valeur par défaut différente). Sur le bus D, ce champ est "
--"« assigned-mac-address » ou « cloned-mac-address » (déprécié)."
-+"\"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
-@@ -6258,6 +6245,17 @@ msgid ""
- "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."
-
- #: ../clients/common/settings-docs.h.in:13
- msgid ""
-@@ -6449,7 +6447,6 @@ msgstr ""
- "\"ccmp\"."
-
- #: ../clients/common/settings-docs.h.in:27
--#, fuzzy
- msgid ""
- "Key management used for the connection. One of \"none\" (WEP), \"ieee8021x"
- "\" (Dynamic WEP), \"wpa-none\" (Ad-Hoc WPA-PSK), \"wpa-psk\" (infrastructure "
-@@ -6472,7 +6469,7 @@ msgstr ""
-
- #: ../clients/common/settings-docs.h.in:29
- msgid "Flags indicating how to handle the \"leap-password\" property."
--msgstr "Drapeaux indiquant comment gérer la propriété \"Leap-password\"."
-+msgstr "Marqueurs indiquant comment gérer la propriété \"Leap-password\"."
-
- #: ../clients/common/settings-docs.h.in:30
- msgid ""
-@@ -6535,17 +6532,23 @@ msgid ""
- "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."
-
- #: ../clients/common/settings-docs.h.in:35
- msgid "Flags indicating how to handle the \"psk\" property."
--msgstr "Drapeaux indiquant comment gérer la propriété \"psk\"."
-+msgstr "Marqueurs indiquant comment gérer la propriété \"psk\"."
-
- #: ../clients/common/settings-docs.h.in:36
- msgid ""
- "Flags indicating how to handle the \"wep-key0\", \"wep-key1\", \"wep-key2\", "
- "and \"wep-key3\" properties."
- msgstr ""
--"Drapeaux indiquant comment gérer les propriétés \"wep-key0\", \"wep-key1\", "
-+"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
-@@ -6621,7 +6624,7 @@ msgid ""
- "Point capabilities. WPS can be disabled by setting this property to a value "
- "of 1."
- msgstr ""
--"Drapeaux indiquant quel mode de WPS doit être utilisé, le cas échéant. Il y "
-+"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 "
-@@ -6691,7 +6694,7 @@ msgstr ""
-
- #: ../clients/common/settings-docs.h.in:49
- msgid "Flags indicating how to handle the \"ca-cert-password\" property."
--msgstr "Drapeaux indiquant comment gérer la propriété \"ca-cert-password\"."
-+msgstr "Marqueurs indiquant comment gérer la propriété \"ca-cert-password\"."
-
- #: ../clients/common/settings-docs.h.in:50
- msgid ""
-@@ -6735,7 +6738,7 @@ msgstr ""
- #: ../clients/common/settings-docs.h.in:53
- msgid "Flags indicating how to handle the \"client-cert-password\" property."
- msgstr ""
--"Drapeaux indiquant comment gérer la propriété \"client-cert-password\"."
-+"Marqueurs indiquant comment gérer la propriété \"client-cert-password\"."
-
- #: ../clients/common/settings-docs.h.in:54
- msgid ""
-@@ -6794,7 +6797,7 @@ msgstr ""
- #: ../clients/common/settings-docs.h.in:178
- #: ../clients/common/settings-docs.h.in:290
- msgid "Flags indicating how to handle the \"password\" property."
--msgstr "Drapeaux indiquant comment gérer la propriété \"password\"."
-+msgstr "Marqueurs indiquant comment gérer la propriété \"password\"."
-
- #: ../clients/common/settings-docs.h.in:60
- msgid ""
-@@ -6810,7 +6813,7 @@ msgstr ""
-
- #: ../clients/common/settings-docs.h.in:61
- msgid "Flags indicating how to handle the \"password-raw\" property."
--msgstr "Drapeaux indiquant comment gérer la propriété \"password-raw\"."
-+msgstr "Marqueurs indiquant comment gérer la propriété \"password-raw\"."
-
- #: ../clients/common/settings-docs.h.in:62
- msgid ""
-@@ -6821,10 +6824,10 @@ msgid ""
- "tls_disable_tlsv1_x settings. See the wpa_supplicant documentation for more "
- "details."
- msgstr ""
--"Spécifie les drapeaux d'authentification à utiliser dans l'authentification "
-+"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 drapeau TLS désactivé n'est pas activé, il appartient au suppliant "
-+"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."
-@@ -6958,7 +6961,7 @@ msgstr ""
- msgid ""
- "Flags indicating how to handle the \"phase2-ca-cert-password\" property."
- msgstr ""
--"Drapeaux indiquant comment gérer la propriété \"phase2-ca-cert-password\"."
-+"Marqueurs indiquant comment gérer la propriété \"phase2-ca-cert-password\"."
-
- #: ../clients/common/settings-docs.h.in:72
- msgid ""
-@@ -7008,7 +7011,7 @@ msgstr ""
- msgid ""
- "Flags indicating how to handle the \"phase2-client-cert-password\" property."
- msgstr ""
--"Drapeaux indiquant comment gérer la propriété \"phase2-client-cert-password"
-+"Marqueurs indiquant comment gérer la propriété \"phase2-client-cert-password"
- "\"."
-
- #: ../clients/common/settings-docs.h.in:76
-@@ -7103,7 +7106,7 @@ msgstr "PIN utilisé pour les méthodes d'authentification EAP."
- #: ../clients/common/settings-docs.h.in:82
- #: ../clients/common/settings-docs.h.in:180
- msgid "Flags indicating how to handle the \"pin\" property."
--msgstr "Drapeaux indiquant comment gérer la propriété \"pin\"."
-+msgstr "Marqueurs indiquant comment gérer la propriété \"pin\"."
-
- #: ../clients/common/settings-docs.h.in:83
- msgid ""
-@@ -7162,7 +7165,7 @@ msgstr ""
- #: ../clients/common/settings-docs.h.in:85
- msgid "Flags indicating how to handle the \"private-key-password\" property."
- msgstr ""
--"Drapeaux indiquant comment gérer la propriété \"private-key-password\"."
-+"Marqueurs indiquant comment gérer la propriété \"private-key-password\"."
-
- #: ../clients/common/settings-docs.h.in:86
- msgid ""
-@@ -7220,35 +7223,33 @@ msgstr ""
- #: ../clients/common/settings-docs.h.in:89
- #, fuzzy
- msgid ""
--"If specified, request that the device use this MAC address instead of its "
--"permanent MAC address. This is known as MAC cloning or spoofing. Beside "
--"explicitly specifying a MAC address, the special values \"preserve\", "
--"\"permanent\", \"random\" and \"stable\" are supported. \"preserve\" means "
--"not to touch the MAC address on activation. \"permanent\" means to use the "
--"permanent hardware address if the device has one (otherwise this is treated "
--"as \"preserve\"). \"random\" 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 \"permanent\". On D-Bus, this field is expressed as \"assigned-"
--"mac-address\" or the deprecated \"cloned-mac-address\"."
-+"If specified, request that the device use this MAC address instead. This is "
-+"known as MAC cloning or spoofing. Beside explicitly specifying a MAC "
-+"address, the special values \"preserve\", \"permanent\", \"random\" and "
-+"\"stable\" are supported. \"preserve\" means not to touch the MAC address on "
-+"activation. \"permanent\" means to use the permanent hardware address if the "
-+"device has one (otherwise this is treated as \"preserve\"). \"random\" "
-+"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 "
-+"\"cloned-mac-address\"."
- msgstr ""
--"Si spécifié, demandez au périphérique d'utiliser cette adresse MAC à la "
-+"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 si "
--"l'appareil en possède une (sinon, cela est considéré comme une \"préservation"
--"\"). \"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 "
--"remplacée par les valeurs par défaut globales, voir le manuel de "
--"NetworkManager.conf. Si elle n'est pas encore spécifiée, elle sera sur "
--"\"preserve\" par défaut (les anciennes versions de NetworkManager peuvent "
--"utiliser une valeur par défaut différente). Sur le bus D, ce champ est "
--"exprimé par \"assigned-mac-address\" ou la désapprouvée \"cloned-mac-address"
--"\"."
-+"\"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
- msgid ""
-@@ -7545,13 +7546,12 @@ 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."
-
- #: ../clients/common/settings-docs.h.in:122
--#, fuzzy
- msgid "Control whether VLAN filtering is enabled on the bridge."
--msgstr ""
--"Contrôle si le protocole Spanning Tree Protocol (STP) est activé pour ce "
--"pont."
-+msgstr "Contrôle l'activation du filtrage VLAN sur le pontage."
-
- #: ../clients/common/settings-docs.h.in:123
- msgid ""
-@@ -7562,6 +7562,13 @@ msgid ""
- "$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:124
- msgid ""
-@@ -7591,6 +7598,13 @@ msgid ""
- "[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:174
-@@ -7869,7 +7883,6 @@ msgstr ""
- "exemple, \"bond\"), ou NULL si cette connexion n'est pas un esclave."
-
- #: ../clients/common/settings-docs.h.in:151
--#, fuzzy
- msgid ""
- "This represents the identity of the connection used for various purposes. It "
- "allows to configure multiple profiles to share the identity. Also, the "
-@@ -8886,7 +8899,7 @@ msgstr ""
-
- #: ../clients/common/settings-docs.h.in:246
- msgid "Flags indicating how to handle the \"mka-cak\" property."
--msgstr "Drapeaux indiquant comment gérer la propriété \"mka-cak\"."
-+msgstr "Marqueurs indiquant comment gérer la propriété \"mka-cak\"."
-
- #: ../clients/common/settings-docs.h.in:247
- msgid ""
-@@ -9287,6 +9300,11 @@ msgid ""
- "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."
-
- #: ../clients/common/settings-docs.h.in:304
- msgid ""
-@@ -9757,6 +9775,8 @@ 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."
-
- #: ../clients/common/settings-docs.h.in:365
- msgid ""
-@@ -9766,19 +9786,21 @@ msgid ""
- "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."
-
- #: ../clients/common/settings-docs.h.in:366
--#, fuzzy
- 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 ""
--"Drapeaux 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."
-+"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:367
- msgid ""
-@@ -9803,15 +9825,19 @@ 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."
- 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."
-
- #: ../clients/common/settings-docs.h.in:370
- 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."
-
- #: ../clients/common/settings-docs.h.in:371
--#, fuzzy
- 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 "
-@@ -9819,8 +9845,10 @@ msgid ""
- "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 "
--"Ethernet."
-+"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:372
- msgid ""
-@@ -9830,22 +9858,28 @@ msgid ""
- "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."
-
- #: ../clients/common/settings-docs.h.in:373
- msgid "The 256 bit private-key in base64 encoding."
--msgstr ""
-+msgstr "La clé privée 256 bits en encodage base64."
-
- #: ../clients/common/settings-docs.h.in:374
--#, fuzzy
- msgid "Flags indicating how to handle the \"private-key\" property."
--msgstr ""
--"Drapeaux indiquant comment gérer la propriété \"private-key-password\"."
-+msgstr "Marqueurs indiquant comment gérer la propriété \"private-key\"."
-
- #: ../clients/common/settings-docs.h.in:375
- 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é »."
-
- #: ../clients/common/settings-docs.h.in:376
- msgid ""
-@@ -9860,6 +9894,8 @@ 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é »."
-
- #: ../clients/common/settings-docs.h.in:378
- msgid "IEEE 802.15.4 Personal Area Network (PAN) identifier."
-@@ -9995,7 +10031,7 @@ msgstr "Connexion DSL %d"
- #: ../clients/tui/nm-editor-utils.c:188 ../libnm-core/nm-connection.c:2509
- #: ../libnm-glib/nm-device.c:1834 ../libnm-util/nm-connection.c:1623
- #: ../libnm/nm-device.c:1400
--#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4836
-+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4898
- msgid "Bond"
- msgstr "Liaison"
-
-@@ -10007,7 +10043,7 @@ msgstr "Connexion de liaison %d"
- #: ../clients/tui/nm-editor-utils.c:197 ../libnm-core/nm-connection.c:2513
- #: ../libnm-glib/nm-device.c:1838 ../libnm-util/nm-connection.c:1627
- #: ../libnm/nm-device.c:1404
--#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5216
-+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5288
- msgid "Bridge"
- msgstr "Pont"
-
-@@ -10019,7 +10055,7 @@ msgstr "Connexion de pont %d"
- #: ../clients/tui/nm-editor-utils.c:206 ../libnm-core/nm-connection.c:2511
- #: ../libnm-glib/nm-device.c:1836 ../libnm-util/nm-connection.c:1625
- #: ../libnm/nm-device.c:1402
--#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4939
-+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5006
- msgid "Team"
- msgstr "Équipe"
-
-@@ -11237,6 +11273,7 @@ msgstr "La méthode a renvoyé le type « %s », mais « %s » était attend
- #, c-format
- msgid "value is not an integer in range [%lld, %lld]"
- msgstr ""
-+"valur ne correspondant pas à un nombre entier relatif entre [%lld, %lld]"
-
- #: ../libnm-core/nm-keyfile.c:211
- msgid "ignoring missing number"
-@@ -11365,9 +11402,9 @@ msgid "invalid parity value '%s'"
- msgstr "valeur de parité « %s » non valide"
-
- #: ../libnm-core/nm-keyfile.c:1603 ../libnm-core/nm-keyfile.c:3052
--#, fuzzy, c-format
-+#, c-format
- msgid "invalid setting: %s"
--msgstr "nom de configuration non valide « %s »"
-+msgstr "configuration non valide « %s »"
-
- #: ../libnm-core/nm-keyfile.c:1618
- #, c-format
-@@ -11394,7 +11431,7 @@ msgstr "erreur de chargement de la valeur du paramètre : %s"
- #: ../libnm-core/nm-keyfile.c:2975 ../libnm-core/nm-keyfile.c:3027
- #: ../libnm-core/nm-keyfile.c:3038
- msgid "value cannot be interpreted as integer"
--msgstr ""
-+msgstr "la valeur ne doit pas être interprétée en tant que nombre entier"
-
- #: ../libnm-core/nm-keyfile.c:3073
- #, c-format
-@@ -11412,39 +11449,40 @@ msgid "key '%s.%s' is not boolean"
- msgstr "clé '%s.%s' n’est pas un booléen"
-
- #: ../libnm-core/nm-keyfile.c:3190
--#, fuzzy, c-format
-+#, c-format
- msgid "invalid peer public key in section '%s'"
--msgstr "option « %s » non valide"
-+msgstr "Clé publique homologue non valide dans la section «%s»"
-
- #: ../libnm-core/nm-keyfile.c:3202
- #, c-format
- msgid "key '%s.%s' is not a valid 256 bit key in base64 encoding"
--msgstr ""
-+msgstr "clé « %s.%s » est une clé de 256 non valide en chiffrage base64"
-
- #: ../libnm-core/nm-keyfile.c:3215
--#, fuzzy, c-format
-+#, c-format
- msgid "key '%s.%s' is not a valid secret flag"
--msgstr "« %s » n'est pas un marqueur DCB valide"
-+msgstr "« %s.%s » n'est pas un marqueur de secret valide"
-
- #: ../libnm-core/nm-keyfile.c:3227
--#, fuzzy, c-format
-+#, c-format
- msgid "key '%s.%s' is not a integer in range 0 to 2^32"
--msgstr "clé '%s.%s' n’est pas un booléen"
-+msgstr ""
-+"clé « %s.%s » ne correspond pas à un nombre entier relatif entre 0 et 2^32"
-
- #: ../libnm-core/nm-keyfile.c:3239
--#, fuzzy, c-format
-+#, c-format
- msgid "key '%s.%s' is not a valid endpoint"
--msgstr "'%s' n’est pas un type valide"
-+msgstr "clé « %s.%s » n'est pas un point de terminaison valide"
-
- #: ../libnm-core/nm-keyfile.c:3261
- #, c-format
- msgid "key '%s.%s' has invalid allowed-ips"
--msgstr ""
-+msgstr "clé « %s.%s » comprend des adresses ip «allowed-ips» non valides"
-
- #: ../libnm-core/nm-keyfile.c:3273
--#, fuzzy, c-format
-+#, c-format
- msgid "peer '%s' is invalid: %s"
--msgstr "« %s » n'est pas valide"
-+msgstr "l'homologue « %s » est non valide : %s"
-
- #: ../libnm-core/nm-setting-6lowpan.c:93
- #, c-format
-@@ -11614,7 +11652,7 @@ msgstr "« %s » n'est pas une valeur valide pour la propriété"
-
- #: ../libnm-core/nm-setting-8021x.c:2896
- msgid "invalid auth flags"
--msgstr "drapeaux d'auth non valides"
-+msgstr "marqueurs d'auth non valides"
-
- #: ../libnm-core/nm-setting-bluetooth.c:160
- #, c-format
-@@ -11914,10 +11952,9 @@ msgstr ""
- "à « %s » ou ne doit pas être défini (au lieu de « %s »)"
-
- #: ../libnm-core/nm-setting-infiniband.c:281
--#, fuzzy, c-format
-+#, c-format
- msgid "mtu can be at most %u but it is %u"
--msgstr ""
--"mtu pour le mode de transport « %s » but être %d au maximum et non pas %d"
-+msgstr "mtu peut être %u au maximum but il est à %u"
-
- #: ../libnm-core/nm-setting-ip-config.c:136
- #, c-format
-@@ -11993,164 +12030,147 @@ msgid "invalid prefix %s"
- msgstr "préfixe %s non valide"
-
- #: ../libnm-core/nm-setting-ip-config.c:2479
--#, fuzzy
- msgid "invalid priority"
--msgstr "Plan des priorités non valide « %s »"
-+msgstr "priorité non valide"
-
- #: ../libnm-core/nm-setting-ip-config.c:2490
--#, fuzzy
- msgid "missing table"
--msgstr "clé manquante"
-+msgstr "tableau manquant"
-
- #: ../libnm-core/nm-setting-ip-config.c:2496
--#, fuzzy
- msgid "invalid action"
--msgstr "option « » non valide"
-+msgstr "action non valide"
-
- #: ../libnm-core/nm-setting-ip-config.c:2503
- msgid "has from/src but the prefix-length is zero"
--msgstr ""
-+msgstr "comprend « from/src » mais la longueur du préfixe est zéro"
-
- #: ../libnm-core/nm-setting-ip-config.c:2510
- msgid "missing from/src for a non zero prefix-length"
--msgstr ""
-+msgstr "ne comprend pas « from/src » et la longueur du préfixe n'est pas zéro"
-
- #: ../libnm-core/nm-setting-ip-config.c:2515
--#, fuzzy
- msgid "invalid from/src"
--msgstr "port invalide %d"
-+msgstr "from/src non valide"
-
- #: ../libnm-core/nm-setting-ip-config.c:2520
--#, fuzzy
- msgid "invalid prefix length for from/src"
--msgstr "longueur de préfixe non valide pour %s : « %s », valeur par défaut %d"
-+msgstr "longueur de préfixe non valide pour « from/src »"
-
- #: ../libnm-core/nm-setting-ip-config.c:2527
- msgid "has to/dst but the prefix-length is zero"
--msgstr ""
-+msgstr "comprend « to/dst » mais la longueur du préfixe est zéro"
-
- #: ../libnm-core/nm-setting-ip-config.c:2534
- msgid "missing to/dst for a non zero prefix-length"
--msgstr ""
-+msgstr "ne comprend pas « to/dst » et la longueur du préfixe n'est pas zéro"
-
- #: ../libnm-core/nm-setting-ip-config.c:2539
--#, fuzzy
- msgid "invalid to/dst"
--msgstr "port invalide %d"
-+msgstr "to/dst non valide"
-
- #: ../libnm-core/nm-setting-ip-config.c:2544
--#, fuzzy
- msgid "invalid prefix length for to/dst"
--msgstr "longueur de préfixe non valide pour %s : « %s », valeur par défaut %d"
-+msgstr "longueur de préfixe non valide pour « to/dst »"
-
- #: ../libnm-core/nm-setting-ip-config.c:2552
--#, fuzzy
- msgid "invalid iifname"
--msgstr "valeur non valide"
-+msgstr "iifname non valide"
-
- #: ../libnm-core/nm-setting-ip-config.c:2560
--#, fuzzy
- msgid "invalid oifname"
--msgstr "valeur non valide"
-+msgstr "oifname non valide"
-
- #: ../libnm-core/nm-setting-ip-config.c:2566
--#, fuzzy
- msgid "invalid source port range"
--msgstr "Port source minimum [0]"
-+msgstr "Plage de ports source non valide"
-
- #: ../libnm-core/nm-setting-ip-config.c:2572
--#, fuzzy
- msgid "invalid destination port range"
--msgstr "option « » non valide"
-+msgstr "Plage de ports de destination non valides"
-
- #: ../libnm-core/nm-setting-ip-config.c:2676
--#, fuzzy, c-format
-+#, c-format
- msgid "duplicate key %s"
--msgstr "dupliquer la propriété"
-+msgstr "clé dupliquée %s"
-
- #: ../libnm-core/nm-setting-ip-config.c:2690
--#, fuzzy, c-format
-+#, c-format
- msgid "invalid key \"%s\""
--msgstr "clé non valide \"%s\": %s"
-+msgstr "clé non valide « %s »"
-
- #: ../libnm-core/nm-setting-ip-config.c:2703
--#, fuzzy, c-format
-+#, c-format
- msgid "invalid variant type '%s' for \"%s\""
--msgstr "type d'attribut « %s » non valide"
-+msgstr "type de variante '%s' pour \"%s\" non valide"
-
- #: ../libnm-core/nm-setting-ip-config.c:2712
--#, fuzzy
- msgid "missing \""
--msgstr "clé manquante"
-+msgstr "manquant \""
-
- #: ../libnm-core/nm-setting-ip-config.c:2718
--#, fuzzy
- msgid "invalid \""
--msgstr "DUID non valide"
-+msgstr "non valid \""
-
- #: ../libnm-core/nm-setting-ip-config.c:2909
--#, fuzzy
- msgid "Unsupported to-string-flags argument"
--msgstr "fonctionnalité de déchargement non prise en charge"
-+msgstr "Argument to-string-flag non pris en charge"
-
- #: ../libnm-core/nm-setting-ip-config.c:2916
- msgid "Unsupported extra-argument"
--msgstr ""
-+msgstr "extra-argument non pris en charge"
-
- #: ../libnm-core/nm-setting-ip-config.c:3161
--#, fuzzy, c-format
-+#, c-format
- msgid "unsupported key \"%s\""
--msgstr "attribut « %s » de type « » non supporté"
-+msgstr "clé « %s » non prise en charge"
-
- #: ../libnm-core/nm-setting-ip-config.c:3166
--#, fuzzy, c-format
-+#, c-format
- msgid "duplicate key \"%s\""
--msgstr "index VF dupliqué %u"
-+msgstr "clé « %s » dupliquée"
-
- #: ../libnm-core/nm-setting-ip-config.c:3171
--#, fuzzy, c-format
-+#, c-format
- msgid "invalid value for \"%s\""
--msgstr "valeur non valide pour \"%s\": %s"
-+msgstr "valeur de « %s » non valide"
-
- #: ../libnm-core/nm-setting-ip-config.c:3181
- msgid "empty text does not describe a rule"
--msgstr ""
-+msgstr "texte vide qui ne décrit pas de règle"
-
- #: ../libnm-core/nm-setting-ip-config.c:3187
--#, fuzzy, c-format
-+#, c-format
- msgid "missing argument for \"%s\""
--msgstr "hôte cible manquant"
-+msgstr "argument manquant pour « %s »"
-
- #: ../libnm-core/nm-setting-ip-config.c:3199
--#, fuzzy
- msgid "invalid \"from\" part"
--msgstr "port invalide %d"
-+msgstr "partie « from » non valide"
-
- #: ../libnm-core/nm-setting-ip-config.c:3213
--#, fuzzy
- msgid "invalid \"to\" part"
--msgstr "port invalide %d"
-+msgstr "parie « to » non valide"
-
- #: ../libnm-core/nm-setting-ip-config.c:3222
- #, c-format
- msgid "cannot detect address family for rule"
--msgstr ""
-+msgstr "impossible de détecter la famille d'adresses pour la règle"
-
- #: ../libnm-core/nm-setting-ip-config.c:3279
- #: ../libnm-core/nm-setting-ip-config.c:3373
--#, fuzzy, c-format
-+#, c-format
- msgid "rule is invalid: %s"
--msgstr "certificat non valide : %s"
-+msgstr "règle suivante non valide : %s"
-
- #: ../libnm-core/nm-setting-ip-config.c:3356
--#, fuzzy
- msgid "invalid address family"
--msgstr "adresse IP invalide : %s"
-+msgstr "famille d'adresses non valide"
-
- #: ../libnm-core/nm-setting-ip-config.c:4618
--#, fuzzy, c-format
-+#, c-format
- msgid "rule #%u is invalid: %s"
--msgstr "certificat non valide : %s"
-+msgstr "règle #%u non valide : %s"
-
- #: ../libnm-core/nm-setting-ip-config.c:4836
- #, c-format
-@@ -12195,12 +12215,12 @@ msgstr "%d. La route ne peut pas être une route par défaut"
- #: ../libnm-core/nm-setting-ip-config.c:4935
- #, c-format
- msgid "%u. rule has wrong address-family"
--msgstr ""
-+msgstr "la règle %u. a une mauvaise address-family"
-
- #: ../libnm-core/nm-setting-ip-config.c:4944
--#, fuzzy, c-format
-+#, c-format
- msgid "%u. rule is invalid: %s"
--msgstr "%d. La route n'est pas valide"
-+msgstr "la règle %u. est non valide : %s"
-
- #: ../libnm-core/nm-setting-ip-config.c:4957
- #, c-format
-@@ -12235,7 +12255,7 @@ msgstr "un TTL fixe est permis quand le chemin MTU de découverte est actif"
- #: ../libnm-core/nm-setting-ip-tunnel.c:454
- #, c-format
- msgid "some flags are invalid for the select mode: %s"
--msgstr "certains drapeaux ne sont pas valides pour le mode select : %s"
-+msgstr "certains marqueurs ne sont pas valides pour le mode select : %s"
-
- #: ../libnm-core/nm-setting-ip-tunnel.c:468
- #, c-format
-@@ -12335,7 +12355,7 @@ msgstr "La gestion des clés EAP requiert la présence de paramètres '%s'"
-
- #: ../libnm-core/nm-setting-macsec.c:357
- msgid "must be either psk (0) or eap (1)"
--msgstr ""
-+msgstr "doit être soit psk (0), soit eap (1)"
-
- #: ../libnm-core/nm-setting-macsec.c:366
- #, c-format
-@@ -12344,7 +12364,7 @@ msgstr "port invalide %d"
-
- #: ../libnm-core/nm-setting-macsec.c:377
- msgid "only valid for psk mode"
--msgstr ""
-+msgstr "uniquement valide en mode psk"
-
- #: ../libnm-core/nm-setting-macvlan.c:168
- msgid "non promiscuous operation is allowed only in passthru mode"
-@@ -12501,9 +12521,9 @@ msgid "the script lacks FindProxyForURL function"
- msgstr "il manque à ce script la fonction FindProxyForURL"
-
- #: ../libnm-core/nm-setting-sriov.c:1070
--#, fuzzy, c-format
-+#, c-format
- msgid "VF with index %u, but the total number of VFs is %u"
--msgstr "VF avec indice %u, mais le nombre total de VF est "
-+msgstr "VF avec index %u, mais le nombre total de VF est %u"
-
- #: ../libnm-core/nm-setting-sriov.c:1081
- #, c-format
-@@ -12523,9 +12543,9 @@ 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
--#, fuzzy, c-format
-+#, c-format
- msgid "kind is missing"
--msgstr "la valeur est manquante"
-+msgstr "type manquant"
-
- #: ../libnm-core/nm-setting-tc-config.c:78
- #: ../libnm-core/nm-setting-tc-config.c:444
-@@ -12580,9 +12600,8 @@ msgid "source-host '%s' contains invalid characters"
- msgstr "hôte-source « %s » contient des caractères non valides"
-
- #: ../libnm-core/nm-setting-team.c:312
--#, fuzzy
- msgid "vlanid is out of range [-1, 4094]"
--msgstr "La valeur « %d » est hors de portée <%d-%d>"
-+msgstr "vlanid n'est pas entre [-1, 4094]"
-
- #: ../libnm-core/nm-setting-team.c:1260
- #, c-format
-@@ -12716,9 +12735,8 @@ msgid "secret is not of correct type"
- msgstr "secret de type erroné"
-
- #: ../libnm-core/nm-setting-vpn.c:757
--#, fuzzy
- msgid "secret flags property not found"
--msgstr "La propriété « %s » de marqueurs secrets n'a pas été trouvée"
-+msgstr "la propriété des marqueurs secrets n'a pas été trouvée"
-
- #: ../libnm-core/nm-setting-vxlan.c:367
- #, c-format
-@@ -12770,80 +12788,79 @@ msgstr ""
-
- #: ../libnm-core/nm-setting-wireguard.c:778
- msgid "missing public-key for peer"
--msgstr ""
-+msgstr "clé publique manquante pour l'homologue"
-
- #: ../libnm-core/nm-setting-wireguard.c:782
- msgid "invalid public-key for peer"
--msgstr ""
-+msgstr "clé publique non valide pour l'homologue"
-
- #: ../libnm-core/nm-setting-wireguard.c:791
--#, fuzzy
- msgid "invalid preshared-key for peer"
--msgstr "clé privée non valide"
-+msgstr "clé pré-partagée non valide pour l'homologue"
-
- #: ../libnm-core/nm-setting-wireguard.c:809
--#, fuzzy
- msgid "invalid endpoint for peer"
--msgstr "Point de terminaison local [none]"
-+msgstr "point de terminaison non valide pour l'homologue"
-
- #: ../libnm-core/nm-setting-wireguard.c:819
--#, fuzzy, c-format
-+#, c-format
- msgid "invalid IP address \"%s\" for allowed-ip of peer"
--msgstr "adresse IP invalide : %s"
-+msgstr ""
-+"adresse IP non valide : « %s » pour l'adresse ip autorisée (allowed-ip) de "
-+"l'homologue"
-
- #: ../libnm-core/nm-setting-wireguard.c:828
- msgid "invalid preshared-key-flags for peer"
--msgstr ""
-+msgstr "marqueurs preshared-key-flags non valide pour l'homologue"
-
- #: ../libnm-core/nm-setting-wireguard.c:1567
- #, c-format
- msgid "peer #%u has no public-key"
--msgstr ""
-+msgstr "l'homologue #%u n'a pas de clé publique"
-
- #: ../libnm-core/nm-setting-wireguard.c:1578
- #, c-format
- msgid "peer #%u has invalid public-key"
--msgstr ""
-+msgstr "l'homologue #%u a une clé publique non valide"
-
- #: ../libnm-core/nm-setting-wireguard.c:1592
- #, c-format
- msgid "peer #%u has invalid endpoint"
--msgstr ""
-+msgstr "l'homologue #%u a un point de terminaison non valide"
-
- #: ../libnm-core/nm-setting-wireguard.c:1622
- #, c-format
- msgid "peer #%u has invalid allowed-ips setting"
--msgstr ""
-+msgstr "l'homologue #%u a une configuration aloowed-ip non valide"
-
- #: ../libnm-core/nm-setting-wireguard.c:1634
--#, fuzzy, c-format
-+#, c-format
- msgid "peer #%u is invalid: %s"
--msgstr "certificat non valide : %s"
-+msgstr "l'homologue #%u est non valide : %s"
-
- #: ../libnm-core/nm-setting-wireguard.c:1705
- #: ../libnm-core/nm-setting-wireguard.c:1719
- #, c-format
- msgid "method \"%s\" is not supported for WireGuard"
--msgstr ""
-+msgstr "la méthode « %s » n'est pas prise en charge par WireGuard"
-
- #: ../libnm-core/nm-setting-wireguard.c:1739
- msgid "key must be 32 bytes base64 encoded"
--msgstr ""
-+msgstr "la clé doit compter 32 octets et chiffrée base64"
-
- #: ../libnm-core/nm-setting-wireguard.c:1875
--#, fuzzy
- msgid "invalid peer secrets"
--msgstr "Secrets non valides"
-+msgstr "Secrets de l'homologue non valides"
-
- #: ../libnm-core/nm-setting-wireguard.c:1898
- #, c-format
- msgid "peer #%u lacks public-key"
--msgstr ""
-+msgstr "l'homologue #%u n'a pas de clé publique"
-
- #: ../libnm-core/nm-setting-wireguard.c:1912
- #, c-format
- msgid "non-existing peer '%s'"
--msgstr ""
-+msgstr "l'homologue « %s » n'existe pas"
-
- #: ../libnm-core/nm-setting-wireless-security.c:935
- #: ../libnm-util/nm-setting-wireless-security.c:911
-@@ -12876,10 +12893,12 @@ 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:1086
--#, fuzzy, c-format
-+#, c-format
- msgid ""
- "'%s' can only be used with 'wpa-eap', 'wpa-psk' or 'sae' key management "
--msgstr "« %s » peut uniquement être utilisé avec '%s=%s' or '%s=%s'"
-+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:756
- #: ../libnm-util/nm-setting-wireless.c:786
-@@ -12911,7 +12930,7 @@ msgstr ""
-
- #: ../libnm-core/nm-setting-wireless.c:889
- msgid "Wake-on-WLAN trying to set unknown flag"
--msgstr "Wake-on-WLAN essaye d'activer un drapeau inconnu"
-+msgstr "Wake-on-WLAN essaye d'activer un marqueur inconnu"
-
- #: ../libnm-core/nm-setting-wireless.c:911
- #, c-format
-@@ -12921,17 +12940,17 @@ msgstr ""
-
- #: ../libnm-core/nm-setting-wpan.c:185
- msgid "page must be defined along with a channel"
--msgstr ""
-+msgstr "page et canal doivent être définis"
-
- #: ../libnm-core/nm-setting-wpan.c:194
- #, c-format
- msgid "page must be between %d and %d"
--msgstr ""
-+msgstr "page doit être entre %d et %d"
-
- #: ../libnm-core/nm-setting-wpan.c:205
- #, c-format
- msgid "channel must not be between %d and %d"
--msgstr ""
-+msgstr "canal ne doit pas être entre %d et %d"
-
- #: ../libnm-core/nm-setting.c:872
- #, c-format
-@@ -13057,32 +13076,28 @@ msgid "Could not find \"%s\" binary"
- msgstr "N'a pas pu trouver le binaire « %s »"
-
- #: ../libnm-core/nm-utils.c:4460
--#, fuzzy
- msgid "unknown secret flags"
--msgstr "Nom de paramètre inconnu"
-+msgstr "marqueurs de secret inconnus"
-
- #: ../libnm-core/nm-utils.c:4470
- msgid "conflicting secret flags"
--msgstr ""
-+msgstr "marqueurs de secret conflictueux"
-
- #: ../libnm-core/nm-utils.c:4481
--#, fuzzy
- msgid "secret flags must not be \"not-required\""
--msgstr "La propriété « %s » de marqueurs secrets n'a pas été trouvée"
-+msgstr "les marqueurs de secret non doivent pas être «non-requis»"
-
- #: ../libnm-core/nm-utils.c:4489
--#, fuzzy
- msgid "unsupported secret flags"
--msgstr "attribut « %s » de type « » non supporté"
-+msgstr "marqueurs de secret non pris en charge"
-
- #: ../libnm-core/nm-utils.c:4519
- msgid "can't be simultaneously disabled and enabled"
- msgstr "ne peut pas être simultanément désactivé et activé"
-
- #: ../libnm-core/nm-utils.c:4527
--#, fuzzy
- msgid "WPS is required"
--msgstr "Code PIN requis"
-+msgstr "WPS requis"
-
- #: ../libnm-core/nm-utils.c:4593
- #, c-format
-@@ -13166,18 +13181,18 @@ msgid "unsupported attribute '%s' of type '%s'"
- msgstr "attribut « %s » de type « %s » non supporté"
-
- #: ../libnm-core/nm-utils.c:6935
--#, fuzzy, c-format
-+#, c-format
- msgid "Bridge VLANs %d and %d are not sorted by ascending vid"
--msgstr "les VF %d et %d ne sont pas ordonnancés par index ascendant"
-+msgstr "Les VLAN %d et %d ne sont pas ordonnancés par vid ascendant"
-
- #: ../libnm-core/nm-utils.c:6959
--#, fuzzy, c-format
-+#, c-format
- msgid "duplicate bridge VLAN vid %u"
--msgstr "index VF dupliqué %u"
-+msgstr "VLAN vid %s de pontage dupliqué"
-
- #: ../libnm-core/nm-utils.c:6971
- msgid "only one VLAN can be the PVID"
--msgstr ""
-+msgstr "un VLAN uniquement peut correspondre au PVID"
-
- #: ../libnm-core/nm-vpn-editor-plugin.c:296
- #, c-format
-@@ -13618,9 +13633,8 @@ msgstr ""
- "pas."
-
- #: ../libnm/nm-device-wifi-p2p.c:326
--#, fuzzy
- msgid "The connection was not a Wi-Fi P2P connection."
--msgstr "La connexion n'était pas une connexion Wi-Fi."
-+msgstr "La connexion n'était pas une connexion Wi-Fi P2P."
-
- #: ../libnm/nm-device-wifi.c:613
- msgid "The connection was not a Wi-Fi connection."
-@@ -13683,9 +13697,8 @@ msgid "WireGuard"
- msgstr "WireGuard"
-
- #: ../libnm/nm-device.c:1432
--#, fuzzy
- msgid "Wi-Fi P2P"
--msgstr "Wi-Fi"
-+msgstr "Wi-Fi P2P"
-
- #: ../libnm/nm-device.c:2551
- #, c-format
-@@ -13788,16 +13801,12 @@ msgid "System policy prevents control of network connections"
- msgstr "La politique du système empêche le contrôle des connexions réseau"
-
- #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:15
--#, fuzzy
- msgid "Allow control of Wi-Fi scans"
- msgstr "Autoriser le contrôle des connexions réseau"
-
- #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:16
--#, fuzzy
- msgid "System policy prevents Wi-Fi scans"
--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 de scanner la Wi-Fi"
-
- #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:17
- msgid "Connection sharing via a protected Wi-Fi network"
-@@ -14039,11 +14048,11 @@ msgid "You must be root to run %s!\n"
- msgstr ""
- "Vous devez être connecté en tant que super-utilisateur pour exécuter %s !\n"
-
--#: ../src/dhcp/nm-dhcp-dhclient-utils.c:272
-+#: ../src/dhcp/nm-dhcp-dhclient-utils.c:302
- msgid "# Created by NetworkManager\n"
- msgstr "# Créé par NetworkManager\n"
-
--#: ../src/dhcp/nm-dhcp-dhclient-utils.c:283
-+#: ../src/dhcp/nm-dhcp-dhclient-utils.c:313
- #, c-format
- msgid ""
- "# Merged from %s\n"
-@@ -14328,9 +14337,9 @@ msgid "Failed to determine AP security information"
- msgstr "N'a pas pu déterminer les informations de sécurité AP"
-
- #: ../src/nm-config.c:562
--#, fuzzy, c-format
-+#, c-format
- msgid "Bad '%s' option: "
--msgstr "l'option « %s » est vide"
-+msgstr "Option « %s » erronée :"
-
- #: ../src/nm-config.c:575
- msgid "Config file location"
-@@ -14382,14 +14391,12 @@ msgid "The expected start of the response"
- msgstr "Début prévu de la réponse"
-
- #: ../src/nm-config.c:595
--#, fuzzy
- msgid "NetworkManager options"
--msgstr "Permissions NetworkManager"
-+msgstr "Options NetworkManager"
-
- #: ../src/nm-config.c:595
--#, fuzzy
- msgid "Show NetworkManager options"
--msgstr "Permissions NetworkManager"
-+msgstr "Afficher options NetworkManager"
-
- #. Interface/IP config
- #: ../src/nm-iface-helper.c:275
-@@ -14507,9 +14514,11 @@ msgid "(%s): Invalid IID %s\n"
- msgstr "(%s): IID non valide %s\n"
-
- #: ../src/nm-iface-helper.c:492
--#, fuzzy, c-format
-+#, c-format
- msgid "(%s): Invalid DHCP client-id %s\n"
--msgstr "(%s) : id-client DHCP non valide\n"
-+msgstr ""
-+"(%s) : id-client DHCP non valide %s\n"
-+"\n"
-
- #: ../src/nm-logging.c:290
- #, c-format
-@@ -14520,185 +14529,3 @@ msgstr "Niveau de journalisation « %s » inconnu"
- #, c-format
- msgid "Unknown log domain '%s'"
- msgstr "Domaine de journalisation « %s » inconnu"
--
--#~ msgid "Error: failed to remove a value from %s.%s: %s."
--#~ msgstr "Erreur : échec lors de la suppression d'une valeur de %s.%s : %s."
--
--#~ msgid "WEP"
--#~ msgstr "WEP"
--
--#~ msgid "WPA1"
--#~ msgstr "WPA1"
--
--#~ msgid "WPA2"
--#~ msgstr "WPA2"
--
--#~ msgid "802.1X"
--#~ msgstr "802.1X"
--
--#~ msgid "default route cannot be added (NetworkManager handles it by itself)"
--#~ msgstr ""
--#~ "la route par défaut ne peut être ajoutée (NetworkManager la gère lui-même)"
--
--#~ msgid "priority '%s' is not valid (<0-%ld>)"
--#~ msgstr "priorité « %s » n'est pas valide (<0-%ld>)"
--
--#~ msgid "no item to remove"
--#~ msgstr "aucun élément à supprimer"
--
--#~ msgid "index '%d' is not in range <0-%d>"
--#~ msgstr "index « %d » n'est pas dans la plage <0-%d>"
--
--#~ msgid "missing option"
--#~ msgstr "option manquante"
--
--#~ msgid "'%s' is not a valid MAC"
--#~ msgstr "« %s » n'est pas une adresse MAC valide"
--
--#~ msgid "the property doesn't contain EAP method '%s'"
--#~ msgstr "la propriété ne contient pas de méthode EAP « %s »"
--
--#~ msgid "the property doesn't contain alternative subject match '%s'"
--#~ msgstr ""
--#~ "la propriété ne contient pas de sujet alternatif correspondant « %s »"
--
--#~ msgid ""
--#~ "the property doesn't contain \"phase2\" alternative subject match '%s'"
--#~ msgstr ""
--#~ "la propriété ne contient pas de sujet alternatif « phase 2 » "
--#~ "correspondant « %s »"
--
--#~ msgid "the property doesn't contain permission '%s'"
--#~ msgstr "la propriété ne contient pas de permission « %s »"
--
--#~ msgid "the property doesn't contain UUID '%s'"
--#~ msgstr "la propriété ne contient pas d'UUID « %s »"
--
--#~ msgid "the property doesn't contain DNS server '%s'"
--#~ msgstr "la propriété ne contient pas de serveur DNS « %s »"
--
--#~ msgid "the property doesn't contain DNS search domain '%s'"
--#~ msgstr "la propriété ne contient pas de domaine de recherche DNS « %s »"
--
--#~ msgid "the property doesn't contain DNS option '%s'"
--#~ msgstr "la propriété ne contient pas d'option DNS « %s »"
--
--#~ msgid "the property doesn't contain IP address '%s'"
--#~ msgstr "la propriété ne contient pas d'adresse IP « %s »"
--
--#~ msgid "the property doesn't contain route '%s'"
--#~ msgstr "la propriété ne contient pas la route « %s »"
--
--#~ msgid "invalid IPv6 address '%s'"
--#~ msgstr "adresse IPv6 « %s » non valide"
--
--#~ msgid "the property doesn't contain interface name '%s'"
--#~ msgstr "la propriété ne contient pas le nom de l'interface « %s »"
--
--#~ msgid "the property doesn't contain vf with index %u"
--#~ msgstr "la propriété ne contient pas vf avec l’index %u"
--
--#~ msgid "the property doesn't contain qdisc '%s'"
--#~ msgstr "la propriété ne contient pas de qdisc « %s »"
--
--#~ msgid ""
--#~ "The valid syntax is: '[root | parent <handle>] [handle <handle>] "
--#~ "<tfilter>'"
--#~ msgstr ""
--#~ "La syntaxe valide est : '[root | parent <handle>][handle <handle>] "
--#~ "<tfilter>'"
--
--#~ msgid "the property doesn't contain tfilter '%s'"
--#~ msgstr "la propriété ne contient pas de tfilter « %s »"
--
--#~ msgid "the property doesn't contain string '%s'"
--#~ msgstr "la propriété ne contient pas la chaîne « %s »"
--
--#~ msgid "the property doesn't contain link watcher '%s'"
--#~ msgstr "la propriété ne contient pas le lien observateur « %s »"
--
--#~ msgid "only one mapping at a time is supported; taking the first one (%s)"
--#~ msgstr ""
--#~ "un seul mappage à la fois est pris en charge ; le premier est retenu (%s)"
--
--#~ msgid "the property doesn't contain mapping '%s'"
--#~ msgstr "la propriété ne contient pas le mappage « %s »"
--
--#~ msgid "no priority to remove"
--#~ msgstr "aucune priorité à supprimer"
--
--#~ msgid "index '%d' is not in the range of <0-%d>"
--#~ msgstr "L’index « %d » n'est pas dans la plage <0-%d>"
--
--#~ msgid "'%s' cannot be empty"
--#~ msgstr "« %s » ne peut pas rester vide"
--
--#~ msgid "the property doesn't contain MAC address '%s'"
--#~ msgstr "la propriété ne contient pas d'adresse MAC « %s »"
--
--#~ msgid "'%s' string value should consist of 1 - 199 characters"
--#~ msgstr "« %s » doit consister à un nombre de 1 - 199 caractères"
--
--#~ msgid "the property doesn't contain protocol '%s'"
--#~ msgstr "la propriété ne contient pas le protocole « %s »"
--
--#~ msgid "'%s' is not a valid PSK"
--#~ msgstr "« %s » n'est pas un PSK valide"
--
--#~ msgid ""
--#~ "Pre-Shared-Key for WPA networks. If the key is 64-characters long, it "
--#~ "must contain only hexadecimal characters and is interpreted as a "
--#~ "hexadecimal WPA key. Otherwise, the key must be between 8 and 63 ASCII "
--#~ "characters (as specified in the 802.11i standard) and is interpreted as a "
--#~ "WPA passphrase, and is hashed to derive the actual WPA-PSK used when "
--#~ "connecting to the Wi-Fi network."
--#~ msgstr ""
--#~ "Clé pré-partagée pour les réseaux WPA. Si la clé est longue de 64 "
--#~ "caractères, elle ne doit contenir que des caractères hexadécimaux et est "
--#~ "interprétée comme une clé WPA hexadécimale. Sinon, la clé doit comporter "
--#~ "entre 8 et 63 caractères ASCII (comme spécifié dans la norme 802.11i) et "
--#~ "est interprétée comme une phrase de passe WPA, et est hachée pour obtenir "
--#~ "le WPA-PSK réel utilisé pour la connexion au réseau Wi-Fi."
--
--#~ msgid "GSM mobile broadband connection requires a 'gsm' setting"
--#~ msgstr ""
--#~ "La connexion de bande passante mobile GSM exige une configuration «gsm »"
--
--#~ msgid "Error: Failed to setup a Wi-Fi hotspot"
--#~ msgstr "Erreur : échec lors de l'installation du Wi-Fi Hotspot"
--
--#~ msgid "Error: Failed to add/activate new connection: Unknown error"
--#~ msgstr ""
--#~ "Erreur : échec de l'ajout ou de l'activation de la nouvelle connexion : "
--#~ "Erreur inconnue"
--
--#~ msgid "Connection with UUID '%s' created and activated on device '%s'\n"
--#~ msgstr ""
--#~ "Connexion avec l'UUID « %s » créé et activé sur le périphérique « %s »\n"
--
--#~ msgid "Hotspot '%s' activated on device '%s'\n"
--#~ msgstr "Hotspot « %s » activé sur le périphérique « %s »\n"
--
--#~ msgid "Device '%s' has been connected.\n"
--#~ msgstr "Le périphérique « %s » a été connecté.\n"
--
--#~ msgid "invalid negative value (%i)"
--#~ msgstr "valeur négative non valide (%i)"
--
--#~ msgid "invalid char value (%i)"
--#~ msgstr "valeur char non valide (%i)"
--
--#~ msgid "invalid int64 value (%s)"
--#~ msgstr "valeur int64 non valide (%s)"
--
--#~ msgid "too large FLAGS property '%s' (%llu)"
--#~ msgstr "propriété FLAGS trop grande « %s » (%llu)"
--
--#~ msgid "unhandled setting property type '%s'"
--#~ msgstr "type de propriété de configuration non prise en charge « %s »"
--
--#~ msgid "failed to convert value '%s' to uint"
--#~ msgstr "n'a pas pu convertir la valeur « %s » à uint"
--
--#~ msgid "secret is not set"
--#~ msgstr "secret non défini"
-diff --git a/po/ja.po b/po/ja.po
-index b2ca86093b..27e80c6906 100644
---- a/po/ja.po
-+++ b/po/ja.po
-@@ -5,17 +5,14 @@
- # Satoru SATOH <ssato@redhat.com>, 2005-2007.
- # Kiyoto Hashida <khashida@redhat.com>, 2010.
- # Noriko Mizumoto <noriko@fedoraproject.org>, 2013 - 2014.
--# lrintel <lrintel@redhat.com>, 2017. #zanata
--# tchuang <tchuang@redhat.com>, 2017. #zanata
--# amoewaki <amoewaki@redhat.com>, 2018. #zanata
--# kemorigu <kemorigu@redhat.com>, 2018. #zanata
--# lrintel <lrintel@redhat.com>, 2018. #zanata
-+# kemorigu <kemorigu@redhat.com>, 2019. #zanata
-+# lrintel <lrintel@redhat.com>, 2019. #zanata
- msgid ""
- msgstr ""
- "Project-Id-Version: PACKAGE VERSION\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2019-05-21 09:59+0200\n"
--"PO-Revision-Date: 2018-08-16 01:39+0000\n"
-+"POT-Creation-Date: 2019-05-28 14:18+0200\n"
-+"PO-Revision-Date: 2019-05-24 03:03+0000\n"
- "Last-Translator: kemorigu <kemorigu@redhat.com>\n"
- "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
- "Language: ja\n"
-@@ -466,7 +463,7 @@ msgstr ""
- "\n"
-
- #: ../clients/cli/connections.c:944
--#, fuzzy, c-format
-+#, c-format
- msgid ""
- "Usage: nmcli connection add { ARGUMENTS | help }\n"
- "\n"
-@@ -623,10 +620,10 @@ msgid ""
- " [ip6 <IPv6 address>] [gw6 <IPv6 gateway>]\n"
- "\n"
- msgstr ""
--"使い方: nmcli connection add { 引数 | help }\n"
-+"使い方: nmcli connection add { ARGUMENTS | help }\n"
- "\n"
--"引数 := 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"
-@@ -758,9 +755,9 @@ msgstr ""
- " [destination-port <0-65535>]\n"
- "\n"
- " wpan: [short-addr <0x0000-0xffff>]\n"
--"\n"
- " [pan-id <0x0000-0xffff>]\n"
--"\n"
-+" [page <default|0-31>]\n"
-+" [channel <default|0-26>]\n"
- " [mac <MAC address>]\n"
- "\n"
- " 6lowpan: dev <parent device (connection UUID, ifname, or MAC)>\n"
-@@ -776,6 +773,7 @@ msgstr ""
- " IP_OPTIONS:\n"
- " [ip4 <IPv4 address>] [gw4 <IPv4 gateway>]\n"
- " [ip6 <IPv6 address>] [gw6 <IPv6 gateway>]\n"
-+"\n"
-
- #: ../clients/cli/connections.c:1068
- #, c-format
-@@ -1104,9 +1102,9 @@ msgid "no active connection or device"
- msgstr "アクティブな接続またはデバイスがありません"
-
- #: ../clients/cli/connections.c:2354
--#, fuzzy, c-format
-+#, c-format
- msgid "device '%s' not compatible with connection '%s': "
--msgstr "デバイス '%s' は接続 '%s' と互換性がありません:"
-+msgstr "デバイス '%s' は接続 '%s' と互換性がありません: "
-
- #: ../clients/cli/connections.c:2387
- #, c-format
-@@ -1121,7 +1119,7 @@ msgstr "接続 '%s'用のデバイスが見つかりません"
- #: ../clients/cli/connections.c:2441
- #, c-format
- msgid "Hint: use '%s' to get more details."
--msgstr ""
-+msgstr "ヒント: '%s' を使用して詳細を取得します。"
-
- #: ../clients/cli/connections.c:2459
- #, c-format
-@@ -1245,9 +1243,9 @@ msgid "Error: invalid property '%s': %s."
- msgstr "エラー: 無効なプロパティー '%s': %s。"
-
- #: ../clients/cli/connections.c:3998
--#, fuzzy, c-format
-+#, c-format
- msgid "Error: failed to %s %s.%s: %s."
--msgstr "エラー: %s.%s の変更に失敗しました: %s。"
-+msgstr "エラー: %s %s.%s: %s. に失敗しました"
-
- #: ../clients/cli/connections.c:4033
- #, c-format
-@@ -2025,9 +2023,9 @@ msgid "Error: Failed to save '%s' (%s) connection: %s\n"
- msgstr "エラー: '%s' (%s) 接続の保存に失敗しました: %s\n"
-
- #: ../clients/cli/connections.c:7834
--#, fuzzy, c-format
-+#, c-format
- msgid "Error: Timeout saving '%s' (%s) connection\n"
--msgstr "エラー: '%s' (%s) 接続の保存に失敗しました: %s\n"
-+msgstr "エラー: %s' (%s) 接続の保存に失敗しました\n"
-
- #: ../clients/cli/connections.c:7839
- #, c-format
-@@ -2202,9 +2200,9 @@ msgid "Error: not all connections deleted."
- msgstr "エラー: 一部の接続が削除されていません。"
-
- #: ../clients/cli/connections.c:8553
--#, fuzzy, c-format
-+#, c-format
- msgid "Error: Connection deletion failed: %s\n"
--msgstr "エラー: 接続の削除に失敗しました: %s"
-+msgstr "エラー: 接続の削除に失敗しました: %s\n"
-
- #: ../clients/cli/connections.c:8609 ../clients/cli/connections.c:8730
- #, c-format
-@@ -2357,7 +2355,7 @@ msgid "%u Mb/s"
- msgstr "%u Mb/s"
-
- #: ../clients/cli/devices.c:689
--#, fuzzy, c-format
-+#, c-format
- msgid ""
- "Usage: nmcli device { COMMAND | help }\n"
- "\n"
-@@ -2397,10 +2395,10 @@ msgid ""
- " lldp [list [ifname <ifname>]]\n"
- "\n"
- msgstr ""
--"使い方: nmcli device { コマンド | help }\n"
-+"使い方: nmcli device { COMMAND | help }\n"
- "\n"
--"コマンド := { 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"
-@@ -2420,7 +2418,7 @@ 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"
-@@ -2656,7 +2654,7 @@ msgstr ""
- "\n"
-
- #: ../clients/cli/devices.c:831
--#, fuzzy, c-format
-+#, c-format
- msgid ""
- "Usage: nmcli device wifi { ARGUMENTS | help }\n"
- "\n"
-@@ -2708,39 +2706,40 @@ msgid ""
- "use 'nmcli device wifi list' for that.\n"
- "\n"
- msgstr ""
--"使い方: nmcli device wifi { 引数 | help }\n"
-+"使い方: nmcli device wifi { ARGUMENTS | help }\n"
- "\n"
- "Wi-Fi デバイス上で演算を実行します。\n"
- "\n"
--"引数 := [list [ifname <ifname>] [bssid <BSSID>]]\n"
-+"ARGUMENTS := [list [ifname <ifname>] [bssid <BSSID>] [--rescan yes|no|"
-+"auto]]\n"
- "\n"
- "使用可能な Wi-Fi アクセスポイントを一覧表示します。'ifname' オプションと "
--"'bssid' オプションを使用すると、\n"
--"特定のインターフェース用の AP、または特定の BSSID を持つ AP を一覧表示するこ"
--"とができます。\n"
-+"'bssid' \n"
-+"オプションを使用すると、特定のインターフェース用の AP、または特定の BSSID "
-+"を\n"
-+"持つ AP を一覧表示することができます。新しい Wi-Fi スキャンをトリガーすべき"
-+"か\n"
-+"どうか、--rescan フラグが通知します。\n"
- "\n"
--"引数 := 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"
--"SSID または BSSID で指定した Wi-Fi ネットワークへ接続します。このコマンドによ"
--"り新規の\n"
--"接続が作成され、デバイス上でアクティベートされます。これは、GUI\n"
--"クライアントで SSID をクリックした場合と同じ動作になります。常に新規の接続"
--"が\n"
--"作成されるため、主に新規の Wi-Fi ネットワークに接続する場合に役に立ちます。\n"
--"ネットワーク用の接続がすでに存在する場合は、「nmcli con up id <name>」を使っ"
--"て\n"
--"既存のプロファイルを有効にすることが推奨されます。現時点でサポートされている"
--"のはオープンな\n"
--"WEP ネットワークおよび WPA-PSK ネットワークのみであることに注意してくださ"
--"い。また、\n"
--"IP 設定は DHCP で取得することが前提となります。\n"
-+"SSID または BSSID で指定した Wi-Fi ネットワークへ接続します。コマンドで一致す"
-+"る接続を探すか、または新規の接続を作成し、デバイス上でアクティベートしま"
-+"す。\n"
-+"これは、GUI クライアントで SSID をクリックした場合と同じコマンドラインの動"
-+"作\n"
-+"になります。ネットワーク用の接続がすでに存在する場合は、\n"
-+"「nmcli con up id <name>」を使って既存のプロファイルを有効にすることが可能で"
-+"す。\n"
-+"既存の接続がない場合は、オープンな WEP ネットワークおよび WPA-PSK ネット\n"
-+"ワークのみがサポートされている点に注意してください。また、IP 設定は DHCP で\n"
-+"取得することが前提となります。\n"
- "\n"
--"引数 := wifi hotspot [ifname <ifname>] [con-name <name>] [ssid <SSID>]\n"
--" [band a|bg] [channel <channel>] [password "
--"<password>]\n"
-+"ARGUMENTS := 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"
-@@ -2754,19 +2753,19 @@ msgstr ""
- "channel - Wi-Fi channel to use\n"
- "password - password to use for the hotspot\n"
- "\n"
--"引数 := rescan [ifname <ifname>] [[ssid <SSID to scan>] ...]\n"
-+"ARGUMENTS := rescan [ifname <ifname>] [[ssid <SSID to scan>] ...]\n"
- "\n"
--"NetworkManager が直ちに利用可能なアクセスポイントを再スキャンすることをリクエ"
--"ストします。\n"
--"\n"
--"NetworkManager は定期的に Wi-Fi ネットワークをスキャンしますが、\n"
-+"NetworkManager が直ちに利用可能なアクセスポイントを再スキャンすることをリク"
-+"エ\n"
-+"ストします。NetworkManager は定期的に Wi-Fi ネットワークをスキャンします"
-+"が、\n"
- "スキャンを手動で開始することが便利な場合もあります。'ssid' を使用すると特定"
- "の\n"
--"SSID をスキャンすることができ、非表示 SSID の AP で便利です。'ssid' パラメー"
--"ターは複数使用できます。\n"
--"このコマンドは AP を表示しないことに留意してください。\n"
-+"SSID をスキャンすることができ、非表示 SSID の AP で便利です。'ssid' パラ"
-+"メー\n"
-+"ターは複数使用できます。このコマンドは AP を表示しないことに留意してくださ"
-+"い。\n"
- "表示するためのコマンドは 'nmcli device wifi list' です。\n"
--"\n"
-
- #: ../clients/cli/devices.c:878
- #, c-format
-@@ -2890,9 +2889,9 @@ msgid "Error: Failed to add/activate new connection: %s"
- msgstr "エラー: 新規接続の追加またはアクティベートに失敗しました: %s"
-
- #: ../clients/cli/devices.c:1862
--#, fuzzy, c-format
-+#, c-format
- msgid "Error: Failed to activate connection: %s"
--msgstr "エラー: 新規接続の追加またはアクティベートに失敗しました: %s"
-+msgstr "エラー: 接続のアクティベートに失敗しました: %s"
-
- #: ../clients/cli/devices.c:1932
- #, c-format
-@@ -3100,7 +3099,7 @@ msgstr "エラー: BSSID が '%s' のアクセスポイントが見つかりま
- #: ../clients/cli/devices.c:3397
- #, c-format
- msgid "Error: Connection '%s' exists but properties don't match."
--msgstr ""
-+msgstr "エラー: 接続 '%s' は存在しますが、プロパティーが一致しません。"
-
- #: ../clients/cli/devices.c:3440
- #, c-format
-@@ -3698,7 +3697,7 @@ msgid "Networkmanager is not running (waiting for it)\n"
- msgstr "Networkmanager が実行されていません (待機中)\n"
-
- #: ../clients/cli/nmcli.c:244
--#, fuzzy, c-format
-+#, c-format
- msgid ""
- "Usage: nmcli [OPTIONS] OBJECT { COMMAND | help }\n"
- "\n"
-@@ -3732,24 +3731,21 @@ msgstr ""
- "使い方: nmcli [OPTIONS] OBJECT { COMMAND | help }\n"
- "\n"
- "OPTIONS\n"
--" -o[verview] overview mode (hide default "
--"values)\n"
--" -t[erse] terse output\n"
--" -p[retty] pretty output\n"
--" -m[ode] tabular|multiline output mode\n"
--" -c[olors] auto|yes|no whether to use colors in "
--"output\n"
--" -f[ields] <field1,field2,...>|all|common specify fields to output\n"
--" -g[et-values] <field1,field2,...>|all|common shortcut for -m tabular -t -"
--"f\n"
--" -e[scape] yes|no escape columns separators "
--"in values\n"
--" -a[sk] ask for missing parameters\n"
--" -s[how-secrets] allow displaying passwords\n"
--" -w[ait] <seconds> set timeout waiting for "
--"finishing operations\n"
--" -v[ersion] show program version\n"
--" -h[elp] print this help\n"
-+" -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"
-+" -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"
-+" -m, --mode tabular|multiline output mode\n"
-+" -o, --overview overview mode\n"
-+" -p, --pretty pretty output\n"
-+" -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"
- "\n"
- "OBJECT\n"
- " g[eneral] NetworkManager's general status and operations\n"
-@@ -4324,7 +4320,6 @@ msgid "The device parent's management changed"
- msgstr "デバイスの親の管理が変更されました"
-
- #: ../clients/common/nm-client-utils.c:355
--#, fuzzy
- msgid "Open vSwitch database connection failed"
- msgstr "Open vSwitch データベースの接続に失敗しました"
-
-@@ -4341,9 +4336,8 @@ msgid "Failed to configure SR-IOV parameters"
- msgstr "SR-IOV パラメーターの設定に失敗しました"
-
- #: ../clients/common/nm-client-utils.c:359
--#, fuzzy
- msgid "The Wi-Fi P2P peer could not be found"
--msgstr "Wi-Fi ネットワークが見つかりませんでした"
-+msgstr "Wi-Fi P2P ピアが見つかりませんでした"
-
- #: ../clients/common/nm-client-utils.c:365
- msgid "Unknown reason"
-@@ -4505,9 +4499,8 @@ msgstr "%s (%s)"
-
- #: ../clients/common/nm-meta-setting-desc.c:1372
- #: ../clients/common/nm-meta-setting-desc.c:1376
--#, fuzzy
- msgid "'%s' is out of range [%"
--msgstr "'%s' は、[0, %u] の範囲外です"
-+msgstr "'%s' は [% の範囲外です"
-
- #: ../clients/common/nm-meta-setting-desc.c:1381
- #, c-format
-@@ -4591,9 +4584,9 @@ msgid "'%s' is not valid; use <option>=<value>"
- msgstr "'%s' は無効です; <option>=<value> を使用してください"
-
- #: ../clients/common/nm-meta-setting-desc.c:1993
--#, fuzzy, c-format
-+#, c-format
- msgid "cannot set empty \"%s\" option"
--msgstr "プロパティーを設定できません: %s"
-+msgstr "空の \"%s\" オプションを設定できません"
-
- #: ../clients/common/nm-meta-setting-desc.c:2052
- #, c-format
-@@ -4612,9 +4605,8 @@ msgid "'%s' is not valid"
- msgstr "'%s' は無効です"
-
- #: ../clients/common/nm-meta-setting-desc.c:2187
--#, fuzzy
- msgid "not a valid hex-string"
--msgstr "無効なインターフェース名です"
-+msgstr "有効な 16 進数の文字列ではありません"
-
- #: ../clients/common/nm-meta-setting-desc.c:2203
- #, c-format
-@@ -4626,11 +4618,13 @@ msgid ""
- "too many arguments. Please only specify a private key file and optionally a "
- "password"
- msgstr ""
-+"引数が多すぎます。プライベートのキーファイルのみを指定してください。オプショ"
-+"ンでパスワードを指定します"
-
- #: ../clients/common/nm-meta-setting-desc.c:2404
--#, fuzzy, c-format
-+#, c-format
- msgid "failed to set bond option \"%s\""
--msgstr "プロパティーの設定に失敗しました: %s"
-+msgstr "ボンドオプション \"%s\" の設定に失敗しました"
-
- #: ../clients/common/nm-meta-setting-desc.c:2421
- #, c-format
-@@ -4676,9 +4670,9 @@ msgid "Can not change the connection type"
- msgstr "接続タイプを変更できません"
-
- #: ../clients/common/nm-meta-setting-desc.c:2564
--#, fuzzy, c-format
-+#, c-format
- msgid "invalid permission \"%s\""
--msgstr "無効なランナー \"%s\""
-+msgstr "無効なパーミッション \"%s\""
-
- #: ../clients/common/nm-meta-setting-desc.c:2601
- #, c-format
-@@ -4754,9 +4748,9 @@ msgid "default"
- msgstr "デフォルト"
-
- #: ../clients/common/nm-meta-setting-desc.c:3235
--#, fuzzy, c-format
-+#, c-format
- msgid "invalid IPv%c address '%s'"
--msgstr "無効な IPv4 アドレス '%s'"
-+msgstr "無効な IPv%c アドレス '%s'"
-
- #: ../clients/common/nm-meta-setting-desc.c:3362
- #, c-format
-@@ -4776,14 +4770,13 @@ msgstr ""
-
- #: ../clients/common/nm-meta-setting-desc.c:3617
- #: ../clients/common/nm-meta-setting-desc.c:3697
--#, fuzzy
- msgid ""
- "The valid syntax is: '[root | parent <handle>] [handle <handle>] <kind>'"
--msgstr "有効な構文: '[root | parent <handle>] [handle <handle>] <qdisc>'"
-+msgstr "有効な構文: '[root | parent <handle>] [handle <handle>] <kind>'"
-
- #: ../clients/common/nm-meta-setting-desc.c:3642
- msgid "The valid syntax is: '<vid>[-<vid>] [pvid] [untagged]'"
--msgstr ""
-+msgstr "有効な構文: '<vid>[-<vid>] [pvid] [untagged]'"
-
- #: ../clients/common/nm-meta-setting-desc.c:3917
- #, c-format
-@@ -5268,6 +5261,9 @@ msgid ""
- " priority [prio] [from [src]] [to [dst]], ,...\n"
- "\n"
- msgstr ""
-+"次のような形式で IPv4 ルーティングルールの一覧を入力してください:\n"
-+" priority [prio] [from [src]] [to [dst]], ,...\n"
-+"\n"
-
- #: ../clients/common/nm-meta-setting-desc.c:5798
- msgid ""
-@@ -5341,6 +5337,9 @@ msgid ""
- " priority [prio] [from [src]] [to [dst]], ,...\n"
- "\n"
- msgstr ""
-+"次のような形式で IPv6 ルーティングルールの一覧を入力してください:\n"
-+" priority [prio] [from [src]] [to [dst]], ,...\n"
-+"\n"
-
- #: ../clients/common/nm-meta-setting-desc.c:6008
- #: ../clients/common/nm-meta-setting-desc.c:6934
-@@ -5490,7 +5489,7 @@ msgstr "接続先ポート [8472]"
-
- #: ../clients/common/nm-meta-setting-desc.c:7012
- msgid "Peer"
--msgstr ""
-+msgstr "ピア"
-
- #: ../clients/common/nm-meta-setting-desc.c:7042
- msgid "WiMAX NSP name"
-@@ -5507,7 +5506,7 @@ msgid ""
- "\n"
- "Example: 0.0.0e20 0.0.0e21 0.0.0e22\n"
- msgstr ""
--"サブチャネルの一覧を入力します (カンマまたはスペースで区切ります)。\n"
-+"サブチャネルの一覧を入力します (コンマまたはスペースで区切ります)。\n"
- "\n"
- "例: 0.0.0e20 0.0.0e21 0.0.0e22\n"
-
-@@ -5528,13 +5527,12 @@ msgid "PAN Identifier (<0x0000-0xffff>)"
- msgstr "PAN 識別子 (<0x0000-0xffff>)"
-
- #: ../clients/common/nm-meta-setting-desc.c:7517
--#, fuzzy
- msgid "Page (<default|0-31>)"
--msgstr "(デフォルト)"
-+msgstr "ページ (<default|0-31>)"
-
- #: ../clients/common/nm-meta-setting-desc.c:7531
- msgid "Channel (<default|0-26>)"
--msgstr ""
-+msgstr "チャンネル (<default|0-26>)"
-
- #. ***************************************************************************
- #: ../clients/common/nm-meta-setting-desc.c:7666
-@@ -5688,7 +5686,7 @@ msgstr "ユーザー設定"
- msgid "VLAN connection"
- msgstr "VLAN 接続"
-
--#: ../clients/common/nm-meta-setting-desc.c:7703 ../src/nm-manager.c:5539
-+#: ../clients/common/nm-meta-setting-desc.c:7703 ../src/nm-manager.c:5536
- msgid "VPN connection"
- msgstr "VPN 接続"
-
-@@ -5698,9 +5696,8 @@ msgid "VXLAN connection"
- msgstr "VXLAN 接続"
-
- #: ../clients/common/nm-meta-setting-desc.c:7705
--#, fuzzy
- msgid "Wi-Fi P2P connection"
--msgstr "Wi-Fi 接続"
-+msgstr "Wi-Fi P2P 接続"
-
- #: ../clients/common/nm-meta-setting-desc.c:7706
- msgid "WiMAX connection"
-@@ -5711,9 +5708,8 @@ msgid "Wired Ethernet"
- msgstr "有線 Ethernet"
-
- #: ../clients/common/nm-meta-setting-desc.c:7708
--#, fuzzy
- msgid "WireGuard VPN settings"
--msgstr "WPAN 設定"
-+msgstr "WireGuard VPN 設定"
-
- #: ../clients/common/nm-meta-setting-desc.c:7709
- msgid "Wi-Fi connection"
-@@ -5738,7 +5734,7 @@ msgstr "認証セッションはすでに実行されています。"
- #: ../clients/common/nm-secret-agent-simple.c:230
- #, c-format
- msgid "Preshared-key for %s"
--msgstr ""
-+msgstr "%s の共有前のキー"
-
- #: ../clients/common/nm-secret-agent-simple.c:286
- #: ../clients/common/nm-secret-agent-simple.c:323
-@@ -5775,14 +5771,13 @@ msgid "Service"
- msgstr "サービス"
-
- #: ../clients/common/nm-secret-agent-simple.c:486
--#, fuzzy
- msgid "WireGuard private-key"
--msgstr "無効なプライベートキー"
-+msgstr "WireGuard プライベートキー"
-
- #: ../clients/common/nm-secret-agent-simple.c:527
--#, fuzzy, c-format
-+#, c-format
- msgid "Secrets are required to connect WireGuard VPN '%s'"
--msgstr "有線ネットワーク '%s' へのアクセスにはシークレットが必要です"
-+msgstr "WireGuard VPN '%s' の接続にはシークレットが必要です"
-
- #: ../clients/common/nm-secret-agent-simple.c:628
- #: ../clients/common/nm-secret-agent-simple.c:912
-@@ -5856,9 +5851,8 @@ msgid "MACsec EAP authentication"
- msgstr "MACsec EAP 認証"
-
- #: ../clients/common/nm-secret-agent-simple.c:940
--#, fuzzy
- msgid "WireGuard VPN secret"
--msgstr "WireGuard"
-+msgstr "WireGuard VPN シークレット"
-
- #: ../clients/common/nm-secret-agent-simple.c:979
- msgid "VPN password required"
-@@ -5914,35 +5908,37 @@ msgid "Gateway certificate hash"
- msgstr "ゲートウェイ証明書ハッシュ"
-
- #: ../clients/common/nm-vpn-helpers.c:270
--#, fuzzy, c-format
-+#, c-format
- msgid "Invalid peer starting at %s:%zu: %s"
--msgstr "無効な設定名 '%s'"
-+msgstr "%s:%zu で始まる無効なピア: %s"
-
- #: ../clients/common/nm-vpn-helpers.c:390
- msgid ""
- "The WireGuard config file must be a valid interface name followed by \".conf"
- "\""
- msgstr ""
-+"WireGuard 設定ファイルは、\".conf\" があとに続く有効なインターフェース名でな"
-+"ければなりません"
-
- #: ../clients/common/nm-vpn-helpers.c:678
- #, c-format
- msgid "unrecognized line at %s:%zu"
--msgstr ""
-+msgstr "%s:%zu に未認識の行があります"
-
- #: ../clients/common/nm-vpn-helpers.c:683
--#, fuzzy, c-format
-+#, c-format
- msgid "invalid value for '%s' at %s:%zu"
--msgstr "'%s' の無効な値: %s"
-+msgstr "%s:%zu における '%s' の値は無効です"
-
- #: ../clients/common/nm-vpn-helpers.c:688
--#, fuzzy, c-format
-+#, c-format
- msgid "invalid secret '%s' at %s:%zu"
--msgstr "無効なルート: %s. %s"
-+msgstr "%s:%zu のシークレット '%s' は無効です"
-
- #: ../clients/common/nm-vpn-helpers.c:801
--#, fuzzy, c-format
-+#, c-format
- msgid "Failed to create WireGuard connection: %s"
--msgstr "エラー: 新規接続の追加またはアクティベートに失敗しました: %s"
-+msgstr "WireGuard 接続の作成に失敗しました: %s"
-
- #. Generated file. Do not edit.
- #: ../clients/common/settings-docs.h.in:3
-@@ -6014,32 +6010,31 @@ msgstr ""
- #: ../clients/common/settings-docs.h.in:10
- #, fuzzy
- msgid ""
--"If specified, request that the device use this MAC address instead of its "
--"permanent MAC address. This is known as MAC cloning or spoofing. Beside "
--"explicitly specifying a MAC address, the special values \"preserve\", "
--"\"permanent\", \"random\" and \"stable\" are supported. \"preserve\" means "
--"not to touch the MAC address on activation. \"permanent\" means to use the "
--"permanent hardware address of the device. \"random\" 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 \"permanent\". On D-Bus, this field is "
--"expressed as \"assigned-mac-address\" or the deprecated \"cloned-mac-address"
--"\"."
-+"If specified, request that the device use this MAC address instead. This is "
-+"known as MAC cloning or spoofing. Beside explicitly specifying a MAC "
-+"address, the special values \"preserve\", \"permanent\", \"random\" and "
-+"\"stable\" are supported. \"preserve\" means not to touch the MAC address on "
-+"activation. \"permanent\" means to use the permanent hardware address of the "
-+"device. \"random\" 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 \"cloned-mac-address\"."
- msgstr ""
--"指定した場合は、デバイスがこの MAC アドレスを代わりに使用するよう要求します。"
--"これは、MAC クローニングまたはスプーフィングとして知られています。明示的に "
--"MAC アドレスを指定する以外に、\"preserve\"、\"permanent\"、\"random"
--"\"、\"stable\" の特別値がサポートされます。\"preserve\" では、アクティベー"
--"ション時に MAC アドレスを変更しません。\"permanent\" では、デバイスに永続化"
--"ハードウェアアドレスを使用します。\"random\" では、各接続にランダムの MAC ア"
--"ドレスを作成します。\"stable\" では、connection.stable-id と機種依存キーに基"
--"づいて、ハッシュ化した MAC アドレスを作成します。指定しない場合は、その値はグ"
--"ローバルのデフォルトにより上書きされます。NetworkManager.conf を参照してくだ"
--"さい。それでも指定しない場合は、デフォルトの \"preserve\" が設定されます "
--"(NetworkManager の旧バージョンは別のデフォルト値を使用するかもしれません)。D-"
--"Bus において、このフィールドは \"assigned-mac-address\" または廃止予定の "
--"\"cloned-mac-address\" として表示されます。"
-+"これを指定した場合は、デバイスが、その永続化 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
-@@ -6298,7 +6293,6 @@ msgstr ""
- "す。"
-
- #: ../clients/common/settings-docs.h.in:27
--#, fuzzy
- msgid ""
- "Key management used for the connection. One of \"none\" (WEP), \"ieee8021x"
- "\" (Dynamic WEP), \"wpa-none\" (Ad-Hoc WPA-PSK), \"wpa-psk\" (infrastructure "
-@@ -6306,9 +6300,10 @@ msgid ""
- "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)、また"
--"は \"wpa-eap\" (WPA-Enterprise) のいずれかになります。このプロパティーは、セ"
--"キュリティーを使用するすべての Wi-Fi 接続に設定する必要があります。"
-+"none\" (Ad-Hoc WPA-PSK)、\"wpa-psk\" (インフラストラクチャー WPA-PSK)、\"sae"
-+"\" (SAE) または \"wpa-eap\" (WPA-Enterprise) のいずれかになります。このプロパ"
-+"ティーは、セキュリティーを使用するすべての Wi-Fi 接続に設定する必要がありま"
-+"す。"
-
- #: ../clients/common/settings-docs.h.in:28
- msgid ""
-@@ -6381,6 +6376,11 @@ msgid ""
- "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 の認証に文字数に制限のないパスフレーズを使用しま"
-+"す。"
-
- #: ../clients/common/settings-docs.h.in:35
- msgid "Flags indicating how to handle the \"psk\" property."
-@@ -7030,33 +7030,33 @@ msgstr ""
- #: ../clients/common/settings-docs.h.in:89
- #, fuzzy
- msgid ""
--"If specified, request that the device use this MAC address instead of its "
--"permanent MAC address. This is known as MAC cloning or spoofing. Beside "
--"explicitly specifying a MAC address, the special values \"preserve\", "
--"\"permanent\", \"random\" and \"stable\" are supported. \"preserve\" means "
--"not to touch the MAC address on activation. \"permanent\" means to use the "
--"permanent hardware address if the device has one (otherwise this is treated "
--"as \"preserve\"). \"random\" 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 \"permanent\". On D-Bus, this field is expressed as \"assigned-"
--"mac-address\" or the deprecated \"cloned-mac-address\"."
-+"If specified, request that the device use this MAC address instead. This is "
-+"known as MAC cloning or spoofing. Beside explicitly specifying a MAC "
-+"address, the special values \"preserve\", \"permanent\", \"random\" and "
-+"\"stable\" are supported. \"preserve\" means not to touch the MAC address on "
-+"activation. \"permanent\" means to use the permanent hardware address if the "
-+"device has one (otherwise this is treated as \"preserve\"). \"random\" "
-+"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 "
-+"\"cloned-mac-address\"."
- msgstr ""
--"指定した場合は、デバイスがこの MAC アドレスを代わりに使用するよう要求します。"
--"これは、MAC クローニングまたはスプーフィングとして知られています。明示的に "
--"MAC アドレスを指定する以外に、\"preserve\"、\"permanent\"、\"random"
--"\"、\"stable\" の特別値がサポートされます。\"preserve\" では、アクティベー"
--"ション時に MAC アドレスを変更しません。\"permanent\" では、デバイスに永続化"
--"ハードウェアアドレスがある場合はそれを使用します (ない場合は \"preserve\" と"
--"同じ扱いとなります)。\"random\" では、各接続にランダムの MAC アドレスを作成し"
--"ます。\"stable\" では、connection.stable-id と機種依存キーに基づいて、ハッ"
--"シュ化した MAC アドレスを作成します。指定しない場合は、その値はグローバルのデ"
--"フォルトにより上書きされます。NetworkManager.conf を参照してください。それで"
--"も指定しない場合は、デフォルトで \"preserve\" が設定されます (NetworkManager "
--"の旧バージョンは別のデフォルト値を使用するかもしれません)。D-Bus において、こ"
--"のフィールドは \"assigned-mac-address\" または廃止予定の \"cloned-mac-address"
--"\" として表示されます。"
-+"指定した場合は、デバイスが、その永続化 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
- msgid ""
-@@ -7337,13 +7337,12 @@ 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
--#, fuzzy
- msgid "Control whether VLAN filtering is enabled on the bridge."
--msgstr ""
--"このブリッジにおいて、スパニングツリープロトコル (STP) が有効かどうかを制御し"
--"ます。"
-+msgstr "このブリッジにおいて、VLAN フィルタリングが有効かどうかを制御します。"
-
- #: ../clients/common/settings-docs.h.in:123
- msgid ""
-@@ -7354,6 +7353,12 @@ msgid ""
- "$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:124
- msgid ""
-@@ -7382,6 +7387,12 @@ msgid ""
- "[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:174
-@@ -7558,7 +7569,6 @@ msgid "Interface name of the master device or UUID of the master connection."
- msgstr "マスター接続のマスターデバイスまたは UUID のインターフェース名。"
-
- #: ../clients/common/settings-docs.h.in:144
--#, fuzzy
- 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 "
-@@ -7567,11 +7577,9 @@ msgid ""
- "plugin is dns-systemd-resolved."
- msgstr ""
- "mDNS の接続が実行されるかどうか。利用できる値は、yes: ホスト名を登録して接続"
--"を解決、no: インターフェースに対して mDNS を無効にする 、resolve: ホスト名を"
--"登録せずに mDNS ホスト名の解決を許可、の 3 つになります。現在有効な接続でこの"
--"プロパティーをアップデートすると、変更はすぐに有効になります。この機能には、"
--"mDNS をサポートするプラグインが必要です。たとえば、dns-systemd-resolved など"
--"です。"
-+"を解決、no: インターフェースに対して mDNS を無効にする、resolve: ホスト名を登"
-+"録せずに mDNS ホスト名の解決を許可、の 3 つになります。この機能には、mDNS を"
-+"サポートするプラグインが必要です。たとえば、dns-systemd-resolved などです。"
-
- #: ../clients/common/settings-docs.h.in:145
- msgid ""
-@@ -7641,7 +7649,6 @@ msgstr ""
- "がスレーブではない場合は NULL。"
-
- #: ../clients/common/settings-docs.h.in:151
--#, fuzzy
- msgid ""
- "This represents the identity of the connection used for various purposes. It "
- "allows to configure multiple profiles to share the identity. Also, the "
-@@ -7686,12 +7693,13 @@ msgstr ""
- "addr-gen-mode=stable-privacy では、別々のインターフェースが別々のアドレスを生"
- "成するようにデバイス名も含まれています。この '$' 文字は、ランタイム時に動的置"
- "換を実行するのに使用されます。現在サポートされているの"
--"は、\"${CONNECTION}\"、\"${DEVICE}\"、\"${BOOT}\"、\"${RANDOM}\" です。これ"
--"は、各接続時、各デバイスごと、各起動時、または毎回、固有の ID を効果的に作成"
--"します。\"${DEVICE}\"は、デバイスのインターフェース名に対応している点に注意し"
--"てください。'$' に続く認識されていないパターンは文字通りに扱われますが、今後"
--"使用されるために予約されます。したがって、これは '$' を使用しないか、またはエ"
--"スケープ文字 \"$$\" として使用することが推奨されます。たとえば、これを "
-+"は、\"${CONNECTION}\"、\"${DEVICE}\"、\"${MAC}\"、\"${BOOT}\"、\"${RANDOM}\" "
-+"です。これは、各接続時、各デバイスごと、各起動時、または毎回、固有の ID を効"
-+"果的に作成します。\"${DEVICE}\" は、デバイスのインターフェース名に対応"
-+"し、\"${MAC}\" はデバイスの永続的 MAC アドレスという点に注意してくださ"
-+"い。'$' に続く認識されていないパターンは文字通りに扱われますが、今後使用され"
-+"るために予約されます。したがって、これは '$' を使用しないか、またはエスケープ"
-+"文字 \"$$\" として使用することが推奨されます。たとえば、これを "
- "\"${CONNECTION}-${BOOT}-${DEVICE}\" に設定すると、この接続に対して固有の ID "
- "を作成します。これは、システムを再起動するたびに変更され、プロファイルがアク"
- "ティベートされるインターフェースに応じて異なってきます。値が設定されていない"
-@@ -7960,6 +7968,8 @@ 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:179
- msgid ""
-@@ -8165,7 +8175,6 @@ msgstr ""
- "IPv4 にのみ実装されています。"
-
- #: ../clients/common/settings-docs.h.in:204
--#, fuzzy
- 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 "
-@@ -8197,11 +8206,15 @@ msgstr ""
- "ID と見なされ、'type' フィールドは 0 に設定されます。特別値である \"mac\" お"
- "よび \"perm-mac\" はサポートされています。これらは、デバイスの現在または永続"
- "的 MAC アドレスを使用して、type ethernet (01) でクライアント識別子を生成しま"
--"す。現在、これらのオプションは、ethernet リンクでのみ有効です。特別値 "
--"\"stable\" は、stable-id (connection.stable-id を参照) およびホストごとのキー"
--"を基に、type 0 のクライアント識別子を生成するようサポートされています。値が設"
--"定されない場合は、グローバルに設定されたデフォルトが使用されます。引き続き値"
--"が設定されない場合は、最後のリースのクライアント ID が再利用されます。"
-+"す。現在、これらのオプションは、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:205
- msgid ""
-@@ -8263,7 +8276,6 @@ msgstr ""
-
- #: ../clients/common/settings-docs.h.in:211
- #: ../clients/common/settings-docs.h.in:231
--#, fuzzy
- msgid ""
- "DNS servers priority. The relative priority for DNS servers specified by "
- "this setting. A lower value is better (higher priority). Zero selects a "
-@@ -8289,23 +8301,25 @@ msgid ""
- "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 の優先度の値が負である別のドメイン"
--"のサブドメインである場合、そのサブドメインは無視されます。"
-+"い方が良い (優先度が高い) です。値がゼロの場合、グローバルに設定されたデフォ"
-+"ルト値が使用されます。グローバルに設定されたデフォルト値がないか、または同じ"
-+"くゼロの場合、デフォルト値 (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:212
- #: ../clients/common/settings-docs.h.in:232
-@@ -8500,7 +8514,6 @@ msgstr ""
- "このオプションで設定した一時アドレスには影響しないことに注意してください。"
-
- #: ../clients/common/settings-docs.h.in:225
--#, fuzzy
- 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 "
-@@ -8543,13 +8556,15 @@ msgstr ""
- "に) グローバルに使用され、ディスクに永続する一定のタイムスタンプが含まれま"
- "す。特別値の \"stable-llt\"、\"stable-ll\"、および \"stable-uuid\" は、対応す"
- "るタイプの DUID を生成します。これは、接続の stable-id およびホストごとの固有"
--"のキーから取得したものです。したがって、\"stable-ll\" および \"stable-llt\" "
--"のリンク層のアドレスは、stable id から算出される生成されたアドレスになりま"
--"す。\"stable-llt\" オプションの DUID-LLT タイム値は、3 年という静的タイムスパ"
--"ンの中から選ばれます (インターバルの上限は、\"llt\" で使用される一定のタイム"
--"スタンプと同じです)。プロパティーが設定されていない場合、\"ipv6.dhcp-duid\" "
--"に提供されるグローバル値が使用されます。グローバル値が提供されない場合は、デ"
--"フォルトの \"lease\" 値が想定されます。 "
-+"のキーから取得したものです。このプロファイルが複数のデバイスでアクティベート"
-+"される場合は、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:236
- msgid ""
-@@ -8984,9 +8999,12 @@ msgid ""
- "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 設定を接続に追加しないで"
-+"ください。"
-
- #: ../clients/common/settings-docs.h.in:304
--#, fuzzy
- msgid ""
- "Array of virtual function descriptors. Each VF descriptor is a dictionary "
- "mapping attribute names to GVariant values. The 'index' entry is mandatory "
-@@ -9002,10 +9020,12 @@ msgstr ""
- "仮想関数記述子の配列。各 VF 記述子は、GVariant 値に対する辞書マッピング属性名"
- "です。各 VF にとって 'index' エントリーは必須です。文字列で表す場合、VF の形"
- "式は \"INDEX [ATTR=VALUE[ ATTR=VALUE]...]\" となります。たとえば、\"2 "
--"mac=00:11:22:33:44:55 spoof-check=true\" などです。\"vlans\" 属性は、VLAN 記"
--"述子の semicolor-separated 一覧として表されます。ここでは、各記述子の形式は "
--"\"ID[.PRIORITY[.PROTO]]\" となります。PROTO は 'q' (802.1Q、デフォルト) また"
--"は 'ad' (802.1ad) のいずれかになります。"
-+"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:305
- msgid "Array of TC queueing disciplines."
-@@ -9029,7 +9049,6 @@ msgstr ""
-
- #: ../clients/common/settings-docs.h.in:308
- #: ../clients/common/settings-docs.h.in:326
--#, fuzzy
- msgid ""
- "Link watchers configuration for the connection: each link watcher is defined "
- "by a dictionary, whose keys depend upon the selected link watcher. Available "
-@@ -9046,7 +9065,7 @@ msgstr ""
- "'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-"
-+"キーおよび 'source-host'、'validate-active'、'validate-inactive'、'send-"
- "always'。詳細は teamd.conf の man ページを参照してください。"
-
- #: ../clients/common/settings-docs.h.in:309
-@@ -9439,6 +9458,8 @@ 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:365
- msgid ""
-@@ -9448,18 +9469,20 @@ msgid ""
- "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 ク"
-+"ライアントを実装する場合にのみ役立ちます。 "
-
- #: ../clients/common/settings-docs.h.in:366
--#, fuzzy
- 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 のモードが使用される場合に、どのモードが使用されるかを示すフラグ。アクセ"
--"スポイントの機能から WPS エンロールメントを開始できるかどうかを "
--"NetworkManager が自動的に決定するため、デフォルト設定の変更をする利点はほと"
--"んどありません。このプロパティーの値を 1 にすると WPS を無効にできます。"
-+"WPS のモードが使用される場合に、どのモードが使用されるかを示すフラグ。"
-+"NetworkManager が最適なメソッドの使用を自動的に決定するため、デフォルト設定"
-+"を変更する利点はほとんどありません。"
-
- #: ../clients/common/settings-docs.h.in:367
- msgid ""
-@@ -9484,15 +9507,19 @@ 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."
- msgstr ""
-+"fwmark の使用はオプションで、デフォルトでオフに設定されています。これを 0 に"
-+"設定すると、無効化されます。無効化されなければ、出力パケットでは 32 ビットの "
-+"fwmark です。"
-
- #: ../clients/common/settings-docs.h.in:370
- 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:371
--#, fuzzy
- 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 "
-@@ -9500,7 +9527,9 @@ msgid ""
- "account the current routes at the time of activation."
- msgstr ""
- "ゼロ以外は、指定したサイズ以下のパケットだけが送信されます。指定より大きなパ"
--"ケットは、複数の Ethernet フレームに分割されます。"
-+"ケットは、複数のフラグメントに分割されます。ゼロの場合は、デフォルトの MTU を"
-+"使用します。wg-quick の MTU 設定とは対照的に、これはアクティベーション時に現"
-+"行のルートについて考慮しない点に注意してください。"
-
- #: ../clients/common/settings-docs.h.in:372
- msgid ""
-@@ -9510,21 +9539,27 @@ msgid ""
- "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 のそれぞれに静的ルートを設定することをおすすめします。"
-
- #: ../clients/common/settings-docs.h.in:373
- msgid "The 256 bit private-key in base64 encoding."
--msgstr ""
-+msgstr "base64 エンコードにおける 256 ビットのプライベートキー。"
-
- #: ../clients/common/settings-docs.h.in:374
--#, fuzzy
- msgid "Flags indicating how to handle the \"private-key\" property."
--msgstr "\"private-key-password\" プロパティーの処理方法を示すフラグ。"
-+msgstr "\"private-key\" プロパティーの処理方法を示すフラグ。"
-
- #: ../clients/common/settings-docs.h.in:375
- 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:376
- msgid ""
-@@ -9539,6 +9574,8 @@ 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:378
- msgid "IEEE 802.15.4 Personal Area Network (PAN) identifier."
-@@ -9670,7 +9707,7 @@ msgstr "DSL 接続 %d"
- #: ../clients/tui/nm-editor-utils.c:188 ../libnm-core/nm-connection.c:2509
- #: ../libnm-glib/nm-device.c:1834 ../libnm-util/nm-connection.c:1623
- #: ../libnm/nm-device.c:1400
--#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4836
-+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4898
- msgid "Bond"
- msgstr "ボンド"
-
-@@ -9682,7 +9719,7 @@ msgstr "ボンド接続 %d"
- #: ../clients/tui/nm-editor-utils.c:197 ../libnm-core/nm-connection.c:2513
- #: ../libnm-glib/nm-device.c:1838 ../libnm-util/nm-connection.c:1627
- #: ../libnm/nm-device.c:1404
--#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5216
-+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5288
- msgid "Bridge"
- msgstr "ブリッジ"
-
-@@ -9694,7 +9731,7 @@ msgstr "ブリッジ接続 %d"
- #: ../clients/tui/nm-editor-utils.c:206 ../libnm-core/nm-connection.c:2511
- #: ../libnm-glib/nm-device.c:1836 ../libnm-util/nm-connection.c:1625
- #: ../libnm/nm-device.c:1402
--#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4939
-+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5006
- msgid "Team"
- msgstr "team "
-
-@@ -10899,9 +10936,9 @@ msgid "Method returned type '%s', but expected '%s'"
- msgstr "メソッドはタイプ '%s' を返しましたが、'%s' を想定していました"
-
- #: ../libnm-core/nm-keyfile-utils.c:210
--#, fuzzy, c-format
-+#, c-format
- msgid "value is not an integer in range [%lld, %lld]"
--msgstr "'%s' は、[%lli, %lli] の範囲外です"
-+msgstr "値は、[%lld, %lld] の範囲の整数ではありません"
-
- #: ../libnm-core/nm-keyfile.c:211
- msgid "ignoring missing number"
-@@ -11026,9 +11063,9 @@ msgid "invalid parity value '%s'"
- msgstr "無効なパリティー値 '%s'"
-
- #: ../libnm-core/nm-keyfile.c:1603 ../libnm-core/nm-keyfile.c:3052
--#, fuzzy, c-format
-+#, c-format
- msgid "invalid setting: %s"
--msgstr "無効な設定名 '%s'"
-+msgstr "無効な設定: %s"
-
- #: ../libnm-core/nm-keyfile.c:1618
- #, c-format
-@@ -11055,7 +11092,7 @@ msgstr "設定値のロード中にエラーが発生しました: %s"
- #: ../libnm-core/nm-keyfile.c:2975 ../libnm-core/nm-keyfile.c:3027
- #: ../libnm-core/nm-keyfile.c:3038
- msgid "value cannot be interpreted as integer"
--msgstr ""
-+msgstr "値は整数として解釈できません"
-
- #: ../libnm-core/nm-keyfile.c:3073
- #, c-format
-@@ -11073,39 +11110,40 @@ msgid "key '%s.%s' is not boolean"
- msgstr "キー '%s.%s' はブール値ではありません"
-
- #: ../libnm-core/nm-keyfile.c:3190
--#, fuzzy, c-format
-+#, c-format
- msgid "invalid peer public key in section '%s'"
--msgstr "無効なオプション '%s'"
-+msgstr "セクション '%s' のピア公開鍵が無効です"
-
- #: ../libnm-core/nm-keyfile.c:3202
- #, 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:3215
--#, fuzzy, c-format
-+#, c-format
- msgid "key '%s.%s' is not a valid secret flag"
--msgstr "'%s' は有効な DCB フラグではありません"
-+msgstr "キー '%s.%s' は、有効なシークレットフラグではありません"
-
- #: ../libnm-core/nm-keyfile.c:3227
--#, fuzzy, c-format
-+#, c-format
- msgid "key '%s.%s' is not a integer in range 0 to 2^32"
--msgstr "'%s' は、[%lli, %lli] の範囲外です"
-+msgstr "キー '%s.%s' は、0 から 2^32 の範囲の整数ではありません"
-
- #: ../libnm-core/nm-keyfile.c:3239
--#, fuzzy, c-format
-+#, c-format
- msgid "key '%s.%s' is not a valid endpoint"
--msgstr "'%s' は有効ではありません。"
-+msgstr "キー '%s.%s' は、有効なエンドポイントではありません"
-
- #: ../libnm-core/nm-keyfile.c:3261
- #, c-format
- msgid "key '%s.%s' has invalid allowed-ips"
--msgstr ""
-+msgstr "キー '%s.%s' の allowed-ips は無効です"
-
- #: ../libnm-core/nm-keyfile.c:3273
--#, fuzzy, c-format
-+#, c-format
- msgid "peer '%s' is invalid: %s"
--msgstr "'%s' は無効です"
-+msgstr "ピア '%s' は無効です: %s"
-
- #: ../libnm-core/nm-setting-6lowpan.c:93
- #, c-format
-@@ -11568,11 +11606,9 @@ msgstr ""
- "である必要があります (実際には '%s')"
-
- #: ../libnm-core/nm-setting-infiniband.c:281
--#, fuzzy, c-format
-+#, c-format
- msgid "mtu can be at most %u but it is %u"
--msgstr ""
--"トランスポートモード '%s' の mtu は最大で %d にすることができますが、実際に"
--"は %d です"
-+msgstr "mtu は最大で %u になり得ますが、%u です"
-
- #: ../libnm-core/nm-setting-ip-config.c:136
- #, c-format
-@@ -11648,164 +11684,147 @@ msgid "invalid prefix %s"
- msgstr "無効なプレフィックス %s"
-
- #: ../libnm-core/nm-setting-ip-config.c:2479
--#, fuzzy
- msgid "invalid priority"
--msgstr "無効な優先度マップ '%s'"
-+msgstr "無効な優先度"
-
- #: ../libnm-core/nm-setting-ip-config.c:2490
--#, fuzzy
- msgid "missing table"
--msgstr "キーがみつかりません"
-+msgstr "テーブルがありません"
-
- #: ../libnm-core/nm-setting-ip-config.c:2496
--#, fuzzy
- msgid "invalid action"
--msgstr "無効なアクション: "
-+msgstr "無効なアクション "
-
- #: ../libnm-core/nm-setting-ip-config.c:2503
- msgid "has from/src but the prefix-length is zero"
--msgstr ""
-+msgstr "from/src があっても、プレフィックス長はゼロです"
-
- #: ../libnm-core/nm-setting-ip-config.c:2510
- msgid "missing from/src for a non zero prefix-length"
--msgstr ""
-+msgstr "ゼロではないプレフィックス長には from/src がありません"
-
- #: ../libnm-core/nm-setting-ip-config.c:2515
--#, fuzzy
- msgid "invalid from/src"
--msgstr "無効なポート %d"
-+msgstr "無効な from/src"
-
- #: ../libnm-core/nm-setting-ip-config.c:2520
--#, fuzzy
- msgid "invalid prefix length for from/src"
--msgstr "%s '%s' の無効なプレフィックス長 (デフォルト値は %d)"
-+msgstr "from/src のプレフィックス長は無効です"
-
- #: ../libnm-core/nm-setting-ip-config.c:2527
- msgid "has to/dst but the prefix-length is zero"
--msgstr ""
-+msgstr "to/dst があっても、プレフィックス長はゼロです"
-
- #: ../libnm-core/nm-setting-ip-config.c:2534
- msgid "missing to/dst for a non zero prefix-length"
--msgstr ""
-+msgstr "ゼロではないプレフィックス長には to/dst がありません"
-
- #: ../libnm-core/nm-setting-ip-config.c:2539
--#, fuzzy
- msgid "invalid to/dst"
--msgstr "無効なポート %d"
-+msgstr "無効な to/dst"
-
- #: ../libnm-core/nm-setting-ip-config.c:2544
--#, fuzzy
- msgid "invalid prefix length for to/dst"
--msgstr "%s '%s' の無効なプレフィックス長 (デフォルト値は %d)"
-+msgstr "to/dst のプレフィックス長は無効です"
-
- #: ../libnm-core/nm-setting-ip-config.c:2552
--#, fuzzy
- msgid "invalid iifname"
--msgstr "無効な値"
-+msgstr "無効な iifname"
-
- #: ../libnm-core/nm-setting-ip-config.c:2560
--#, fuzzy
- msgid "invalid oifname"
--msgstr "無効な値"
-+msgstr "無効な oifname"
-
- #: ../libnm-core/nm-setting-ip-config.c:2566
--#, fuzzy
- msgid "invalid source port range"
--msgstr "最小ソースポート数 [0]"
-+msgstr "ソースポートの範囲が無効です"
-
- #: ../libnm-core/nm-setting-ip-config.c:2572
--#, fuzzy
- msgid "invalid destination port range"
--msgstr "無効なアクション: "
-+msgstr "接続先ポートの範囲が無効です"
-
- #: ../libnm-core/nm-setting-ip-config.c:2676
--#, fuzzy, c-format
-+#, c-format
- msgid "duplicate key %s"
--msgstr "重複するプロパティー"
-+msgstr "重複キー %s"
-
- #: ../libnm-core/nm-setting-ip-config.c:2690
--#, fuzzy, c-format
-+#, c-format
- msgid "invalid key \"%s\""
--msgstr "無効なキー '%s': %s"
-+msgstr "無効なキー \"%s\""
-
- #: ../libnm-core/nm-setting-ip-config.c:2703
--#, fuzzy, c-format
-+#, c-format
- msgid "invalid variant type '%s' for \"%s\""
--msgstr "無効な属性タイプ '%s'"
-+msgstr "\"%s\" のバリアントタイプ '%s' が無効です"
-
- #: ../libnm-core/nm-setting-ip-config.c:2712
--#, fuzzy
- msgid "missing \""
--msgstr "キーがみつかりません"
-+msgstr "\" がありません"
-
- #: ../libnm-core/nm-setting-ip-config.c:2718
--#, fuzzy
- msgid "invalid \""
--msgstr "無効な DUID"
-+msgstr "\" は無効です"
-
- #: ../libnm-core/nm-setting-ip-config.c:2909
--#, fuzzy
- msgid "Unsupported to-string-flags argument"
--msgstr "サポートされていないオフロード機能"
-+msgstr "to-string-flags 引数はサポートされていません"
-
- #: ../libnm-core/nm-setting-ip-config.c:2916
- msgid "Unsupported extra-argument"
--msgstr ""
-+msgstr "サポートなしの追加の引数"
-
- #: ../libnm-core/nm-setting-ip-config.c:3161
--#, fuzzy, c-format
-+#, c-format
- msgid "unsupported key \"%s\""
--msgstr "サポートされていない tfilter オプション: '%s'."
-+msgstr "サポートされていないキー \"%s\""
-
- #: ../libnm-core/nm-setting-ip-config.c:3166
--#, fuzzy, c-format
-+#, c-format
- msgid "duplicate key \"%s\""
--msgstr "VF インデックス %u を複製します"
-+msgstr "重複キー \"%s\""
-
- #: ../libnm-core/nm-setting-ip-config.c:3171
--#, fuzzy, c-format
-+#, c-format
- msgid "invalid value for \"%s\""
--msgstr "'%s' の無効な値: %s"
-+msgstr "\"%s\" の値は無効です"
-
- #: ../libnm-core/nm-setting-ip-config.c:3181
- msgid "empty text does not describe a rule"
--msgstr ""
-+msgstr "空のテキストはルールを説明していません"
-
- #: ../libnm-core/nm-setting-ip-config.c:3187
--#, fuzzy, c-format
-+#, c-format
- msgid "missing argument for \"%s\""
--msgstr "ターゲットホストがありません"
-+msgstr "\"%s\" の引数がありません"
-
- #: ../libnm-core/nm-setting-ip-config.c:3199
--#, fuzzy
- msgid "invalid \"from\" part"
--msgstr "無効なポート %d"
-+msgstr "\"from\" の部分が無効です"
-
- #: ../libnm-core/nm-setting-ip-config.c:3213
--#, fuzzy
- msgid "invalid \"to\" part"
--msgstr "無効なポート %d"
-+msgstr "\"to\" の部分が無効です"
-
- #: ../libnm-core/nm-setting-ip-config.c:3222
- #, c-format
- msgid "cannot detect address family for rule"
--msgstr ""
-+msgstr "ルールのアドレスファミリーを検出できません"
-
- #: ../libnm-core/nm-setting-ip-config.c:3279
- #: ../libnm-core/nm-setting-ip-config.c:3373
--#, fuzzy, c-format
-+#, c-format
- msgid "rule is invalid: %s"
--msgstr "証明書が無効です: %s"
-+msgstr "ルールが無効です: %s"
-
- #: ../libnm-core/nm-setting-ip-config.c:3356
--#, fuzzy
- msgid "invalid address family"
--msgstr "無効な IP アドレス: %s"
-+msgstr "アドレスファミリーが無効です"
-
- #: ../libnm-core/nm-setting-ip-config.c:4618
--#, fuzzy, c-format
-+#, c-format
- msgid "rule #%u is invalid: %s"
--msgstr "証明書が無効です: %s"
-+msgstr "ルール #%u は無効です: %s"
-
- #: ../libnm-core/nm-setting-ip-config.c:4836
- #, c-format
-@@ -11848,12 +11867,12 @@ msgstr "%d. ルートをデフォルトルートにすることはできませ
- #: ../libnm-core/nm-setting-ip-config.c:4935
- #, c-format
- msgid "%u. rule has wrong address-family"
--msgstr ""
-+msgstr "%u. ルールのアドレスファミリーは間違っています"
-
- #: ../libnm-core/nm-setting-ip-config.c:4944
--#, fuzzy, c-format
-+#, c-format
- msgid "%u. rule is invalid: %s"
--msgstr "%d. ルートは無効です"
-+msgstr "%u. ルールは無効です: %s"
-
- #: ../libnm-core/nm-setting-ip-config.c:4957
- #, c-format
-@@ -11939,7 +11958,7 @@ msgstr "メソッドが無効に設定されている場合は、プロパティ
-
- #: ../libnm-core/nm-setting-ip6-config.c:248
- msgid "value is not a valid token"
--msgstr "値 は有効なトークンではありません"
-+msgstr "値は有効なトークンではありません"
-
- #: ../libnm-core/nm-setting-ip6-config.c:259
- msgid "only makes sense with EUI64 address generation mode"
-@@ -11983,7 +12002,7 @@ msgstr "EAP キー管理には '%s' 設定が必要です"
-
- #: ../libnm-core/nm-setting-macsec.c:357
- msgid "must be either psk (0) or eap (1)"
--msgstr ""
-+msgstr "PSK (0) または EAP (1) のいずれかでなければなりません"
-
- #: ../libnm-core/nm-setting-macsec.c:366
- #, c-format
-@@ -11992,7 +12011,7 @@ msgstr "無効なポート %d"
-
- #: ../libnm-core/nm-setting-macsec.c:377
- msgid "only valid for psk mode"
--msgstr ""
-+msgstr "PSK モードでのみ有効です"
-
- #: ../libnm-core/nm-setting-macvlan.c:168
- msgid "non promiscuous operation is allowed only in passthru mode"
-@@ -12168,16 +12187,16 @@ 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
--#, fuzzy, c-format
-+#, c-format
- msgid "kind is missing"
--msgstr "値がありません"
-+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
- #, c-format
- msgid "'%s' is not a valid kind"
--msgstr "'%s' は有効ではありません。"
-+msgstr "'%s' は有効な kind ではありません。"
-
- #: ../libnm-core/nm-setting-tc-config.c:86
- #: ../libnm-core/nm-setting-tc-config.c:722
-@@ -12225,9 +12244,8 @@ msgid "source-host '%s' contains invalid characters"
- msgstr "source-host '%s' に無効な文字が含まれています"
-
- #: ../libnm-core/nm-setting-team.c:312
--#, fuzzy
- msgid "vlanid is out of range [-1, 4094]"
--msgstr "%s は [0, %d] の範囲外です"
-+msgstr "vlanid は [-1, 4094] の範囲外です"
-
- #: ../libnm-core/nm-setting-team.c:1260
- #, c-format
-@@ -12359,9 +12377,8 @@ msgid "secret is not of correct type"
- msgstr "シークレットのタイプが正しくありません"
-
- #: ../libnm-core/nm-setting-vpn.c:757
--#, fuzzy
- msgid "secret flags property not found"
--msgstr "シークレットフラグプロパティー '%s' が見つかりません"
-+msgstr "シークレットフラグプロパティーが見つかりません"
-
- #: ../libnm-core/nm-setting-vxlan.c:367
- #, c-format
-@@ -12408,80 +12425,77 @@ msgstr "速度と二重の両方が静的リンク設定に必要です"
-
- #: ../libnm-core/nm-setting-wireguard.c:778
- msgid "missing public-key for peer"
--msgstr ""
-+msgstr "ピアの公開鍵がありません"
-
- #: ../libnm-core/nm-setting-wireguard.c:782
- msgid "invalid public-key for peer"
--msgstr ""
-+msgstr "ピアの公開鍵が無効です"
-
- #: ../libnm-core/nm-setting-wireguard.c:791
--#, fuzzy
- msgid "invalid preshared-key for peer"
--msgstr "無効なプライベートキー"
-+msgstr "ピアの共有前のキーが無効です"
-
- #: ../libnm-core/nm-setting-wireguard.c:809
--#, fuzzy
- msgid "invalid endpoint for peer"
--msgstr "ローカルエンドポイント [none]"
-+msgstr "ピアのエンドポイントが無効です"
-
- #: ../libnm-core/nm-setting-wireguard.c:819
--#, fuzzy, c-format
-+#, c-format
- msgid "invalid IP address \"%s\" for allowed-ip of peer"
--msgstr "無効な IP アドレス: %s"
-+msgstr "ピアの allowed-ip の IP アドレス \"%s\" は無効です "
-
- #: ../libnm-core/nm-setting-wireguard.c:828
- msgid "invalid preshared-key-flags for peer"
--msgstr ""
-+msgstr "ピアの共有前のキーフラグが無効です"
-
- #: ../libnm-core/nm-setting-wireguard.c:1567
- #, c-format
- msgid "peer #%u has no public-key"
--msgstr ""
-+msgstr "ピア #%u には公開鍵がありません"
-
- #: ../libnm-core/nm-setting-wireguard.c:1578
- #, c-format
- msgid "peer #%u has invalid public-key"
--msgstr ""
-+msgstr "ピア #%u の公開鍵は無効です"
-
- #: ../libnm-core/nm-setting-wireguard.c:1592
- #, c-format
- msgid "peer #%u has invalid endpoint"
--msgstr ""
-+msgstr "ピア #%u のエンドポイントは無効です"
-
- #: ../libnm-core/nm-setting-wireguard.c:1622
- #, c-format
- msgid "peer #%u has invalid allowed-ips setting"
--msgstr ""
-+msgstr "ピア #%u の allowed-ips 設定は無効です"
-
- #: ../libnm-core/nm-setting-wireguard.c:1634
--#, fuzzy, c-format
-+#, c-format
- msgid "peer #%u is invalid: %s"
--msgstr "証明書が無効です: %s"
-+msgstr "ピア #%u は無効です: %s"
-
- #: ../libnm-core/nm-setting-wireguard.c:1705
- #: ../libnm-core/nm-setting-wireguard.c:1719
- #, c-format
- msgid "method \"%s\" is not supported for WireGuard"
--msgstr ""
-+msgstr "メソッド \"%s\" は、WireGuard ではサポートしていません"
-
- #: ../libnm-core/nm-setting-wireguard.c:1739
- msgid "key must be 32 bytes base64 encoded"
--msgstr ""
-+msgstr "キーは 32 バイトで base64 でエンコードされている必要があります"
-
- #: ../libnm-core/nm-setting-wireguard.c:1875
--#, fuzzy
- msgid "invalid peer secrets"
--msgstr "無効なシークレット"
-+msgstr "無効なピアシークレット"
-
- #: ../libnm-core/nm-setting-wireguard.c:1898
- #, c-format
- msgid "peer #%u lacks public-key"
--msgstr ""
-+msgstr "ピア #%u には公開鍵がありません"
-
- #: ../libnm-core/nm-setting-wireguard.c:1912
- #, c-format
- msgid "non-existing peer '%s'"
--msgstr ""
-+msgstr "ピア '%s' は存在しません"
-
- #: ../libnm-core/nm-setting-wireless-security.c:935
- #: ../libnm-util/nm-setting-wireless-security.c:911
-@@ -12514,10 +12528,11 @@ msgid "'%s' can only be used with '%s=%s' (WEP)"
- msgstr "'%s' は '%s=%s' (WEP) でしか使用できません"
-
- #: ../libnm-core/nm-setting-wireless-security.c:1086
--#, fuzzy, c-format
-+#, c-format
- msgid ""
- "'%s' can only be used with 'wpa-eap', 'wpa-psk' or 'sae' key management "
--msgstr "'%s' は、'%s=%s' または '%s=%s' でしか使用できません"
-+msgstr ""
-+"'%s' は、'wpa-eap'、'wpa-psk' または 'sae' のキー管理でのみ使用できます"
-
- #: ../libnm-core/nm-setting-wireless.c:756
- #: ../libnm-util/nm-setting-wireless.c:786
-@@ -12556,17 +12571,17 @@ msgstr "mac-address-randomization と cloned-mac-address の値の競合"
-
- #: ../libnm-core/nm-setting-wpan.c:185
- msgid "page must be defined along with a channel"
--msgstr ""
-+msgstr "ページはチャンネルと共に定義される必要があります"
-
- #: ../libnm-core/nm-setting-wpan.c:194
- #, c-format
- msgid "page must be between %d and %d"
--msgstr ""
-+msgstr "ページは %d から %d の間でなければなりません"
-
- #: ../libnm-core/nm-setting-wpan.c:205
- #, c-format
- msgid "channel must not be between %d and %d"
--msgstr ""
-+msgstr "チャンネルは %d から %d の間であってはなりません"
-
- #: ../libnm-core/nm-setting.c:872
- #, c-format
-@@ -12690,32 +12705,28 @@ msgid "Could not find \"%s\" binary"
- msgstr "\"%s\" バイナリーを見つけることができませんでした"
-
- #: ../libnm-core/nm-utils.c:4460
--#, fuzzy
- msgid "unknown secret flags"
--msgstr "不明な設定名"
-+msgstr "不明なシークレットフラグ"
-
- #: ../libnm-core/nm-utils.c:4470
- msgid "conflicting secret flags"
--msgstr ""
-+msgstr "競合するシークレットフラグ"
-
- #: ../libnm-core/nm-utils.c:4481
--#, fuzzy
- msgid "secret flags must not be \"not-required\""
--msgstr "シークレットフラグプロパティー '%s' が見つかりません"
-+msgstr "シークレットフラグは \"not-required\" であってはなりません"
-
- #: ../libnm-core/nm-utils.c:4489
--#, fuzzy
- msgid "unsupported secret flags"
--msgstr "サポートされていない qdisc オプション: '%s'"
-+msgstr "サポートされていないシークレットフラグ"
-
- #: ../libnm-core/nm-utils.c:4519
- msgid "can't be simultaneously disabled and enabled"
- msgstr "同時に無効または有効にすることはできません"
-
- #: ../libnm-core/nm-utils.c:4527
--#, fuzzy
- msgid "WPS is required"
--msgstr "PIN コードが必要です"
-+msgstr "WPS が必要です"
-
- #: ../libnm-core/nm-utils.c:4593
- #, c-format
-@@ -12774,7 +12785,7 @@ msgid "unknown attribute '%s'"
- msgstr "不明な属性 '%s'"
-
- #: ../libnm-core/nm-utils.c:6548
--#, fuzzy, c-format
-+#, c-format
- msgid "missing key-value separator '%c' after '%s'"
- msgstr "'%s' の後に、キー/値のセパレーター '%c' がありません"
-
-@@ -12799,18 +12810,18 @@ msgid "unsupported attribute '%s' of type '%s'"
- msgstr "タイプ '%s' のサポートされていない属性 '%s'"
-
- #: ../libnm-core/nm-utils.c:6935
--#, fuzzy, c-format
-+#, c-format
- msgid "Bridge VLANs %d and %d are not sorted by ascending vid"
--msgstr "VFs %d および %d は、上昇するインデックスでソートされません"
-+msgstr "ブリッジ VLANs %d および %d は、上昇する vid でソートされません"
-
- #: ../libnm-core/nm-utils.c:6959
--#, fuzzy, c-format
-+#, c-format
- msgid "duplicate bridge VLAN vid %u"
--msgstr "VF インデックス %u を複製します"
-+msgstr "ブリッジ VLAN vid %u を複製します"
-
- #: ../libnm-core/nm-utils.c:6971
- msgid "only one VLAN can be the PVID"
--msgstr ""
-+msgstr "PVID になれるのは 1 つの VLAN のみです"
-
- #: ../libnm-core/nm-vpn-editor-plugin.c:296
- #, c-format
-@@ -13234,9 +13245,8 @@ msgid "The VXLAN identifiers of the device and the connection didn't match."
- msgstr "デバイスと接続の VXLAN ID が一致しませんでした。"
-
- #: ../libnm/nm-device-wifi-p2p.c:326
--#, fuzzy
- msgid "The connection was not a Wi-Fi P2P connection."
--msgstr "接続は Wi-Fi 接続ではありませんでした。"
-+msgstr "接続は Wi-Fi P2P 接続ではありませんでした。"
-
- #: ../libnm/nm-device-wifi.c:613
- msgid "The connection was not a Wi-Fi connection."
-@@ -13295,9 +13305,8 @@ msgid "WireGuard"
- msgstr "WireGuard"
-
- #: ../libnm/nm-device.c:1432
--#, fuzzy
- msgid "Wi-Fi P2P"
--msgstr "Wi-Fi"
-+msgstr "Wi-Fi P2P"
-
- #: ../libnm/nm-device.c:2551
- #, c-format
-@@ -13396,15 +13405,12 @@ msgid "System policy prevents control of network connections"
- msgstr "システムポリシーによりネットワーク接続の制御が阻止されます"
-
- #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:15
--#, fuzzy
- msgid "Allow control of Wi-Fi scans"
--msgstr "ネットワーク接続の制御を許可"
-+msgstr "Wi-Fi スキャンの制御を許可"
-
- #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:16
--#, fuzzy
- msgid "System policy prevents Wi-Fi scans"
--msgstr ""
--"システムポリシーにより Wi-Fi デバイスの有効化または無効化が阻止されます"
-+msgstr "システムポリシーにより Wi-Fi スキャンは阻止されます"
-
- #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:17
- msgid "Connection sharing via a protected Wi-Fi network"
-@@ -13626,11 +13632,11 @@ msgstr "%s はすでに実行中です (pid %ld)\n"
- msgid "You must be root to run %s!\n"
- msgstr "%s を実行するには root になる必要があります!\n"
-
--#: ../src/dhcp/nm-dhcp-dhclient-utils.c:272
-+#: ../src/dhcp/nm-dhcp-dhclient-utils.c:302
- msgid "# Created by NetworkManager\n"
- msgstr "# NetworkManager で作成されています\n"
-
--#: ../src/dhcp/nm-dhcp-dhclient-utils.c:283
-+#: ../src/dhcp/nm-dhcp-dhclient-utils.c:313
- #, c-format
- msgid ""
- "# Merged from %s\n"
-@@ -13900,9 +13906,9 @@ msgid "Failed to determine AP security information"
- msgstr "AP セキュリティー情報の決定に失敗しました。"
-
- #: ../src/nm-config.c:562
--#, fuzzy, c-format
-+#, c-format
- msgid "Bad '%s' option: "
--msgstr "'%s' オプションが空白です"
-+msgstr "不正な '%s' オプション: "
-
- #: ../src/nm-config.c:575
- msgid "Config file location"
-@@ -13954,14 +13960,12 @@ msgid "The expected start of the response"
- msgstr "期待されている応答の開始点"
-
- #: ../src/nm-config.c:595
--#, fuzzy
- msgid "NetworkManager options"
--msgstr "NetworkManager のパーミッション"
-+msgstr "NetworkManager オプション"
-
- #: ../src/nm-config.c:595
--#, fuzzy
- msgid "Show NetworkManager options"
--msgstr "NetworkManager のパーミッション"
-+msgstr "NetworkManager オプションを表示"
-
- #. Interface/IP config
- #: ../src/nm-iface-helper.c:275
-@@ -14090,195 +14094,3 @@ msgstr "不明なログレベル '%s'"
- #, c-format
- msgid "Unknown log domain '%s'"
- msgstr "不明なログドメイン '%s'"
--
--#~ msgid "Error: failed to remove a value from %s.%s: %s."
--#~ msgstr "エラー: '%s' の値の削除に失敗しました、%s: %s。"
--
--#~ msgid "WEP"
--#~ msgstr "WEP"
--
--#~ msgid "WPA1"
--#~ msgstr "WPA1"
--
--#~ msgid "WPA2"
--#~ msgstr "WPA2"
--
--#~ msgid "802.1X"
--#~ msgstr "802.1X"
--
--#~ msgid "default route cannot be added (NetworkManager handles it by itself)"
--#~ msgstr ""
--#~ "デフォルトのルートは追加できません (NetworkManager 自体が処理します)"
--
--#~ msgid "priority '%s' is not valid (<0-%ld>)"
--#~ msgstr "'%s' は有効な優先度ではありません (<0-%ld>)"
--
--#~ msgid "no item to remove"
--#~ msgstr "削除するアイテムがありません"
--
--#~ msgid "index '%d' is not in range <0-%d>"
--#~ msgstr "インデックス '%d' は範囲内にありません <0-%d>"
--
--#~ msgid "missing option"
--#~ msgstr "足りないオプション"
--
--#~ msgid "'%s' is not a valid MAC"
--#~ msgstr "'%s' は有効な MAC ではありません"
--
--#~ msgid "the property doesn't contain EAP method '%s'"
--#~ msgstr "プロパティーには EAP メソッド '%s' が含まれません"
--
--#~ msgid "the property doesn't contain alternative subject match '%s'"
--#~ msgstr "プロパティーには代替のサブジェクトマッチ '%s' が含まれません"
--
--#~ msgid ""
--#~ "the property doesn't contain \"phase2\" alternative subject match '%s'"
--#~ msgstr ""
--#~ "プロパティーには代替の \"phase2\" サブジェクトマッチ '%s' が含まれません"
--
--#~ msgid "the property doesn't contain permission '%s'"
--#~ msgstr "プロパティーにはパーミッション '%s' が含まれません"
--
--#~ msgid "the property doesn't contain UUID '%s'"
--#~ msgstr "プロパティーには UUID '%s' が含まれません"
--
--#~ msgid "the property doesn't contain DNS server '%s'"
--#~ msgstr "プロパティーには DNS サーバー '%s' が含まれません"
--
--#~ msgid "the property doesn't contain DNS search domain '%s'"
--#~ msgstr "プロパティーには DNS 検索ドメイン '%s' が含まれません"
--
--#~ msgid "the property doesn't contain DNS option '%s'"
--#~ msgstr "プロパティーには DNS オプション '%s' が含まれません"
--
--#~ msgid "the property doesn't contain IP address '%s'"
--#~ msgstr "プロパティーには IP アドレス '%s' が含まれません"
--
--#~ msgid "the property doesn't contain route '%s'"
--#~ msgstr "プロパティーにはルート '%s' が含まれません"
--
--#~ msgid "invalid IPv6 address '%s'"
--#~ msgstr "無効な IPv6 アドレス '%s'"
--
--#~ msgid "the property doesn't contain interface name '%s'"
--#~ msgstr "プロパティーにはインターフェース名 '%s' が含まれません"
--
--#~ msgid "the property doesn't contain vf with index %u"
--#~ msgstr "プロパティーにはインデックス %u を持つ vf が含まれません"
--
--#~ msgid "the property doesn't contain qdisc '%s'"
--#~ msgstr "プロパティーには qdisc '%s' が含まれません"
--
--#~ msgid ""
--#~ "The valid syntax is: '[root | parent <handle>] [handle <handle>] "
--#~ "<tfilter>'"
--#~ msgstr "有効な構文: '[root | parent <handle>] [handle <handle>] <tfilter>'"
--
--#~ msgid "the property doesn't contain tfilter '%s'"
--#~ msgstr "プロパティーには tfilter '%s' が含まれません"
--
--#~ msgid "the property doesn't contain string '%s'"
--#~ msgstr "プロパティーには文字列 '%s' が含まれません"
--
--#~ msgid "the property doesn't contain link watcher '%s'"
--#~ msgstr "プロパティーにはリンクウォッチャー '%s' が含まれません"
--
--#~ msgid "only one mapping at a time is supported; taking the first one (%s)"
--#~ msgstr ""
--#~ "マッピングは一度に 1 つだけ行います。最初のマッピング (%s) を行います。"
--
--#~ msgid "the property doesn't contain mapping '%s'"
--#~ msgstr "プロパティーにはマッピング '%s' が含まれません"
--
--#~ msgid "no priority to remove"
--#~ msgstr "削除する優先度がありません"
--
--#~ msgid "index '%d' is not in the range of <0-%d>"
--#~ msgstr "インデックス '%d' は <0-%d> の範囲内にありません"
--
--#~ msgid "'%s' cannot be empty"
--#~ msgstr "'%s' を空白にすることはできません"
--
--#~ msgid "the property doesn't contain MAC address '%s'"
--#~ msgstr "プロパティーには MAC アドレス '%s' が含まれません"
--
--#~ msgid "'%s' string value should consist of 1 - 199 characters"
--#~ msgstr "'%s' 文字列値は 1 - 199 の文字で構成される必要があります"
--
--#~ msgid "the property doesn't contain protocol '%s'"
--#~ msgstr "プロパティーにはプロトコル '%s' が含まれません"
--
--#~ msgid "'%s' is not a valid PSK"
--#~ msgstr "'%s' は有効な PSK ではありません"
--
--#~ msgid ""
--#~ "Pre-Shared-Key for WPA networks. If the key is 64-characters long, it "
--#~ "must contain only hexadecimal characters and is interpreted as a "
--#~ "hexadecimal WPA key. Otherwise, the key must be between 8 and 63 ASCII "
--#~ "characters (as specified in the 802.11i standard) and is interpreted as a "
--#~ "WPA passphrase, and is hashed to derive the actual WPA-PSK used when "
--#~ "connecting to the Wi-Fi network."
--#~ msgstr ""
--#~ "WPA ネットワークの共有前のキー。このキーを 64 文字の長さにする場合は、16 "
--#~ "進数の文字でなければならず、16 進数の WPA キーとして解釈されません。それ以"
--#~ "外では、キーは、(802.11i 仕様で指定されているように) 8 文字から 63 文字の "
--#~ "ASCII 文字にする必要があり、WPA パスフレーズとして解釈されます。接続が Wi-"
--#~ "Fi ネットワークに接続する際に使用される実際の WPA-PSK を取得するためにハッ"
--#~ "シュ化されます。"
--
--#~ msgid "GSM mobile broadband connection requires a 'gsm' setting"
--#~ msgstr "GSM モバイルブロードバンド接続には 'gsm' 設定が必要です"
--
--#~ msgid "Error: Failed to setup a Wi-Fi hotspot"
--#~ msgstr "エラー: Wi-Fi hotspot の設定に失敗しました"
--
--#~ msgid "Error: Failed to add/activate new connection: Unknown error"
--#~ msgstr "エラー: 新規接続の追加、アクティベートに失敗しました: 不明なエラー"
--
--#~ msgid "Connection with UUID '%s' created and activated on device '%s'\n"
--#~ msgstr ""
--#~ "UUID '%s' の接続が、'%s' デバイス上に作成されアクティベートされました。\n"
--
--#~ msgid "Hotspot '%s' activated on device '%s'\n"
--#~ msgstr "ホットスポット '%s' が、デバイス '%s' でアクティベートされました\n"
--
--#~ msgid "Device '%s' has been connected.\n"
--#~ msgstr "デバイス '%s' は接続されています。\n"
--
--#~ msgid ""
--#~ "Number to dial when establishing a PPP data session with the GSM-based "
--#~ "mobile broadband network. Many modems do not require PPP for connections "
--#~ "to the mobile network and thus this property should be left blank, which "
--#~ "allows NetworkManager to select the appropriate settings automatically."
--#~ msgstr ""
--#~ "GSM ベースのモバイルブロードバンドネットワークで PPP データを確立する際の"
--#~ "ダイアル番号。多くのモデムでは、モバイルネットワークへの接続に PPP を必要"
--#~ "しないため、このプロパティーは空のままにして、NetworkManager が自動的に適"
--#~ "切な設定を選択するようにする必要があります。"
--
--#~ msgid "The total number of virtual functions to create."
--#~ msgstr "作成する仮想関数の総数。"
--
--#~ msgid "invalid negative value (%i)"
--#~ msgstr "無効な負の値 (%i)"
--
--#~ msgid "invalid char value (%i)"
--#~ msgstr "無効な char 値 (%i)"
--
--#~ msgid "invalid int64 value (%s)"
--#~ msgstr "無効な int64 値 (%s)"
--
--#~ msgid "too large FLAGS property '%s' (%llu)"
--#~ msgstr "大きすぎる FLAGS プロパティー '%s' (%llu)"
--
--#~ msgid "unhandled setting property type '%s'"
--#~ msgstr "プロパティータイプ '%s' の設定が未処理"
--
--#~ msgid "failed to convert value '%s' to uint"
--#~ msgstr "値 '%s' を uint に変換するのに失敗しました"
--
--#~ msgid "secret is not set"
--#~ msgstr "シークレットが設定されていません"
--
--#~ msgid "mdns value %d is not valid"
--#~ msgstr "mdns value %d は無効です"
-diff --git a/po/zh_CN.po b/po/zh_CN.po
-index 6652b5b585..acf6164927 100644
---- a/po/zh_CN.po
-+++ b/po/zh_CN.po
-@@ -12,21 +12,22 @@
- # Mingye Wang (Arthur2e5) <arthur200126@gmail.com>, 2016.
- # Mingcong Bai <jeffbai@aosc.xyz>, 2017.
- # Dingzhong Chen <wsxy162@gmail.com>, 2016, 2017, 2018.
--#
-+# lrintel <lrintel@redhat.com>, 2019. #zanata
-+# tfu <tfu@redhat.com>, 2019. #zanata
- msgid ""
- msgstr ""
--"Project-Id-Version: NetworkManager master\n"
-+"Project-Id-Version: PACKAGE VERSION\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2019-05-21 09:59+0200\n"
--"PO-Revision-Date: 2018-08-30 12:00+0800\n"
--"Last-Translator: Dingzhong Chen <wsxy162@gmail.com>\n"
-+"POT-Creation-Date: 2019-05-28 14:18+0200\n"
-+"PO-Revision-Date: 2019-05-23 03:13+0000\n"
-+"Last-Translator: tfu <tfu@redhat.com>\n"
- "Language-Team: Chinese (China) <i18n-zh@googlegroups.com>\n"
--"Language: zh_CN\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: Poedit 2.1.1\n"
-+"X-Generator: Zanata 4.6.2\n"
-
- #: ../clients/cli/agent.c:39
- #, c-format
-@@ -461,7 +462,7 @@ msgstr ""
- "\n"
-
- #: ../clients/cli/connections.c:944
--#, fuzzy, c-format
-+#, c-format
- msgid ""
- "Usage: nmcli connection add { ARGUMENTS | help }\n"
- "\n"
-@@ -753,9 +754,9 @@ msgstr ""
- " [destination-port <0-65535>]\n"
- "\n"
- " wpan: [short-addr <0x0000-0xffff>]\n"
--"\n"
- " [pan-id <0x0000-0xffff>]\n"
--"\n"
-+" [page <default|0-31>]\n"
-+" [channel <default|0-26>]\n"
- " [mac <MAC address>]\n"
- "\n"
- " 6lowpan: dev <parent device (connection UUID, ifname, or MAC)>\n"
-@@ -1094,9 +1095,9 @@ msgid "no active connection or device"
- msgstr "没有活动的连接或设备"
-
- #: ../clients/cli/connections.c:2354
--#, fuzzy, c-format
-+#, c-format
- msgid "device '%s' not compatible with connection '%s': "
--msgstr "设备 \"%s\" 与连接 \"%s\" 不兼容："
-+msgstr "设备 '%s' 与连接 '%s' 不兼容： "
-
- #: ../clients/cli/connections.c:2387
- #, c-format
-@@ -1111,7 +1112,7 @@ msgstr "没有找到可用于连接 \"%s\" 的设备"
- #: ../clients/cli/connections.c:2441
- #, c-format
- msgid "Hint: use '%s' to get more details."
--msgstr ""
-+msgstr "提示：使用 '%s' 来获得更详细的信息。"
-
- #: ../clients/cli/connections.c:2459
- #, c-format
-@@ -1236,9 +1237,9 @@ msgid "Error: invalid property '%s': %s."
- msgstr "错误：无效的属性 \"%s\"：%s。"
-
- #: ../clients/cli/connections.c:3998
--#, fuzzy, c-format
-+#, c-format
- msgid "Error: failed to %s %s.%s: %s."
--msgstr "错误：修改 %s.%s 失败：%s。"
-+msgstr "错误：%s %s.%s 失败 : %s."
-
- #: ../clients/cli/connections.c:4033
- #, c-format
-@@ -1314,14 +1315,14 @@ msgid "Error: Failed to add '%s' connection: %s"
- msgstr "错误：添加 \"%s\" 连接失败：%s"
-
- #: ../clients/cli/connections.c:4795
--#, fuzzy, c-format
-+#, 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] "警告：存在名为 '%1$s' 的连接。这个连接由它的 uuid '%2$s' 指代\n"
-+msgstr[0] "警告：名为 '%1$s' 的连接已存在。使用 uuid '%2$s' 来指代连接\n"
-
- #: ../clients/cli/connections.c:4804
- #, c-format
-@@ -1991,9 +1992,9 @@ msgid "Error: Failed to save '%s' (%s) connection: %s\n"
- msgstr "错误：保存 \"%s\" (%s) 连接失败：%s\n"
-
- #: ../clients/cli/connections.c:7834
--#, fuzzy, c-format
-+#, c-format
- msgid "Error: Timeout saving '%s' (%s) connection\n"
--msgstr "错误：保存 \"%s\" (%s) 连接失败：%s\n"
-+msgstr "错误：保存 '%s' (%s) 连接超时\n"
-
- #: ../clients/cli/connections.c:7839
- #, c-format
-@@ -2164,9 +2165,9 @@ msgid "Error: not all connections deleted."
- msgstr "错误：未删除所有的连接。"
-
- #: ../clients/cli/connections.c:8553
--#, fuzzy, c-format
-+#, c-format
- msgid "Error: Connection deletion failed: %s\n"
--msgstr "错误：连接删除失败：%s"
-+msgstr "错误：连接删除失败：%s\n"
-
- #: ../clients/cli/connections.c:8609 ../clients/cli/connections.c:8730
- #, c-format
-@@ -2319,7 +2320,7 @@ msgid "%u Mb/s"
- msgstr "%u Mb/s"
-
- #: ../clients/cli/devices.c:689
--#, fuzzy, c-format
-+#, c-format
- msgid ""
- "Usage: nmcli device { COMMAND | help }\n"
- "\n"
-@@ -2382,7 +2383,7 @@ 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"
-@@ -2611,7 +2612,7 @@ msgstr ""
- "\n"
-
- #: ../clients/cli/devices.c:831
--#, fuzzy, c-format
-+#, c-format
- msgid ""
- "Usage: nmcli device wifi { ARGUMENTS | help }\n"
- "\n"
-@@ -2665,44 +2666,52 @@ msgid ""
- msgstr ""
- "Usage: nmcli device wifi { ARGUMENTS | help }\n"
- "\n"
--"在 Wi-Fi 设备中执行操作。\n"
-+"Perform operation on Wi-Fi devices.\n"
- "\n"
--"ARGUMENTS := [list [ifname <ifname>] [bssid <BSSID>]]\n"
-+"ARGUMENTS := [list [ifname <ifname>] [bssid <BSSID>] [--rescan yes|no|"
-+"auto]]\n"
- "\n"
--"列出可用的 Wi-Fi 接入点。'ifname' 和 'bssid' 选项可以用来为一个特定接口列出 "
--"AP，或使用一个特定的 BSSID。\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"
- " [bssid <BSSID>] [name <name>] [private yes|no] [hidden "
- "yes|no]\n"
- "\n"
--"连接到由 SSID 或 BSSID 指定的一个 Wi-Fi 网络。这个命令会创建一个新的连接，然"
--"后在一个设备上激活它。这与在 GUI 客户端中点一个 SSID 的效果相同。这个命令会创"
--"建一个新的连接，它主要用于连接到一个新的 Wi-Fi\n"
--"网络。如果到这个网络的连接已存在，最好使用以下方法来使用已存在的配置集："
--"nmcli con up id <name>.。请注意，当前只支持 open、WEP 和 WPA-PSK 网络。它同时"
--"假设 IP 地址的配置是通过 DHCP 获得的。\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"
-+"is a command-line counterpart of clicking an SSID in a GUI client. If a\n"
-+"connection for the network already exists, it is possible to bring up the\n"
-+"existing profile as follows: nmcli con up id <name>. Note that only open,\n"
-+"WEP and WPA-PSK networks are supported if no previous connection exists.\n"
-+"It is also assumed that IP configuration is obtained via DHCP.\n"
-+"\n"
- "ARGUMENTS := 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"
--"可以停止使用这个热点。\n"
--"热点参数可以通过可选参数进行配置：\n"
--"ifname - 使用的 Wi-Fi 设备\n"
--"con-name - 创建的热点连接配置集的名称\n"
--"ssid - 热点的 SSID\n"
--"band - 使用的 Wi-Fi 频段\n"
--"channel - 使用的 Wi-Fi channel\n"
--"password - 热点的密码\n"
-+"Create a Wi-Fi hotspot. Use 'connection down' or 'device disconnect'\n"
-+"to stop the hotspot.\n"
-+"Parameters of the hotspot can be influenced by the optional parameters:\n"
-+"ifname - Wi-Fi device to use\n"
-+"con-name - name of the created hotspot connection profile\n"
-+"ssid - SSID of the hotspot\n"
-+"band - Wi-Fi band to use\n"
-+"channel - Wi-Fi channel to use\n"
-+"password - password to use for the hotspot\n"
- "\n"
- "ARGUMENTS := rescan [ifname <ifname>] [[ssid <SSID to scan>] ...]\n"
- "\n"
--"请求 NetworkManager 马上重新扫描可用的接入点。\n"
--"NetworkManager 会定期扫描 Wi-Fi 网络，但在一些情况下，可能需要手动进行扫"
--"描。'ssid' 可以用来扫描特定的\n"
--"SSID，这对于带有隐藏的 SSID 的 AP 非常有用。可以指定多个 'ssid' 参数。请注"
--"意，这个命令不会显示 AP，需要使用 'nmcli device wifi list' 来实现这个功能。\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"
-
- #: ../clients/cli/devices.c:878
-@@ -2826,9 +2835,9 @@ msgid "Error: Failed to add/activate new connection: %s"
- msgstr "错误：添加/激活新连接失败：%s"
-
- #: ../clients/cli/devices.c:1862
--#, fuzzy, c-format
-+#, c-format
- msgid "Error: Failed to activate connection: %s"
--msgstr "错误：添加/激活新连接失败：%s"
-+msgstr "错误：激活连接失败：%s"
-
- #: ../clients/cli/devices.c:1932
- #, c-format
-@@ -3032,7 +3041,7 @@ msgstr "错误：未找到 BSSID 为 \"%s\" 的接入点。"
- #: ../clients/cli/devices.c:3397
- #, c-format
- msgid "Error: Connection '%s' exists but properties don't match."
--msgstr ""
-+msgstr "错误：连接 '%s' 存在但属性不匹配。"
-
- #: ../clients/cli/devices.c:3440
- #, c-format
-@@ -3620,7 +3629,7 @@ msgid "Networkmanager is not running (waiting for it)\n"
- msgstr "网络管理器未运行（等待中）。\n"
-
- #: ../clients/cli/nmcli.c:244
--#, fuzzy, c-format
-+#, c-format
- msgid ""
- "Usage: nmcli [OPTIONS] OBJECT { COMMAND | help }\n"
- "\n"
-@@ -3651,31 +3660,33 @@ msgid ""
- " m[onitor] monitor NetworkManager changes\n"
- "\n"
- msgstr ""
--"用法：nmcli [选项] OBJECT \n"
-+"Usage: nmcli [OPTIONS] OBJECT { COMMAND | help }\n"
- "\n"
--"选项：\n"
--" -o[verview] 概览模式（隐藏默认值）\n"
--" -t[erse] 简洁输出\n"
--" -p[retty] 整齐输出\n"
--" -m[ode] tabular|multiline 输出模式\n"
--" -c[olors] auto|yes|no 是否在输出中使用颜色\n"
--" -f[ields] |all|common 指定要输出的字段\n"
--" -g[et-values] |all|common -m tabular -t -f 的快捷方式\n"
--" -e[scape] yes|no 在值中转义列分隔符\n"
--" -a[sk] 询问缺少的参数\n"
--" -s[how-secrets] 允许显示密码\n"
--" -w[ait] 为完成的操作设置超时等待时间\n"
--" -v[ersion] 显示程序版本\n"
--" -h[elp] 输出此帮助\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"
-+" -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"
-+" -m, --mode tabular|multiline output mode\n"
-+" -o, --overview overview mode\n"
-+" -p, --pretty pretty output\n"
-+" -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"
- "\n"
--"对象：\n"
--" g[eneral] 网络管理器（NetworkManager）的常规状态和操作\n"
--" n[etworking] 整体联网控制\n"
--" r[adio] 网络管理器无线电开关\n"
--" c[onnection] 网络管理器的连接\n"
--" d[evice] 由网络管理器管理的设备\n"
--" a[gent] 网络管理器的密钥（secret）代理或 polkit 代理\n"
--" m[onitor] 监视网络管理器更改\n"
-+"OBJECT\n"
-+" g[eneral] NetworkManager's general status and operations\n"
-+" n[etworking] overall networking control\n"
-+" r[adio] NetworkManager radio switches\n"
-+" c[onnection] NetworkManager's connections\n"
-+" d[evice] devices managed by NetworkManager\n"
-+" a[gent] NetworkManager secret agent or polkit agent\n"
-+" m[onitor] monitor NetworkManager changes\n"
- "\n"
-
- #: ../clients/cli/nmcli.c:324
-@@ -4259,9 +4270,8 @@ msgid "Failed to configure SR-IOV parameters"
- msgstr "配置 SR-IOV 参数失败"
-
- #: ../clients/common/nm-client-utils.c:359
--#, fuzzy
- msgid "The Wi-Fi P2P peer could not be found"
--msgstr "未找到 Wi-Fi 网络"
-+msgstr "无法找到 Wi-Fi P2P peer"
-
- #: ../clients/common/nm-client-utils.c:365
- msgid "Unknown reason"
-@@ -4423,9 +4433,8 @@ msgstr "%s（%s）"
-
- #: ../clients/common/nm-meta-setting-desc.c:1372
- #: ../clients/common/nm-meta-setting-desc.c:1376
--#, fuzzy
- msgid "'%s' is out of range [%"
--msgstr "\"%s\" 超出范围 [0, %u]"
-+msgstr "'%s' 超出范围 [%"
-
- #: ../clients/common/nm-meta-setting-desc.c:1381
- #, c-format
-@@ -4509,9 +4518,9 @@ msgid "'%s' is not valid; use <option>=<value>"
- msgstr "'%s' 无效; 使用 <option>=<value>"
-
- #: ../clients/common/nm-meta-setting-desc.c:1993
--#, fuzzy, c-format
-+#, c-format
- msgid "cannot set empty \"%s\" option"
--msgstr "无法设定属性：%s"
-+msgstr "无法设定空的 %s 选项"
-
- #: ../clients/common/nm-meta-setting-desc.c:2052
- #, c-format
-@@ -4530,9 +4539,8 @@ msgid "'%s' is not valid"
- msgstr "\"%s\" 无效"
-
- #: ../clients/common/nm-meta-setting-desc.c:2187
--#, fuzzy
- msgid "not a valid hex-string"
--msgstr "不是有效的接口名称"
-+msgstr "不是有效的 hex 字符串"
-
- #: ../clients/common/nm-meta-setting-desc.c:2203
- #, c-format
-@@ -4543,12 +4551,12 @@ msgstr "\"%s\" 不是有效十六进制字符"
- msgid ""
- "too many arguments. Please only specify a private key file and optionally a "
- "password"
--msgstr ""
-+msgstr "参数太多。只能指定一个私钥或再指定一个可选的密码"
-
- #: ../clients/common/nm-meta-setting-desc.c:2404
--#, fuzzy, c-format
-+#, c-format
- msgid "failed to set bond option \"%s\""
--msgstr "设定属性失败：%s"
-+msgstr "设定绑定属性失败 %s"
-
- #: ../clients/common/nm-meta-setting-desc.c:2421
- #, c-format
-@@ -4594,9 +4602,9 @@ msgid "Can not change the connection type"
- msgstr "无法更改连接类型"
-
- #: ../clients/common/nm-meta-setting-desc.c:2564
--#, fuzzy, c-format
-+#, c-format
- msgid "invalid permission \"%s\""
--msgstr "无效的运行程序（runner）\"%s\""
-+msgstr "无效的权限 \"%s\""
-
- #: ../clients/common/nm-meta-setting-desc.c:2601
- #, c-format
-@@ -4668,9 +4676,9 @@ msgid "default"
- msgstr "默认"
-
- #: ../clients/common/nm-meta-setting-desc.c:3235
--#, fuzzy, c-format
-+#, c-format
- msgid "invalid IPv%c address '%s'"
--msgstr "无效的 IPv4 地址\"%s\""
-+msgstr "无效的 IPv%c 地址 '%s'"
-
- #: ../clients/common/nm-meta-setting-desc.c:3362
- #, c-format
-@@ -4688,14 +4696,13 @@ msgstr "有效语法为：\"vf [attribute=value]... [,vf [attribute=value]...]\"
-
- #: ../clients/common/nm-meta-setting-desc.c:3617
- #: ../clients/common/nm-meta-setting-desc.c:3697
--#, fuzzy
- msgid ""
- "The valid syntax is: '[root | parent <handle>] [handle <handle>] <kind>'"
--msgstr "有效的语法是：'[root | parent <handle>] [handle <handle>] <qdisc>'"
-+msgstr "正确语法为：'[root | parent <handle>] [handle <handle>] <kind>'"
-
- #: ../clients/common/nm-meta-setting-desc.c:3642
- msgid "The valid syntax is: '<vid>[-<vid>] [pvid] [untagged]'"
--msgstr ""
-+msgstr "正确语法为：'<vid>[-<vid>] [pvid] [untagged]'"
-
- #: ../clients/common/nm-meta-setting-desc.c:3917
- #, c-format
-@@ -5159,6 +5166,9 @@ msgid ""
- " priority [prio] [from [src]] [to [dst]], ,...\n"
- "\n"
- msgstr ""
-+"使用以下格式输入一组 IPv4 路由规则：\n"
-+" priority [prio] [from [src]] [to [dst]], ,...\n"
-+"\n"
-
- #: ../clients/common/nm-meta-setting-desc.c:5798
- msgid ""
-@@ -5229,6 +5239,9 @@ msgid ""
- " priority [prio] [from [src]] [to [dst]], ,...\n"
- "\n"
- msgstr ""
-+"使用以下格式输入一组 IPv6 路由规则：\n"
-+" priority [prio] [from [src]] [to [dst]], ,...\n"
-+"\n"
-
- #: ../clients/common/nm-meta-setting-desc.c:6008
- #: ../clients/common/nm-meta-setting-desc.c:6934
-@@ -5378,7 +5391,7 @@ msgstr "目标端口 [8472]"
-
- #: ../clients/common/nm-meta-setting-desc.c:7012
- msgid "Peer"
--msgstr ""
-+msgstr "同等"
-
- #: ../clients/common/nm-meta-setting-desc.c:7042
- msgid "WiMAX NSP name"
-@@ -5416,13 +5429,12 @@ msgid "PAN Identifier (<0x0000-0xffff>)"
- msgstr "PAN 标识符（<0x0000-0xffff>）"
-
- #: ../clients/common/nm-meta-setting-desc.c:7517
--#, fuzzy
- msgid "Page (<default|0-31>)"
--msgstr "（默认）"
-+msgstr "页 (<default|0-31>)"
-
- #: ../clients/common/nm-meta-setting-desc.c:7531
- msgid "Channel (<default|0-26>)"
--msgstr ""
-+msgstr "频道 (<default|0-26>)"
-
- #. ***************************************************************************
- #: ../clients/common/nm-meta-setting-desc.c:7666
-@@ -5576,7 +5588,7 @@ msgstr "用户设置"
- msgid "VLAN connection"
- msgstr "VLAN 连接"
-
--#: ../clients/common/nm-meta-setting-desc.c:7703 ../src/nm-manager.c:5539
-+#: ../clients/common/nm-meta-setting-desc.c:7703 ../src/nm-manager.c:5536
- msgid "VPN connection"
- msgstr "VPN 连接"
-
-@@ -5586,9 +5598,8 @@ msgid "VXLAN connection"
- msgstr "VXLAN 连接"
-
- #: ../clients/common/nm-meta-setting-desc.c:7705
--#, fuzzy
- msgid "Wi-Fi P2P connection"
--msgstr "Wi-Fi 连接"
-+msgstr "Wi-Fi P2P 连接"
-
- #: ../clients/common/nm-meta-setting-desc.c:7706
- msgid "WiMAX connection"
-@@ -5599,9 +5610,8 @@ msgid "Wired Ethernet"
- msgstr "有线以太网"
-
- #: ../clients/common/nm-meta-setting-desc.c:7708
--#, fuzzy
- msgid "WireGuard VPN settings"
--msgstr "WPAN 设置"
-+msgstr "WireGuard VPN 设置"
-
- #: ../clients/common/nm-meta-setting-desc.c:7709
- msgid "Wi-Fi connection"
-@@ -5626,7 +5636,7 @@ msgstr "验证会话已在进行。"
- #: ../clients/common/nm-secret-agent-simple.c:230
- #, c-format
- msgid "Preshared-key for %s"
--msgstr ""
-+msgstr "%s 的预共享密钥"
-
- #: ../clients/common/nm-secret-agent-simple.c:286
- #: ../clients/common/nm-secret-agent-simple.c:323
-@@ -5663,14 +5673,13 @@ msgid "Service"
- msgstr "服务"
-
- #: ../clients/common/nm-secret-agent-simple.c:486
--#, fuzzy
- msgid "WireGuard private-key"
--msgstr "无效的私有密钥"
-+msgstr "WireGuard 私钥"
-
- #: ../clients/common/nm-secret-agent-simple.c:527
--#, fuzzy, c-format
-+#, c-format
- msgid "Secrets are required to connect WireGuard VPN '%s'"
--msgstr "需要密钥来访问有线网络 \"%s\"。"
-+msgstr "连接到 WireGuard VPN '%s' 所需要的 secret"
-
- #: ../clients/common/nm-secret-agent-simple.c:628
- #: ../clients/common/nm-secret-agent-simple.c:912
-@@ -5742,9 +5751,8 @@ msgid "MACsec EAP authentication"
- msgstr "MACsec EAP 身份验证"
-
- #: ../clients/common/nm-secret-agent-simple.c:940
--#, fuzzy
- msgid "WireGuard VPN secret"
--msgstr "WireGuard"
-+msgstr "WireGuard VPN secret"
-
- #: ../clients/common/nm-secret-agent-simple.c:979
- msgid "VPN password required"
-@@ -5798,35 +5806,35 @@ msgid "Gateway certificate hash"
- msgstr "网关证书散列"
-
- #: ../clients/common/nm-vpn-helpers.c:270
--#, fuzzy, c-format
-+#, c-format
- msgid "Invalid peer starting at %s:%zu: %s"
--msgstr "无效的设置名称 \"%s\""
-+msgstr "于 %s:%zu: %s 启动的无效 peer"
-
- #: ../clients/common/nm-vpn-helpers.c:390
- msgid ""
- "The WireGuard config file must be a valid interface name followed by \".conf"
- "\""
--msgstr ""
-+msgstr "WireGuard 配置文件需要是一个有效的接口名再加上 \".conf\""
-
- #: ../clients/common/nm-vpn-helpers.c:678
- #, c-format
- msgid "unrecognized line at %s:%zu"
--msgstr ""
-+msgstr "无法识别的行 %s:%zu"
-
- #: ../clients/common/nm-vpn-helpers.c:683
--#, fuzzy, c-format
-+#, c-format
- msgid "invalid value for '%s' at %s:%zu"
--msgstr "对 \"%s\" 无效的值：%s"
-+msgstr "无效的值 '%s' 于 %s:%zu"
-
- #: ../clients/common/nm-vpn-helpers.c:688
--#, fuzzy, c-format
-+#, c-format
- msgid "invalid secret '%s' at %s:%zu"
--msgstr "无效路由：%s。%s"
-+msgstr "无效的 secret '%s' 于 %s:%zu"
-
- #: ../clients/common/nm-vpn-helpers.c:801
--#, fuzzy, c-format
-+#, c-format
- msgid "Failed to create WireGuard connection: %s"
--msgstr "错误：添加/激活新连接失败：%s"
-+msgstr "创建 WireGuard 连接失败 : %s"
-
- #. Generated file. Do not edit.
- #: ../clients/common/settings-docs.h.in:3
-@@ -5890,18 +5898,18 @@ msgstr ""
- #: ../clients/common/settings-docs.h.in:10
- #, fuzzy
- msgid ""
--"If specified, request that the device use this MAC address instead of its "
--"permanent MAC address. This is known as MAC cloning or spoofing. Beside "
--"explicitly specifying a MAC address, the special values \"preserve\", "
--"\"permanent\", \"random\" and \"stable\" are supported. \"preserve\" means "
--"not to touch the MAC address on activation. \"permanent\" means to use the "
--"permanent hardware address of the device. \"random\" 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 \"permanent\". On D-Bus, this field is "
--"expressed as \"assigned-mac-address\" or the deprecated \"cloned-mac-address"
--"\"."
-+"If specified, request that the device use this MAC address instead. This is "
-+"known as MAC cloning or spoofing. Beside explicitly specifying a MAC "
-+"address, the special values \"preserve\", \"permanent\", \"random\" and "
-+"\"stable\" are supported. \"preserve\" means not to touch the MAC address on "
-+"activation. \"permanent\" means to use the permanent hardware address of the "
-+"device. \"random\" 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 \"cloned-mac-address\"."
- msgstr ""
- "如指定了，则请求该设备使用此 MAC 地址来代替。这个可被称为 MAC 克隆或欺骗。除"
- "了明确地指定 MAC 地址，也支持 \"preserve\"、\"permanent\"、\"random\" 和 "
-@@ -5909,8 +5917,8 @@ msgstr ""
- "设备的永久硬件地址。\"random\" 则在每个连接上创建随机的 MAC 地址。\"stable\" "
- "则根据 connection.stable-id 和机器相关密钥创建散列的 MAC 地址。如未指定，该值"
- "可被全局默认值覆盖，参见 NetworkManager.conf 的手册。如还未指定，它就默认为 "
--"\"preserve\"（旧版 NetworkManager 可能使用不同的默认值）。在 D-Bus 上, 此字段"
--"表示为 \"assigned-mac-address\" 或已弃用的 \"cloned-mac-address\"。"
-+"\"permanent\"。在 D-Bus 上, 此字段表示为 \"assigned-mac-address\" 或已弃用的 "
-+"\"cloned-mac-address\"。"
-
- #: ../clients/common/settings-docs.h.in:11
- #: ../clients/common/settings-docs.h.in:91
-@@ -5955,7 +5963,6 @@ msgstr ""
- "的 MAC 地址，随机地选择本地或全局管理。"
-
- #: ../clients/common/settings-docs.h.in:12
--#, fuzzy
- msgid ""
- "If TRUE, indicates that the network is a non-broadcasting network that hides "
- "its SSID. This works both in infrastructure and AP mode. In infrastructure "
-@@ -5967,10 +5974,12 @@ msgid ""
- "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 网络。注意标记"
--"网络为隐藏对于你可能是个隐私问题，因为明确的探测扫描在空中可能被清晰地识别。"
-+"如果为 TRUE，代表网络是一个隐藏了其 SSID 的非广播网络。这适用于 "
-+"infrastructure 模式和 AP 模式。对于 infrastructure 模式，可以使用不同的方法来"
-+"更可靠地发现隐藏网络，例如探针扫描 SSID。然而，这些方法会暴露出隐藏了 SSID 的"
-+"网络的不安全性，因此在使用隐藏了 SSID 的网络时应谨慎。对于 AP 模式，创建的网"
-+"络不会广播其 SSID。请注意，把网络标记为隐藏对于您（infrastructure 模式）或客"
-+"户端工作站（AP 模式）可能只是一个隐私问题，因为显式探针扫描可以识别它们。"
-
- #: ../clients/common/settings-docs.h.in:13
- msgid ""
-@@ -6143,7 +6152,6 @@ msgstr ""
- "\"wep40\"、\"wep104\"、\"tkip\" 或 \"ccmp\" 中的一个。"
-
- #: ../clients/common/settings-docs.h.in:27
--#, fuzzy
- msgid ""
- "Key management used for the connection. One of \"none\" (WEP), \"ieee8021x"
- "\" (Dynamic WEP), \"wpa-none\" (Ad-Hoc WPA-PSK), \"wpa-psk\" (infrastructure "
-@@ -6220,6 +6228,10 @@ msgid ""
- "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 验证。"
-
- #: ../clients/common/settings-docs.h.in:35
- msgid "Flags indicating how to handle the \"psk\" property."
-@@ -6800,28 +6812,28 @@ msgstr ""
- #: ../clients/common/settings-docs.h.in:89
- #, fuzzy
- msgid ""
--"If specified, request that the device use this MAC address instead of its "
--"permanent MAC address. This is known as MAC cloning or spoofing. Beside "
--"explicitly specifying a MAC address, the special values \"preserve\", "
--"\"permanent\", \"random\" and \"stable\" are supported. \"preserve\" means "
--"not to touch the MAC address on activation. \"permanent\" means to use the "
--"permanent hardware address if the device has one (otherwise this is treated "
--"as \"preserve\"). \"random\" 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 \"permanent\". On D-Bus, this field is expressed as \"assigned-"
--"mac-address\" or the deprecated \"cloned-mac-address\"."
-+"If specified, request that the device use this MAC address instead. This is "
-+"known as MAC cloning or spoofing. Beside explicitly specifying a MAC "
-+"address, the special values \"preserve\", \"permanent\", \"random\" and "
-+"\"stable\" are supported. \"preserve\" means not to touch the MAC address on "
-+"activation. \"permanent\" means to use the permanent hardware address if the "
-+"device has one (otherwise this is treated as \"preserve\"). \"random\" "
-+"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 "
-+"\"cloned-mac-address\"."
- msgstr ""
--"如果指定了，则请求设备改成使用此 MAC 地址。这被称为 MAC 克隆或欺骗。除了明确"
--"地指定个 MAC 地址，也支持特殊值 \"preserve\"、\"permanent\"、\"random\" 和 "
--"\"stable\"。\"preserve\" 表示激活时不动 MAC 地址。\"permanent\" 表示如果设备"
--"有永久硬件地址则使用（否则视为 \"preserve\"）。\"random\" 会在每次连接时创建"
--"个随机的 MAC 地址。\"stable\" 根据 connection.stable-id 和机器相关的密钥创建"
--"个散列的 MAC 地址。如果未指定，其值可被全局默认值覆盖，参阅 NetworkManager."
--"conf 手册。如仍未指定，它将默认为 \"preserve\"（旧版 NetworkManager 可能使用"
--"不同的默认值）。在 D-Bus 上，此字段表示为 \"assigned-mac-address\" 或已弃用"
--"的 \"cloned-mac-address\"。"
-+"如指定了，则请求该设备使用此 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
- msgid ""
-@@ -7075,12 +7087,11 @@ msgstr "控制是否为此网桥启用生成树协议（STP）。"
- msgid ""
- "The default PVID for the ports of the bridge, that is the VLAN id assigned "
- "to incoming untagged frames."
--msgstr ""
-+msgstr "网桥端口的默认 PVID，它是分配给入站的未经过 tag 的数据包的 VLAN id。"
-
- #: ../clients/common/settings-docs.h.in:122
--#, fuzzy
- msgid "Control whether VLAN filtering is enabled on the bridge."
--msgstr "控制是否为此网桥启用生成树协议（STP）。"
-+msgstr "控制在网桥中是否启用 VLAN 过滤。"
-
- #: ../clients/common/settings-docs.h.in:123
- msgid ""
-@@ -7091,6 +7102,10 @@ msgid ""
- "$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:124
- msgid ""
-@@ -7116,6 +7131,10 @@ msgid ""
- "[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:174
-@@ -7251,7 +7270,6 @@ msgid "Whether LLDP is enabled for the connection."
- msgstr "是否为连接启用 LLDP。"
-
- #: ../clients/common/settings-docs.h.in:142
--#, fuzzy
- 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 "
-@@ -7262,16 +7280,17 @@ msgid ""
- "host names. This feature requires a plugin which supports LLMNR. One such "
- "plugin is dns-systemd-resolved."
- msgstr ""
--"是否为连接启用 mDNS。它的值可以是：yes: 注册主机名并为连接进行解析，no: 接口"
--"禁用 mDNS，resolve: 不注册主机名但允许解析 mDNS 主机名。这个功能需要一个支持 "
--"mDNS 的插件。dns-systemd-resolved 就是这样一个插件。"
-+"连接是否启用 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
- msgid "Interface name of the master device or UUID of the master connection."
- msgstr "主设备的接口名或 UUID 或主连接。"
-
- #: ../clients/common/settings-docs.h.in:144
--#, fuzzy
- 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 "
-@@ -7342,7 +7361,6 @@ msgstr ""
- "是从连接。"
-
- #: ../clients/common/settings-docs.h.in:151
--#, fuzzy
- msgid ""
- "This represents the identity of the connection used for various purposes. It "
- "allows to configure multiple profiles to share the identity. Also, the "
-@@ -7630,7 +7648,7 @@ msgstr ""
- msgid ""
- "Legacy setting that used to help establishing PPP data sessions for GSM-"
- "based modems. Deprecated: 1"
--msgstr ""
-+msgstr "用来帮助基于 GSM 的调制解调器创建 PPP 数据会话的老的设置。已过期：1"
-
- #: ../clients/common/settings-docs.h.in:179
- msgid ""
-@@ -7811,7 +7829,6 @@ msgstr ""
- "秒）。大于零的值为以毫秒计算的超时时间。该属性当前只实现于 IPv4。"
-
- #: ../clients/common/settings-docs.h.in:204
--#, fuzzy
- 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 "
-@@ -7842,7 +7859,7 @@ msgstr ""
- "MAC 地址来生成类型为以太网类型 (01) 的客户端标识符。当前这些选项仅适用于以太"
- "网类型的链路。支持特殊值 \"stable\" 基于 stable-id 和每个主机的密钥生成一个类"
- "型 0 的客户端标识符（参见 connection.stable-id）。如果未设，使用全局默认值。"
--"如果仍未设定，重新使用来自上个租约的 client-id。"
-+"如果仍未设定，默认值取决于 DHCP 插件。"
-
- #: ../clients/common/settings-docs.h.in:205
- msgid ""
-@@ -7898,7 +7915,6 @@ msgstr ""
-
- #: ../clients/common/settings-docs.h.in:211
- #: ../clients/common/settings-docs.h.in:231
--#, fuzzy
- msgid ""
- "DNS servers priority. The relative priority for DNS servers specified by "
- "this setting. A lower value is better (higher priority). Zero selects a "
-@@ -7995,7 +8011,6 @@ msgstr ""
-
- #: ../clients/common/settings-docs.h.in:217
- #: ../clients/common/settings-docs.h.in:238
--#, fuzzy
- msgid ""
- "IP configuration method. NMSettingIP4Config and NMSettingIP6Config both "
- "support \"auto\", \"manual\", and \"link-local\". See the subclass-specific "
-@@ -8108,7 +8123,6 @@ msgstr ""
- "址。"
-
- #: ../clients/common/settings-docs.h.in:225
--#, fuzzy
- 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 "
-@@ -8545,9 +8559,11 @@ msgid ""
- "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 设置。"
-
- #: ../clients/common/settings-docs.h.in:304
--#, fuzzy
- msgid ""
- "Array of virtual function descriptors. Each VF descriptor is a dictionary "
- "mapping attribute names to GVariant values. The 'index' entry is mandatory "
-@@ -8588,7 +8604,6 @@ msgstr ""
-
- #: ../clients/common/settings-docs.h.in:308
- #: ../clients/common/settings-docs.h.in:326
--#, fuzzy
- msgid ""
- "Link watchers configuration for the connection: each link watcher is defined "
- "by a dictionary, whose keys depend upon the selected link watcher. Available "
-@@ -8603,8 +8618,9 @@ 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\"。"
-+"\"、\"target-host\"；arp_ping：包括 nsna_ping 中的所有以及 \"source-host"
-+"\"、\"validate-active\"、\"validate-incative\"、\"send-always\"。请参阅 "
-+"teamd.conf 的 man 页了解详细信息。"
-
- #: ../clients/common/settings-docs.h.in:309
- msgid "Corresponds to the teamd mcast_rejoin.count."
-@@ -8953,7 +8969,7 @@ msgstr "指定要在传出数据包使用的存活时间值。"
- msgid ""
- "The P2P device that should be connected to. Currently this is the only way "
- "to create or join a group."
--msgstr ""
-+msgstr "应该连接到的 P2P 设备。目前，这是唯一创建或加入一个组的方法。"
-
- #: ../clients/common/settings-docs.h.in:365
- msgid ""
-@@ -8963,17 +8979,18 @@ msgid ""
- "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 客户端时有用。"
-
- #: ../clients/common/settings-docs.h.in:366
--#, fuzzy
- 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）会自"
--"动从接入点功能确定启动 WPS 注册是否可行，因此改变默认设置几乎没有意义。可以通"
--"过设置此属性值为 1 来禁用 WPS。"
-+"动决定要使用的最佳方法，因此改变默认设置几乎没有意义。"
-
- #: ../clients/common/settings-docs.h.in:367
- msgid ""
-@@ -8995,22 +9012,25 @@ 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."
- msgstr ""
-+"使用 fwmark 是可选的，它被默认禁用。如果把它设为 0，则代表被禁用，其他情况下"
-+"它是一个用于出站数据包的 32 位 fwmark。"
-
- #: ../clients/common/settings-docs.h.in:370
- msgid ""
- "The listen-port. If listen-port is not specified, the port will be chosen "
- "randomly when the interface comes up."
--msgstr ""
-+msgstr "listen-port。如果 listen-port 没有被指定，则会在接口使用随机选择端口。"
-
- #: ../clients/common/settings-docs.h.in:371
--#, fuzzy
- 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 不同，它不会考虑在激活时"
-+"当前的路由。"
-
- #: ../clients/common/settings-docs.h.in:372
- msgid ""
-@@ -9020,21 +9040,24 @@ msgid ""
- "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 中添加静态路由。"
-
- #: ../clients/common/settings-docs.h.in:373
- msgid "The 256 bit private-key in base64 encoding."
--msgstr ""
-+msgstr "以 base64 编码的 256 为私钥。"
-
- #: ../clients/common/settings-docs.h.in:374
--#, fuzzy
- msgid "Flags indicating how to handle the \"private-key\" property."
--msgstr "指示如何处理 \"private-key-password\" 属性的标志。"
-+msgstr "指示如何处理 \"private-key\" 属性的标志。"
-
- #: ../clients/common/settings-docs.h.in:375
- msgid ""
- "IEEE 802.15.4 channel. A positive integer or -1, meaning \"do not set, use "
- "whatever the device is already set to\"."
--msgstr ""
-+msgstr "IEEE 802.15.4 频道。一个正整数，或 -1 意味着“不设置，使用设置的设置”。"
-
- #: ../clients/common/settings-docs.h.in:376
- msgid ""
-@@ -9049,6 +9072,7 @@ 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:378
- msgid "IEEE 802.15.4 Personal Area Network (PAN) identifier."
-@@ -9174,7 +9198,7 @@ msgstr "DSL 连接 %d"
- #: ../clients/tui/nm-editor-utils.c:188 ../libnm-core/nm-connection.c:2509
- #: ../libnm-glib/nm-device.c:1834 ../libnm-util/nm-connection.c:1623
- #: ../libnm/nm-device.c:1400
--#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4836
-+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4898
- msgid "Bond"
- msgstr "绑定"
-
-@@ -9186,7 +9210,7 @@ msgstr "绑定连接 %d"
- #: ../clients/tui/nm-editor-utils.c:197 ../libnm-core/nm-connection.c:2513
- #: ../libnm-glib/nm-device.c:1838 ../libnm-util/nm-connection.c:1627
- #: ../libnm/nm-device.c:1404
--#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5216
-+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5288
- msgid "Bridge"
- msgstr "网桥"
-
-@@ -9198,7 +9222,7 @@ msgstr "网桥连接 %d"
- #: ../clients/tui/nm-editor-utils.c:206 ../libnm-core/nm-connection.c:2511
- #: ../libnm-glib/nm-device.c:1836 ../libnm-util/nm-connection.c:1625
- #: ../libnm/nm-device.c:1402
--#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4939
-+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5006
- msgid "Team"
- msgstr "组合"
-
-@@ -9505,7 +9529,7 @@ msgid "(No custom routes)"
- msgstr "（没有自定义路由）"
-
- #: ../clients/tui/nmt-page-ip4.c:85 ../clients/tui/nmt-page-ip6.c:85
--#, fuzzy, c-format
-+#, c-format
- msgid "One custom route"
- msgid_plural "%d custom routes"
- msgstr[0] " 个自定义路由"
-@@ -10013,9 +10037,9 @@ msgid "NetworkManager is not running."
- msgstr "NetworkManaer 未运行。"
-
- #: ../libnm-core/nm-crypto.c:213
--#, fuzzy, c-format
-+#, c-format
- msgid "PEM key file had no start tag"
--msgstr "PEM 密钥文件没有结束标记 \"%s\"。"
-+msgstr "PEM 密钥文件没有 start tag"
-
- #: ../libnm-core/nm-crypto.c:221 ../libnm-util/crypto.c:130
- #, c-format
-@@ -10081,9 +10105,9 @@ msgid "IV contains non-hexadecimal digits."
- msgstr "初始向量中包含非十六进制数字。"
-
- #: ../libnm-core/nm-crypto.c:531
--#, fuzzy, c-format
-+#, c-format
- msgid "IV must contain at least 8 characters"
--msgstr "密钥包含无效的字符"
-+msgstr "IV 需要最少包括 8 个字符"
-
- #: ../libnm-core/nm-crypto.c:579 ../libnm-util/crypto.c:515
- #, c-format
-@@ -10111,33 +10135,33 @@ msgid "Failed to decode certificate."
- msgstr "无法解码证书。"
-
- #: ../libnm-core/nm-crypto.c:702 ../libnm-core/nm-crypto.c:755
--#, fuzzy, c-format
-+#, c-format
- msgid "Certificate file is empty"
--msgstr "密钥为空"
-+msgstr "整数文件为空"
-
- #: ../libnm-core/nm-crypto.c:735
--#, fuzzy, c-format
-+#, c-format
- msgid "Failed to recognize certificate"
--msgstr "无法解码证书。"
-+msgstr "识别证书失败。"
-
- #: ../libnm-core/nm-crypto.c:845
--#, fuzzy, c-format
-+#, c-format
- msgid "not a valid private key"
--msgstr "无效的私有密钥"
-+msgstr "无效的私钥"
-
- #: ../libnm-core/nm-crypto-gnutls.c:75 ../libnm-util/crypto_gnutls.c:48
- msgid "Failed to initialize the crypto engine."
- msgstr "初始化加密引擎失败。"
-
- #: ../libnm-core/nm-crypto-gnutls.c:107 ../libnm-core/nm-crypto-nss.c:129
--#, fuzzy, c-format
-+#, c-format
- msgid "Unsupported key cipher for decryption"
--msgstr "不支持的流量过滤器（tfilter）选项：\"%s\"。"
-+msgstr "解密不支持的密钥密码"
-
- #: ../libnm-core/nm-crypto-gnutls.c:117 ../libnm-core/nm-crypto-nss.c:136
--#, fuzzy, c-format
-+#, c-format
- msgid "Invalid IV length (must be at least %u)."
--msgstr "无效的初始向量长度（至少为 %d）。"
-+msgstr "无效的初始向量长度（至少为 %u）。"
-
- #: ../libnm-core/nm-crypto-gnutls.c:134 ../libnm-util/crypto_gnutls.c:175
- #, c-format
-@@ -10162,9 +10186,9 @@ msgid "Failed to decrypt the private key."
- msgstr "解密私钥失败。"
-
- #: ../libnm-core/nm-crypto-gnutls.c:205 ../libnm-core/nm-crypto-nss.c:289
--#, fuzzy, c-format
-+#, c-format
- msgid "Unsupported key cipher for encryption"
--msgstr "不支持的流量过滤器（tfilter）选项：\"%s\"。"
-+msgstr "加密不支持的密钥密码"
-
- #: ../libnm-core/nm-crypto-gnutls.c:221 ../libnm-util/crypto_gnutls.c:280
- #, c-format
-@@ -10292,9 +10316,9 @@ msgid "Password must be UTF-8"
- msgstr "密码必须是 UTF-8 格式"
-
- #: ../libnm-core/nm-crypto-nss.c:462
--#, fuzzy, c-format
-+#, c-format
- msgid "Couldn't initialize slot"
--msgstr "无法初始化 PKCS#8 解码器：%s"
-+msgstr "无法初始 slot"
-
- #: ../libnm-core/nm-crypto-nss.c:470 ../libnm-util/crypto_nss.c:489
- #, c-format
-@@ -10401,9 +10425,9 @@ msgid "Method returned type '%s', but expected '%s'"
- msgstr "方法返回类型 \"%s\"，但期望的是 \"%s\""
-
- #: ../libnm-core/nm-keyfile-utils.c:210
--#, fuzzy, c-format
-+#, c-format
- msgid "value is not an integer in range [%lld, %lld]"
--msgstr "\"%s\" 超出范围 [%lli, %lli]"
-+msgstr "值不是在 [%lld, %lld] 范围内的一个整数"
-
- #: ../libnm-core/nm-keyfile.c:211
- msgid "ignoring missing number"
-@@ -10528,9 +10552,9 @@ msgid "invalid parity value '%s'"
- msgstr "无效的奇偶校验值 \"%s\""
-
- #: ../libnm-core/nm-keyfile.c:1603 ../libnm-core/nm-keyfile.c:3052
--#, fuzzy, c-format
-+#, c-format
- msgid "invalid setting: %s"
--msgstr "无效的设置名称 \"%s\""
-+msgstr "无效设置：%s"
-
- #: ../libnm-core/nm-keyfile.c:1618
- #, c-format
-@@ -10557,7 +10581,7 @@ msgstr "加载设置值时出错：%s"
- #: ../libnm-core/nm-keyfile.c:2975 ../libnm-core/nm-keyfile.c:3027
- #: ../libnm-core/nm-keyfile.c:3038
- msgid "value cannot be interpreted as integer"
--msgstr ""
-+msgstr "值无法被解析为整数"
-
- #: ../libnm-core/nm-keyfile.c:3073
- #, c-format
-@@ -10575,39 +10599,39 @@ msgid "key '%s.%s' is not boolean"
- msgstr "密钥 \"%s.%s\" 不是布尔值"
-
- #: ../libnm-core/nm-keyfile.c:3190
--#, fuzzy, c-format
-+#, c-format
- msgid "invalid peer public key in section '%s'"
--msgstr "无效选项 \"%s\""
-+msgstr "'%s' 项中无效的 peer 公钥"
-
- #: ../libnm-core/nm-keyfile.c:3202
- #, c-format
- msgid "key '%s.%s' is not a valid 256 bit key in base64 encoding"
--msgstr ""
-+msgstr "密钥 '%s.%s' 不是一个以 base64 编码的有效的 256 位密钥"
-
- #: ../libnm-core/nm-keyfile.c:3215
--#, fuzzy, c-format
-+#, c-format
- msgid "key '%s.%s' is not a valid secret flag"
--msgstr "\"%s\" 不是有效的 DCB 标记"
-+msgstr " '%s.%s' 不是一个有效的 secret 标记"
-
- #: ../libnm-core/nm-keyfile.c:3227
--#, fuzzy, c-format
-+#, c-format
- msgid "key '%s.%s' is not a integer in range 0 to 2^32"
--msgstr "\"%s\" 超出范围 [%lli, %lli]"
-+msgstr "'%s.%s' 不是在 0 到 2^32 范围内的一个整数"
-
- #: ../libnm-core/nm-keyfile.c:3239
--#, fuzzy, c-format
-+#, c-format
- msgid "key '%s.%s' is not a valid endpoint"
--msgstr "\"%s\" 不是有效的种类"
-+msgstr "'%s.%s' 不是一个有效的端点"
-
- #: ../libnm-core/nm-keyfile.c:3261
- #, c-format
- msgid "key '%s.%s' has invalid allowed-ips"
--msgstr ""
-+msgstr "'%s.%s' 包括无效的 allowed-ips"
-
- #: ../libnm-core/nm-keyfile.c:3273
--#, fuzzy, c-format
-+#, c-format
- msgid "peer '%s' is invalid: %s"
--msgstr "\"%s\" 无效"
-+msgstr "peer '%s' 无效 : %s"
-
- #: ../libnm-core/nm-setting-6lowpan.c:93
- #, c-format
-@@ -10655,9 +10679,9 @@ msgid "certificate is invalid: %s"
- msgstr "证书是无效的：%s"
-
- #: ../libnm-core/nm-setting-8021x.c:321
--#, fuzzy, c-format
-+#, c-format
- msgid "certificate detected as invalid scheme"
--msgstr "证书是无效的：%s"
-+msgstr "证书无效"
-
- #: ../libnm-core/nm-setting-8021x.c:535 ../libnm-util/nm-setting-8021x.c:639
- msgid "CA certificate must be in X.509 format"
-@@ -11064,9 +11088,9 @@ msgid ""
- msgstr "软件 infiniband 设备的接口名必须为 \"%s\" 或未设置（但现在是 \"%s\"）"
-
- #: ../libnm-core/nm-setting-infiniband.c:281
--#, fuzzy, c-format
-+#, c-format
- msgid "mtu can be at most %u but it is %u"
--msgstr "传输模式 \"%s\" 的 MTU 最多为 %d，但现在是 %d"
-+msgstr "mtu 最大为 %u，但它的值是 %u"
-
- #: ../libnm-core/nm-setting-ip-config.c:136
- #, c-format
-@@ -11142,164 +11166,147 @@ msgid "invalid prefix %s"
- msgstr "无效的前缀 %s"
-
- #: ../libnm-core/nm-setting-ip-config.c:2479
--#, fuzzy
- msgid "invalid priority"
--msgstr "无效的优先级映射 \"%s\""
-+msgstr "无效的优先级"
-
- #: ../libnm-core/nm-setting-ip-config.c:2490
--#, fuzzy
- msgid "missing table"
--msgstr "缺少密钥"
-+msgstr "缺少表"
-
- #: ../libnm-core/nm-setting-ip-config.c:2496
--#, fuzzy
- msgid "invalid action"
--msgstr "无效操作："
-+msgstr "无效操作"
-
- #: ../libnm-core/nm-setting-ip-config.c:2503
- msgid "has from/src but the prefix-length is zero"
--msgstr ""
-+msgstr "带有 from/src 但是 prefix-length 为 0"
-
- #: ../libnm-core/nm-setting-ip-config.c:2510
- msgid "missing from/src for a non zero prefix-length"
--msgstr ""
-+msgstr "一个非 0 的 prefix-length 但没有 from/src"
-
- #: ../libnm-core/nm-setting-ip-config.c:2515
--#, fuzzy
- msgid "invalid from/src"
--msgstr "无效的端口 %d"
-+msgstr "无效的 from/src"
-
- #: ../libnm-core/nm-setting-ip-config.c:2520
--#, fuzzy
- msgid "invalid prefix length for from/src"
--msgstr "%s 的前缀长度 \"%s\" 无效，默认为 %d"
-+msgstr "from/src 无效的前缀长度"
-
- #: ../libnm-core/nm-setting-ip-config.c:2527
- msgid "has to/dst but the prefix-length is zero"
--msgstr ""
-+msgstr "带有 to/dst 但是 prefix-length 为 0"
-
- #: ../libnm-core/nm-setting-ip-config.c:2534
- msgid "missing to/dst for a non zero prefix-length"
--msgstr ""
-+msgstr "一个非 0 的 prefix-length 但没有 to/dst"
-
- #: ../libnm-core/nm-setting-ip-config.c:2539
--#, fuzzy
- msgid "invalid to/dst"
--msgstr "无效的端口 %d"
-+msgstr "无效的 to/dst"
-
- #: ../libnm-core/nm-setting-ip-config.c:2544
--#, fuzzy
- msgid "invalid prefix length for to/dst"
--msgstr "%s 的前缀长度 \"%s\" 无效，默认为 %d"
-+msgstr "to/dst 无效的前缀长度"
-
- #: ../libnm-core/nm-setting-ip-config.c:2552
--#, fuzzy
- msgid "invalid iifname"
--msgstr "无效值"
-+msgstr "无效的 iifname"
-
- #: ../libnm-core/nm-setting-ip-config.c:2560
--#, fuzzy
- msgid "invalid oifname"
--msgstr "无效值"
-+msgstr "无效的 oifname"
-
- #: ../libnm-core/nm-setting-ip-config.c:2566
--#, fuzzy
- msgid "invalid source port range"
--msgstr "最小来源端口 [0]"
-+msgstr "无效的源端口范围"
-
- #: ../libnm-core/nm-setting-ip-config.c:2572
--#, fuzzy
- msgid "invalid destination port range"
--msgstr "无效操作："
-+msgstr "无效的目标端口范围"
-
- #: ../libnm-core/nm-setting-ip-config.c:2676
--#, fuzzy, c-format
-+#, c-format
- msgid "duplicate key %s"
--msgstr "重复的属性"
-+msgstr "重复的 %s"
-
- #: ../libnm-core/nm-setting-ip-config.c:2690
--#, fuzzy, c-format
-+#, c-format
- msgid "invalid key \"%s\""
--msgstr "无效的密钥 \"%s\"：%s"
-+msgstr "无效的 \"%s\""
-
- #: ../libnm-core/nm-setting-ip-config.c:2703
--#, fuzzy, c-format
-+#, c-format
- msgid "invalid variant type '%s' for \"%s\""
--msgstr "无效的属性类型 \"%s\""
-+msgstr "无效的变体类型 '%s'（对于 \"%s\"）"
-
- #: ../libnm-core/nm-setting-ip-config.c:2712
--#, fuzzy
- msgid "missing \""
--msgstr "缺少密钥"
-+msgstr "缺少 \""
-
- #: ../libnm-core/nm-setting-ip-config.c:2718
--#, fuzzy
- msgid "invalid \""
--msgstr "无效的 DUID"
-+msgstr "无效 \""
-
- #: ../libnm-core/nm-setting-ip-config.c:2909
--#, fuzzy
- msgid "Unsupported to-string-flags argument"
--msgstr "不支持的卸载功能"
-+msgstr "不支持的 to-string-flags 参数"
-
- #: ../libnm-core/nm-setting-ip-config.c:2916
- msgid "Unsupported extra-argument"
--msgstr ""
-+msgstr "不支持的 extra-argument"
-
- #: ../libnm-core/nm-setting-ip-config.c:3161
--#, fuzzy, c-format
-+#, c-format
- msgid "unsupported key \"%s\""
--msgstr "不支持的流量过滤器（tfilter）选项：\"%s\"。"
-+msgstr "不支持的 \"%s\""
-
- #: ../libnm-core/nm-setting-ip-config.c:3166
--#, fuzzy, c-format
-+#, c-format
- msgid "duplicate key \"%s\""
--msgstr "重复的虚拟功能索引 %u"
-+msgstr "重复的 \"%s\""
-
- #: ../libnm-core/nm-setting-ip-config.c:3171
--#, fuzzy, c-format
-+#, c-format
- msgid "invalid value for \"%s\""
--msgstr "对 \"%s\" 无效的值：%s"
-+msgstr "\"%s\" 无效的值"
-
- #: ../libnm-core/nm-setting-ip-config.c:3181
- msgid "empty text does not describe a rule"
--msgstr ""
-+msgstr "空文本没有描述一个规则"
-
- #: ../libnm-core/nm-setting-ip-config.c:3187
--#, fuzzy, c-format
-+#, c-format
- msgid "missing argument for \"%s\""
--msgstr "缺少目标主机"
-+msgstr "\"%s\" 缺少参数"
-
- #: ../libnm-core/nm-setting-ip-config.c:3199
--#, fuzzy
- msgid "invalid \"from\" part"
--msgstr "无效的端口 %d"
-+msgstr "无效的 \"from\" 部分"
-
- #: ../libnm-core/nm-setting-ip-config.c:3213
--#, fuzzy
- msgid "invalid \"to\" part"
--msgstr "无效的端口 %d"
-+msgstr "无效的 \"to\" 部分"
-
- #: ../libnm-core/nm-setting-ip-config.c:3222
- #, c-format
- msgid "cannot detect address family for rule"
--msgstr ""
-+msgstr "无法为规则检测到地址家族"
-
- #: ../libnm-core/nm-setting-ip-config.c:3279
- #: ../libnm-core/nm-setting-ip-config.c:3373
--#, fuzzy, c-format
-+#, c-format
- msgid "rule is invalid: %s"
--msgstr "证书是无效的：%s"
-+msgstr "规则无效：%s"
-
- #: ../libnm-core/nm-setting-ip-config.c:3356
--#, fuzzy
- msgid "invalid address family"
--msgstr "无效的 IP 地址：%s"
-+msgstr "无效的 地址家族"
-
- #: ../libnm-core/nm-setting-ip-config.c:4618
--#, fuzzy, c-format
-+#, c-format
- msgid "rule #%u is invalid: %s"
--msgstr "证书是无效的：%s"
-+msgstr "规则 #%u 无效：%s"
-
- #: ../libnm-core/nm-setting-ip-config.c:4836
- #, c-format
-@@ -11342,12 +11349,12 @@ msgstr "%d。路由不能是默认路由"
- #: ../libnm-core/nm-setting-ip-config.c:4935
- #, c-format
- msgid "%u. rule has wrong address-family"
--msgstr ""
-+msgstr "%u. 规则带有错误的地址家族"
-
- #: ../libnm-core/nm-setting-ip-config.c:4944
--#, fuzzy, c-format
-+#, c-format
- msgid "%u. rule is invalid: %s"
--msgstr "%d。路由无效"
-+msgstr "%u. 规则无效：%s"
-
- #: ../libnm-core/nm-setting-ip-config.c:4957
- #, c-format
-@@ -11477,7 +11484,7 @@ msgstr "EAP 密钥管理需要 \"%s\" 设置存在"
-
- #: ../libnm-core/nm-setting-macsec.c:357
- msgid "must be either psk (0) or eap (1)"
--msgstr ""
-+msgstr "必须为 psk (0) 或 eap (1)"
-
- #: ../libnm-core/nm-setting-macsec.c:366
- #, c-format
-@@ -11486,7 +11493,7 @@ msgstr "无效的端口 %d"
-
- #: ../libnm-core/nm-setting-macsec.c:377
- msgid "only valid for psk mode"
--msgstr ""
-+msgstr "只对 psk 模式有效"
-
- #: ../libnm-core/nm-setting-macvlan.c:168
- msgid "non promiscuous operation is allowed only in passthru mode"
-@@ -11658,9 +11665,9 @@ 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
--#, fuzzy, c-format
-+#, c-format
- msgid "kind is missing"
--msgstr "缺少值"
-+msgstr "缺少种类"
-
- #: ../libnm-core/nm-setting-tc-config.c:78
- #: ../libnm-core/nm-setting-tc-config.c:444
-@@ -11715,9 +11722,8 @@ msgid "source-host '%s' contains invalid characters"
- msgstr "来源主机 \"%s\" 包含无效的字符"
-
- #: ../libnm-core/nm-setting-team.c:312
--#, fuzzy
- msgid "vlanid is out of range [-1, 4094]"
--msgstr "%s 超出了范围 [0, %d]"
-+msgstr "vlanid 超出范围 [-1, 4094]"
-
- #: ../libnm-core/nm-setting-team.c:1260
- #, c-format
-@@ -11849,9 +11855,8 @@ msgid "secret is not of correct type"
- msgstr "密钥（secret）不是正确的类型"
-
- #: ../libnm-core/nm-setting-vpn.c:757
--#, fuzzy
- msgid "secret flags property not found"
--msgstr "未找到密钥（secret）标记属性 \"%s\""
-+msgstr "未找到 secret 标记属性"
-
- #: ../libnm-core/nm-setting-vxlan.c:367
- #, c-format
-@@ -11896,80 +11901,77 @@ msgstr "静态链路配置需要设置速度和双工"
-
- #: ../libnm-core/nm-setting-wireguard.c:778
- msgid "missing public-key for peer"
--msgstr ""
-+msgstr "peer 缺少 public-key "
-
- #: ../libnm-core/nm-setting-wireguard.c:782
- msgid "invalid public-key for peer"
--msgstr ""
-+msgstr "peer 无效的 public-key"
-
- #: ../libnm-core/nm-setting-wireguard.c:791
--#, fuzzy
- msgid "invalid preshared-key for peer"
--msgstr "无效的私有密钥"
-+msgstr "peer 无效的 preshared-key"
-
- #: ../libnm-core/nm-setting-wireguard.c:809
--#, fuzzy
- msgid "invalid endpoint for peer"
--msgstr "本地端点 [无]"
-+msgstr "peer 无效的端点"
-
- #: ../libnm-core/nm-setting-wireguard.c:819
--#, fuzzy, c-format
-+#, c-format
- msgid "invalid IP address \"%s\" for allowed-ip of peer"
--msgstr "无效的 IP 地址：%s"
-+msgstr "peer 的 allowed-ip 无效的 IP 地址 \"%s\" "
-
- #: ../libnm-core/nm-setting-wireguard.c:828
- msgid "invalid preshared-key-flags for peer"
--msgstr ""
-+msgstr "peer 无效的 preshared-key-flags"
-
- #: ../libnm-core/nm-setting-wireguard.c:1567
- #, c-format
- msgid "peer #%u has no public-key"
--msgstr ""
-+msgstr "peer #%u 没有 public-key"
-
- #: ../libnm-core/nm-setting-wireguard.c:1578
- #, c-format
- msgid "peer #%u has invalid public-key"
--msgstr ""
-+msgstr "peer #%u 带有无效的 public-key"
-
- #: ../libnm-core/nm-setting-wireguard.c:1592
- #, c-format
- msgid "peer #%u has invalid endpoint"
--msgstr ""
-+msgstr "peer #%u 带有无效的端点"
-
- #: ../libnm-core/nm-setting-wireguard.c:1622
- #, c-format
- msgid "peer #%u has invalid allowed-ips setting"
--msgstr ""
-+msgstr "peer #%u 带有无效的 allowed-ips 设置"
-
- #: ../libnm-core/nm-setting-wireguard.c:1634
--#, fuzzy, c-format
-+#, c-format
- msgid "peer #%u is invalid: %s"
--msgstr "证书是无效的：%s"
-+msgstr "peer #%u 无效：%s"
-
- #: ../libnm-core/nm-setting-wireguard.c:1705
- #: ../libnm-core/nm-setting-wireguard.c:1719
- #, c-format
- msgid "method \"%s\" is not supported for WireGuard"
--msgstr ""
-+msgstr "方法 \"%s\" 不支持 WireGuard"
-
- #: ../libnm-core/nm-setting-wireguard.c:1739
- msgid "key must be 32 bytes base64 encoded"
--msgstr ""
-+msgstr "密钥需要是基于 base64 编码的 32 个字节"
-
- #: ../libnm-core/nm-setting-wireguard.c:1875
--#, fuzzy
- msgid "invalid peer secrets"
--msgstr "无效的密钥"
-+msgstr "无效的 peer secrets"
-
- #: ../libnm-core/nm-setting-wireguard.c:1898
- #, c-format
- msgid "peer #%u lacks public-key"
--msgstr ""
-+msgstr "peer #%u 缺少 public-key"
-
- #: ../libnm-core/nm-setting-wireguard.c:1912
- #, c-format
- msgid "non-existing peer '%s'"
--msgstr ""
-+msgstr "不存在 peer '%s'"
-
- #: ../libnm-core/nm-setting-wireless-security.c:935
- #: ../libnm-util/nm-setting-wireless-security.c:911
-@@ -12002,10 +12004,10 @@ msgid "'%s' can only be used with '%s=%s' (WEP)"
- msgstr "\"%s\" 只能与 \"%s=%s\"（WEP）共用"
-
- #: ../libnm-core/nm-setting-wireless-security.c:1086
--#, fuzzy, c-format
-+#, c-format
- msgid ""
- "'%s' can only be used with 'wpa-eap', 'wpa-psk' or 'sae' key management "
--msgstr "\"%s\" 只能与 \"%s=%s\" 或 \"%s=%s\"共用"
-+msgstr "'%s' 只能用于 'wpa-eap'、'wpa-psk' 或 'sae' 密钥管理"
-
- #: ../libnm-core/nm-setting-wireless.c:756
- #: ../libnm-util/nm-setting-wireless.c:786
-@@ -12044,17 +12046,17 @@ msgstr "mac-address-randomization 和 cloned-mac-address 的值冲突"
-
- #: ../libnm-core/nm-setting-wpan.c:185
- msgid "page must be defined along with a channel"
--msgstr ""
-+msgstr "页需要和一个频道定义"
-
- #: ../libnm-core/nm-setting-wpan.c:194
- #, c-format
- msgid "page must be between %d and %d"
--msgstr ""
-+msgstr "页需要在 %d 和 %d 之间"
-
- #: ../libnm-core/nm-setting-wpan.c:205
- #, c-format
- msgid "channel must not be between %d and %d"
--msgstr ""
-+msgstr "频道不能在 %d 和 %d 之间"
-
- #: ../libnm-core/nm-setting.c:872
- #, c-format
-@@ -12178,32 +12180,28 @@ msgid "Could not find \"%s\" binary"
- msgstr "无法找到 \"%s\" 二进制文件"
-
- #: ../libnm-core/nm-utils.c:4460
--#, fuzzy
- msgid "unknown secret flags"
--msgstr "未知的设置名称"
-+msgstr "未知的 secret 标记"
-
- #: ../libnm-core/nm-utils.c:4470
- msgid "conflicting secret flags"
--msgstr ""
-+msgstr "冲突的 secret 标记"
-
- #: ../libnm-core/nm-utils.c:4481
--#, fuzzy
- msgid "secret flags must not be \"not-required\""
--msgstr "未找到密钥（secret）标记属性 \"%s\""
-+msgstr "secret 标记不能为 \"not-required\""
-
- #: ../libnm-core/nm-utils.c:4489
--#, fuzzy
- msgid "unsupported secret flags"
--msgstr "不支持的排队规则（qdisc）选项：\"%s\"。"
-+msgstr "不支持的 secret 标记"
-
- #: ../libnm-core/nm-utils.c:4519
- msgid "can't be simultaneously disabled and enabled"
- msgstr "不能同时启用和禁用"
-
- #: ../libnm-core/nm-utils.c:4527
--#, fuzzy
- msgid "WPS is required"
--msgstr "需要 PIN 码"
-+msgstr "需要 WPS"
-
- #: ../libnm-core/nm-utils.c:4593
- #, c-format
-@@ -12287,18 +12285,18 @@ msgid "unsupported attribute '%s' of type '%s'"
- msgstr "不支持类型 \"%2$s\" 的属性 \"%1$s\""
-
- #: ../libnm-core/nm-utils.c:6935
--#, fuzzy, c-format
-+#, c-format
- msgid "Bridge VLANs %d and %d are not sorted by ascending vid"
--msgstr "虚拟功能 %d 和 %d 未按升序排列"
-+msgstr "网桥 VLANs %d 和 %d 没有根据生序 vid 进行排序"
-
- #: ../libnm-core/nm-utils.c:6959
--#, fuzzy, c-format
-+#, c-format
- msgid "duplicate bridge VLAN vid %u"
--msgstr "重复的虚拟功能索引 %u"
-+msgstr "重复的网桥 VLAN vid %u"
-
- #: ../libnm-core/nm-utils.c:6971
- msgid "only one VLAN can be the PVID"
--msgstr ""
-+msgstr "只有一个 VLAN 可以是 PVID"
-
- #: ../libnm-core/nm-vpn-editor-plugin.c:296
- #, c-format
-@@ -12722,9 +12720,8 @@ msgid "The VXLAN identifiers of the device and the connection didn't match."
- msgstr "设备和连接的 VXLAN 标识符不匹配。"
-
- #: ../libnm/nm-device-wifi-p2p.c:326
--#, fuzzy
- msgid "The connection was not a Wi-Fi P2P connection."
--msgstr "此连接不是 Wi-Fi 连接。"
-+msgstr "这个连接不是一个 Wi-Fi P2P 连接。"
-
- #: ../libnm/nm-device-wifi.c:613
- msgid "The connection was not a Wi-Fi connection."
-@@ -12783,9 +12780,8 @@ msgid "WireGuard"
- msgstr "WireGuard"
-
- #: ../libnm/nm-device.c:1432
--#, fuzzy
- msgid "Wi-Fi P2P"
--msgstr "Wi-Fi"
-+msgstr "Wi-Fi P2P"
-
- #: ../libnm/nm-device.c:2551
- #, c-format
-@@ -12873,14 +12869,12 @@ msgid "System policy prevents control of network connections"
- msgstr "系统策略阻止网络连接的控制"
-
- #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:15
--#, fuzzy
- msgid "Allow control of Wi-Fi scans"
--msgstr "允许控制网络连接"
-+msgstr "允许控制 Wi-Fi 扫描"
-
- #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:16
--#, fuzzy
- msgid "System policy prevents Wi-Fi scans"
--msgstr "系统策略阻止启用或禁用 Wi-Fi 设备"
-+msgstr "系统策略阻止 Wi-Fi 扫描"
-
- #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:17
- msgid "Connection sharing via a protected Wi-Fi network"
-@@ -13087,11 +13081,11 @@ msgstr "%s 已在运行中（pid %ld）\n"
- msgid "You must be root to run %s!\n"
- msgstr "运行 %s 必须是根用户！\n"
-
--#: ../src/dhcp/nm-dhcp-dhclient-utils.c:272
-+#: ../src/dhcp/nm-dhcp-dhclient-utils.c:302
- msgid "# Created by NetworkManager\n"
- msgstr "# 由 NetworkManger 创建\n"
-
--#: ../src/dhcp/nm-dhcp-dhclient-utils.c:283
-+#: ../src/dhcp/nm-dhcp-dhclient-utils.c:313
- #, c-format
- msgid ""
- "# Merged from %s\n"
-@@ -13353,9 +13347,9 @@ msgid "Failed to determine AP security information"
- msgstr "确定 AP 安全信息失败"
-
- #: ../src/nm-config.c:562
--#, fuzzy, c-format
-+#, c-format
- msgid "Bad '%s' option: "
--msgstr "\"%s\"选项为空"
-+msgstr "错误的 '%s' 选项："
-
- #: ../src/nm-config.c:575
- msgid "Config file location"
-@@ -13407,14 +13401,12 @@ msgid "The expected start of the response"
- msgstr "预期的响应开头"
-
- #: ../src/nm-config.c:595
--#, fuzzy
- msgid "NetworkManager options"
--msgstr "网络管理器权限"
-+msgstr "NetworkManager 选项"
-
- #: ../src/nm-config.c:595
--#, fuzzy
- msgid "Show NetworkManager options"
--msgstr "网络管理器权限"
-+msgstr "显示 NetworkManager 选项"
-
- #. Interface/IP config
- #: ../src/nm-iface-helper.c:275
-@@ -13539,299 +13531,3 @@ msgstr "未知的日志等级 \"%s\""
- #, c-format
- msgid "Unknown log domain '%s'"
- msgstr "未知的日志域 \"%s\""
--
--#~ msgid "Error: failed to remove a value from %s.%s: %s."
--#~ msgstr "错误：从 %s.%s 删除值失败：%s。"
--
--#~ msgid "WEP"
--#~ msgstr "WEP"
--
--#~ msgid "WPA1"
--#~ msgstr "WPA1"
--
--#~ msgid "WPA2"
--#~ msgstr "WPA2"
--
--#~ msgid "802.1X"
--#~ msgstr "802.1X"
--
--#~ msgid "default route cannot be added (NetworkManager handles it by itself)"
--#~ msgstr "无法添加默认路由（网络管理器自己进行处理）"
--
--#~ msgid "priority '%s' is not valid (<0-%ld>)"
--#~ msgstr "优先级 '%s' 无效 (<0-%ld>)"
--
--#~ msgid "no item to remove"
--#~ msgstr "没有要移除的项"
--
--#~ msgid "index '%d' is not in range <0-%d>"
--#~ msgstr "索引 '%d' 超出了范围 <0-%d>"
--
--#~ msgid "missing option"
--#~ msgstr "缺少选项"
--
--#~ msgid "'%s' is not a valid MAC"
--#~ msgstr "\"%s\" 不是有效的 MAC"
--
--#~ msgid "the property doesn't contain EAP method '%s'"
--#~ msgstr "属性没有包含 EAP 方法 \"%s\""
--
--#~ msgid "the property doesn't contain alternative subject match '%s'"
--#~ msgstr "属性没有包含符合 \"%s\" 的替换者"
--
--#~ msgid ""
--#~ "the property doesn't contain \"phase2\" alternative subject match '%s'"
--#~ msgstr "属性没有包含符合 \"%s\" 的 \"phase2\" 替换者"
--
--#~ msgid "the property doesn't contain permission '%s'"
--#~ msgstr "属性没有包含权限 \"%s\""
--
--#~ msgid "the property doesn't contain UUID '%s'"
--#~ msgstr "属性没有包含 UUID \"%s\""
--
--#~ msgid "the property doesn't contain DNS server '%s'"
--#~ msgstr "属性没有包含 DNS 服务器 \"%s\""
--
--#~ msgid "the property doesn't contain DNS search domain '%s'"
--#~ msgstr "属性没有包含 DNS 搜索域 \"%s\""
--
--#~ msgid "the property doesn't contain DNS option '%s'"
--#~ msgstr "属性没有包含 DNS 选项 \"%s\""
--
--#~ msgid "the property doesn't contain IP address '%s'"
--#~ msgstr "属性没有包含 IP 地址 \"%s\""
--
--#~ msgid "the property doesn't contain route '%s'"
--#~ msgstr "属性没有包含路由 \"%s\""
--
--#~ msgid "invalid IPv6 address '%s'"
--#~ msgstr "无效的 IPv6 地址 \"%s\""
--
--#~ msgid "the property doesn't contain interface name '%s'"
--#~ msgstr "属性没有包含接口名 \"%s\""
--
--#~ msgid "the property doesn't contain vf with index %u"
--#~ msgstr "属性没有包含索引为 %u 的虚拟功能（vf）"
--
--#~ msgid "the property doesn't contain qdisc '%s'"
--#~ msgstr "属性没有包含排队规则（qdisc） \"%s\""
--
--#~ msgid ""
--#~ "The valid syntax is: '[root | parent <handle>] [handle <handle>] "
--#~ "<tfilter>'"
--#~ msgstr ""
--#~ "有效的语法是：'[root | parent <handle>] [handle <handle>] <tfilter>'"
--
--#~ msgid "the property doesn't contain tfilter '%s'"
--#~ msgstr "属性没有包含流量过滤器（tfilter）\"%s\""
--
--#~ msgid "the property doesn't contain string '%s'"
--#~ msgstr "属性没有包含字符串 \"%s\""
--
--#~ msgid "the property doesn't contain link watcher '%s'"
--#~ msgstr "属性没有包含链路监视器 \"%s\""
--
--#~ msgid "only one mapping at a time is supported; taking the first one (%s)"
--#~ msgstr "警告：一次只支持映射一个；使用第一个（%s）"
--
--#~ msgid "the property doesn't contain mapping '%s'"
--#~ msgstr "属性没有包含映射 \"%s\""
--
--#~ msgid "no priority to remove"
--#~ msgstr "没有要删除的优先级"
--
--#~ msgid "index '%d' is not in the range of <0-%d>"
--#~ msgstr "索引 '%d' 不在 <0-%d> 范围内"
--
--#~ msgid "'%s' cannot be empty"
--#~ msgstr "\"%s\" 不能为空"
--
--#~ msgid "the property doesn't contain MAC address '%s'"
--#~ msgstr "属性没有包含 MAC 地址 \"%s\""
--
--#~ msgid "'%s' string value should consist of 1 - 199 characters"
--#~ msgstr "\"%s\" 字符串值应该由 1～199 个字符组成"
--
--#~ msgid "the property doesn't contain protocol '%s'"
--#~ msgstr "属性没有包含协议 \"%s\""
--
--#~ msgid "'%s' is not a valid PSK"
--#~ msgstr "\"%s\" 不是有效的 PSK"
--
--#~ msgid ""
--#~ "Pre-Shared-Key for WPA networks. If the key is 64-characters long, it "
--#~ "must contain only hexadecimal characters and is interpreted as a "
--#~ "hexadecimal WPA key. Otherwise, the key must be between 8 and 63 ASCII "
--#~ "characters (as specified in the 802.11i standard) and is interpreted as a "
--#~ "WPA passphrase, and is hashed to derive the actual WPA-PSK used when "
--#~ "connecting to the Wi-Fi network."
--#~ msgstr ""
--#~ "用于 WPA 网络的预共享密钥。如果密钥时 64 字符长，它必须只能包含十六进制的"
--#~ "字符，并且被解释为十六进制的 WPA 密钥。否则，该密钥必须在 8 到 63 ASCII 字"
--#~ "符之间（如 802.11i 标准所规定）并被解释为 WPA 密码；而且当连接到 Wi-Fi 网"
--#~ "络时，该密钥被散列以衍生实际的 WPA-PSK。"
--
--#~ msgid "GSM mobile broadband connection requires a 'gsm' setting"
--#~ msgstr "GSM 移动宽带连接要求 \"gsm\" 设置"
--
--#~ msgid "Error: Failed to setup a Wi-Fi hotspot"
--#~ msgstr "错误：建立 Wi-Fi 热点失败"
--
--#~ msgid "Error: Failed to add/activate new connection: Unknown error"
--#~ msgstr "错误：无法添加/激活新连接：未知错误"
--
--#~ msgid "Connection with UUID '%s' created and activated on device '%s'\n"
--#~ msgstr "UUID 为 \"%s\" 的连接已创建并在设备 \"%s\" 上激活\n"
--
--#~ msgid "Hotspot '%s' activated on device '%s'\n"
--#~ msgstr "热点 \"%s\" 已在设备 \"%s\" 上激活\n"
--
--# 原译设备已连接。原话用来提示设备已连接过了，不能再激活另一个连接了。如果使用“已连接”会让人认为是连接成功的意思，所以改成这个。
--#~ msgid "Device '%s' has been connected.\n"
--#~ msgstr "设备 \"%s\" 已有连接。\n"
--
--#~ msgid ""
--#~ "Number to dial when establishing a PPP data session with the GSM-based "
--#~ "mobile broadband network. Many modems do not require PPP for connections "
--#~ "to the mobile network and thus this property should be left blank, which "
--#~ "allows NetworkManager to select the appropriate settings automatically."
--#~ msgstr ""
--#~ "当与基于 GSM 移动宽带网络建立 PPP 数据会话时要拨打的号码。很多调制解调器不"
--#~ "需要 PPP 来连接到移动网络，这种情况下该属性应留空，以允许网络管理器"
--#~ "（NetworkManager）自动选择合适的设置。"
--
--#~ msgid "The total number of virtual functions to create."
--#~ msgstr "要创建的虚拟功能总数。"
--
--#~ msgid "invalid negative value (%i)"
--#~ msgstr "无效的负值（%i）"
--
--#~ msgid "invalid char value (%i)"
--#~ msgstr "无效的字符值（%i）"
--
--#~ msgid "invalid int64 value (%s)"
--#~ msgstr "无效的 int64 值（%s）"
--
--#~ msgid "too large FLAGS property '%s' (%llu)"
--#~ msgstr "过大的 FLAGS 属性 \"%s\" (%llu)"
--
--#~ msgid "unhandled setting property type '%s'"
--#~ msgstr "未处理的设置属性类型 \"%s\""
--
--#~ msgid "mdns value %d is not valid"
--#~ msgstr "mdns %d 无效"
--
--#~ msgid "failed to convert value '%s' to uint"
--#~ msgstr "转换 \"%s\" 值为 uint 失败"
--
--#~ msgid "secret is not set"
--#~ msgstr "未设置密钥"
--
--#~ msgid ""
--#~ "The setting's name, which uniquely identifies the setting within the "
--#~ "connection. Each setting type has a name unique to that type, for "
--#~ "example \"ppp\" or \"wireless\" or \"wired\"."
--#~ msgstr ""
--#~ "设置的名称，用在连接里的唯一标志。每个设置类型拥有该类型的唯一名称，例如 "
--#~ "\"ppp\"、\"wireless\" 或 \"wired\"。"
--
--#~ msgid "Error: bad color: %s\n"
--#~ msgstr "错误：错误的颜色：%s\n"
--
--#~ msgid "'%s' is ambiguous (%s x %s)"
--#~ msgstr "\"%s\" 不明确（%s x %s）"
--
--#~ msgid "'%s' is not a valid flag; use <0-%d> or a combination of '%s'"
--#~ msgstr "\"%s\" 标记无效，请使用 <0-%d> 或 \"%s\" 的组合"
--
--#~ msgid "'%s' sum is higher than all flags => all flags set"
--#~ msgstr "\"%s\" 总和高于全部的标记 => 全部标记集合"
--
--#~ msgid "%d (disabled)"
--#~ msgstr "%d（禁用）"
--
--#~ msgid "%d (enabled, prefer public IP)"
--#~ msgstr "%d（启用，首选公共 IP）"
--
--#~ msgid "%d (enabled, prefer temporary IP)"
--#~ msgstr "%d（启用，首选临时 IP）"
--
--#~ msgid ""
--#~ "If TRUE, enforce auto-negotiation of port speed and duplex mode. If "
--#~ "FALSE, \"speed\" and \"duplex\" properties should be both set or link "
--#~ "configuration will be skipped."
--#~ msgstr ""
--#~ "如果为 TRUE，强制端口速度和双工模式的自动协商。如果为 FALSE，\"speed\" 和 "
--#~ "\"duplex\" 属性都应该被设定或者链接配置将被忽略。"
--
--#~ msgid ""
--#~ "Can be specified only when \"auto-negotiate\" is \"off\". In that case, "
--#~ "statically configures the device to use that specified duplex mode, "
--#~ "either \"half\" or \"full\". Must be set together with the \"speed\" "
--#~ "property if specified. Before specifying a duplex mode be sure your "
--#~ "device supports it."
--#~ msgstr ""
--#~ "只在 \"auto-negotiate\" 为 \"off\" 时可指定。在该情况下，静态配置设备使用"
--#~ "指定的双工模式，\"half\" 或 \"full\"。如果指定则必须同时设定 \"speed\" 属"
--#~ "性。在指定双工模式前请确保您的设备支持它。"
--
--#~ msgid ""
--#~ "Can be set to a value greater than zero only when \"auto-negotiate\" is "
--#~ "\"off\". In that case, statically configures the device to use that "
--#~ "specified speed. In Mbit/s, ie 100 == 100Mbit/s. Must be set together "
--#~ "with the \"duplex\" property when non-zero. Before specifying a speed "
--#~ "value be sure your device supports it."
--#~ msgstr ""
--#~ "只在 \"auto-negotiate\" 为 \"off\" 时可以设置为大于零的值。这种情况下，静"
--#~ "态配置设备使用该指定的速度。以 Mbit/s 计算，例如 100 == 100Mbit/s。非零时 "
--#~ "\"duplex\" 属性必须同时设置。在指定速度值前请确保您的设备支持它。"
--
--#~ msgid ""
--#~ "Intra-connection DNS priority. The relative priority to be used when "
--#~ "determining the order of DNS servers in resolv.conf. A lower value means "
--#~ "that servers will be on top of the file. Zero selects the default value, "
--#~ "which is 50 for VPNs and 100 for other connections. Note that the "
--#~ "priority is to order DNS settings for multiple active connections. It "
--#~ "does not disambiguate multiple DNS servers within the same connection "
--#~ "profile. For that, just specify the DNS servers in the desired order. "
--#~ "When multiple devices have configurations with the same priority, the one "
--#~ "with an active default route will be preferred. Note that when using "
--#~ "dns=dnsmasq the order is meaningless since dnsmasq forwards queries to "
--#~ "all known servers at the same time. Negative values have the special "
--#~ "effect of excluding other configurations with a greater priority value; "
--#~ "so in presence of at least a negative priority, only DNS servers from "
--#~ "connections with the lowest priority value will be used."
--#~ msgstr ""
--#~ "内部连接的 DNS 优先级。当确定 resolv.conf 里的 DNS 服务器顺序时使用的相对"
--#~ "优先级。更低的值代表服务器将位于文件的更顶部。零代表默认值，即 50 用于 "
--#~ "VPN 和 100 用于其他连接。注意此优先级用于为多个活动连接排序 DNS 设置。它不"
--#~ "是对同个连接配置集中的多个 DNS 服务器进行明确选择。要完成这个，只要以期望"
--#~ "的顺序指定 DNS 服务器就行。当多个设备配置了同样的优先级，将优先选择活动默"
--#~ "认路由的那一个。注意当使用 dns=dnsmasq 时，此顺序无意义因为 dnsmasq 同时转"
--#~ "发查询到所有已知服务器。负值具有排除其他拥有更高优先级值的配置的特殊效果；"
--#~ "所以存在至少一个负值优先级的情况下，只使用具有最低优先级值的连接的 DNS 服"
--#~ "务器。"
--
--#~ msgid "ignoring invalid DNS server IPv6 address '%s'"
--#~ msgstr "忽略无效的 DNS 服务器 IPv6 地址 \"%s\""
--
--#~ msgid "when link autonegotiation is enabled no duplex value is accepted"
--#~ msgstr "当链路自动协商启用时不接受任何双工值"
--
--#~ msgid "when link autonegotiation is enabled speed should be 0"
--#~ msgstr "当链路自动协商启用时速度应该为 0"
--
--#~ msgid "Error in configuration file: %s.\n"
--#~ msgstr "配置文件有错误：%s。\n"
--
--#~ msgid "Ignoring unrecognized log domain(s) '%s' from config files.\n"
--#~ msgstr "正在忽略来自配置文件的未识别日志域 \"%s\"。\n"
--
--#~ msgid "'%s' is not a valid flag number; use <0-%d>"
--#~ msgstr "'%s' 是无效的标记数字，请使用 <0-%d>。"
--
--#~ msgid "Editor failed with status %d"
--#~ msgstr "编辑器失败，状态码：%d"
--
--#~ msgid "Editor failed with signal %d"
--#~ msgstr "编辑器失败，信号 %d"
---
-2.21.0
-
diff --git a/SOURCES/1011-cli-editor-no-wait-on-failure-rh1702203.patch b/SOURCES/1011-cli-editor-no-wait-on-failure-rh1702203.patch
deleted file mode 100644
index 0681471..0000000
--- a/SOURCES/1011-cli-editor-no-wait-on-failure-rh1702203.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From ac383b87ffd097b67b0b1cd2818df0e41bb17903 Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Tue, 23 Apr 2019 22:24:36 +0200
-Subject: [PATCH] cli: don't wait for connection change on update failure
-
-When saving a connection, we wait the connection-changed signal before
-proceeding to ensure that the remote connection is up to date.
-However, no signal is emitted if the update fails and so we shouldn't
-wait for it.
-
-Fixes: a370faeb59a9 ('cli: wait for changed signal after updating a connection'):
-
-https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/124
-https://bugzilla.redhat.com/show_bug.cgi?id=1702203
-(cherry picked from commit 2d347e7e176e7cb8daaa2e02b0758821fc3f5f04)
-(cherry picked from commit 3423629ff0fc65c16c2a4c541a5fc3435cd72091)
----
- clients/cli/connections.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/clients/cli/connections.c b/clients/cli/connections.c
-index 034fc19f5..7bfbe0b6a 100644
---- a/clients/cli/connections.c
-+++ b/clients/cli/connections.c
-@@ -7817,8 +7817,10 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t
- while (!nmc_editor_cb_called && !timeout)
- g_main_context_iteration (NULL, TRUE);
-
-- while (!connection_changed && !timeout)
-- g_main_context_iteration (NULL, TRUE);
-+ if (!nmc_editor_error) {
-+ while (!connection_changed && !timeout)
-+ g_main_context_iteration (NULL, TRUE);
-+ }
-
- if (handler_id)
- g_signal_handler_disconnect (rem_con, handler_id);
---
-2.20.1
-
diff --git a/SOURCES/1012-team-fix-validate-send-always-flags-rh1720153.patch b/SOURCES/1012-team-fix-validate-send-always-flags-rh1720153.patch
deleted file mode 100644
index 9323259..0000000
--- a/SOURCES/1012-team-fix-validate-send-always-flags-rh1720153.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 42c7f7dfee122b9da446c0e985187e0dc66ecb09 Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Fri, 14 Jun 2019 16:31:53 +0200
-Subject: [PATCH] libnm-core: fix conversion to json of team watcher flags
-
-Team watcher flags are boolean objects: persist them as such and not
-as strings.
-
-Fixes: e59878ce1911f3930c60a104673b59fb3c5ae001
-https://bugzilla.redhat.com/show_bug.cgi?id=1720153
-(cherry picked from commit 28c3692023fe65d5a6def93774ff1ac7f07e27f0)
----
- libnm-core/nm-utils.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c
-index 394ca7c3a..6d8a0fe32 100644
---- a/libnm-core/nm-utils.c
-+++ b/libnm-core/nm-utils.c
-@@ -5786,11 +5786,11 @@ _nm_utils_team_link_watcher_to_json (NMTeamLinkWatcher *watcher)
-
- flags = nm_team_link_watcher_get_flags (watcher);
- if (flags & NM_TEAM_LINK_WATCHER_ARP_PING_FLAG_VALIDATE_ACTIVE)
-- json_object_set_new (json_element, "validate_active", json_string ("true"));
-+ json_object_set_new (json_element, "validate_active", json_true ());
- if (flags & NM_TEAM_LINK_WATCHER_ARP_PING_FLAG_VALIDATE_INACTIVE)
-- json_object_set_new (json_element, "validate_inactive", json_string ("true"));
-+ json_object_set_new (json_element, "validate_inactive", json_true ());
- if (flags & NM_TEAM_LINK_WATCHER_ARP_PING_FLAG_SEND_ALWAYS)
-- json_object_set_new (json_element, "send_always", json_string ("true"));
-+ json_object_set_new (json_element, "send_always", json_true ());
-
- return json_element;
-
---
-2.20.1
-
diff --git a/SOURCES/1013-ovs-slaves-restart-fixes-rh1733709.patch b/SOURCES/1013-ovs-slaves-restart-fixes-rh1733709.patch
deleted file mode 100644
index 804126c..0000000
--- a/SOURCES/1013-ovs-slaves-restart-fixes-rh1733709.patch
+++ /dev/null
@@ -1,204 +0,0 @@
-From 8775e71d12bf26f4153d12dcb20e8e92ba6f0189 Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Mon, 29 Jul 2019 16:13:27 +0200
-Subject: [PATCH 1/3] ovs: don't release slaves on quit
-
-An OVS bridge and its slaves can continue to work even after NM has
-quit. Keep the interface enslaved when the @configure argument of
-device->release_slave() is FALSE, which happens on quit and in other
-circumstances when we don't really want to release the slave from its
-master.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1733709
-https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/215
-(cherry picked from commit ccd4be4014f9f4cfdd0d298ff387ee7558d5f3a5)
-(cherry picked from commit a1f39b69e0b09b7ab02513e34bd41276808ad778)
----
- src/devices/ovs/nm-device-ovs-port.c | 19 ++++++++++++-------
- 1 file changed, 12 insertions(+), 7 deletions(-)
-
-diff --git a/src/devices/ovs/nm-device-ovs-port.c b/src/devices/ovs/nm-device-ovs-port.c
-index 35eb739f9..8a93a5a9d 100644
---- a/src/devices/ovs/nm-device-ovs-port.c
-+++ b/src/devices/ovs/nm-device-ovs-port.c
-@@ -140,13 +140,18 @@ del_iface_cb (GError *error, gpointer user_data)
- static void
- release_slave (NMDevice *device, NMDevice *slave, gboolean configure)
- {
-- nm_ovsdb_del_interface (nm_ovsdb_get (), nm_device_get_iface (slave),
-- del_iface_cb, g_object_ref (slave));
--
-- /* Open VSwitch is going to delete this one. We must ignore what happens
-- * next with the interface. */
-- if (NM_IS_DEVICE_OVS_INTERFACE (slave))
-- nm_device_update_from_platform_link (slave, NULL);
-+ NMDeviceOvsPort *self = NM_DEVICE_OVS_PORT (device);
-+
-+ if (configure) {
-+ _LOGI (LOGD_DEVICE, "releasing ovs interface %s", nm_device_get_ip_iface (slave));
-+ nm_ovsdb_del_interface (nm_ovsdb_get (), nm_device_get_iface (slave),
-+ del_iface_cb, g_object_ref (slave));
-+ /* Open VSwitch is going to delete this one. We must ignore what happens
-+ * next with the interface. */
-+ if (NM_IS_DEVICE_OVS_INTERFACE (slave))
-+ nm_device_update_from_platform_link (slave, NULL);
-+ } else
-+ _LOGI (LOGD_DEVICE, "ovs interface %s was released", nm_device_get_ip_iface (slave));
- }
-
- /*****************************************************************************/
---
-2.21.0
-
-From 846a67ab95bc5f3e36099a45b0f2131c6346ef6a Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Tue, 30 Jul 2019 11:03:59 +0200
-Subject: [PATCH 2/3] device: check platform link compatibility when setting
- nm-owned flag
-
-We set nm-owned to indicate whether a software device was created by
-NM or it was pre-existing. When checking the existence, we must verify
-also whether the link type is compatible with the device, otherwise it
-is possible to match unrelated interfaces. For example, when checking
-for the existence of an ovs-bridge (which is not compatible with any
-platform link) we could match a unrelated platform link with the same
-name.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1733709
-(cherry picked from commit 3cb4b36261684aa3d2676f922c6d53bc31085153)
-(cherry picked from commit cb20d0791a6daf20d64f4cd57d6bd4b60e35a9a0)
-(cherry picked from commit 511ef27d5eaf6fd0577b867d9d31de3bee0440fe)
----
- src/devices/nm-device.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
-index 9ad69998b..eaf72a7a0 100644
---- a/src/devices/nm-device.c
-+++ b/src/devices/nm-device.c
-@@ -4106,13 +4106,14 @@ nm_device_create_and_realize (NMDevice *self,
- {
- nm_auto_nmpobj const NMPObject *plink_keep_alive = NULL;
- NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
-- const NMPlatformLink *plink = NULL;
-+ const NMPlatformLink *plink;
-
- /* Must be set before device is realized */
-- priv->nm_owned = !nm_platform_link_get_by_ifname (nm_device_get_platform (self), priv->iface);
--
-+ plink = nm_platform_link_get_by_ifname (nm_device_get_platform (self), priv->iface);
-+ priv->nm_owned = !plink || !link_type_compatible (self, plink->type, NULL, NULL);
- _LOGD (LOGD_DEVICE, "create (is %snm-owned)", priv->nm_owned ? "" : "not ");
-
-+ plink = NULL;
- /* Create any resources the device needs */
- if (NM_DEVICE_GET_CLASS (self)->create_and_realize) {
- if (!NM_DEVICE_GET_CLASS (self)->create_and_realize (self, connection, parent, &plink, error))
---
-2.21.0
-
-From 70ada1a2c9e936ec5abe737e1eb80463ff4fba60 Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Wed, 31 Jul 2019 11:40:35 +0200
-Subject: [PATCH 3/3] device: fix releasing slaves
-
-Not all masters type have a platform link and so it's wrong to check
-for it to decide whether the slave should be really released. Move the
-check to master devices that need it (bond, bridge and team).
-
-OVS ports don't need the check because they don't call to platform to
-remove a slave.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1733709
-(cherry picked from commit 57e3734b6cc1bb453216c7e2150a698114507a46)
-(cherry picked from commit ec1b5fb019929441fdcdf6bf7c54a2856ad61976)
-(cherry picked from commit f6a90b899ab01d6dc2635faf6bc8d72839a9064c)
----
- src/devices/nm-device-bond.c | 6 ++++++
- src/devices/nm-device-bridge.c | 6 ++++++
- src/devices/nm-device.c | 7 +------
- src/devices/team/nm-device-team.c | 6 ++++++
- 4 files changed, 19 insertions(+), 6 deletions(-)
-
-diff --git a/src/devices/nm-device-bond.c b/src/devices/nm-device-bond.c
-index 37159fca8..790f00d44 100644
---- a/src/devices/nm-device-bond.c
-+++ b/src/devices/nm-device-bond.c
-@@ -413,6 +413,12 @@ release_slave (NMDevice *device,
- NMDeviceBond *self = NM_DEVICE_BOND (device);
- gboolean success;
- gs_free char *address = NULL;
-+ int ifindex;
-+
-+ ifindex = nm_device_get_ifindex (device);
-+ if ( ifindex <= 0
-+ || !nm_platform_link_get (nm_device_get_platform (device), ifindex))
-+ configure = FALSE;
-
- if (configure) {
- /* When the last slave is released the bond MAC will be set to a random
-diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c
-index 4275af912..e81bcd5d2 100644
---- a/src/devices/nm-device-bridge.c
-+++ b/src/devices/nm-device-bridge.c
-@@ -625,6 +625,12 @@ release_slave (NMDevice *device,
- {
- NMDeviceBridge *self = NM_DEVICE_BRIDGE (device);
- gboolean success;
-+ int ifindex;
-+
-+ ifindex = nm_device_get_ifindex (device);
-+ if ( ifindex <= 0
-+ || !nm_platform_link_get (nm_device_get_platform (device), ifindex))
-+ configure = FALSE;
-
- if (configure) {
- success = nm_platform_link_release (nm_device_get_platform (device),
-diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
-index eaf72a7a0..5bb7a592e 100644
---- a/src/devices/nm-device.c
-+++ b/src/devices/nm-device.c
-@@ -4851,7 +4851,6 @@ nm_device_master_release_slaves (NMDevice *self)
- {
- NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
- NMDeviceStateReason reason;
-- gboolean configure = TRUE;
- CList *iter, *safe;
-
- /* Don't release the slaves if this connection doesn't belong to NM. */
-@@ -4862,14 +4861,10 @@ nm_device_master_release_slaves (NMDevice *self)
- if (priv->state == NM_DEVICE_STATE_FAILED)
- reason = NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED;
-
-- if ( priv->ifindex <= 0
-- || !nm_platform_link_get (nm_device_get_platform (self), priv->ifindex))
-- configure = FALSE;
--
- c_list_for_each_safe (iter, safe, &priv->slaves) {
- SlaveInfo *info = c_list_entry (iter, SlaveInfo, lst_slave);
-
-- nm_device_master_release_one_slave (self, info->slave, configure, reason);
-+ nm_device_master_release_one_slave (self, info->slave, TRUE, reason);
- }
- }
-
-diff --git a/src/devices/team/nm-device-team.c b/src/devices/team/nm-device-team.c
-index 4ae276dbf..7afd18606 100644
---- a/src/devices/team/nm-device-team.c
-+++ b/src/devices/team/nm-device-team.c
-@@ -774,6 +774,12 @@ release_slave (NMDevice *device,
- NMDeviceTeam *self = NM_DEVICE_TEAM (device);
- NMDeviceTeamPrivate *priv = NM_DEVICE_TEAM_GET_PRIVATE (self);
- gboolean success;
-+ int ifindex;
-+
-+ ifindex = nm_device_get_ifindex (device);
-+ if ( ifindex <= 0
-+ || !nm_platform_link_get (nm_device_get_platform (device), ifindex))
-+ configure = FALSE;
-
- if (configure) {
- success = nm_platform_link_release (nm_device_get_platform (device),
---
-2.21.0
-
diff --git a/SOURCES/20-connectivity-fedora.conf b/SOURCES/20-connectivity-fedora.conf
index 945bea6..4c398c3 100644
--- a/SOURCES/20-connectivity-fedora.conf
+++ b/SOURCES/20-connectivity-fedora.conf
@@ -1,3 +1,8 @@
+# Enable connectivity checking for NetworkManager.
+# See `man NetworkManager.conf`.
+#
+# Note that connectivity checking works badly with rp_filter set to
+# strict. Check "/proc/sys/net/ipv4/conf/*/rp_filter".
[connectivity]
uri=http://fedoraproject.org/static/hotspot.txt
response=OK
diff --git a/SOURCES/20-connectivity-redhat.conf b/SOURCES/20-connectivity-redhat.conf
index e556fd6..94783b3 100644
--- a/SOURCES/20-connectivity-redhat.conf
+++ b/SOURCES/20-connectivity-redhat.conf
@@ -1,3 +1,8 @@
+# Enable connectivity checking for NetworkManager.
+# See `man NetworkManager.conf`.
+#
+# Note that connectivity checking works badly with rp_filter set to
+# strict. Check "/proc/sys/net/ipv4/conf/*/rp_filter".
[connectivity]
uri=http://static.redhat.com/test/rhel-networkmanager.txt
response=OK
diff --git a/SOURCES/9999-fix-pregen-doc.patch b/SOURCES/9999-fix-pregen-doc.patch
index 32c5580..22a4e7f 100644
--- a/SOURCES/9999-fix-pregen-doc.patch
+++ b/SOURCES/9999-fix-pregen-doc.patch
@@ -1,4 +1,4 @@
-From 7c94c0568e3c4a4db49f2a99ff297f7b3efe84e4 Mon Sep 17 00:00:00 2001
+From ea5cb54ccbd2e165d135a01a1c0351eb6b994b82 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Mon, 18 Jun 2018 14:01:36 +0200
Subject: [PATCH] patch documentation with the proper default values
@@ -14,10 +14,10 @@ Patch the man pages with the proper values.
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/docs/api/html/NetworkManager.conf.html b/docs/api/html/NetworkManager.conf.html
-index ae2b1081e..6e5282b2a 100644
+index 0069f1e4164f..88f8b72e8597 100644
--- a/docs/api/html/NetworkManager.conf.html
+++ b/docs/api/html/NetworkManager.conf.html
-@@ -180,7 +180,7 @@ plugins-=remove-me
+@@ -193,7 +193,7 @@ plugins-=remove-me
clients to be installed. The <code class="literal">internal</code>
option uses a built-in DHCP client which is not currently as
featureful as the external clients.</p>
@@ -26,7 +26,7 @@ index ae2b1081e..6e5282b2a 100644
It the chosen plugin is not available, clients are looked for
in this order: <code class="literal">dhclient</code>, <code class="literal">dhcpcd</code>,
<code class="literal">internal</code>.</p>
-@@ -339,7 +339,7 @@ no-auto-default=*
+@@ -359,7 +359,7 @@ no-auto-default=*
<p>Set the <code class="filename">resolv.conf</code>
management mode. The default value depends on NetworkManager build
options, and this version of NetworkManager was build with a default of
@@ -35,7 +35,7 @@ index ae2b1081e..6e5282b2a 100644
Regardless of this setting, NetworkManager will
always write resolv.conf to its runtime state directory
<code class="filename">/var/run/NetworkManager/resolv.conf</code>.</p>
-@@ -625,7 +625,7 @@ ipv6.ip6-privacy=0
+@@ -675,7 +675,7 @@ ipv6.ip6-privacy=0
</tr>
<tr>
<td><p><span class="term"><code class="varname">ethernet.cloned-mac-address</code></span></p></td>
@@ -44,7 +44,7 @@ index ae2b1081e..6e5282b2a 100644
</tr>
<tr>
<td><p><span class="term"><code class="varname">ethernet.generate-mac-address-mask</code></span></p></td>
-@@ -703,7 +703,7 @@ ipv6.ip6-privacy=0
+@@ -771,7 +771,7 @@ ipv6.ip6-privacy=0
</tr>
<tr>
<td><p><span class="term"><code class="varname">wifi.cloned-mac-address</code></span></p></td>
@@ -54,10 +54,10 @@ index ae2b1081e..6e5282b2a 100644
<tr>
<td><p><span class="term"><code class="varname">wifi.generate-mac-address-mask</code></span></p></td>
diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5
-index 26b31e1bd..058177719 100644
+index 63959c9fb14b..73ccd7073e27 100644
--- a/man/NetworkManager.conf.5
+++ b/man/NetworkManager.conf.5
-@@ -145,7 +145,7 @@ internal
+@@ -155,7 +155,7 @@ internal
option uses a built\-in DHCP client which is not currently as featureful as the external clients\&.
.sp
If this key is missing, it defaults to
@@ -66,7 +66,7 @@ index 26b31e1bd..058177719 100644
dhclient,
dhcpcd,
internal\&.
-@@ -254,7 +254,7 @@ rc\-manager\ \&unmanaged
+@@ -281,7 +281,7 @@ that contains the original name servers pushed to the DNS plugin\&.
.RS 4
Set the
resolv\&.conf
@@ -75,7 +75,7 @@ index 26b31e1bd..058177719 100644
/var/run/NetworkManager/resolv\&.conf\&.
.sp
symlink: If
-@@ -607,7 +607,7 @@ If left unspecified, the default value is 3 tries before failing the connection\
+@@ -668,7 +668,7 @@ If left unspecified, the default value is 3 tries before failing the connection\
.PP
\fIethernet\&.cloned\-mac\-address\fR
.RS 4
@@ -84,7 +84,7 @@ index 26b31e1bd..058177719 100644
.RE
.PP
\fIethernet\&.generate\-mac\-address\-mask\fR
-@@ -688,7 +688,7 @@ If left unspecified, default value of 60 seconds is used\&.
+@@ -768,7 +768,7 @@ If left unspecified, default value of 60 seconds is used\&.
.PP
\fIwifi\&.cloned\-mac\-address\fR
.RS 4
@@ -94,5 +94,5 @@ index 26b31e1bd..058177719 100644
.PP
\fIwifi\&.generate\-mac\-address\-mask\fR
--
-2.17.0
+2.21.0
diff --git a/SPECS/NetworkManager.spec b/SPECS/NetworkManager.spec
index 6872f54..4fcb7f7 100644
--- a/SPECS/NetworkManager.spec
+++ b/SPECS/NetworkManager.spec
@@ -8,9 +8,9 @@
%global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad)
%global epoch_version 1
-%global rpm_version 1.18.0
-%global real_version 1.18.0
-%global release_version 6
+%global rpm_version 1.18.4
+%global real_version 1.18.4
+%global release_version 3
%global snapshot %{nil}
%global git_sha %{nil}
@@ -116,7 +116,7 @@
%endif
%if 0%{?fedora}
-# Altough eBPF would be available on Fedora's kernel, it seems
+# Although eBPF would be available on Fedora's kernel, it seems
# we often get SELinux denials (rh#1651654). But even aside them,
# bpf(BPF_MAP_CREATE, ...) randomly fails with EPERM. That might
# be related to `ulimit -l`. Anyway, this is not usable at the
@@ -160,20 +160,9 @@ Patch5: 0005-dhcp-internal-default-client-id-rh1695723.patch
Patch6: 0006-no-keyfile-file-name-extension-rh1697858.patch
# Bugfixes
-Patch1000: 1000-cli-hide-certificate-blobs-rh1702199.patch
-Patch1001: 1001-device-fix-reapply-of-MTU-rh1702657.patch
-Patch1002: 1002-settings-fix-failed-assertion-rh1707261.patch
-Patch1003: 1003-sw-devices-managed-after-wake-rh1701585.patch
-Patch1004: 1004-device-restore-ipv6-config-on-link-up-rh1548237.patch
-Patch1005: 1005-load-connection-dbus-fixes-rh1708660.patch
-Patch1006: 1006-fix-file-permissions-secret-key-rh1709849.patch
-Patch1007: 1007-tc-update-rh1546802.patch
-Patch1008: 1008-don-t-kill-teamd-for-external-devices-rh1711952.patch
-Patch1009: 1009-ifcfg-rh-use-PKCS12-private-as-client-cert-rh1714610.patch
-Patch1010: 1010-translations-rh1689962.patch
-Patch1011: 1011-cli-editor-no-wait-on-failure-rh1702203.patch
-Patch1012: 1012-team-fix-validate-send-always-flags-rh1720153.patch
-Patch1013: 1013-ovs-slaves-restart-fixes-rh1733709.patch
+Patch1000: 1000-dhclient-include-conditionals-rh1758550.patch
+Patch1001: 1001-fix-arp-announcements-rh1767681.patch
+Patch1002: 1002-ovs-cloned-mac-rh1740557.patch
# The pregenerated docs contain default values and paths that depend
# on the configure options when creating the source tarball.
@@ -360,6 +349,7 @@ Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
%if %{with iwd} && (0%{?fedora} > 24 || 0%{?rhel} > 7)
Requires: (wpa_supplicant >= %{wpa_supplicant_version} or iwd)
+Suggests: wpa_supplicant
%else
# Just require wpa_supplicant on platforms that don't support boolean
# dependencies even though the plugin supports both supplicant and
@@ -548,10 +538,6 @@ by nm-connection-editor and nm-applet in a non-graphical environment.
%prep
%autosetup -p1 -n NetworkManager-%{real_version}
-# On RHEL 7 patch creates backup files if the match is not clean.
-# Fixed in later RPM versions.
-find -name '*.orig' -delete
-
%build
%if %{with meson}
@@ -1107,6 +1093,24 @@ fi
%changelog
+* Mon Jan 13 2020 Beniamino Galvani <bgalvani@redhat.com> - 1:1.18.4-3
+- ovs: allow changing mac address of bridges and interfaces (rh #1740557)
+
+* Thu Nov 7 2019 Beniamino Galvani <bgalvani@redhat.com> - 1:1.18.4-2
+- dhcp: include conditionals from existing dhclient configuration (rh #1758550)
+- core: fix sending ARP announcements (rh #1767681)
+
+* Wed Oct 9 2019 Thomas Haller <thaller@redhat.com> - 1:1.18.4-1
+- Update to 1.18.4 release
+- cli: fix bash completion for slave-types (rh #1654062)
+- core: improve handling of policy routing rules when restarting daemon (rh #1696881)
+- ifcfg-rh: preserve existance of ethernet setting in profile (rh #1703960)
+- tui: only add bond options to profile that are supported by tui (rh #1715720)
+- cli: fix resetting default value for properties (rh #1715887)
+- core: fix detecting parent device by connection's UUID (rh #1716438)
+- core: fix setting IPv6 route options and destination (rh #1727193)
+- core: support more "arp_validate" bond options (rh #1730793)
+
* Thu Aug 1 2019 Beniamino Galvani <bgalvani@redhat.com> - 1:1.18.0-6
- core: fix activation of ovs slaves after a service restart (rh #1733709)