diff --git a/.NetworkManager.metadata b/.NetworkManager.metadata
index 56a8837..7ac8c02 100644
--- a/.NetworkManager.metadata
+++ b/.NetworkManager.metadata
@@ -1 +1 @@
-4f0745b84feefa57ca83d43310860bffa666e0d4 SOURCES/NetworkManager-1.26.0.tar.xz
+ad4ff9a9e3827b182b365388da9fccea7ed80949 SOURCES/NetworkManager-1.27.3.tar.xz
diff --git a/.gitignore b/.gitignore
index f12bf8a..19b98b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/NetworkManager-1.26.0.tar.xz
+SOURCES/NetworkManager-1.27.3.tar.xz
diff --git a/SOURCES/1000-team-fix-crash-rh1856723.patch b/SOURCES/1000-team-fix-crash-rh1856723.patch
deleted file mode 100644
index 5f98f2a..0000000
--- a/SOURCES/1000-team-fix-crash-rh1856723.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From a1198f4f6d95682bc4126fe4f13d8c549394d8b6 Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Tue, 14 Jul 2020 22:52:56 +0200
-Subject: [PATCH] team: perform cleanup immediately when connecting to teamd
- fails
-
-When NM fails to connect to teamd during an activation, it sets the
-device state to FAILED. Eventually the device will become DISCONNECTED
-and will call the ->deactivate() method that will perform the cleanup
-of timers, teamd process and teamdctl instance.
-
-However, in this way, when the device is DISCONNECTED timers are still
-armed and can be triggered in the wrong state. Instead, perform the
-cleanup immediately on failure.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1856723
-(cherry picked from commit 26e97fcd0d4a70e32a484d3bfc57c1802da10554)
-(cherry picked from commit 680c0b88122077101cbfd878a70d54fb7a4afcea)
----
- src/devices/team/nm-device-team.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/devices/team/nm-device-team.c b/src/devices/team/nm-device-team.c
-index 217c4bdd7c..7ba3034212 100644
---- a/src/devices/team/nm-device-team.c
-+++ b/src/devices/team/nm-device-team.c
-@@ -371,6 +371,7 @@ teamd_ready (NMDeviceTeam *self)
- success = teamd_read_config (self);
-
- if (!success) {
-+ teamd_cleanup (self, TRUE);
- nm_device_state_changed (device, NM_DEVICE_STATE_FAILED, NM_DEVICE_STATE_REASON_TEAMD_CONTROL_FAILED);
- return;
- }
---
-2.26.2
-
diff --git a/SOURCES/1001-core-fix-generation-of-dependent-rh1857133.patch b/SOURCES/1001-core-fix-generation-of-dependent-rh1857133.patch
deleted file mode 100644
index b236458..0000000
--- a/SOURCES/1001-core-fix-generation-of-dependent-rh1857133.patch
+++ /dev/null
@@ -1,291 +0,0 @@
-From 7fadadb8f33675d0a12c94f5c0f5c6ecef4a98cf Mon Sep 17 00:00:00 2001
-From: Antonio Cardace <acardace@redhat.com>
-Date: Tue, 14 Jul 2020 11:35:35 +0200
-Subject: [PATCH] core: fix generation of dependent local routes for VRFs
-
-When using VRF devices we must pre-generate dependent local
-routes in the VRF's table otherwise they will be incorrectly added
-to the local table instead.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1857133
-
-Fixes: a199cd2a7d92 ('core: add dependent local routes configured by kernel')
-(cherry picked from commit d342af1925223cf8d117750c91f35f3041f05570)
-(cherry picked from commit ad64da5e85757eeb729fea377bb92ac41c8b92bd)
----
- src/devices/nm-device.c | 9 ++++++++-
- src/nm-iface-helper.c | 11 ++++++++++-
- src/nm-ip4-config.c | 19 +++++++++++--------
- src/nm-ip4-config.h | 7 ++++---
- src/nm-ip6-config.c | 17 +++++++++++------
- src/nm-ip6-config.h | 5 +++--
- src/vpn/nm-vpn-connection.c | 19 ++++++++++++++++---
- 7 files changed, 63 insertions(+), 24 deletions(-)
-
-diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
-index de09e4807..57c32cef8 100644
---- a/src/devices/nm-device.c
-+++ b/src/devices/nm-device.c
-@@ -68,6 +68,7 @@
-
- #include "nm-device-generic.h"
- #include "nm-device-vlan.h"
-+#include "nm-device-vrf.h"
- #include "nm-device-wireguard.h"
-
- #include "nm-device-logging.h"
-@@ -8097,15 +8098,21 @@ ip_config_merge_and_apply (NMDevice *self,
- }
-
- if (commit) {
-+ gboolean is_vrf;
-+
-+ is_vrf = priv->master && nm_device_get_device_type (priv->master) == NM_DEVICE_TYPE_VRF;
-+
- if (IS_IPv4) {
- nm_ip4_config_add_dependent_routes (NM_IP4_CONFIG (composite),
- nm_device_get_route_table (self, addr_family),
- nm_device_get_route_metric (self, addr_family),
-+ is_vrf,
- &ip4_dev_route_blacklist);
- } else {
- nm_ip6_config_add_dependent_routes (NM_IP6_CONFIG (composite),
- nm_device_get_route_table (self, addr_family),
-- nm_device_get_route_metric (self, addr_family));
-+ nm_device_get_route_metric (self, addr_family),
-+ is_vrf);
- }
- }
-
-diff --git a/src/nm-iface-helper.c b/src/nm-iface-helper.c
-index 6320e722c..c7d65d2a6 100644
---- a/src/nm-iface-helper.c
-+++ b/src/nm-iface-helper.c
-@@ -41,11 +41,13 @@
- static struct {
- GMainLoop *main_loop;
- int ifindex;
-+ gboolean is_vrf_device;
-
- guint dad_failed_id;
- CList dad_failed_lst_head;
- } gl/*obal*/ = {
- .ifindex = -1,
-+ .is_vrf_device = FALSE,
- };
-
- static struct {
-@@ -120,6 +122,7 @@ dhcp4_state_changed (NMDhcpClient *client,
- nm_ip4_config_add_dependent_routes (existing,
- RT_TABLE_MAIN,
- global_opt.priority_v4,
-+ gl.is_vrf_device,
- &ip4_dev_route_blacklist);
- if (!nm_ip4_config_commit (existing,
- NM_PLATFORM_GET,
-@@ -236,7 +239,8 @@ ndisc_config_changed (NMNDisc *ndisc, const NMNDiscData *rdata, guint changed_in
- nm_ip6_config_merge (existing, ndisc_config, NM_IP_CONFIG_MERGE_DEFAULT, 0);
- nm_ip6_config_add_dependent_routes (existing,
- RT_TABLE_MAIN,
-- global_opt.priority_v6);
-+ global_opt.priority_v6,
-+ gl.is_vrf_device);
- if (!nm_ip6_config_commit (existing,
- NM_PLATFORM_GET,
- NM_IP_ROUTE_TABLE_SYNC_MODE_MAIN,
-@@ -480,6 +484,11 @@ main (int argc, char *argv[])
- if (pllink) {
- hwaddr = nmp_link_address_get_as_bytes (&pllink->l_address);
- bcast_hwaddr = nmp_link_address_get_as_bytes (&pllink->l_broadcast);
-+
-+ if (pllink->master > 0) {
-+ gl.is_vrf_device
-+ = nm_platform_link_get_type (NM_PLATFORM_GET, pllink->master) == NM_LINK_TYPE_VRF;
-+ }
- }
-
- if (global_opt.iid_str) {
-diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c
-index 490296c8d..f017a3e80 100644
---- a/src/nm-ip4-config.c
-+++ b/src/nm-ip4-config.c
-@@ -672,9 +672,11 @@ nm_ip4_config_update_routes_metric (NMIP4Config *self, gint64 metric)
- }
-
- static void
--_add_local_route_from_addr4 (NMIP4Config *self,
-- const NMPlatformIP4Address *addr,
-- int ifindex)
-+_add_local_route_from_addr4 (NMIP4Config * self,
-+ const NMPlatformIP4Address *addr,
-+ int ifindex,
-+ guint32 route_table,
-+ gboolean is_vrf)
- {
- nm_auto_nmpobj NMPObject *r = NULL;
- NMPlatformIP4Route *route;
-@@ -686,18 +688,19 @@ _add_local_route_from_addr4 (NMIP4Config *self,
- route->network = addr->address;
- route->plen = 32;
- route->pref_src = addr->address;
-- route->table_coerced = nm_platform_route_table_coerce (RT_TABLE_LOCAL);
- route->type_coerced = nm_platform_route_type_coerce (RTN_LOCAL);
- route->scope_inv = nm_platform_route_scope_inv (RT_SCOPE_HOST);
-+ route->table_coerced = nm_platform_route_table_coerce (is_vrf ? route_table : RT_TABLE_LOCAL);
-
- _add_route (self, r, NULL, NULL);
- }
-
- void
- nm_ip4_config_add_dependent_routes (NMIP4Config *self,
-- guint32 route_table,
-- guint32 route_metric,
-- GPtrArray **out_ip4_dev_route_blacklist)
-+ guint32 route_table,
-+ guint32 route_metric,
-+ gboolean is_vrf,
-+ GPtrArray ** out_ip4_dev_route_blacklist)
- {
- GPtrArray *ip4_dev_route_blacklist = NULL;
- const NMPlatformIP4Address *my_addr;
-@@ -729,7 +732,7 @@ nm_ip4_config_add_dependent_routes (NMIP4Config *self,
- if (my_addr->external)
- continue;
-
-- _add_local_route_from_addr4 (self, my_addr, ifindex);
-+ _add_local_route_from_addr4 (self, my_addr, ifindex, route_table, is_vrf);
-
- if (_ipv4_is_zeronet (network)) {
- /* Kernel doesn't add device-routes for destinations that
-diff --git a/src/nm-ip4-config.h b/src/nm-ip4-config.h
-index d4694d936..dc8222fd5 100644
---- a/src/nm-ip4-config.h
-+++ b/src/nm-ip4-config.h
-@@ -157,9 +157,10 @@ NMDedupMultiIndex *nm_ip4_config_get_multi_idx (const NMIP4Config *self);
- NMIP4Config *nm_ip4_config_capture (NMDedupMultiIndex *multi_idx, NMPlatform *platform, int ifindex);
-
- void nm_ip4_config_add_dependent_routes (NMIP4Config *self,
-- guint32 route_table,
-- guint32 route_metric,
-- GPtrArray **out_ip4_dev_route_blacklist);
-+ guint32 route_table,
-+ guint32 route_metric,
-+ gboolean is_vrf,
-+ GPtrArray ** out_ip4_dev_route_blacklist);
-
- gboolean nm_ip4_config_commit (const NMIP4Config *self,
- NMPlatform *platform,
-diff --git a/src/nm-ip6-config.c b/src/nm-ip6-config.c
-index 4911ec1d1..1589cad00 100644
---- a/src/nm-ip6-config.c
-+++ b/src/nm-ip6-config.c
-@@ -475,27 +475,32 @@ _add_multicast_route6 (NMIP6Config *self, int ifindex)
- }
-
- static void
--_add_local_route_from_addr6 (NMIP6Config *self, const NMPlatformIP6Address *addr, int ifindex)
-+_add_local_route_from_addr6 (NMIP6Config * self,
-+ const NMPlatformIP6Address *addr,
-+ int ifindex,
-+ guint32 route_table,
-+ gboolean is_vrf)
- {
- nm_auto_nmpobj NMPObject *r = NULL;
-- NMPlatformIP6Route *route;
-+ NMPlatformIP6Route * route;
-
- r = nmp_object_new (NMP_OBJECT_TYPE_IP6_ROUTE, NULL);
- route = NMP_OBJECT_CAST_IP6_ROUTE (r);
- route->ifindex = ifindex;
- route->network = addr->address;
- route->plen = 128;
-- route->table_coerced = nm_platform_route_table_coerce (RT_TABLE_LOCAL);
- route->type_coerced = nm_platform_route_type_coerce (RTN_LOCAL);
- route->metric = 0;
-+ route->table_coerced = nm_platform_route_table_coerce (is_vrf ? route_table : RT_TABLE_LOCAL);
-
- _add_route (self, r, NULL, NULL);
- }
-
- void
- nm_ip6_config_add_dependent_routes (NMIP6Config *self,
-- guint32 route_table,
-- guint32 route_metric)
-+ guint32 route_table,
-+ guint32 route_metric,
-+ gboolean is_vrf)
- {
- const NMPlatformIP6Address *my_addr;
- const NMPlatformIP6Route *my_route;
-@@ -524,7 +529,7 @@ nm_ip6_config_add_dependent_routes (NMIP6Config *self,
- continue;
-
- /* Pre-generate local route added by kernel */
-- _add_local_route_from_addr6 (self, my_addr, ifindex);
-+ _add_local_route_from_addr6 (self, my_addr, ifindex, route_table, is_vrf);
-
- if (NM_FLAGS_HAS (my_addr->n_ifa_flags, IFA_F_NOPREFIXROUTE))
- continue;
-diff --git a/src/nm-ip6-config.h b/src/nm-ip6-config.h
-index 36e8518a8..b6f461b29 100644
---- a/src/nm-ip6-config.h
-+++ b/src/nm-ip6-config.h
-@@ -93,8 +93,9 @@ NMIP6Config *nm_ip6_config_capture (struct _NMDedupMultiIndex *multi_idx, NMPlat
- NMSettingIP6ConfigPrivacy use_temporary);
-
- void nm_ip6_config_add_dependent_routes (NMIP6Config *self,
-- guint32 route_table,
-- guint32 route_metric);
-+ guint32 route_table,
-+ guint32 route_metric,
-+ gboolean is_vrf);
-
- gboolean nm_ip6_config_commit (const NMIP6Config *self,
- NMPlatform *platform,
-diff --git a/src/vpn/nm-vpn-connection.c b/src/vpn/nm-vpn-connection.c
-index 6d995dc48..ff6b8e00c 100644
---- a/src/vpn/nm-vpn-connection.c
-+++ b/src/vpn/nm-vpn-connection.c
-@@ -1447,6 +1447,20 @@ get_route_table (NMVpnConnection *self,
- return route_table ?: (fallback_main ? RT_TABLE_MAIN : 0);
- }
-
-+static gboolean
-+_is_device_vrf (NMVpnConnection *self)
-+{
-+ NMDevice *parent;
-+ NMDevice *master;
-+
-+ parent = nm_active_connection_get_device (NM_ACTIVE_CONNECTION (self));
-+ if (!parent)
-+ return FALSE;
-+
-+ master = nm_device_get_master (parent);
-+ return master && nm_device_get_link_type (master) == NM_LINK_TYPE_VRF;
-+}
-+
- static void
- nm_vpn_connection_ip4_config_get (NMVpnConnection *self, GVariant *dict)
- {
-@@ -1646,6 +1660,7 @@ nm_vpn_connection_ip4_config_get (NMVpnConnection *self, GVariant *dict)
- nm_ip4_config_add_dependent_routes (config,
- route_table,
- nm_vpn_connection_get_ip4_route_metric (self),
-+ _is_device_vrf (self),
- &priv->ip4_dev_route_blacklist);
-
- if (priv->ip4_config) {
-@@ -1840,9 +1855,7 @@ next:
- nm_ip6_config_add_route (config, &r, NULL);
- }
-
-- nm_ip6_config_add_dependent_routes (config,
-- route_table,
-- route_metric);
-+ nm_ip6_config_add_dependent_routes (config, route_table, route_metric, _is_device_vrf (self));
-
- if (priv->ip6_config) {
- nm_ip6_config_replace (priv->ip6_config, config, NULL);
---
-2.26.2
-
diff --git a/SOURCES/1002-fix-check-on-master-ac-failure-rh1845018.patch b/SOURCES/1002-fix-check-on-master-ac-failure-rh1845018.patch
deleted file mode 100644
index 20c6b7e..0000000
--- a/SOURCES/1002-fix-check-on-master-ac-failure-rh1845018.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 39e365733bd3c79c5801d4e6c7a32f133b9af678 Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Mon, 6 Jul 2020 17:30:05 +0200
-Subject: [PATCH] core: fix check on master active-connection failure
-
-The previous check was never satisfied, as the device is assigned to
-the active-connection and realized early. Instead, check the
-master_ready flag, which tells if the master is ready and, therefore,
-if the slave has already been added to the master.
-
-Before this commit, in some cases a device didn't detect that the
-master failed and kept waiting forever.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1845018
-https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/568
-(cherry picked from commit 0911d2a4ee1c317f455c01cbad048b994f69844d)
-(cherry picked from commit 223f741810db9e457ec512c7626bf9e65d82a6cb)
----
- src/nm-active-connection.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/nm-active-connection.c b/src/nm-active-connection.c
-index 08037ebe71..151fb4d939 100644
---- a/src/nm-active-connection.c
-+++ b/src/nm-active-connection.c
-@@ -810,14 +810,14 @@ master_state_cb (NMActiveConnection *master,
- gpointer user_data)
- {
- NMActiveConnection *self = NM_ACTIVE_CONNECTION (user_data);
-+ NMActiveConnectionPrivate *priv = NM_ACTIVE_CONNECTION_GET_PRIVATE (self);
- NMActiveConnectionState master_state = nm_active_connection_get_state (master);
-- NMDevice *master_device = nm_active_connection_get_device (master);
-
- check_master_ready (self);
-
- if ( master_state == NM_ACTIVE_CONNECTION_STATE_DEACTIVATING
-- && (!master_device || !nm_device_is_real (master_device))) {
-- /* Master failed without ever creating or realizing its device */
-+ && !priv->master_ready) {
-+ /* Master disconnected before the slave was added */
- if (NM_ACTIVE_CONNECTION_GET_CLASS (self)->master_failed)
- NM_ACTIVE_CONNECTION_GET_CLASS (self)->master_failed (self);
- }
---
-2.26.2
-
diff --git a/SOURCES/1003-translations-rh1820552.patch b/SOURCES/1003-translations-rh1820552.patch
deleted file mode 100644
index fc319a5..0000000
--- a/SOURCES/1003-translations-rh1820552.patch
+++ /dev/null
@@ -1,50357 +0,0 @@
-From 589762a4da8ae2d6ffeda6d1fcba5b3ce0f89c70 Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Fri, 17 Jul 2020 15:57:38 +0200
-Subject: [PATCH] po: RHEL 8.3 translations - fr,ja,zh-CN
-
-(cherry picked from commit 74a36168bbc57a8a451ea722e2f01fd78c427641)
-(cherry picked from commit 5555887e12019c4097fdfef0a5928fa5fa312060)
----
- po/fr.po | 4540 +++++++++++++++------------
- po/ja.po | 4540 +++++++++++++++------------
- po/ko.po | 8482 +++++++++++++++++++++++++--------------------------
- po/zh_CN.po | 4534 +++++++++++++++------------
- 4 files changed, 11629 insertions(+), 10467 deletions(-)
-
-diff --git a/po/fr.po b/po/fr.po
-index 1b3cca7803..267ad67fb1 100644
---- a/po/fr.po
-+++ b/po/fr.po
-@@ -15,7 +15,7 @@ msgid ""
- msgstr ""
- "Project-Id-Version: PACKAGE VERSION\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2019-12-23 18:47+0100\n"
-+"POT-Creation-Date: 2020-06-30 11:33+0200\n"
- "PO-Revision-Date: 2019-08-15 10:06+0000\n"
- "Last-Translator: ljanda <ljanda@redhat.com>\n"
- "Language-Team: French <trans-fr@lists.fedoraproject.org>\n"
-@@ -26,7 +26,7 @@ msgstr ""
- "Plural-Forms: nplurals=2; plural=n>1;\n"
- "X-Generator: Zanata 4.6.2\n"
-
--#: ../clients/cli/agent.c:23
-+#: ../clients/cli/agent.c:22
- #, c-format
- msgid ""
- "Usage: nmcli agent { COMMAND | help }\n"
-@@ -38,7 +38,7 @@ msgstr "Syntaxe : nmcli agent { COMMAND | help }\n"
- "COMMAND := { secret | polkit | all }\n"
- "\n"
-
--#: ../clients/cli/agent.c:31
-+#: ../clients/cli/agent.c:30
- #, c-format
- msgid ""
- "Usage: nmcli agent secret { help }\n"
-@@ -56,7 +56,7 @@ msgstr "Syntaxe : nmcli agent secret { help }\n"
- "à l'utilisateur.\n"
- "\n"
-
--#: ../clients/cli/agent.c:41
-+#: ../clients/cli/agent.c:40
- #, c-format
- msgid ""
- "Usage: nmcli agent polkit { help }\n"
-@@ -73,7 +73,7 @@ msgstr "Syntaxe : nmcli agent polkit { help }\n"
- "l'utilisateur et donnera la réponse à polkit.\n"
- "\n"
-
--#: ../clients/cli/agent.c:51
-+#: ../clients/cli/agent.c:50
- #, c-format
- msgid ""
- "Usage: nmcli agent all { help }\n"
-@@ -85,113 +85,113 @@ msgstr "Syntaxe : nmcli agent all { help }\n"
- "Lance nmcli à la fois en tant qu'agent de secret NetworkManager et agent polkit.\n"
- "\n"
-
--#: ../clients/cli/agent.c:143
-+#: ../clients/cli/agent.c:142
- #, 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:145
-+#: ../clients/cli/agent.c:144
- #, c-format
- msgid "Error: secret agent initialization failed"
- msgstr "Erreur : l'initialisation de l'agent de secret a échoué"
-
--#: ../clients/cli/agent.c:164
--#, c-format
--msgid "Error: polkit agent initialization failed: %s"
--msgstr "Erreur : l'initialisation de l'agent polkit a échoué : %s"
--
--#: ../clients/cli/agent.c:172
-+#: ../clients/cli/agent.c:153
- #, c-format
- msgid "nmcli successfully registered as a polkit agent.\n"
- msgstr "nmcli est enregistré comme agent polkit.\n"
-
--#: ../clients/cli/common.c:344 ../clients/cli/common.c:345
--#: ../clients/cli/common.c:376 ../clients/cli/common.c:377
--#: ../clients/cli/connections.c:1495
-+#: ../clients/cli/agent.c:176
-+#, c-format
-+msgid "Error: polkit agent initialization failed: %s"
-+msgstr "Erreur : l'initialisation de l'agent polkit a échoué : %s"
-+
-+#: ../clients/cli/common.c:347 ../clients/cli/common.c:348
-+#: ../clients/cli/common.c:379 ../clients/cli/common.c:380
-+#: ../clients/cli/connections.c:1523
- msgid "GROUP"
- msgstr "GROUPE"
-
--#: ../clients/cli/common.c:628
-+#: ../clients/cli/common.c:631
- #, c-format
- msgid "Error: openconnect failed: %s\n"
- msgstr "Erreur : échec de openconnect : %s\n"
-
--#: ../clients/cli/common.c:635
-+#: ../clients/cli/common.c:638
- #, c-format
- msgid "Error: openconnect failed with status %d\n"
- msgstr "Erreur : échec de openconnect avec l'état %d\n"
-
--#: ../clients/cli/common.c:637
-+#: ../clients/cli/common.c:640
- #, c-format
- msgid "Error: openconnect failed with signal %d\n"
- msgstr "Erreur : échec de openconnect avec le signal %d\n"
-
--#: ../clients/cli/common.c:725
-+#: ../clients/cli/common.c:728
- #, c-format
- msgid ""
- "Warning: password for '%s' not given in 'passwd-file' and nmcli cannot ask "
- "without '--ask' option.\n"
- msgstr "Avertissement : le mot de passe pour « %s » n'est pas indiqué dans le paramètre« passwd-file » et nmcli ne peut le demander à l'utilisateur sans l'option « --ask ».\n"
-
--#: ../clients/cli/common.c:1227
-+#: ../clients/cli/common.c:1244
- #, c-format
- msgid "Error: Could not create NMClient object: %s."
- msgstr "Erreur : impossible de créer l'objet NMClient : %s."
-
--#: ../clients/cli/common.c:1246
-+#: ../clients/cli/common.c:1265
- msgid "Error: NetworkManager is not running."
- msgstr "Erreur : NetworkManager n'est pas lancé."
-
--#: ../clients/cli/common.c:1339
-+#: ../clients/cli/common.c:1364
- #, 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:1347
-+#: ../clients/cli/common.c:1372
- msgid "Error: missing argument. Try passing --help."
- msgstr "Erreur : paramètre manquant. Essayez --help."
-
--#: ../clients/cli/common.c:1414
-+#: ../clients/cli/common.c:1439
- msgid "access denied"
- msgstr "accès refusé"
-
--#: ../clients/cli/common.c:1416
-+#: ../clients/cli/common.c:1441
- msgid "NetworkManager is not running"
- msgstr "NetworkManager n'est pas en cours d'exécution."
-
--#: ../clients/cli/common.c:1442
-+#: ../clients/cli/common.c:1467
- #, c-format
- msgid "Error: error connecting to system bus: %s"
- msgstr "Erreur : erreur de connexion au bus système : %s"
-
--#: ../clients/cli/common.c:1468 ../clients/cli/connections.c:66
--#: ../clients/cli/connections.c:75 ../clients/cli/devices.c:427
--#: ../clients/cli/devices.c:519 ../clients/cli/devices.c:526
--#: ../clients/cli/general.c:26 ../clients/cli/general.c:116
--#: ../clients/cli/general.c:121 ../clients/common/nm-client-utils.c:250
--#: ../clients/common/nm-client-utils.c:263
--#: ../clients/common/nm-client-utils.c:267
--#: ../clients/common/nm-client-utils.c:272
--#: ../clients/common/nm-meta-setting-desc.c:1724
--#: ../clients/common/nm-meta-setting-desc.c:1755
--#: ../clients/common/nm-meta-setting-desc.c:2687
--#: ../clients/common/nm-meta-setting-desc.c:2745
-+#: ../clients/cli/common.c:1493 ../clients/cli/connections.c:67
-+#: ../clients/cli/connections.c:77 ../clients/cli/devices.c:434
-+#: ../clients/cli/devices.c:526 ../clients/cli/devices.c:533
-+#: ../clients/cli/general.c:31 ../clients/cli/general.c:86
-+#: ../clients/cli/general.c:91 ../clients/common/nm-client-utils.c:252
-+#: ../clients/common/nm-client-utils.c:265
-+#: ../clients/common/nm-client-utils.c:301
-+#: ../clients/common/nm-client-utils.c:306
-+#: ../clients/common/nm-meta-setting-desc.c:1747
-+#: ../clients/common/nm-meta-setting-desc.c:1778
-+#: ../clients/common/nm-meta-setting-desc.c:2680
-+#: ../clients/common/nm-meta-setting-desc.c:2738
- msgid "unknown"
- msgstr "inconnu"
-
--#: ../clients/cli/common.c:1469
-+#: ../clients/cli/common.c:1494
- msgid "none"
- msgstr "aucun"
-
--#: ../clients/cli/common.c:1470
-+#: ../clients/cli/common.c:1495
- msgid "portal"
- msgstr "portail"
-
--#: ../clients/cli/common.c:1471
-+#: ../clients/cli/common.c:1496
- msgid "limited"
- msgstr "limité"
-
--#: ../clients/cli/common.c:1472
-+#: ../clients/cli/common.c:1497
- msgid "full"
- msgstr "plein"
-
-@@ -225,55 +225,55 @@ msgstr "Connexion(s) (nom, UUID, ou chemin) : "
- msgid "Connection(s) (name, UUID, path or apath): "
- msgstr "Connexion(s) (nom, UUID, path ou apath) : "
-
--#: ../clients/cli/connections.c:67
-+#: ../clients/cli/connections.c:68
- msgid "activating"
- msgstr "activation"
-
--#: ../clients/cli/connections.c:68
-+#: ../clients/cli/connections.c:69
- msgid "activated"
- msgstr "activé"
-
--#: ../clients/cli/connections.c:69 ../clients/common/nm-client-utils.c:261
-+#: ../clients/cli/connections.c:70 ../clients/common/nm-client-utils.c:263
- msgid "deactivating"
- msgstr "désactivation"
-
--#: ../clients/cli/connections.c:70
-+#: ../clients/cli/connections.c:71
- msgid "deactivated"
- msgstr "désactivé"
-
--#: ../clients/cli/connections.c:76
-+#: ../clients/cli/connections.c:78
- msgid "VPN connecting (prepare)"
- msgstr "Connexion VPN (préparation)"
-
--#: ../clients/cli/connections.c:77
-+#: ../clients/cli/connections.c:79
- msgid "VPN connecting (need authentication)"
- msgstr "Connexion VPN (authentification requise)"
-
--#: ../clients/cli/connections.c:78
-+#: ../clients/cli/connections.c:80
- msgid "VPN connecting"
- msgstr "Connexion VPN"
-
--#: ../clients/cli/connections.c:79
-+#: ../clients/cli/connections.c:81
- msgid "VPN connecting (getting IP configuration)"
- msgstr "Connexion VPN (obtention de la configuration IP)"
-
--#: ../clients/cli/connections.c:80
-+#: ../clients/cli/connections.c:82
- msgid "VPN connected"
- msgstr "VPN connecté"
-
--#: ../clients/cli/connections.c:81
-+#: ../clients/cli/connections.c:83
- msgid "VPN connection failed"
- msgstr "Échec de la connexion VPN"
-
--#: ../clients/cli/connections.c:82
-+#: ../clients/cli/connections.c:84
- msgid "VPN disconnected"
- msgstr "VPN déconnecté"
-
--#: ../clients/cli/connections.c:544
-+#: ../clients/cli/connections.c:546
- msgid "never"
- msgstr "jamais"
-
--#: ../clients/cli/connections.c:904
-+#: ../clients/cli/connections.c:907
- #, c-format
- msgid ""
- "Usage: nmcli connection { COMMAND | help }\n"
-@@ -345,7 +345,7 @@ msgstr "Usage: nmcli connection { COMMAND | help }\n"
- " export [id | uuid | path] <ID> [<output file>]\n"
- "\n"
-
--#: ../clients/cli/connections.c:926
-+#: ../clients/cli/connections.c:929
- #, c-format
- msgid ""
- "Usage: nmcli connection show { ARGUMENTS | help }\n"
-@@ -387,7 +387,7 @@ msgstr "Syntaxe : nmcli connection show { ARGUMENTS | help }\n"
- "Lorsque l'option --active est spécifiée, seuls les profils actifs sont pris en\n"
- "compte. L'utilisation de l'option --show-secrets révéle également les secrets associés.\n"
-
--#: ../clients/cli/connections.c:947
-+#: ../clients/cli/connections.c:950
- #, c-format
- msgid ""
- "Usage: nmcli connection up { ARGUMENTS | help }\n"
-@@ -428,7 +428,7 @@ msgstr "Syntaxe : nmcli connection up { ARGUMENTS | help }\n"
- "passwd-file - fichier contenant les mots de passe requis pour l'activation de la connexion\n"
- "\n"
-
--#: ../clients/cli/connections.c:968
-+#: ../clients/cli/connections.c:971
- #, c-format
- msgid ""
- "Usage: nmcli connection down { ARGUMENTS | help }\n"
-@@ -449,7 +449,7 @@ msgstr "Syntaxe : nmcli connection down { ARGUMENTS | help }\n"
- "UUID ou chemin D-Bus.\n"
- "\n"
-
--#: ../clients/cli/connections.c:980
-+#: ../clients/cli/connections.c:983
- #, c-format
- msgid ""
- "Usage: nmcli connection add { ARGUMENTS | help }\n"
-@@ -757,7 +757,7 @@ msgstr "Usage: nmcli connection add { ARGUMENTS | help }\n"
- " [ip6 <IPv6 address>] [gw6 <IPv6 gateway>]\n"
- "\n"
-
--#: ../clients/cli/connections.c:1104
-+#: ../clients/cli/connections.c:1107
- #, c-format
- msgid ""
- "Usage: nmcli connection modify { ARGUMENTS | help }\n"
-@@ -770,6 +770,10 @@ msgid ""
- "The '+' sign allows appending items instead of overwriting the whole value.\n"
- "The '-' sign allows removing selected items instead of the whole value.\n"
- "\n"
-+"ARGUMENTS := remove <setting>\n"
-+"\n"
-+"Remove a setting from the connection profile.\n"
-+"\n"
- "Examples:\n"
- "nmcli con mod home-wifi wifi.ssid rakosnicek\n"
- "nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, "
-@@ -779,16 +783,17 @@ msgid ""
- "nmcli con mod em1-1 -ipv6.addr \"abbe::cafe/56\"\n"
- "nmcli con mod bond0 +bond.options mii=500\n"
- "nmcli con mod bond0 -bond.options downdelay\n"
-+"nmcli con mod em1-1 remove sriov\n"
- "\n"
- msgstr "Syntaxe : nmcli connection modify { ARGUMENTS | help }\n"
- "\n"
- "ARGUMENTS := [id | uuid | path] <ID> ([+|-]<setting>.<property> <value>)+\n"
- "\n"
- "Modifie une ou plusieurs des propriétés du profil de connexion.\n"
--"Le profil est identifié par son nom, son UUID ou son D-Bus. Pour les propriétés aux valeurs multiples\n"
-+"Le profil est identifié par son nom, son UUID ou son D-Bus. Pour les propriétés aux valeurs multiples,\n"
- "vous pouvez utiliser en option le préfixe « + » ou « -» préfixe devant le nom de la propriété.\n"
- "Le signe « + » permet l’ajout d’éléments au lieu d’écraser la valeur entière.\n"
--"Le « - » signe permet de supprimer les éléments sélectionnés, plutôt que la valeur entière.\n"
-+"Le signe « - » permet de supprimer les éléments sélectionnés, plutôt que la valeur entière.\n"
- "\n"
- "Exemples :\n"
- "nmcli con mod home-wifi wifi.ssid rakosnicek\n"
-@@ -798,9 +803,9 @@ msgstr "Syntaxe : nmcli connection modify { ARGUMENTS | help }\n"
- "nmcli con mod em1-1 -ipv6.addr \"abbe::cafe/56\"\n"
- "nmcli con mod bond0 +bond.options mii=500\n"
- "nmcli con mod bond0 -bond.options downdelay\n"
--"\n"
-+"nmcli con mod em1-1 remove sriov\n"
-
--#: ../clients/cli/connections.c:1127
-+#: ../clients/cli/connections.c:1135
- #, c-format
- msgid ""
- "Usage: nmcli connection clone { ARGUMENTS | help }\n"
-@@ -820,7 +825,7 @@ msgstr "Syntaxe : nmcli connection clone { ARGUMENTS | help }\n"
- "l'id (fourni comme argument <new name>).\n"
- "\n"
-
--#: ../clients/cli/connections.c:1139
-+#: ../clients/cli/connections.c:1147
- #, c-format
- msgid ""
- "Usage: nmcli connection edit { ARGUMENTS | help }\n"
-@@ -846,7 +851,7 @@ msgstr "Syntaxe : nmcli connection edit { ARGUMENTS | help }\n"
- "Ajoute un nouveau profil de connexion dans un éditeur interactif.\n"
- "\n"
-
--#: ../clients/cli/connections.c:1154
-+#: ../clients/cli/connections.c:1162
- #, c-format
- msgid ""
- "Usage: nmcli connection delete { ARGUMENTS | help }\n"
-@@ -864,7 +869,7 @@ msgstr "Syntaxe : nmcli connection delete { ARGUMENTS | help }\n"
- "Le profil est identifié par son nom, UUID ou chemin D-Bus.\n"
- "\n"
-
--#: ../clients/cli/connections.c:1165
-+#: ../clients/cli/connections.c:1173
- #, c-format
- msgid ""
- "Usage: nmcli connection monitor { ARGUMENTS | help }\n"
-@@ -884,7 +889,7 @@ msgstr "Syntaxe : nmcli connection edit { ARGUMENTS | help }\n"
- "Surveille tous les profils de connexion si rien n'est spécifié \n"
- "\n"
-
--#: ../clients/cli/connections.c:1177
-+#: ../clients/cli/connections.c:1185
- #, c-format
- msgid ""
- "Usage: nmcli connection reload { help }\n"
-@@ -896,7 +901,7 @@ msgstr "Syntaxe : nmcli connection reload { help }\n"
- "Recharge tous les fichiers de connexion à partir du disque.\n"
- "\n"
-
--#: ../clients/cli/connections.c:1185
-+#: ../clients/cli/connections.c:1193
- #, c-format
- msgid ""
- "Usage: nmcli connection load { ARGUMENTS | help }\n"
-@@ -917,7 +922,7 @@ msgstr "Syntaxe : nmcli connection load { ARGUMENTS | help }\n"
- "conscient de l'état le plus récent.\n"
- "\n"
-
--#: ../clients/cli/connections.c:1197
-+#: ../clients/cli/connections.c:1205
- #, c-format
- msgid ""
- "Usage: nmcli connection import { ARGUMENTS | help }\n"
-@@ -940,7 +945,7 @@ msgstr "Syntaxe : nmcli connection import { ARGUMENTS | help }\n"
- "est importée par les greffons de VPN du NetworkManager.\n"
- "\n"
-
--#: ../clients/cli/connections.c:1210
-+#: ../clients/cli/connections.c:1218
- #, c-format
- msgid ""
- "Usage: nmcli connection export { ARGUMENTS | help }\n"
-@@ -958,344 +963,348 @@ msgstr "Syntaxe : nmcli connection delete { ARGUMENTS | help }\n"
- "Les données sont dirigées vers la sortie standard ou vers un fichier si un nom est donné.\n"
- "\n"
-
--#: ../clients/cli/connections.c:1301
-+#: ../clients/cli/connections.c:1309
- #, c-format
- msgid "Error updating secrets for %s: %s\n"
- msgstr "Erreur lors de la mise à jour des secrets pour l'objet %s : %s\n"
-
--#: ../clients/cli/connections.c:1348
-+#: ../clients/cli/connections.c:1356
- msgid "Connection profile details"
- msgstr "Informations de profil de connexion"
-
--#: ../clients/cli/connections.c:1361 ../clients/cli/connections.c:1446
-+#: ../clients/cli/connections.c:1369 ../clients/cli/connections.c:1470
- #, c-format
- msgid "Error: 'connection show': %s"
- msgstr "Erreur : « connection show » : %s"
-
--#: ../clients/cli/connections.c:1436
-+#: ../clients/cli/connections.c:1458
- msgid "Activate connection details"
- msgstr "Informations d'activation de connexion"
-
--#: ../clients/cli/connections.c:1544 ../clients/cli/devices.c:1485
--#: ../clients/cli/devices.c:1499 ../clients/cli/devices.c:1513
--#: ../clients/cli/devices.c:1528 ../clients/cli/devices.c:1586
--#: ../clients/cli/devices.c:1688
-+#: ../clients/cli/connections.c:1572 ../clients/cli/devices.c:1501
-+#: ../clients/cli/devices.c:1515 ../clients/cli/devices.c:1529
-+#: ../clients/cli/devices.c:1544 ../clients/cli/devices.c:1601
-+#: ../clients/cli/devices.c:1703
- msgid "NAME"
- msgstr "NOM"
-
--#: ../clients/cli/connections.c:1637
-+#: ../clients/cli/connections.c:1665
- #, 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:1647 ../clients/cli/connections.c:1655
-+#: ../clients/cli/connections.c:1675 ../clients/cli/connections.c:1683
- #, c-format
- msgid "'%s' has to be alone"
- msgstr "« %s » doit être seul"
-
--#: ../clients/cli/connections.c:1915
-+#: ../clients/cli/connections.c:1943
- #, c-format
- msgid "incorrect string '%s' of '--order' option"
- msgstr "chaîne incorrecte « %s » de l'option « --order »"
-
--#: ../clients/cli/connections.c:1940
-+#: ../clients/cli/connections.c:1968
- #, c-format
- msgid "incorrect item '%s' in '--order' option"
- msgstr "élément incorrect « %s » de l'option « --order »"
-
--#: ../clients/cli/connections.c:1978
-+#: ../clients/cli/connections.c:2006
- msgid "No connection specified"
- msgstr "Aucune connexion spécifiée."
-
--#: ../clients/cli/connections.c:1989
-+#: ../clients/cli/connections.c:2017
- #, c-format
- msgid "%s argument is missing"
- msgstr "le paramètre %s est manquant"
-
--#: ../clients/cli/connections.c:2007
-+#: ../clients/cli/connections.c:2035
- #, c-format
- msgid "unknown connection '%s'"
- msgstr "connexion inconnue : « %s »"
-
--#: ../clients/cli/connections.c:2036
-+#: ../clients/cli/connections.c:2064
- msgid "'--order' argument is missing"
- msgstr "l'argument de « --order » est manquant"
-
--#: ../clients/cli/connections.c:2096
-+#: ../clients/cli/connections.c:2125
- 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:2097
-+#: ../clients/cli/connections.c:2126
- msgid "NetworkManager connection profiles"
- msgstr "Profils de connexion NetworkManager"
-
--#: ../clients/cli/connections.c:2149 ../clients/cli/connections.c:2895
--#: ../clients/cli/connections.c:2907 ../clients/cli/connections.c:2919
--#: ../clients/cli/connections.c:3149 ../clients/cli/connections.c:8969
--#: ../clients/cli/connections.c:8990 ../clients/cli/devices.c:3019
--#: ../clients/cli/devices.c:3031 ../clients/cli/devices.c:3044
--#: ../clients/cli/devices.c:3299 ../clients/cli/devices.c:3310
--#: ../clients/cli/devices.c:3328 ../clients/cli/devices.c:3337
--#: ../clients/cli/devices.c:3358 ../clients/cli/devices.c:3369
--#: ../clients/cli/devices.c:3387 ../clients/cli/devices.c:3905
--#: ../clients/cli/devices.c:3915 ../clients/cli/devices.c:3923
--#: ../clients/cli/devices.c:3935 ../clients/cli/devices.c:3950
--#: ../clients/cli/devices.c:3958 ../clients/cli/devices.c:4101
--#: ../clients/cli/devices.c:4112 ../clients/cli/devices.c:4326
--#: ../clients/cli/devices.c:4495
-+#: ../clients/cli/connections.c:2178 ../clients/cli/connections.c:2857
-+#: ../clients/cli/connections.c:2870 ../clients/cli/connections.c:2883
-+#: ../clients/cli/connections.c:3115 ../clients/cli/connections.c:8986
-+#: ../clients/cli/connections.c:9008 ../clients/cli/devices.c:3121
-+#: ../clients/cli/devices.c:3134 ../clients/cli/devices.c:3146
-+#: ../clients/cli/devices.c:3439 ../clients/cli/devices.c:3450
-+#: ../clients/cli/devices.c:3468 ../clients/cli/devices.c:3477
-+#: ../clients/cli/devices.c:3498 ../clients/cli/devices.c:3509
-+#: ../clients/cli/devices.c:3527 ../clients/cli/devices.c:4047
-+#: ../clients/cli/devices.c:4058 ../clients/cli/devices.c:4067
-+#: ../clients/cli/devices.c:4081 ../clients/cli/devices.c:4098
-+#: ../clients/cli/devices.c:4107 ../clients/cli/devices.c:4253
-+#: ../clients/cli/devices.c:4264 ../clients/cli/devices.c:4480
-+#: ../clients/cli/devices.c:4652
- #, c-format
- msgid "Error: %s argument is missing."
- msgstr "Erreur : le paramètre %s est manquant."
-
--#: ../clients/cli/connections.c:2177
-+#: ../clients/cli/connections.c:2206
- #, c-format
- msgid "Error: %s - no such connection profile."
- msgstr "Erreur : %s - profil de connexion introuvable."
-
--#: ../clients/cli/connections.c:2268 ../clients/cli/connections.c:2882
--#: ../clients/cli/connections.c:2947 ../clients/cli/connections.c:8506
--#: ../clients/cli/connections.c:8597 ../clients/cli/connections.c:9090
--#: ../clients/cli/devices.c:1773 ../clients/cli/devices.c:2041
--#: ../clients/cli/devices.c:2211 ../clients/cli/devices.c:2319
--#: ../clients/cli/devices.c:2511 ../clients/cli/devices.c:3178
--#: ../clients/cli/devices.c:4064 ../clients/cli/devices.c:4501
--#: ../clients/cli/general.c:982
-+#: ../clients/cli/connections.c:2297 ../clients/cli/connections.c:2843
-+#: ../clients/cli/connections.c:2913 ../clients/cli/connections.c:8527
-+#: ../clients/cli/connections.c:8619 ../clients/cli/connections.c:9113
-+#: ../clients/cli/devices.c:1801 ../clients/cli/devices.c:2069
-+#: ../clients/cli/devices.c:2239 ../clients/cli/devices.c:2352
-+#: ../clients/cli/devices.c:2541 ../clients/cli/devices.c:3318
-+#: ../clients/cli/devices.c:4217 ../clients/cli/devices.c:4659
-+#: ../clients/cli/general.c:997
- #, c-format
- msgid "Error: %s."
- msgstr "Erreur : %s."
-
--#: ../clients/cli/connections.c:2361 ../clients/cli/devices.c:4278
-+#: ../clients/cli/connections.c:2389 ../clients/cli/devices.c:4431
- #, c-format
- msgid "no active connection on device '%s'"
- msgstr "aucune connexion active sur le périphérique « %s »"
-
--#: ../clients/cli/connections.c:2369
-+#: ../clients/cli/connections.c:2397
- msgid "no active connection or device"
- msgstr "aucune connexion ou périphérique actif"
-
--#: ../clients/cli/connections.c:2389
-+#: ../clients/cli/connections.c:2417
- #, c-format
- msgid "device '%s' not compatible with connection '%s': "
- msgstr "périphérique « %s » incompatible avec la connexion « %s » : "
-
--#: ../clients/cli/connections.c:2422
-+#: ../clients/cli/connections.c:2450
- #, c-format
- msgid "device '%s' not compatible with connection '%s'"
- msgstr "périphérique « %s » incompatible avec la connexion « %s »"
-
--#: ../clients/cli/connections.c:2425
-+#: ../clients/cli/connections.c:2453
- #, c-format
- msgid "no device found for connection '%s'"
- msgstr "aucun périphérique trouvé pour la connexion « %s »"
-
--#: ../clients/cli/connections.c:2476
-+#: ../clients/cli/connections.c:2504
- #, c-format
- msgid "Hint: use '%s' to get more details."
- msgstr "Astuce : utiliser « %s » pour obtenir plus d'informations."
-
--#: ../clients/cli/connections.c:2494
-+#: ../clients/cli/connections.c:2522
- #, 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:2498 ../clients/cli/connections.c:2648
--#: ../clients/cli/connections.c:6798
-+#: ../clients/cli/connections.c:2526 ../clients/cli/connections.c:2676
-+#: ../clients/cli/connections.c:6828
- #, 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:2505 ../clients/cli/connections.c:2627
-+#: ../clients/cli/connections.c:2533 ../clients/cli/connections.c:2655
- #, c-format
- msgid "Error: Connection activation failed: %s"
- msgstr "Erreur : l'activation de la connexion a échoué : %s"
-
--#: ../clients/cli/connections.c:2542
-+#: ../clients/cli/connections.c:2570
- #, c-format
- msgid "Error: Timeout expired (%d seconds)"
- msgstr "Erreur : le délai d'attente a expiré (%d secondes)"
-
--#: ../clients/cli/connections.c:2709
--#, c-format
--msgid "failed to read passwd-file '%s': %s"
--msgstr "Erreur : échec de lecture du fichier de mot de passe « %s » : %s"
--
--#: ../clients/cli/connections.c:2722
--#, c-format
--msgid "missing colon in 'password' entry '%s'"
--msgstr "Virgule manquant dans la saisie du mot de passe « %s »"
--
--#: ../clients/cli/connections.c:2730
--#, c-format
--msgid "missing dot in 'password' entry '%s'"
--msgstr "Point manquant dans la saisie du mot de passe « %s »"
--
- #: ../clients/cli/connections.c:2743
- #, c-format
--msgid "invalid setting name in 'password' entry '%s'"
--msgstr "Nom du paramètre non valide dans la saisie du mot de passe « %s »"
--
--#: ../clients/cli/connections.c:2800
--#, c-format
- msgid "unknown device '%s'."
- msgstr "périphérique inconnu « %s »."
-
--#: ../clients/cli/connections.c:2805
-+#: ../clients/cli/connections.c:2748
- 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:2929 ../clients/cli/connections.c:9000
--#: ../clients/cli/devices.c:1732 ../clients/cli/devices.c:1778
--#: ../clients/cli/devices.c:2216 ../clients/cli/devices.c:3076
--#: ../clients/cli/devices.c:3400 ../clients/cli/devices.c:3967
--#: ../clients/cli/devices.c:4118 ../clients/cli/devices.c:4335
--#: ../clients/cli/devices.c:4505
-+#: ../clients/cli/connections.c:2761
-+#, c-format
-+msgid "invalid passwd-file '%s' at line %zd: %s"
-+msgstr "fichier passwd non valide '%s' à la ligne %zd: %s"
-+
-+#: ../clients/cli/connections.c:2767
-+#, c-format
-+msgid "invalid passwd-file '%s': %s"
-+msgstr "fichier passwd non valide '%s': %s"
-+
-+#: ../clients/cli/connections.c:2894 ../clients/cli/connections.c:9019
-+#: ../clients/cli/devices.c:1759 ../clients/cli/devices.c:1807
-+#: ../clients/cli/devices.c:2245 ../clients/cli/devices.c:3181
-+#: ../clients/cli/devices.c:3540 ../clients/cli/devices.c:4117
-+#: ../clients/cli/devices.c:4270 ../clients/cli/devices.c:4490
-+#: ../clients/cli/devices.c:4664
- #, c-format
- msgid "Error: invalid extra argument '%s'."
- msgstr "Erreur : argument supplémentaire « %s » non valide."
-
--#: ../clients/cli/connections.c:2955
-+#: ../clients/cli/connections.c:2922
- msgid "preparing"
- msgstr "préparation"
-
--#: ../clients/cli/connections.c:3064
-+#: ../clients/cli/connections.c:3029
- #, c-format
- msgid "Connection '%s' (%s) successfully deleted.\n"
- msgstr "Connexion « %s » (%s) supprimée.\n"
-
--#: ../clients/cli/connections.c:3080
-+#: ../clients/cli/connections.c:3045
- #, 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:3131 ../clients/cli/connections.c:8693
--#: ../clients/cli/connections.c:8724 ../clients/cli/connections.c:8890
-+#: ../clients/cli/connections.c:3096 ../clients/cli/connections.c:8716
-+#: ../clients/cli/connections.c:8747 ../clients/cli/connections.c:8910
- #, c-format
- msgid "Error: No connection specified."
- msgstr "Erreur : aucune connexion spécifiée."
-
--#: ../clients/cli/connections.c:3161
-+#: ../clients/cli/connections.c:3128
- #, 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:3162
-+#: ../clients/cli/connections.c:3129
- #, c-format
- msgid "Error: not all active connections found."
- msgstr "Erreur : les connexions n'ont pas toutes été trouvées."
-
--#: ../clients/cli/connections.c:3170
-+#: ../clients/cli/connections.c:3137
- #, c-format
- msgid "Error: no active connection provided."
- msgstr "Erreur : aucune connexion fournie."
-
--#: ../clients/cli/connections.c:3201
-+#: ../clients/cli/connections.c:3169
- #, 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:3461 ../clients/cli/connections.c:3518
--#: ../clients/common/nm-client-utils.c:211
-+#: ../clients/cli/connections.c:3427 ../clients/cli/connections.c:3485
-+#: ../clients/common/nm-client-utils.c:213
- #, 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:3481 ../clients/cli/connections.c:3541
--#: ../clients/common/nm-client-utils.c:279
-+#: ../clients/cli/connections.c:3447 ../clients/cli/connections.c:3506
-+#: ../clients/common/nm-client-utils.c:313
- #, c-format
- msgid "Unknown error"
- msgstr "Erreur inconnue"
-
--#: ../clients/cli/connections.c:3675
-+#: ../clients/cli/connections.c:3640
- #, 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:4038
-+#: ../clients/cli/connections.c:4000
- #, c-format
- msgid "Error: invalid property '%s': %s."
- msgstr "Erreur : propriété « %s » non valide : %s."
-
--#: ../clients/cli/connections.c:4053
-+#: ../clients/cli/connections.c:4015
- #, c-format
- msgid "Error: failed to %s %s.%s: %s."
- msgstr "Erreur : échec %s %s.%s: %s."
-
--#: ../clients/cli/connections.c:4095
-+#: ../clients/cli/connections.c:4057
- #, c-format
- msgid "Error: '%s' is mandatory."
- msgstr "Erreur : « %s » est obligatoire."
-
--#: ../clients/cli/connections.c:4122
-+#: ../clients/cli/connections.c:4084
- #, c-format
- msgid "Error: invalid slave type; %s."
- msgstr "Erreur : type esclave invalide ; %s."
-
--#: ../clients/cli/connections.c:4130
-+#: ../clients/cli/connections.c:4092
- #, c-format
- msgid "Error: invalid connection type; %s."
- msgstr "Erreur : type de connexion non valide ; %s."
-
--#: ../clients/cli/connections.c:4207
-+#: ../clients/cli/connections.c:4169
- #, c-format
- msgid "Error: bad connection type: %s"
- msgstr "Erreur : type de connexion invalide : %s."
-
--#: ../clients/cli/connections.c:4263
--#, c-format
--msgid "Error: '%s': %s"
--msgstr "Erreur : « %s » : %s"
--
--#: ../clients/cli/connections.c:4290
-+#: ../clients/cli/connections.c:4244
- msgid "Error: master is required"
- msgstr "Erreur : « master » requis."
-
--#: ../clients/cli/connections.c:4359
-+#: ../clients/cli/connections.c:4313
- #, 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:4390
-+#: ../clients/cli/connections.c:4344
- #, 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:4421
-+#: ../clients/cli/connections.c:4375
- #, 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:4686
-+#: ../clients/cli/connections.c:4669
-+#, c-format
-+msgid "Error: setting '%s' is mandatory and cannot be removed."
-+msgstr "Erreur : le paramètre « %s » est obligatoire et ne peut pas être supprimé."
-+
-+#: ../clients/cli/connections.c:4679
- #, c-format
- msgid "Error: value for '%s' is missing."
- msgstr "Erreur : la valeur de l'argument « %s » est requise."
-
--#: ../clients/cli/connections.c:4730
-+#: ../clients/cli/connections.c:4724
- msgid "Error: <setting>.<property> argument is missing."
- msgstr "Erreur : l'argument <setting>.<property> est manquant."
-
--#: ../clients/cli/connections.c:4756
-+#: ../clients/cli/connections.c:4750
-+msgid "Error: missing setting."
-+msgstr "Erreur : paramètre manquant."
-+
-+#: ../clients/cli/connections.c:4768
-+#, c-format
-+msgid "Setting '%s' is not present in the connection."
-+msgstr "Le paramètre « %s » n'est pas présent dans la connexion."
-+
-+#: ../clients/cli/connections.c:4772
-+#, c-format
-+msgid "Error: invalid setting argument '%s'."
-+msgstr "Erreur : argument de paramètre « %s » non valide."
-+
-+#: ../clients/cli/connections.c:4796
- #, 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:4805 ../clients/cli/connections.c:4821
-+#: ../clients/cli/connections.c:4845 ../clients/cli/connections.c:4861
- #, 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:4837
-+#: ../clients/cli/connections.c:4881
- #, c-format
- msgid "Error: invalid <setting>.<property> '%s'."
- msgstr "Erreur : <setting>.<property> non valide '%s’."
-
--#: ../clients/cli/connections.c:4876 ../clients/cli/connections.c:8545
-+#: ../clients/cli/connections.c:4919 ../clients/cli/connections.c:8567
- #, c-format
- msgid "Error: Failed to add '%s' connection: %s"
- msgstr "Erreur: impossible d'ajouter la connexion « %s » : %s"
-
--#: ../clients/cli/connections.c:4894
-+#: ../clients/cli/connections.c:4937
- #, c-format
- msgid ""
- "Warning: There is another connection with the name '%1$s'. Reference the "
-@@ -1304,68 +1313,68 @@ msgid_plural "Warning: There are %3$u other connections with the name '%1$s'. Re
- msgstr[0] "Attention : il y a une autre connexion avec le nom '%1$s’. Référez-vous à la connexion par son uuid '%2$s'\n"
- msgstr[1] "Attention : il y a %3$u autres connexions avec le nom '%1$s’. Référez-vous à la connexion par son uuid '%2$s'\n"
-
--#: ../clients/cli/connections.c:4903
-+#: ../clients/cli/connections.c:4946
- #, c-format
- msgid "Connection '%s' (%s) successfully added.\n"
- msgstr "Connexion « %s » (%s) ajoutée avec succès.\n"
-
--#: ../clients/cli/connections.c:4965 ../clients/cli/connections.c:6921
--#: ../clients/cli/connections.c:6922 ../clients/cli/devices.c:518
--#: ../clients/cli/devices.c:525 ../clients/cli/devices.c:1239
--#: ../clients/cli/general.c:123 ../clients/cli/utils.h:291
--#: ../clients/common/nm-client-utils.c:269
--#: ../clients/common/nm-meta-setting-desc.c:866
--#: ../clients/common/nm-meta-setting-desc.c:2682
-+#: ../clients/cli/connections.c:5008 ../clients/cli/connections.c:6934
-+#: ../clients/cli/connections.c:6935 ../clients/cli/devices.c:525
-+#: ../clients/cli/devices.c:532 ../clients/cli/devices.c:1250
-+#: ../clients/cli/general.c:93 ../clients/cli/utils.h:294
-+#: ../clients/common/nm-client-utils.c:303
-+#: ../clients/common/nm-meta-setting-desc.c:871
-+#: ../clients/common/nm-meta-setting-desc.c:2675
- msgid "no"
- msgstr "non"
-
--#: ../clients/cli/connections.c:4966 ../clients/cli/connections.c:6921
--#: ../clients/cli/connections.c:6922 ../clients/cli/devices.c:517
--#: ../clients/cli/devices.c:524 ../clients/cli/devices.c:1239
--#: ../clients/cli/general.c:122 ../clients/cli/utils.h:291
--#: ../clients/common/nm-client-utils.c:268
--#: ../clients/common/nm-meta-setting-desc.c:866
--#: ../clients/common/nm-meta-setting-desc.c:2679
-+#: ../clients/cli/connections.c:5009 ../clients/cli/connections.c:6934
-+#: ../clients/cli/connections.c:6935 ../clients/cli/devices.c:524
-+#: ../clients/cli/devices.c:531 ../clients/cli/devices.c:1250
-+#: ../clients/cli/general.c:92 ../clients/cli/utils.h:294
-+#: ../clients/common/nm-client-utils.c:302
-+#: ../clients/common/nm-meta-setting-desc.c:871
-+#: ../clients/common/nm-meta-setting-desc.c:2672
- msgid "yes"
- msgstr "oui"
-
--#: ../clients/cli/connections.c:5052
-+#: ../clients/cli/connections.c:5095
- #, c-format
- msgid ""
- "You can specify this option more than once. Press <Enter> when you're done.\n"
- msgstr "Vous pouvez spécifier cette option plus d'une fois. Tapez <Entrée> quand vous avez terminé.\n"
-
- #. Ask for optional arguments.
--#: ../clients/cli/connections.c:5154
-+#: ../clients/cli/connections.c:5197
- #, 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:5160
-+#: ../clients/cli/connections.c:5203
- #, 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:5292 ../clients/cli/utils.c:279
-+#: ../clients/cli/connections.c:5335 ../clients/cli/utils.c:279
- #, c-format
- msgid "Error: value for '%s' argument is required."
- msgstr "Erreur : la valeur de l'argument « %s » est requise."
-
--#: ../clients/cli/connections.c:5299
-+#: ../clients/cli/connections.c:5342
- #, c-format
- msgid "Error: 'save': %s."
- msgstr "Erreur: « save » : %s."
-
--#: ../clients/cli/connections.c:5384 ../clients/cli/connections.c:5395
-+#: ../clients/cli/connections.c:5427 ../clients/cli/connections.c:5438
- #, c-format
- msgid "Error: '%s' argument is required."
- msgstr "Erreur : l'argument « %s » est requis."
-
--#: ../clients/cli/connections.c:6354
-+#: ../clients/cli/connections.c:6384
- #, c-format
- msgid "['%s' setting values]\n"
- msgstr "[« %s » setting values]\n"
-@@ -1373,7 +1382,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:6463
-+#: ../clients/cli/connections.c:6493
- #, c-format
- msgid ""
- "---[ Main menu ]---\n"
-@@ -1404,7 +1413,7 @@ msgstr "---[ Menu principal ]---\n"
- "nmcli <conf-option> <value> :: configuration de nmcli\n"
- "quit :: quitter nmcli\n"
-
--#: ../clients/cli/connections.c:6490
-+#: ../clients/cli/connections.c:6520
- #, c-format
- msgid ""
- "goto <setting>[.<prop>] | <prop> :: enter setting/property for editing\n"
-@@ -1422,7 +1431,7 @@ msgstr "goto <setting>[.<prop>] | <prop> :: saisir le paramètre ou la proprié
- " nmcli connection> goto secondaries\n"
- " nmcli> goto ipv4.addresses\n"
-
--#: ../clients/cli/connections.c:6497
-+#: ../clients/cli/connections.c:6527
- #, c-format
- msgid ""
- "remove <setting>[.<prop>] :: remove setting or reset property value\n"
-@@ -1441,7 +1450,7 @@ msgstr "remove <setting>[.<prop>] :: supprimer le paramètre ou réinitialiser
- "Exemples : nmcli> remove wifi-sec\n"
- " nmcli> remove eth.mtu\n"
-
--#: ../clients/cli/connections.c:6504
-+#: ../clients/cli/connections.c:6534
- #, c-format
- msgid ""
- "set [<setting>.<prop> <value>] :: set property value\n"
-@@ -1455,7 +1464,7 @@ msgstr "set [<setting>.<prop> <value>] :: définir la valeur de la propriété\
- "\n"
- "Exemple : nmcli> set con.id My connection\n"
-
--#: ../clients/cli/connections.c:6509
-+#: ../clients/cli/connections.c:6539
- #, c-format
- msgid ""
- "describe [<setting>.<prop>] :: describe property\n"
-@@ -1466,7 +1475,7 @@ msgstr "describe [<setting>.<prop>] :: décrire la propriété\n"
- "\n"
- "Affiche la description de la propriété. Vous pouvez consulter la page du manuel nm-settings(5) pour afficher tous les paramètres et propriétés NM.\n"
-
--#: ../clients/cli/connections.c:6514
-+#: ../clients/cli/connections.c:6544
- #, c-format
- msgid ""
- "print [all] :: print setting or connection values\n"
-@@ -1480,7 +1489,7 @@ msgstr "print [all] :: imprimer le paramètre ou les valeurs de la connexion\n"
- "\n"
- "Exemple : nmcli ipv4> print all\n"
-
--#: ../clients/cli/connections.c:6519
-+#: ../clients/cli/connections.c:6549
- #, c-format
- msgid ""
- "verify [all | fix] :: verify setting or connection validity\n"
-@@ -1503,7 +1512,7 @@ msgstr "verify [all] : vérifier le paramètre ou la validité de la connexion\
- " nmcli> verify fix\n"
- " nmcli bond> verifyerify\n"
-
--#: ../clients/cli/connections.c:6528
-+#: ../clients/cli/connections.c:6558
- #, c-format
- msgid ""
- "save [persistent|temporary] :: save the connection\n"
-@@ -1527,7 +1536,7 @@ msgstr "save [persistent|temporary] : sauvegarder la connexion\n"
- "persitera pas à l'amorçage ou au démarrage. Si vous souhaitez supprimer la connexion\n"
- "persitante, le profil de connexion devra être supprimé.\n"
-
--#: ../clients/cli/connections.c:6539
-+#: ../clients/cli/connections.c:6569
- #, c-format
- msgid ""
- "activate [<ifname>] [/<ap>|<nsp>] :: activate the connection\n"
-@@ -1546,7 +1555,7 @@ msgstr "activate [<ifname>] [/<ap>|<nsp>] :: activer la connexion\n"
- "<ifname> - périphérique sur lequel la connexion sera activée\n"
- "/<ap>|<nsp> - AP (Wi-Fi) ou NSP (WiMAX) (ajouter avec ou lorsque <ifname> n'est pas spécifié)\n"
-
--#: ../clients/cli/connections.c:6546 ../clients/cli/connections.c:6704
-+#: ../clients/cli/connections.c:6576 ../clients/cli/connections.c:6734
- #, c-format
- msgid ""
- "back :: go to upper menu level\n"
-@@ -1554,7 +1563,7 @@ msgid ""
- msgstr "back :: aller au niveau supérieur du menu\n"
- "\n"
-
--#: ../clients/cli/connections.c:6549
-+#: ../clients/cli/connections.c:6579
- #, c-format
- msgid ""
- "help/? [<command>] :: help for the nmcli commands\n"
-@@ -1562,7 +1571,7 @@ msgid ""
- msgstr "help/? [<command>] :: aide pour les commandes nmcli\n"
- "\n"
-
--#: ../clients/cli/connections.c:6552
-+#: ../clients/cli/connections.c:6582
- #, c-format
- msgid ""
- "nmcli [<conf-option> <value>] :: nmcli configuration\n"
-@@ -1587,7 +1596,7 @@ msgstr "nmcli [<conf-option> <value>] :: nmcli configuration\n"
- " nmcli> nmcli save-confirmation no\n"
- " nmcli> nmcli prompt-color 3\n"
-
--#: ../clients/cli/connections.c:6574 ../clients/cli/connections.c:6710
-+#: ../clients/cli/connections.c:6604 ../clients/cli/connections.c:6740
- #, c-format
- msgid ""
- "quit :: exit nmcli\n"
-@@ -1598,8 +1607,8 @@ msgstr "quit :: quitter nmcli\n"
- "\n"
- "Cette commande permet de quitter nmcli. Lorsque la connexion en cours de modification n'est pas enregistrée, il est demandé à l'utilisateur de confirmer l'action.\n"
-
--#: ../clients/cli/connections.c:6579 ../clients/cli/connections.c:6715
--#: ../clients/cli/connections.c:7126 ../clients/cli/connections.c:8129
-+#: ../clients/cli/connections.c:6609 ../clients/cli/connections.c:6745
-+#: ../clients/cli/connections.c:7140 ../clients/cli/connections.c:8149
- #, c-format
- msgid "Unknown command: '%s'\n"
- msgstr "Commande inconnue : « %s »\n"
-@@ -1607,7 +1616,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:6644
-+#: ../clients/cli/connections.c:6674
- #, c-format
- msgid ""
- "---[ Property menu ]---\n"
-@@ -1632,7 +1641,7 @@ msgstr "---[ Menu des propriétés ]---\n"
- "help/? [<command>] :: imprimer cette description d'aide ou de commande\n"
- "quit :: quitter nmcli\n"
-
--#: ../clients/cli/connections.c:6669
-+#: ../clients/cli/connections.c:6699
- #, c-format
- msgid ""
- "set [<value>] :: set new value\n"
-@@ -1642,7 +1651,7 @@ msgstr "set [<value>] :: définir une nouvelle valeur\n"
- "\n"
- "Cette commande définit la <value> (valeur) fournie à cette propriété\n"
-
--#: ../clients/cli/connections.c:6673
-+#: ../clients/cli/connections.c:6703
- #, c-format
- msgid ""
- "add [<value>] :: append new value to the property\n"
-@@ -1654,7 +1663,7 @@ msgstr "add [<value>] :: ajouter une nouvelle valeur à la propriété\n"
- "\n"
- "Cette commande ajoute une <value> (valeur) fournie à cette propriété si la propriété est d'un type de conteneur. Pour les propriétés à valeur unique, ceci remplace la valeur (comme « set »).\n"
-
--#: ../clients/cli/connections.c:6679
-+#: ../clients/cli/connections.c:6709
- #, c-format
- msgid ""
- "change :: change current value\n"
-@@ -1664,7 +1673,7 @@ msgstr "change :: modifie la valeur actuelle\n"
- "\n"
- "Affiche la valeur actuelle et permet sa modification.\n"
-
--#: ../clients/cli/connections.c:6683
-+#: ../clients/cli/connections.c:6713
- #, c-format
- msgid ""
- "remove [<value>|<index>|<option name>] :: delete the value\n"
-@@ -1695,7 +1704,7 @@ msgstr "remove [<value>|<index>|<option name>] :: supprime la valeur\n"
- " nmcli bond.options> remove downdelay\n"
- "\n"
-
--#: ../clients/cli/connections.c:6694
-+#: ../clients/cli/connections.c:6724
- #, c-format
- msgid ""
- "describe :: describe property\n"
-@@ -1706,7 +1715,7 @@ msgstr "describe :: décrire la propriété\n"
- "\n"
- "Affiche la description de la propriété. Vous pouvez consulter la page du manuel nm-settings(5) pour voir tous les paramètres et toutes les propriétés NM.\n"
-
--#: ../clients/cli/connections.c:6699
-+#: ../clients/cli/connections.c:6729
- #, c-format
- msgid ""
- "print [property|setting|connection] :: print property (setting, connection) "
-@@ -1718,7 +1727,7 @@ msgstr "print [property|setting|connection] :: imprimer la(les) valeur(s) de la
- "\n"
- "Affiche la(les) valeur(s) de la propriété. En fournissant un argument, vous pourrez aussi afficher les valeurs de la totalité du paramètre ou de la connexion.\n"
-
--#: ../clients/cli/connections.c:6707
-+#: ../clients/cli/connections.c:6737
- #, c-format
- msgid ""
- "help/? [<command>] :: help for nmcli commands\n"
-@@ -1726,88 +1735,83 @@ msgid ""
- msgstr "help/? [<command>] :: aide pour les commandes nmcli\n"
- "\n"
-
--#: ../clients/cli/connections.c:6804
-+#: ../clients/cli/connections.c:6834
- #, c-format
- msgid "Error: Connection activation failed.\n"
- msgstr "Erreur : échec de l'activation de la connexion.\n"
-
--#: ../clients/cli/connections.c:6901
--#, c-format
--msgid "Error: setting '%s' is mandatory and cannot be removed.\n"
--msgstr "Erreur : le paramètre « %s » est obligatoire et ne peut pas être supprimé.\n"
--
- #. TRANSLATORS: status line in nmcli connection editor
--#: ../clients/cli/connections.c:6919
-+#: ../clients/cli/connections.c:6932
- #, 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:6955
-+#: ../clients/cli/connections.c:6968
- #, 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:6996
-+#: ../clients/cli/connections.c:7009
- #, c-format
- msgid ""
- "The connection profile has been removed from another client. You may type "
- "'save' in the main menu to restore it.\n"
- msgstr "Le profil de connexion a été supprimé à partir d'un autre client. Vous pouvez saisir « enregistrer » dans le menu principal pour le restaurer.\n"
-
--#: ../clients/cli/connections.c:7030 ../clients/cli/connections.c:7424
--#: ../clients/cli/connections.c:7488
-+#: ../clients/cli/connections.c:7043 ../clients/cli/connections.c:7437
-+#: ../clients/cli/connections.c:7501
- #, 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:7034 ../clients/cli/connections.c:7428
--#: ../clients/cli/connections.c:7492
-+#: ../clients/cli/connections.c:7047 ../clients/cli/connections.c:7441
-+#: ../clients/cli/connections.c:7505
- #, c-format
- msgid "Enter '%s' value: "
- msgstr "Saisissez la valeur « %s » : "
-
--#: ../clients/cli/connections.c:7048 ../clients/cli/connections.c:7066
--#: ../clients/cli/connections.c:7437 ../clients/cli/connections.c:7505
-+#: ../clients/cli/connections.c:7061 ../clients/cli/connections.c:7079
-+#: ../clients/cli/connections.c:7450 ../clients/cli/connections.c:7518
- #, 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:7057
-+#: ../clients/cli/connections.c:7070
- #, c-format
- msgid "Edit '%s' value: "
- msgstr "Paramétrer la valeur « %s » : "
-
--#: ../clients/cli/connections.c:7080 ../clients/cli/settings.c:400
-+#: ../clients/cli/connections.c:7093 ../clients/cli/settings.c:400
- #, c-format
- msgid "Error: %s\n"
- msgstr "Erreur : %s\n"
-
--#: ../clients/cli/connections.c:7099
-+#: ../clients/cli/connections.c:7112
- #, c-format
- msgid "Unknown command argument: '%s'\n"
- msgstr "Argument de commande inconnu : « %s »\n"
-
--#: ../clients/cli/connections.c:7190
-+#: ../clients/cli/connections.c:7204
- #, c-format
- msgid "Available settings: %s\n"
- msgstr "Paramètres disponibles : %s\n"
-
--#: ../clients/cli/connections.c:7202
-+#: ../clients/cli/connections.c:7216
- #, c-format
- msgid "Error: invalid setting name; %s\n"
- msgstr "Erreur : nom de paramètre non valide ; %s\n"
-
--#: ../clients/cli/connections.c:7220
-+#: ../clients/cli/connections.c:7233
- #, c-format
- msgid "Available properties: %s\n"
- msgstr "Propriétés disponibles : %s\n"
-
--#: ../clients/cli/connections.c:7228
-+#: ../clients/cli/connections.c:7242
- #, c-format
- msgid "Error: property %s\n"
- msgstr "Erreur : propriété %s\n"
-
--#: ../clients/cli/connections.c:7273
-+#: ../clients/cli/connections.c:7286
- #, c-format
- msgid ""
- "Saving the connection with 'autoconnect=yes'. That might result in an "
-@@ -1816,426 +1820,426 @@ msgid ""
- msgstr "Enregistrer la connexion avec « autoconnect=yes ». Ceci pourrait entraîner l'activation immédiate de la connexion.\n"
- "Souhaitez-vous tout de même enregistrer ? %s"
-
--#: ../clients/cli/connections.c:7358
-+#: ../clients/cli/connections.c:7371
- #, 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:7389
-+#: ../clients/cli/connections.c:7402
- #, c-format
- msgid ""
- "The connection profile has been removed from another client. You may type "
- "'save' to restore it.\n"
- msgstr "Le profil de connexion a été supprimé à partir d'un autre client. Vous pouvez saisir « enregistrer » pour le restaurer.\n"
-
--#: ../clients/cli/connections.c:7441 ../clients/cli/connections.c:7709
--#: ../clients/cli/connections.c:7741
-+#: ../clients/cli/connections.c:7454 ../clients/cli/connections.c:7729
-+#: ../clients/cli/connections.c:7761
- #, 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:7442
-+#: ../clients/cli/connections.c:7455
- #, 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:7457 ../clients/cli/connections.c:7634
--#: ../clients/cli/connections.c:7731
-+#: ../clients/cli/connections.c:7470 ../clients/cli/connections.c:7647
-+#: ../clients/cli/connections.c:7751
- #, 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:7466
-+#: ../clients/cli/connections.c:7479
- #, 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:7473
-+#: ../clients/cli/connections.c:7486
- #, c-format
- msgid "Error: invalid property: %s\n"
- msgstr "Erreur : propriété non valide : %s\n"
-
--#: ../clients/cli/connections.c:7537
-+#: ../clients/cli/connections.c:7550
- #, c-format
- msgid "Error: unknown setting '%s'\n"
- msgstr "Erreur : paramètre inconnu « %s »\n"
-
--#: ../clients/cli/connections.c:7562
-+#: ../clients/cli/connections.c:7575
- #, 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:7607 ../clients/cli/connections.c:7662
-+#: ../clients/cli/connections.c:7620 ../clients/cli/connections.c:7679
- #, 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:7612
-+#: ../clients/cli/connections.c:7625
- #, c-format
- msgid "Error: no argument given; valid are [%s]\n"
- msgstr "Erreur : aucun argument donné ; [%s] sont valides\n"
-
--#: ../clients/cli/connections.c:7631
-+#: ../clients/cli/connections.c:7644
- #, 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:7685
-+#: ../clients/cli/connections.c:7705
- #, 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:7710 ../clients/cli/connections.c:7742
-+#: ../clients/cli/connections.c:7730 ../clients/cli/connections.c:7762
- #, 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:7765
-+#: ../clients/cli/connections.c:7785
- #, 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:7795
-+#: ../clients/cli/connections.c:7815
- #, c-format
- msgid "Error: unknown setting: '%s'\n"
- msgstr "Erreur : paramètre inconnu : « %s »\n"
-
--#: ../clients/cli/connections.c:7800
-+#: ../clients/cli/connections.c:7820
- #, 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:7831
-+#: ../clients/cli/connections.c:7851
- #, c-format
- msgid "Error: invalid property: %s%s\n"
- msgstr "Erreur : propriété non valide : %s%s,\n"
-
--#: ../clients/cli/connections.c:7833
-+#: ../clients/cli/connections.c:7853
- 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:7849
-+#: ../clients/cli/connections.c:7869
- #, c-format
- msgid "Invalid verify option: %s\n"
- msgstr "Option de vérification non valide : %s\n"
-
--#: ../clients/cli/connections.c:7858
-+#: ../clients/cli/connections.c:7878
- #, c-format
- msgid "Verify setting '%s': %s\n"
- msgstr "Vérifier le paramètre « %s » : %s\n"
-
--#: ../clients/cli/connections.c:7874
-+#: ../clients/cli/connections.c:7894
- #, c-format
- msgid "Verify connection: %s\n"
- msgstr "Vérifier la connexion : %s\n"
-
--#: ../clients/cli/connections.c:7877
-+#: ../clients/cli/connections.c:7897
- #, 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:7897
-+#: ../clients/cli/connections.c:7917
- #, c-format
- msgid "Error: invalid argument '%s'\n"
- msgstr "Erreur : argument « %s » non valideerify\n"
-
--#: ../clients/cli/connections.c:7947
-+#: ../clients/cli/connections.c:7967
- #, 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:7953
-+#: ../clients/cli/connections.c:7973
- #, c-format
- msgid "Error: Timeout saving '%s' (%s) connection\n"
- msgstr "Erreur : échec lors de l'enregistrement de la connexion '%s' (%s)\n"
-
--#: ../clients/cli/connections.c:7958
-+#: ../clients/cli/connections.c:7978
- #, c-format
- msgid "Connection '%s' (%s) successfully saved.\n"
- msgstr "Connexion « %s » (%s) enregistrée.\n"
-
--#: ../clients/cli/connections.c:7959
-+#: ../clients/cli/connections.c:7979
- #, c-format
- msgid "Connection '%s' (%s) successfully updated.\n"
- msgstr "Connexion « %s » (%s) mise à jour.\n"
-
--#: ../clients/cli/connections.c:7992
-+#: ../clients/cli/connections.c:8012
- #, 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:7993
-+#: ../clients/cli/connections.c:8013
- msgid "(unknown error)"
- msgstr "(erreur inconnue)"
-
--#: ../clients/cli/connections.c:7994
-+#: ../clients/cli/connections.c:8014
- #, 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"
-
- #. TRANSLATORS: do not translate 'save', leave it as it is
--#: ../clients/cli/connections.c:8017
-+#: ../clients/cli/connections.c:8037
- #, 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:8021
-+#: ../clients/cli/connections.c:8041
- #, c-format
- msgid "Error: connection is not valid: %s\n"
- msgstr "Erreur : la connexion n'est pas valide : %s\n"
-
--#: ../clients/cli/connections.c:8031
-+#: ../clients/cli/connections.c:8051
- #, c-format
- msgid "Error: Cannot activate connection: %s.\n"
- msgstr "Erreur : impossible d'activer la connexion : %s.\n"
-
--#: ../clients/cli/connections.c:8040
-+#: ../clients/cli/connections.c:8060
- #, 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:8047
-+#: ../clients/cli/connections.c:8067
- 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:8083
-+#: ../clients/cli/connections.c:8103
- #, c-format
- msgid "Error: status-line: %s\n"
- msgstr "Erreur : statut ligne : %s\n"
-
--#: ../clients/cli/connections.c:8091
-+#: ../clients/cli/connections.c:8111
- #, c-format
- msgid "Error: save-confirmation: %s\n"
- msgstr "Erreur : sauvegarder confirmation : %s\n"
-
--#: ../clients/cli/connections.c:8099
-+#: ../clients/cli/connections.c:8119
- #, c-format
- msgid "Error: show-secrets: %s\n"
- msgstr "Erreur : afficher les secrets : %s\n"
-
--#: ../clients/cli/connections.c:8106
-+#: ../clients/cli/connections.c:8126
- #, c-format
- msgid "Current nmcli configuration:\n"
- msgstr "Configuration nmcli actuelle :\n"
-
--#: ../clients/cli/connections.c:8114
-+#: ../clients/cli/connections.c:8134
- #, c-format
- msgid "Invalid configuration option '%s'; allowed [%s]\n"
- msgstr "Option de configuration « %s » non valide ; [%s] autorisé\n"
-
--#: ../clients/cli/connections.c:8335
-+#: ../clients/cli/connections.c:8356
- #, 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:8349 ../clients/cli/connections.c:8513
-+#: ../clients/cli/connections.c:8371 ../clients/cli/connections.c:8535
- #, c-format
- msgid "Error: Unknown connection '%s'."
- msgstr "Erreur : connexion inconnue : « %s »."
-
--#: ../clients/cli/connections.c:8365
-+#: ../clients/cli/connections.c:8388
- #, 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:8368
-+#: ../clients/cli/connections.c:8391
- #, c-format
- msgid ""
- "Warning: editing existing connection '%s'; 'con-name' argument is ignored\n"
- msgstr "Avertissement : modification de la connexion existante « %s » ; l'argument « con-name » est ignoré\n"
-
--#: ../clients/cli/connections.c:8395
-+#: ../clients/cli/connections.c:8418
- #, c-format
- msgid "Valid connection types: %s\n"
- msgstr "Types de connexion valides : %s\n"
-
--#: ../clients/cli/connections.c:8397
-+#: ../clients/cli/connections.c:8420
- #, c-format
- msgid "Error: invalid connection type; %s\n"
- msgstr "Erreur : type de connexion non valide ; %s\n"
-
--#: ../clients/cli/connections.c:8433
-+#: ../clients/cli/connections.c:8456
- #, c-format
- msgid "===| nmcli interactive connection editor |==="
- msgstr "===| éditeur de connexions interactives nmcli |==="
-
--#: ../clients/cli/connections.c:8436
-+#: ../clients/cli/connections.c:8459
- #, c-format
- msgid "Editing existing '%s' connection: '%s'"
- msgstr "Modification de la connexion « %s » : « %s »"
-
--#: ../clients/cli/connections.c:8438
-+#: ../clients/cli/connections.c:8461
- #, c-format
- msgid "Adding a new '%s' connection"
- msgstr "Ajout d'une nouvelle connexion « %s »"
-
- #. TRANSLATORS: do not translate 'help', leave it as it is
--#: ../clients/cli/connections.c:8441
-+#: ../clients/cli/connections.c:8464
- #, c-format
- msgid "Type 'help' or '?' for available commands."
- msgstr "Saisissez « help » ou « ? » pour les commandes disponibles."
-
- #. TRANSLATORS: do not translate 'print', leave it as it is
--#: ../clients/cli/connections.c:8444
-+#: ../clients/cli/connections.c:8467
- #, c-format
- msgid "Type 'print' to show all the connection properties."
- msgstr "Saisissez « print » (imprimer) pour afficher toutes les propriétés de connexion."
-
- #. TRANSLATORS: do not translate 'describe', leave it as it is
--#: ../clients/cli/connections.c:8447
-+#: ../clients/cli/connections.c:8470
- #, 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:8475
-+#: ../clients/cli/connections.c:8498
- #, 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:8481
-+#: ../clients/cli/connections.c:8504
- #, c-format
- msgid "Connection '%s' (%s) successfully modified.\n"
- msgstr "Connexion « %s » (%s) modifiée.\n"
-
--#: ../clients/cli/connections.c:8549
-+#: ../clients/cli/connections.c:8571
- #, 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:8608
-+#: ../clients/cli/connections.c:8631
- msgid "New connection name: "
- msgstr "Nom de la nouvelle connexion : "
-
--#: ../clients/cli/connections.c:8610
-+#: ../clients/cli/connections.c:8633
- #, c-format
- msgid "Error: <new name> argument is missing."
- msgstr "Erreur : le paramètre <new name> est manquant."
-
--#: ../clients/cli/connections.c:8615 ../clients/cli/connections.c:9101
-+#: ../clients/cli/connections.c:8639 ../clients/cli/connections.c:9124
- #, c-format
- msgid "Error: unknown extra argument: '%s'."
- msgstr "Erreur : argument supplémentaire « %s » inconnu."
-
--#: ../clients/cli/connections.c:8648
-+#: ../clients/cli/connections.c:8671
- #, c-format
- msgid "Error: not all connections deleted."
- msgstr "Erreur : les connexions n'ont pas toutes été supprimées."
-
--#: ../clients/cli/connections.c:8649
-+#: ../clients/cli/connections.c:8672
- #, c-format
- msgid "Error: Connection deletion failed: %s\n"
- msgstr "Erreur : la suppression de la connexion a échoué : %s\n"
-
--#: ../clients/cli/connections.c:8705 ../clients/cli/connections.c:8826
-+#: ../clients/cli/connections.c:8728 ../clients/cli/connections.c:8848
- #, c-format
- msgid "Error: %s.\n"
- msgstr "Erreur : %s.\n"
-
--#: ../clients/cli/connections.c:8706 ../clients/cli/connections.c:8827
-+#: ../clients/cli/connections.c:8729 ../clients/cli/connections.c:8849
- #, 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:8757
-+#: ../clients/cli/connections.c:8780
- #, 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:8767
-+#: ../clients/cli/connections.c:8789
- #, c-format
- msgid "%s: connection profile changed\n"
- msgstr "%s: le profil de connexion a changé\n"
-
--#: ../clients/cli/connections.c:8793
-+#: ../clients/cli/connections.c:8815
- #, c-format
- msgid "%s: connection profile created\n"
- msgstr "%s: profil de connection créé\n"
-
--#: ../clients/cli/connections.c:8802
-+#: ../clients/cli/connections.c:8824
- #, c-format
- msgid "%s: connection profile removed\n"
- msgstr "%s: profil de connexion supprimé\n"
-
--#: ../clients/cli/connections.c:8873
-+#: ../clients/cli/connections.c:8894
- #, c-format
- msgid "Error: failed to reload connections: %s."
- msgstr "Erreur : échec lors du rechargement des connexions : %s."
-
--#: ../clients/cli/connections.c:8905
-+#: ../clients/cli/connections.c:8924
- #, c-format
- msgid "Error: failed to load connection: %s."
- msgstr "Erreur : échec lors du rechargement de la connexion : %s."
-
--#: ../clients/cli/connections.c:8913
-+#: ../clients/cli/connections.c:8932
- #, c-format
- msgid "Could not load file '%s'\n"
- msgstr "Impossible de charger le fichier « %s »\n"
-
--#: ../clients/cli/connections.c:8920
-+#: ../clients/cli/connections.c:8936
- msgid "File to import: "
- msgstr "Fichier à importer : "
-
--#: ../clients/cli/connections.c:8953
-+#: ../clients/cli/connections.c:8969
- #, c-format
- msgid "Error: No arguments provided."
- msgstr "Erreur : aucun argument fourni."
-
--#: ../clients/cli/connections.c:8984
-+#: ../clients/cli/connections.c:9002
- #, 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:8998
-+#: ../clients/cli/connections.c:9017
- #, 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:9011
-+#: ../clients/cli/connections.c:9031
- #, c-format
- msgid "Error: 'type' argument is required."
- msgstr "Erreur : l'argument « type » est requis."
-
--#: ../clients/cli/connections.c:9015
-+#: ../clients/cli/connections.c:9036
- #, c-format
- msgid "Error: 'file' argument is required."
- msgstr "Erreur : l'argument «fichier » est requis."
-
--#: ../clients/cli/connections.c:9024
-+#: ../clients/cli/connections.c:9046
- #, 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:9031 ../clients/cli/connections.c:9122
-+#: ../clients/cli/connections.c:9054 ../clients/cli/connections.c:9145
- #, c-format
- msgid "Error: failed to load VPN plugin: %s."
- msgstr "Erreur : échec du chargement du greffon de VPN : %s."
-
--#: ../clients/cli/connections.c:9040
-+#: ../clients/cli/connections.c:9064
- #, c-format
- msgid "Error: failed to import '%s': %s."
- msgstr "Erreur : n'a pas pu importer « %s »: %s."
-
--#: ../clients/cli/connections.c:9108
-+#: ../clients/cli/connections.c:9131
- msgid "Output file name: "
- msgstr "Nom du fichier de sortie : "
-
--#: ../clients/cli/connections.c:9113
-+#: ../clients/cli/connections.c:9136
- #, c-format
- msgid "Error: the connection is not VPN."
- msgstr "Erreur : la connexion n'est pas VPN."
-
--#: ../clients/cli/connections.c:9135
-+#: ../clients/cli/connections.c:9158
- #, c-format
- msgid "Error: failed to create temporary file %s."
- msgstr "Erreur : impossible de créer le fichier temporaire %s"
-
--#: ../clients/cli/connections.c:9143
-+#: ../clients/cli/connections.c:9166
- #, c-format
- msgid "Error: failed to export '%s': %s."
- msgstr "Erreur : n'a pas pu exporter « %s » : %s."
-
--#: ../clients/cli/connections.c:9155
-+#: ../clients/cli/connections.c:9178
- #, c-format
- msgid "Error: failed to read temporary file '%s': %s."
- msgstr "Erreur : n'a pas pu lire le fichier temporaire « %s » : %s."
-@@ -2249,29 +2253,29 @@ msgstr "Interface : "
- msgid "Interface(s): "
- msgstr "Interface(s) : "
-
--#: ../clients/cli/devices.c:59 ../clients/cli/devices.c:1267
-+#: ../clients/cli/devices.c:64 ../clients/cli/devices.c:1278
- msgid "(none)"
- msgstr "(aucun)"
-
--#: ../clients/cli/devices.c:166 ../clients/cli/devices.c:173
-+#: ../clients/cli/devices.c:171 ../clients/cli/devices.c:178
- msgid "(unknown)"
- msgstr "(inconnu)"
-
--#: ../clients/cli/devices.c:322
-+#: ../clients/cli/devices.c:329
- #, c-format
- msgid "<invisible> | %s"
- msgstr "<invisible> | %s"
-
--#: ../clients/cli/devices.c:323
-+#: ../clients/cli/devices.c:330
- msgid "<invisible>"
- msgstr "<invisible>"
-
--#: ../clients/cli/devices.c:424
-+#: ../clients/cli/devices.c:431
- #, c-format
- msgid "%u Mb/s"
- msgstr "%u Mb/s"
-
--#: ../clients/cli/devices.c:725
-+#: ../clients/cli/devices.c:732
- #, c-format
- msgid ""
- "Usage: nmcli device { COMMAND | help }\n"
-@@ -2349,7 +2353,7 @@ msgstr "Usage: nmcli device { COMMAND | help }\n"
- " lldp [list [ifname <ifname>]]\n"
- "\n"
-
--#: ../clients/cli/devices.c:749
-+#: ../clients/cli/devices.c:756
- #, c-format
- msgid ""
- "Usage: nmcli device status { help }\n"
-@@ -2377,7 +2381,7 @@ msgstr "Syntaxe : nmcli device status { help }\n"
- "est la commande par défaut, c-a-d que 'nmcli device' appelle 'nmcli device status'.\n"
- "\n"
-
--#: ../clients/cli/devices.c:764
-+#: ../clients/cli/devices.c:771
- #, c-format
- msgid ""
- "Usage: nmcli device show { ARGUMENTS | help }\n"
-@@ -2395,7 +2399,7 @@ msgstr "Syntaxe : nmcli device show { ARGUMENTS | help }\n"
- "La commande afficher tous les détails de tous les périphériques, ou pour un périphérique donné.\n"
- "\n"
-
--#: ../clients/cli/devices.c:775
-+#: ../clients/cli/devices.c:782
- #, c-format
- msgid ""
- "Usage: nmcli device connect { ARGUMENTS | help }\n"
-@@ -2416,7 +2420,7 @@ msgstr "Syntaxe : nmcli device connect { ARGUMENTS | help }\n"
- "NetworkManager envisagera aussi les connexions qui ne sont pas réglées sur auto-connect.\n"
- "\n"
-
--#: ../clients/cli/devices.c:787
-+#: ../clients/cli/devices.c:794
- #, c-format
- msgid ""
- "Usage: nmcli device reapply { ARGUMENTS | help }\n"
-@@ -2433,7 +2437,7 @@ msgstr "Usage: nmcli device reapply { ARGUMENTS | help }\n"
- "Tentatives de mettre à jour le périphérique avec les modifications apportées à la connexion active depuis sa dernière application.\n"
- "\n"
-
--#: ../clients/cli/devices.c:798
-+#: ../clients/cli/devices.c:805
- #, c-format
- msgid ""
- "Usage: nmcli device modify { ARGUMENTS | --help }\n"
-@@ -2467,7 +2471,7 @@ msgstr "Usage: nmcli device modify { ARGUMENTS | --help }\n"
- "nmcli dev mod em1 -ipv4.dns 1\n"
- "nmcli dev mod em1 -ipv6.addr \"abbe::cafe/56\"\n"
-
--#: ../clients/cli/devices.c:818
-+#: ../clients/cli/devices.c:825
- #, c-format
- msgid ""
- "Usage: nmcli device disconnect { ARGUMENTS | help }\n"
-@@ -2487,7 +2491,7 @@ msgstr "Syntaxe : nmcli device disconnect { ARGUMENTS | help }\n"
- "des connexions supplémentaires sans une intervention manuelle de l'utilisateur.\n"
- "\n"
-
--#: ../clients/cli/devices.c:830
-+#: ../clients/cli/devices.c:837
- #, c-format
- msgid ""
- "Usage: nmcli device delete { ARGUMENTS | help }\n"
-@@ -2509,7 +2513,7 @@ msgstr "Syntaxe : nmcli device show { ARGUMENTS | help }\n"
- "commande.\n"
- "\n"
-
--#: ../clients/cli/devices.c:843
-+#: ../clients/cli/devices.c:850
- #, c-format
- msgid ""
- "Usage: nmcli device set { ARGUMENTS | help }\n"
-@@ -2531,7 +2535,7 @@ msgstr "Syntaxe : nmcli device set { ARGUMENTS | help }\n"
- "Modifie les propriétés du périphérique.\n"
- "\n"
-
--#: ../clients/cli/devices.c:856
-+#: ../clients/cli/devices.c:863
- #, c-format
- msgid ""
- "Usage: nmcli device monitor { ARGUMENTS | help }\n"
-@@ -2551,7 +2555,7 @@ msgstr "Syntaxe : nmcli device show { ARGUMENTS | help }\n"
- "Surveille tous les périphériques si aucune interface n'est spécifiée.\n"
- "\n"
-
--#: ../clients/cli/devices.c:868
-+#: ../clients/cli/devices.c:875
- #, c-format
- msgid ""
- "Usage: nmcli device wifi { ARGUMENTS | help }\n"
-@@ -2637,7 +2641,7 @@ msgstr "Syntaxe : nmcli device wifi { ARGUMENTS | help }\n"
- "NetworkManager scanne les réseaux Wi-Fi de manière périodique, mais dans certains cas il peut être utile d'effectuer le scan manuellement. 'ssid' autorise le scan d'un SSID spécifique, ce qui est utile pour les point d'accès dont le SSID est masqué. Plusieurs paramètres 'ssid' peuvent être passés. Remarquez que cette commande n'affiche pas les points d'accès, veuillez utiliser « nmcli device wifi list » pour cela.\n"
- "\n"
-
--#: ../clients/cli/devices.c:915
-+#: ../clients/cli/devices.c:922
- #, c-format
- msgid ""
- "Usage: nmcli device lldp { ARGUMENTS | help }\n"
-@@ -2656,465 +2660,466 @@ msgstr "Syntaxe : nmcli device lldp { ARGUMENTS | help }\n"
- "utilisée pour dresser cette liste pour une interface donnée.\n"
- "\n"
-
--#: ../clients/cli/devices.c:1013
-+#: ../clients/cli/devices.c:1021
- #, c-format
- msgid "Error: No interface specified."
- msgstr "Erreur : aucune interface spécifiée."
-
--#: ../clients/cli/devices.c:1036
-+#: ../clients/cli/devices.c:1044
- #, c-format
- msgid "Warning: argument '%s' is duplicated.\n"
- msgstr "Avertissement : l'argument « %s » est dupliqué.\n"
-
--#: ../clients/cli/devices.c:1039
-+#: ../clients/cli/devices.c:1047
- #, c-format
- msgid "Error: Device '%s' not found.\n"
- msgstr "Erreur : périphérique « %s » introuvable.\n"
-
--#: ../clients/cli/devices.c:1040
-+#: ../clients/cli/devices.c:1048
- #, 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:1071
-+#: ../clients/cli/devices.c:1079
- msgid "No interface specified"
- msgstr "Aucune interface spécifiée"
-
--#: ../clients/cli/devices.c:1090
-+#: ../clients/cli/devices.c:1098
- #, c-format
- msgid "Device '%s' not found"
- msgstr "Périphérique « %s » introuvable"
-
--#: ../clients/cli/devices.c:1186
-+#: ../clients/cli/devices.c:1194
- #, c-format
- msgid "%u MHz"
- msgstr "%u MHz"
-
--#: ../clients/cli/devices.c:1187
-+#: ../clients/cli/devices.c:1195
- #, c-format
- msgid "%u Mbit/s"
- msgstr "%u Mb/s"
-
--#: ../clients/cli/devices.c:1226
-+#: ../clients/cli/devices.c:1237
- msgid "Ad-Hoc"
- msgstr "Ad-Hoc"
-
--#: ../clients/cli/devices.c:1227
-+#: ../clients/cli/devices.c:1238
- msgid "Infra"
- msgstr "Infra"
-
--#: ../clients/cli/devices.c:1228 ../src/devices/wifi/nm-device-olpc-mesh.c:118
-+#: ../clients/cli/devices.c:1239 ../src/devices/wifi/nm-device-olpc-mesh.c:118
- msgid "Mesh"
- msgstr "Mesh"
-
--#: ../clients/cli/devices.c:1229
-+#: ../clients/cli/devices.c:1240
- msgid "N/A"
- msgstr "N/A"
-
--#: ../clients/cli/devices.c:1424
-+#: ../clients/cli/devices.c:1435
- msgid "Device details"
- msgstr "Détails de périphérique"
-
--#: ../clients/cli/devices.c:1435
-+#: ../clients/cli/devices.c:1447
- #, c-format
- msgid "Error: 'device show': %s"
- msgstr "Erreur : « device show » : %s"
-
--#: ../clients/cli/devices.c:1747
-+#: ../clients/cli/devices.c:1776
- msgid "Status of devices"
- msgstr "État des périphériques"
-
--#: ../clients/cli/devices.c:1751
-+#: ../clients/cli/devices.c:1780
- #, c-format
- msgid "Error: 'device status': %s"
- msgstr "Erreur : « device status » : %s"
-
--#: ../clients/cli/devices.c:1814 ../clients/cli/general.c:537
-+#: ../clients/cli/devices.c:1842 ../clients/cli/general.c:511
- #, c-format
- msgid "Error: Timeout %d sec expired."
- msgstr "Erreur : le délai d'attente de %d sec a expiré."
-
--#: ../clients/cli/devices.c:1886
-+#: ../clients/cli/devices.c:1914
- #, c-format
- msgid "Device '%s' successfully activated with '%s'.\n"
- msgstr "Périphérique « %s » activé avec « %s ».\n"
-
--#: ../clients/cli/devices.c:1891
-+#: ../clients/cli/devices.c:1919
- #, c-format
- msgid ""
- "Hint: \"nmcli dev wifi show-password\" shows the Wi-Fi name and password.\n"
- msgstr "Indice utile : \"nmcli dev wifi show-password\" affiche le nom et le mot de passe Wi-Fi.\n"
-
--#: ../clients/cli/devices.c:1895
-+#: ../clients/cli/devices.c:1923
- #, 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:1925
-+#: ../clients/cli/devices.c:1953
- #, 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:1928
-+#: ../clients/cli/devices.c:1956
- #, 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:1931
-+#: ../clients/cli/devices.c:1959
- #, c-format
- msgid "Error: Failed to activate connection: %s"
- msgstr "Erreur : échec d'activation de la connexion : %s"
-
--#: ../clients/cli/devices.c:1996
-+#: ../clients/cli/devices.c:2024
- #, c-format
- msgid "Error: Device activation failed: %s"
- msgstr "Erreur : l'activation du périphérique a échoué : %s"
-
--#: ../clients/cli/devices.c:2046
-+#: ../clients/cli/devices.c:2075
- #, c-format
- msgid "Error: extra argument not allowed: '%s'."
- msgstr "Erreur : argument supplémentaire non autorisé : « %s »."
-
--#: ../clients/cli/devices.c:2116 ../clients/cli/devices.c:2131
--#: ../clients/cli/devices.c:2368
-+#: ../clients/cli/devices.c:2144 ../clients/cli/devices.c:2159
-+#: ../clients/cli/devices.c:2400
- #, c-format
- msgid "Device '%s' successfully disconnected.\n"
- msgstr "Périphérique « %s » déconnecté.\n"
-
--#: ../clients/cli/devices.c:2119 ../clients/cli/devices.c:2442
-+#: ../clients/cli/devices.c:2147 ../clients/cli/devices.c:2473
- #, c-format
- msgid "Device '%s' successfully removed.\n"
- msgstr "Périphérique « %s »supprimé.\n"
-
--#: ../clients/cli/devices.c:2181 ../clients/cli/devices.c:2251
-+#: ../clients/cli/devices.c:2209 ../clients/cli/devices.c:2279
- #, 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:2191 ../clients/cli/devices.c:2260
-+#: ../clients/cli/devices.c:2219 ../clients/cli/devices.c:2288
- #, 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:2285
-+#: ../clients/cli/devices.c:2315
- #, 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:2352
-+#: ../clients/cli/devices.c:2384
- #, 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:2353
-+#: ../clients/cli/devices.c:2385
- #, 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:2433
-+#: ../clients/cli/devices.c:2464
- #, 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:2434
-+#: ../clients/cli/devices.c:2465
- #, 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:2516
-+#: ../clients/cli/devices.c:2547
- #, c-format
- msgid "Error: No property specified."
- msgstr "Erreur : aucune propriété n'a été spécifiée."
-
--#: ../clients/cli/devices.c:2531 ../clients/cli/devices.c:2548
--#: ../clients/cli/general.c:777 ../clients/cli/general.c:789
-+#: ../clients/cli/devices.c:2563 ../clients/cli/devices.c:2582
-+#: ../clients/cli/general.c:773 ../clients/cli/general.c:786
- #, c-format
- msgid "Error: '%s' argument is missing."
- msgstr "Erreur : l'argument « %s » est manquant."
-
--#: ../clients/cli/devices.c:2537
-+#: ../clients/cli/devices.c:2570
- #, c-format
- msgid "Error: 'managed': %s."
- msgstr "Erreur: 'géré': %s."
-
--#: ../clients/cli/devices.c:2554
-+#: ../clients/cli/devices.c:2589
- #, c-format
- msgid "Error: 'autoconnect': %s."
- msgstr "Erreur : « autoconnect » : %s."
-
--#: ../clients/cli/devices.c:2562 ../clients/cli/general.c:803
-+#: ../clients/cli/devices.c:2598 ../clients/cli/general.c:801
- #, c-format
- msgid "Error: property '%s' is not known."
- msgstr "Erreur : propriété « %s » inconnue."
-
--#: ../clients/cli/devices.c:2611
-+#: ../clients/cli/devices.c:2644
- #, c-format
- msgid "%s: using connection '%s'\n"
- msgstr "%s: utilisation de la connection « %s »\n"
-
--#: ../clients/cli/devices.c:2637
-+#: ../clients/cli/devices.c:2670
- #, 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:2644
-+#: ../clients/cli/devices.c:2677
- #, c-format
- msgid "%s: device removed\n"
- msgstr "%s: périphérique supprimé\n"
-
--#: ../clients/cli/devices.c:2824
-+#: ../clients/cli/devices.c:2856
- msgid "Wi-Fi scan list"
- msgstr "Liste de balayage Wi-Fi"
-
--#: ../clients/cli/devices.c:2911
-+#: ../clients/cli/devices.c:2974 ../clients/cli/devices.c:3251
- #, 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:3067
-+#: ../clients/cli/devices.c:3174
- #, c-format
- msgid "Error: 'device wifi': %s"
- msgstr "Erreur : « device wifi » : %s"
-
--#: ../clients/cli/devices.c:3087
-+#: ../clients/cli/devices.c:3193
- #, 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:3094
-+#: ../clients/cli/devices.c:3232
- #, c-format
- msgid "Error: Device '%s' not found."
- msgstr "Erreur : périphérique « %s » introuvable."
-
--#: ../clients/cli/devices.c:3105
-+#: ../clients/cli/devices.c:3237
- #, c-format
- msgid ""
- "Error: Device '%s' was not recognized as a Wi-Fi device, check "
- "NetworkManager Wi-Fi plugin."
- msgstr "Erreur : le périphérique « %s » n'est pas un périphérique Wi-Fi. Vérifier le greffon Wi-Fi du NetworkManager."
-
--#: ../clients/cli/devices.c:3109 ../clients/cli/devices.c:3430
--#: ../clients/cli/devices.c:4006 ../clients/cli/devices.c:4134
--#: ../clients/cli/devices.c:4266
-+#: ../clients/cli/devices.c:3241 ../clients/cli/devices.c:3570
-+#: ../clients/cli/devices.c:4159 ../clients/cli/devices.c:4286
-+#: ../clients/cli/devices.c:4419
- #, 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:3277
-+#: ../clients/cli/devices.c:3417
- msgid "SSID or BSSID: "
- msgstr "SSID ou BSSID : "
-
--#: ../clients/cli/devices.c:3282
-+#: ../clients/cli/devices.c:3422
- #, c-format
- msgid "Error: SSID or BSSID are missing."
- msgstr "Erreur : SSID ou BSSID sont manquants."
-
--#: ../clients/cli/devices.c:3319
-+#: ../clients/cli/devices.c:3459
- #, 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:3349
-+#: ../clients/cli/devices.c:3489
- #, c-format
- msgid ""
- "Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
- msgstr "Erreur : la valeur de l'argument wep-key-type « %s » est non valide, veuillez utiliser « key » ou « phrase »."
-
--#: ../clients/cli/devices.c:3376 ../clients/cli/devices.c:3394
-+#: ../clients/cli/devices.c:3516 ../clients/cli/devices.c:3534
- #, c-format
- msgid "Error: %s: %s."
- msgstr "Erreur : %s : %s."
-
--#: ../clients/cli/devices.c:3413
-+#: ../clients/cli/devices.c:3553
- #, 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:3419
-+#: ../clients/cli/devices.c:3559
- #, 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:3432 ../clients/cli/devices.c:4008
--#: ../clients/cli/devices.c:4136 ../clients/cli/devices.c:4367
-+#: ../clients/cli/devices.c:3572 ../clients/cli/devices.c:4161
-+#: ../clients/cli/devices.c:4288 ../clients/cli/devices.c:4524
- #, c-format
- msgid "Error: No Wi-Fi device found."
- msgstr "Erreur : aucun périphérique Wi-Fi trouvé."
-
--#: ../clients/cli/devices.c:3452
-+#: ../clients/cli/devices.c:3592
- #, c-format
- msgid "Error: Failed to scan hidden SSID: %s."
- msgstr "Erreur : impossible de scanner le SSID caché : %s."
-
--#: ../clients/cli/devices.c:3479
-+#: ../clients/cli/devices.c:3619
- #, c-format
- msgid "Error: No network with SSID '%s' found."
- msgstr "Erreur : aucun réseau avec le SSID « %s » trouvé."
-
--#: ../clients/cli/devices.c:3481
-+#: ../clients/cli/devices.c:3621
- #, 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:3508
-+#: ../clients/cli/devices.c:3648
- #, c-format
- msgid "Error: Connection '%s' exists but properties don't match."
- msgstr "Erreur : la connexion « %s » existe mais les propriétés ne correspondent pas."
-
--#: ../clients/cli/devices.c:3551
-+#: ../clients/cli/devices.c:3691
- #, c-format
- msgid ""
- "Warning: '%s' should be SSID for hidden APs; but it looks like a BSSID.\n"
- msgstr "Attention : « %s » doit correspondre à un SSID pour les points d'accès cachés ; mais il correspond à un BSSID.\n"
-
--#: ../clients/cli/devices.c:3588
-+#: ../clients/cli/devices.c:3732
- msgid "Password: "
- msgstr "Mot de passe : "
-
--#: ../clients/cli/devices.c:3729
-+#: ../clients/cli/devices.c:3871
- #, c-format
- msgid "'%s' is not valid WPA PSK"
- msgstr "« %s » n'est pas un WPA PSK valide"
-
--#: ../clients/cli/devices.c:3746
-+#: ../clients/cli/devices.c:3888
- #, 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:3762
-+#: ../clients/cli/devices.c:3904
- #, c-format
- msgid "Hotspot password: %s\n"
- msgstr "Mot de passe hotspot : %s\n"
-
--#: ../clients/cli/devices.c:3927
-+#: ../clients/cli/devices.c:4072
- #, c-format
- msgid "Error: ssid is too long."
- msgstr "Erreur : « ssid » est trop long."
-
--#: ../clients/cli/devices.c:3942
-+#: ../clients/cli/devices.c:4089
- #, 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:3989
-+#: ../clients/cli/devices.c:4140
- #, c-format
- msgid "Error: channel requires band too."
- msgstr "Erreur : le canal requiert une bande également."
-
--#: ../clients/cli/devices.c:3994
-+#: ../clients/cli/devices.c:4146
- #, 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:4019
-+#: ../clients/cli/devices.c:4173
- #, 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:4041
-+#: ../clients/cli/devices.c:4195
- #, c-format
- msgid "Error: Invalid 'password': %s."
- msgstr "Erreur : le mot de passe est non valide : « %s »"
-
--#: ../clients/cli/devices.c:4094 ../clients/cli/devices.c:4318
-+#: ../clients/cli/devices.c:4246 ../clients/cli/devices.c:4471
- #, c-format
- msgid "Error: '%s' cannot repeat."
- msgstr "Erreur : le paramètre « %s » ne peut pas être répété."
-
--#: ../clients/cli/devices.c:4227 ../clients/cli/devices.c:4231
--#: ../clients/cli/devices.c:4236 ../clients/tui/nmt-page-wifi.c:249
-+#: ../clients/cli/devices.c:4377 ../clients/cli/devices.c:4381
-+#: ../clients/cli/devices.c:4386 ../clients/cli/devices.c:4389
-+#: ../clients/tui/nmt-page-wifi.c:250
- msgid "Security"
- msgstr "Sécurité"
-
--#: ../clients/cli/devices.c:4227
-+#: ../clients/cli/devices.c:4377
- msgid "None"
- msgstr "Aucun"
-
--#: ../clients/cli/devices.c:4240 ../clients/common/nm-secret-agent-simple.c:273
-+#: ../clients/cli/devices.c:4393 ../clients/common/nm-secret-agent-simple.c:273
- #: ../clients/common/nm-secret-agent-simple.c:310
- #: ../clients/common/nm-secret-agent-simple.c:333
- #: ../clients/common/nm-secret-agent-simple.c:366
- #: ../clients/common/nm-secret-agent-simple.c:903
- #: ../clients/common/nm-secret-agent-simple.c:938
- #: ../clients/common/nm-secret-agent-simple.c:961
--#: ../clients/common/nm-vpn-helpers.c:110
--#: ../clients/common/nm-vpn-helpers.c:114
--#: ../clients/common/nm-vpn-helpers.c:120
--#: ../clients/common/nm-vpn-helpers.c:125 ../clients/tui/nmt-page-dsl.c:62
--#: ../clients/tui/nmt-page-wifi.c:265 ../clients/tui/nmt-page-wifi.c:297
--#: ../clients/tui/nmt-page-wifi.c:330
-+#: ../clients/common/nm-vpn-helpers.c:137
-+#: ../clients/common/nm-vpn-helpers.c:143
-+#: ../clients/common/nm-vpn-helpers.c:151
-+#: ../clients/common/nm-vpn-helpers.c:160 ../clients/tui/nmt-page-dsl.c:62
-+#: ../clients/tui/nmt-page-wifi.c:266 ../clients/tui/nmt-page-wifi.c:298
-+#: ../clients/tui/nmt-page-wifi.c:331
- msgid "Password"
- msgstr "Mot de passe"
-
--#: ../clients/cli/devices.c:4355
-+#: ../clients/cli/devices.c:4511
- #, c-format
- msgid "%s"
- msgstr "%s"
-
- #. Main header name
--#: ../clients/cli/devices.c:4411
-+#: ../clients/cli/devices.c:4565
- msgid "Device LLDP neighbors"
- msgstr "Voisins du périphérique LLDP"
-
--#: ../clients/cli/devices.c:4521
-+#: ../clients/cli/devices.c:4682
- #, c-format
- msgid "Error: 'device lldp list': %s"
- msgstr "Erreur : « liste des périphériques lldp » : %s"
-
--#: ../clients/cli/general.c:27
-+#: ../clients/cli/general.c:32
- msgid "asleep"
- msgstr "veille"
-
--#: ../clients/cli/general.c:28
-+#: ../clients/cli/general.c:33
- msgid "connecting"
- msgstr "connexion"
-
--#: ../clients/cli/general.c:29
-+#: ../clients/cli/general.c:34
- msgid "connected (local only)"
- msgstr "connecté (local seulement)"
-
--#: ../clients/cli/general.c:30
-+#: ../clients/cli/general.c:35
- msgid "connected (site only)"
- msgstr "connecté (site seulement)"
-
--#: ../clients/cli/general.c:31 ../clients/common/nm-client-utils.c:260
-+#: ../clients/cli/general.c:36 ../clients/common/nm-client-utils.c:262
- msgid "connected"
- msgstr "connecté"
-
--#: ../clients/cli/general.c:32
-+#: ../clients/cli/general.c:37
- msgid "disconnecting"
- msgstr "déconnexion"
-
--#: ../clients/cli/general.c:33 ../clients/common/nm-client-utils.c:253
-+#: ../clients/cli/general.c:38 ../clients/common/nm-client-utils.c:255
- msgid "disconnected"
- msgstr "déconnecté"
-
--#: ../clients/cli/general.c:124
-+#: ../clients/cli/general.c:94
- msgid "auth"
- msgstr "auth"
-
--#: ../clients/cli/general.c:152
-+#: ../clients/cli/general.c:123
- msgid "running"
- msgstr "actif"
-
--#: ../clients/cli/general.c:166
-+#: ../clients/cli/general.c:137
- msgid "starting"
- msgstr "démarrage"
-
--#: ../clients/cli/general.c:166
-+#: ../clients/cli/general.c:137
- msgid "started"
- msgstr "démarré"
-
--#: ../clients/cli/general.c:200
-+#: ../clients/cli/general.c:171
- msgid "enabled"
- msgstr "activé"
-
--#: ../clients/cli/general.c:200
-+#: ../clients/cli/general.c:171
- msgid "disabled"
- msgstr "désactivé"
-
--#: ../clients/cli/general.c:318
-+#: ../clients/cli/general.c:289
- #, c-format
- msgid ""
- "Usage: nmcli general { COMMAND | help }\n"
-@@ -3142,7 +3147,7 @@ msgstr "Syntaxe : nmcli general { COMMAND | help }\n"
- " logging [level <log level>] [domains <log domains>]\n"
- "\n"
-
--#: ../clients/cli/general.c:329
-+#: ../clients/cli/general.c:300
- #, c-format
- msgid ""
- "Usage: nmcli general status { help }\n"
-@@ -3157,7 +3162,7 @@ msgstr "Syntaxe : nmcli general status { help }\n"
- "« status » est l'action par défaut, ce qui signifie que « nmcli gen » appelle « nmcli gen status »\n"
- "\n"
-
--#: ../clients/cli/general.c:338
-+#: ../clients/cli/general.c:309
- #, c-format
- msgid ""
- "Usage: nmcli general hostname { ARGUMENTS | help }\n"
-@@ -3178,7 +3183,7 @@ msgstr "Syntaxe : nmcli general hostname { ARGUMENTS | help }\n"
- "un nom d'hôte, NetworkManager va le définir comme étant le nouveau nom d'hôte persistant du système.\n"
- "\n"
-
--#: ../clients/cli/general.c:350
-+#: ../clients/cli/general.c:321
- #, c-format
- msgid ""
- "Usage: nmcli general permissions { help }\n"
-@@ -3190,7 +3195,7 @@ msgstr "Syntaxe : nmcli general permissions { help }\n"
- "Affiche les permissions de l'appelant pour les opérations authentifiées.\n"
- "\n"
-
--#: ../clients/cli/general.c:358
-+#: ../clients/cli/general.c:329
- #, c-format
- msgid ""
- "Usage: nmcli general reload { ARGUMENTS | help }\n"
-@@ -3247,7 +3252,7 @@ msgstr "Utilisation : nmcli general reload { ARGUMENTS | help }\n"
- "Sans drapeau, tout ce qui est pris en charge est rechargé, ce qui\n"
- "identique à l'envoi d'un SIGHUP.\n"
-
--#: ../clients/cli/general.c:390
-+#: ../clients/cli/general.c:361
- #, c-format
- msgid ""
- "Usage: nmcli general logging { ARGUMENTS | help }\n"
-@@ -3271,7 +3276,7 @@ msgstr "Syntaxe : nmcli general logging { ARGUMENTS | help }\n"
- "pour obtenir la liste des domaines de connexion possibles.\n"
- "\n"
-
--#: ../clients/cli/general.c:403
-+#: ../clients/cli/general.c:374
- #, c-format
- msgid ""
- "Usage: nmcli networking { COMMAND | help }\n"
-@@ -3295,7 +3300,7 @@ msgstr "Syntaxe : nmcli networking { COMMAND | help }\n"
- " connectivity [check]\n"
- "\n"
-
--#: ../clients/cli/general.c:413
-+#: ../clients/cli/general.c:384
- #, c-format
- msgid ""
- "Usage: nmcli networking on { help }\n"
-@@ -3307,7 +3312,7 @@ msgstr "Syntaxe : nmcli networking on { help }\n"
- "Active la mise en réseau.\n"
- "\n"
-
--#: ../clients/cli/general.c:421
-+#: ../clients/cli/general.c:392
- #, c-format
- msgid ""
- "Usage: nmcli networking off { help }\n"
-@@ -3319,7 +3324,7 @@ msgstr "Syntaxe : nmcli networking off { help }\n"
- "Désactive la mise en réseau.\n"
- "\n"
-
--#: ../clients/cli/general.c:429
-+#: ../clients/cli/general.c:400
- #, c-format
- msgid ""
- "Usage: nmcli networking connectivity { ARGUMENTS | help }\n"
-@@ -3338,7 +3343,7 @@ msgstr "Syntaxe : nmcli networking connectivity { ARGUMENTS | help }\n"
- "L'argument optionnel « check » fait que NetworkManager vérifie à nouveau la connectivité.\n"
- "\n"
-
--#: ../clients/cli/general.c:441
-+#: ../clients/cli/general.c:412
- #, c-format
- msgid ""
- "Usage: nmcli radio { COMMAND | help }\n"
-@@ -3354,7 +3359,7 @@ msgstr "Syntaxe : nmcli radio { COMMAND | help }\n"
- " all | wifi | wwan | wimax [ on | off ]\n"
- "\n"
-
--#: ../clients/cli/general.c:450
-+#: ../clients/cli/general.c:421
- #, c-format
- msgid ""
- "Usage: nmcli radio all { ARGUMENTS | help }\n"
-@@ -3370,7 +3375,7 @@ msgstr "Usage: nmcli radio all { ARGUMENTS | help }\n"
- "Obtient le statut de tous les interrupteurs radios, les activer ou désactiver.\n"
- "\n"
-
--#: ../clients/cli/general.c:460
-+#: ../clients/cli/general.c:431
- #, c-format
- msgid ""
- "Usage: nmcli radio wifi { ARGUMENTS | help }\n"
-@@ -3386,7 +3391,7 @@ msgstr "Syntaxe : nmcli radio wifi { ARGUMENTS | help }\n"
- "Obtient le statut de l'interrupteur radio Wi-Fi, l'activer ou le désactiver.\n"
- "\n"
-
--#: ../clients/cli/general.c:470
-+#: ../clients/cli/general.c:441
- #, c-format
- msgid ""
- "Usage: nmcli radio wwan { ARGUMENTS | help }\n"
-@@ -3402,7 +3407,7 @@ msgstr "Syntaxe : nmcli radio wwan { ARGUMENTS | help }\n"
- "Obtient le statut de l'interrupteur radio du haut débit mobile, l'activer ou le désactiver.\n"
- "\n"
-
--#: ../clients/cli/general.c:480
-+#: ../clients/cli/general.c:451
- #, c-format
- msgid ""
- "Usage: nmcli monitor\n"
-@@ -3416,203 +3421,219 @@ msgstr "Syntaxe : nmcli monitor\n"
- "Imprime une ligne à chaque changement du NetworkManager\n"
- "\n"
-
--#: ../clients/cli/general.c:510
-+#: ../clients/cli/general.c:481
- msgid "NetworkManager status"
- msgstr "État de NetworkManager"
-
--#: ../clients/cli/general.c:514
-+#: ../clients/cli/general.c:485
- #, c-format
- msgid "Error: only these fields are allowed: %s"
- msgstr "Erreur : seuls ces champs sont autorisés : %s"
-
--#: ../clients/cli/general.c:567
-+#. NetworkManager quit while we were waiting.
-+#: ../clients/cli/general.c:541 ../clients/tui/nmtui.c:246
-+#, c-format
-+msgid "NetworkManager is not running."
-+msgstr "NetworkManager n'est pas en cours d'exécution."
-+
-+#: ../clients/cli/general.c:563
- msgid "NetworkManager permissions"
- msgstr "Permissions NetworkManager"
-
--#: ../clients/cli/general.c:571
-+#: ../clients/cli/general.c:567
- #, c-format
- msgid "Error: 'general permissions': %s"
- msgstr "Erreur : « general permissions » : %s"
-
--#: ../clients/cli/general.c:664
--#, fuzzy, c-format
-+#: ../clients/cli/general.c:644
-+#, c-format
- msgid "Error: invalid reload flag '%s'. Allowed flags are: %s"
- msgstr "Erreur : drapeau de rechargement non valide «%s». Les drapeaux autorisés sont : "
-
--#: ../clients/cli/general.c:674
-+#: ../clients/cli/general.c:655
- #, c-format
- msgid "Error: extra argument '%s'"
- msgstr "Erreur : argument supplémentaire « %s »."
-
--#: ../clients/cli/general.c:688
-+#: ../clients/cli/general.c:670
- #, c-format
- msgid "Error: failed to reload: %s"
- msgstr "Erreur : n'a pas pu cherger à nouveau « %s »"
-
--#: ../clients/cli/general.c:727
-+#: ../clients/cli/general.c:708
- msgid "NetworkManager logging"
- msgstr "Journalisation NetworkManager"
-
--#: ../clients/cli/general.c:731
-+#: ../clients/cli/general.c:712
- #, c-format
- msgid "Error: 'general logging': %s"
- msgstr "Erreur : « general logging » : %s"
-
--#: ../clients/cli/general.c:813
-+#: ../clients/cli/general.c:744
- #, c-format
- msgid "Error: failed to set logging: %s"
- msgstr "Erreur : accès refusé pour définir la journalisation : %s"
-
--#: ../clients/cli/general.c:830
-+#: ../clients/cli/general.c:834
- #, 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:900
-+#: ../clients/cli/general.c:895
- #, 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:925
-+#: ../clients/cli/general.c:920
- #, c-format
- msgid "Error: invalid '%s' argument: '%s' (use on/off)."
- msgstr "Erreur : argument « %s » non valide : « %s » (utilisez marche/arrêt)."
-
-+#: ../clients/cli/general.c:943
-+#, c-format
-+msgid "Error: failed to set networking: %s"
-+msgstr "Erreur : échec de la mise en réseau : %s"
-+
- #. no arguments -> get current state
--#: ../clients/cli/general.c:973 ../clients/cli/general.c:985
-+#: ../clients/cli/general.c:988 ../clients/cli/general.c:1000
- msgid "Connectivity"
- msgstr "Connectivité"
-
--#: ../clients/cli/general.c:988
-+#: ../clients/cli/general.c:1003
- #, c-format
- msgid "Error: 'networking' command '%s' is not valid."
- msgstr "Erreur : commande « networking » « %s » non valide."
-
--#: ../clients/cli/general.c:1002
-+#: ../clients/cli/general.c:1015
- msgid "Networking"
- msgstr "Réseau"
-
- #. no argument, show all radio switches
--#: ../clients/cli/general.c:1037
-+#: ../clients/cli/general.c:1043
- msgid "Radio switches"
- msgstr "Interrupteurs radio"
-
-+#: ../clients/cli/general.c:1068
-+#, c-format
-+msgid "Error: failed to set Wi-Fi radio: %s"
-+msgstr "Erreur : échec du réglage de la radio Wi-Fi : %s"
-+
- #. no argument, show current Wi-Fi state
--#: ../clients/cli/general.c:1067
-+#: ../clients/cli/general.c:1086
- msgid "Wi-Fi radio switch"
- msgstr "Interrupteur radio Wi-Fi"
-
- #. no argument, show current WWAN (mobile broadband) state
--#: ../clients/cli/general.c:1094
-+#: ../clients/cli/general.c:1122
- msgid "WWAN radio switch"
- msgstr "Interrupteur radio WWAN"
-
--#: ../clients/cli/general.c:1142
-+#: ../clients/cli/general.c:1162
- msgid "NetworkManager has started"
- msgstr "Le NetworkManager a démarré"
-
--#: ../clients/cli/general.c:1142
-+#: ../clients/cli/general.c:1162
- msgid "NetworkManager has stopped"
- msgstr "Le NetworkManager est arrêté"
-
--#: ../clients/cli/general.c:1153
-+#: ../clients/cli/general.c:1173
- #, c-format
- msgid "Hostname set to '%s'\n"
- msgstr "Nom d'hôte défini à « %s »\n"
-
--#: ../clients/cli/general.c:1168
-+#: ../clients/cli/general.c:1188
- #, c-format
- msgid "'%s' is now the primary connection\n"
- msgstr "« %s » est la connexion primaire.\n"
-
--#: ../clients/cli/general.c:1170
-+#: ../clients/cli/general.c:1190
- #, c-format
- msgid "There's no primary connection\n"
- msgstr "Il n'y a pas de connexion primaire\n"
-
--#: ../clients/cli/general.c:1182
-+#: ../clients/cli/general.c:1202
- #, c-format
- msgid "Connectivity is now '%s'\n"
- msgstr "La connectivité est « %s » maintenant\n"
-
--#: ../clients/cli/general.c:1196
-+#: ../clients/cli/general.c:1216
- #, 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:1216
-+#: ../clients/cli/general.c:1236
- msgid "connection available"
- msgstr "connexion disponible"
-
--#: ../clients/cli/general.c:1218
-+#: ../clients/cli/general.c:1238
- msgid "connections available"
- msgstr "connexions disponibles"
-
--#: ../clients/cli/general.c:1236
-+#: ../clients/cli/general.c:1256
- msgid "autoconnect"
- msgstr "connexion automatique"
-
--#: ../clients/cli/general.c:1238
-+#: ../clients/cli/general.c:1258
- msgid "fw missing"
- msgstr "fw manquant"
-
--#: ../clients/cli/general.c:1243
-+#: ../clients/cli/general.c:1263
- msgid "plugin missing"
- msgstr "greffon manquant"
-
--#: ../clients/cli/general.c:1253 ../clients/cli/general.c:1267
-+#: ../clients/cli/general.c:1273 ../clients/cli/general.c:1287
- msgid "sw disabled"
- msgstr "sw désactivé"
-
--#: ../clients/cli/general.c:1258 ../clients/cli/general.c:1272
-+#: ../clients/cli/general.c:1278 ../clients/cli/general.c:1292
- msgid "hw disabled"
- msgstr "hw désactivé"
-
--#: ../clients/cli/general.c:1283
-+#: ../clients/cli/general.c:1303
- msgid "sw"
- msgstr "sw"
-
--#: ../clients/cli/general.c:1285
-+#: ../clients/cli/general.c:1305
- msgid "hw"
- msgstr "hw"
-
--#: ../clients/cli/general.c:1290
-+#: ../clients/cli/general.c:1310
- msgid "iface"
- msgstr "iface"
-
--#: ../clients/cli/general.c:1293
-+#: ../clients/cli/general.c:1313
- msgid "port"
- msgstr "port"
-
--#: ../clients/cli/general.c:1296
-+#: ../clients/cli/general.c:1316
- msgid "mtu"
- msgstr "mtu"
-
--#: ../clients/cli/general.c:1313
-+#: ../clients/cli/general.c:1333
- msgid "master"
- msgstr "master"
-
--#: ../clients/cli/general.c:1317 ../clients/tui/nm-editor-utils.c:235
-+#: ../clients/cli/general.c:1337 ../clients/tui/nm-editor-utils.c:230
- #: ../clients/tui/nmt-connect-connection-list.c:394
- msgid "VPN"
- msgstr "VPN"
-
--#: ../clients/cli/general.c:1319
-+#: ../clients/cli/general.c:1339
- msgid "ip4 default"
- msgstr "ip4 par défaut"
-
--#: ../clients/cli/general.c:1321
-+#: ../clients/cli/general.c:1341
- msgid "ip6 default"
- msgstr "ip6 par défaut"
-
--#: ../clients/cli/general.c:1403
-+#: ../clients/cli/general.c:1417
- #, c-format
- msgid "%s VPN connection"
- msgstr "Connexion VPN « %s »"
-
- #. TRANSLATORS: prints header line for activated device in plain `nmcli` overview output as
- #. * "<interface-name>: <device-state> to <connection-id>"
--#: ../clients/cli/general.c:1423
-+#: ../clients/cli/general.c:1436
- #, c-format
- msgctxt "nmcli-overview"
- msgid "%s: %s to %s"
-@@ -3620,13 +3641,13 @@ msgstr "%s: %s à %s"
-
- #. TRANSLATORS: prints header line for not active device in plain `nmcli` overview output as
- #. * "<interface-name>: <device-state>"
--#: ../clients/cli/general.c:1430
-+#: ../clients/cli/general.c:1443
- #, c-format
- msgctxt "nmcli-overview"
- msgid "%s: %s"
- msgstr "%s: %s"
-
--#: ../clients/cli/general.c:1480
-+#: ../clients/cli/general.c:1493
- #, c-format
- msgid ""
- "Use \"nmcli device show\" to get complete information about known devices "
-@@ -3639,16 +3660,16 @@ msgstr "Utilisez « nmcli device show » pour obtenir des informations complè
- "\n"
- "Consultez les pages de manuel nmcli(1) et nmcli-examples(7) pour les détails complets d'utilisation.\n"
-
--#: ../clients/cli/general.c:1501
-+#: ../clients/cli/general.c:1509
- #, c-format
- msgid "Error: 'monitor' command '%s' is not valid."
- msgstr "Erreur : commande « monitor » « %s » non valide."
-
--#: ../clients/cli/general.c:1513
-+#: ../clients/cli/general.c:1521
- 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:230
-+#: ../clients/cli/nmcli.c:233
- #, c-format
- msgid ""
- "Usage: nmcli [OPTIONS] OBJECT { COMMAND | help }\n"
-@@ -3706,97 +3727,92 @@ msgstr "Usage : nmcli [OPTIONS] OBJECT { COMMAND | help }\n"
- " m[onitor] monitor NetworkManager changes\n"
- "\n"
-
--#: ../clients/cli/nmcli.c:310
-+#: ../clients/cli/nmcli.c:308
- #, c-format
- msgid "Error: missing argument for '%s' option."
- msgstr "Erreur : paramètre manquant pour l'option « %s »."
-
--#: ../clients/cli/nmcli.c:618
-+#: ../clients/cli/nmcli.c:621
- #, c-format
- msgid "Unexpected end of file following '%s'\n"
- msgstr "Fin inattendue du fichier après « %s »\n"
-
--#: ../clients/cli/nmcli.c:626
-+#: ../clients/cli/nmcli.c:629
- #, c-format
- msgid "Expected whitespace following '%s'\n"
- msgstr "Espacement prévu après « %s »\n"
-
--#: ../clients/cli/nmcli.c:638
-+#: ../clients/cli/nmcli.c:641
- #, c-format
- msgid "Expected a value for '%s'\n"
- msgstr "Valeur attendue pour « %s »\n"
-
--#: ../clients/cli/nmcli.c:652
-+#: ../clients/cli/nmcli.c:655
- #, 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:741
-+#: ../clients/cli/nmcli.c:761
- #, 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:746
-+#: ../clients/cli/nmcli.c:766
- #, c-format
- msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
- msgstr "Erreur : option « --terse » mutuellement exclusive avec « --pretty »."
-
--#: ../clients/cli/nmcli.c:754
-+#: ../clients/cli/nmcli.c:774
- #, 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:759
-+#: ../clients/cli/nmcli.c:779
- #, c-format
- msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
- msgstr "Erreur : option « --pretty » mutuellement exclusive avec « --terse »."
-
--#: ../clients/cli/nmcli.c:774
-+#: ../clients/cli/nmcli.c:794
- #, 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:788 ../clients/cli/nmcli.c:800
-+#: ../clients/cli/nmcli.c:808 ../clients/cli/nmcli.c:820
- #, 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:824
-+#: ../clients/cli/nmcli.c:844
- #, 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:831
-+#: ../clients/cli/nmcli.c:851
- #, c-format
- msgid "nmcli tool, version %s\n"
- msgstr "outil nmcli, version %s\n"
-
--#: ../clients/cli/nmcli.c:839
-+#: ../clients/cli/nmcli.c:859
- #, c-format
- msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
- msgstr "Erreur : option « %s » inconnue, essayez « nmcli -help »."
-
--#: ../clients/cli/nmcli.c:895 ../clients/cli/nmcli.c:902
-+#: ../clients/cli/nmcli.c:915 ../clients/cli/nmcli.c:922
- #, c-format
- msgid "Error: nmcli terminated by signal %s (%d)"
- msgstr "Erreur : nmcli terminé par le signal %s (%d)"
-
--#: ../clients/cli/nmcli.c:968
-+#: ../clients/cli/nmcli.c:990
- msgid "Success"
- msgstr "Succès"
-
--#: ../clients/cli/polkit-agent.c:54
--#, c-format
--msgid "Authentication message: %s\n"
--msgstr "Message d'authentication : %s\n"
--
--#: ../clients/cli/polkit-agent.c:62
-+#: ../clients/cli/polkit-agent.c:41
- #, c-format
--msgid "Authentication error: %s\n"
--msgstr "Erreur d'authentication : %s\n"
-+msgid "Error: polkit agent failed: %s\n"
-+msgstr "Erreur : l'agent polkit a échoué : %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:122
-+#: ../clients/cli/polkit-agent.c:99
- #, c-format
- msgid "Warning: polkit agent initialization failed: %s\n"
- msgstr "Warning: l'initialisation de l'agent polkit a échoué : %s\n"
-@@ -3851,19 +3867,19 @@ msgstr "Avertissement : %s\n"
- msgid "Info: %s\n"
- msgstr "Info : %s\n"
-
--#: ../clients/cli/settings.c:490
-+#: ../clients/cli/settings.c:488
- 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:580
-+#: ../clients/cli/settings.c:578
- msgid "the property can't be changed"
- msgstr "la propriété ne peut pas être modifiée"
-
--#: ../clients/cli/settings.c:658
-+#: ../clients/cli/settings.c:656
- msgid "[NM property description]"
- msgstr "[description de la propriété NM]"
-
--#: ../clients/cli/settings.c:668
-+#: ../clients/cli/settings.c:666
- msgid "[nmcli specific description]"
- msgstr "[description spécifique de nmcli]"
-
-@@ -3877,61 +3893,61 @@ msgstr "Erreur : l'argument « %s » était attendu, mais « %s » a été
- msgid "Error: Unexpected argument '%s'"
- msgstr "Erreur : argument « %s » inattendu"
-
--#: ../clients/cli/utils.c:695
-+#: ../clients/cli/utils.c:691
- #, c-format
- msgid "invalid field '%s%s%s'; no such field"
- msgstr "champ « %s%s%s » invalide ; champ inconnu"
-
--#: ../clients/cli/utils.c:699
-+#: ../clients/cli/utils.c:695
- #, 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:795
-+#: ../clients/cli/utils.c:791
- #, c-format
- msgid "failure to select field"
- msgstr "Impossible de sélectionner le champ"
-
--#: ../clients/cli/utils.c:1424
-+#: ../clients/cli/utils.c:1427
- #, c-format
- msgid "Error reading nmcli output: %s\n"
- msgstr "Erreur de lecture de la sortie nmcli : %s\n"
-
--#: ../clients/cli/utils.c:1429
-+#: ../clients/cli/utils.c:1432
- #, c-format
- msgid "Error writing nmcli output: %s\n"
- msgstr "Erreur d'écriture de la sortie nmcli : %s\n"
-
--#: ../clients/cli/utils.c:1455
-+#: ../clients/cli/utils.c:1458
- #, 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:1464
-+#: ../clients/cli/utils.c:1467
- #, c-format
- msgid "Failed to fork pager: %s\n"
- msgstr "Échec du fork pager : %s\n"
-
--#: ../clients/cli/utils.c:1511 ../clients/cli/utils.c:1515
-+#: ../clients/cli/utils.c:1514 ../clients/cli/utils.c:1518
- #, 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:297 ../clients/common/nm-meta-setting-desc.c:4136
-+#: ../clients/cli/utils.h:300 ../clients/common/nm-meta-setting-desc.c:4129
- msgid "on"
- msgstr "marche"
-
--#: ../clients/cli/utils.h:297 ../clients/common/nm-meta-setting-desc.c:4138
-+#: ../clients/cli/utils.h:300 ../clients/common/nm-meta-setting-desc.c:4130
- msgid "off"
- msgstr "arrêt"
-
--#: ../clients/cli/utils.h:323
-+#: ../clients/cli/utils.h:326
- #, c-format
- msgid "%lld (%s)"
- msgstr "%lld (%s)"
-
--#: ../clients/cli/utils.h:330
-+#: ../clients/cli/utils.h:333
- #, c-format
- msgid "%lld - %s"
- msgstr "%lld - %s"
-@@ -3939,465 +3955,512 @@ 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:107
--#: ../clients/common/nm-client-utils.c:138
-+#: ../clients/common/nm-client-utils.c:109
-+#: ../clients/common/nm-client-utils.c:140
- #, c-format
- msgid "'%s' is ambiguous (%s)"
- msgstr "« %s » est ambigu (%s)"
-
--#: ../clients/common/nm-client-utils.c:117
-+#: ../clients/common/nm-client-utils.c:119
- #, 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:150
-+#: ../clients/common/nm-client-utils.c:152
- #, 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:199
-+#: ../clients/common/nm-client-utils.c:201
- #, c-format
- msgid "'%s' is ambiguous: %s"
- msgstr "« %s » est ambigu : %s"
-
--#: ../clients/common/nm-client-utils.c:209
-+#: ../clients/common/nm-client-utils.c:211
- #, c-format
- msgid "missing name, try one of [%s]"
- msgstr "nom manquant, essayez l'un de [%s]"
-
--#: ../clients/common/nm-client-utils.c:251
-+#: ../clients/common/nm-client-utils.c:253
- msgid "unmanaged"
- msgstr "non-géré"
-
--#: ../clients/common/nm-client-utils.c:252
-+#: ../clients/common/nm-client-utils.c:254
- msgid "unavailable"
- msgstr "indisponible"
-
--#: ../clients/common/nm-client-utils.c:254
-+#: ../clients/common/nm-client-utils.c:256
- msgid "connecting (prepare)"
- msgstr "connexion (préparation)"
-
--#: ../clients/common/nm-client-utils.c:255
-+#: ../clients/common/nm-client-utils.c:257
- msgid "connecting (configuring)"
- msgstr "connexion (configuration)"
-
--#: ../clients/common/nm-client-utils.c:256
-+#: ../clients/common/nm-client-utils.c:258
- msgid "connecting (need authentication)"
- msgstr "connexion (authentification requise)"
-
--#: ../clients/common/nm-client-utils.c:257
-+#: ../clients/common/nm-client-utils.c:259
- msgid "connecting (getting IP configuration)"
- msgstr "connexion (obtention de la configuration IP)"
-
--#: ../clients/common/nm-client-utils.c:258
-+#: ../clients/common/nm-client-utils.c:260
- msgid "connecting (checking IP connectivity)"
- msgstr "connexion (contrôle de la connectivité IP)"
-
--#: ../clients/common/nm-client-utils.c:259
-+#: ../clients/common/nm-client-utils.c:261
- msgid "connecting (starting secondary connections)"
- msgstr "connexion (démarrage des connexions secondaires)"
-
--#: ../clients/common/nm-client-utils.c:262
-+#: ../clients/common/nm-client-utils.c:264
- msgid "connection failed"
- msgstr "échec de la connexion"
-
--#: ../clients/common/nm-client-utils.c:270
-+#: ../clients/common/nm-client-utils.c:271
-+#: ../clients/common/nm-client-utils.c:272
-+#: ../clients/common/nm-client-utils.c:273
-+#: ../clients/common/nm-client-utils.c:274
-+#: ../clients/common/nm-client-utils.c:275
-+#: ../clients/common/nm-client-utils.c:276
-+msgid "connecting (externally)"
-+msgstr "connexion (externe)"
-+
-+#: ../clients/common/nm-client-utils.c:277
-+msgid "connected (externally)"
-+msgstr "connecté (en externe)"
-+
-+#: ../clients/common/nm-client-utils.c:278
-+#: ../clients/common/nm-client-utils.c:279
-+msgid "deactivating (externally)"
-+msgstr "désactivation (externe)"
-+
-+#: ../clients/common/nm-client-utils.c:304
- msgid "yes (guessed)"
- msgstr "oui (deviné)"
-
--#: ../clients/common/nm-client-utils.c:271
-+#: ../clients/common/nm-client-utils.c:305
- 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:277
--#: ../clients/common/nm-client-utils.c:350 ../libnm/nm-device.c:1514
-+#: ../clients/common/nm-client-utils.c:311
-+#: ../clients/common/nm-client-utils.c:384 ../libnm/nm-device.c:1628
- msgid "Unknown"
- msgstr "Inconnu"
-
--#: ../clients/common/nm-client-utils.c:278
-+#: ../clients/common/nm-client-utils.c:312
- msgid "No reason given"
- msgstr "Aucun raison donnée"
-
--#: ../clients/common/nm-client-utils.c:280
-+#: ../clients/common/nm-client-utils.c:314
- 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:281
-+#: ../clients/common/nm-client-utils.c:315
- 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:282
-+#: ../clients/common/nm-client-utils.c:316
- 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:283
-+#: ../clients/common/nm-client-utils.c:317
- msgid ""
- "IP configuration could not be reserved (no available address, timeout, etc.)"
- msgstr "La configuration IP n'a pas pu être réservée (aucun adresse disponible, délai d'expiration, etc. )"
-
- # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
--#: ../clients/common/nm-client-utils.c:284
-+#: ../clients/common/nm-client-utils.c:318
- 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:285
-+#: ../clients/common/nm-client-utils.c:319
- 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:286
-+#: ../clients/common/nm-client-utils.c:320
- 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:287
-+#: ../clients/common/nm-client-utils.c:321
- 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:288
-+#: ../clients/common/nm-client-utils.c:322
- 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:289
-+#: ../clients/common/nm-client-utils.c:323
- 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:290
-+#: ../clients/common/nm-client-utils.c:324
- 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:291
-+#: ../clients/common/nm-client-utils.c:325
- 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:292
-+#: ../clients/common/nm-client-utils.c:326
- 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:293
-+#: ../clients/common/nm-client-utils.c:327
- 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:294
-+#: ../clients/common/nm-client-utils.c:328
- 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:295
-+#: ../clients/common/nm-client-utils.c:329
- 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:296
-+#: ../clients/common/nm-client-utils.c:330
- 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:297
-+#: ../clients/common/nm-client-utils.c:331
- 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:298
-+#: ../clients/common/nm-client-utils.c:332
- 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:299
-+#: ../clients/common/nm-client-utils.c:333
- 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:300
-+#: ../clients/common/nm-client-utils.c:334
- 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:301
-+#: ../clients/common/nm-client-utils.c:335
- 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:302
-+#: ../clients/common/nm-client-utils.c:336
- 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:303
-+#: ../clients/common/nm-client-utils.c:337
- 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:304
-+#: ../clients/common/nm-client-utils.c:338
- 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:305
-+#: ../clients/common/nm-client-utils.c:339
- 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:306
-+#: ../clients/common/nm-client-utils.c:340
- 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:307
-+#: ../clients/common/nm-client-utils.c:341
- 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:308
-+#: ../clients/common/nm-client-utils.c:342
- 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:309
-+#: ../clients/common/nm-client-utils.c:343
- 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:310
-+#: ../clients/common/nm-client-utils.c:344
- 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:311
-+#: ../clients/common/nm-client-utils.c:345
- 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:312
-+#: ../clients/common/nm-client-utils.c:346
- 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:313
-+#: ../clients/common/nm-client-utils.c:347
- 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:314
-+#: ../clients/common/nm-client-utils.c:348
- 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:315
-+#: ../clients/common/nm-client-utils.c:349
- 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:316
-+#: ../clients/common/nm-client-utils.c:350
- 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:317
-+#: ../clients/common/nm-client-utils.c:351
- 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:318
-+#: ../clients/common/nm-client-utils.c:352
- 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:319
-+#: ../clients/common/nm-client-utils.c:353
- 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:320
-+#: ../clients/common/nm-client-utils.c:354
- 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:321
-+#: ../clients/common/nm-client-utils.c:355
- 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:322
-+#: ../clients/common/nm-client-utils.c:356
- 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:323
-+#: ../clients/common/nm-client-utils.c:357
- 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:324
-+#: ../clients/common/nm-client-utils.c:358
- 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:325
-+#: ../clients/common/nm-client-utils.c:359
- 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:326
-+#: ../clients/common/nm-client-utils.c:360
- 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:327
-+#: ../clients/common/nm-client-utils.c:361
- 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:328
-+#: ../clients/common/nm-client-utils.c:362
- 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:329
-+#: ../clients/common/nm-client-utils.c:363
- 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:330
-+#: ../clients/common/nm-client-utils.c:364
- 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:331
-+#: ../clients/common/nm-client-utils.c:365
- 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:332
-+#: ../clients/common/nm-client-utils.c:366
- 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:333
-+#: ../clients/common/nm-client-utils.c:367
- msgid "DCB or FCoE setup failed"
- msgstr "L'installation DCB ou FCoE a échoué"
-
--#: ../clients/common/nm-client-utils.c:334
-+#: ../clients/common/nm-client-utils.c:368
- msgid "teamd control failed"
- msgstr "échec du contrôle teamd"
-
--#: ../clients/common/nm-client-utils.c:335
-+#: ../clients/common/nm-client-utils.c:369
- msgid "Modem failed or no longer available"
- msgstr "Le modem est en échec ou n'est plus disponible"
-
--#: ../clients/common/nm-client-utils.c:336
-+#: ../clients/common/nm-client-utils.c:370
- msgid "Modem now ready and available"
- msgstr "Le modem est prêt et disponible"
-
--#: ../clients/common/nm-client-utils.c:337
-+#: ../clients/common/nm-client-utils.c:371
- msgid "SIM PIN was incorrect"
- msgstr "Le code PIN de la SIM est incorrect"
-
--#: ../clients/common/nm-client-utils.c:338
-+#: ../clients/common/nm-client-utils.c:372
- 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:339
-+#: ../clients/common/nm-client-utils.c:373
- msgid "The device's parent changed"
- msgstr "Le parent du périphérique a changé"
-
--#: ../clients/common/nm-client-utils.c:340
-+#: ../clients/common/nm-client-utils.c:374
- msgid "The device parent's management changed"
- msgstr "Le gestionnaire du périphérique parent a changé"
-
--#: ../clients/common/nm-client-utils.c:341
-+#: ../clients/common/nm-client-utils.c:375
- msgid "Open vSwitch database connection failed"
- msgstr "Echec de la connexion à la base de données Open vSwitch"
-
--#: ../clients/common/nm-client-utils.c:342
-+#: ../clients/common/nm-client-utils.c:376
- msgid "A duplicate IP address was detected"
- msgstr "Une adresse IP en double a été détectée"
-
--#: ../clients/common/nm-client-utils.c:343
-+#: ../clients/common/nm-client-utils.c:377
- 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:344
-+#: ../clients/common/nm-client-utils.c:378
- msgid "Failed to configure SR-IOV parameters"
- msgstr "Échec de la configuration des paramètres SR-IOV"
-
--#: ../clients/common/nm-client-utils.c:345
-+#: ../clients/common/nm-client-utils.c:379
- msgid "The Wi-Fi P2P peer could not be found"
- msgstr "L'homologue Wi-Fi P2P n'a pas pu être trouvé"
-
--#: ../clients/common/nm-client-utils.c:351
-+#: ../clients/common/nm-client-utils.c:385
- msgid "Unknown reason"
- msgstr "Raison inconnue"
-
--#: ../clients/common/nm-client-utils.c:352
-+#: ../clients/common/nm-client-utils.c:386
- msgid "The connection was disconnected"
- msgstr "La connexion a été déconnectée"
-
--#: ../clients/common/nm-client-utils.c:353
-+#: ../clients/common/nm-client-utils.c:387
- msgid "Disconnected by user"
- msgstr "Déconnecté par l'utilisateur"
-
--#: ../clients/common/nm-client-utils.c:354
-+#: ../clients/common/nm-client-utils.c:388
- msgid "The base network connection was interrupted"
- msgstr "La connexion réseau de base a été interrompue"
-
--#: ../clients/common/nm-client-utils.c:355
-+#: ../clients/common/nm-client-utils.c:389
- msgid "The VPN service stopped unexpectedly"
- msgstr "Arrêt inattendu du service VPN"
-
--#: ../clients/common/nm-client-utils.c:356
-+#: ../clients/common/nm-client-utils.c:390
- msgid "The VPN service returned invalid configuration"
- msgstr "Le service VPN a retourné une configuration non valide"
-
--#: ../clients/common/nm-client-utils.c:357
-+#: ../clients/common/nm-client-utils.c:391
- 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:358
-+#: ../clients/common/nm-client-utils.c:392
- 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:359
-+#: ../clients/common/nm-client-utils.c:393
- msgid "The VPN service failed to start"
- msgstr "Échec du démarrage du service VPN"
-
--#: ../clients/common/nm-client-utils.c:360
-+#: ../clients/common/nm-client-utils.c:394
- msgid "No valid secrets"
- msgstr "Aucun secret valide"
-
--#: ../clients/common/nm-client-utils.c:361
-+#: ../clients/common/nm-client-utils.c:395
- msgid "Invalid secrets"
- msgstr "Secrets non valides"
-
--#: ../clients/common/nm-client-utils.c:362
-+#: ../clients/common/nm-client-utils.c:396
- msgid "The connection was removed"
- msgstr "La connexion a été supprimée"
-
--#: ../clients/common/nm-client-utils.c:363
-+#: ../clients/common/nm-client-utils.c:397
- msgid "Master connection failed"
- msgstr "Échec de la connexion maître"
-
--#: ../clients/common/nm-client-utils.c:364
-+#: ../clients/common/nm-client-utils.c:398
- 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:365
-+#: ../clients/common/nm-client-utils.c:399
- msgid "The device disappeared"
- msgstr "Le périphérique a disparu"
-
-+#: ../clients/common/nm-client-utils.c:722
-+msgid "missing colon for \"<setting>.<property>:<secret>\" format"
-+msgstr "deux points manquants pour le format \"<setting>.<property>:<secret>\" "
-+
-+#: ../clients/common/nm-client-utils.c:738
-+msgid "missing dot for \"<setting>.<property>:<secret>\" format"
-+msgstr "point manquant pour le format \"<setting>.<property>:<secret>\" "
-+
-+#: ../clients/common/nm-client-utils.c:743
-+msgid "missing setting for \"<setting>.<property>:<secret>\" format"
-+msgstr "paramètre manquant pour le format \"<setting>.<property>:<secret>\" "
-+
-+#: ../clients/common/nm-client-utils.c:753
-+msgid "missing property for \"<setting>.<property>:<secret>\" format"
-+msgstr "propriété manquante pour le format \"<setting>.<property>:<secret>\" "
-+
-+#: ../clients/common/nm-client-utils.c:764
-+msgid "invalid setting name"
-+msgstr "nom de paramètre non valide"
-+
-+#: ../clients/common/nm-client-utils.c:780
-+msgid "property name is not UTF-8"
-+msgstr "le nom de la propriété n'est pas UTF-8"
-+
-+#: ../clients/common/nm-client-utils.c:795
-+#: ../clients/common/nm-client-utils.c:802
-+msgid "secret is not UTF-8"
-+msgstr "le secret n'est pas UTF-8"
-+
- #: ../clients/common/nm-meta-setting-access.c:496
- #, c-format
- msgid "field '%s' has to be alone"
-@@ -4408,206 +4471,208 @@ msgstr "champ « %s » doit être seul"
- 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:297
--#: ../clients/common/nm-meta-setting-desc.c:358
-+#: ../clients/common/nm-meta-setting-desc.c:276
-+#: ../clients/common/nm-meta-setting-desc.c:337
- #, c-format
- msgid "invalid prefix '%s'; <1-%d> allowed"
- msgstr "préfixe invalide « %s »; <1-%d> autorisé"
-
--#: ../clients/common/nm-meta-setting-desc.c:305
-+#: ../clients/common/nm-meta-setting-desc.c:284
- #, c-format
- msgid "invalid IP address: %s"
- msgstr "adresse IP invalide : %s"
-
--#: ../clients/common/nm-meta-setting-desc.c:330
-+#: ../clients/common/nm-meta-setting-desc.c:309
- msgid ""
- "The valid syntax is: 'ip[/prefix] [next-hop] [metric] [attribute=val]... [,"
- "ip[/prefix] ...]'"
- msgstr "La syntaxe valide est : 'ip[/prefix][next-hop][metric][attribute=val]... [,ip[/prefix] ....]’"
-
--#: ../clients/common/nm-meta-setting-desc.c:369
-+#: ../clients/common/nm-meta-setting-desc.c:348
- #, 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:375
-+#: ../clients/common/nm-meta-setting-desc.c:354
- #, 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:423
-+#: ../clients/common/nm-meta-setting-desc.c:402
- #, c-format
- msgid "invalid route: %s. %s"
- msgstr "route non valide : %s. %s"
-
--#: ../clients/common/nm-meta-setting-desc.c:489
-+#: ../clients/common/nm-meta-setting-desc.c:468
- #, 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:496
-+#: ../clients/common/nm-meta-setting-desc.c:475
- #, 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:509
-+#: ../clients/common/nm-meta-setting-desc.c:488
- #, 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:512
-+#: ../clients/common/nm-meta-setting-desc.c:491
- #, c-format
- msgid "Not a valid PAC Script"
- msgstr "Script PAC non valide"
-
--#: ../clients/common/nm-meta-setting-desc.c:565
-+#: ../clients/common/nm-meta-setting-desc.c:544
- #, 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:572
-+#: ../clients/common/nm-meta-setting-desc.c:551
- #, 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:1029
-+#: ../clients/common/nm-meta-setting-desc.c:1036
- msgid "auto"
- msgstr "auto"
-
--#: ../clients/common/nm-meta-setting-desc.c:1181
-+#: ../clients/common/nm-meta-setting-desc.c:1188
- #, c-format
- msgid "%s (%s)"
- msgstr "%s (%s)"
-
--#: ../clients/common/nm-meta-setting-desc.c:1329
--#: ../clients/common/nm-meta-setting-desc.c:1333
-+#: ../clients/common/nm-meta-setting-desc.c:1352
-+#: ../clients/common/nm-meta-setting-desc.c:1356
-+#: ../clients/common/nm-meta-setting-desc.c:4153
- msgid "'%s' is out of range [%"
- msgstr "« %s » est en dehors de la plage [%"
-
--#: ../clients/common/nm-meta-setting-desc.c:1338
-+#: ../clients/common/nm-meta-setting-desc.c:1361
- #, c-format
- msgid "'%s' is not a valid number"
- msgstr "« %s » n'est pas un nombre valide"
-
--#: ../clients/common/nm-meta-setting-desc.c:1395
-+#: ../clients/common/nm-meta-setting-desc.c:1418
- #, 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:1441
-+#: ../clients/common/nm-meta-setting-desc.c:1464
- #, 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:1567
-+#: ../clients/common/nm-meta-setting-desc.c:1590
- #, 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:1572 ../libnm-core/nm-keyfile.c:926
-+#: ../clients/common/nm-meta-setting-desc.c:1595
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1076
- #, 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:1691
-+#: ../clients/common/nm-meta-setting-desc.c:1714
- #, c-format
- msgid "%d (key)"
- msgstr "%d (clé)"
-
--#: ../clients/common/nm-meta-setting-desc.c:1693
-+#: ../clients/common/nm-meta-setting-desc.c:1716
- #, c-format
- msgid "%d (passphrase)"
- msgstr "%d (phrase de passe)"
-
--#: ../clients/common/nm-meta-setting-desc.c:1696
-+#: ../clients/common/nm-meta-setting-desc.c:1719
- #, c-format
- msgid "%d (unknown)"
- msgstr "%d (inconnu)"
-
--#: ../clients/common/nm-meta-setting-desc.c:1709
-+#: ../clients/common/nm-meta-setting-desc.c:1732
- msgid "0 (NONE)"
- msgstr "0 (AUCUN)"
-
--#: ../clients/common/nm-meta-setting-desc.c:1715
-+#: ../clients/common/nm-meta-setting-desc.c:1738
- msgid "REORDER_HEADERS, "
- msgstr "REORDER_HEADERS, "
-
--#: ../clients/common/nm-meta-setting-desc.c:1717
-+#: ../clients/common/nm-meta-setting-desc.c:1740
- msgid "GVRP, "
- msgstr "GVRP, "
-
--#: ../clients/common/nm-meta-setting-desc.c:1719
-+#: ../clients/common/nm-meta-setting-desc.c:1742
- msgid "LOOSE_BINDING, "
- msgstr "LOOSE_BINDING, "
-
--#: ../clients/common/nm-meta-setting-desc.c:1721
-+#: ../clients/common/nm-meta-setting-desc.c:1744
- msgid "MVRP, "
- msgstr "MVRP, "
-
--#: ../clients/common/nm-meta-setting-desc.c:1742
-+#: ../clients/common/nm-meta-setting-desc.c:1765
- msgid "0 (none)"
- msgstr "0 (aucun)"
-
--#: ../clients/common/nm-meta-setting-desc.c:1748
-+#: ../clients/common/nm-meta-setting-desc.c:1771
- msgid "agent-owned, "
- msgstr "appartient-à-l'agent "
-
--#: ../clients/common/nm-meta-setting-desc.c:1750
-+#: ../clients/common/nm-meta-setting-desc.c:1773
- msgid "not saved, "
- msgstr "non enregistré, "
-
--#: ../clients/common/nm-meta-setting-desc.c:1752
-+#: ../clients/common/nm-meta-setting-desc.c:1775
- msgid "not required, "
- msgstr "non requis, "
-
--#: ../clients/common/nm-meta-setting-desc.c:1970
-+#: ../clients/common/nm-meta-setting-desc.c:1975
- #, 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:1980
-+#: ../clients/common/nm-meta-setting-desc.c:1985
- #, c-format
- msgid "cannot set empty \"%s\" option"
- msgstr "l'option « %s » ne peut pas rester vide"
-
--#: ../clients/common/nm-meta-setting-desc.c:2039
-+#: ../clients/common/nm-meta-setting-desc.c:2044
- #, 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:2056
-+#: ../clients/common/nm-meta-setting-desc.c:2061
- #, 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:2077
--#: ../clients/common/nm-meta-setting-desc.c:4052
--#: ../libnm-core/nm-setting-ovs-bridge.c:183 ../src/nm-config.c:556
-+#: ../clients/common/nm-meta-setting-desc.c:2082
-+#: ../clients/common/nm-meta-setting-desc.c:4026
-+#: ../libnm-core/nm-setting-ovs-bridge.c:183 ../src/nm-config.c:549
- #, c-format
- msgid "'%s' is not valid"
- msgstr "« %s » n'est pas valide"
-
--#: ../clients/common/nm-meta-setting-desc.c:2174
-+#: ../clients/common/nm-meta-setting-desc.c:2177
- msgid "not a valid hex-string"
- msgstr "hex-string non valide"
-
--#: ../clients/common/nm-meta-setting-desc.c:2190
-+#: ../clients/common/nm-meta-setting-desc.c:2193
- #, 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:2269
-+#: ../clients/common/nm-meta-setting-desc.c:2272
- 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:2376
-+#: ../clients/common/nm-meta-setting-desc.c:2387
- #, c-format
- msgid "failed to set bond option \"%s\""
- msgstr "N'a pas pu définir liaison \"%s\""
-
--#: ../clients/common/nm-meta-setting-desc.c:2393
-+#: ../clients/common/nm-meta-setting-desc.c:2404
- #, c-format
- msgid ""
- "Enter a list of bonding options formatted as:\n"
-@@ -4644,125 +4709,120 @@ msgstr "Saisir une liste d'options de liaisons formatées ainsi :\n"
- #. * 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:2458
-+#: ../clients/common/nm-meta-setting-desc.c:2469
- #, c-format
- msgid "Can not change the connection type"
- msgstr "Impossible de changer le type de connexion"
-
--#: ../clients/common/nm-meta-setting-desc.c:2543
-+#: ../clients/common/nm-meta-setting-desc.c:2554
- #, c-format
- msgid "invalid permission \"%s\""
- msgstr "permission non valide \"%s\""
-
--#: ../clients/common/nm-meta-setting-desc.c:2580
--#, c-format
--msgid "'%s' is not valid master; use ifname or connection UUID"
--msgstr "« %s » n'est pas un maître valide ; utilisez ifname ou un UUID de connexion"
--
--#: ../clients/common/nm-meta-setting-desc.c:2661
-+#: ../clients/common/nm-meta-setting-desc.c:2654
- #, 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:2732
-+#: ../clients/common/nm-meta-setting-desc.c:2725
- msgid "0 (disabled)"
- msgstr "0 (désactivé)"
-
--#: ../clients/common/nm-meta-setting-desc.c:2738
-+#: ../clients/common/nm-meta-setting-desc.c:2731
- msgid "enabled, "
- msgstr "activé, "
-
--#: ../clients/common/nm-meta-setting-desc.c:2740
-+#: ../clients/common/nm-meta-setting-desc.c:2733
- msgid "advertise, "
- msgstr "annoncer, "
-
--#: ../clients/common/nm-meta-setting-desc.c:2742
-+#: ../clients/common/nm-meta-setting-desc.c:2735
- msgid "willing, "
- msgstr "disposé, "
-
--#: ../clients/common/nm-meta-setting-desc.c:2831
-+#: ../clients/common/nm-meta-setting-desc.c:2824
- #, 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:2858
-+#: ../clients/common/nm-meta-setting-desc.c:2851
- 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:2872
-+#: ../clients/common/nm-meta-setting-desc.c:2865
- #, 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:2875
-+#: ../clients/common/nm-meta-setting-desc.c:2868
- #, 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:2896
-+#: ../clients/common/nm-meta-setting-desc.c:2889
- #, 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:2926
-+#: ../clients/common/nm-meta-setting-desc.c:2919
- #, 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:2997
--#: ../clients/common/nm-meta-setting-desc.c:3003
-+#: ../clients/common/nm-meta-setting-desc.c:2990
-+#: ../clients/common/nm-meta-setting-desc.c:2996
- 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:3027
-+#: ../clients/common/nm-meta-setting-desc.c:3020
- #, 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:3050
-+#: ../clients/common/nm-meta-setting-desc.c:3043
- msgid "default"
- msgstr "par défaut"
-
--#: ../clients/common/nm-meta-setting-desc.c:3214
-+#: ../clients/common/nm-meta-setting-desc.c:3207
- #, c-format
- msgid "invalid IPv%c address '%s'"
- msgstr "adresse IPv%c « %s » non valide"
-
--#: ../clients/common/nm-meta-setting-desc.c:3341
-+#: ../clients/common/nm-meta-setting-desc.c:3334
- #, c-format
- msgid "invalid gateway address '%s'"
- msgstr "adresse de passerelle « %s » non valide"
-
--#: ../clients/common/nm-meta-setting-desc.c:3491
-+#: ../clients/common/nm-meta-setting-desc.c:3461
- #, 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:3571
-+#: ../clients/common/nm-meta-setting-desc.c:3541
- 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:3595
--#: ../clients/common/nm-meta-setting-desc.c:3675
-+#: ../clients/common/nm-meta-setting-desc.c:3565
-+#: ../clients/common/nm-meta-setting-desc.c:3645
- msgid ""
- "The valid syntax is: '[root | parent <handle>] [handle <handle>] <kind>'"
- msgstr "La syntaxe valide est : '[root | parent <handle>][handle <handle>] <kind>'"
-
--#: ../clients/common/nm-meta-setting-desc.c:3620
-+#: ../clients/common/nm-meta-setting-desc.c:3590
- msgid "The valid syntax is: '<vid>[-<vid>] [pvid] [untagged]'"
- msgstr "La syntaxe valide est : '<vid>[-<vid>] [pvid] [untagged]'"
-
--#: ../clients/common/nm-meta-setting-desc.c:3816
-+#: ../clients/common/nm-meta-setting-desc.c:3786
- #, c-format
- msgid "invalid priority map '%s'"
- msgstr "Plan des priorités non valide « %s »"
-
--#: ../clients/common/nm-meta-setting-desc.c:3904
-+#: ../clients/common/nm-meta-setting-desc.c:3878
- #, 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:3943
-+#: ../clients/common/nm-meta-setting-desc.c:3917
- #, c-format
- msgid ""
- "Enter a list of S/390 options formatted as:\n"
-@@ -4772,88 +4832,88 @@ msgstr "Saisissez une liste d’options S/390 formatées ainsi :\n"
- " option = <value>, option = <value>,...\n"
- "Les options acceptées sont : %s\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:3978
-+#: ../clients/common/nm-meta-setting-desc.c:3952
- #, c-format
- msgid "'%s' is not a valid channel"
- msgstr "« %s » n'est pas un canal valide"
-
--#: ../clients/common/nm-meta-setting-desc.c:3984
-+#: ../clients/common/nm-meta-setting-desc.c:3958
- #, c-format
- msgid "'%ld' is not a valid channel"
- msgstr "« %ld » n'est pas un canal valide"
-
--#: ../clients/common/nm-meta-setting-desc.c:4001
--#: ../libnm-core/nm-setting-sriov.c:434 ../libnm-core/nm-setting-wired.c:758
-+#: ../clients/common/nm-meta-setting-desc.c:3975
-+#: ../libnm-core/nm-setting-sriov.c:438 ../libnm-core/nm-setting-wired.c:758
- #: ../libnm-core/nm-setting-wired.c:771 ../libnm-core/nm-setting-wired.c:824
--#: ../libnm-core/nm-setting-wired.c:867 ../libnm-core/nm-setting-wireless.c:876
--#: ../libnm-core/nm-setting-wireless.c:892
-+#: ../libnm-core/nm-setting-wired.c:867 ../libnm-core/nm-setting-wireless.c:881
-+#: ../libnm-core/nm-setting-wireless.c:897
- #, 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:4061
-+#: ../clients/common/nm-meta-setting-desc.c:4035
- #, c-format
- msgid ""
- "'%s' not compatible with %s '%s', please change the key or set the right %s "
- "first."
- msgstr "« %s » n'est pas compatible avec %s « %s » ; veuillez changer la clé et définir le « %s » qui convient pour commencer."
-
--#: ../clients/common/nm-meta-setting-desc.c:4071
-+#: ../clients/common/nm-meta-setting-desc.c:4045
- #, 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:4076
-+#: ../clients/common/nm-meta-setting-desc.c:4050
- #, 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:4115
-+#: ../clients/common/nm-meta-setting-desc.c:4089
- #, 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:4172
-+#: ../clients/common/nm-meta-setting-desc.c:4175
- #, 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:4232
-+#: ../clients/common/nm-meta-setting-desc.c:4244
- 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:4239
-+#: ../clients/common/nm-meta-setting-desc.c:4251
- msgid "Bonding monitoring mode"
- msgstr "Mode de surveillance de liaison"
-
--#: ../clients/common/nm-meta-setting-desc.c:4248
-+#: ../clients/common/nm-meta-setting-desc.c:4260
- msgid "Bonding miimon [100]"
- msgstr "miimon de liaison [100]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4256
-+#: ../clients/common/nm-meta-setting-desc.c:4268
- msgid "Bonding downdelay [0]"
- msgstr "downdelay de liaison [0]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4264
-+#: ../clients/common/nm-meta-setting-desc.c:4276
- msgid "Bonding updelay [0]"
- msgstr "updelay de liaison [0]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4272
-+#: ../clients/common/nm-meta-setting-desc.c:4284
- msgid "Bonding arp-interval [0]"
- msgstr "arp-interval de liaison [0]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4280
-+#: ../clients/common/nm-meta-setting-desc.c:4292
- msgid "Bonding arp-ip-target [none]"
- msgstr "arp-ip-target de liaison [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4288
-+#: ../clients/common/nm-meta-setting-desc.c:4300
- msgid "LACP rate ('slow' or 'fast') [slow]"
- msgstr "Débit LACP (« lent » ou « rapide ») [lent]"
-
- #. macro that returns @func as const (guint32(*)(NMSetting*)) type, but checks
- #. * that the actual type is (guint32(*)(type *)).
--#: ../clients/common/nm-meta-setting-desc.c:4455
-+#: ../clients/common/nm-meta-setting-desc.c:4467
- 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 "
-@@ -4867,7 +4927,7 @@ msgstr "nmcli peut accepter les données de configuration JSON directes ainsi qu
- "Exemples : set team.config { \"device\": \"team0\", \"runner\": {\"name\": \"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n"
- " set team.config /etc/my-team.conf\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:4463
-+#: ../clients/common/nm-meta-setting-desc.c:4475
- 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 "
-@@ -4908,11 +4968,11 @@ msgstr "Saisir une liste d’observateurs de liens comme dictionnaires dont les
- "Exemple:\n"
- " name=arp_ping source-host=172.16.1.1 target-host=172.16.1.254, name=ethtool delay-up=3\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:4496
-+#: ../clients/common/nm-meta-setting-desc.c:4524
- 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:4532
-+#: ../clients/common/nm-meta-setting-desc.c:4560
- msgid ""
- "Enter file path to CA certificate (optionally prefixed with file://).\n"
- " [file://]<file path>\n"
-@@ -4922,7 +4982,7 @@ msgstr "Saisir le chemin du fichier de certificat d’autorité (CA) (peut êtr
- "Notez que nmcli ne supporte pas que l'on spécifie les certificats sous forme de données brutes de blob.\n"
- "Exemple : /home/cimrman/cacert.crt\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:4571
-+#: ../clients/common/nm-meta-setting-desc.c:4602
- msgid ""
- "Enter file path to client certificate (optionally prefixed with file://).\n"
- " [file://]<file path>\n"
-@@ -4932,7 +4992,7 @@ msgstr "Saisir le chemin du certificat client (CA) (peut être précédé de fi
- "Notez que nmcli ne supporte pas que l'on spécifie les certificats sous forme de données brutes de blob.\n"
- "Exemple : /home/cimrman/jara.crt\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:4628
-+#: ../clients/common/nm-meta-setting-desc.c:4659
- msgid ""
- "Enter file path to CA certificate for inner authentication (optionally "
- "prefixed\n"
-@@ -4945,7 +5005,7 @@ msgstr "Saisir le chemin du fichier de certificat d’autorité (CA) pour une au
- "Notez que nmcli ne supporte pas que l'on spécifie les certificats sous forme de données brutes de blob.\n"
- "Exemple : /home/cimrman/ca-zweite-phase.crt\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:4668
-+#: ../clients/common/nm-meta-setting-desc.c:4702
- msgid ""
- "Enter file path to client certificate for inner authentication (optionally "
- "prefixed\n"
-@@ -4958,7 +5018,7 @@ msgstr "Saisir le chemin du fichier de certificat client pour une authorisation
- "Notez que nmcli ne supporte pas que l'on spécifie les certificats sous forme de données brutes de blob.\n"
- "Exemple : /home/cimrman/jara-zweite-phase.crt\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:4695
-+#: ../clients/common/nm-meta-setting-desc.c:4729
- msgid ""
- "Enter bytes as a list of hexadecimal values.\n"
- "Two formats are accepted:\n"
-@@ -4977,8 +5037,8 @@ msgstr "Saisissez les octets en tant que liste de valeurs hexadécimales.\n"
- "Exemples : ab0455a6ea3a74C2\n"
- " ab 4 55 0xa6 ea 3a 74 C2\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:4712
--#: ../clients/common/nm-meta-setting-desc.c:4730
-+#: ../clients/common/nm-meta-setting-desc.c:4746
-+#: ../clients/common/nm-meta-setting-desc.c:4764
- msgid ""
- "Enter path to a private key and the key password (if not set yet):\n"
- " [file://]<file path> [<password>]\n"
-@@ -4988,84 +5048,84 @@ msgstr "Saisissez le chemin d'accès vers une clé privée et le mot de passe de
- " [file://]<file path> [<password>]\n"
- "Exemple : /home/cimrman/jara-priv-key Dardanely\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:4769
-+#: ../clients/common/nm-meta-setting-desc.c:4803
- #: ../clients/common/nm-secret-agent-simple.c:268
- #: ../clients/common/nm-secret-agent-simple.c:356
--#: ../clients/tui/nmt-page-dsl.c:53 ../clients/tui/nmt-page-wifi.c:321
-+#: ../clients/tui/nmt-page-dsl.c:53 ../clients/tui/nmt-page-wifi.c:322
- msgid "Username"
- msgstr "Nom d'utilisateur"
-
--#: ../clients/common/nm-meta-setting-desc.c:4775
--#: ../clients/common/nm-meta-setting-desc.c:4990
--#: ../clients/common/nm-meta-setting-desc.c:5385
--#: ../clients/common/nm-meta-setting-desc.c:6328
-+#: ../clients/common/nm-meta-setting-desc.c:4809
-+#: ../clients/common/nm-meta-setting-desc.c:5093
-+#: ../clients/common/nm-meta-setting-desc.c:5520
-+#: ../clients/common/nm-meta-setting-desc.c:6492
- msgid "Password [none]"
- msgstr "Mot de passe [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4821
-+#: ../clients/common/nm-meta-setting-desc.c:4855
- msgid "Bluetooth device address"
- msgstr "Adresse du périphérique Bluetooth"
-
--#: ../clients/common/nm-meta-setting-desc.c:4869
--#: ../clients/common/nm-meta-setting-desc.c:5438
--#: ../clients/common/nm-meta-setting-desc.c:7024
--#: ../clients/common/nm-meta-setting-desc.c:7062
--#: ../clients/common/nm-meta-setting-desc.c:7244
--#: ../clients/common/nm-meta-setting-desc.c:7474
-+#: ../clients/common/nm-meta-setting-desc.c:4903
-+#: ../clients/common/nm-meta-setting-desc.c:5573
-+#: ../clients/common/nm-meta-setting-desc.c:7200
-+#: ../clients/common/nm-meta-setting-desc.c:7238
-+#: ../clients/common/nm-meta-setting-desc.c:7420
-+#: ../clients/common/nm-meta-setting-desc.c:7650
- msgid "MAC [none]"
- msgstr "MAC [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4875
-+#: ../clients/common/nm-meta-setting-desc.c:4909
- msgid "Enable STP [no]"
- msgstr "Activer STP [no]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4881
-+#: ../clients/common/nm-meta-setting-desc.c:4915
- msgid "STP priority [32768]"
- msgstr "Priorité STP [32768]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4887
-+#: ../clients/common/nm-meta-setting-desc.c:4921
- msgid "Forward delay [15]"
- msgstr "Délai de réacheminement [15]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4893
-+#: ../clients/common/nm-meta-setting-desc.c:4927
- msgid "Hello time [2]"
- msgstr "Hello time [2]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4899
-+#: ../clients/common/nm-meta-setting-desc.c:4933
- msgid "Max age [20]"
- msgstr "Max age [20]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4905
-+#: ../clients/common/nm-meta-setting-desc.c:4939
- msgid "MAC address ageing time [300]"
- msgstr "Période de vieillissement des adresses MAC [300]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4911
-+#: ../clients/common/nm-meta-setting-desc.c:4949
- msgid "Group forward mask [0]"
- msgstr "Group forward mask [0]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4917
-+#: ../clients/common/nm-meta-setting-desc.c:4991
- msgid "Enable IGMP snooping [no]"
- msgstr "Activer le snooping IGMP [no]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4946
-+#: ../clients/common/nm-meta-setting-desc.c:5049
- msgid "Bridge port priority [32]"
- msgstr "Priorité du port de pontage [32]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4952
-+#: ../clients/common/nm-meta-setting-desc.c:5055
- 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:4958
-+#: ../clients/common/nm-meta-setting-desc.c:5061
- msgid "Hairpin [no]"
- msgstr "Hairpin [no]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4984
--#: ../clients/common/nm-meta-setting-desc.c:5379
--#: ../clients/common/nm-meta-setting-desc.c:6882
-+#: ../clients/common/nm-meta-setting-desc.c:5087
-+#: ../clients/common/nm-meta-setting-desc.c:5514
-+#: ../clients/common/nm-meta-setting-desc.c:7046
- msgid "Username [none]"
- msgstr "Nom d'utilisateur [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5086
-+#: ../clients/common/nm-meta-setting-desc.c:5189
- msgid ""
- "Enter a list of user permissions. This is a list of user names formatted "
- "as:\n"
-@@ -5079,7 +5139,7 @@ msgstr "Saisissez une liste des permissions utilisateur. Ceci est une liste des
- "\n"
- "Exemple : alice bob charlie\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5138
-+#: ../clients/common/nm-meta-setting-desc.c:5242
- msgid ""
- "Enter secondary connections that should be activated when this connection "
- "is\n"
-@@ -5099,7 +5159,7 @@ msgstr "Saisissez des connexions secondaires qui peuvent être activées quand c
- "\n"
- "Exemple : private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5161
-+#: ../clients/common/nm-meta-setting-desc.c:5265
- 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"
-@@ -5112,25 +5172,25 @@ msgstr "Saisir une valeur qui indique si la connexion est assujetie à un quota
- "'false','no','off' pour définir la connexion comme n'étant pas mesurée\n"
- "'unknown' permettre au NetworkManager de choisir une valeur à partir d'heuristiques\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5395
-+#: ../clients/common/nm-meta-setting-desc.c:5530
- msgid "APN"
- msgstr "APN"
-
--#: ../clients/common/nm-meta-setting-desc.c:5447
--#: ../clients/common/nm-meta-setting-desc.c:7093
--#: ../clients/common/nm-meta-setting-desc.c:7284
-+#: ../clients/common/nm-meta-setting-desc.c:5582
-+#: ../clients/common/nm-meta-setting-desc.c:7269
-+#: ../clients/common/nm-meta-setting-desc.c:7460
- msgid "MTU [auto]"
- msgstr "MTU [auto]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5466
-+#: ../clients/common/nm-meta-setting-desc.c:5601
- msgid "P_KEY [none]"
- msgstr "P_KEY [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5475
-+#: ../clients/common/nm-meta-setting-desc.c:5610
- msgid "Parent interface [none]"
- msgstr "Interface parente [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5502
-+#: ../clients/common/nm-meta-setting-desc.c:5637
- msgid ""
- "Enter a list of IPv4 addresses of DNS servers.\n"
- "\n"
-@@ -5139,11 +5199,11 @@ msgstr "Saisissez une liste d'adresses IPv4 de serveurs DNS.\n"
- "\n"
- "Exemple : 8.8.8.8, 8.8.4.4\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5550
-+#: ../clients/common/nm-meta-setting-desc.c:5685
- msgid "IPv4 address (IP[/plen]) [none]"
- msgstr "Adresse IPv4 (IP[/plen]) [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5552
-+#: ../clients/common/nm-meta-setting-desc.c:5687
- msgid ""
- "Enter a list of IPv4 addresses formatted as:\n"
- " ip[/prefix], ip[/prefix],...\n"
-@@ -5156,11 +5216,11 @@ msgstr "Saisissez une liste des adresses IPv4 formatées comme suit :\n"
- "\n"
- "Exemple : 192.168.1.5/24, 10.0.0.11/24\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5571
-+#: ../clients/common/nm-meta-setting-desc.c:5706
- msgid "IPv4 gateway [none]"
- msgstr "Passerelle IPv4 [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5579
-+#: ../clients/common/nm-meta-setting-desc.c:5714
- msgid ""
- "Enter a list of IPv4 routes formatted as:\n"
- " ip[/prefix] [next-hop] [metric],...\n"
-@@ -5181,7 +5241,7 @@ msgstr "Saisissez une liste des routes IPv4 formatée comme suit :\n"
- "Examples: 192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n"
- " 10.1.2.0/24\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5619
-+#: ../clients/common/nm-meta-setting-desc.c:5754
- msgid ""
- "Enter a list of IPv4 routing rules formatted as:\n"
- " priority [prio] [from [src]] [to [dst]], ,...\n"
-@@ -5190,7 +5250,7 @@ msgstr "Saisissez une liste des adresses IPv4 formatées comme suit :\n"
- " priority [prio] [from [src]] [to [dst]], ,...\n"
- "\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5721
-+#: ../clients/common/nm-meta-setting-desc.c:5845
- 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 "
-@@ -5204,11 +5264,11 @@ msgstr "Saisissez une liste des adresses IPv6 de serveurs DNS. Si la méthode d
- "\n"
- "Exemple : 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5775
-+#: ../clients/common/nm-meta-setting-desc.c:5899
- msgid "IPv6 address (IP[/plen]) [none]"
- msgstr "Adresse IPv6 (IP[/plen]) [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5777
-+#: ../clients/common/nm-meta-setting-desc.c:5901
- msgid ""
- "Enter a list of IPv6 addresses formatted as:\n"
- " ip[/prefix], ip[/prefix],...\n"
-@@ -5221,11 +5281,11 @@ msgstr "Saisissez une liste des adresses IPv6 formatées comme suit :\n"
- "\n"
- "Exemple : 2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5796
-+#: ../clients/common/nm-meta-setting-desc.c:5920
- msgid "IPv6 gateway [none]"
- msgstr "Passerelle IPv6 [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5804
-+#: ../clients/common/nm-meta-setting-desc.c:5928
- msgid ""
- "Enter a list of IPv6 routes formatted as:\n"
- " ip[/prefix] [next-hop] [metric],...\n"
-@@ -5247,7 +5307,7 @@ msgstr "Saisissez une liste des routes IPv6 formatées comme suit :\n"
- "Exemple : 2001:db8:beef:2::/64 2001:db8:beef::2, 2001:db8:beef:3::/64 2001:db8:beef::3 2\n"
- " abbe::/64 55\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5844
-+#: ../clients/common/nm-meta-setting-desc.c:5968
- msgid ""
- "Enter a list of IPv6 routing rules formatted as:\n"
- " priority [prio] [from [src]] [to [dst]], ,...\n"
-@@ -5256,166 +5316,170 @@ msgstr "Saisissez une liste des adresses IPv6 formatées comme suit :\n"
- " priority [prio] [from [src]] [to [dst]], ,...\n"
- "\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5943
--#: ../clients/common/nm-meta-setting-desc.c:6923
-+#: ../clients/common/nm-meta-setting-desc.c:6075
-+#: ../clients/common/nm-meta-setting-desc.c:7099
- msgid "Parent device [none]"
- msgstr "Périphérique parent [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5949
-+#: ../clients/common/nm-meta-setting-desc.c:6081
- msgid "Local endpoint [none]"
- msgstr "Point de terminaison local [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5956
--#: ../clients/common/nm-meta-setting-desc.c:6943
-+#: ../clients/common/nm-meta-setting-desc.c:6088
-+#: ../clients/common/nm-meta-setting-desc.c:7119
- msgid "Remote"
- msgstr "Distant"
-
--#: ../clients/common/nm-meta-setting-desc.c:6001
-+#: ../clients/common/nm-meta-setting-desc.c:6133
- msgid "MACsec parent device or connection UUID"
- msgstr "Périphérique parent ou connexion MACsec UUID"
-
--#: ../clients/common/nm-meta-setting-desc.c:6022
-+#: ../clients/common/nm-meta-setting-desc.c:6154
- msgid "Enable encryption [yes]"
- msgstr "Activer le chiffrement [yes]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6028
-+#: ../clients/common/nm-meta-setting-desc.c:6160
- #: ../clients/common/nm-secret-agent-simple.c:917
- msgid "MKA CAK"
- msgstr "MKA CAK"
-
--#: ../clients/common/nm-meta-setting-desc.c:6038
-+#: ../clients/common/nm-meta-setting-desc.c:6170
- msgid "MKA_CKN"
- msgstr "MKA_CKN"
-
--#: ../clients/common/nm-meta-setting-desc.c:6044
-+#: ../clients/common/nm-meta-setting-desc.c:6176
- msgid "SCI port [1]"
- msgstr "SCI port [1]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6070
-+#: ../clients/common/nm-meta-setting-desc.c:6202
- msgid "MACVLAN parent device or connection UUID"
- msgstr "Périphérique parent MACVLAN ou connexion UUID"
-
--#: ../clients/common/nm-meta-setting-desc.c:6091
-+#: ../clients/common/nm-meta-setting-desc.c:6223
- msgid "Tap [no]"
- msgstr "Cliquez [no]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6126
--#: ../clients/common/nm-meta-setting-desc.c:7198
--#: ../clients/tui/nmt-page-wifi.c:212
-+#: ../clients/common/nm-meta-setting-desc.c:6290
-+#: ../clients/common/nm-meta-setting-desc.c:7374
-+#: ../clients/tui/nmt-page-wifi.c:213
- msgid "SSID"
- msgstr "SSID"
-
--#: ../clients/common/nm-meta-setting-desc.c:6135
-+#: ../clients/common/nm-meta-setting-desc.c:6299
- msgid "OLPC Mesh channel [1]"
- msgstr "Canal OLPC Mesh [1]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6144
-+#: ../clients/common/nm-meta-setting-desc.c:6308
- msgid "DHCP anycast MAC address [none]"
- msgstr "Adresse MAC anycast DHCP [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6309
-+#: ../clients/common/nm-meta-setting-desc.c:6473
- msgid "PPPoE parent device"
- msgstr "Périphérique parent PPPoE"
-
--#: ../clients/common/nm-meta-setting-desc.c:6315
-+#: ../clients/common/nm-meta-setting-desc.c:6479
- msgid "Service [none]"
- msgstr "Service [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6322
-+#: ../clients/common/nm-meta-setting-desc.c:6486
- msgid "PPPoE username"
- msgstr "Nom d'utilisateur PPPoE"
-
--#: ../clients/common/nm-meta-setting-desc.c:6358
-+#: ../clients/common/nm-meta-setting-desc.c:6522
- msgid "Browser only [no]"
- msgstr "Navigateur seulement [no]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6364
-+#: ../clients/common/nm-meta-setting-desc.c:6528
- msgid "PAC URL"
- msgstr "URL PAC"
-
--#: ../clients/common/nm-meta-setting-desc.c:6370
-+#: ../clients/common/nm-meta-setting-desc.c:6534
- msgid "PAC script"
- msgstr "Script PAC"
-
--#: ../clients/common/nm-meta-setting-desc.c:6494
--#: ../clients/common/nm-meta-setting-desc.c:6682
-+#: ../clients/common/nm-meta-setting-desc.c:6658
-+#: ../clients/common/nm-meta-setting-desc.c:6846
- msgid "Team JSON configuration [none]"
- msgstr "Configuration de l'équipe JSON [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6785
-+#: ../clients/common/nm-meta-setting-desc.c:6949
- msgid "User ID [none]"
- msgstr "ID Utilisateur [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6791
-+#: ../clients/common/nm-meta-setting-desc.c:6955
- msgid "Group ID [none]"
- msgstr "ID Groupe [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6797
-+#: ../clients/common/nm-meta-setting-desc.c:6961
- msgid "Enable PI [no]"
- msgstr "Activer PI [no]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6803
-+#: ../clients/common/nm-meta-setting-desc.c:6967
- msgid "Enable VNET header [no]"
- msgstr "Activer l'en-tête VNET [no]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6809
-+#: ../clients/common/nm-meta-setting-desc.c:6973
- msgid "Enable multi queue [no]"
- msgstr "Activer les files d'attente multiples [no]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6822
-+#: ../clients/common/nm-meta-setting-desc.c:6986
- msgid "VLAN parent device or connection UUID"
- msgstr "Périphérique parent VLAN ou connexion UUID"
-
--#: ../clients/common/nm-meta-setting-desc.c:6829
-+#: ../clients/common/nm-meta-setting-desc.c:6993
- msgid "VLAN ID (<0-4094>)"
- msgstr "VLAN ID (<0-4094>)"
-
--#: ../clients/common/nm-meta-setting-desc.c:6835
-+#: ../clients/common/nm-meta-setting-desc.c:6999
- msgid "VLAN flags (<0-7>) [none]"
- msgstr "Marqueurs VLAN (<0-7>) [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6844
-+#: ../clients/common/nm-meta-setting-desc.c:7008
- msgid "Ingress priority maps [none]"
- msgstr "Carte des priorités entrantes [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6854
-+#: ../clients/common/nm-meta-setting-desc.c:7018
- msgid "Egress priority maps [none]"
- msgstr "Carte des priorités sortantes [aucune]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6930
-+#: ../clients/common/nm-meta-setting-desc.c:7086
-+msgid "Table [0]"
-+msgstr "Tableau [0]"
-+
-+#: ../clients/common/nm-meta-setting-desc.c:7106
- msgid "VXLAN ID"
- msgstr "ID VXLAN"
-
--#: ../clients/common/nm-meta-setting-desc.c:6936
-+#: ../clients/common/nm-meta-setting-desc.c:7112
- msgid "Local address [none]"
- msgstr "Adresse locale [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6949
-+#: ../clients/common/nm-meta-setting-desc.c:7125
- msgid "Minimum source port [0]"
- msgstr "Port source minimum [0]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6955
-+#: ../clients/common/nm-meta-setting-desc.c:7131
- msgid "Maximum source port [0]"
- msgstr "Port source maximum [0]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6961
-+#: ../clients/common/nm-meta-setting-desc.c:7137
- msgid "Destination port [8472]"
- msgstr "Port de destination [8472]"
-
--#: ../clients/common/nm-meta-setting-desc.c:7001
-+#: ../clients/common/nm-meta-setting-desc.c:7177
- msgid "Peer"
- msgstr "Peer"
-
--#: ../clients/common/nm-meta-setting-desc.c:7031
-+#: ../clients/common/nm-meta-setting-desc.c:7207
- msgid "WiMAX NSP name"
- msgstr "Nom NSP WiMAX"
-
--#: ../clients/common/nm-meta-setting-desc.c:7068
--#: ../clients/common/nm-meta-setting-desc.c:7249
-+#: ../clients/common/nm-meta-setting-desc.c:7244
-+#: ../clients/common/nm-meta-setting-desc.c:7425
- msgid "Cloned MAC [none]"
- msgstr "MAC dupliqué [aucun]"
-
--#: ../clients/common/nm-meta-setting-desc.c:7101
-+#: ../clients/common/nm-meta-setting-desc.c:7277
- msgid ""
- "Enter a list of subchannels (comma or space separated).\n"
- "\n"
-@@ -5424,230 +5488,241 @@ msgstr "Saisissez une liste de sous-canaux (séparés par des virgules ou espace
- "\n"
- "Exemple : 0.0.0e20 0.0.0e21 0.0.0e22\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:7423
-+#: ../clients/common/nm-meta-setting-desc.c:7599
- msgid ""
- "Enter the type of WEP keys. The accepted values are: 0 or unknown, 1 or key, "
- "and 2 or passphrase.\n"
- msgstr "Saisissez le type des clés WEP. Les valeurs acceptées sont : 0 ou inconnu, 1 ou clé et 2 ou phrase de passe.\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:7482
-+#: ../clients/common/nm-meta-setting-desc.c:7658
- msgid "Short address (<0x0000-0xffff>)"
- msgstr "Adresse courte (<0x0000-0xffff>)"
-
--#: ../clients/common/nm-meta-setting-desc.c:7498
-+#: ../clients/common/nm-meta-setting-desc.c:7674
- msgid "PAN Identifier (<0x0000-0xffff>)"
- msgstr "Identificateur PAN (<0x0000-0xffff>)"
-
--#: ../clients/common/nm-meta-setting-desc.c:7513
-+#: ../clients/common/nm-meta-setting-desc.c:7689
- msgid "Page (<default|0-31>)"
- msgstr "Page (<default|0-31>)"
-
--#: ../clients/common/nm-meta-setting-desc.c:7527
-+#: ../clients/common/nm-meta-setting-desc.c:7703
- msgid "Channel (<default|0-26>)"
- msgstr "Canal (<default|0-26>)"
-
- #. ***************************************************************************
--#: ../clients/common/nm-meta-setting-desc.c:7662
-+#: ../clients/common/nm-meta-setting-desc.c:7838
- msgid "6LOWPAN settings"
- msgstr "Configuration 6LOWPAN"
-
--#: ../clients/common/nm-meta-setting-desc.c:7663
-+#: ../clients/common/nm-meta-setting-desc.c:7839
- msgid "802-1x settings"
- msgstr "Configuration 802-1x"
-
--#: ../clients/common/nm-meta-setting-desc.c:7664
-+#: ../clients/common/nm-meta-setting-desc.c:7840
- #: ../src/devices/adsl/nm-device-adsl.c:117
- msgid "ADSL connection"
- msgstr "Connexion ADSL"
-
--#: ../clients/common/nm-meta-setting-desc.c:7665
-+#: ../clients/common/nm-meta-setting-desc.c:7841
- msgid "bluetooth connection"
- msgstr "Connexion bluetooth"
-
--#: ../clients/common/nm-meta-setting-desc.c:7666
-+#: ../clients/common/nm-meta-setting-desc.c:7842
- msgid "Bond device"
- msgstr "Périphérique de liaison"
-
--#: ../clients/common/nm-meta-setting-desc.c:7667
-+#: ../clients/common/nm-meta-setting-desc.c:7843
- msgid "Bridge device"
- msgstr "Périphérique de pontage"
-
--#: ../clients/common/nm-meta-setting-desc.c:7668
-+#: ../clients/common/nm-meta-setting-desc.c:7844
- msgid "Bridge port"
- msgstr "Pont port"
-
--#: ../clients/common/nm-meta-setting-desc.c:7669
-+#: ../clients/common/nm-meta-setting-desc.c:7845
- msgid "CDMA mobile broadband connection"
- msgstr "Connexion haut débit mobile"
-
--#: ../clients/common/nm-meta-setting-desc.c:7670
-+#: ../clients/common/nm-meta-setting-desc.c:7846
- msgid "General settings"
- msgstr "Configuration générale"
-
--#: ../clients/common/nm-meta-setting-desc.c:7671
-+#: ../clients/common/nm-meta-setting-desc.c:7847
- msgid "DCB settings"
- msgstr "Configuration DCB"
-
--#: ../clients/common/nm-meta-setting-desc.c:7672
-+#: ../clients/common/nm-meta-setting-desc.c:7848
- msgid "Dummy settings"
- msgstr "Paramètres fictifs"
-
--#: ../clients/common/nm-meta-setting-desc.c:7673
-+#: ../clients/common/nm-meta-setting-desc.c:7849
- msgid "Ethtool settings"
- msgstr "Paramètres de l'Ethtool"
-
--#: ../clients/common/nm-meta-setting-desc.c:7674
-+#: ../clients/common/nm-meta-setting-desc.c:7850
- msgid "Generic settings"
- msgstr "Paramètres génériques"
-
--#: ../clients/common/nm-meta-setting-desc.c:7675
-+#: ../clients/common/nm-meta-setting-desc.c:7851
- msgid "GSM mobile broadband connection"
- msgstr "Connexion haut débit mobile"
-
--#: ../clients/common/nm-meta-setting-desc.c:7676
-+#: ../clients/common/nm-meta-setting-desc.c:7852
- #: ../src/devices/nm-device-infiniband.c:158
- msgid "InfiniBand connection"
- msgstr "Connexion InfiniBand"
-
--#: ../clients/common/nm-meta-setting-desc.c:7677
-+#: ../clients/common/nm-meta-setting-desc.c:7853
- msgid "IPv4 protocol"
- msgstr "Protocole IPv4"
-
--#: ../clients/common/nm-meta-setting-desc.c:7678
-+#: ../clients/common/nm-meta-setting-desc.c:7854
- msgid "IPv6 protocol"
- msgstr "Protocole IPv6"
-
--#: ../clients/common/nm-meta-setting-desc.c:7679
-+#: ../clients/common/nm-meta-setting-desc.c:7855
- msgid "IP-tunnel settings"
- msgstr "Paramètres du tunnel IP"
-
--#: ../clients/common/nm-meta-setting-desc.c:7680
-+#: ../clients/common/nm-meta-setting-desc.c:7856
- msgid "MACsec connection"
- msgstr "Connexion MACsec"
-
--#: ../clients/common/nm-meta-setting-desc.c:7681
-+#: ../clients/common/nm-meta-setting-desc.c:7857
- msgid "macvlan connection"
- msgstr "Connexion macvlan"
-
--#: ../clients/common/nm-meta-setting-desc.c:7682
-+#: ../clients/common/nm-meta-setting-desc.c:7858
- msgid "Match"
- msgstr "Correspond"
-
--#: ../clients/common/nm-meta-setting-desc.c:7683
-+#: ../clients/common/nm-meta-setting-desc.c:7859
- msgid "OLPC Mesh connection"
- msgstr "Connexion OLPC Mesh"
-
--#: ../clients/common/nm-meta-setting-desc.c:7684
-+#: ../clients/common/nm-meta-setting-desc.c:7860
- msgid "Open vSwitch bridge settings"
- msgstr "Configuration du pont Open vSwitch"
-
--#: ../clients/common/nm-meta-setting-desc.c:7685
-+#: ../clients/common/nm-meta-setting-desc.c:7861
- msgid "Open vSwitch DPDK interface settings"
- msgstr "Paramètres de l'interface Open vSwitch DPDK"
-
--#: ../clients/common/nm-meta-setting-desc.c:7686
-+#: ../clients/common/nm-meta-setting-desc.c:7862
- msgid "Open vSwitch interface settings"
- msgstr "Paramètres de l'interface Open vSwitch"
-
--#: ../clients/common/nm-meta-setting-desc.c:7687
-+#: ../clients/common/nm-meta-setting-desc.c:7863
- msgid "Open vSwitch patch interface settings"
- msgstr "Paramètres de l'interface de patch Open vSwitch"
-
--#: ../clients/common/nm-meta-setting-desc.c:7688
-+#: ../clients/common/nm-meta-setting-desc.c:7864
- msgid "Open vSwitch port settings"
- msgstr "Paramètres du port Open vSwitch"
-
--#: ../clients/common/nm-meta-setting-desc.c:7689
-+#: ../clients/common/nm-meta-setting-desc.c:7865
- msgid "PPP settings"
- msgstr "Paramètres PPP"
-
--#: ../clients/common/nm-meta-setting-desc.c:7690
-+#: ../clients/common/nm-meta-setting-desc.c:7866
- msgid "PPPoE"
- msgstr "PPPoE"
-
--#: ../clients/common/nm-meta-setting-desc.c:7691
-+#: ../clients/common/nm-meta-setting-desc.c:7867
- msgid "Proxy"
- msgstr "Procuration"
-
--#: ../clients/common/nm-meta-setting-desc.c:7692
-+#: ../clients/common/nm-meta-setting-desc.c:7868
- msgid "Serial settings"
- msgstr "Configuration de série"
-
--#: ../clients/common/nm-meta-setting-desc.c:7693
-+#: ../clients/common/nm-meta-setting-desc.c:7869
- msgid "SR-IOV settings"
- msgstr "Configuration SR-IOV"
-
--#: ../clients/common/nm-meta-setting-desc.c:7694
-+#: ../clients/common/nm-meta-setting-desc.c:7870
- 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:7695
-+#: ../clients/common/nm-meta-setting-desc.c:7871
- msgid "Team device"
- msgstr "Périphérique de l'équipe"
-
--#: ../clients/common/nm-meta-setting-desc.c:7696
-+#: ../clients/common/nm-meta-setting-desc.c:7872
- 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:7697
-+#: ../clients/common/nm-meta-setting-desc.c:7873
- msgid "Tun device"
- msgstr "Périphérique TUN"
-
--#: ../clients/common/nm-meta-setting-desc.c:7698
-+#: ../clients/common/nm-meta-setting-desc.c:7874
- msgid "User settings"
- msgstr "Configuration utilisateur"
-
--#: ../clients/common/nm-meta-setting-desc.c:7699
-+#: ../clients/common/nm-meta-setting-desc.c:7875
- #: ../src/devices/nm-device-vlan.c:385
- msgid "VLAN connection"
- msgstr "Connexion VLAN"
-
--#: ../clients/common/nm-meta-setting-desc.c:7700 ../src/nm-manager.c:5652
-+#: ../clients/common/nm-meta-setting-desc.c:7876 ../src/nm-manager.c:5697
- msgid "VPN connection"
- msgstr "Connexion VPN"
-
--#: ../clients/common/nm-meta-setting-desc.c:7701
-+#: ../clients/common/nm-meta-setting-desc.c:7877
-+#: ../src/devices/nm-device-vrf.c:175
-+msgid "VRF connection"
-+msgstr "Connexion VRF"
-+
-+#: ../clients/common/nm-meta-setting-desc.c:7878
- #: ../src/devices/nm-device-vxlan.c:354
- msgid "VXLAN connection"
- msgstr "Connexion VXLAN"
-
--#: ../clients/common/nm-meta-setting-desc.c:7702
-+#: ../clients/common/nm-meta-setting-desc.c:7879
- msgid "Wi-Fi P2P connection"
- msgstr "Connexion Wi-Fi P2P"
-
--#: ../clients/common/nm-meta-setting-desc.c:7703
-+#: ../clients/common/nm-meta-setting-desc.c:7880
- msgid "WiMAX connection"
- msgstr "Connexion WiMAX"
-
--#: ../clients/common/nm-meta-setting-desc.c:7704
-+#: ../clients/common/nm-meta-setting-desc.c:7881
- msgid "Wired Ethernet"
- msgstr "Ethernet filaire"
-
--#: ../clients/common/nm-meta-setting-desc.c:7705
-+#: ../clients/common/nm-meta-setting-desc.c:7882
- msgid "WireGuard VPN settings"
- msgstr "Configuration VPN WireGuard"
-
--#: ../clients/common/nm-meta-setting-desc.c:7706
-+#: ../clients/common/nm-meta-setting-desc.c:7883
- msgid "Wi-Fi connection"
- msgstr "Connexion Wi-Fi"
-
--#: ../clients/common/nm-meta-setting-desc.c:7707
-+#: ../clients/common/nm-meta-setting-desc.c:7884
- msgid "Wi-Fi security settings"
- msgstr "Paramètres de sécurité Wi-Fi"
-
--#: ../clients/common/nm-meta-setting-desc.c:7708
-+#: ../clients/common/nm-meta-setting-desc.c:7885
- msgid "WPAN settings"
- msgstr "Configuration WPAN"
-
--#: ../clients/common/nm-meta-setting-desc.c:8074
-+#: ../clients/common/nm-meta-setting-desc.c:8262
- msgid "name"
- msgstr "nom"
-
--#: ../clients/common/nm-polkit-listener.c:225
--msgid "An authentication session is already underway."
--msgstr "Il y a déjà une session d'authentification en cours."
-+#: ../clients/common/nm-polkit-listener.c:368
-+#, c-format
-+msgid "Could not find any session id for uid %d"
-+msgstr "Impossible de trouver un identifiant de session pour l'uid %d"
-+
-+#: ../clients/common/nm-polkit-listener.c:370
-+#, c-format
-+msgid "Could not retrieve session id: %s"
-+msgstr "Impossible de récupérer l'identifiant de la session : %s"
-
- #: ../clients/common/nm-secret-agent-simple.c:217
- #, c-format
-@@ -5663,7 +5738,7 @@ msgid "Private key password"
- msgstr "Mot de passe de la clé privée"
-
- #: ../clients/common/nm-secret-agent-simple.c:323
--#: ../clients/tui/nmt-page-wifi.c:278
-+#: ../clients/tui/nmt-page-wifi.c:279
- msgid "Key"
- msgstr "Clé"
-
-@@ -5779,60 +5854,60 @@ msgstr "impossible de charger le greffon VPN « %s » à cause de « %s » m
- msgid "failed to load VPN plugin \"%s\": %s"
- msgstr "impossible de charger le greffon VPN « %s » : %s"
-
--#: ../clients/common/nm-vpn-helpers.c:115
-+#: ../clients/common/nm-vpn-helpers.c:144
- msgid "Certificate password"
- msgstr "Mot de passe du certificat"
-
- # ctx::sourcefile::/rhn/admin/config/GeneralConfig.do
--#: ../clients/common/nm-vpn-helpers.c:116
-+#: ../clients/common/nm-vpn-helpers.c:145
- msgid "HTTP proxy password"
- msgstr "Mot de passe du proxy HTTP"
-
--#: ../clients/common/nm-vpn-helpers.c:121
--#: ../clients/common/nm-vpn-helpers.c:126
-+#: ../clients/common/nm-vpn-helpers.c:152
-+#: ../clients/common/nm-vpn-helpers.c:161
- msgid "Group password"
- msgstr "Mot de passe de groupe"
-
--#: ../clients/common/nm-vpn-helpers.c:130 ../clients/tui/nmt-page-ip4.c:130
-+#: ../clients/common/nm-vpn-helpers.c:167 ../clients/tui/nmt-page-ip4.c:130
- #: ../clients/tui/nmt-page-ip6.c:131
- msgid "Gateway"
- msgstr "Passerelle"
-
--#: ../clients/common/nm-vpn-helpers.c:131
-+#: ../clients/common/nm-vpn-helpers.c:168
- msgid "Cookie"
- msgstr "Cookie"
-
--#: ../clients/common/nm-vpn-helpers.c:132
-+#: ../clients/common/nm-vpn-helpers.c:169
- msgid "Gateway certificate hash"
- msgstr "Hachage de certificat de passerelle"
-
--#: ../clients/common/nm-vpn-helpers.c:257
-+#: ../clients/common/nm-vpn-helpers.c:267
- #, c-format
- msgid "Invalid peer starting at %s:%zu: %s"
- msgstr "Homologue non valide commençant à %s:%zu: %s"
-
--#: ../clients/common/nm-vpn-helpers.c:377
-+#: ../clients/common/nm-vpn-helpers.c:388
- msgid ""
--"The WireGuard config file must be a valid interface name followed by \".conf"
--"\""
-+"The name of the WireGuard config 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:666
-+#: ../clients/common/nm-vpn-helpers.c:680
- #, c-format
- msgid "unrecognized line at %s:%zu"
- msgstr "ligne non reconnue à %s:%zu"
-
--#: ../clients/common/nm-vpn-helpers.c:671
-+#: ../clients/common/nm-vpn-helpers.c:685
- #, c-format
- msgid "invalid value for '%s' at %s:%zu"
- msgstr "valeur non reconnue pour '%s' at %s:%zu"
-
--#: ../clients/common/nm-vpn-helpers.c:676
-+#: ../clients/common/nm-vpn-helpers.c:690
- #, c-format
- msgid "invalid secret '%s' at %s:%zu"
- msgstr "secret non valide '%s' à %s:%zu"
-
--#: ../clients/common/nm-vpn-helpers.c:789
-+#: ../clients/common/nm-vpn-helpers.c:823
- #, c-format
- msgid "Failed to create WireGuard connection: %s"
- msgstr "N'a pas pu créer de connexion WireGuard : %s"
-@@ -5902,7 +5977,7 @@ msgid ""
- msgstr "Si spécifié, demande au périphérique d'utiliser cette adresse MAC à la place. C'est ce qu'on appelle le clonage ou l'usurpation d'identité MAC. Outre la spécification explicite d'une adresse MAC, les valeurs spéciales \"preserve\", \"permanent\", \"random\" et \"stable\" sont supportées. \"préserver\" signifie ne pas toucher l'adresse MAC lors de l'activation. \"permanent\" signifie l'utilisation de l'adresse matérielle permanente du dispositif. \"random\" crée une adresse MAC aléatoire sur chaque connexion. \"stable\" crée une adresse MAC hachée basée sur connection.stable-id et une clé dépendante de la machine. Si elle n'est pas spécifiée, la valeur peut être écrasée via les valeurs par défaut globales, voir le manuel de NetworkManager.conf. Si elle n'est pas encore spécifiée, elle correspondra à \"permanent\" par défaut. Sur le bus D, ce champ est « assigned-mac-address » ou « cloned-mac-address » (déprécié)."
-
- #: ../clients/common/settings-docs.h.in:11
--#: ../clients/common/settings-docs.h.in:92
-+#: ../clients/common/settings-docs.h.in:94
- msgid ""
- "With \"cloned-mac-address\" setting \"random\" or \"stable\", by default all "
- "bits of the MAC address are scrambled and a locally-administered, unicast "
-@@ -5973,7 +6048,7 @@ msgid ""
- msgstr "Mode réseau Wi-Fi ; l'un des modes \"infrastructure\", \"adhoc\" ou \"ap\" ; Si vide, l'infrastructure est présumée."
-
- #: ../clients/common/settings-docs.h.in:17
--#: ../clients/common/settings-docs.h.in:95
-+#: ../clients/common/settings-docs.h.in:97
- msgid ""
- "If non-zero, only transmit packets of the specified size or smaller, "
- "breaking larger packets up into multiple Ethernet frames."
-@@ -6064,9 +6139,9 @@ msgstr "Une liste d'algorithmes de cryptage de groupe/diffusion qui empêche les
- #: ../clients/common/settings-docs.h.in:27
- msgid ""
- "Key management used for the connection. One of \"none\" (WEP), \"ieee8021x"
--"\" (Dynamic WEP), \"wpa-psk\" (infrastructure WPA-PSK), \"sae\" (SAE) or "
--"\"wpa-eap\" (WPA-Enterprise). This property must be set for any Wi-Fi "
--"connection that uses security."
-+"\" (Dynamic WEP), \"wpa-psk\" (infrastructure WPA-PSK), \"sae\" (SAE), \"owe"
-+"\" (Opportunistic Wireless Encryption) or \"wpa-eap\" (WPA-Enterprise). "
-+"This property must be set for any Wi-Fi connection that uses security."
- msgstr "Gestion des clés utilisées pour la connexion. L'une des options suivantes : \" none \" (WEP), \" ieee8021x \" (WEP dynamique), \" wpa-psk \" (infrastructure WPA-PSK), \" sae \" (SAE) ou \" wpa-eap \" (WPA-Enterprise). Cette propriété doit être définie pour toute connexion Wi-Fi qui utilise la sécurité."
-
- #: ../clients/common/settings-docs.h.in:28
-@@ -6205,15 +6280,17 @@ msgstr "Un délai d'attente pour l'authentification : zéro signifie la valeur p
- #: ../clients/common/settings-docs.h.in:47
- msgid ""
- "Contains the CA certificate if used by the EAP method specified in the \"eap"
--"\" property. Certificate data is specified using a \"scheme\"; two are "
--"currently supported: blob and path. When using the blob scheme (which is "
--"backwards compatible with NM 0.7.x) this property should be set to the "
--"certificate's DER encoded data. When using the path scheme, this property "
--"should be set to the full UTF-8 encoded path of the certificate, prefixed "
--"with the string \"file://\" and ending with a terminating NUL byte. This "
--"property can be unset even if the EAP method supports CA certificates, but "
--"this allows man-in-the-middle attacks and is NOT recommended."
--msgstr "Contient le certificat CA si utilisé par la méthode EAP spécifiée dans la propriété \"eap\". Les données du certificat sont spécifiées à l'aide d'un \"schéma\" ; deux sont actuellement prises en charge : blob et path. Lorsque vous utilisez le schéma blob (qui est rétrocompatible avec NM 0.7.x) cette propriété doit être définie sur les données codées UTF-8 du certificat. Lorsque vous utilisez le schéma path, cette propriété doit être définie comme chemin complet UTF-8, préfixée avec la chaîne \"file://\" et terminant par un byte NUL. Cette propriété peut être annulée même si la méthode EAP prend en charge les certificats, mais cela ouvre la porte aux attaques malveillantes et n’est donc pas conseillé."
-+"\" property. Certificate data is specified using a \"scheme\"; three are "
-+"currently supported: blob, path and pkcs#11 URL. When using the blob scheme "
-+"this property should be set to the certificate's DER encoded data. When "
-+"using the path scheme, this property should be set to the full UTF-8 encoded "
-+"path of the certificate, prefixed with the string \"file://\" and ending "
-+"with a terminating NUL byte. This property can be unset even if the EAP "
-+"method supports CA certificates, but this allows man-in-the-middle attacks "
-+"and is NOT recommended. Note that enabling NMSetting8021x:system-ca-certs "
-+"will override this setting to use the built-in path, if the built-in path is "
-+"not a directory."
-+msgstr "Contient le certificat CA si utilisé par la méthode EAP spécifiée dans la propriété \"eap\". Les données du certificat sont spécifiées à l'aide d'un \"schéma\" ; trois sont actuellement prises en charge : blob, path et pkcs#11. Lorsque vous utilisez le schéma blob, cette propriété doit être définie sur les données codées UTF-8 du certificat. Lorsque vous utilisez le schéma path, cette propriété doit être définie comme chemin complet UTF-8, préfixée avec la chaîne \"file://\" et terminant par un byte NUL. Cette propriété peut être annulée même si la méthode EAP prend en charge les certificats CA, mais cela ouvre la porte aux attaques malveillantes et n’est donc PAS conseillé. Notez qu’activer les NMSetting8021x:system-ca-certs remplacera cette configuration pour utiliser le chemin intégré si le chemin intégré ne correspond pas à un répertoire."
-
- #: ../clients/common/settings-docs.h.in:48
- msgid ""
-@@ -6230,8 +6307,10 @@ msgstr "Marqueurs indiquant comment gérer la propriété \"ca-cert-password\"."
- msgid ""
- "UTF-8 encoded path to a directory containing PEM or DER formatted "
- "certificates to be added to the verification chain in addition to the "
--"certificate specified in the \"ca-cert\" property."
--msgstr "Chemin encodé en UTF-8 vers un répertoire contenant les certificats au format PEM ou DER à ajouter à la chaîne de vérification en plus du certificat spécifié dans la propriété \"ca-cert\"."
-+"certificate specified in the \"ca-cert\" property. If NMSetting8021x:system-"
-+"ca-certs is enabled and the built-in CA path is an existing directory, then "
-+"this setting is ignored."
-+msgstr "Chemin codé en UTF-8 vers un répertoire contenant les certificats formatés PEM ou DER à ajouter à la chaîne de vérification en plus du certificat spécifié dans la propriété \"ca-cert\". Si NMSetting8021x:system-ca-certs est activé et que le chemin CA intégré est un répertoire existant, alors ce paramètre est ignoré."
-
- #: ../clients/common/settings-docs.h.in:51
- msgid ""
-@@ -6257,15 +6336,26 @@ msgstr "Marqueurs indiquant comment gérer la propriété \"client-cert-password
-
- #: ../clients/common/settings-docs.h.in:54
- msgid ""
--"Constraint for server domain name. If set, this FQDN is used as a suffix "
-+"Constraint for server domain name. If set, this list of FQDNs is used as a "
- "match requirement for dNSName element(s) of the certificate presented by the "
- "authentication server. If a matching dNSName is found, this constraint is "
- "met. If no dNSName values are present, this constraint is matched against "
--"SubjectName CN using same suffix match comparison."
--msgstr "Contrainte pour le nom de domaine du serveur. Si définie, ce FQDN est utilisé comme correspondance de suffixe pour le ou les éléments dNSName du certificat présenté par le serveur d'authentification. Si un dNSName correspondant est trouvé, cette contrainte est remplie. Si aucune valeur dNSName est présente, cette contrainte est comparée au CN du SubjectName en utilisant cette correspondance de suffixe."
-+"SubjectName CN using the same comparison. Multiple valid FQDNs can be passed "
-+"as a \";\" delimited list."
-+msgstr "Contrainte pour le nom de domaine du serveur. Si définie, cette liste de FQDN est utilisée comme correspondance de suffixe pour le ou les éléments dNSName du certificat présenté par le serveur d'authentification. Si un dNSName correspondant est trouvé, cette contrainte est remplie. Si aucune valeur dNSName est présente, cette contrainte est comparée au CN du SubjectName. Plusieurs FQDNs peuvent être passés en tant que liste délimitée par « ; »."
-
- #: ../clients/common/settings-docs.h.in:55
- msgid ""
-+"Constraint for server domain name. If set, this FQDN is used as a suffix "
-+"match requirement for dNSName element(s) of the certificate presented by the "
-+"authentication server. If a matching dNSName is found, this constraint is "
-+"met. If no dNSName values are present, this constraint is matched against "
-+"SubjectName CN using same suffix match comparison. Since version 1.24, "
-+"multiple valid FQDNs can be passed as a \";\" delimited list."
-+msgstr "Contrainte pour le nom de domaine du serveur. Si défini, ce FQDN est utilisé comme correspondance de suffixe pour le ou les éléments dNSName du certificat présenté par le serveur d'authentification. Si un dNSName correspondant est trouvé, cette contrainte est remplie. Si aucune valeur dNSName est présente, cette contrainte est comparée au CN du SubjectName en utilisant cette correspondance de suffixe. Depuis la version 1.24, plusieurs FQDN valides peuvent être passés en tant que liste délimitée par « ; »."
-+
-+#: ../clients/common/settings-docs.h.in:56
-+msgid ""
- "The allowed EAP method to be used when authenticating to the network with "
- "802.1x. Valid methods are: \"leap\", \"md5\", \"tls\", \"peap\", \"ttls\", "
- "\"pwd\", and \"fast\". Each method requires different configuration using "
-@@ -6273,13 +6363,13 @@ msgid ""
- "the allowed combinations."
- msgstr "La méthode EAP autorisée lors de l'authentification au réseau avec 802.1x. Les méthodes valides sont : \"saut\", \"md5\", \"tls\", \"peap\", \"ttls\", \"ttls\", \"pwd\" et \"fast\". Chaque méthode nécessite différentes configurations utilisant les propriétés de ce paramètre ; consultez la documentation wpa_supplicant pour les combinaisons possibles."
-
--#: ../clients/common/settings-docs.h.in:56
-+#: ../clients/common/settings-docs.h.in:57
- msgid ""
- "Identity string for EAP authentication methods. Often the user's user or "
- "login name."
- msgstr "Chaîne d'identité pour les méthodes d'authentification EAP. Souvent le nom d'utilisateur ou de connexion de l'utilisateur."
-
--#: ../clients/common/settings-docs.h.in:57
-+#: ../clients/common/settings-docs.h.in:58
- msgid ""
- "Whether the 802.1X authentication is optional. If TRUE, the activation will "
- "continue even after a timeout or an authentication failure. Setting the "
-@@ -6287,26 +6377,26 @@ msgid ""
- "to FALSE, the activation can continue only after a successful authentication."
- msgstr "Si l'authentification 802.1X est facultative. Si elle est TRUE, l'activation se poursuivra même après un délai d'attente ou un échec d'authentification. Le réglage de la propriété sur TRUE n'est actuellement autorisé que pour les connexions Ethernet. Si elle est réglée sur FALSE, l'activation ne peut se poursuivre qu'après une authentification réussie."
-
--#: ../clients/common/settings-docs.h.in:58
-+#: ../clients/common/settings-docs.h.in:59
- msgid "UTF-8 encoded file path containing PAC for EAP-FAST."
- msgstr "Chemin de fichier encodé UTF-8 contenant PAC pour EAP-FAST."
-
--#: ../clients/common/settings-docs.h.in:59
-+#: ../clients/common/settings-docs.h.in:60
- msgid ""
- "UTF-8 encoded password used for EAP authentication methods. If both the "
- "\"password\" property and the \"password-raw\" property are specified, "
- "\"password\" is preferred."
- msgstr "Mot de passe encodé UTF-8 utilisé pour les méthodes d'authentification EAP. Si la propriété \"password\" et la propriété \"password-raw\" sont toutes deux spécifiées, on choisira \"password\"."
-
--#: ../clients/common/settings-docs.h.in:60
--#: ../clients/common/settings-docs.h.in:105
--#: ../clients/common/settings-docs.h.in:132
--#: ../clients/common/settings-docs.h.in:181
--#: ../clients/common/settings-docs.h.in:299
-+#: ../clients/common/settings-docs.h.in:61
-+#: ../clients/common/settings-docs.h.in:107
-+#: ../clients/common/settings-docs.h.in:149
-+#: ../clients/common/settings-docs.h.in:199
-+#: ../clients/common/settings-docs.h.in:321
- msgid "Flags indicating how to handle the \"password\" property."
- msgstr "Marqueurs indiquant comment gérer la propriété \"password\"."
-
--#: ../clients/common/settings-docs.h.in:61
-+#: ../clients/common/settings-docs.h.in:62
- msgid ""
- "Password used for EAP authentication methods, given as a byte array to allow "
- "passwords in other encodings than UTF-8 to be used. If both the \"password\" "
-@@ -6314,11 +6404,11 @@ msgid ""
- "preferred."
- msgstr "Mot de passe utilisé pour les méthodes d'authentification EAP, donné sous forme de tableau d'octets pour permettre l'utilisation de mots de passe dans d'autres encodages que UTF-8. Si la propriété \"password\" et la propriété \"password-raw\" sont spécifiées, on choisira \"password\"."
-
--#: ../clients/common/settings-docs.h.in:62
-+#: ../clients/common/settings-docs.h.in:63
- msgid "Flags indicating how to handle the \"password-raw\" property."
- msgstr "Marqueurs indiquant comment gérer la propriété \"password-raw\"."
-
--#: ../clients/common/settings-docs.h.in:63
-+#: ../clients/common/settings-docs.h.in:64
- msgid ""
- "Specifies authentication flags to use in \"phase 1\" outer authentication "
- "using NMSetting8021xAuthFlags options. The individual TLS versions can be "
-@@ -6328,7 +6418,7 @@ msgid ""
- "details."
- msgstr "Spécifie les marqueurs d'authentification à utiliser dans l'authentification externe \"phase 1\" en utilisant les options NMSetting8021xAuthFlags Les versions TLS individuelles peuvent être explicitement désactivées. Si un certain marqueur TLS désactivé n'est pas activé, il appartient au suppliant de l'autoriser ou non. Les options TLS correspondent aux paramètres tls_disable_tlsv1_x. Consultez la documentation wpa_supplicant pour plus de détails."
-
--#: ../clients/common/settings-docs.h.in:64
-+#: ../clients/common/settings-docs.h.in:65
- msgid ""
- "Enables or disables in-line provisioning of EAP-FAST credentials when FAST "
- "is specified as the EAP method in the \"eap\" property. Recognized values "
-@@ -6338,7 +6428,7 @@ msgid ""
- "documentation for more details."
- msgstr "Active ou désactive le provisionnement en ligne des identifiants EAP-FAST lorsque FAST est spécifié comme méthode EAP dans la propriété \"eap\". Les valeurs reconnues sont \"0\" (désactivé), \"1\" (autorise le provisionnement non authentifié), \"2\" (autorise le provisionnement authentifié) et \"3\" (autorise le provisionnement authentifié et non authentifié). Voir la documentation wpa_supplicant pour plus de détails."
-
--#: ../clients/common/settings-docs.h.in:65
-+#: ../clients/common/settings-docs.h.in:66
- msgid ""
- "Forces use of the new PEAP label during key derivation. Some RADIUS servers "
- "may require forcing the new PEAP label to interoperate with PEAPv1. Set to "
-@@ -6346,7 +6436,7 @@ msgid ""
- "documentation for more details."
- msgstr "Force l'utilisation du nouveau label PEAP lors de la dérivation des clés. Certains serveurs RADIUS peuvent nécessiter de forcer le nouveau label PEAP à inter opérer avec PEAPv1. Définir sur \"1\" pour forcer l'utilisation du nouveau label PEAP. Consultez la documentation wpa_supplicant pour plus de détails."
-
--#: ../clients/common/settings-docs.h.in:66
-+#: ../clients/common/settings-docs.h.in:67
- msgid ""
- "Forces which PEAP version is used when PEAP is set as the EAP method in the "
- "\"eap\" property. When unset, the version reported by the server will be "
-@@ -6355,7 +6445,7 @@ msgid ""
- "set to \"0\" or \"1\" to force that specific PEAP version."
- msgstr "Force quelle version de PEAP est utilisée lorsque PEAP est définie comme méthode EAP dans la propriété \"eap\". Lorsqu'elle est désactivée, la version signalée par le serveur sera utilisée. Parfois, lors de l'utilisation d'anciens serveurs RADIUS, il est nécessaire de forcer le client à utiliser une version PEAP particulière. Pour ce faire, cette propriété peut être définie sur \"0\" ou \"1\" pour forcer cette version spécifique de PEAP."
-
--#: ../clients/common/settings-docs.h.in:67
-+#: ../clients/common/settings-docs.h.in:68
- msgid ""
- "List of strings to be matched against the altSubjectName of the certificate "
- "presented by the authentication server during the inner \"phase 2\" "
-@@ -6363,7 +6453,7 @@ msgid ""
- "certificate's altSubjectName is performed."
- msgstr "Liste des chaînes à comparer avec le nom altSubjectName du certificat présenté par le serveur d'authentification lors de l'authentification interne \"phase 2\" Si la liste est vide, aucune vérification du nom altSubjectName du certificat du serveur n'est effectuée."
-
--#: ../clients/common/settings-docs.h.in:68
-+#: ../clients/common/settings-docs.h.in:69
- msgid ""
- "Specifies the allowed \"phase 2\" inner non-EAP authentication method when "
- "an EAP method that uses an inner TLS tunnel is specified in the \"eap\" "
-@@ -6371,9 +6461,9 @@ msgid ""
- "\"mschap\", \"mschapv2\", \"gtc\", \"otp\", \"md5\", and \"tls\". Each "
- "\"phase 2\" inner method requires specific parameters for successful "
- "authentication; see the wpa_supplicant documentation for more details."
--msgstr "Spécifie la méthode d'authentification interne non-EAP \"phase 2\" autorisée lorsqu'une méthode EAP qui utilise un tunnel TLS interne est spécifiée dans la propriété \"eap\". Les méthodes reconnues de la \" phase 2 \" qui ne font pas partie du PAE sont \" pap \", \" chap \", \" mschap \", \" mschapv2 \", \" gtc \", \" otp \", \" md5 \" et \" tls \". Chaque méthode interne de \"phase 2\" nécessite des paramètres spécifiques pour une authentification réussie ; voir la documentation de wpa_supplicant pour plus de détails."
-+msgstr "Spécifie la méthode d'authentification interne non-EAP \"phase 2\" autorisée lorsqu'une méthode EAP qui utilise un tunnel TLS interne est spécifiée dans la propriété \"eap\". Les méthodes reconnues de la \" phase 2 \" qui ne font pas partie d’EAP sont \" pap \", \" chap \", \" mschap \", \" mschapv2 \", \" gtc \", \" otp \", \" md5 \" et \" tls \". Chaque méthode interne de \"phase 2\" nécessite des paramètres spécifiques pour une authentification réussie ; voir la documentation de wpa_supplicant pour plus de détails."
-
--#: ../clients/common/settings-docs.h.in:69
-+#: ../clients/common/settings-docs.h.in:70
- msgid ""
- "Specifies the allowed \"phase 2\" inner EAP-based authentication method when "
- "an EAP method that uses an inner TLS tunnel is specified in the \"eap\" "
-@@ -6381,42 +6471,45 @@ msgid ""
- "\"mschapv2\", \"otp\", \"gtc\", and \"tls\". Each \"phase 2\" inner method "
- "requires specific parameters for successful authentication; see the "
- "wpa_supplicant documentation for more details."
--msgstr "Spécifie la méthode d'authentification interne non-EAP \"phase 2\" autorisée lorsqu'une méthode EAP qui utilise un tunnel TLS interne est spécifiée dans la propriété \"eap\". Les méthodes reconnues de la \" phase 2 \" qui ne font pas partie du PAE sont \" pap \", \" chap \", \" mschap \", \" md5 \", \" gtc \", \" otp \", \" mschapv2 \" et \" tls \". Chaque méthode interne de \"phase 2\" nécessite des paramètres spécifiques pour une authentification réussie ; voir la documentation de wpa_supplicant pour plus de détails."
-+msgstr "Spécifie la méthode d'authentification interne non-EAP \"phase 2\" autorisée lorsqu'une méthode EAP qui utilise un tunnel TLS interne est spécifiée dans la propriété \"eap\". Les méthodes reconnues de \"phase 2\" basées sur EAP sont \"md5\", \"mschapv2\", \"otp\", \"gtc\" et \"tls\". Chaque méthode interne de \"phase 2\" nécessite des paramètres spécifiques pour une authentification réussie ; voir la documentation wpa_supplicant pour plus de détails."
-
--#: ../clients/common/settings-docs.h.in:70
-+#: ../clients/common/settings-docs.h.in:71
- msgid ""
- "Contains the \"phase 2\" CA certificate if used by the EAP method specified "
- "in the \"phase2-auth\" or \"phase2-autheap\" properties. Certificate data is "
--"specified using a \"scheme\"; two are currently supported: blob and path. "
--"When using the blob scheme (which is backwards compatible with NM 0.7.x) "
--"this property should be set to the certificate's DER encoded data. When "
--"using the path scheme, this property should be set to the full UTF-8 encoded "
--"path of the certificate, prefixed with the string \"file://\" and ending "
--"with a terminating NUL byte. This property can be unset even if the EAP "
--"method supports CA certificates, but this allows man-in-the-middle attacks "
--"and is NOT recommended."
--msgstr "Contient le certificat CA \"phase 2\" si utilisé par la méthode EAP spécifiée dans les propriétés \"phase2-auth\" ou \"phase2-autheap\". Les données du certificat sont spécifiées à l'aide d'un \"schéma\" ; deux sont actuellement supportées : blob et path. Lorsque le schéma blob (qui est rétrocompatible avec NM 0.7.x) est utilisé, cette propriété doit être définie sur les données du certificat encodées DER. Lorsque le schéma path est utilisé, cette propriété doit être définie comme chemin complet UTF-8, préfixée de \"file://\" et se terminant par un octet NUL de terminaison. Cette propriété peut être désactivée même si la méthode EAP supporte les certificats CA, mais cela permet les attaques malveillantes et n'est PAS recommandé."
-+"specified using a \"scheme\"; three are currently supported: blob, path and "
-+"pkcs#11 URL. When using the blob scheme this property should be set to the "
-+"certificate's DER encoded data. When using the path scheme, this property "
-+"should be set to the full UTF-8 encoded path of the certificate, prefixed "
-+"with the string \"file://\" and ending with a terminating NUL byte. This "
-+"property can be unset even if the EAP method supports CA certificates, but "
-+"this allows man-in-the-middle attacks and is NOT recommended. Note that "
-+"enabling NMSetting8021x:system-ca-certs will override this setting to use "
-+"the built-in path, if the built-in path is not a directory."
-+msgstr "Contient le certificat de l'AC \"phase 2\" s'il est utilisé par la méthode EAP spécifiée dans les propriétés \"phase2-auth\" ou \"phase2-autheap\". Les données du certificat sont spécifiées à l'aide d'un \"schéma\" ; trois sont actuellement prises en charge : blob, path et pkcs#11 URL. Lorsque vous utilisez le schéma blob, cette propriété doit être définie sur les données codées DER du certificat. Lorsque vous utilisez le schéma path, cette propriété doit être définie sur le chemin complet du certificat encodé en UTF-8, préfixé par la chaîne \"file://\" et se terminant par un octet NUL. Cette propriété peut être désactivée même si la méthode EAP prend en charge les certificats CA, mais cela permet des attaques malveillantes et n'est PAS recommandé. Notez que l'activation de NMSetting8021x:system-ca-certs remplacera ce paramètre pour utiliser le chemin intégré, si le chemin intégré n'est pas un répertoire."
-
--#: ../clients/common/settings-docs.h.in:71
-+#: ../clients/common/settings-docs.h.in:72
- msgid ""
- "The password used to access the \"phase2\" CA certificate stored in \"phase2-"
- "ca-cert\" property. Only makes sense if the certificate is stored on a "
- "PKCS#11 token that requires a login."
- msgstr "Le mot de passe utilisé pour accéder au certificat CA \"phase2\" stocké dans la propriété \"phase2-ca-cert\" n'a de sens que si le certificat est stocké sur un jeton PKCS#11 qui nécessite un login."
-
--#: ../clients/common/settings-docs.h.in:72
-+#: ../clients/common/settings-docs.h.in:73
- msgid ""
- "Flags indicating how to handle the \"phase2-ca-cert-password\" property."
- msgstr "Marqueurs indiquant comment gérer la propriété \"phase2-ca-cert-password\"."
-
--#: ../clients/common/settings-docs.h.in:73
-+#: ../clients/common/settings-docs.h.in:74
- msgid ""
- "UTF-8 encoded path to a directory containing PEM or DER formatted "
- "certificates to be added to the verification chain in addition to the "
--"certificate specified in the \"phase2-ca-cert\" property."
--msgstr "Chemin encodé en UTF-8 vers un répertoire contenant les certificats formatés PEM ou DER à ajouter à la chaîne de vérification en plus du certificat spécifié dans la propriété \"phase2-ca-cert\"."
-+"certificate specified in the \"phase2-ca-cert\" property. If NMSetting8021x:"
-+"system-ca-certs is enabled and the built-in CA path is an existing "
-+"directory, then this setting is ignored."
-+msgstr "Chemin encodé en UTF-8 vers un répertoire contenant les certificats formatés PEM ou DER à ajouter à la chaîne de vérification en plus du certificat spécifié dans la propriété \"phase2-ca-cert\". Si NMSetting8021x:system-ca-certs est activé et que le chemin d'accès intégré à l'AC est un répertoire existant, ce paramètre est ignoré."
-
--#: ../clients/common/settings-docs.h.in:74
-+#: ../clients/common/settings-docs.h.in:75
- msgid ""
- "Contains the \"phase 2\" client certificate if used by the EAP method "
- "specified in the \"phase2-auth\" or \"phase2-autheap\" properties. "
-@@ -6430,29 +6523,40 @@ msgid ""
- "in-the-middle attacks and is NOT recommended."
- msgstr "Contient le certificat client \"phase 2\" si utilisé par la méthode EAP spécifiée dans les propriétés \"phase2-auth\" ou \"phase2-autheap\" ; les données du certificat sont spécifiées en utilisant un \"schéma\" ; deux sont actuellement supportées : blob et path ; lorsque vous utilisez le schéma blob (qui est rétrocompatible avec NM 0.7.x) cette propriété doit être définie comme les données codées DER du certificat, et le chemin complet du certificat doit être défini en UTF-8, avec le \"file://\" et se terminant par un octet NUL de terminaison. Cette propriété peut être désactivée même si la méthode EAP supporte les certificats CA, mais cela permet les attaques malveillantes et n'est PAS recommandé."
-
--#: ../clients/common/settings-docs.h.in:75
-+#: ../clients/common/settings-docs.h.in:76
- msgid ""
- "The password used to access the \"phase2\" client certificate stored in "
- "\"phase2-client-cert\" property. Only makes sense if the certificate is "
- "stored on a PKCS#11 token that requires a login."
- msgstr "Le mot de passe utilisé pour accéder au certificat client \"phase2\" stocké dans la propriété \"phase2-client-cert\" n'a de sens que si le certificat est stocké sur un jeton PKCS#11 qui nécessite un login."
-
--#: ../clients/common/settings-docs.h.in:76
-+#: ../clients/common/settings-docs.h.in:77
- msgid ""
- "Flags indicating how to handle the \"phase2-client-cert-password\" property."
- msgstr "Marqueurs indiquant comment gérer la propriété \"phase2-client-cert-password\"."
-
--#: ../clients/common/settings-docs.h.in:77
-+#: ../clients/common/settings-docs.h.in:78
-+msgid ""
-+"Constraint for server domain name. If set, this list of FQDNs is used as a "
-+"match requirement for dNSName element(s) of the certificate presented by the "
-+"authentication server during the inner \"phase 2\" authentication. If a "
-+"matching dNSName is found, this constraint is met. If no dNSName values are "
-+"present, this constraint is matched against SubjectName CN using the same "
-+"comparison. Multiple valid FQDNs can be passed as a \";\" delimited list."
-+msgstr "Contrainte pour le nom de domaine du serveur. Si définie, ce FQDN est utilisé comme exigence de correspondance de suffixe pour le ou les éléments dNSName du certificat présenté par le serveur d'authentification pendant l'authentification interne \"phase 2\". Si un dNSName correspondant est trouvé, cette contrainte est remplie. Si aucune valeur dNSName n'est présente, cette contrainte est comparée à CN SubjectName utilisant la même correspondance. Plusieurs FQDNs valides peuvent être passés comme une liste délimitée par « ; »."
-+
-+#: ../clients/common/settings-docs.h.in:79
- msgid ""
- "Constraint for server domain name. If set, this FQDN is used as a suffix "
- "match requirement for dNSName element(s) of the certificate presented by the "
- "authentication server during the inner \"phase 2\" authentication. If a "
- "matching dNSName is found, this constraint is met. If no dNSName values are "
- "present, this constraint is matched against SubjectName CN using same suffix "
--"match comparison."
--msgstr "Contrainte pour le nom de domaine du serveur. Si définie, ce FQDN est utilisé comme exigence de correspondance de suffixe pour le ou les éléments dNSName du certificat présenté par le serveur d'authentification pendant l'authentification interne \"phase 2\". Si un dNSName correspondant est trouvé, cette contrainte est remplie. Si aucune valeur dNSName n'est présente, cette contrainte est comparée à CN SubjectName utilisant la même correspondance de suffixe."
-+"match comparison. Since version 1.24, multiple valid FQDNs can be passed as "
-+"a \";\" delimited list."
-+msgstr "Contrainte pour le nom de domaine du serveur. Si défini, ce FQDN est utilisé comme exigence de correspondance de suffixe pour le ou les éléments dNSName du certificat présenté par le serveur d'authentification pendant l'authentification interne \"phase 2\". Si un dNSName correspondant est trouvé, cette contrainte est remplie. Si aucune valeur dNSName n'est présente, cette contrainte est comparée à CN SubjectName utilisant la même correspondance de suffixe. Depuis la version 1.24, plusieurs FQDNs valides peuvent être passés comme une liste délimitée par « ; »."
-
--#: ../clients/common/settings-docs.h.in:78
-+#: ../clients/common/settings-docs.h.in:80
- msgid ""
- "Contains the \"phase 2\" inner private key when the \"phase2-auth\" or "
- "\"phase2-autheap\" property is set to \"tls\". Key data is specified using a "
-@@ -6471,19 +6575,19 @@ msgid ""
- "decode the PKCS#12 private key and certificate."
- msgstr "Contient la clé privée interne \"phase 2\" lorsque la propriété \"phase2-auth\" ou \"phase2-autheap\" est définie sur \"tls\". Les données clés sont spécifiées à l'aide d'un \"schéma\" ; deux sont actuellement prises en charge : blob et path. Lors de l'utilisation du schéma blob et des clés privées, cette propriété doit être définie sur les données codées PEM cryptées de la clé. Lors de l'utilisation de clés privées avec le schéma de chemin d'accès, cette propriété doit être définie sur le chemin d'accès encodé UTF-8 complet de la clé, préfixé par la chaîne \"file:///\" et se terminant par un octet NUL de fin. Lors de l'utilisation des clés privées au format PKCS#12 et du schéma blob, cette propriété doit être définie sur les données PKCS#12 et la propriété \"phase2-private-key-password\" doit être définie sur le mot de passe utilisé pour décrypter le certificat et la clé PKCS#12. Lors de l'utilisation des fichiers PKCS#12 et du schéma de chemins, cette propriété doit être définie sur le chemin complet encodé en UTF-8 de la clé, préfixé par la chaîne \"file://\" et se terminant par un octet NUL de fin, et comme pour le schéma blob, la propriété \"phase2-private-key-password\" doit être définie comme le mot de passe utilisé pour décoder la clé privée PKCS#12 et son certificat."
-
--#: ../clients/common/settings-docs.h.in:79
-+#: ../clients/common/settings-docs.h.in:81
- msgid ""
- "The password used to decrypt the \"phase 2\" private key specified in the "
- "\"phase2-private-key\" property when the private key either uses the path "
- "scheme, or is a PKCS#12 format key."
- msgstr "Le mot de passe utilisé pour déchiffrer la clé privée \"phase 2\" spécifiée dans la propriété \"phase2-private-key\" lorsque la clé privée utilise le schéma de chemins ou est une clé au format PKCS#12."
-
--#: ../clients/common/settings-docs.h.in:80
-+#: ../clients/common/settings-docs.h.in:82
- msgid ""
- "Flags indicating how to handle the \"phase2-private-key-password\" property."
- msgstr "Indicateurs de gestion de la propriété \"phase2-private-key-password\"."
-
--#: ../clients/common/settings-docs.h.in:81
-+#: ../clients/common/settings-docs.h.in:83
- msgid ""
- "Substring to be matched against the subject of the certificate presented by "
- "the authentication server during the inner \"phase 2\" authentication. When "
-@@ -6492,16 +6596,16 @@ msgid ""
- "deprecated in favor of NMSetting8021x:phase2-domain-suffix-match."
- msgstr "Substring à faire correspondre à l'objet du certificat présenté par le serveur d'authentification lors de l'authentification interne \"phase 2\". Si non défini, on ne peut vérifier l'objet du certificat du serveur d'authentification. Cette propriété fournit peu de sécurité, si elle existe, et son utilisation est dépréciée en faveur du NMSetting8021x:phase2-domain-suffix-match."
-
--#: ../clients/common/settings-docs.h.in:82
-+#: ../clients/common/settings-docs.h.in:84
- msgid "PIN used for EAP authentication methods."
- msgstr "PIN utilisé pour les méthodes d'authentification EAP."
-
--#: ../clients/common/settings-docs.h.in:83
--#: ../clients/common/settings-docs.h.in:183
-+#: ../clients/common/settings-docs.h.in:85
-+#: ../clients/common/settings-docs.h.in:201
- msgid "Flags indicating how to handle the \"pin\" property."
- msgstr "Marqueurs indiquant comment gérer la propriété \"pin\"."
-
--#: ../clients/common/settings-docs.h.in:84
-+#: ../clients/common/settings-docs.h.in:86
- msgid ""
- "Contains the private key when the \"eap\" property is set to \"tls\". Key "
- "data is specified using a \"scheme\"; two are currently supported: blob and "
-@@ -6523,18 +6627,18 @@ msgid ""
- "to prevent unauthorized access to unencrypted private key data."
- msgstr "Contient la clé privée lorsque la propriété \"eap\" est définie sur \"tls\". Les données clés sont spécifiées à l'aide d'un \"schéma\" ; deux sont actuellement prises en charge : blob et path. Lors de l'utilisation du schéma blob et des clés privées, cette propriété doit être définie sur les données codées PEM cryptées de la clé. Lors de l'utilisation de clés privées avec le schéma de chemin d'accès, cette propriété doit être définie sur le chemin d'accès encodé UTF-8 complet de la clé, préfixé par la chaîne \"file:///\" et se terminant par un octet NUL de fin. Lors de l'utilisation des clés privées au format PKCS#12 et du schéma blob, cette propriété doit être définie sur les données PKCS#12 et la propriété \"clé privée-mot de passe\" doit être définie sur mot de passe utilisé pour décrypter le certificat et la clé PKCS#12. Lors de l'utilisation des fichiers PKCS#12 et du schéma de chemins, cette propriété doit être définie sur le chemin complet encodé en UTF-8 de la clé, préfixé par la chaîne \"file://\" et se terminant par un octet NUL de fin, et comme pour le schéma blob, la propriété \"private key-password\" doit être définie par le mot de passe utilisé pour décoder la clé privée et le certificat PKCS#12. ATTENTION : \"clé privée\" n'est pas une propriété \"secrète\", et donc des données de clé privée non cryptées utilisant le schéma BLOB peuvent être lues par des utilisateurs non privilégiés. Les clés privées doivent toujours être cryptées à l'aide d'un mot de passe de clé privée afin d'empêcher tout accès non autorisé aux données non cryptées des clés privées."
-
--#: ../clients/common/settings-docs.h.in:85
-+#: ../clients/common/settings-docs.h.in:87
- msgid ""
- "The password used to decrypt the private key specified in the \"private-key"
- "\" property when the private key either uses the path scheme, or if the "
- "private key is a PKCS#12 format key."
- msgstr "Le mot de passe utilisé pour déchiffrer la clé privée spécifiée dans la propriété \" private key \" lorsque la clé privée utilise le schéma de chemins ou si la clé privée est une clé au format PKCS#12."
-
--#: ../clients/common/settings-docs.h.in:86
-+#: ../clients/common/settings-docs.h.in:88
- msgid "Flags indicating how to handle the \"private-key-password\" property."
- msgstr "Marqueurs indiquant comment gérer la propriété \"private-key-password\"."
-
--#: ../clients/common/settings-docs.h.in:87
-+#: ../clients/common/settings-docs.h.in:89
- msgid ""
- "Substring to be matched against the subject of the certificate presented by "
- "the authentication server. When unset, no verification of the authentication "
-@@ -6543,7 +6647,7 @@ msgid ""
- "domain-suffix-match."
- msgstr "Sous-chaîne à faire correspondre à l'objet du certificat présenté par le serveur d'authentification. Lorsqu'il est désactivé, aucune vérification de l'objet du certificat du serveur d'authentification n'est effectuée. Cette propriété offre peu de sécurité, voire aucune, et son utilisation est dépréciée en faveur de NMSetting8021x:domain-suffix-match"
-
--#: ../clients/common/settings-docs.h.in:88
-+#: ../clients/common/settings-docs.h.in:90
- msgid ""
- "When TRUE, overrides the \"ca-path\" and \"phase2-ca-path\" properties using "
- "the system CA directory specified at configure time with the --system-ca-"
-@@ -6555,7 +6659,7 @@ msgid ""
- "options for wpa_supplicant)."
- msgstr "Si définie sur TRUE, remplace les propriétés \"ca-path\" et \"phase2-ca-path\" en utilisant le répertoire CA système spécifié lors de la configuration avec le commutateur --system-ca-path. Les certificats de ce répertoire sont ajoutés à la chaîne de vérification en plus des certificats spécifiés par les propriétés \"ca-cert\" et \"phase2-ca-cert\". Si le chemin fourni avec --system-ca-path est plutôt un nom de fichier (paquet de certificats CA de confiance), il remplace les propriétés \"ca-cert\" et \"phase2-ca-cert\" (définit les options ca_cert/ca_cert2 pour wpa_supplicant)."
-
--#: ../clients/common/settings-docs.h.in:89
-+#: ../clients/common/settings-docs.h.in:91
- msgid ""
- "When TRUE, enforce auto-negotiation of speed and duplex mode. If \"speed\" "
- "and \"duplex\" properties are both specified, only that single mode will be "
-@@ -6566,7 +6670,7 @@ msgid ""
- "be skipped."
- msgstr "Si défini sur TRUE, applique la négociation automatique de la vitesse et du mode duplex. Si les propriétés \"speed\" et \"duplex\" sont toutes les deux spécifiées, seul ce mode unique sera annoncé et accepté pendant le processus d'auto-négociation des liens : cela ne fonctionne que pour les spécifications BASE-T 802.3 et est utile pour faire respecter les modes gigabits, car dans ces cas, la négociation des liens est obligatoire. Si défini sur FALSE, les propriétés \"speed\" et \"duplex\" doivent être toutes les deux réglées ou la configuration de la liaison sera ignorée."
-
--#: ../clients/common/settings-docs.h.in:90
-+#: ../clients/common/settings-docs.h.in:92
- msgid ""
- "If specified, request that the device use this MAC address instead. This is "
- "known as MAC cloning or spoofing. Beside explicitly specifying a MAC "
-@@ -6583,7 +6687,7 @@ msgid ""
- "\"cloned-mac-address\"."
- msgstr "Si spécifié, demande au périphérique d'utiliser cette adresse MAC à la place. C'est ce qu'on appelle le clonage ou l'usurpation d'identité MAC. Outre la spécification explicite d'une adresse MAC, les valeurs spéciales \"preserve\", \"permanent\", \"random\" et \"stable\" sont supportées. \"préserver\" signifie ne pas toucher l'adresse MAC lors de l'activation. \"permanent\" signifie l'utilisation de l'adresse matérielle permanente du dispositif. \"random\" crée une adresse MAC aléatoire sur chaque connexion. \"stable\" crée une adresse MAC hachée basée sur connection.stable-id et une clé dépendante de la machine. Si elle n'est pas spécifiée, la valeur peut être écrasée via les valeurs par défaut globales, voir le manuel de NetworkManager.conf. Si elle n'est pas encore spécifiée, elle correspondra à \"permanent\" par défaut. Sur le bus D, ce champ est « assigned-mac-address » ou « cloned-mac-address » (déprécié)."
-
--#: ../clients/common/settings-docs.h.in:91
-+#: ../clients/common/settings-docs.h.in:93
- msgid ""
- "When a value is set, either \"half\" or \"full\", configures the device to "
- "use the specified duplex mode. If \"auto-negotiate\" is \"yes\" the "
-@@ -6598,21 +6702,21 @@ msgid ""
- "your device supports it."
- msgstr "Lorsqu'une valeur est définie, \"half\" ou \"full\", ella a pour effet de configurer l'appareil pour qu'il utilise le mode duplex spécifié. Si \"auto-negociate\" est sur \"yes\", le mode duplex spécifié sera le seul proposé lors de la négociation du lien : il ne fonctionne que pour les spécifications BASE-T 802.3 et est utile pour faire respecter les modes gigabits, car dans ces cas la négociation du lien est obligatoire. Si la valeur n'est pas définie (valeur par défaut), la configuration du lien sera soit ignorée (si \"auto-negociate\" est sur \"no\", la valeur par défaut), soit négociée automatiquement (si \"auto-negociate\" est sur \"yes\") et le périphérique local annoncera tous les modes duplex supportés. Doit être défini avec la propriété \"speed\" si spécifié. Avant de spécifier un mode duplex, assurez-vous que votre périphérique le prenne bien en charge."
-
--#: ../clients/common/settings-docs.h.in:93
-+#: ../clients/common/settings-docs.h.in:95
- msgid ""
- "If specified, this connection will only apply to the Ethernet device whose "
- "permanent MAC address matches. This property does not change the MAC address "
- "of the device (i.e. MAC spoofing)."
- msgstr "Si spécifiée, cette connexion ne s'applique qu'au périphérique Ethernet dont l'adresse MAC permanente correspond à l'adresse MAC. Cette propriété ne change pas l'adresse MAC du périphérique (c'est-à-dire l'usurpation d'identité MAC)."
-
--#: ../clients/common/settings-docs.h.in:94
-+#: ../clients/common/settings-docs.h.in:96
- msgid ""
- "If specified, this connection will never apply to the Ethernet device whose "
- "permanent MAC address matches an address in the list. Each MAC address is "
- "in the standard hex-digits-and-colons notation (00:11:22:33:44:55)."
- msgstr "Si spécifiée, cette connexion ne s'appliquera jamais au périphérique Ethernet dont l'adresse MAC permanente correspond à une adresse dans la liste. Chaque adresse MAC est en notation standard hexadécimale (00:11:22:33:44:55)."
-
--#: ../clients/common/settings-docs.h.in:96
-+#: ../clients/common/settings-docs.h.in:98
- msgid ""
- "Specific port type to use if the device supports multiple attachment "
- "methods. One of \"tp\" (Twisted Pair), \"aui\" (Attachment Unit Interface), "
-@@ -6620,13 +6724,13 @@ msgid ""
- "device supports only one port type, this setting is ignored."
- msgstr "Type de port spécifique à utiliser si l'appareil prend en charge plusieurs méthodes de connexion. Un des types \"tp\" (Twisted Pair), \"aui\" (Attachment Unit Interface), \"bnc\" (Thin Ethernet) ou \"mii\" (Media Independent Interface). Si l'appareil ne prend en charge qu'un type de port, ce paramètre sera ignoré."
-
--#: ../clients/common/settings-docs.h.in:97
-+#: ../clients/common/settings-docs.h.in:99
- msgid ""
- "s390 network device type; one of \"qeth\", \"lcs\", or \"ctc\", representing "
- "the different types of virtual network devices available on s390 systems."
- msgstr "type de périphérique réseau s390 ; un parmi \"qeth\", \"lcs\" ou \"ctc\", représentant les différents types de périphériques réseau virtuels disponibles sur les systèmes s390."
-
--#: ../clients/common/settings-docs.h.in:98
-+#: ../clients/common/settings-docs.h.in:100
- msgid ""
- "Dictionary of key/value pairs of s390-specific device options. Both keys "
- "and values must be strings. Allowed keys include \"portno\", \"layer2\", "
-@@ -6634,7 +6738,7 @@ msgid ""
- "alphanumeric characters (ie, [a-zA-Z0-9])."
- msgstr "Dictionnaire des paires clé/valeur des options de périphériques spécifiques à s390. Les clés et les valeurs doivent correspondre à des chaînes de caractères. Les clés autorisées comprennent \"portno\", \"layer2\", \"portname\", \"protocol\", entre autres. Les noms des clés doivent contenir uniquement des caractères alphanumériques (c'est-à-dire[a-zA-Z0-9])."
-
--#: ../clients/common/settings-docs.h.in:99
-+#: ../clients/common/settings-docs.h.in:101
- msgid ""
- "Identifies specific subchannels that this network device uses for "
- "communication with z/VM or s390 host. Like the \"mac-address\" property for "
-@@ -6644,7 +6748,7 @@ msgid ""
- "hexadecimal characters and the period (.) character."
- msgstr "Identifie les sous-canaux spécifiques que ce périphérique réseau utilise pour communiquer avec l'hôte z/VM ou s390. Comme la propriété \"mac-address\" pour les périphériques non z/VM, cette propriété peut être utilisée pour garantir que cette connexion ne s'applique qu'au périphérique réseau qui utilise ces sous-canaux. La liste doit contenir exactement 3 chaînes, et chaque chaîne ne peut être composée que de caractères hexadécimaux et le caractère point (.)."
-
--#: ../clients/common/settings-docs.h.in:100
-+#: ../clients/common/settings-docs.h.in:102
- msgid ""
- "When a value greater than 0 is set, configures the device to use the "
- "specified speed. If \"auto-negotiate\" is \"yes\" the specified speed will "
-@@ -6659,7 +6763,7 @@ msgid ""
- "supports it."
- msgstr "Lorsqu'une valeur supérieure à 0 est définie, configure l'appareil pour qu'il utilise la vitesse spécifiée. Si \"auto-négocier\" est sur \"yes\", la vitesse spécifiée sera la seule annoncée lors de la négociation du lien : cela ne fonctionne que pour les spécifications BASE-T 802.3 et est utile pour imposer des vitesses gigabit, car dans ce cas la négociation du lien est obligatoire. Si la valeur n'est pas réglée (0, la valeur par défaut), la configuration du lien sera soit ignorée (si \"auto-negociate\" est sur \"no\", la valeur par défaut), soit négociée automatiquement (si \"auto-negociate\" est sur \"yes\") et le périphérique local affichera toutes les vitesses supportées. En Mbit/s, soit 100 == 100Mbit/s. Doit être défini ainsi quela propriété \"duplex\" si elle est différente de zéro. Avant de spécifier une valeur de vitesse, assurez-vous que votre périphérique la prenne bien en charge."
-
--#: ../clients/common/settings-docs.h.in:101
-+#: ../clients/common/settings-docs.h.in:103
- msgid ""
- "The NMSettingWiredWakeOnLan options to enable. Not all devices support all "
- "options. May be any combination of NM_SETTING_WIRED_WAKE_ON_LAN_PHY (0x2), "
-@@ -6672,63 +6776,71 @@ msgid ""
- "disable management of Wake-on-LAN in NetworkManager)."
- msgstr "Les options NMSettingWiredWakeOnLan à activer. Les périphériques ne prennent pas tous en charge toutes les options. Peut correspondre à une combinaison de NM_SETTING_WIRED_WAKE_ON_LAN_PHY (0x2), NM_SETTING_WIRED_WAKE_ON_LAN_UNICAST (0x4), NM_SETTING_WIRED_WAKE_ON_LAN_MULTICAST (0x8), NM_SETTING_WIRED_WAKE_ON_LAN_BROADCAST (0x10), NM_SETTING_WIRED_WAKE_ON_LAN_ARP (0x20), NM_SETTING_WIRED_WAKE_ON_LAN_MAGIC (0x40) ou les valeurs spéciales NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT (0x1) (pour utiliser les paramètres globaux) et NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE (0x8000) (pour déactiver la gestion de Wake-on-LAN du NetworkManager)."
-
--#: ../clients/common/settings-docs.h.in:102
-+#: ../clients/common/settings-docs.h.in:104
- msgid ""
- "If specified, the password used with magic-packet-based Wake-on-LAN, "
- "represented as an Ethernet MAC address. If NULL, no password will be "
- "required."
- msgstr "Si spécifié, le mot de passe utilisé avec Wake-on-LAN basé sur magic-packet, représenté par une adresse Ethernet MAC. Si NULL, aucun mot de passe ne sera requis."
-
--#: ../clients/common/settings-docs.h.in:103
-+#: ../clients/common/settings-docs.h.in:105
- msgid "Encapsulation of ADSL connection. Can be \"vcmux\" or \"llc\"."
- msgstr "Encapsulation de la connexion ADSL. Peut correspondre à \"vcmux\" ou \"llc\"."
-
--#: ../clients/common/settings-docs.h.in:104
-+#: ../clients/common/settings-docs.h.in:106
- msgid "Password used to authenticate with the ADSL service."
- msgstr "Mot de passe utilisé pour s'authentifier avec le service ADSL."
-
--#: ../clients/common/settings-docs.h.in:106
-+#: ../clients/common/settings-docs.h.in:108
- msgid "ADSL connection protocol. Can be \"pppoa\", \"pppoe\" or \"ipoatm\"."
- msgstr "Protocole de connexion ADSL. Peut correspondre à \"pppoa\", \"pppoe\" ou \"ipoatm\"."
-
--#: ../clients/common/settings-docs.h.in:107
-+#: ../clients/common/settings-docs.h.in:109
- msgid "Username used to authenticate with the ADSL service."
- msgstr "Nom d'utilisateur utilisé pour s'authentifier avec le service ADSL."
-
--#: ../clients/common/settings-docs.h.in:108
-+#: ../clients/common/settings-docs.h.in:110
- msgid "VCI of ADSL connection"
- msgstr "VCI de connexion ADSL"
-
--#: ../clients/common/settings-docs.h.in:109
-+#: ../clients/common/settings-docs.h.in:111
- msgid "VPI of ADSL connection"
- msgstr "VPI de connexion ADSL"
-
--#: ../clients/common/settings-docs.h.in:110
-+#: ../clients/common/settings-docs.h.in:112
- msgid "The Bluetooth address of the device."
- msgstr "L'adresse Bluetooth de l'appareil."
-
--#: ../clients/common/settings-docs.h.in:111
-+#: ../clients/common/settings-docs.h.in:113
- msgid ""
- "Either \"dun\" for Dial-Up Networking connections or \"panu\" for Personal "
- "Area Networking connections to devices supporting the NAP profile."
- msgstr "Soit \"dun\" pour les connexions au réseau Dial-Up, soit \"panu\" pour les connexions au réseau local personnel vers des périphériques prenant en charge le profil NAP."
-
--#: ../clients/common/settings-docs.h.in:112
-+#: ../clients/common/settings-docs.h.in:114
- msgid ""
- "Dictionary of key/value pairs of bonding options. Both keys and values must "
- "be strings. Option names must contain only alphanumeric characters (ie, [a-"
- "zA-Z0-9])."
- msgstr "Dictionnaire des combinaisons clé/valeur des options de collage Les clés et les valeurs doivent être des chaînes de caractères et les noms des options ne doivent contenir que des caractères alphanumériques (c.-à-d.,[a-zA-Z0-9])."
-
--#: ../clients/common/settings-docs.h.in:113
-+#: ../clients/common/settings-docs.h.in:115
- msgid "The Ethernet MAC address aging time, in seconds."
- msgstr "Le temps de vieillissement de l'adresse Ethernet MAC, en secondes."
-
--#: ../clients/common/settings-docs.h.in:114
-+#: ../clients/common/settings-docs.h.in:116
- msgid "The Spanning Tree Protocol (STP) forwarding delay, in seconds."
- msgstr "Le délai de transmission du protocole Spanning Tree Protocol (STP), en secondes."
-
--#: ../clients/common/settings-docs.h.in:115
-+#: ../clients/common/settings-docs.h.in:117
-+msgid ""
-+"If specified, The MAC address of the multicast group this bridge uses for "
-+"STP. The address must be a link-local address in standard Ethernet MAC "
-+"address format, ie an address of the form 01:80:C2:00:00:0X, with X in [0, "
-+"4..F]. If not specified the default value is 01:80:C2:00:00:00."
-+msgstr "Si elle est spécifiée, l'adresse MAC du groupe de multidiffusion que ce pont utilise pour STP. L'adresse doit être une adresse locale de liaison au format standard d'adresse MAC Ethernet, c'est-à-dire une adresse de la forme 01:80:C2:00:00:0X, avec X dans [0, 4..F]. Si elle n'est pas spécifiée, la valeur par défaut est 01:80:C2:00:00:00."
-+
-+#: ../clients/common/settings-docs.h.in:118
- msgid ""
- "A mask of group addresses to forward. Usually, group addresses in the range "
- "from 01:80:C2:00:00:00 to 01:80:C2:00:00:0F are not forwarded according to "
-@@ -6737,11 +6849,11 @@ msgid ""
- "or 2 set because they are used for STP, MAC pause frames and LACP."
- msgstr "Un masque d'adresses de groupe à transférer. Habituellement, les adresses de groupe comprises entre 01:80:C2:00:00:00:00:00 et 01:80:C2:00:00:0F ne sont pas transmises conformément aux normes. Cette propriété est un masque de 16 bits, chacun correspondant à une adresse de groupe dans cette plage qui doit être transmise. Le masque ne peut pas avoir les bits 0, 1 ou 2 car ils sont utilisés pour STP, les frames de pause MAC et LACP."
-
--#: ../clients/common/settings-docs.h.in:116
-+#: ../clients/common/settings-docs.h.in:119
- msgid "The Spanning Tree Protocol (STP) hello time, in seconds."
- msgstr "Le protocole Spanning Tree Protocol (STP) hello time, en secondes."
-
--#: ../clients/common/settings-docs.h.in:117
-+#: ../clients/common/settings-docs.h.in:120
- msgid ""
- "If specified, the MAC address of bridge. When creating a new bridge, this "
- "MAC address will be set. If this field is left unspecified, the \"ethernet."
-@@ -6751,40 +6863,119 @@ msgid ""
- "property is deprecated. Deprecated: 1"
- msgstr "Si définie, l’adresse MAC d’un pontage. Lors de la création d'un nouveau pontage, cette adresse MAC est définie ; si ce champ n'est pas spécifié, l'adresse \"ethernet.cloned-mac-address\" est utilisée pour générer l'adresse MAC initiale. Notez que le paramètre \"ethernet.cloned-mac-address\" écrase l'adresse MAC du pont lors de son activation ultérieure. Cette propriété est donc obsolète. Dépréciation: 1"
-
--#: ../clients/common/settings-docs.h.in:118
-+#: ../clients/common/settings-docs.h.in:121
- msgid "The Spanning Tree Protocol (STP) maximum message age, in seconds."
- msgstr "Le protocole Spanning Tree Protocol (STP) hello time, en secondes."
-
--#: ../clients/common/settings-docs.h.in:119
-+#: ../clients/common/settings-docs.h.in:122
-+msgid "Set maximum size of multicast hash table (value must be a power of 2)."
-+msgstr "Définir la taille maximale de la table de hachage multicast (la valeur doit être une puissance de 2)."
-+
-+#: ../clients/common/settings-docs.h.in:123
-+msgid ""
-+"Set the number of queries the bridge will send before stopping forwarding a "
-+"multicast group after a \"leave\" message has been received."
-+msgstr "Définissez le nombre de requêtes que la passerelle enverra avant d'arrêter la transmission d'un groupe multicast après la réception d'un message \"leave\"."
-+
-+#: ../clients/common/settings-docs.h.in:124
-+msgid ""
-+"Set interval (in deciseconds) between queries to find remaining members of a "
-+"group, after a \"leave\" message is received."
-+msgstr "Définissez l'intervalle (en décisecondes) entre les requêtes pour trouver les membres restants d'un groupe, après réception d'un message de \"leave\"."
-+
-+#: ../clients/common/settings-docs.h.in:125
-+msgid ""
-+"Set delay (in deciseconds) after which the bridge will leave a group, if no "
-+"membership reports for this group are received."
-+msgstr "Définissez le délai (en décisecondes) après lequel le pont quittera un groupe, si aucun rapport d'adhésion pour ce groupe n'est reçu."
-+
-+#: ../clients/common/settings-docs.h.in:126
-+msgid ""
-+"Enable or disable sending of multicast queries by the bridge. If not "
-+"specified the option is disabled."
-+msgstr "Activer ou désactiver l'envoi de requêtes multicast par la passerelle. Si elle n'est pas spécifiée, l'option est désactivée."
-+
-+#: ../clients/common/settings-docs.h.in:127
-+msgid ""
-+"If no queries are seen after this delay (in deciseconds) has passed, the "
-+"bridge will start to send its own queries."
-+msgstr "Si aucune requête n'est vue après que ce délai (en décisecondes) soit passé, le pont commencera à envoyer ses propres requêtes."
-+
-+#: ../clients/common/settings-docs.h.in:128
-+msgid ""
-+"Interval (in deciseconds) between queries sent by the bridge after the end "
-+"of the startup phase."
-+msgstr "Intervalle (en décisecondes) entre les requêtes envoyées par la passerelle après la fin de la phase de démarrage."
-+
-+#: ../clients/common/settings-docs.h.in:129
-+msgid ""
-+"Set the Max Response Time/Max Response Delay (in deciseconds) for IGMP/MLD "
-+"queries sent by the bridge."
-+msgstr "Définissez le temps de réponse maximal/délai de réponse maximal (en décisecondes) pour les requêtes IGMP/MLD envoyées par la passerelle."
-+
-+#: ../clients/common/settings-docs.h.in:130
-+msgid ""
-+"If enabled the bridge's own IP address is used as the source address for "
-+"IGMP queries otherwise the default of 0.0.0.0 is used."
-+msgstr "Si elle est activée, la propre adresse IP du pont est utilisée comme adresse source pour les requêtes IGMP ; sinon, la valeur par défaut de 0.0.0.0 est utilisée."
-+
-+#: ../clients/common/settings-docs.h.in:131
-+msgid ""
-+"Sets bridge's multicast router. Multicast-snooping must be enabled for this "
-+"option to work. Supported values are: 'auto', 'disabled', 'enabled'. If not "
-+"specified the default value is 'auto'."
-+msgstr "Installe le routeur multicast du pont. Pour que cette option fonctionne, il faut activer multicast-snooping. Les valeurs prises en charge sont : \"auto\", \"disabled\", \"enabled\". Si elle n'est pas spécifiée, la valeur par défaut est \"auto\"."
-+
-+#: ../clients/common/settings-docs.h.in:132
- msgid ""
- "Controls whether IGMP snooping is enabled for this bridge. Note that if "
- "snooping was automatically disabled due to hash collisions, the system may "
- "refuse to enable the feature until the collisions are resolved."
- msgstr "Vérifie si IGMP Snooping est activé pour ce pontage, mais si le snooping a été automatiquement désactivé en raison des collisions de hachage, le système peut refuser d'activer la fonction jusqu'à ce que les collisions soient résolues."
-
--#: ../clients/common/settings-docs.h.in:120
-+#: ../clients/common/settings-docs.h.in:133
-+msgid "Set the number of IGMP queries to send during startup phase."
-+msgstr "Définissez le nombre de requêtes IGMP à envoyer pendant la phase de démarrage."
-+
-+#: ../clients/common/settings-docs.h.in:134
-+msgid ""
-+"Sets the time (in deciseconds) between queries sent out at startup to "
-+"determine membership information."
-+msgstr "Définit le temps (en décisecondes) entre les requêtes envoyées au démarrage pour déterminer les informations sur les membres."
-+
-+#: ../clients/common/settings-docs.h.in:135
- msgid ""
- "Sets the Spanning Tree Protocol (STP) priority for this bridge. Lower "
- "values are \"better\"; the lowest priority bridge will be elected the root "
- "bridge."
- msgstr "Définit la priorité du protocole Spanning Tree Protocol (STP) pour ce pont : les valeurs inférieures sont \"meilleures\" ; le pont de priorité inférieure sera élu pont racine."
-
--#: ../clients/common/settings-docs.h.in:121
-+#: ../clients/common/settings-docs.h.in:136
- msgid ""
- "Controls whether Spanning Tree Protocol (STP) is enabled for this bridge."
- msgstr "Contrôle si le protocole Spanning Tree Protocol (STP) est activé pour ce pont."
-
--#: ../clients/common/settings-docs.h.in:122
-+#: ../clients/common/settings-docs.h.in:137
- 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:123
-+#: ../clients/common/settings-docs.h.in:138
- msgid "Control whether VLAN filtering is enabled on the bridge."
- msgstr "Contrôle l'activation du filtrage VLAN sur le pontage."
-
--#: ../clients/common/settings-docs.h.in:124
-+#: ../clients/common/settings-docs.h.in:139
-+msgid ""
-+"If specified, the protocol used for VLAN filtering. Supported values are: "
-+"'802.1Q', '802.1ad'. If not specified the default value is '802.1Q'."
-+msgstr "Si spécifié, le protocole utilisé pour le filtrage VLAN. Les valeurs prises en charge sont : '802.1Q', '802.1ad'. Si elle n'est pas spécifiée, la valeur par défaut est \"802.1Q\"."
-+
-+#: ../clients/common/settings-docs.h.in:140
-+msgid "Controls whether per-VLAN stats accounting is enabled."
-+msgstr "Contrôle si la comptabilité des statistiques par VLAN est activée."
-+
-+#: ../clients/common/settings-docs.h.in:141
- 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-"
-@@ -6794,22 +6985,22 @@ msgid ""
- "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:125
-+#: ../clients/common/settings-docs.h.in:142
- 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:126
-+#: ../clients/common/settings-docs.h.in:143
- 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:127
-+#: ../clients/common/settings-docs.h.in:144
- 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:128
-+#: ../clients/common/settings-docs.h.in:145
- 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 "
-@@ -6819,38 +7010,38 @@ msgid ""
- "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:129
--#: ../clients/common/settings-docs.h.in:177
--#: ../clients/common/settings-docs.h.in:188
-+#: ../clients/common/settings-docs.h.in:146
-+#: ../clients/common/settings-docs.h.in:195
-+#: ../clients/common/settings-docs.h.in:206
- msgid ""
- "If non-zero, only transmit packets of the specified size or smaller, "
- "breaking larger packets up into multiple frames."
- msgstr "Si différent de zéro, ne transmettez que des paquets de la taille spécifiée ou plus petits, divisant les paquets plus grands en plusieurs trames."
-
--#: ../clients/common/settings-docs.h.in:130
-+#: ../clients/common/settings-docs.h.in:147
- msgid ""
- "The number to dial to establish the connection to the CDMA-based mobile "
- "broadband network, if any. If not specified, the default number (#777) is "
- "used when required."
- msgstr "Le numéro à composer pour établir la connexion au réseau mobile à large bande CDMA, s'il y a lieu. Si non spécifié, le numéro par défaut (#777) est utilisé au besoin."
-
--#: ../clients/common/settings-docs.h.in:131
--#: ../clients/common/settings-docs.h.in:180
-+#: ../clients/common/settings-docs.h.in:148
-+#: ../clients/common/settings-docs.h.in:198
- msgid ""
- "The password used to authenticate with the network, if required. Many "
- "providers do not require a password, or accept any password. But if a "
- "password is required, it is specified here."
- msgstr "Le mot de passe utilisé pour s'authentifier auprès du réseau, si nécessaire. De nombreux fournisseurs n'ont pas besoin d'un mot de passe ou acceptent n’importe quel mot de passe. Mais si un mot de passe est requis, il est spécifié ici."
-
--#: ../clients/common/settings-docs.h.in:133
--#: ../clients/common/settings-docs.h.in:186
-+#: ../clients/common/settings-docs.h.in:150
-+#: ../clients/common/settings-docs.h.in:204
- msgid ""
- "The username used to authenticate with the network, if required. Many "
- "providers do not require a username, or accept any username. But if a "
- "username is required, it is specified here."
- msgstr "Le mot de passe utilisé pour s'authentifier auprès du réseau, si nécessaire. De nombreux fournisseurs n'ont pas besoin d'un mot de passe ou acceptent n’importe quel mot de passe. Mais si un mot de passe est requis, il est spécifié ici."
-
--#: ../clients/common/settings-docs.h.in:134
-+#: ../clients/common/settings-docs.h.in:151
- 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 "
-@@ -6858,7 +7049,7 @@ msgid ""
- "Currently this only applies to 802-1x authentication."
- msgstr "Le nombre de tentatives d'authentification : Zéro signifie essayer indéfiniment ; -1 signifie utiliser une valeur par défaut globale. Si la valeur par défaut globale n'est pas définie, l'authentification est tentée à nouveau 3 fois avant de faire échouer la connexion, ce qui ne s'applique actuellement qu'à l'authentification 802-1x."
-
--#: ../clients/common/settings-docs.h.in:135
-+#: ../clients/common/settings-docs.h.in:152
- msgid ""
- "Whether or not the connection should be automatically connected by "
- "NetworkManager when the resources for the connection are available. TRUE to "
-@@ -6868,14 +7059,14 @@ msgid ""
- "profiles."
- msgstr "Indique si la connexion doit ou non être automatiquement connectée par NetworkManager lorsque les ressources pour la connexion sont disponibles. TRUE pour activer automatiquement la connexion, FALSE pour demander une intervention manuelle pour activer la connexion. Notez que la connexion automatique n'est pas implémentée pour les profils VPN. Voir \"secondaires\" comme alternative pour connecter automatiquement les profils VPN."
-
--#: ../clients/common/settings-docs.h.in:136
-+#: ../clients/common/settings-docs.h.in:153
- msgid ""
- "The autoconnect priority. If the connection is set to autoconnect, "
- "connections with higher priority will be preferred. Defaults to 0. The "
- "higher number means higher priority."
- msgstr "La priorité de connexion automatique : si la connexion est configurée sur connexion automatique, les connexions avec une priorité plus élevée seront préférées ; par défaut, la valeur est 0 ; le nombre le plus élevé signifie une priorité plus élevée."
-
--#: ../clients/common/settings-docs.h.in:137
-+#: ../clients/common/settings-docs.h.in:154
- 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 "
-@@ -6884,7 +7075,7 @@ msgid ""
- "autoconnect again."
- msgstr "Le nombre de fois qu'une connexion doit être essayée lors de l'activation automatique avant d'abandonner. Zéro signifie pour toujours, -1 signifie la valeur par défaut globale (4 fois si elle n'est pas annulée) et 1 signifie qu'il faut essayer l'activation une seule fois avant de bloquer la connexion automatique. Notez qu’après un timeout, NetworkManager va essayer de se reconnecter automatiquement."
-
--#: ../clients/common/settings-docs.h.in:138
-+#: ../clients/common/settings-docs.h.in:155
- msgid ""
- "Whether or not slaves of this connection should be automatically brought up "
- "when NetworkManager activates this connection. This only has a real effect "
-@@ -6896,19 +7087,19 @@ msgid ""
- "value. If it is default as well, this fallbacks to 0."
- msgstr "Indique si les esclaves de cette connexion doivent être automatiquement rappelés lorsque NetworkManager active cette connexion. Ceci n'a d'effet réel que pour les connexions maître. Les propriétés \"autoconnect\", \"autoconnect-priority\" et \"autoconnect-retries\" ne sont pas liées à ce paramètre. Les valeurs autorisées sont : 0 : ne pas toucher aux connexions esclaves, 1 : activer toutes les connexions esclaves avec cette connexion, -1 : par défaut. Si -1 (par défaut) est défini, le fichier global connection.autoconnect-slaves est lu pour déterminer la valeur réelle. Si c'est également le cas par défaut, cette valeur est ramenée à 0."
-
--#: ../clients/common/settings-docs.h.in:139
-+#: ../clients/common/settings-docs.h.in:156
- msgid ""
- "If greater than zero, delay success of IP addressing until either the "
- "timeout is reached, or an IP gateway replies to a ping."
- msgstr "Indique si cette valeur est supérieure à zéro, retardez le succès de l'adressage IP jusqu'à ce que le délai d'attente soit atteint ou qu'une passerelle IP réponde à un ping."
-
--#: ../clients/common/settings-docs.h.in:140
-+#: ../clients/common/settings-docs.h.in:157
- msgid ""
- "A human readable unique identifier for the connection, like \"Work Wi-Fi\" "
- "or \"T-Mobile 3G\"."
- msgstr "Un identifiant unique lisible par l'homme pour la connexion, comme \"Work Wi-Fi\" ou \"T-Mobile 3G\"."
-
--#: ../clients/common/settings-docs.h.in:141
-+#: ../clients/common/settings-docs.h.in:158
- 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 "
-@@ -6921,48 +7112,64 @@ msgid ""
- "interface."
- msgstr "Le nom de l'interface réseau à laquelle cette connexion est liée, si elle n'est pas définie, la connexion peut être attachée à n'importe quelle interface du type approprié (sous réserve des restrictions imposées par d'autres paramètres), ce qui spécifie le nom du périphérique créé pour les périphériques logiciels. Pour les types de connexion où les noms des interfaces ne sont pas facilement persistants (par exemple, mobile haut débit ou Ethernet USB), cette propriété ne doit pas être utilisée, et si les noms des interfaces peuvent être utilisés avec la connexion, la connexion est limitée, ou bien en cas de changement de changement du nom des interfaces, elle peut être appliquée sur la mauvaise interface."
-
--#: ../clients/common/settings-docs.h.in:142
-+#: ../clients/common/settings-docs.h.in:159
- msgid "Whether LLDP is enabled for the connection."
- msgstr "Indique si LLDP est activé pour la connexion."
-
--#: ../clients/common/settings-docs.h.in:143
-+#: ../clients/common/settings-docs.h.in:160
- 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 "
- "format that allows both IPv4 and IPv6 hosts to perform name resolution for "
--"hosts on the same local link. The permitted values are: yes: register "
--"hostname and resolving for the connection, no: disable LLMNR for the "
--"interface, resolve: do not register hostname but allow resolving of LLMNR "
--"host names. This feature requires a plugin which supports LLMNR. One such "
--"plugin is dns-systemd-resolved."
--msgstr "LLMNR est un protocole basé sur le format de paquets DNS (Domain Name System) qui permet aux hôtes IPv4 et IPv6 d'effectuer la résolution de noms pour les hôtes sur le même lien local. Les valeurs autorisées sont : oui : enregistrer nom d'hôte et résolution pour la connexion, non : désactiver LLMNR pour l'interface, résoudre : ne pas enregistrer nom d'hôte mais permettre la résolution de noms d'hôtes LLMNR. Cette fonctionnalité nécessite un plugin qui supporte LLMNR. Un de ces plug-ins est dns-systemd-resolved."
-+"hosts on the same local link. The permitted values are: \"yes\" (2) register "
-+"hostname and resolving for the connection, \"no\" (0) disable LLMNR for the "
-+"interface, \"resolve\" (1) do not register hostname but allow resolving of "
-+"LLMNR host names If unspecified, \"default\" ultimately depends on the DNS "
-+"plugin (which for systemd-resolved currently means \"yes\"). This feature "
-+"requires a plugin which supports LLMNR. Otherwise the setting has no effect. "
-+"One such plugin is dns-systemd-resolved."
-+msgstr "LLMNR est un protocole basé sur le format de paquets DNS (Domain Name System) qui permet aux hôtes IPv4 et IPv6 d'effectuer la résolution de noms pour les hôtes sur le même lien local. Les valeurs autorisées sont : oui : enregistrer nom d'hôte et résolution pour la connexion, non : désactiver LLMNR pour l'interface, \"resolve\" (1) : ne pas enregistrer de nom d'hôte mais permettre la résolution de noms d'hôtes LLMNR. Cette fonctionnalité nécessite un plugin qui supporte LLMNR. Un de ces plug-ins est dns-systemd-resolved. S'il n'est pas spécifié, la valeur par \"défaut\" dépend en fin de compte du plugin DNS (qui, pour \"systemd-resolved\", signifie actuellement \"oui\"). Cette fonctionnalité nécessite un plugin qui prend en charge LLMNR. Sinon, le paramètre n'aura aucun effet. Un de ces plugins est dns-systemd-resolved."
-
--#: ../clients/common/settings-docs.h.in:144
-+#: ../clients/common/settings-docs.h.in:161
- 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:145
-+#: ../clients/common/settings-docs.h.in:162
- msgid ""
--"Whether mDNS is enabled for the connection. The permitted values are: yes: "
--"register hostname and resolving for the connection, no: disable mDNS for the "
--"interface, resolve: do not register hostname but allow resolving of mDNS "
--"host names. This feature requires a plugin which supports mDNS. One such "
--"plugin is dns-systemd-resolved."
--msgstr "Indique si mDNS est activé pour la connexion. Les valeurs autorisées sont : oui : enregistrer le nom d'hôte et la résolution pour la connexion, non : désactiver mDNS pour l'interface, résoudre : ne pas enregistrer le nom d'hôte mais autoriser la résolution des noms d'hôte mDNS. Cette fonctionnalité nécessite un plugin qui supporte mDNS. dns-systemd-resolved est l'un de ces plug-ins."
-+"Whether mDNS is enabled for the connection. The permitted values are: \"yes"
-+"\" (2) register hostname and resolving for the connection, \"no\" (0) "
-+"disable mDNS for the interface, \"resolve\" (1) do not register hostname but "
-+"allow resolving of mDNS host names and \"default\" (-1) to allow lookup of a "
-+"global default in NetworkManager.conf. If unspecified, \"default\" "
-+"ultimately depends on the DNS plugin (which for systemd-resolved currently "
-+"means \"no\"). This feature requires a plugin which supports mDNS. Otherwise "
-+"the setting has no effect. One such plugin is dns-systemd-resolved."
-+msgstr "Si mDNS est activé pour la connexion. Les valeurs autorisées sont : \"oui\" (2) enregistrer le nom d'hôte et la résolution pour la connexion, \"non\" (0) désactive mDNS pour l'interface, \"resolve\" (1) ne pas enregistrer le nom d'hôte mais permettre la résolution des noms d'hôtes mDNS et \"default\" (-1) pour permettre la recherche d'une valeur par défaut globale dans NetworkManager.conf. S'il n'est pas spécifié, \"default\" dépend en fin de compte du plugin DNS (qui, pour \"systemd-resolved\", signifie actuellement \"non\"). Cette fonctionnalité nécessite un plugin qui prend en charge mDNS. Sinon, le réglage n'a aucun effet. L'un de ces plugins est dns-systemd-resolved."
-
--#: ../clients/common/settings-docs.h.in:146
-+#: ../clients/common/settings-docs.h.in:163
- msgid ""
- "Whether the connection is metered. When updating this property on a "
- "currently activated connection, the change takes effect immediately."
- msgstr "Indique si la connexion est mesurée. Lors de la mise à jour de cette propriété sur une connexion actuellement activée, le changement prend effet immédiatement."
-
--#: ../clients/common/settings-docs.h.in:147
-+#: ../clients/common/settings-docs.h.in:164
-+msgid ""
-+"If configured, set to a Manufacturer Usage Description (MUD) URL that points "
-+"to manufacturer-recommended network policies for IoT devices. It is "
-+"transmitted as a DHCPv4 or DHCPv6 option. The value must be a valid URL "
-+"starting with \"https://\". The special value \"none\" is allowed to "
-+"indicate that no MUD URL is used. If the per-profile value is unspecified "
-+"(the default), a global connection default gets consulted. If still "
-+"unspecified, the ultimate default is \"none\"."
-+msgstr "S'il est configuré, définissez une URL MUD (Manufacturer Usage Description) qui pointe vers les politiques réseau recommandées par le fabricant pour les périphériques IoT. Transmis sous la forme d'une option DHCPv4 ou DHCPv6. La valeur doit être une URL valide commençant par \"https://\". La valeur spéciale \"none\" est autorisée pour indiquer qu'aucune URL MUD n'est utilisée. Si la valeur par profil n'est pas spécifiée (par défaut), une connexion globale par défaut est consultée. Si elle n'est toujours pas spécifiée, la valeur par défaut est \"none\"."
-+
-+#: ../clients/common/settings-docs.h.in:165
- msgid ""
- "Specifies whether the profile can be active multiple times at a particular "
- "moment. The value is of type NMConnectionMultiConnect."
- msgstr "Indique si le profil peut être actif plusieurs fois à un moment donné, la valeur est de type NMConnectionMultiConnect."
-
--#: ../clients/common/settings-docs.h.in:148
-+#: ../clients/common/settings-docs.h.in:166
- 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 "
-@@ -6977,26 +7184,26 @@ msgid ""
- "[id], and [reserved] must be valid UTF-8."
- msgstr "Un tableau de chaînes de caractères définissant l'accès d'un utilisateur donné à cette connexion. Si elle est NULL ou vide, tous les utilisateurs sont autorisés à accéder à cette connexion ; sinon, les utilisateurs sont autorisés si et seulement s'ils sont dans cette liste. Lorsque cette option n'est pas vide, la connexion ne peut être active que si l'un des utilisateurs spécifiés est connecté à une session active. Chaque entrée est de la forme \"[type] :[id] :[réservé]\" ; par exemple, \"user:dcbw:blah\". Pour l'instant, seul l' \"utilisateur\"[type] est autorisé. Toutes les autres valeurs sont ignorées et réservées pour une utilisation future. [id] est le nom d'utilisateur auquel se réfère cette permission, qui ne peut pas contenir le caractère \" : \". Toute information[réservée] présente doit être ignorée et est réservée pour une utilisation future. Tous les[type],[id] et[réservé] doivent être valides UTF-8."
-
--#: ../clients/common/settings-docs.h.in:149
-+#: ../clients/common/settings-docs.h.in:167
- msgid ""
- "FALSE if the connection can be modified using the provided settings "
- "service's D-Bus interface with the right privileges, or TRUE if the "
- "connection is read-only and cannot be modified."
- msgstr "FALSE si la connexion peut être modifiée à l'aide de l'interface D-Bus du service de paramétrage fourni avec les bons privilèges, ou TRUE si la connexion est en lecture seule et ne peut être modifiée."
-
--#: ../clients/common/settings-docs.h.in:150
-+#: ../clients/common/settings-docs.h.in:168
- msgid ""
- "List of connection UUIDs that should be activated when the base connection "
- "itself is activated. Currently only VPN connections are supported."
- msgstr "Liste des UUID de connexion qui doivent être activées lorsque la connexion de base elle-même est activée, actuellement seules les connexions VPN sont supportées."
-
--#: ../clients/common/settings-docs.h.in:151
-+#: ../clients/common/settings-docs.h.in:169
- msgid ""
- "Setting name of the device type of this slave's master connection (eg, \"bond"
- "\"), or NULL if this connection is not a slave."
- msgstr "Réglage du nom du type d'appareil de la connexion maître de cet esclave (par exemple, \"bond\"), ou NULL si cette connexion n'est pas un esclave."
-
--#: ../clients/common/settings-docs.h.in:152
-+#: ../clients/common/settings-docs.h.in:170
- msgid ""
- "This represents the identity of the connection used for various purposes. It "
- "allows to configure multiple profiles to share the identity. Also, the "
-@@ -7027,7 +7234,7 @@ msgid ""
- "uses a unique, fixed ID for the connection."
- msgstr "Il s'agit de l'identité de la connexion utilisée à diverses fins. Permet de configurer plusieurs profils pour partager l'identité. De plus, stable-id peut contenir des espaces réservés qui sont substitués dynamiquement et déterministiquement en fonction du contexte. Le stable-id est utilisé pour générer des adresses privées stables IPv6 avec ipv6.addr-gen-mode=stable-privacy. Il est également utilisé pour semer l'adresse MAC clonée générée pour ethernet.cloned-mac-address=stable et wifi.cloned-mac-address=stable. Il est également utilisé comme identifiant client DHCP avec ipv4.dhcp-client-id=stable et pour dériver le DUID DHCP avec ipv6.dhcp-duid=stable-[llt,ll,uuid]. Notez que selon le contexte dans lequel il est utilisé, d'autres paramètres sont également placés dans l'algorithme de génération. Par exemple, une clé par hôte est généralement incluse, de sorte que différents systèmes finissent par générer des ID différents. Ou avec ipv6.addr-gen-mode=stable-privacy, le nom du périphérique est égaleme '$' est traité spécialement pour effectuer des substitutions dynamiques au moment de l'exécution. Les valeurs actuellement supportés sont \"${CONNECTION}\", \"${DEVICE}\", \"${BOOT}\", \"${RANDOM}\". Celles-ci créent effectivement des ID uniques par connexion, par périphérique, par amorçage ou à chaque fois. Notez que \"${DEVICE}\" correspond au nom de l'interface du périphérique. Tout modèle non reconnu après \" $ \" est traité mot pour mot, mais il est réservé pour une utilisation future. Il vous est donc conseillé d'éviter'$' ou d'y échapper par \"$$\". Par exemple, réglez-le sur \"${CONNECTION}-${BOOT}-${DEVICE}\" pour créer un identifiant unique pour cette connexion qui change avec chaque redémarrage et diffère selon l’interface sur laquelle le profil est activé. Si la valeur n’est pas définie, une valeur de connexion globale par défaut sera consultée. Si la valeur n’est toujours pas déterminée, la valeur par défaut est semblable à celle de \"${CONNECTION}\" et utilise un ID fixe et unique pour la connexion."
-
--#: ../clients/common/settings-docs.h.in:153
-+#: ../clients/common/settings-docs.h.in:171
- msgid ""
- "The time, in seconds since the Unix Epoch, that the connection was last "
- "_successfully_ fully activated. NetworkManager updates the connection "
-@@ -7036,7 +7243,7 @@ msgid ""
- "reading (changes to this property will not be preserved)."
- msgstr "La durée, en secondes, depuis Unix Epoch, pendant lequel la connexion a été activée pour la dernière fois avec succès. NetworkManager met à jour périodiquement l'horodatage de connexion lorsque la connexion est active pour s'assurer qu'une connexion active dispose du dernier horodatage. La propriété est uniquement destinée à la lecture (les modifications apportées à cette propriété ne seront pas conservées)."
-
--#: ../clients/common/settings-docs.h.in:154
-+#: ../clients/common/settings-docs.h.in:172
- msgid ""
- "Base type of the connection. For hardware-dependent connections, should "
- "contain the setting name of the hardware-type specific setting (ie, \"802-3-"
-@@ -7045,7 +7252,7 @@ msgid ""
- "setting name of that setting type (ie, \"vpn\" or \"bridge\", etc)."
- msgstr "Type de base de la connexion. Pour les connexions dépendantes du matériel, doit contenir le nom du paramètre spécifique au type de matériel (par exemple, \"802-3-ethernet\" ou \"802-11-wireless\" ou \"bluetooth\", etc), et pour les connexions non dépendantes du matériel comme VPN ou autre, doit contenir le nom du paramètre de ce type (par exemple, \"vpn\" ou \"pont\", etc)."
-
--#: ../clients/common/settings-docs.h.in:155
-+#: ../clients/common/settings-docs.h.in:173
- msgid ""
- "A universally unique identifier for the connection, for example generated "
- "with libuuid. It should be assigned when the connection is created, and "
-@@ -7057,7 +7264,7 @@ msgid ""
- "contains only hexadecimal characters and \"-\")."
- msgstr "Un identifiant universellement unique pour la connexion, par exemple généré avec libuuuid, qui doit être attribué lors de la création de la connexion et ne doit jamais être modifié tant que la connexion s'applique toujours au même réseau. Par exemple, il ne doit pas être modifié lorsque la propriété \"id\" ou NMSettingIP4Config change, mais doit être recréé lorsque le SSID Wi-Fi, le fournisseur de réseau mobile à large bande ou la propriété \"type\" change. l'UUID doit être au format \"2815492f-7e56-435e-bbd2e9-2467cdc667 (c-a-d ne doit contenir que des caractères hexadécimaux et \"-\")."
-
--#: ../clients/common/settings-docs.h.in:156
-+#: ../clients/common/settings-docs.h.in:174
- msgid ""
- "Timeout in milliseconds to wait for device at startup. During boot, devices "
- "may take a while to be detected by the driver. This property will cause to "
-@@ -7068,7 +7275,7 @@ msgid ""
- "currently has the same meaning as no wait time."
- msgstr "Délai d'attente en millisecondes au démarrage des périphériques. Pendant le démarrage, les périphériques peuvent prendre un certain temps avant d'être détectés par le pilote. Cette propriété retardera NetworkManager-wait-online.service et nm-online pour donner une chance à l'appareil d'apparaître. Notez que cette propriété ne fonctionne qu'avec NMSettingConnection:interface-name pour identifier le périphérique qui attendu. La valeur 0 signifie aucun temps d'attente. La valeur par défaut est -1, qui actuellement est l'équivalent de la valeur 0"
-
--#: ../clients/common/settings-docs.h.in:157
-+#: ../clients/common/settings-docs.h.in:175
- msgid ""
- "The trust level of a the connection. Free form case-insensitive string (for "
- "example \"Home\", \"Work\", \"Public\"). NULL or unspecified zone means the "
-@@ -7077,53 +7284,53 @@ msgid ""
- "takes effect immediately."
- msgstr "Le niveau de confiance d'une connexion. Chaîne libre insensible à la casse (par exemple \"Home\", \"Work\", \"Public\"), NULL ou zone non spécifiée signifie que la connexion sera placée dans la zone par défaut définie par le pare-feu. La modification prend effet immédiatement lorsque cette propriété est mise à jour sur une connexion actuellement active."
-
--#: ../clients/common/settings-docs.h.in:158
-+#: ../clients/common/settings-docs.h.in:176
- msgid ""
- "Specifies the NMSettingDcbFlags for the DCB FCoE application. Flags may be "
- "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
- "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
- msgstr "Spécifie le NMSettingDcbFlags pour l'application FCoE du DCB Les indicateurs peuvent être n'importe quelle combinaison de NM_SETTING_DCB_FLAG_ENABLE (0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2) et NM_SETTING_DCB_FLAG_WILLING (0x4)."
-
--#: ../clients/common/settings-docs.h.in:159
-+#: ../clients/common/settings-docs.h.in:177
- 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:160
-+#: ../clients/common/settings-docs.h.in:178
- msgid ""
- "The highest User Priority (0 - 7) which FCoE frames should use, or -1 for "
- "default priority. Only used when the \"app-fcoe-flags\" property includes "
- "the NM_SETTING_DCB_FLAG_ENABLE (0x1) flag."
- msgstr "La priorité utilisateur la plus élevée (0 - 7) que les trames FCoE doivent utiliser, ou -1 pour la priorité par défaut. Utilisée uniquement lorsque la propriété \"app-fcoe-flags\" inclut l'indicateur NM_SETTING_DCB_FLAG_ENABLE (0x1)."
-
--#: ../clients/common/settings-docs.h.in:161
-+#: ../clients/common/settings-docs.h.in:179
- msgid ""
- "Specifies the NMSettingDcbFlags for the DCB FIP application. Flags may be "
- "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
- "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
- msgstr "Spécifie le NMSettingDcbFlags pour l'application FIP du DCB Les indicateurs peuvent être n'importe quelle combinaison de NM_SETTING_DCB_FLAG_ENABLE (0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2) et NM_SETTING_DCB_FLAG_WILLING (0x4)."
-
--#: ../clients/common/settings-docs.h.in:162
-+#: ../clients/common/settings-docs.h.in:180
- msgid ""
- "The highest User Priority (0 - 7) which FIP frames should use, or -1 for "
- "default priority. Only used when the \"app-fip-flags\" property includes "
- "the NM_SETTING_DCB_FLAG_ENABLE (0x1) flag."
- msgstr "La priorité utilisateur la plus élevée (0 - 7) que les trames FCoE doivent utiliser, ou -1 pour la priorité par défaut. Utilisée uniquement lorsque la propriété \"app-fcoe-flags\" inclut l'indicateur NM_SETTING_DCB_FLAG_ENABLE (0x1)."
-
--#: ../clients/common/settings-docs.h.in:163
-+#: ../clients/common/settings-docs.h.in:181
- msgid ""
- "Specifies the NMSettingDcbFlags for the DCB iSCSI application. Flags may be "
- "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
- "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
- msgstr "Spécifie le NMSettingDcbFlags pour l'application iSCSI du DCB Les indicateurs peuvent être n'importe quelle combinaison de NM_SETTING_DCB_FLAG_ENABLE (0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2) et NM_SETTING_DCB_FLAG_WILLING (0x4)."
-
--#: ../clients/common/settings-docs.h.in:164
-+#: ../clients/common/settings-docs.h.in:182
- msgid ""
- "The highest User Priority (0 - 7) which iSCSI frames should use, or -1 for "
- "default priority. Only used when the \"app-iscsi-flags\" property includes "
- "the NM_SETTING_DCB_FLAG_ENABLE (0x1) flag."
- msgstr "La priorité utilisateur la plus élevée (0 - 7) que les trames iSCSI doivent utiliser, ou -1 pour la priorité par défaut. Utilisée uniquement lorsque la propriété \"app-iscsi-flags\" inclut l'indicateur NM_SETTING_DCB_FLAG_ENABLE (0x1)."
-
--#: ../clients/common/settings-docs.h.in:165
-+#: ../clients/common/settings-docs.h.in:183
- 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 "
-@@ -7132,21 +7339,21 @@ msgid ""
- "percents."
- msgstr "Un tableau de 8 valeurs d'uint, où l'index du tableau correspond à la priorité utilisateur (0 - 7) et la valeur indique le pourcentage de bande passante du groupe assigné à la priorité que la priorité peut utiliser. la somme de tous les pourcentages pour les priorités qui appartiennent au même groupe doit totaliser 100 pourcents."
-
--#: ../clients/common/settings-docs.h.in:166
-+#: ../clients/common/settings-docs.h.in:184
- msgid ""
- "An array of 8 boolean values, where the array index corresponds to the User "
- "Priority (0 - 7) and the value indicates whether or not the corresponding "
- "priority should transmit priority pause."
- msgstr "Un tableau de 8 valeurs booléennes, où l'index du tableau correspond à la priorité utilisateur (0 - 7) et la valeur indique si la priorité correspondante doit ou non transmettre une pause de priorité."
-
--#: ../clients/common/settings-docs.h.in:167
-+#: ../clients/common/settings-docs.h.in:185
- msgid ""
- "Specifies the NMSettingDcbFlags for DCB Priority Flow Control (PFC). Flags "
- "may be any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
- "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
- msgstr "Spécifie les indicateurs NMSettingDcbFlags pour le contrôle de débit prioritaire (PFC) du DCB, qui peuvent être n'importe quelle combinaison de NM_SETTING_DCB_FLAG_ENABLE (0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2) et NM_SETTING_DCB_FLAG_WILLING (0x4)."
-
--#: ../clients/common/settings-docs.h.in:168
-+#: ../clients/common/settings-docs.h.in:186
- 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 "
-@@ -7154,35 +7361,35 @@ msgid ""
- "values must total 100 percents."
- msgstr "Un tableau de 8 valeurs d'uint, où l'index du tableau correspond à l'ID de groupe prioritaire (0 - 7) et la valeur indique le pourcentage de la largeur de bande de liaison allouée à ce groupe. Les valeurs autorisées sont 0 - 100, et la somme de toutes les valeurs doit totaliser 100 pourcent."
-
--#: ../clients/common/settings-docs.h.in:169
-+#: ../clients/common/settings-docs.h.in:187
- msgid ""
- "Specifies the NMSettingDcbFlags for DCB Priority Groups. Flags may be any "
- "combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
- "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
- msgstr "Spécifie les indicateurs NMSettingDcbFlags des groupes de priorité DCB. Les indicateurs peuvent être n'importe quelle combinaison de NM_SETTING_DCB_FLAG_ENABLE (0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2), et NM_SETTING_DCB_FLAG_WILLING (0x4)."
-
--#: ../clients/common/settings-docs.h.in:170
-+#: ../clients/common/settings-docs.h.in:188
- msgid ""
- "An array of 8 uint values, where the array index corresponds to the User "
- "Priority (0 - 7) and the value indicates the Priority Group ID. Allowed "
- "Priority Group ID values are 0 - 7 or 15 for the unrestricted group."
- msgstr "Un tableau de 8 valeurs d'uint, où l'index du tableau correspond à la priorité utilisateur (0 - 7) et la valeur indique l'ID de groupe prioritaire. Les valeurs autorisées d'ID de groupe prioritaire sont 0 - 7 ou 15 pour le groupe sans restriction."
-
--#: ../clients/common/settings-docs.h.in:171
-+#: ../clients/common/settings-docs.h.in:189
- msgid ""
- "An array of 8 boolean values, where the array index corresponds to the User "
- "Priority (0 - 7) and the value indicates whether or not the priority may use "
- "all of the bandwidth allocated to its assigned group."
- msgstr "Un tableau de 8 valeurs booléennes, où l'index du tableau correspond à la priorité utilisateur (0 - 7) et la valeur indique si la priorité peut ou non utiliser toute la bande passante allouée à son groupe attribué."
-
--#: ../clients/common/settings-docs.h.in:172
-+#: ../clients/common/settings-docs.h.in:190
- msgid ""
- "An array of 8 uint values, where the array index corresponds to the User "
- "Priority (0 - 7) and the value indicates the traffic class (0 - 7) to which "
- "the priority is mapped."
- msgstr "Un tableau de 8 valeurs d'uint, où l'index du tableau correspond à la priorité utilisateur (0 - 7) et la valeur indique la classe de trafic (0 - 7) à laquelle la priorité est affectée."
-
--#: ../clients/common/settings-docs.h.in:173
-+#: ../clients/common/settings-docs.h.in:191
- 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 "
-@@ -7193,27 +7400,27 @@ msgid ""
- "14.9."
- msgstr "Nom du point d'accès GPRS spécifiant l'APN utilisé lors de l'établissement d'une session de données avec le réseau GSM. L'APN détermine souvent comment l'utilisateur sera facturé pour l'utilisation de son réseau et si l'utilisateur a accès à l'Internet ou s'il n'a accès qu'à un endroit gardé propre à son fournisseur. Il est donc important d'utiliser le bon APN pour le plan haut débit mobile de l’utilisateur. L'APN ne peut être composé que des caractères a-z, 0-9, ., et - par GSM 03.60 Section 14.9."
-
--#: ../clients/common/settings-docs.h.in:174
-+#: ../clients/common/settings-docs.h.in:192
- msgid ""
- "When TRUE, the settings such as APN, username, or password will default to "
- "values that match the network the modem will register to in the Mobile "
- "Broadband Provider database."
- msgstr "Lorsque le paramètre est sur TRUE, les valeurs par défaut des paramètres tels que APN, nom d'utilisateur ou mot de passe correspondent au réseau auquel le modem s'inscrit dans la base de données du fournisseur de services mobiles à large bande."
-
--#: ../clients/common/settings-docs.h.in:175
-+#: ../clients/common/settings-docs.h.in:193
- msgid ""
- "The device unique identifier (as given by the WWAN management service) which "
- "this connection applies to. If given, the connection will only apply to the "
- "specified device."
- msgstr "L'identifiant unique de l'appareil (tel qu'indiqué par le service de gestion WWAN) auquel cette connexion s'applique. Si donné, la connexion ne s'appliquera qu'à l'appareil spécifié."
-
--#: ../clients/common/settings-docs.h.in:176
-+#: ../clients/common/settings-docs.h.in:194
- msgid ""
- "When TRUE, only connections to the home network will be allowed. Connections "
- "to roaming networks will not be made."
- msgstr "Si sur TRUE, seules les connexions au réseau domestique seront autorisées, mais les connexions aux réseaux d'itinérance ne seront pas effectuées."
-
--#: ../clients/common/settings-docs.h.in:178
-+#: ../clients/common/settings-docs.h.in:196
- msgid ""
- "The Network ID (GSM LAI format, ie MCC-MNC) to force specific network "
- "registration. If the Network ID is specified, NetworkManager will attempt "
-@@ -7222,20 +7429,20 @@ msgid ""
- "the device is not otherwise possible."
- msgstr "L'ID réseau (format GSM LAI, c'est-à-dire MCC-MNC) pour forcer l'enregistrement d'un réseau spécifique. Si l'ID réseau est spécifié, NetworkManager tentera de forcer le périphérique à s'enregistrer uniquement sur le réseau spécifié. Ceci peut être utilisé pour garantir que le périphérique n'est pas en itinérance lorsque le contrôle direct roaming direct du périphérique n’est pas possible."
-
--#: ../clients/common/settings-docs.h.in:179
-+#: ../clients/common/settings-docs.h.in:197
- msgid ""
- "Legacy setting that used to help establishing PPP data sessions for GSM-"
- "based modems. Deprecated: 1"
- msgstr "Numéro à composer lors de l'établissement d'une session de données PPP avec le réseau mobile à large bande GSM De nombreux modems n'ont pas besoin de PPP pour les connexions au réseau mobile et donc cette propriété doit être laissée vide, ce qui permet à NetworkManager de sélectionner les paramètres appropriés automatiquement."
-
--#: ../clients/common/settings-docs.h.in:182
-+#: ../clients/common/settings-docs.h.in:200
- msgid ""
- "If the SIM is locked with a PIN it must be unlocked before any other "
- "operations are requested. Specify the PIN here to allow operation of the "
- "device."
- msgstr "Si la carte SIM est verrouillée avec un code PIN, elle doit être déverrouillée avant toute autre opération. Indiquez ici le code PIN pour permettre l'utilisation de l'appareil."
-
--#: ../clients/common/settings-docs.h.in:184
-+#: ../clients/common/settings-docs.h.in:202
- 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 "
-@@ -7243,7 +7450,7 @@ msgid ""
- "the given identifier."
- msgstr "L'identifiant unique de la carte SIM (tel qu'il est donné par le service de gestion WWAN) auquel cette connexion s'applique. Si donnée, la connexion s'appliquera à tout appareil également autorisé par \"device-id\" qui contient une carte SIM correspondant à l'identifiant donné."
-
--#: ../clients/common/settings-docs.h.in:185
-+#: ../clients/common/settings-docs.h.in:203
- msgid ""
- "A MCC/MNC string like \"310260\" or \"21601\" identifying the specific "
- "mobile network operator which this connection applies to. If given, the "
-@@ -7251,39 +7458,39 @@ msgid ""
- "id\" which contains a SIM card provisioned by the given operator."
- msgstr "Une chaîne MCC/MNC telle que \"310260\" ou \"21601\" identifiant l'opérateur de réseau mobile spécifique auquel cette connexion s'applique.Si donnée, la connexion s'appliquera à tout dispositif également autorisé par \"device-id\" et \"sim-id\" qui contient une carte SIM fournie par cet opérateur."
-
--#: ../clients/common/settings-docs.h.in:187
-+#: ../clients/common/settings-docs.h.in:205
- msgid ""
- "If specified, this connection will only apply to the IPoIB device whose "
- "permanent MAC address matches. This property does not change the MAC address "
- "of the device (i.e. MAC spoofing)."
- msgstr "Si elle est spécifiée, cette connexion ne s'appliquera qu'au périphérique IPoIB dont l'adresse MAC permanente correspond. Cette propriété ne change pas l'adresse MAC du périphérique (c'est-à-dire l'usurpation d'adresse MAC)."
-
--#: ../clients/common/settings-docs.h.in:189
-+#: ../clients/common/settings-docs.h.in:207
- msgid ""
- "The InfiniBand P_Key to use for this device. A value of -1 means to use the "
- "default P_Key (aka \"the P_Key at index 0\"). Otherwise it is a 16-bit "
- "unsigned integer, whose high bit is set if it is a \"full membership\" P_Key."
- msgstr "La clé InfiniBand P_Key à utiliser pour cet appareil. Une valeur de -1 signifie utiliser la clé par défaut P_Key (alias \"la clé P_Key à l'index 0\"). Sinon, c'est un entier non signé de 16 bits, dont le bit haut est défini si c'est une \"full membership\" P_Key."
-
--#: ../clients/common/settings-docs.h.in:190
-+#: ../clients/common/settings-docs.h.in:208
- msgid ""
- "The interface name of the parent device of this device. Normally NULL, but "
- "if the \"p_key\" property is set, then you must specify the base device by "
- "setting either this property or \"mac-address\"."
- msgstr "Le nom de l'interface du dispositif parent de cet appareil. Normalement NULL, mais si la propriété \"p_key\" est définie, alors vous devez spécifier le périphérique de base en définissant cette propriété ou \"mac-adresse\"."
-
--#: ../clients/common/settings-docs.h.in:191
-+#: ../clients/common/settings-docs.h.in:209
- 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:192
-+#: ../clients/common/settings-docs.h.in:210
- 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:193
-+#: ../clients/common/settings-docs.h.in:211
- msgid ""
- "Tunnel flags. Currently the following values are supported: "
- "NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT (0x1), "
-@@ -7294,78 +7501,78 @@ msgid ""
- "for IPv6 tunnels."
- msgstr "Les valeurs suivantes sont actuellement prises en charge : NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT (0x1), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_TCLASS (0x2), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FLOWLABEL (0x4), NM_IP_TUNNEL_FLAG_IP6_MIP6_DEV (0x8), NM_IP_TUNNEL_FLAG_IP6_RCV_DSCP_COPY (0x10), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK (0x20). Elles ne sont valides que pour les tunels IPv6."
-
--#: ../clients/common/settings-docs.h.in:194
-+#: ../clients/common/settings-docs.h.in:212
- msgid ""
- "The flow label to assign to tunnel packets. This property applies only to "
- "IPv6 tunnels."
- msgstr "L'étiquette de flux à affecter aux paquets du tunnel. Cette propriété s'applique uniquement aux tunnels IPv6."
-
--#: ../clients/common/settings-docs.h.in:195
-+#: ../clients/common/settings-docs.h.in:213
- msgid ""
- "The key used for tunnel input packets; the property is valid only for "
- "certain tunnel modes (GRE, IP6GRE). If empty, no key is used."
- msgstr "La clé utilisée pour les paquets d'entrée du tunnel ; la propriété n'est valide que pour certains modes de tunnel (GRE, IP6GRE), si vide, aucune clé n'est utilisée."
-
--#: ../clients/common/settings-docs.h.in:196
-+#: ../clients/common/settings-docs.h.in:214
- msgid ""
- "The local endpoint of the tunnel; the value can be empty, otherwise it must "
- "contain an IPv4 or IPv6 address."
- msgstr "Le terminal local du tunnel ; la valeur peut être vide, sinon elle doit contenir une adresse IPv4 ou IPv6."
-
--#: ../clients/common/settings-docs.h.in:197
-+#: ../clients/common/settings-docs.h.in:215
- msgid ""
- "The tunneling mode, for example NM_IP_TUNNEL_MODE_IPIP (1) or "
- "NM_IP_TUNNEL_MODE_GRE (2)."
- msgstr "Le mode tunneling, par exemple NM_IP_TUNNEL_MODE_IPIP (1) ou NM_IP_TUNNEL_MODE_GRE (2)."
-
--#: ../clients/common/settings-docs.h.in:198
-+#: ../clients/common/settings-docs.h.in:216
- msgid ""
- "If non-zero, only transmit packets of the specified size or smaller, "
- "breaking larger packets up into multiple fragments."
- msgstr "Si différent de zéro, ne transmet que des paquets de la taille spécifiée ou plus petits, divisant les paquets plus grands en plusieurs fragments."
-
--#: ../clients/common/settings-docs.h.in:199
-+#: ../clients/common/settings-docs.h.in:217
- msgid ""
- "The key used for tunnel output packets; the property is valid only for "
- "certain tunnel modes (GRE, IP6GRE). If empty, no key is used."
- msgstr "La clé utilisée pour les paquets d'entrée du tunnel ; la propriété n'est valide que pour certains modes de tunnel (GRE, IP6GRE). Si vide, aucune clé n'est utilisée."
-
--#: ../clients/common/settings-docs.h.in:200
-+#: ../clients/common/settings-docs.h.in:218
- msgid ""
- "If given, specifies the parent interface name or parent connection UUID the "
- "new device will be bound to so that tunneled packets will only be routed via "
- "that interface."
- msgstr "S'il est donné, spécifie le nom de l'interface parent ou l'UUID de connexion parent auquel le nouveau périphérique sera lié de sorte que les paquets tunnelisés seront uniquement routés via cette interface."
-
--#: ../clients/common/settings-docs.h.in:201
-+#: ../clients/common/settings-docs.h.in:219
- 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:202
-+#: ../clients/common/settings-docs.h.in:220
- msgid ""
- "The remote endpoint of the tunnel; the value must contain an IPv4 or IPv6 "
- "address."
- msgstr "Le point de terminaison distant du tunnel ; la valeur doit contenir une adresse IPv4 ou IPv6."
-
--#: ../clients/common/settings-docs.h.in:203
-+#: ../clients/common/settings-docs.h.in:221
- msgid ""
- "The type of service (IPv4) or traffic class (IPv6) field to be set on "
- "tunneled packets."
- msgstr "Le champ de type de service (IPv4) ou de classe de trafic (IPv6) à définir sur les paquets tunnelisés."
-
--#: ../clients/common/settings-docs.h.in:204
-+#: ../clients/common/settings-docs.h.in:222
- msgid ""
- "The TTL to assign to tunneled packets. 0 is a special value meaning that "
- "packets inherit the TTL value."
- msgstr "Le TTL à assigner aux paquets tunnelisés. 0 est une valeur spéciale qui signifie que les paquets héritent de la valeur TTL."
-
--#: ../clients/common/settings-docs.h.in:205
--#: ../clients/common/settings-docs.h.in:228
-+#: ../clients/common/settings-docs.h.in:223
-+#: ../clients/common/settings-docs.h.in:246
- msgid "Array of IP addresses."
- msgstr "Tableau d'adresses IP."
-
--#: ../clients/common/settings-docs.h.in:206
--#: ../clients/common/settings-docs.h.in:229
-+#: ../clients/common/settings-docs.h.in:224
-+#: ../clients/common/settings-docs.h.in:247
- msgid ""
- "Timeout in milliseconds used to check for the presence of duplicate IP "
- "addresses on the network. If an address conflict is detected, the "
-@@ -7375,7 +7582,7 @@ msgid ""
- "in milliseconds. The property is currently implemented only for IPv4."
- msgstr "Timeout en millisecondes utilisé pour vérifier la présence d'adresses IP dupliquées sur le réseau. Si un conflit d'adresse est détecté, l'activation échoue. Une valeur zéro signifie qu'aucune détection d'adresse dupliquée n'est effectuée ; -1 signifie la valeur par défaut (remplacé par la configuration ipvx.dad-timeout ou zéro). Une valeur supérieure à zéro est un timeout en millisecondes. La propriété est actuellement mise en œuvre uniquement pour IPv4."
-
--#: ../clients/common/settings-docs.h.in:207
-+#: ../clients/common/settings-docs.h.in:225
- 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 "
-@@ -7398,23 +7605,23 @@ msgid ""
- "plugin."
- msgstr "Une chaîne de caractères envoyée au serveur DHCP pour identifier la machine locale que le serveur DHCP peut utiliser pour personnaliser la location et les options DHCP. Lorsque la propriété est une chaîne hexadécimale ('aa:bb:cc'), elle est interprétée comme un ID de client binaire, auquel cas le premier octet est supposé être le champ 'type' selon RFC 2132 section 9.14 et les octets restants peuvent correspondre à une adresse matérielle (par exemple '01:xx:xx:xx:xx:xx:xx:xx' où 1 est le type ARP Ethernet et le reste est une adresse MAC). Si la propriété n'est pas une chaîne hexadécimale, elle est considérée comme un identifiant client sans adresse matérielle et le champ 'type' est mis à 0. Les valeurs spéciales 'mac' et 'perm-mac' sont supportées; elles utilisent l'adresse MAC actuelle ou permanente du périphérique pour générer un identifiant client avec un type ethernet (01). Actuellement, ces options ne fonctionnent que pour les liens de type ethernet. La valeur spéciale \"stable\" est prise en charge pour générer un identificateur de client de type 0 basé sur l'identifiant stable-id (voir connexion.stable-id) et une clé par hôte. Si elle n'est pas activée, une valeur par défaut configurée globalement sera utilisée. S'il n'est pas encore paramétré, l’id du client de leasing sera réutilisé."
-
--#: ../clients/common/settings-docs.h.in:208
-+#: ../clients/common/settings-docs.h.in:226
- msgid ""
- "If the \"dhcp-send-hostname\" property is TRUE, then the specified FQDN will "
- "be sent to the DHCP server when acquiring a lease. This property and \"dhcp-"
- "hostname\" are mutually exclusive and cannot be set at the same time."
- msgstr "Si la propriété \"dhcp-send-hostname\" est sur TRUE, alors le FQDN spécifié sera envoyé au serveur DHCP lors de l'acquisition du leasing. Cette propriété et \"dhcp-hostname\" sont mutuellement exclusifs et ne peuvent être définis simultanément."
-
--#: ../clients/common/settings-docs.h.in:209
--#: ../clients/common/settings-docs.h.in:231
-+#: ../clients/common/settings-docs.h.in:227
-+#: ../clients/common/settings-docs.h.in:249
- msgid ""
- "If the \"dhcp-send-hostname\" property is TRUE, then the specified name will "
- "be sent to the DHCP server when acquiring a lease. This property and \"dhcp-"
- "fqdn\" are mutually exclusive and cannot be set at the same time."
- msgstr "Si la propriété \"dhcp-send-hostname\" est sur TRUE, alors le nom spécifié sera envoyé au serveur DHCP lors de l'acquisition du leasing. Cette propriété et \"dhcp-hostname\" sont mutuellement exclusifs et ne peuvent être définis simultanément."
-
--#: ../clients/common/settings-docs.h.in:210
--#: ../clients/common/settings-docs.h.in:232
-+#: ../clients/common/settings-docs.h.in:228
-+#: ../clients/common/settings-docs.h.in:250
- msgid ""
- "Flags for the DHCP hostname and FQDN. Currently this property only includes "
- "flags to control the FQDN flags set in the DHCP FQDN option. Supported FQDN "
-@@ -7433,8 +7640,8 @@ msgid ""
- "above are sent in the DHCP requests."
- msgstr "Drapeaux pour le nom d'hôte DHCP et le FQDN. Actuellement, cette propriété n'inclut que les drapeaux pour contrôler les drapeaux FQDN définis dans l'option DHCP FQDN. Les indicateurs FQDN pris en charge sont NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) et NM_DHCP_HOSTNAME_FLAG_FQDN_NO_UPDATE (0x4). Lorsqu'aucun drapeau FQDN n'est défini et que NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) est défini, l'option DHCP FQDN ne contient aucun drapeau. Sinon, si aucun code FQDN n'est activé et que NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) n'est pas activé, les codes FQDN standard sont activés dans la requête : NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) pour IPv4 et NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1) pour IPv6. Lorsque cette propriété est définie sur la valeur par défaut NM_DHCP_HOSTNAME_FLAG_NONE (0x0), une valeur par défaut globale est recherché dans la configuration de NetworkManager. Si cette valeur est non définie ou également NM_DHCP_HOSTNAME_FLAG_NONE (0x0), alors les drapeaux FQDN standard décrits ci-dessus sont envoyés dans les requêtes DHCP."
-
--#: ../clients/common/settings-docs.h.in:211
--#: ../clients/common/settings-docs.h.in:233
-+#: ../clients/common/settings-docs.h.in:229
-+#: ../clients/common/settings-docs.h.in:251
- msgid ""
- "A string containing the \"Identity Association Identifier\" (IAID) used by "
- "the DHCP client. The property is a 32-bit decimal value or a special value "
-@@ -7449,8 +7656,8 @@ msgid ""
- "for IPv6 by dhclient, which always derives the IAID from the MAC address."
- msgstr "Une chaîne contenant \"Identity Association Identifier\" (IAID) utilisé par le client DHCP. La propriété est une valeur décimale de 32 bits ou une valeur spéciale parmi \"mac\", \"perm-mac\", \"ifname\" et \"stable\". Lorsqu'il est réglé sur \"mac\" (ou \"perm-mac\"), les 4 derniers octets de l'adresse MAC actuelle (ou permanente) sont utilisés comme IAID. Lorsqu'il est défini à \"ifname\", l'IAID est calculé en hachant le nom de l'interface. La valeur spéciale \"stable\" permet de générer un IAID basé sur le stable-id (voir connection.stable-id), une clé par hôte et le nom de l'interface. Lorsque la propriété n'est pas définie, la valeur de la configuration globale est utilisée ; si aucun défaut global n'est défini, alors l'IAID est supposé être \"ifname\". Notez qu'à l'heure actuelle cette propriété est ignorée pour IPv6 par dhclient, qui dérive toujours l'IAID de l'adresse MAC."
-
--#: ../clients/common/settings-docs.h.in:212
--#: ../clients/common/settings-docs.h.in:234
-+#: ../clients/common/settings-docs.h.in:230
-+#: ../clients/common/settings-docs.h.in:252
- 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 "
-@@ -7459,54 +7666,66 @@ msgid ""
- "of the computer is sent."
- msgstr "Si sur TRUE, un nom d’hôte est envoyé au serveur DHCP lors de l’acquisition d’un leasing. Certains serveurs DHCP utilisent ce nom d'hôte pour mettre à jour les bases de données DNS, fournissant essentiellement un nom d'hôte statique pour l'ordinateur. Si la propriété \"dhcp-hostname\" est NULL et que cette propriété est TRUE, le nom d'hôte permanent actuel de l'ordinateur est envoyé."
-
--#: ../clients/common/settings-docs.h.in:213
--#: ../clients/common/settings-docs.h.in:235
--msgid "A timeout for a DHCP transaction in seconds."
--msgstr "Un délai d'attente pour une transaction DHCP en secondes."
-+#: ../clients/common/settings-docs.h.in:231
-+#: ../clients/common/settings-docs.h.in:253
-+msgid ""
-+"A timeout for a DHCP transaction in seconds. If zero (the default), a "
-+"globally configured default is used. If still unspecified, a device specific "
-+"timeout is used (usually 45 seconds). Set to 2147483647 (MAXINT32) for "
-+"infinity."
-+msgstr "Un délai d'attente pour une transaction DHCP en secondes. S'il est égal à zéro (par défaut), une valeur par défaut configurée globalement est utilisée. S'il n'est pas encore spécifié, un délai d'attente spécifique à l'appareil est utilisé (généralement 45 secondes). Réglé sur 2147483647 (MAXINT32) pour l'infini."
-
--#: ../clients/common/settings-docs.h.in:214
--#: ../clients/common/settings-docs.h.in:236
-+#: ../clients/common/settings-docs.h.in:232
-+#: ../clients/common/settings-docs.h.in:254
- msgid "Array of IP addresses of DNS servers."
- msgstr "Tableau d'adresses IP des serveurs DNS."
-
--#: ../clients/common/settings-docs.h.in:215
--#: ../clients/common/settings-docs.h.in:237
-+#: ../clients/common/settings-docs.h.in:233
-+#: ../clients/common/settings-docs.h.in:255
- msgid ""
- "Array of DNS options as described in man 5 resolv.conf. NULL means that the "
- "options are unset and left at the default. In this case NetworkManager will "
--"use default options. This is distinct from an empty list of properties."
--msgstr "Tableau d'options DNS tel que décrit dans le fichier man 5 resolv.conf. NULL signifie que les options sont désactivées et laissées par défaut. Dans ce cas, NetworkManager utilisera les options par défaut, ce qui est différent d'une liste de propriétés vide."
-+"use default options. This is distinct from an empty list of properties. The "
-+"currently supported options are \"attempts\", \"debug\", \"edns0\", "
-+"\"inet6\", \"ip6-bytestring\", \"ip6-dotint\", \"ndots\", \"no-check-names"
-+"\", \"no-ip6-dotint\", \"no-reload\", \"no-tld-query\", \"rotate\", \"single-"
-+"request\", \"single-request-reopen\", \"timeout\", \"trust-ad\", \"use-vc\". "
-+"The \"trust-ad\" setting is only honored if the profile contributes name "
-+"servers to resolv.conf, and if all contributing profiles have \"trust-ad\" "
-+"enabled."
-+msgstr "Tableau des options DNS tel que décrit dans man 5 resolv.conf. NULL signifie que les options ne sont pas définies et sont laissées par défaut. Dans ce cas, NetworkManager utilisera les options par défaut. Ceci est distinct d'une liste vide de propriétés. Les options actuellement supportées sont \"attempts\", \"debug\", \"edns0\", \"inet6\", \"ip6-bytestring\", \"ip6-dotint\", \"ndots\", \"no-check-names\", \"no-ip6-dotint\", \"no-reload\", \"no-tld-query\", \"rotate\", \"single-request\", \"single-request-reopen\", \"timeout\", \"trust-ad\", \"use-vc\". Le paramètre \"trust-ad\" n'est honoré que si le profil contribue aux serveurs de noms de resolv.conf, et si tous les profils contributeurs ont activé \"trust-ad\"."
-
--#: ../clients/common/settings-docs.h.in:216
--#: ../clients/common/settings-docs.h.in:238
-+#: ../clients/common/settings-docs.h.in:234
-+#: ../clients/common/settings-docs.h.in:256
- msgid ""
- "DNS servers priority. The relative priority for DNS servers specified by "
- "this setting. A lower value is better (higher priority). Zero selects a "
- "globally configured default value. If the latter is missing or zero too, it "
--"defaults to 50 for VPNs and 100 for other connections. Note that the "
--"priority is to order DNS settings for multiple active connections. It does "
--"not disambiguate multiple DNS servers within the same connection profile. "
--"When using dns=default, servers with higher priority will be on top of "
--"resolv.conf. To prioritize a given server over another one within the same "
--"connection, just specify them in the desired order. When multiple devices "
--"have configurations with the same priority, the one with an active default "
--"route will be preferred. Negative values have the special effect of "
--"excluding other configurations with a greater priority value; so in presence "
--"of at least a negative priority, only DNS servers from connections with the "
--"lowest priority value will be used. When using a DNS resolver that supports "
--"Conditional Forwarding as dns=dnsmasq or dns=systemd-resolved, each "
--"connection is used to query domains in its search list. Queries for domains "
--"not present in any search list are routed through connections having the "
--"'~.' special wildcard domain, which is added automatically to connections "
--"with the default route (or can be added manually). When multiple "
--"connections specify the same domain, the one with the highest priority "
--"(lowest numerical value) wins. If a connection specifies a domain which is "
--"subdomain of another domain with a negative DNS priority value, the "
--"subdomain is ignored."
--msgstr "Priorité des serveurs DNS : la priorité relative des serveurs DNS spécifiée par ce paramètre. Une valeur inférieure est meilleure (priorité supérieure) Zéro sélectionne la valeur par défaut, qui est 50 pour les VPNs et 100 pour les autres connexions. Notez que la priorité est d’ordonnancer les paramètres DNS pour plusieurs connexions actives. Ne désambiguise pas plusieurs serveurs DNS dans le même profil de connexion. Avec dns = default, les serveurs avec priorité supérieure seront au dessus de resolv.conf. Pour donner la priorité à un autre serveur sur la même connexion, il suffit d’en spécifier l’ordre. Lorsque plusieurs périphériques ont des configuration avec la même priorité, on préférera celui qui a une route active par défaut. Le valeurs négatives ont pour effet spécial d’exclure les configurations ayant une valeur de priorité plus élevée; donc en présence d'au moins une priorité négative, seuls les serveurs DNS des connexions ayant la valeur de priorité la plus basse seront utilisés. Lors de l'utilisation d'un résolveur DNS qui prend en charge les DNS qui supportent les transmissions conditionnelles comme dns=dnsmasq ou dns=systemd-resolved, chaque connexion est utilisée pour interroger les domaines de recherche dans sa liste de recherche. Les requêtes pour les domaines qui ne figurent dans aucune liste de recherche sont acheminées par des connexions ayant le domaine générique spécial '~.', qui est ajouté automatiquement aux connexions ayant la route par défaut (ou peut être ajouté manuellement). Lorsque plusieurs connexions spécifient le même domaine, celui qui a la priorité la plus élevée (valeur numérique la plus basse) gagne. Si une connexion spécifie un domaine qui est un sous-domaine d'un autre domaine avec une valeur de priorité DNS négative, le sous-domaine est ignoré."
-+"defaults to 50 for VPNs (including WireGuard) and 100 for other connections. "
-+"Note that the priority is to order DNS settings for multiple active "
-+"connections. It does not disambiguate multiple DNS servers within the same "
-+"connection profile. When using dns=default, servers with higher priority "
-+"will be on top of resolv.conf. To prioritize a given server over another "
-+"one within the same connection, just specify them in the desired order. "
-+"When multiple devices have configurations with the same priority, VPNs will "
-+"be considered first, then devices with the best (lowest metric) default "
-+"route and then all other devices. Negative values have the special effect "
-+"of excluding other configurations with a greater priority value; so in "
-+"presence of at least one negative priority, only DNS servers from "
-+"connections with the lowest priority value will be used. When using a DNS "
-+"resolver that supports Conditional Forwarding as dns=dnsmasq or dns=systemd-"
-+"resolved, each connection is used to query domains in its search list. "
-+"Queries for domains not present in any search list are routed through "
-+"connections having the '~.' special wildcard domain, which is added "
-+"automatically to connections with the default route (or can be added "
-+"manually). When multiple connections specify the same domain, the one with "
-+"the highest priority (lowest numerical value) wins. If a connection "
-+"specifies a domain which is subdomain of another domain with a negative DNS "
-+"priority value, the subdomain is ignored."
-+msgstr "Priorité aux serveurs DNS. La priorité relative des serveurs DNS spécifiée par ce paramètre. Une valeur inférieure est meilleure (priorité supérieure). Zéro sélectionne une valeur par défaut configurée globalement. Si cette dernière est manquante ou si elle est également nulle, la valeur par défaut est 50 pour les VPN (y compris WireGuard) et 100 pour les autres connexions. Notez que la priorité est d'ordonner les paramètres DNS pour plusieurs connexions actives. Elle ne désambiguise pas plusieurs serveurs DNS dans un même profil de connexion. En utilisant dns=default, les serveurs avec une priorité plus élevée seront en haut de resolv.conf. Pour donner la priorité à un serveur donné par rapport à un autre au sein de la même connexion, il suffit de les spécifier dans l'ordre souhaité. Lorsque plusieurs appareils ont des configurations avec la même priorité, les VPN seront considérés en premier, puis les appareils avec la meilleure route (métrique la plus basse) par défaut et ensuite tous les autres appareils. Les valeurs négatives ont pour effet particulier d'exclure les autres configurations ayant une valeur de priorité plus élevée ; ainsi, en présence d'au moins une priorité négative, seuls les serveurs DNS des connexions ayant la valeur de priorité la plus faible seront utilisés. Lorsque l'on utilise un résolveur DNS qui prend en charge la redirection conditionnelle sous la forme dns=dnsmasq ou dns=systemd-resolved, chaque connexion est utilisée pour interroger les domaines de sa liste de recherche. Les requêtes concernant des domaines non présents dans une liste de recherche sont acheminées par des connexions ayant le domaine joker spécial \"~.\", qui est ajouté automatiquement aux connexions avec la route par défaut (ou peut être ajouté manuellement). Lorsque plusieurs connexions spécifient le même domaine, celle qui a la priorité la plus élevée (valeur numérique la plus basse) gagne. Si une connexion spécifie un domaine qui est un sous-domaine d'un autre domaine avec une valeur de priorité DNS négative, le sous-domaine est ignoré."
-
--#: ../clients/common/settings-docs.h.in:217
--#: ../clients/common/settings-docs.h.in:239
-+#: ../clients/common/settings-docs.h.in:235
-+#: ../clients/common/settings-docs.h.in:257
- msgid ""
- "Array of DNS search domains. Domains starting with a tilde ('~') are "
- "considered 'routing' domains and are used only to decide the interface over "
-@@ -7514,15 +7733,19 @@ msgid ""
- "host names."
- msgstr "Tableau de domaines de recherche DNS. Les domaines commençant par un tilde ('~') sont considérés comme des domaines de 'routage' et ne sont utilisés que pour décider de l'interface sur laquelle une requête doit être transmise ; ils ne sont pas utilisés pour compléter des noms d'hôtes non qualifiés."
-
--#: ../clients/common/settings-docs.h.in:218
--#: ../clients/common/settings-docs.h.in:240
-+#: ../clients/common/settings-docs.h.in:236
-+#: ../clients/common/settings-docs.h.in:258
- msgid ""
- "The gateway associated with this configuration. This is only meaningful if "
--"\"addresses\" is also set."
--msgstr "La passerelle associée à cette configuration, qui n'a de sens que si l'on définit également des \"adresses\"."
-+"\"addresses\" is also set. The gateway's main purpose is to control the next "
-+"hop of the standard default route on the device. Hence, the gateway property "
-+"conflicts with \"never-default\" and will be automatically dropped if the IP "
-+"configuration is set to never-default. As an alternative to set the gateway, "
-+"configure a static default route with /0 as prefix length."
-+msgstr "La passerelle associée à cette configuration. Cela n'a de sens que si des \"adresses\" sont également définies. Le but principal de la passerelle est de contrôler le prochain saut de route standard par défaut sur l'appareil. Par conséquent, la propriété de la passerelle est en conflit avec \"never-default\" et sera automatiquement abandonnée si la configuration IP est définie sur «never-default». Comme alternative pour définir la passerelle, configurez une route statique par défaut avec /0 comme longueur de préfixe."
-
--#: ../clients/common/settings-docs.h.in:219
--#: ../clients/common/settings-docs.h.in:241
-+#: ../clients/common/settings-docs.h.in:237
-+#: ../clients/common/settings-docs.h.in:259
- msgid ""
- "When \"method\" is set to \"auto\" and this property to TRUE, automatically "
- "configured nameservers and search domains are ignored and only nameservers "
-@@ -7530,16 +7753,16 @@ msgid ""
- "if any, are used."
- msgstr "Lorsque \"method\" est définie sur \"auto\" et cette propriété sur TRUE, les serveurs de noms et les domaines de recherche configurés automatiquement sont ignorés et seuls les serveurs de noms et les domaines de recherche spécifiés dans les propriétés \"dns\" et \"dns-search\", le cas échéant, sont utilisés."
-
--#: ../clients/common/settings-docs.h.in:220
--#: ../clients/common/settings-docs.h.in:242
-+#: ../clients/common/settings-docs.h.in:238
-+#: ../clients/common/settings-docs.h.in:260
- msgid ""
- "When \"method\" is set to \"auto\" and this property to TRUE, automatically "
- "configured routes are ignored and only routes specified in the \"routes\" "
- "property, if any, are used."
- msgstr "Lorsque \"method\" est défini sur \"auto\" et cette propriété sur TRUE, les routes configurées automatiquement sont ignorées et seules les routes spécifiées dans la propriété \"routes\", le cas échéant, sont utilisées."
-
--#: ../clients/common/settings-docs.h.in:221
--#: ../clients/common/settings-docs.h.in:244
-+#: ../clients/common/settings-docs.h.in:239
-+#: ../clients/common/settings-docs.h.in:262
- msgid ""
- "If TRUE, allow overall network configuration to proceed even if the "
- "configuration specified by this property times out. Note that at least one "
-@@ -7549,8 +7772,8 @@ msgid ""
- "if IPv4 configuration fails but IPv6 configuration completes successfully."
- msgstr "si défini sur TRUE, laissez la configuration réseau globale se poursuivre même si la configuration spécifiée par cette propriété est dépassée. Notez qu'au moins une configuration IP doit réussir ou la configuration réseau globale échouera toujours. Par exemple, dans les réseaux IPv6 uniquement, définir cette propriété à TRUE sur NMSettingIP4Config permet à la configuration réseau globale d’aboutir si la configuration IPv4 échoue mais que la configuration IPv6 s’achève correctement."
-
--#: ../clients/common/settings-docs.h.in:222
--#: ../clients/common/settings-docs.h.in:245
-+#: ../clients/common/settings-docs.h.in:240
-+#: ../clients/common/settings-docs.h.in:263
- msgid ""
- "IP configuration method. NMSettingIP4Config and NMSettingIP6Config both "
- "support \"disabled\", \"auto\", \"manual\", and \"link-local\". See the "
-@@ -7566,15 +7789,15 @@ msgid ""
- "the uplink which is shared."
- msgstr "Méthode de configuration IP. NMSettingIP4Config et NMSettingIP6Config supportent tous les deux \"auto\", \"manual\" et \"link-local\". Reportez-vous à la documentation spécifique à la sous-classe pour obtenir d'autres valeurs. En général, pour la méthode \"auto\", les propriétés telles que \"dns\" et \"routes\" spécifient des informations qui s'ajoutent aux informations renvoyées par la configuration automatique. Les propriétés \"ignore-auto-routes\" et \"ignore-auto-dns\" modifient ce comportement. Pour les méthodes qui n'impliquent aucun réseau amont, telles que \"shared\" ou \"link-local\", ces propriétés doivent être vides. Pour la méthode IPv4 \"partagée\", le sous-réseau IP peut être configuré en ajoutant une adresse IPv4 manuelle, sinon 10.42.x.0/24 est choisi. Notez que la méthode partagée doit être configurée sur l'interface qui partage Internet avec un sous-réseau, et non sur la liaison montante qui est partagée."
-
--#: ../clients/common/settings-docs.h.in:223
--#: ../clients/common/settings-docs.h.in:246
-+#: ../clients/common/settings-docs.h.in:241
-+#: ../clients/common/settings-docs.h.in:264
- msgid ""
- "If TRUE, this connection will never be the default connection for this IP "
- "type, meaning it will never be assigned the default route by NetworkManager."
- msgstr "Si TRUE, cette connexion ne sera jamais la connexion par défaut pour ce type d'IP, ce qui signifie que NetworkManager ne lui assignera jamais la route par défaut."
-
--#: ../clients/common/settings-docs.h.in:224
--#: ../clients/common/settings-docs.h.in:247
-+#: ../clients/common/settings-docs.h.in:242
-+#: ../clients/common/settings-docs.h.in:266
- 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 "
-@@ -7585,8 +7808,8 @@ msgid ""
- "mean setting it to 1024. For IPv4, zero is a regular value for the metric."
- msgstr "La métrique par défaut pour les routes qui ne spécifient pas explicitement une métrique. La valeur par défaut -1 signifie que la métrique est choisie automatiquement en fonction du type de dispositif. La métrique s'applique aux routes dynamiques, aux routes manuelles (statiques) qui n'ont pas de paramètre métrique explicite, aux routes de préfixe d'adresse et à la route par défaut. Notez que pour IPv6, le noyau accepte zéro (0) mais le contraint à 1024 (utilisateur par défaut). Par conséquent, mettre cette propriété à zéro signifie qu'il faut la mettre à 1024. Pour IPv4, zéro est une valeur normale de métrique."
-
--#: ../clients/common/settings-docs.h.in:225
--#: ../clients/common/settings-docs.h.in:248
-+#: ../clients/common/settings-docs.h.in:243
-+#: ../clients/common/settings-docs.h.in:267
- msgid ""
- "Enable policy routing (source routing) and set the routing table used when "
- "adding routes. This affects all routes, including device-routes, IPv4LL, "
-@@ -7603,12 +7826,12 @@ msgid ""
- "tables outside of NetworkManager."
- msgstr "Active le routage de stratégie (routage source) et définit la table de routage utilisée lors de l'ajout de routes. Ceci affecte toutes les routes, y compris les routes de périphériques, IPv4LL, DHCP, SLAAC, les routes par défaut et les routes statiques. Mais notez que les routes statiques peuvent écraser individuellement le paramètre en spécifiant explicitement une table de routage non nulle. Si le réglage de table est laissé à zéro, il peut être écrasé via la configuration globale. Si la propriété est nulle même après l'application de la valeur de configuration globale, le routage des stratégies est désactivé pour la famille d'adresses de cette connexion. Le routage de stratégie désactivé signifie que NetworkManager ajoutera toutes les routes à la table principale (sauf les routes statiques qui configurent explicitement une table différente). En outre, NetworkManager ne supprimera les routes extrinsèques aux tables, à l'exception de la table principale, ceci afin de préserver la rétrocompatibilité pour les utilisateurs qui gèrent les tables de routage en dehors de NetworkManager."
-
--#: ../clients/common/settings-docs.h.in:226
--#: ../clients/common/settings-docs.h.in:249
-+#: ../clients/common/settings-docs.h.in:244
-+#: ../clients/common/settings-docs.h.in:268
- msgid "Array of IP routes."
- msgstr "Tale de routes IP."
-
--#: ../clients/common/settings-docs.h.in:227
-+#: ../clients/common/settings-docs.h.in:245
- msgid ""
- "Configure method for creating the address for use with RFC4862 IPv6 "
- "Stateless Address Autoconfiguration. The permitted values are: "
-@@ -7630,7 +7853,7 @@ msgid ""
- "affect the temporary addresses configured with this option."
- msgstr "Configurez la méthode de création de l'adresse à utiliser avec l'autoconfiguration d'adresse sans état RFC4862 IPv6. Les valeurs autorisées sont : NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_EUI64 (0) ou NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_STABLE_PRIVACY (1). Si la propriété est définie sur EUI64, les adresses seront générées à l'aide des jetons d'interface dérivés de l'adresse matérielle. Cela permet à la partie hôte de l'adresse de rester constante, ce qui permet de suivre la présence de l'hôte lorsqu'il change de réseau. L'adresse change lorsque le matériel de l'interface est remplacé. La valeur stable-privacy permet d'utiliser le hachage cryptographique sécurisé d'une clé secrète spécifique à l'hôte avec l'identifiant stable de la connexion et l'adresse réseau comme spécifié par RFC7217. Cela rend impossible l'utilisation de la présence de l'hôte address track et rend l'adresse stable lorsque le matériel de l'interface réseau est remplacé. Sur le D-Bus, l'absence d'un réglage de mode addr-gen équivaut à permettre une protection stable de la vie privée. Pour le plugin keyfile, l'absence du paramètre sur le disque signifie EUI64 pour que la propriété ne change pas lors de la mise à jour par rapport aux anciennes versions. Notez que ce paramètre est distinct des extensions de confidentialité configurées par la propriété \"ip6-privacy\" et n'affecte pas les adresses temporaires configurées avec cette option."
-
--#: ../clients/common/settings-docs.h.in:230
-+#: ../clients/common/settings-docs.h.in:248
- 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 "
-@@ -7659,7 +7882,7 @@ msgid ""
- "assumed."
- msgstr "Chaîne contenant l'identificateur unique DHCPv6 (DUID) utilisé par le client dhcp pour s'identifier aux serveurs DHCPv6 (RFC 3315). Le DUID est porté dans l'option Client Identifier. Si la propriété est une chaîne hexadécimale ('aa:bbb:cc'), elle est interprétée comme un DUID binaire et remplie comme une valeur opaque dans l'option Client Identifier. La valeur spéciale \"lease\" permet de récupérer le DUID précédemment utilisé dans le fichier de location appartenant à la connexion. Si aucun DUID n'est trouvé et que \"dhclient\" est le client dhcp configuré, le DUID est recherché dans le fichier de location dhclient du système. Si aucun DUID n'est trouvé, ou si un autre client dhcp est utilisé, un DUID-UUID global et permanent (RFC 6355) sera généré à partir du machine-id. Les valeurs spéciales \"llt\" et \"ll\" génèrent un DUID de type LLT ou LL (voir RFC 3315) basé sur l'adresse MAC actuelle de l'appareil. Afin d'essayer de fournir un DUID-LLT stable, le champ d'heure contiendra un horodatage constant qui sera utilisé globalement (pour tous les profils) et persisté sur le disque. Les valeurs spéciales \"stable-llt\", \"stable-llt\" et \"stable-uuid\" génèrent un DUID du type correspondant, dérivé de l'identifiant stable de la connexion et d'une clé unique par hôte. Ainsi, l'adresse de la couche de liens de \"stable-ll\" et \"stable-llt\" sera une adresse générée dérivée de l'identifiant stable. La valeur de temps DUID-LLT de l'option \"stable-llt\" sera choisie dans un intervalle de temps statique de trois ans (la limite supérieure de l'intervalle est la même horodatage constant utilisé dans \"llt\"). Lorsque la propriété n'est pas définie, la valeur globale fournie pour \"ipv6.dhcp-duid\" est utilisée. Si aucune valeur globale n'est fournie, la valeur par défaut de la \"location\" est présumée."
-
--#: ../clients/common/settings-docs.h.in:243
-+#: ../clients/common/settings-docs.h.in:261
- msgid ""
- "Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941. If "
- "enabled, it makes the kernel generate a temporary IPv6 address in addition "
-@@ -7676,38 +7899,46 @@ msgid ""
- "IPv6 addresses."
- msgstr "Configurez les extensions de confidentialité IPv6 pour SLAAC, décrites dans la RFC4941. Si cette option est activée, le noyau génère une adresse IPv6 temporaire en plus de l'adresse publique générée à partir de l'adresse MAC via EUI-64 modifiée. Cela améliore la protection de la vie privée, mais pourrait causer des problèmes dans certaines applications. Les valeurs autorisées sont : 1 : inconnu, 0 : désactivé, 1 : activé (préfère l'adresse publique), 2 : activé (préfère les adresses temporaires). Avoir un paramètre par connexion réglé sur \"-1\" (inconnu) signifie un retour à la configuration globale \"ipv6.ip6.ip6-privacy\". Si la configuration globale n'est pas spécifiée ou est définie sur \"-1\", lire \"/proc/sys/net/ipv6/conf/default/use_tempaddr\" à la place. Notez que ce paramètre est distinct des adresses Stable Privacy qui peuvent être activées avec le paramètre \"stable-privacy\" de la propriété \"addr-gen-mode\" comme un autre moyen d'éviter le suivi des hôtes avec des adresses IPv6."
-
--#: ../clients/common/settings-docs.h.in:250
-+#: ../clients/common/settings-docs.h.in:265
-+msgid ""
-+"A timeout for waiting Router Advertisements in seconds. If zero (the "
-+"default), a globally configured default is used. If still unspecified, the "
-+"timeout depends on the sysctl settings of the device. Set to 2147483647 "
-+"(MAXINT32) for infinity."
-+msgstr "Un délai d'attente pour les Alertes de Routeurs en secondes. Si la valeur est nulle (par défaut), une valeur par défaut configurée globalement est utilisée. S'il n'est pas encore spécifié, le délai d'attente dépend des paramètres sysctl de l'appareil. Réglé sur 2147483647 (MAXINT32) pour l'infini."
-+
-+#: ../clients/common/settings-docs.h.in:269
- msgid ""
- "Configure the token for draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 "
- "tokenized interface identifiers. Useful with eui64 addr-gen-mode."
- msgstr "Configurez le jeton pour les identificateurs d'interface à jeton IPv6 IPv6 de draft-chown-6man-tokenised-ipv6-identifiers-02. Utile dans le mode eui64 addr-gen."
-
--#: ../clients/common/settings-docs.h.in:251
-+#: ../clients/common/settings-docs.h.in:270
- msgid "Whether the transmitted traffic must be encrypted."
- msgstr "Indique si le trafic transmis doit être crypté."
-
--#: ../clients/common/settings-docs.h.in:252
-+#: ../clients/common/settings-docs.h.in:271
- 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:253
-+#: ../clients/common/settings-docs.h.in:272
- msgid "Flags indicating how to handle the \"mka-cak\" property."
- msgstr "Marqueurs indiquant comment gérer la propriété \"mka-cak\"."
-
--#: ../clients/common/settings-docs.h.in:254
-+#: ../clients/common/settings-docs.h.in:273
- 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:255
-+#: ../clients/common/settings-docs.h.in:274
- msgid ""
- "Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
- "Agreement) is obtained."
- msgstr "Indique si le CAK (Connectivity Association Key) pré-partagé pour MACsec Key Agreement a été obtenu."
-
--#: ../clients/common/settings-docs.h.in:256
-+#: ../clients/common/settings-docs.h.in:275
- 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 "
-@@ -7715,29 +7946,29 @@ msgid ""
- "\"mac-address\" property."
- msgstr "S'il est donné, spécifie le nom de l'interface parent ou l'UUID de connexion parent à partir duquel cette interface MACSEC doit être créée. Si cette propriété n'est pas spécifiée, la connexion doit contenir un paramètre \"802-3-ethernet\" avec une propriété \"mac-address\"."
-
--#: ../clients/common/settings-docs.h.in:257
-+#: ../clients/common/settings-docs.h.in:276
- 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:258
-+#: ../clients/common/settings-docs.h.in:277
- 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:259
-+#: ../clients/common/settings-docs.h.in:278
- msgid "Specifies the validation mode for incoming frames."
- msgstr "Spécifie le mode de validation des trames entrantes."
-
--#: ../clients/common/settings-docs.h.in:260
-+#: ../clients/common/settings-docs.h.in:279
- msgid ""
- "The macvlan mode, which specifies the communication mechanism between "
- "multiple macvlans on the same lower device."
- msgstr "Le mode macvlan, qui spécifie le mécanisme de communication entre plusieurs macvlans d'un périphérique inférieur identique."
-
--#: ../clients/common/settings-docs.h.in:261
-+#: ../clients/common/settings-docs.h.in:280
- 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 "
-@@ -7745,102 +7976,145 @@ msgid ""
- "\"mac-address\" property."
- msgstr "S'il est donné, spécifie le nom de l'interface parent ou l'UUID de connexion parent à partir duquel cette interface MACSEC doit être créée. Si cette propriété n'est pas spécifiée, la connexion doit contenir un paramètre \"802-3-ethernet\" avec une propriété \"mac-address\"."
-
--#: ../clients/common/settings-docs.h.in:262
-+#: ../clients/common/settings-docs.h.in:281
- 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:263
-+#: ../clients/common/settings-docs.h.in:282
- msgid "Whether the interface should be a MACVTAP."
- msgstr "Indique si l'interface doit être une MACVTAP."
-
--#: ../clients/common/settings-docs.h.in:264
-+#: ../clients/common/settings-docs.h.in:283
-+msgid ""
-+"A list of driver names to match. Each element is a shell wildcard pattern. "
-+"See NMSettingMatch:interface-name for how special characters '|', '&', '!' "
-+"and '\\' are used for optional and mandatory matches and inverting the "
-+"pattern."
-+msgstr "Une liste de noms de drivers à faire correspondre. Chaque élément est un motifs à caractères spéciaux shell. Voir NMSettingMatch:interface-name pour savoir comment les caractères spéciaux \"|\", \"&\", \" !\" et \"\\\" sont utilisés pour les correspondances obligatoires et facultatives et pour inverser le modèle."
-+
-+#: ../clients/common/settings-docs.h.in:284
- msgid ""
- "A list of interface names to match. Each element is a shell wildcard "
--"pattern. When an element is prefixed with exclamation mark (!) the "
--"condition is inverted. A candidate interface name is considered matching "
--"when both these conditions are satisfied: (a) any of the elements not "
--"prefixed with '!' matches or there aren't such elements; (b) none of the "
--"elements prefixed with '!' match."
--msgstr "Une liste de noms d'interface à faire correspondre. Chaque élément est un caractères génériques de ligne de commande. Lorsqu'un élément est précédé d'un point d'exclamation ( !), la condition est inversée ; un nom d'interface candidat est considéré comme correspondant lorsque ces deux conditions sont remplies : (a) les éléments non précédés de '!' correspondent ou il n'existe aucun élément ; (b) aucun des éléments précédés de '' correspondent."
-+"pattern. An element can be prefixed with a pipe symbol (|) or an ampersand "
-+"(&). The former means that the element is optional and the latter means that "
-+"it is mandatory. If there are any optional elements, than the match "
-+"evaluates to true if at least one of the optional element matches (logical "
-+"OR). If there are any mandatory elements, then they all must match (logical "
-+"AND). By default, an element is optional. This means that an element \"foo\" "
-+"behaves the same as \"|foo\". An element can also be inverted with "
-+"exclamation mark (!) between the pipe symbol (or the ampersand) and before "
-+"the pattern. Note that \"!foo\" is a shortcut for the mandatory match \"&!foo"
-+"\". Finally, a backslash can be used at the beginning of the element (after "
-+"the optional special characters) to escape the start of the pattern. For "
-+"example, \"&\\!a\" is an mandatory match for literally \"!a\"."
-+msgstr "Une liste de noms d'interfaces à faire correspondre. Chaque élément est un motif à caractères spéciaux shell. Un élément peut être préfixé par un symbole de tuyau (|) ou une esperluette (&). Le premier signifie que l'élément est facultatif et le second qu'il est obligatoire. S'il y a des éléments optionnels, la correspondance est considérée comme vraie si au moins un des éléments optionnels correspond (OU logique). S'il y a des éléments obligatoires, alors ils doivent tous correspondre (ET logique). Par défaut, un élément est facultatif. Cela signifie qu'un élément \"foo\" se comporte de la même manière que \"|foo\". Un élément peut également être inversé avec un point d'exclamation ( !) entre le symbole de la pipe (ou l'esperluette) et avant le motif. Notez que \"!foo\" est un raccourci pour la correspondance obligatoire \"&!foo\". Enfin, une barre oblique inverse peut être utilisée au début de l'élément (après les caractères spéciaux facultatifs) pour échapper au début du motif. Par exemple, \"&!a\" est une correspondance obligatoire pour littéralement \"a\"."
-
--#: ../clients/common/settings-docs.h.in:265
-+#: ../clients/common/settings-docs.h.in:285
-+msgid ""
-+"A list of kernel command line arguments to match. This may be used to check "
-+"whether a specific kernel command line option is set (or if prefixed with "
-+"the exclamation mark unset). The argument must either be a single word, or "
-+"an assignment (i.e. two words, separated \"=\"). In the former case the "
-+"kernel command line is searched for the word appearing as is, or as left "
-+"hand side of an assignment. In the latter case, the exact assignment is "
-+"looked for with right and left hand side matching. See NMSettingMatch:"
-+"interface-name for how special characters '|', '&', '!' and '\\' are used "
-+"for optional and mandatory matches and inverting the pattern."
-+msgstr "Une liste d'arguments de la ligne de commande du noyau à faire correspondre. Elle peut être utilisée pour vérifier si une option spécifique de la ligne de commande du noyau est définie (ou si elle est préfixée par le point d'exclamation \"unset\"). L'argument doit être soit un mot unique, soit une affectation (c'est-à-dire deux mots, séparés par \"=\"). Dans le premier cas, la ligne de commande du noyau est recherchée pour le mot apparaissant tel quel, ou comme partie gauche d'une assignation. Dans le second cas, l'affectation exacte est recherchée avec une correspondance à droite et à gauche. Voir NMSettingMatch:interface-name pour savoir comment les caractères spéciaux \"|\", \"&\", \" !\" et \"\\\" sont utilisés pour les correspondances facultatives et obligatoires et pour inverser le schéma."
-+
-+#: ../clients/common/settings-docs.h.in:286
-+msgid ""
-+"A list of paths to match against the ID_PATH udev property of devices. "
-+"ID_PATH represents the topological persistent path of a device. It typically "
-+"contains a subsystem string (pci, usb, platform, etc.) and a subsystem-"
-+"specific identifier. For PCI devices the path has the form \"pci-$domain:"
-+"$bus:$device.$function\", where each variable is an hexadecimal value; for "
-+"example \"pci-0000:0a:00.0\". The path of a device can be obtained with "
-+"\"udevadm info /sys/class/net/$dev | grep ID_PATH=\" or by looking at the "
-+"\"path\" property exported by NetworkManager (\"nmcli -f general.path device "
-+"show $dev\"). Each element of the list is a shell wildcard pattern. See "
-+"NMSettingMatch:interface-name for how special characters '|', '&', '!' and "
-+"'\\' are used for optional and mandatory matches and inverting the pattern."
-+msgstr "Une liste de chemins à faire correspondre à la propriété ID_PATH udev des appareils. ID_PATH représente le chemin topologique persistant d'un dispositif. Il contient généralement une chaîne de sous-système (pci, usb, plate-forme, etc.) et un identifiant spécifique au sous-système. Pour les périphériques PCI, le chemin a la forme « pci-$domain:$bus:$device.$function» où chaque variable est une valeur hexadécimale ; par exemple \"pci-0000:0a:00.0\". Le chemin d'un périphérique peut être obtenu avec \"udevadm info /sys/class/net/ | grep$dev ID_PATH=\" ou en regardant la propriété \"path\" exportée par NetworkManager (\"nmcli -f general.path device show $dev \"). Chaque élément de la liste est un motif à caractères spéciaux shell. Voir NMSettingMatch:interface-name pour savoir comment les caractères spéciaux \"|\", \"&\", \" !\" et \"\\\" sont utilisés pour les correspondances facultatives et obligatoires et pour inverser le modèle."
-+
-+#: ../clients/common/settings-docs.h.in:287
- msgid "The data path type. One of \"system\", \"netdev\" or empty."
- msgstr "Le type de chemin des données. Soit \"système\", \"netdev\" ou vide."
-
--#: ../clients/common/settings-docs.h.in:266
-+#: ../clients/common/settings-docs.h.in:288
- 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:267
-+#: ../clients/common/settings-docs.h.in:289
- msgid "Enable or disable multicast snooping."
- msgstr "Activer ou désactiver le snooping multicast."
-
--#: ../clients/common/settings-docs.h.in:268
-+#: ../clients/common/settings-docs.h.in:290
- msgid "Enable or disable RSTP."
- msgstr "Activer ou désactiver le RSTP."
-
--#: ../clients/common/settings-docs.h.in:269
-+#: ../clients/common/settings-docs.h.in:291
- msgid "Enable or disable STP."
- msgstr "Activer ou désactiver STP."
-
--#: ../clients/common/settings-docs.h.in:270
-+#: ../clients/common/settings-docs.h.in:292
- msgid "Open vSwitch DPDK device arguments."
- msgstr "Ouvrir les arguments de DPDK."
-
--#: ../clients/common/settings-docs.h.in:271
-+#: ../clients/common/settings-docs.h.in:293
- msgid ""
- "The interface type. Either \"internal\", \"system\", \"patch\", \"dpdk\", or "
- "empty."
- msgstr "Le type d'interface : soit \"interne\", \"système\", \"patch\", \"dpdk\", soit vide."
-
--#: ../clients/common/settings-docs.h.in:272
-+#: ../clients/common/settings-docs.h.in:294
- msgid ""
--"Specifies the unicast destination IP address of a remote Open vSwitch bridge "
--"port to connect to."
--msgstr "Spécifie l'adresse IP de destination unicast d'un port de pont vSwitch Open distant auquel se connecter."
-+"Specifies the name of the interface for the other side of the patch. The "
-+"patch on the other side must also set this interface as peer."
-+msgstr "Spécifie le nom de l'interface pour l'autre côté du patch. Le patch de l'autre côté doit également définir cette interface comme pair."
-
--#: ../clients/common/settings-docs.h.in:273
-+#: ../clients/common/settings-docs.h.in:295
- 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:274
-+#: ../clients/common/settings-docs.h.in:296
- 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:275
-+#: ../clients/common/settings-docs.h.in:297
- 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:276
-+#: ../clients/common/settings-docs.h.in:298
- msgid "LACP mode. One of \"active\", \"off\", or \"passive\"."
- msgstr "Mode LACP : \"actif\", \"éteint\" ou \"passif\"."
-
--#: ../clients/common/settings-docs.h.in:277
-+#: ../clients/common/settings-docs.h.in:299
- msgid "The VLAN tag in the range 0-4095."
- msgstr "L'étiquette VLAN dans la plage 0-4095."
-
--#: ../clients/common/settings-docs.h.in:278
-+#: ../clients/common/settings-docs.h.in:300
- msgid ""
- "The VLAN mode. One of \"access\", \"native-tagged\", \"native-untagged\", "
- "\"trunk\" or unset."
- msgstr "Le mode VLAN, l'un des modes \"accès\", \"native-tagged\", \"native-untagged\", \"trunk\" ou unset."
-
--#: ../clients/common/settings-docs.h.in:279
-+#: ../clients/common/settings-docs.h.in:301
- msgid ""
- "If non-zero, instruct pppd to set the serial port to the specified "
- "baudrate. This value should normally be left as 0 to automatically choose "
- "the speed."
- msgstr "Si différent de zéro, instruire pppd pour qu’il régle le port série à la vitesse de transmission spécifiée. Cette valeur doit normalement être laissée à 0 pour choisir automatiquement la vitesse."
-
--#: ../clients/common/settings-docs.h.in:280
-+#: ../clients/common/settings-docs.h.in:302
- msgid ""
- "If TRUE, specify that pppd should set the serial port to use hardware flow "
- "control with RTS and CTS signals. This value should normally be set to "
- "FALSE."
- msgstr "Si défini sur TRUE, instruire pppd pour qu’il régle le port série pour utiliser le contrôle de flux matériel avec les signaux RTS et CTS. Cette valeur doit normalement être réglée sur FALSE."
-
--#: ../clients/common/settings-docs.h.in:281
-+#: ../clients/common/settings-docs.h.in:303
- 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 "
-@@ -7848,7 +8122,7 @@ msgid ""
- "property is used."
- msgstr "Si différent de zéro, instruire pppd à présumer que la connexion avec le pair a échoué si le nombre spécifié d'échos-demandes LCP ne reçoit pas de réponse de la part du pair. la propriété \"lcp-echo-interval\" doit également être définie à une valeur non nulle si cette propriété est utilisée."
-
--#: ../clients/common/settings-docs.h.in:282
-+#: ../clients/common/settings-docs.h.in:304
- 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 "
-@@ -7856,78 +8130,78 @@ msgid ""
- "autodetect this."
- msgstr "Si différent de zéro, instruire pppd d'envoyer une trame d'écho-demande LCP au pair toutes les n secondes (où n est la valeur spécifiée). Notez que certains pairs PPP répondront aux demandes d'écho et d'autres non, et il n'est pas possible de l'autodétecter."
-
--#: ../clients/common/settings-docs.h.in:283
-+#: ../clients/common/settings-docs.h.in:305
- msgid ""
- "If TRUE, stateful MPPE is used. See pppd documentation for more information "
- "on stateful MPPE."
- msgstr "Si défini sur TRUE, le MPPE stateful sera utilisé. Voir la documentation pppd pour plus d'informations sur le MPPE stateful."
-
--#: ../clients/common/settings-docs.h.in:284
-+#: ../clients/common/settings-docs.h.in:306
- msgid ""
- "If non-zero, instruct pppd to request that the peer send packets no larger "
- "than the specified size. If non-zero, the MRU should be between 128 and "
- "16384."
- msgstr "Si différent de zéro, instruire pppd à demander que le pair n'envoie pas de paquets plus grands que la taille spécifiée. Si différent de zéro, la MRU doit être entre 128 et 16384."
-
--#: ../clients/common/settings-docs.h.in:285
-+#: ../clients/common/settings-docs.h.in:307
- 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:286
-+#: ../clients/common/settings-docs.h.in:308
- 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:287
-+#: ../clients/common/settings-docs.h.in:309
- msgid ""
- "If TRUE, do not require the other side (usually the PPP server) to "
- "authenticate itself to the client. If FALSE, require authentication from "
- "the remote side. In almost all cases, this should be TRUE."
- msgstr "Si TRUE, n'exigez pas que l'autre partie (généralement le serveur PPP) s'authentifie auprès du client. Si FAUX, exigez une authentification du côté distant. Dans presque tous les cas, cela doit être sur TRUE."
-
--#: ../clients/common/settings-docs.h.in:288
-+#: ../clients/common/settings-docs.h.in:310
- 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:289
-+#: ../clients/common/settings-docs.h.in:311
- 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:290
-+#: ../clients/common/settings-docs.h.in:312
- 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:291
-+#: ../clients/common/settings-docs.h.in:313
- 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:292
-+#: ../clients/common/settings-docs.h.in:314
- 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:293
-+#: ../clients/common/settings-docs.h.in:315
- 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:294
-+#: ../clients/common/settings-docs.h.in:316
- 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:295
-+#: ../clients/common/settings-docs.h.in:317
- msgid ""
- "If TRUE, MPPE (Microsoft Point-to-Point Encryption) will be required for the "
- "PPP session. If either 64-bit or 128-bit MPPE is not available the session "
- "will fail. Note that MPPE is not used on mobile broadband connections."
- msgstr "Si TRUE, MPPE (Microsoft Point-to-Point Encryption) sera exigé pour la session PPP. Si MPPE 64 bits ou 128 bits n'est pas disponible, la session échouera. Notez que MPPE n'est pas utilisé sur les connexions haut débit mobiles."
-
--#: ../clients/common/settings-docs.h.in:296
-+#: ../clients/common/settings-docs.h.in:318
- msgid ""
- "If TRUE, 128-bit MPPE (Microsoft Point-to-Point Encryption) will be required "
- "for the PPP session, and the \"require-mppe\" property must also be set to "
- "TRUE. If 128-bit MPPE is not available the session will fail."
- msgstr "Si TRUE, 128 bits MPPE (Microsoft Point-to-Point Encryption) sera exigé pour la session PPP, et la propriété \"require-mppe\" doit également être réglée sur TRUE. 128 bits MPPE n'est pas disponible, la session échoue."
-
--#: ../clients/common/settings-docs.h.in:297
-+#: ../clients/common/settings-docs.h.in:319
- 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 "
-@@ -7935,11 +8209,11 @@ msgid ""
- "NMSettingConnection."
- msgstr "S'il est donné, spécifie le nom de l'interface parent sur laquelle cette connexion PPPoE doit être créée. Si cette propriété n'est pas spécifiée, la connexion sera activée sur l'interface spécifiée dans \"interface-name\" de NMSettingConnection."
-
--#: ../clients/common/settings-docs.h.in:298
-+#: ../clients/common/settings-docs.h.in:320
- 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:300
-+#: ../clients/common/settings-docs.h.in:322
- msgid ""
- "If specified, instruct PPPoE to only initiate sessions with access "
- "concentrators that provide the specified service. For most providers, this "
-@@ -7947,53 +8221,53 @@ msgid ""
- "concentrators or a specific service is known to be required."
- msgstr "Si spécifié, demandez au PPPoE de n'initier des sessions qu'avec des concentrateurs d'accès qui fournissent le service spécifié. Pour la plupart des fournisseurs, ce champ doit être laissé en blanc. Elle n'est requise que s'il y a plusieurs concentrateurs d'accès ou si un service spécifique est requis."
-
--#: ../clients/common/settings-docs.h.in:301
-+#: ../clients/common/settings-docs.h.in:323
- 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:302
-+#: ../clients/common/settings-docs.h.in:324
- 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:303
-+#: ../clients/common/settings-docs.h.in:325
- 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:304
-+#: ../clients/common/settings-docs.h.in:326
- msgid "PAC script for the connection."
- msgstr "Script PAC pour la connexion."
-
--#: ../clients/common/settings-docs.h.in:305
-+#: ../clients/common/settings-docs.h.in:327
- msgid "PAC URL for obtaining PAC file."
- msgstr "URL PAC pour obtenir le fichier PAC."
-
--#: ../clients/common/settings-docs.h.in:306
-+#: ../clients/common/settings-docs.h.in:328
- msgid ""
- "Speed to use for communication over the serial port. Note that this value "
- "usually has no effect for mobile broadband modems as they generally ignore "
- "speed settings and use the highest available speed."
- msgstr "Vitesse à utiliser pour la communication sur le port en série Notez que cette valeur n'a généralement aucun effet pour les modems mobiles à large bande car ils ignorent généralement les paramètres de vitesse et utilisent la vitesse la plus élevée disponible."
-
--#: ../clients/common/settings-docs.h.in:307
-+#: ../clients/common/settings-docs.h.in:329
- 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:308
-+#: ../clients/common/settings-docs.h.in:330
- msgid "Parity setting of the serial port."
- msgstr "Réglage de la parité du port série."
-
--#: ../clients/common/settings-docs.h.in:309
-+#: ../clients/common/settings-docs.h.in:331
- 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:310
-+#: ../clients/common/settings-docs.h.in:332
- msgid ""
- "Number of stop bits for communication on the serial port. Either 1 or 2. "
- "The 1 in \"8n1\" for example."
- msgstr "Nombre de bits d'arrêt pour la communication sur le port série : 1 ou 2, par exemple le 1 dans \"8n1\"."
-
--#: ../clients/common/settings-docs.h.in:311
-+#: ../clients/common/settings-docs.h.in:333
- 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 "
-@@ -8004,15 +8278,16 @@ msgid ""
- "assumed to be NM_TERNARY_TRUE (1)."
- msgstr "Indique s'il faut autosonder les fonctions virtuelles à l'aide d'un pilote compatible. S'il est défini sur NM_TERNARY_TRUE (1), le noyau essaiera de lier les VFs à un pilote compatible et si cela réussit, une nouvelle interface réseau sera instanciée pour chaque VF. Si la valeur NM_TERNARY_FALSE (0) est définie, les VF ne seront pas réclamés et aucune interface réseau ne sera créée pour eux. Lorsqu'il est défini sur NM_TERNARY_DEFAULT (-1), la valeur par défaut globale est utilisée ; si la valeur par défaut globale n'est pas spécifiée, elle est supposée être NM_TERNARY_TRUE (1)."
-
--#: ../clients/common/settings-docs.h.in:312
-+#: ../clients/common/settings-docs.h.in:334
- msgid ""
- "The total number of virtual functions to create. Note that when the sriov "
- "setting is present NetworkManager enforces the number of virtual functions "
--"on the interface also when it is zero. To prevent any changes to SR-IOV "
--"parameters don't add a sriov setting to the connection."
--msgstr "Le nombre total de fonctions virtuelles à créer. Notez que lorsque le paramètre sriov est présent, NetworkManager applique le nombre de fonctions virtuelles sur l'interface même lorsque celui-ci est nul. Pour éviter toute modification des paramètres SR-IOV, n'ajoutez pas de paramètre sriov à la connexion."
-+"on the interface (also when it is zero) during activation and resets it upon "
-+"deactivation. 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 pendant l’activation et la réinitialise au moment de la désactivation. Pour éviter toute modification des paramètres SR-IOV, n'ajoutez pas de paramètre sriov à la connexion."
-
--#: ../clients/common/settings-docs.h.in:313
-+#: ../clients/common/settings-docs.h.in:335
- msgid ""
- "Array of virtual function descriptors. Each VF descriptor is a dictionary "
- "mapping attribute names to GVariant values. The 'index' entry is mandatory "
-@@ -8026,15 +8301,15 @@ msgid ""
- "default) or 'ad' for 802.1ad."
- msgstr "Tableau de descripteurs de fonctions virtuelles. Chaque descripteur VF est un dictionnaire mappant les noms d'attributs aux valeurs de GVariant. L'entrée 'index' est obligatoire pour chaque VF. Lorsqu'elle est représentée sous forme de chaîne, une VF se présente sous la forme : \"INDEX[ATTR=VALUE[ ATTR=VALUE]...]\". par exemple : \"2 mac=00:11:22:33:44:44:55 spoof-check=true\". L'attribut \"vlans\" est représenté sous la forme d'une liste semicolore de descripteurs VLAN, où chaque descripteur a la forme \"ID[.PRIORITY[.PROTO]]\". PROTO peut être 'q' pour 802.1Q (par défaut) ou 'ad' pour 802.1ad."
-
--#: ../clients/common/settings-docs.h.in:314
-+#: ../clients/common/settings-docs.h.in:336
- msgid "Array of TC queueing disciplines."
- msgstr "Table de disciplines de mise en file d'attente TC"
-
--#: ../clients/common/settings-docs.h.in:315
-+#: ../clients/common/settings-docs.h.in:337
- msgid "Array of TC traffic filters."
- msgstr "Table de filtres de trafic TC."
-
--#: ../clients/common/settings-docs.h.in:316
-+#: ../clients/common/settings-docs.h.in:338
- msgid ""
- "The JSON configuration for the team network interface. The property should "
- "contain raw JSON configuration data suitable for teamd, because the value is "
-@@ -8042,8 +8317,8 @@ msgid ""
- "used. See man teamd.conf for the format details."
- msgstr "La configuration JSON pour l'interface réseau de l'équipe. La propriété doit contenir des données brutes de configuration JSON appropriées pour teamd, car la valeur est passée directement à teamd. Si non spécifiée, la configuration par défaut sera utilisée. Voir man teamd.conf pour les détails du format."
-
--#: ../clients/common/settings-docs.h.in:317
--#: ../clients/common/settings-docs.h.in:335
-+#: ../clients/common/settings-docs.h.in:339
-+#: ../clients/common/settings-docs.h.in:357
- msgid ""
- "Link watchers configuration for the connection: each link watcher is defined "
- "by a dictionary, whose keys depend upon the selected link watcher. Available "
-@@ -8055,65 +8330,65 @@ msgid ""
- "for more details."
- msgstr "Configuration des « link watchers » pour la connexion : chaque link watcher est défini par un dictionnaire, dont les clés dépendent du link watcher sélectionné ; les link watchers disponibles sont 'ethtool', 'nsna_ping' et' arp_ping' et est spécifié dans le dictionnaire avec la clé 'name'. Les clés disponibles sont : ethtool:'delay-up','delay-down','init-wait' ; nsna_ping:'init-wait','interval','missed-max','target-host' ; arp_ping : tous ceux de nsna_ping et'source-host','validate-active','validate-incative','sentalways'. Voir teamd.conf man pour plus de détails."
-
--#: ../clients/common/settings-docs.h.in:318
-+#: ../clients/common/settings-docs.h.in:340
- msgid "Corresponds to the teamd mcast_rejoin.count."
- msgstr "Correspond au teamd mcast_rejoin.count."
-
--#: ../clients/common/settings-docs.h.in:319
-+#: ../clients/common/settings-docs.h.in:341
- msgid "Corresponds to the teamd mcast_rejoin.interval."
- msgstr "Correspond au teamd mcast_rejoin.count."
-
--#: ../clients/common/settings-docs.h.in:320
-+#: ../clients/common/settings-docs.h.in:342
- msgid "Corresponds to the teamd notify_peers.count."
- msgstr "Correspond au teamd notify_peers.count."
-
--#: ../clients/common/settings-docs.h.in:321
-+#: ../clients/common/settings-docs.h.in:343
- msgid "Corresponds to the teamd notify_peers.interval."
- msgstr "Correspond au teamd notify_peers.count."
-
--#: ../clients/common/settings-docs.h.in:322
-+#: ../clients/common/settings-docs.h.in:344
- msgid ""
- "Corresponds to the teamd runner.name. Permitted values are: \"roundrobin\", "
- "\"broadcast\", \"activebackup\", \"loadbalance\", \"lacp\", \"random\"."
- msgstr "Correspond au teamd runner.name. Les valeurs autorisées sont : \"roundrobin\", \"broadcast\", \"activebackup\", \"loadbalance\", \"lacp\", \"random\"."
-
--#: ../clients/common/settings-docs.h.in:323
-+#: ../clients/common/settings-docs.h.in:345
- msgid "Corresponds to the teamd runner.active."
- msgstr "Correspond au teamd runner.active."
-
--#: ../clients/common/settings-docs.h.in:324
-+#: ../clients/common/settings-docs.h.in:346
- msgid "Corresponds to the teamd runner.agg_select_policy."
- msgstr "Correspond au teamd runner.active."
-
--#: ../clients/common/settings-docs.h.in:325
-+#: ../clients/common/settings-docs.h.in:347
- msgid "Corresponds to the teamd runner.fast_rate."
- msgstr "Correspond au teamd runner.active."
-
--#: ../clients/common/settings-docs.h.in:326
-+#: ../clients/common/settings-docs.h.in:348
- msgid "Corresponds to the teamd runner.hwaddr_policy."
- msgstr "Correspond au teamd runner.active."
-
--#: ../clients/common/settings-docs.h.in:327
-+#: ../clients/common/settings-docs.h.in:349
- msgid "Corresponds to the teamd runner.min_ports."
- msgstr "Correspond au teamd runner.active."
-
--#: ../clients/common/settings-docs.h.in:328
-+#: ../clients/common/settings-docs.h.in:350
- msgid "Corresponds to the teamd runner.sys_prio."
- msgstr "Correspond au teamd runner.active."
-
--#: ../clients/common/settings-docs.h.in:329
-+#: ../clients/common/settings-docs.h.in:351
- msgid "Corresponds to the teamd runner.tx_balancer.name."
- msgstr "Correspond au teamd runner.active."
-
--#: ../clients/common/settings-docs.h.in:330
-+#: ../clients/common/settings-docs.h.in:352
- msgid "Corresponds to the teamd runner.tx_balancer.interval."
- msgstr "Correspond au teamd runner.active."
-
--#: ../clients/common/settings-docs.h.in:331
-+#: ../clients/common/settings-docs.h.in:353
- msgid "Corresponds to the teamd runner.tx_hash."
- msgstr "Correspond au teamd runner.active."
-
--#: ../clients/common/settings-docs.h.in:332
-+#: ../clients/common/settings-docs.h.in:354
- msgid ""
- "The JSON configuration for the team port. The property should contain raw "
- "JSON configuration data suitable for teamd, because the value is passed "
-@@ -8121,67 +8396,67 @@ msgid ""
- "man teamd.conf for the format details."
- msgstr "La configuration JSON pour l'interface réseau de l'équipe. La propriété doit contenir des données brutes de configuration JSON appropriées pour teamd, car la valeur est passée directement à teamd. Si non spécifiée, la configuration par défaut sera utilisée. Voir man teamd.conf pour les détails du format."
-
--#: ../clients/common/settings-docs.h.in:333
-+#: ../clients/common/settings-docs.h.in:355
- msgid "Corresponds to the teamd ports.PORTIFNAME.lacp_key."
- msgstr "Correspond au teamd ports.PORTIFNAME.lacp_key."
-
--#: ../clients/common/settings-docs.h.in:334
-+#: ../clients/common/settings-docs.h.in:356
- msgid "Corresponds to the teamd ports.PORTIFNAME.lacp_prio."
- msgstr "Correspond au teamd ports.PORTIFNAME.lacp_prio."
-
--#: ../clients/common/settings-docs.h.in:336
-+#: ../clients/common/settings-docs.h.in:358
- msgid "Corresponds to the teamd ports.PORTIFNAME.prio."
- msgstr "Correspond au teamd ports.PORTIFNAME.lacp_key."
-
--#: ../clients/common/settings-docs.h.in:337
-+#: ../clients/common/settings-docs.h.in:359
- msgid ""
- "Corresponds to the teamd ports.PORTIFNAME.queue_id. When set to -1 means the "
- "parameter is skipped from the json config."
- msgstr "Correspond au teamd ports.PORTIFNAME.queue_id. Quand il est défini à -1, cela signifie que le paramètre est ignoré de la configuration json."
-
--#: ../clients/common/settings-docs.h.in:338
-+#: ../clients/common/settings-docs.h.in:360
- msgid "Corresponds to the teamd ports.PORTIFNAME.sticky."
- msgstr "Correspond au teamd ports.PORTIFNAME.lacp_key."
-
--#: ../clients/common/settings-docs.h.in:339
-+#: ../clients/common/settings-docs.h.in:361
- msgid ""
- "The group ID which will own the device. If set to NULL everyone will be able "
- "to use the device."
- msgstr "L'ID de groupe qui sera propriétaire du périphérique. Si ce paramètre est réglé sur NULL, tout le monde pourra l’utiliser."
-
--#: ../clients/common/settings-docs.h.in:340
-+#: ../clients/common/settings-docs.h.in:362
- msgid ""
- "The operating mode of the virtual device. Allowed values are "
- "NM_SETTING_TUN_MODE_TUN (1) to create a layer 3 device and "
- "NM_SETTING_TUN_MODE_TAP (2) to create an Ethernet-like layer 2 one."
- msgstr "Les valeurs autorisées sont NM_SETTING_TUN_TUN_MODE_TUN (1) pour créer un périphérique de niveau 3 et NM_SETTING_TUN_MODE_TAP (2) pour créer un périphérique de niveau 2 Ethernet."
-
--#: ../clients/common/settings-docs.h.in:341
-+#: ../clients/common/settings-docs.h.in:363
- msgid ""
- "If the property is set to TRUE, the interface will support multiple file "
- "descriptors (queues) to parallelize packet sending or receiving. Otherwise, "
- "the interface will only support a single queue."
- msgstr "Si la propriété est définie sur TRUE, l'interface prendra en charge plusieurs descripteurs de fichiers (files d'attente) pour paralléliser l'envoi ou la réception de paquets, sinon, l'interface ne prendra en charge qu'une seule file d'attente."
-
--#: ../clients/common/settings-docs.h.in:342
-+#: ../clients/common/settings-docs.h.in:364
- msgid ""
- "The user ID which will own the device. If set to NULL everyone will be able "
- "to use the device."
- msgstr "L'ID de groupe qui sera propriétaire du périphérique. Si ce paramètre est réglé sur NULL, tout le monde pourra l’utiliser."
-
--#: ../clients/common/settings-docs.h.in:343
-+#: ../clients/common/settings-docs.h.in:365
- msgid ""
- "If TRUE the interface will prepend a 4 byte header describing the physical "
- "interface to the packets."
- msgstr "Si défini sur TRUE, l'interface sera précédée d'un en-tête de 4 octets décrivant l'interface physique vers les paquets."
-
--#: ../clients/common/settings-docs.h.in:344
-+#: ../clients/common/settings-docs.h.in:366
- msgid ""
- "If TRUE the IFF_VNET_HDR the tunnel packets will include a virtio network "
- "header."
- msgstr "Si l'IFF_VNET_HDR est VRAI, les paquets de tunnel comprendront un en-tête de réseau virtio."
-
--#: ../clients/common/settings-docs.h.in:345
-+#: ../clients/common/settings-docs.h.in:367
- 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 "
-@@ -8189,14 +8464,14 @@ msgid ""
- "up to a certain length."
- msgstr "Un dictionnaire de paires clé/valeur avec les données de l'utilisateur. Ces données sont ignorées par NetworkManager et peuvent être utilisées à la discrétion de l'utilisateur. Les clés ne supportent qu'un format ascii strict, mais les valeurs peuvent être des chaînes UTF8 arbitraires jusqu'à une certaine longueur."
-
--#: ../clients/common/settings-docs.h.in:346
-+#: ../clients/common/settings-docs.h.in:368
- msgid ""
- "For outgoing packets, a list of mappings from Linux SKB priorities to 802.1p "
- "priorities. The mapping is given in the format \"from:to\" where both \"from"
- "\" and \"to\" are unsigned integers, ie \"7:3\"."
- msgstr "Pour les paquets sortants, une liste des mappages des priorités Linux SKB vers les priorités 802.1p. Le mappage est donné dans le format \"from:to\" où \"from\" et \"to\" sont des entiers non signés, soit \"7:3\"."
-
--#: ../clients/common/settings-docs.h.in:347
-+#: ../clients/common/settings-docs.h.in:369
- 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 "
-@@ -8209,20 +8484,20 @@ msgid ""
- "missing property on D-Bus is still considered as 0."
- msgstr "Un ou plusieurs indicateurs qui contrôlent le comportement et les caractéristiques de l'interface VLAN. Les indicateurs comprennent NM_VLAN_FLAG_FLAG_REORDER_HEADERS (0x1) (réorganisation des en-têtes des paquets de sortie), NM_VLAN_FLAG_GVRP (0x2) (utilisation du protocole GVRP) et NM_VLAN_FLAG_LOOSE_BINDING (0x4) (liaison de l'interface à son état de fonctionnement du périphérique maître). NM_VLAN_FLAG_FLAG_MVRP (0x8) (utilisation du protocole MVRP). La valeur par défaut de cette propriété est NM_VLAN_FLAG_REORDER_HEADERS, mais elle était 0 auparavant. Pour préserver la rétrocompatibilité, la valeur par défaut de l'API D-Bus est toujours 0 et une propriété manquante sur D-Bus est toujours considérée comme 0."
-
--#: ../clients/common/settings-docs.h.in:348
-+#: ../clients/common/settings-docs.h.in:370
- msgid ""
- "The VLAN identifier that the interface created by this connection should be "
- "assigned. The valid range is from 0 to 4094, without the reserved id 4095."
- msgstr "L'identificateur du VLAN que l'interface créée par cette connexion doit être affecté. La plage valide est de 0 à 4094, sans l'identifiant réservé 4095."
-
--#: ../clients/common/settings-docs.h.in:349
-+#: ../clients/common/settings-docs.h.in:371
- msgid ""
- "For incoming packets, a list of mappings from 802.1p priorities to Linux SKB "
- "priorities. The mapping is given in the format \"from:to\" where both \"from"
- "\" and \"to\" are unsigned integers, ie \"7:3\"."
- msgstr "Pour les paquets sortants, une liste des mappages des priorités 802.1p vers les priorités Linux SKB. Le mappage est donné dans le format \"from:to\" où \"from\" et \"to\" sont des entiers non signés, soit \"7:3\"."
-
--#: ../clients/common/settings-docs.h.in:350
-+#: ../clients/common/settings-docs.h.in:372
- 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 "
-@@ -8230,32 +8505,32 @@ msgid ""
- "\"mac-address\" property."
- msgstr "S'il est donné, spécifie le nom de l'interface parent ou l'UUID de connexion parent à partir duquel cette interface VLAN doit être créée. Si cette propriété n'est pas spécifiée, la connexion doit contenir un paramètre \"802-3-ethernet\" avec une propriété \"mac-address\"."
-
--#: ../clients/common/settings-docs.h.in:351
-+#: ../clients/common/settings-docs.h.in:373
- msgid ""
- "Dictionary of key/value pairs of VPN plugin specific data. Both keys and "
- "values must be strings."
- msgstr "Dictionnaire des paires clé/valeur de données spécifiques aux plugins VPN. Les clés et les valeurs doivent être des chaînes de caractères."
-
--#: ../clients/common/settings-docs.h.in:352
-+#: ../clients/common/settings-docs.h.in:374
- msgid ""
- "If the VPN service supports persistence, and this property is TRUE, the VPN "
- "will attempt to stay connected across link changes and outages, until "
- "explicitly disconnected."
- msgstr "Si le service VPN prend en charge la persistance et que cette propriété est sur TRUE, le VPN tentera de rester connecté à travers les changements et les interruptions de liaison, jusqu'à ce qu'il soit explicitement déconnecté."
-
--#: ../clients/common/settings-docs.h.in:353
-+#: ../clients/common/settings-docs.h.in:375
- msgid ""
- "Dictionary of key/value pairs of VPN plugin specific secrets like passwords "
- "or private keys. Both keys and values must be strings."
- msgstr "Dictionnaire des paires clé/valeur des secrets spécifiques des plugins VPN, comme les mots de passe ou les clés privées. Les clés et les valeurs doivent correpondre à des chaînes de caractères."
-
--#: ../clients/common/settings-docs.h.in:354
-+#: ../clients/common/settings-docs.h.in:376
- msgid ""
- "D-Bus service name of the VPN plugin that this setting uses to connect to "
- "its network. i.e. org.freedesktop.NetworkManager.vpnc for the vpnc plugin."
- msgstr "Nom de service D-Bus du plugin VPN que ce paramètre utilise pour se connecter à son réseau. i.e. org.freedesktop.NetworkManager.vpnc pour le plugin vpnc."
-
--#: ../clients/common/settings-docs.h.in:355
-+#: ../clients/common/settings-docs.h.in:377
- 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 "
-@@ -8263,7 +8538,7 @@ msgid ""
- "Values greater than zero mean timeout in seconds."
- msgstr "Timeout pour le service VPN pour établir la connexion. Certains services peuvent prendre beaucoup de temps à se connecter. Une valeur de 0 signifie un délai d'attente par défaut, qui est de 60 secondes (à moins qu'il ne soit remplacé par vpn.timeout dans le fichier de configuration). Le valeurs supérieures à zéro indiquent un timeout en secondes."
-
--#: ../clients/common/settings-docs.h.in:356
-+#: ../clients/common/settings-docs.h.in:378
- 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 "
-@@ -8273,92 +8548,96 @@ msgid ""
- "connection."
- msgstr "Si la connexion VPN nécessite un nom d'utilisateur pour l'authentification, ce nom doit être fourni ici. Si la connexion est disponible pour plus d'un utilisateur, et que le VPN exige que chaque utilisateur fournisse un nom différent, alors laissez cette propriété vide. Si cette propriété reste vide, le NetworkManager fournira automatiquement le nom d’utilisateur de l’utilisateur qui a demandé la connexion VPN."
-
--#: ../clients/common/settings-docs.h.in:357
-+#: ../clients/common/settings-docs.h.in:379
-+msgid "The routing table for this VRF."
-+msgstr "La table de routage pour ce VRF."
-+
-+#: ../clients/common/settings-docs.h.in:380
- 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:358
-+#: ../clients/common/settings-docs.h.in:381
- msgid ""
- "Specifies the UDP destination port to communicate to the remote VXLAN tunnel "
- "endpoint."
- msgstr "Spécifie le port de destination UDP à communiquer avec le point de terminaison du tunnel VXLAN distant."
-
--#: ../clients/common/settings-docs.h.in:359
-+#: ../clients/common/settings-docs.h.in:382
- 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:360
-+#: ../clients/common/settings-docs.h.in:383
- 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:361
-+#: ../clients/common/settings-docs.h.in:384
- 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:362
-+#: ../clients/common/settings-docs.h.in:385
- msgid ""
- "Specifies whether unknown source link layer addresses and IP addresses are "
- "entered into the VXLAN device forwarding database."
- msgstr "Indique si des adresses de couche de lien source et des adresses IP inconnues sont entrées dans la base de données de transfert de périphérique VXLAN."
-
--#: ../clients/common/settings-docs.h.in:363
-+#: ../clients/common/settings-docs.h.in:386
- msgid ""
- "Specifies the maximum number of FDB entries. A value of zero means that the "
- "kernel will store unlimited entries."
- msgstr "Spécifie le nombre maximum d'entrées FDB : une valeur de zéro signifie que le noyau stocke un nombre illimité d'entrées."
-
--#: ../clients/common/settings-docs.h.in:364
-+#: ../clients/common/settings-docs.h.in:387
- 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:365
-+#: ../clients/common/settings-docs.h.in:388
- 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:366
-+#: ../clients/common/settings-docs.h.in:389
- msgid "Specifies whether ARP proxy is turned on."
- msgstr "Indique si le proxy ARP est activé."
-
--#: ../clients/common/settings-docs.h.in:367
-+#: ../clients/common/settings-docs.h.in:390
- msgid ""
- "Specifies the unicast destination IP address to use in outgoing packets when "
- "the destination link layer address is not known in the VXLAN device "
- "forwarding database, or the multicast IP address to join."
- msgstr "Spécifie l'adresse IP de destination unicast à utiliser dans les paquets sortants lorsque l'adresse de la couche de liaison de destination n'est pas connue dans la base de données de transfert de périphérique VXLAN, ou l'adresse IP multicast à joindre."
-
--#: ../clients/common/settings-docs.h.in:368
-+#: ../clients/common/settings-docs.h.in:391
- 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:369
-+#: ../clients/common/settings-docs.h.in:392
- msgid ""
- "Specifies the maximum UDP source port to communicate to the remote VXLAN "
- "tunnel endpoint."
- msgstr "Spécifie le port de destination UDP maximum à communiquer au point de terminaison du tunnel VXLAN distant."
-
--#: ../clients/common/settings-docs.h.in:370
-+#: ../clients/common/settings-docs.h.in:393
- msgid ""
- "Specifies the minimum UDP source port to communicate to the remote VXLAN "
- "tunnel endpoint."
- msgstr "Spécifie le port de destination UDP minimum à communiquer au point de terminaison du tunnel VXLAN distant."
-
--#: ../clients/common/settings-docs.h.in:371
-+#: ../clients/common/settings-docs.h.in:394
- 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:372
-+#: ../clients/common/settings-docs.h.in:395
- 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:373
-+#: ../clients/common/settings-docs.h.in:396
- 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:374
-+#: ../clients/common/settings-docs.h.in:397
- 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 "
-@@ -8367,27 +8646,27 @@ msgid ""
- "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:375
-+#: ../clients/common/settings-docs.h.in:398
- msgid ""
- "Flags indicating which mode of WPS is to be used. There's little point in "
- "changing the default setting as NetworkManager will automatically determine "
- "the best method to use."
- msgstr "Marqueurs indiquant quel mode de WPS doit être utilisé. Il y a peu d’intérêt à modifier les paramètres par défaut car NetworkManager déterminera automatiquement la meilleure méthode à utiliser."
-
--#: ../clients/common/settings-docs.h.in:376
-+#: ../clients/common/settings-docs.h.in:399
- msgid ""
- "If specified, this connection will only apply to the WiMAX device whose MAC "
- "address matches. This property does not change the MAC address of the device "
- "(known as MAC spoofing). Deprecated: 1"
- msgstr "Si elle est spécifiée, cette connexion ne s'appliquera qu'au périphérique WiMAX dont l'adresse MAC correspond. Cette propriété ne change pas l'adresse MAC du périphérique (connue sous le nom de MAC spoofing). Si dépréciée:1"
-
--#: ../clients/common/settings-docs.h.in:377
-+#: ../clients/common/settings-docs.h.in:400
- msgid ""
- "Network Service Provider (NSP) name of the WiMAX network this connection "
- "should use. Deprecated: 1"
- msgstr "Nom du fournisseur de service réseau (NSP) du réseau WiMAX que cette connexion doit utiliser. Si déprécié : 1"
-
--#: ../clients/common/settings-docs.h.in:378
-+#: ../clients/common/settings-docs.h.in:401
- msgid ""
- "The use of fwmark is optional and is by default off. Setting it to 0 "
- "disables it. Otherwise it is a 32-bit fwmark for outgoing packets. Note that "
-@@ -8395,29 +8674,32 @@ msgid ""
- "automatically choose a fwmark."
- msgstr "L'utilisation de fwmark est facultative et par défaut désactivée. Le réglage à 0 le désactive. Sinon, il s'agit d'un fwmark 32 bits pour les paquets sortants. Veuillez noter que lorsque \"ip4-auto-default-route\" ou \"ip6-auto-default-route\" activé implique de choisir automatiquement une fwmark."
-
--#: ../clients/common/settings-docs.h.in:379
-+#: ../clients/common/settings-docs.h.in:402
- msgid ""
- "Whether to enable special handling of the IPv4 default route. If enabled, "
--"the IPv4 default route will be placed to a dedicated routing-table and two "
--"policy routing rules will be added. The fwmark number is also used as "
--"routing-table for the default-route, and if fwmark is zero, a unused fwmark/"
--"table is chosen automatically. This corresponds to what wg-quick does with "
--"Table=auto. Leaving this at the default will enable this option "
--"automatically if ipv4.never-default is not set and there are any peers that "
--"use a default-route as allowed-ips."
--msgstr "Indique s'il faut activer la gestion spéciale de la route par défaut IPv4. Si cette option est activée, la route par défaut IPv4 sera placée dans une table de routage dédiée et deux règles de routage de stratégie seront ajoutées. Le numéro fwmark est également utilisé pour la table de routage pour la route par défaut, et si fwmark est zéro, une table fwmark inutilisée est automatiquement choisie. Cela correspond à ce que wg-quick fait avec Table=auto. Laisser cette option comme l'option par défaut activera automatiquement cette option si ipv4.never-default n'est pas défini et s'il y a des pairs qui utilisent une route par défaut comme IPS autorisées."
--
--#: ../clients/common/settings-docs.h.in:380
-+"the IPv4 default route from wireguard.peer-routes will be placed to a "
-+"dedicated routing-table and two policy routing rules will be added. The "
-+"fwmark number is also used as routing-table for the default-route, and if "
-+"fwmark is zero, an unused fwmark/table is chosen automatically. This "
-+"corresponds to what wg-quick does with Table=auto and what WireGuard calls "
-+"\"Improved Rule-based Routing\". Note that for this automatism to work, you "
-+"usually don't want to set ipv4.gateway, because that will result in a "
-+"conflicting default route. Leaving this at the default will enable this "
-+"option automatically if ipv4.never-default is not set and there are any "
-+"peers that use a default-route as allowed-ips."
-+msgstr "S'il faut permettre un traitement spécial de la route par défaut d'IPv4. Si activée, la route par défaut IPv4 de wireguard.peer-routes sera placée sur une table de routage dédiée et deux règles de routage de politique seront ajoutées. Le numéro fwmark est également utilisé comme table de routage pour la route par défaut, et si fwmark est égal à zéro, un fwmark/tableau inutilisé est choisi automatiquement. Cela correspond à ce que wg-quick fait avec Table=auto et à ce que WireGuard appelle \"Improved Rule-based Routing\". Notez que pour que cet automatisme fonctionne, vous ne devez généralement pas définir ipv4.gateway, car cela entraînera un conflit de route par défaut. Si vous laissez cette option par défaut, elle sera activée automatiquement si ipv4.never-default n'est pas défini et si des pairs utilisent une route par défaut comme allowed-ips."
-+
-+#: ../clients/common/settings-docs.h.in:403
- msgid "Like ip4-auto-default-route, but for the IPv6 default route."
- msgstr "Similaire à ip4-auto-default-route, mais pourla route par défaut d'IPv6."
-
--#: ../clients/common/settings-docs.h.in:381
-+#: ../clients/common/settings-docs.h.in:404
- 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:382
-+#: ../clients/common/settings-docs.h.in:405
- 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 "
-@@ -8425,94 +8707,98 @@ 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. 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:383
-+#: ../clients/common/settings-docs.h.in:406
- msgid ""
- "Whether to automatically add routes for the AllowedIPs ranges of the peers. "
- "If TRUE (the default), NetworkManager will automatically add routes in the "
--"routing tables according to ipv4.route-table and ipv6.route-table. If FALSE, "
--"no such routes are added automatically. In this case, the user may want to "
--"configure static routes in ipv4.routes and ipv6.routes, respectively."
--msgstr "Indique s'il faut ajouter automatiquement des routes pour les plages d'ips autorisées «AllowedIPs» des pairs. Si VRAI (par défaut), NetworkManager ajoutera automatiquement des routes dans les tables de routage selon ipv4.route-table et ipv6.route-table. Si FAUX, aucun itinéraire de ce type n'est ajouté automatiquement. Dans ce cas, l'utilisateur peut vouloir configurer des routes statiques dans ipv4.routes et ipv6.routes, respectivement."
--
--#: ../clients/common/settings-docs.h.in:384
-+"routing tables according to ipv4.route-table and ipv6.route-table. Usually "
-+"you want this automatism enabled. 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. Note that if the peer's "
-+"AllowedIPs is \"0.0.0.0/0\" or \"::/0\" and the profile's ipv4.never-default "
-+"or ipv6.never-default setting is enabled, the peer route for this peer won't "
-+"be added automatically."
-+msgstr "S'il faut ajouter automatiquement des routes pour les plages de PIP autorisées des pairs. Si VRAI (par défaut), NetworkManager ajoutera automatiquement des routes dans les tables de routage en fonction de ipv4.route-table et ipv6.route-table. Habituellement, vous souhaitez que cet automatisme soit activé. Si FALSE, aucune route de ce type n'est ajoutée automatiquement. Dans ce cas, l'utilisateur peut vouloir configurer des routes statiques dans ipv4.routes et ipv6.routes, respectivement. Notez que si le paramètre AllowedIPs du pair est \"0.0.0.0/0\" ou \"::/0\" et que le paramètre ipv4.never-default ou ipv6.never-default du profil est activé, la route de ce pair ne sera pas ajoutée automatiquement."
-+
-+#: ../clients/common/settings-docs.h.in:407
- msgid "The 256 bit private-key in base64 encoding."
- msgstr "La clé privée 256 bits en encodage base64."
-
--#: ../clients/common/settings-docs.h.in:385
-+#: ../clients/common/settings-docs.h.in:408
- msgid "Flags indicating how to handle the \"private-key\" property."
- msgstr "Marqueurs indiquant comment gérer la propriété \"private-key\"."
-
--#: ../clients/common/settings-docs.h.in:386
-+#: ../clients/common/settings-docs.h.in:409
- 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:387
-+#: ../clients/common/settings-docs.h.in:410
- msgid ""
- "If specified, this connection will only apply to the IEEE 802.15.4 (WPAN) "
- "MAC layer device whose permanent MAC address matches."
- msgstr "Si elle est spécifiée, cette connexion ne s'appliquera qu'au périphérique de couche MAC IEEE 802.15.4 (WPAN) dont l'adresse MAC permanente correspond."
-
--#: ../clients/common/settings-docs.h.in:388
-+#: ../clients/common/settings-docs.h.in:411
- 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:389
-+#: ../clients/common/settings-docs.h.in:412
- 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:390
-+#: ../clients/common/settings-docs.h.in:413
- msgid "Short IEEE 802.15.4 address to be used within a restricted environment."
- msgstr "Adresse IEEE 802.15.4 courte à utiliser dans un environnement restreint."
-
--#: ../clients/nm-online.c:75
-+#: ../clients/nm-online.c:77
- msgid "Connecting"
- msgstr "Connexion"
-
--#: ../clients/nm-online.c:191
-+#: ../clients/nm-online.c:193
- #, c-format
- msgid "Error: timeout creating NMClient object\n"
- msgstr "Erreur : délai d'attente dépassé lors de la création de l'objet NMClient\n"
-
--#: ../clients/nm-online.c:211
-+#: ../clients/nm-online.c:216
- #, c-format
- msgid "Error: Could not create NMClient object: %s\n"
- msgstr "Erreur : impossible de créer l'objet NMClient : %s\n"
-
--#: ../clients/nm-online.c:237
-+#: ../clients/nm-online.c:240
- msgid "Don't print anything"
- msgstr "Ne rien imprimer"
-
--#: ../clients/nm-online.c:238
-+#: ../clients/nm-online.c:241
- msgid "Wait for NetworkManager startup instead of a connection"
- msgstr "Attend que NetworkManager démarre au lieu d'une connexion"
-
--#: ../clients/nm-online.c:239
-+#: ../clients/nm-online.c:242
- msgid ""
- "Time to wait for a connection, in seconds (without the option, default value "
- "is 30)"
- msgstr "Temps d'attente de connexion en secondes (sans l'option, la valeur par défaut est 30)"
-
--#: ../clients/nm-online.c:240
-+#: ../clients/nm-online.c:243
- msgid "Exit immediately if NetworkManager is not running or connecting"
- msgstr "Quitter immédiatement si NetworkManager n'exécute pas ou n'est pas en cours d'exécution"
-
--#: ../clients/nm-online.c:260
-+#: ../clients/nm-online.c:265
- msgid ""
- "Waits for NetworkManager to finish activating startup network connections."
- msgstr "Attend que NetworkManager finisse d'activer les connexion réseau de démarrage."
-
--#: ../clients/nm-online.c:267 ../clients/nm-online.c:273
-+#: ../clients/nm-online.c:272 ../clients/nm-online.c:278
- msgid "Invalid option. Please use --help to see a list of valid options."
- msgstr "Option invalide. Veuillez utiliser --help pour afficher une liste d'options valides."
-
- #: ../clients/tui/newt/nmt-newt-utils.c:163 ../clients/tui/nmt-editor.c:420
- #: ../clients/tui/nmt-password-dialog.c:161
- #: ../clients/tui/nmt-route-editor.c:109 ../clients/tui/nmtui-hostname.c:56
--#: ../clients/tui/nmtui.c:121
-+#: ../clients/tui/nmtui.c:123
- msgid "OK"
- msgstr "Valider"
-
-@@ -8532,105 +8818,105 @@ msgstr "L'éditeur a échoué : %s"
- msgid "Could not re-read file: %s"
- msgstr "Impossible de relire le fichier : %s"
-
--#: ../clients/tui/nm-editor-utils.c:140 ../libnm/nm-device.c:1455
-+#: ../clients/tui/nm-editor-utils.c:135 ../libnm/nm-device.c:1567
- msgid "Ethernet"
- msgstr "Ethernet"
-
--#: ../clients/tui/nm-editor-utils.c:144
-+#: ../clients/tui/nm-editor-utils.c:139
- #, c-format
- msgid "Ethernet connection %d"
- msgstr "Connexion Ethernet %d"
-
--#: ../clients/tui/nm-editor-utils.c:148 ../libnm/nm-device.c:1457
-+#: ../clients/tui/nm-editor-utils.c:143 ../libnm/nm-device.c:1569
- msgid "Wi-Fi"
- msgstr "Wi-Fi"
-
--#: ../clients/tui/nm-editor-utils.c:152
-+#: ../clients/tui/nm-editor-utils.c:147
- #, c-format
- msgid "Wi-Fi connection %d"
- msgstr "Connexion Wi-Fi %d"
-
--#: ../clients/tui/nm-editor-utils.c:157 ../libnm-core/nm-connection.c:2752
--#: ../libnm/nm-device.c:1473
-+#: ../clients/tui/nm-editor-utils.c:152 ../libnm-core/nm-connection.c:2713
-+#: ../libnm/nm-device.c:1585
- msgid "InfiniBand"
- msgstr "InfiniBand"
-
--#: ../clients/tui/nm-editor-utils.c:161
-+#: ../clients/tui/nm-editor-utils.c:156
- #, c-format
- msgid "InfiniBand connection %d"
- msgstr "Connexion InfiniBand %d"
-
--#: ../clients/tui/nm-editor-utils.c:166 ../libnm/nm-device.c:1471
-+#: ../clients/tui/nm-editor-utils.c:161 ../libnm/nm-device.c:1583
- msgid "Mobile Broadband"
- msgstr "Haut débit mobile"
-
--#: ../clients/tui/nm-editor-utils.c:169
-+#: ../clients/tui/nm-editor-utils.c:164
- #, c-format
- msgid "Mobile broadband connection %d"
- msgstr "Connexion haut débit mobile %d"
-
--#: ../clients/tui/nm-editor-utils.c:175 ../clients/tui/nmt-page-dsl.c:49
-+#: ../clients/tui/nm-editor-utils.c:170 ../clients/tui/nmt-page-dsl.c:49
- msgid "DSL"
- msgstr "DSL"
-
--#: ../clients/tui/nm-editor-utils.c:179
-+#: ../clients/tui/nm-editor-utils.c:174
- #, c-format
- msgid "DSL connection %d"
- msgstr "Connexion DSL %d"
-
--#: ../clients/tui/nm-editor-utils.c:184 ../libnm-core/nm-connection.c:2744
--#: ../libnm/nm-device.c:1475
--#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4959
-+#: ../clients/tui/nm-editor-utils.c:179 ../libnm-core/nm-connection.c:2705
-+#: ../libnm/nm-device.c:1587
-+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5216
- msgid "Bond"
- msgstr "Liaison"
-
--#: ../clients/tui/nm-editor-utils.c:188
-+#: ../clients/tui/nm-editor-utils.c:183
- #, c-format
- msgid "Bond connection %d"
- msgstr "Connexion de liaison %d"
-
--#: ../clients/tui/nm-editor-utils.c:193 ../libnm-core/nm-connection.c:2748
--#: ../libnm/nm-device.c:1479
--#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5314
-+#: ../clients/tui/nm-editor-utils.c:188 ../libnm-core/nm-connection.c:2709
-+#: ../libnm/nm-device.c:1591
-+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5599
- msgid "Bridge"
- msgstr "Pont"
-
--#: ../clients/tui/nm-editor-utils.c:198
-+#: ../clients/tui/nm-editor-utils.c:193
- #, c-format
- msgid "Bridge connection %d"
- msgstr "Connexion de pont %d"
-
--#: ../clients/tui/nm-editor-utils.c:202 ../libnm-core/nm-connection.c:2746
--#: ../libnm/nm-device.c:1477
--#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5032
-+#: ../clients/tui/nm-editor-utils.c:197 ../libnm-core/nm-connection.c:2707
-+#: ../libnm/nm-device.c:1589
-+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5289
- msgid "Team"
- msgstr "Équipe"
-
--#: ../clients/tui/nm-editor-utils.c:207
-+#: ../clients/tui/nm-editor-utils.c:202
- #, c-format
- msgid "Team connection %d"
- msgstr "Connexion de l'équipe %d"
-
--#: ../clients/tui/nm-editor-utils.c:211 ../clients/tui/nmt-page-vlan.c:69
--#: ../libnm-core/nm-connection.c:2750 ../libnm/nm-device.c:1481
-+#: ../clients/tui/nm-editor-utils.c:206 ../clients/tui/nmt-page-vlan.c:69
-+#: ../libnm-core/nm-connection.c:2711 ../libnm/nm-device.c:1593
- msgid "VLAN"
- msgstr "VLAN"
-
--#: ../clients/tui/nm-editor-utils.c:215
-+#: ../clients/tui/nm-editor-utils.c:210
- #, c-format
- msgid "VLAN connection %d"
- msgstr "Connexion VLAN %d"
-
--#: ../clients/tui/nm-editor-utils.c:219 ../clients/tui/nmt-page-ip-tunnel.c:123
-+#: ../clients/tui/nm-editor-utils.c:214 ../clients/tui/nmt-page-ip-tunnel.c:123
- msgid "IP tunnel"
- msgstr "Tunnel IP"
-
--#: ../clients/tui/nm-editor-utils.c:223
-+#: ../clients/tui/nm-editor-utils.c:218
- #, c-format
- msgid "IP tunnel connection %d"
- msgstr "Connexion de tunnel IP %d"
-
--#: ../clients/tui/nm-editor-utils.c:238
-+#: ../clients/tui/nm-editor-utils.c:233
- #, c-format
- msgid "VPN connection %d"
- msgstr "Connexion VPN %d"
-@@ -8767,7 +9053,7 @@ msgid "Slaves"
- msgstr "Esclaves"
-
- #: ../clients/tui/nmt-page-bond.c:365 ../clients/tui/nmt-page-ip-tunnel.c:135
--#: ../clients/tui/nmt-page-wifi.c:218
-+#: ../clients/tui/nmt-page-wifi.c:219
- msgid "Mode"
- msgstr "Mode"
-
-@@ -8802,7 +9088,7 @@ msgid "ARP targets"
- msgstr "Cibles ARP"
-
- #: ../clients/tui/nmt-page-bond.c:418 ../clients/tui/nmt-page-ethernet.c:64
--#: ../clients/tui/nmt-page-vlan.c:97 ../clients/tui/nmt-page-wifi.c:353
-+#: ../clients/tui/nmt-page-vlan.c:97 ../clients/tui/nmt-page-wifi.c:354
- msgid "Cloned MAC address"
- msgstr "Adresse MAC clonée"
-
-@@ -8867,7 +9153,7 @@ msgstr "ETHERNET"
- #: ../clients/tui/nmt-page-ethernet.c:70
- #: ../clients/tui/nmt-page-infiniband.c:81
- #: ../clients/tui/nmt-page-ip-tunnel.c:173 ../clients/tui/nmt-page-vlan.c:103
--#: ../clients/tui/nmt-page-wifi.c:359
-+#: ../clients/tui/nmt-page-wifi.c:360
- msgid "MTU"
- msgstr "MTU"
-
-@@ -9160,63 +9446,67 @@ msgstr "WEP Dynamique (802.1x)"
- msgid "LEAP"
- msgstr "LEAP"
-
--#: ../clients/tui/nmt-page-wifi.c:79
-+#: ../clients/tui/nmt-page-wifi.c:75
-+msgid "Enhanced Open (OWE)"
-+msgstr "Enhanced Open (OWE)"
-+
-+#: ../clients/tui/nmt-page-wifi.c:80
- msgctxt "WEP key index"
- msgid "1 (Default)"
- msgstr "1 (par défaut)"
-
--#: ../clients/tui/nmt-page-wifi.c:80
-+#: ../clients/tui/nmt-page-wifi.c:81
- msgctxt "WEP key index"
- msgid "2"
- msgstr "2"
-
--#: ../clients/tui/nmt-page-wifi.c:81
-+#: ../clients/tui/nmt-page-wifi.c:82
- msgctxt "WEP key index"
- msgid "3"
- msgstr "3"
-
--#: ../clients/tui/nmt-page-wifi.c:82
-+#: ../clients/tui/nmt-page-wifi.c:83
- msgctxt "WEP key index"
- msgid "4"
- msgstr "4"
-
--#: ../clients/tui/nmt-page-wifi.c:87
-+#: ../clients/tui/nmt-page-wifi.c:88
- msgid "Open System"
- msgstr "Système ouvert"
-
--#: ../clients/tui/nmt-page-wifi.c:88
-+#: ../clients/tui/nmt-page-wifi.c:89
- msgid "Shared Key"
- msgstr "Clé partagée"
-
--#: ../clients/tui/nmt-page-wifi.c:202
-+#: ../clients/tui/nmt-page-wifi.c:203
- msgid "WI-FI"
- msgstr "WI-FI"
-
--#: ../clients/tui/nmt-page-wifi.c:244
-+#: ../clients/tui/nmt-page-wifi.c:245
- msgid "Channel"
- msgstr "Canal"
-
- #. "wpa-enterprise"
- #. FIXME
--#: ../clients/tui/nmt-page-wifi.c:271
-+#: ../clients/tui/nmt-page-wifi.c:272
- msgid "(No support for wpa-enterprise yet...)"
- msgstr "(Aucune prise en charge de wpa-enterprise pour le moment...)"
-
--#: ../clients/tui/nmt-page-wifi.c:281 ../clients/tui/nmt-page-wifi.c:300
-+#: ../clients/tui/nmt-page-wifi.c:282 ../clients/tui/nmt-page-wifi.c:301
- msgid "WEP index"
- msgstr "Index WEP"
-
--#: ../clients/tui/nmt-page-wifi.c:289 ../clients/tui/nmt-page-wifi.c:308
-+#: ../clients/tui/nmt-page-wifi.c:290 ../clients/tui/nmt-page-wifi.c:309
- msgid "Authentication"
- msgstr "Authentification"
-
- #. "dynamic-wep"
- #. FIXME
--#: ../clients/tui/nmt-page-wifi.c:314
-+#: ../clients/tui/nmt-page-wifi.c:315
- msgid "(No support for dynamic-wep yet...)"
- msgstr "(Aucune prise en charge de dynamic-wep pour le moment...)"
-
--#: ../clients/tui/nmt-page-wifi.c:347
-+#: ../clients/tui/nmt-page-wifi.c:348
- msgid "BSSID"
- msgstr "BSSID"
-
-@@ -9287,38 +9577,43 @@ msgstr "openconnect a échoué avec un signal %d"
- msgid "Activation failed: %s"
- msgstr "Échec de l'activation %s"
-
--#: ../clients/tui/nmtui-connect.c:241
-+#: ../clients/tui/nmtui-connect.c:230
-+#, c-format
-+msgid "Could not deactivate connection: %s"
-+msgstr "Impossible de désactiver la connexion : %s"
-+
-+#: ../clients/tui/nmtui-connect.c:252
- msgid "Connecting..."
- msgstr "Connexion..."
-
--#: ../clients/tui/nmtui-connect.c:279 ../clients/tui/nmtui-connect.c:316
-+#: ../clients/tui/nmtui-connect.c:290 ../clients/tui/nmtui-connect.c:327
- #, c-format
- msgid "Could not activate connection: %s"
- msgstr "Impossible d'activer la connexion : « %s »"
-
--#: ../clients/tui/nmtui-connect.c:378 ../clients/tui/nmtui-connect.c:427
-+#: ../clients/tui/nmtui-connect.c:389 ../clients/tui/nmtui-connect.c:438
- msgid "Activate"
- msgstr "Activer"
-
--#: ../clients/tui/nmtui-connect.c:380
-+#: ../clients/tui/nmtui-connect.c:391
- msgid "Deactivate"
- msgstr "Désactiver"
-
--#: ../clients/tui/nmtui-connect.c:432 ../clients/tui/nmtui-edit.c:105
--#: ../clients/tui/nmtui.c:115
-+#: ../clients/tui/nmtui-connect.c:443 ../clients/tui/nmtui-edit.c:105
-+#: ../clients/tui/nmtui.c:117
- msgid "Quit"
- msgstr "Quitter"
-
--#: ../clients/tui/nmtui-connect.c:432 ../clients/tui/nmtui-edit.c:105
-+#: ../clients/tui/nmtui-connect.c:443 ../clients/tui/nmtui-edit.c:105
- msgid "Back"
- msgstr "Retour"
-
--#: ../clients/tui/nmtui-connect.c:455
-+#: ../clients/tui/nmtui-connect.c:466
- #, c-format
- msgid "No such connection '%s'"
- msgstr "Aucune connexion « %s »"
-
--#: ../clients/tui/nmtui-connect.c:457
-+#: ../clients/tui/nmtui-connect.c:468
- msgid "Connection is already active"
- msgstr "La connexion est déjà active"
-
-@@ -9374,51 +9669,47 @@ msgstr "Définir le nom d'hôte sur « %s »"
- msgid "Unable to set hostname: %s"
- msgstr "Impossible de définir le nom d'hôte : %s"
-
--#: ../clients/tui/nmtui.c:38 ../clients/tui/nmtui.c:41
-+#: ../clients/tui/nmtui.c:40 ../clients/tui/nmtui.c:43
- msgid "connection"
- msgstr "connexion"
-
--#: ../clients/tui/nmtui.c:39
-+#: ../clients/tui/nmtui.c:41
- msgid "Edit a connection"
- msgstr "Modifier une connexion"
-
--#: ../clients/tui/nmtui.c:42
-+#: ../clients/tui/nmtui.c:44
- msgid "Activate a connection"
- msgstr "Activer une connexion"
-
--#: ../clients/tui/nmtui.c:44
-+#: ../clients/tui/nmtui.c:46
- msgid "new hostname"
- msgstr "nouveau nom d'hôte"
-
--#: ../clients/tui/nmtui.c:45
-+#: ../clients/tui/nmtui.c:47
- msgid "Set system hostname"
- msgstr "Définir le nom d'hôte du système"
-
--#: ../clients/tui/nmtui.c:89
-+#: ../clients/tui/nmtui.c:91
- msgid "NetworkManager TUI"
- msgstr "NetworkManager TUI"
-
--#: ../clients/tui/nmtui.c:97
-+#: ../clients/tui/nmtui.c:99
- msgid "Please select an option"
- msgstr "Veuillez sélectionner une option"
-
--#: ../clients/tui/nmtui.c:145
-+#: ../clients/tui/nmtui.c:147
- msgid "Usage"
- msgstr "Syntaxe"
-
--#: ../clients/tui/nmtui.c:226
-+#: ../clients/tui/nmtui.c:228
- msgid "Could not parse arguments"
- msgstr "Impossible d'analyser les arguments"
-
--#: ../clients/tui/nmtui.c:236
-+#: ../clients/tui/nmtui.c:241
- #, c-format
- msgid "Could not contact NetworkManager: %s.\n"
- msgstr "Impossible de contacter le NetworkManager : « %s »\n"
-
--#: ../clients/tui/nmtui.c:241
--msgid "NetworkManager is not running."
--msgstr "NetworkManager n'est pas en cours d'exécution."
--
- #: ../libnm-core/nm-crypto.c:204
- #, c-format
- msgid "PEM key file had no start tag"
-@@ -9545,12 +9836,12 @@ msgstr "clé privée non valide"
- msgid "Failed to initialize the crypto engine."
- msgstr "L'initialisation du moteur de chiffrement a échoué."
-
--#: ../libnm-core/nm-crypto-gnutls.c:90 ../libnm-core/nm-crypto-nss.c:112
-+#: ../libnm-core/nm-crypto-gnutls.c:90 ../libnm-core/nm-crypto-nss.c:114
- #, c-format
- msgid "Unsupported key cipher for decryption"
- msgstr "attribut « » de type « » non supporté"
-
--#: ../libnm-core/nm-crypto-gnutls.c:100 ../libnm-core/nm-crypto-nss.c:119
-+#: ../libnm-core/nm-crypto-gnutls.c:100 ../libnm-core/nm-crypto-nss.c:121
- #, c-format
- msgid "Invalid IV length (must be at least %u)."
- msgstr "Longueur IV non valide (minimum %u)."
-@@ -9565,17 +9856,17 @@ msgstr "L'initialisation du contexte du chiffre de déchiffrement a échoué :
- msgid "Failed to decrypt the private key: %s (%s)"
- msgstr "Le déchiffrement de la clé privée a échoué : %s (%s)"
-
--#: ../libnm-core/nm-crypto-gnutls.c:143 ../libnm-core/nm-crypto-nss.c:206
-+#: ../libnm-core/nm-crypto-gnutls.c:143 ../libnm-core/nm-crypto-nss.c:208
- #, c-format
- msgid "Failed to decrypt the private key: unexpected padding length."
- msgstr "Le déchiffrement de la clé privée a échoué : longueur de remplissage inattendue."
-
--#: ../libnm-core/nm-crypto-gnutls.c:154 ../libnm-core/nm-crypto-nss.c:217
-+#: ../libnm-core/nm-crypto-gnutls.c:154 ../libnm-core/nm-crypto-nss.c:219
- #, c-format
- msgid "Failed to decrypt the private key."
- msgstr "Le déchiffrement de la clé privée a échoué."
-
--#: ../libnm-core/nm-crypto-gnutls.c:188 ../libnm-core/nm-crypto-nss.c:272
-+#: ../libnm-core/nm-crypto-gnutls.c:188 ../libnm-core/nm-crypto-nss.c:274
- #, c-format
- msgid "Unsupported key cipher for encryption"
- msgstr "attribut « » de type « » non supporté"
-@@ -9625,107 +9916,107 @@ msgstr "L'initialisation du décodeur PKCS#8 a échoué : %s"
- msgid "Couldn't decode PKCS#8 file: %s"
- msgstr "Impossible de décoder le fichier PKCS#8 : %s"
-
--#: ../libnm-core/nm-crypto-nss.c:65
-+#: ../libnm-core/nm-crypto-nss.c:67
- #, c-format
- msgid "Failed to initialize the crypto engine: %d."
- msgstr "L'initialisation du moteur de chiffrement a échoué : %d."
-
--#: ../libnm-core/nm-crypto-nss.c:131
-+#: ../libnm-core/nm-crypto-nss.c:133
- #, c-format
- msgid "Failed to initialize the decryption cipher slot."
- msgstr "L'initialisation de l'emplacement du chiffre de déchiffrement a échoué."
-
--#: ../libnm-core/nm-crypto-nss.c:141
-+#: ../libnm-core/nm-crypto-nss.c:143
- #, c-format
- msgid "Failed to set symmetric key for decryption."
- msgstr "La définition de la clé symétrique pour le déchiffrement a échoué."
-
--#: ../libnm-core/nm-crypto-nss.c:151
-+#: ../libnm-core/nm-crypto-nss.c:153
- #, c-format
- msgid "Failed to set IV for decryption."
- msgstr "La définition de IV pour le déchiffrement a échoué."
-
--#: ../libnm-core/nm-crypto-nss.c:159
-+#: ../libnm-core/nm-crypto-nss.c:161
- #, c-format
- msgid "Failed to initialize the decryption context."
- msgstr "L'initialisation du contexte de déchiffrement a échoué."
-
--#: ../libnm-core/nm-crypto-nss.c:175
-+#: ../libnm-core/nm-crypto-nss.c:177
- #, c-format
- msgid "Failed to decrypt the private key: %d."
- msgstr "Le déchiffrement de la clé privée a échoué : %d."
-
--#: ../libnm-core/nm-crypto-nss.c:183
-+#: ../libnm-core/nm-crypto-nss.c:185
- #, c-format
- msgid "Failed to decrypt the private key: decrypted data too large."
- msgstr "Le déchiffrement de la clé privée a échoué : les données déchiffrées sont trop longues."
-
--#: ../libnm-core/nm-crypto-nss.c:194
-+#: ../libnm-core/nm-crypto-nss.c:196
- #, c-format
- msgid "Failed to finalize decryption of the private key: %d."
- msgstr "La finalisation du déchiffrement de la clé privée a échoué : %d."
-
--#: ../libnm-core/nm-crypto-nss.c:283
-+#: ../libnm-core/nm-crypto-nss.c:285
- #, c-format
- msgid "Failed to initialize the encryption cipher slot."
- msgstr "L'initialisation de l'emplacement du cryptage de chiffrement a échoué."
-
--#: ../libnm-core/nm-crypto-nss.c:291
-+#: ../libnm-core/nm-crypto-nss.c:293
- #, c-format
- msgid "Failed to set symmetric key for encryption."
- msgstr "La définition de la clé symétrique pour le chiffrement a échoué."
-
--#: ../libnm-core/nm-crypto-nss.c:299
-+#: ../libnm-core/nm-crypto-nss.c:301
- #, c-format
- msgid "Failed to set IV for encryption."
- msgstr "La définition de IV pour le chiffrement a échoué."
-
--#: ../libnm-core/nm-crypto-nss.c:307
-+#: ../libnm-core/nm-crypto-nss.c:309
- #, c-format
- msgid "Failed to initialize the encryption context."
- msgstr "L'initialisation du contexte de chiffrement a échoué."
-
--#: ../libnm-core/nm-crypto-nss.c:330
-+#: ../libnm-core/nm-crypto-nss.c:332
- #, c-format
- msgid "Failed to encrypt: %d."
- msgstr "Le chiffrement a échoué : %d."
-
--#: ../libnm-core/nm-crypto-nss.c:338
-+#: ../libnm-core/nm-crypto-nss.c:340
- #, c-format
- msgid "Unexpected amount of data after encrypting."
- msgstr "Quantité de données inattendue après chiffrement."
-
--#: ../libnm-core/nm-crypto-nss.c:376
-+#: ../libnm-core/nm-crypto-nss.c:378
- #, c-format
- msgid "Couldn't decode certificate: %d"
- msgstr "Impossible de décoder le certificat : %d"
-
--#: ../libnm-core/nm-crypto-nss.c:422
-+#: ../libnm-core/nm-crypto-nss.c:424
- #, c-format
- msgid "Password must be UTF-8"
- msgstr "Le mot de passe doit être UTF-8"
-
--#: ../libnm-core/nm-crypto-nss.c:445
-+#: ../libnm-core/nm-crypto-nss.c:447
- #, c-format
- msgid "Couldn't initialize slot"
- msgstr "L'initialisation du décodeur PKCS#8 a échoué"
-
--#: ../libnm-core/nm-crypto-nss.c:453
-+#: ../libnm-core/nm-crypto-nss.c:455
- #, c-format
- msgid "Couldn't initialize PKCS#12 decoder: %d"
- msgstr "Impossible d'initialiser le décodeur PKCS#12 : %d"
-
--#: ../libnm-core/nm-crypto-nss.c:462
-+#: ../libnm-core/nm-crypto-nss.c:464
- #, c-format
- msgid "Couldn't decode PKCS#12 file: %d"
- msgstr "Impossible de décoder le fichier PKCS#12 : %d"
-
--#: ../libnm-core/nm-crypto-nss.c:471
-+#: ../libnm-core/nm-crypto-nss.c:473
- #, c-format
- msgid "Couldn't verify PKCS#12 file: %d"
- msgstr "Impossible de vérifier le fichier PKCS#12 : %d"
-
--#: ../libnm-core/nm-crypto-nss.c:521
-+#: ../libnm-core/nm-crypto-nss.c:523
- msgid "Could not generate random data."
- msgstr "Impossible de générer des données aléatoires."
-
-@@ -9741,57 +10032,57 @@ msgstr "Nom de paramètre inconnu"
- msgid "duplicate setting name"
- msgstr "reproduire le nom du paramètre"
-
--#: ../libnm-core/nm-connection.c:1423
-+#: ../libnm-core/nm-connection.c:1424
- msgid "setting not found"
- msgstr "paramètre non trouvé"
-
--#: ../libnm-core/nm-connection.c:1489 ../libnm-core/nm-connection.c:1514
--#: ../libnm-core/nm-connection.c:1539
-+#: ../libnm-core/nm-connection.c:1476 ../libnm-core/nm-connection.c:1501
-+#: ../libnm-core/nm-connection.c:1526
- msgid "setting is required for non-slave connections"
- msgstr "paramètre requis pour les connexions non esclaves"
-
--#: ../libnm-core/nm-connection.c:1502 ../libnm-core/nm-connection.c:1527
--#: ../libnm-core/nm-connection.c:1552
-+#: ../libnm-core/nm-connection.c:1489 ../libnm-core/nm-connection.c:1514
-+#: ../libnm-core/nm-connection.c:1539
- msgid "setting not allowed in slave connection"
- msgstr "le paramètre n'est pas accepté dans la connexion esclave"
-
--#: ../libnm-core/nm-connection.c:1657
-+#: ../libnm-core/nm-connection.c:1644
- msgid "Unexpected failure to normalize the connection"
- msgstr "Erreur inattendue lors de la normalisation de la connexion"
-
--#: ../libnm-core/nm-connection.c:1720
-+#: ../libnm-core/nm-connection.c:1707
- msgid "Unexpected failure to verify the connection"
- msgstr "Erreur inattendue lors de la vérification de la connexion"
-
--#: ../libnm-core/nm-connection.c:1756
-+#: ../libnm-core/nm-connection.c:1743
- #, c-format
- msgid "unexpected uuid %s instead of %s"
- msgstr "uuid inattendu %s au lieu de %s"
-
--#: ../libnm-core/nm-connection.c:2609 ../libnm-core/nm-setting-8021x.c:2574
--#: ../libnm-core/nm-setting-8021x.c:2591 ../libnm-core/nm-setting-8021x.c:2622
--#: ../libnm-core/nm-setting-8021x.c:2639 ../libnm-core/nm-setting-8021x.c:2681
--#: ../libnm-core/nm-setting-8021x.c:2693 ../libnm-core/nm-setting-8021x.c:2711
--#: ../libnm-core/nm-setting-8021x.c:2723 ../libnm-core/nm-setting-8021x.c:2747
--#: ../libnm-core/nm-setting-8021x.c:2840 ../libnm-core/nm-setting-adsl.c:158
-+#: ../libnm-core/nm-connection.c:2569 ../libnm-core/nm-setting-8021x.c:2610
-+#: ../libnm-core/nm-setting-8021x.c:2627 ../libnm-core/nm-setting-8021x.c:2658
-+#: ../libnm-core/nm-setting-8021x.c:2675 ../libnm-core/nm-setting-8021x.c:2717
-+#: ../libnm-core/nm-setting-8021x.c:2729 ../libnm-core/nm-setting-8021x.c:2747
-+#: ../libnm-core/nm-setting-8021x.c:2759 ../libnm-core/nm-setting-8021x.c:2783
-+#: ../libnm-core/nm-setting-8021x.c:2876 ../libnm-core/nm-setting-adsl.c:158
- #: ../libnm-core/nm-setting-bluetooth.c:109
- #: ../libnm-core/nm-setting-bluetooth.c:167
- #: ../libnm-core/nm-setting-bluetooth.c:181 ../libnm-core/nm-setting-cdma.c:128
--#: ../libnm-core/nm-setting-connection.c:954
--#: ../libnm-core/nm-setting-connection.c:997
--#: ../libnm-core/nm-setting-connection.c:1177
--#: ../libnm-core/nm-setting-ip-config.c:4946
--#: ../libnm-core/nm-setting-ip-tunnel.c:359
-+#: ../libnm-core/nm-setting-connection.c:975
-+#: ../libnm-core/nm-setting-connection.c:1004
-+#: ../libnm-core/nm-setting-connection.c:1266
-+#: ../libnm-core/nm-setting-ip-config.c:4974
-+#: ../libnm-core/nm-setting-ip-tunnel.c:367
- #: ../libnm-core/nm-setting-olpc-mesh.c:84
- #: ../libnm-core/nm-setting-ovs-patch.c:77 ../libnm-core/nm-setting-pppoe.c:130
--#: ../libnm-core/nm-setting-vpn.c:516 ../libnm-core/nm-setting-vxlan.c:323
-+#: ../libnm-core/nm-setting-vpn.c:551 ../libnm-core/nm-setting-vxlan.c:323
- #: ../libnm-core/nm-setting-wifi-p2p.c:122 ../libnm-core/nm-setting-wimax.c:94
--#: ../libnm-core/nm-setting-wireless-security.c:902
--#: ../libnm-core/nm-setting-wireless.c:759
-+#: ../libnm-core/nm-setting-wireless-security.c:894
-+#: ../libnm-core/nm-setting-wireless.c:764
- msgid "property is missing"
- msgstr "la propriété est manquante"
-
--#: ../libnm-core/nm-connection.c:2755
-+#: ../libnm-core/nm-connection.c:2716
- msgid "IP Tunnel"
- msgstr "Tunnel IP"
-
-@@ -9800,215 +10091,275 @@ msgstr "Tunnel IP"
- msgid "Method returned type '%s', but expected '%s'"
- msgstr "La méthode a renvoyé le type « %s », mais « %s » était attendu"
-
--#: ../libnm-core/nm-keyfile-utils.c:242
-+#: ../libnm-core/nm-keyfile/nm-keyfile-utils.c:171
-+#, c-format
-+msgid "Value cannot be interpreted as a list of numbers."
-+msgstr "La valeur ne peut pas être interprétée comme une liste de chiffres."
-+
-+#: ../libnm-core/nm-keyfile/nm-keyfile-utils.c:307
- #, 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:196
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:271
- msgid "ignoring missing number"
- msgstr "numéro manquant ignoré"
-
--#: ../libnm-core/nm-keyfile.c:204
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:283
- #, c-format
- msgid "ignoring invalid number '%s'"
- msgstr "numéro « %s » ignoré"
-
--#: ../libnm-core/nm-keyfile.c:225
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:312
- #, c-format
- msgid "ignoring invalid %s address: %s"
- msgstr "adresse non valide « %s » ignorée : %s"
-
--#: ../libnm-core/nm-keyfile.c:268
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:359
- #, 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:292
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:391
- #, c-format
- msgid "ignoring invalid %s route: %s"
- msgstr "route %s non valide ignorée : %s"
-
--#: ../libnm-core/nm-keyfile.c:464
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:566
- #, 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:474
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:582
- #, 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:483
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:597
- #, 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:494
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:614
- #, c-format
- msgid "garbage at the end of value %s: '%s'"
- msgstr "informations unutiles à la fin de %s : « %s »"
-
--#: ../libnm-core/nm-keyfile.c:500
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:624
- #, 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:514
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:647
- #, 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:521
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:659
- #, 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:856 ../libnm-core/nm-setting-user.c:358
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1001
-+#: ../libnm-core/nm-setting-user.c:358
- #, c-format
- msgid "invalid value for \"%s\": %s"
- msgstr "valeur non valide pour \"%s\": %s"
-
--#: ../libnm-core/nm-keyfile.c:894
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1041
- #, 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:990 ../libnm-core/nm-keyfile.c:3143
--#, c-format
--msgid "ignoring invalid byte element '%d' (not between 0 and 255 inclusive)"
--msgstr "élément octet non valide « %d » ignoré (ne doit pas être compris entre 0 et 255 inclus)"
--
--#: ../libnm-core/nm-keyfile.c:1001
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1132
- msgid "ignoring invalid MAC address"
- msgstr "adresse MAC non valide ignorée"
-
--#: ../libnm-core/nm-keyfile.c:1260
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1391
- msgid "ignoring invalid SSID"
- msgstr "SSID non valide ignoré"
-
--#: ../libnm-core/nm-keyfile.c:1276
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1409
- msgid "ignoring invalid raw password"
- msgstr "mot de passe brut non valid ignoré"
-
--#: ../libnm-core/nm-keyfile.c:1416
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1554
- msgid "invalid key/cert value"
- msgstr "valeur clé/cert non valide"
-
--#: ../libnm-core/nm-keyfile.c:1427
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1568
- #, c-format
- msgid "invalid key/cert value path \"%s\""
- msgstr "chemin de valeur de cert / clé non valide « %s »"
-
--#: ../libnm-core/nm-keyfile.c:1447 ../libnm-core/nm-keyfile.c:1530
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1592
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1688
- #, 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:1456
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1604
- #, c-format
- msgid "invalid PKCS#11 URI \"%s\""
- msgstr "URI « %s » PKCS#11 invalide"
-
--#: ../libnm-core/nm-keyfile.c:1500
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1652
- 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:1509
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1664
- msgid "invalid key/cert value data:;base64,file://"
- msgstr "valeur de clé / cert data non valide :;base64,file://"
-
--#: ../libnm-core/nm-keyfile.c:1542
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1703
- 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:1644
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1808
- #, c-format
- msgid "invalid parity value '%s'"
- msgstr "valeur de parité « %s » non valide"
-
--#: ../libnm-core/nm-keyfile.c:1661 ../libnm-core/nm-keyfile.c:3198
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1826
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3391
- #, c-format
- msgid "invalid setting: %s"
- msgstr "configuration non valide « %s »"
-
--#: ../libnm-core/nm-keyfile.c:1678
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1847
- #, c-format
- msgid "ignoring invalid team configuration: %s"
- msgstr "configuration de équipe non valide ignorée : %s"
-
--#: ../libnm-core/nm-keyfile.c:1756
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1932
- #, c-format
- msgid "invalid qdisc: %s"
- msgstr "qdisc non valide : %s"
-
--#: ../libnm-core/nm-keyfile.c:1802
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1981
- #, c-format
- msgid "invalid tfilter: %s"
- msgstr "tfilter non valide : %s"
-
--#: ../libnm-core/nm-keyfile.c:3042
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3234
- #, c-format
- msgid "error loading setting value: %s"
- msgstr "erreur de chargement de la valeur du paramètre : %s"
-
--#: ../libnm-core/nm-keyfile.c:3070 ../libnm-core/nm-keyfile.c:3081
--#: ../libnm-core/nm-keyfile.c:3099 ../libnm-core/nm-keyfile.c:3110
--#: ../libnm-core/nm-keyfile.c:3121 ../libnm-core/nm-keyfile.c:3173
--#: ../libnm-core/nm-keyfile.c:3184
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3262
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3273
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3291
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3302
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3313
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3365
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3376
- msgid "value cannot be interpreted as integer"
- msgstr "la valeur ne doit pas être interprétée en tant que nombre entier"
-
--#: ../libnm-core/nm-keyfile.c:3219
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3338
-+#, c-format
-+msgid "ignoring invalid byte element '%u' (not between 0 and 255 inclusive)"
-+msgstr "élément octet non valide « %u » ignoré (ne doit pas être compris entre 0 et 255 inclus)"
-+
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3416
- #, c-format
- msgid "invalid setting name '%s'"
- msgstr "nom de configuration non valide « %s »"
-
--#: ../libnm-core/nm-keyfile.c:3264
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3465
- #, c-format
- msgid "invalid key '%s.%s'"
- msgstr "clé non valide '%s.%s'"
-
--#: ../libnm-core/nm-keyfile.c:3279
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3484
- #, c-format
- msgid "key '%s.%s' is not boolean"
- msgstr "clé '%s.%s' n’est pas un booléen"
-
--#: ../libnm-core/nm-keyfile.c:3336
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3504
-+#, c-format
-+msgid "key '%s.%s' is not a uint32"
-+msgstr "clé '%s.%s' ne correspond pas à un uint32"
-+
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3565
- #, c-format
- msgid "invalid peer public key in section '%s'"
- msgstr "Clé publique homologue non valide dans la section «%s»"
-
--#: ../libnm-core/nm-keyfile.c:3348
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3580
- #, c-format
- msgid "key '%s.%s' is not a valid 256 bit key in base64 encoding"
- msgstr "clé « %s.%s » est une clé de 256 non valide en chiffrage base64"
-
--#: ../libnm-core/nm-keyfile.c:3361
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3597
- #, c-format
- msgid "key '%s.%s' is not a valid secret flag"
- msgstr "« %s.%s » n'est pas un marqueur de secret valide"
-
--#: ../libnm-core/nm-keyfile.c:3373
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3613
- #, c-format
- msgid "key '%s.%s' is not a integer in range 0 to 2^32"
- msgstr "clé « %s.%s » ne correspond pas à un nombre entier relatif entre 0 et 2^32"
-
--#: ../libnm-core/nm-keyfile.c:3385
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3629
- #, c-format
- msgid "key '%s.%s' is not a valid endpoint"
- msgstr "clé « %s.%s » n'est pas un point de terminaison valide"
-
--#: ../libnm-core/nm-keyfile.c:3407
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3655
- #, c-format
- msgid "key '%s.%s' has invalid allowed-ips"
- msgstr "clé « %s.%s » comprend des adresses ip «allowed-ips» non valides"
-
--#: ../libnm-core/nm-keyfile.c:3419
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3670
- #, c-format
- msgid "peer '%s' is invalid: %s"
- msgstr "l'homologue « %s » est non valide : %s"
-
-+#: ../libnm-core/nm-libnm-core-aux/nm-libnm-core-aux.c:221
-+#, c-format
-+msgid "'%s' is not valid: properties should be specified as 'key=value'"
-+msgstr "« %s » n'est pas valide : les propriétés doivent être spécifiées sous la forme key=value"
-+
-+#: ../libnm-core/nm-libnm-core-aux/nm-libnm-core-aux.c:236
-+#, c-format
-+msgid "'%s' is not a valid key"
-+msgstr "« %s » n’est pas une clé valide"
-+
-+#: ../libnm-core/nm-libnm-core-aux/nm-libnm-core-aux.c:242
-+#, c-format
-+msgid "duplicate key '%s'"
-+msgstr "clé dupliquée « %s »"
-+
-+#: ../libnm-core/nm-libnm-core-aux/nm-libnm-core-aux.c:256
-+#, c-format
-+msgid "number for '%s' is out of range"
-+msgstr "le nombre « %s » est en dehors de la plage autorisée"
-+
-+#: ../libnm-core/nm-libnm-core-aux/nm-libnm-core-aux.c:259
-+#, c-format
-+msgid "value for '%s' must be a number"
-+msgstr "« %s » n'est pas un numéro"
-+
-+#: ../libnm-core/nm-libnm-core-aux/nm-libnm-core-aux.c:270
-+#, c-format
-+msgid "value for '%s' must be a boolean"
-+msgstr "« %s » n'est pas un boléen"
-+
-+#: ../libnm-core/nm-libnm-core-aux/nm-libnm-core-aux.c:279
-+msgid "missing 'name' attribute"
-+msgstr "attribut de « nom » manquant"
-+
-+#: ../libnm-core/nm-libnm-core-aux/nm-libnm-core-aux.c:286
-+#, c-format
-+msgid "invalid 'name' \"%s\""
-+msgstr "« nom » non valide « %s »"
-+
-+#: ../libnm-core/nm-libnm-core-aux/nm-libnm-core-aux.c:298
-+#, c-format
-+msgid "attribute '%s' is invalid for \"%s\""
-+msgstr "attribut '%s' non pas valide pour « %s »"
-+
- #: ../libnm-core/nm-setting-6lowpan.c:79
- #, c-format
- msgid "property is not specified"
-@@ -10021,122 +10372,123 @@ msgid "'%s' value doesn't match '%s=%s'"
- msgstr "la valeur « %s » ne correspond pas à « %s=%s »"
-
- #: ../libnm-core/nm-setting-6lowpan.c:112
--#: ../libnm-core/nm-setting-ip-tunnel.c:337
-+#: ../libnm-core/nm-setting-ip-tunnel.c:345
- #: ../libnm-core/nm-setting-macsec.c:298 ../libnm-core/nm-setting-macvlan.c:127
- #: ../libnm-core/nm-setting-vlan.c:611 ../libnm-core/nm-setting-vxlan.c:366
- #, c-format
- msgid "'%s' is neither an UUID nor an interface name"
- msgstr "« %s » n'est pas un UUID, ni un nom d'interface"
-
--#: ../libnm-core/nm-setting-8021x.c:213
-+#: ../libnm-core/nm-setting-8021x.c:217
- msgid "binary data missing"
- msgstr "donnée binaire manquante"
-
--#: ../libnm-core/nm-setting-8021x.c:241
-+#: ../libnm-core/nm-setting-8021x.c:245
- msgid "URI not NUL terminated"
- msgstr "URI non NUL terminé"
-
--#: ../libnm-core/nm-setting-8021x.c:250
-+#: ../libnm-core/nm-setting-8021x.c:254
- msgid "URI is empty"
- msgstr "URI vide"
-
--#: ../libnm-core/nm-setting-8021x.c:258
-+#: ../libnm-core/nm-setting-8021x.c:262
- msgid "URI is not valid UTF-8"
- msgstr "URI n'est pas un UTF-8 valide"
-
--#: ../libnm-core/nm-setting-8021x.c:276
-+#: ../libnm-core/nm-setting-8021x.c:280
- msgid "data missing"
- msgstr "données manquantes"
-
--#: ../libnm-core/nm-setting-8021x.c:299 ../libnm-core/nm-setting-8021x.c:666
-+#: ../libnm-core/nm-setting-8021x.c:303 ../libnm-core/nm-setting-8021x.c:670
- #, c-format
- msgid "certificate is invalid: %s"
- msgstr "certificat non valide : %s"
-
--#: ../libnm-core/nm-setting-8021x.c:307
-+#: ../libnm-core/nm-setting-8021x.c:311
- #, c-format
- msgid "certificate detected as invalid scheme"
- msgstr "certificat non valide"
-
--#: ../libnm-core/nm-setting-8021x.c:521
-+#: ../libnm-core/nm-setting-8021x.c:525
- 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:537
-+#: ../libnm-core/nm-setting-8021x.c:541
- msgid "invalid certificate format"
- msgstr "format de certificat non valide"
-
--#: ../libnm-core/nm-setting-8021x.c:676
-+#: ../libnm-core/nm-setting-8021x.c:680
- #, 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:2581 ../libnm-core/nm-setting-8021x.c:2598
--#: ../libnm-core/nm-setting-8021x.c:2629 ../libnm-core/nm-setting-8021x.c:2646
--#: ../libnm-core/nm-setting-8021x.c:2687 ../libnm-core/nm-setting-8021x.c:2699
--#: ../libnm-core/nm-setting-8021x.c:2717 ../libnm-core/nm-setting-8021x.c:2729
--#: ../libnm-core/nm-setting-8021x.c:2754 ../libnm-core/nm-setting-adsl.c:165
-+#: ../libnm-core/nm-setting-8021x.c:2617 ../libnm-core/nm-setting-8021x.c:2634
-+#: ../libnm-core/nm-setting-8021x.c:2665 ../libnm-core/nm-setting-8021x.c:2682
-+#: ../libnm-core/nm-setting-8021x.c:2723 ../libnm-core/nm-setting-8021x.c:2735
-+#: ../libnm-core/nm-setting-8021x.c:2753 ../libnm-core/nm-setting-8021x.c:2765
-+#: ../libnm-core/nm-setting-8021x.c:2790 ../libnm-core/nm-setting-adsl.c:166
- #: ../libnm-core/nm-setting-cdma.c:135 ../libnm-core/nm-setting-cdma.c:144
--#: ../libnm-core/nm-setting-connection.c:961
--#: ../libnm-core/nm-setting-connection.c:1009
--#: ../libnm-core/nm-setting-gsm.c:289 ../libnm-core/nm-setting-gsm.c:347
--#: ../libnm-core/nm-setting-gsm.c:384 ../libnm-core/nm-setting-gsm.c:393
--#: ../libnm-core/nm-setting-ip-config.c:4953
-+#: ../libnm-core/nm-setting-connection.c:982
-+#: ../libnm-core/nm-setting-connection.c:1016
-+#: ../libnm-core/nm-setting-connection.c:1238
-+#: ../libnm-core/nm-setting-gsm.c:283 ../libnm-core/nm-setting-gsm.c:341
-+#: ../libnm-core/nm-setting-gsm.c:378 ../libnm-core/nm-setting-gsm.c:387
-+#: ../libnm-core/nm-setting-ip-config.c:4981
- #: ../libnm-core/nm-setting-ip4-config.c:167
- #: ../libnm-core/nm-setting-ip4-config.c:174
- #: ../libnm-core/nm-setting-pppoe.c:137 ../libnm-core/nm-setting-pppoe.c:146
--#: ../libnm-core/nm-setting-vpn.c:525 ../libnm-core/nm-setting-vpn.c:535
-+#: ../libnm-core/nm-setting-vpn.c:559 ../libnm-core/nm-setting-vpn.c:570
- #: ../libnm-core/nm-setting-wimax.c:103
--#: ../libnm-core/nm-setting-wireless-security.c:945
--#: ../libnm-core/nm-setting-wireless-security.c:969
--#: ../libnm-core/nm-setting.c:1243
-+#: ../libnm-core/nm-setting-wireless-security.c:937
-+#: ../libnm-core/nm-setting-wireless-security.c:961
-+#: ../libnm-core/nm-setting.c:1257
- msgid "property is empty"
- msgstr "la propriété est vide"
-
--#: ../libnm-core/nm-setting-8021x.c:2611 ../libnm-core/nm-setting-8021x.c:2659
-+#: ../libnm-core/nm-setting-8021x.c:2647 ../libnm-core/nm-setting-8021x.c:2695
- #, c-format
- msgid "has to match '%s' property for PKCS#12"
- msgstr "doit correspondre à la propriété « %s » pour PKCS#12"
-
--#: ../libnm-core/nm-setting-8021x.c:2831
-+#: ../libnm-core/nm-setting-8021x.c:2867
- msgid "can be enabled only on Ethernet connections"
- msgstr "ne peut être activé que sur les connexions Ethernet"
-
--#: ../libnm-core/nm-setting-8021x.c:2849
-+#: ../libnm-core/nm-setting-8021x.c:2885
- #: ../libnm-core/nm-setting-bluetooth.c:94
--#: ../libnm-core/nm-setting-infiniband.c:162
--#: ../libnm-core/nm-setting-infiniband.c:172
-+#: ../libnm-core/nm-setting-infiniband.c:163
-+#: ../libnm-core/nm-setting-infiniband.c:173
- #: ../libnm-core/nm-setting-ip4-config.c:158
--#: ../libnm-core/nm-setting-ip6-config.c:207
--#: ../libnm-core/nm-setting-ip6-config.c:218
-+#: ../libnm-core/nm-setting-ip6-config.c:226
-+#: ../libnm-core/nm-setting-ip6-config.c:237
- #: ../libnm-core/nm-setting-olpc-mesh.c:113
- #: ../libnm-core/nm-setting-wifi-p2p.c:131 ../libnm-core/nm-setting-wimax.c:112
- #: ../libnm-core/nm-setting-wired.c:785 ../libnm-core/nm-setting-wired.c:795
--#: ../libnm-core/nm-setting-wireless-security.c:988
--#: ../libnm-core/nm-setting-wireless-security.c:997
--#: ../libnm-core/nm-setting-wireless-security.c:1006
--#: ../libnm-core/nm-setting-wireless-security.c:1016
--#: ../libnm-core/nm-setting-wireless-security.c:1026
--#: ../libnm-core/nm-setting-wireless-security.c:1049
--#: ../libnm-core/nm-setting-wireless-security.c:1087
--#: ../libnm-core/nm-setting-wireless-security.c:1128
--#: ../libnm-core/nm-setting-wireless.c:830
--#: ../libnm-core/nm-setting-wireless.c:839
--#: ../libnm-core/nm-setting-wireless.c:850 ../libnm-core/nm-setting-wpan.c:162
--#: ../libnm-core/nm-utils.c:4566
-+#: ../libnm-core/nm-setting-wireless-security.c:980
-+#: ../libnm-core/nm-setting-wireless-security.c:989
-+#: ../libnm-core/nm-setting-wireless-security.c:998
-+#: ../libnm-core/nm-setting-wireless-security.c:1008
-+#: ../libnm-core/nm-setting-wireless-security.c:1018
-+#: ../libnm-core/nm-setting-wireless-security.c:1041
-+#: ../libnm-core/nm-setting-wireless-security.c:1079
-+#: ../libnm-core/nm-setting-wireless-security.c:1120
-+#: ../libnm-core/nm-setting-wireless.c:835
-+#: ../libnm-core/nm-setting-wireless.c:844
-+#: ../libnm-core/nm-setting-wireless.c:855 ../libnm-core/nm-setting-wpan.c:162
-+#: ../libnm-core/nm-utils.c:4596
- msgid "property is invalid"
- msgstr "propriété non valide"
-
--#: ../libnm-core/nm-setting-8021x.c:2876 ../libnm-core/nm-setting-8021x.c:2888
--#: ../libnm-core/nm-setting-8021x.c:2902 ../libnm-core/nm-setting-8021x.c:2929
--#: ../libnm-core/nm-setting-8021x.c:2944 ../libnm-core/nm-setting-adsl.c:177
-+#: ../libnm-core/nm-setting-8021x.c:2912 ../libnm-core/nm-setting-8021x.c:2924
-+#: ../libnm-core/nm-setting-8021x.c:2938 ../libnm-core/nm-setting-8021x.c:2965
-+#: ../libnm-core/nm-setting-8021x.c:2980 ../libnm-core/nm-setting-adsl.c:177
- #: ../libnm-core/nm-setting-adsl.c:189 ../libnm-core/nm-setting-bluetooth.c:122
--#: ../libnm-core/nm-setting-wireless-security.c:923
-+#: ../libnm-core/nm-setting-wireless-security.c:915
- #, c-format
- msgid "'%s' is not a valid value for the property"
- msgstr "« %s » n'est pas une valeur valide pour la propriété"
-
--#: ../libnm-core/nm-setting-8021x.c:2912
-+#: ../libnm-core/nm-setting-8021x.c:2948
- msgid "invalid auth flags"
- msgstr "marqueurs d'auth non valides"
-
-@@ -10150,93 +10502,92 @@ msgstr "la connexion « %s » requiert une configuration « %s » ou « %s
- msgid "'%s' connection requires '%s' setting"
- msgstr "la connexion « %s » requiert une configuration « %s »"
-
--#: ../libnm-core/nm-setting-bond.c:541
-+#: ../libnm-core/nm-setting-bond.c:757
- #, 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:566
--#, c-format
--msgid "only one of '%s' and '%s' can be set"
--msgstr "seul l'un de « %s » et « %s » peut être défini"
--
--#: ../libnm-core/nm-setting-bond.c:579
-+#: ../libnm-core/nm-setting-bond.c:789
- #, c-format
- msgid "mandatory option '%s' is missing"
- msgstr "l'option obligatoire « %s » est manquante"
-
--#: ../libnm-core/nm-setting-bond.c:589
-+#: ../libnm-core/nm-setting-bond.c:799
- #, 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:603
-+#: ../libnm-core/nm-setting-bond.c:816
- #, c-format
- msgid "'%s=%s' is incompatible with '%s > 0'"
- msgstr "« %s=%s » est incompatible avec « %s > 0 »"
-
--#: ../libnm-core/nm-setting-bond.c:618
-+#: ../libnm-core/nm-setting-bond.c:836
- #, 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:629
-+#: ../libnm-core/nm-setting-bond.c:849
- #, 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:642
-+#: ../libnm-core/nm-setting-bond.c:862
- #, 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:655 ../libnm-core/nm-setting-bond.c:664
--#: ../libnm-core/nm-setting-bond.c:684 ../libnm-core/nm-setting-bond.c:720
-+#: ../libnm-core/nm-setting-bond.c:877 ../libnm-core/nm-setting-bond.c:890
-+#, c-format
-+msgid "'%s' option requires '%s' option to be enabled"
-+msgstr "l'option « %s » nécessite que l'option « %s » soit définie"
-+
-+#: ../libnm-core/nm-setting-bond.c:912 ../libnm-core/nm-setting-bond.c:958
- #, 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:695
-+#: ../libnm-core/nm-setting-bond.c:927
- #, c-format
- msgid "'%s' option is empty"
- msgstr "l'option « %s » est vide"
-
--#: ../libnm-core/nm-setting-bond.c:707
-+#: ../libnm-core/nm-setting-bond.c:941
- #, 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:735
-+#: ../libnm-core/nm-setting-bond.c:975
- #, 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:746
-+#: ../libnm-core/nm-setting-bond.c:987
- #, 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:762
-+#: ../libnm-core/nm-setting-bond.c:1010
- #, c-format
- msgid "'%s' option should be string"
- msgstr "l'option « %s » doit correspondre à une chaîne"
-
--#: ../libnm-core/nm-setting-bond.c:778
-+#: ../libnm-core/nm-setting-bond.c:1023
- #, 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:301
-+#: ../libnm-core/nm-setting-bridge-port.c:303
- #: ../libnm-core/nm-setting-ovs-bridge.c:153
--#: ../libnm-core/nm-setting-ovs-interface.c:259
-+#: ../libnm-core/nm-setting-ovs-interface.c:269
- #: ../libnm-core/nm-setting-ovs-port.c:172
- #: ../libnm-core/nm-setting-team-port.c:299
- #, c-format
- msgid "missing setting"
- msgstr "configuration manquante"
-
--#: ../libnm-core/nm-setting-bridge-port.c:312
--#: ../libnm-core/nm-setting-ovs-interface.c:280
-+#: ../libnm-core/nm-setting-bridge-port.c:314
-+#: ../libnm-core/nm-setting-ovs-interface.c:290
- #: ../libnm-core/nm-setting-ovs-port.c:193
- #: ../libnm-core/nm-setting-team-port.c:310
- #, c-format
-@@ -10245,505 +10596,549 @@ msgid ""
- "Instead it is '%s'"
- msgstr "Une connexion qui aurait pour configuration « %s » doit avoir le type d'esclave (slave-type) défini sur « %s » au lieu de « %s »"
-
--#: ../libnm-core/nm-setting-bridge.c:896
-+#: ../libnm-core/nm-setting-bridge.c:1180
- #, 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:913
-+#: ../libnm-core/nm-setting-bridge.c:1197
- msgid "is not a valid MAC address"
- msgstr "n'est pas une adresse MAC valide"
-
--#: ../libnm-core/nm-setting-bridge.c:954
-+#: ../libnm-core/nm-setting-bridge.c:1238
- 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:931
-+#: ../libnm-core/nm-setting-bridge.c:1258
-+msgid "is not a valid link local MAC address"
-+msgstr "n'est pas une adresse MAC locale de lien valide"
-+
-+#: ../libnm-core/nm-setting-bridge.c:1270
-+msgid "is not a valid VLAN filtering protocol"
-+msgstr "n'est pas un protocole de filtrage VLAN valide"
-+
-+#: ../libnm-core/nm-setting-bridge.c:1283
-+msgid "is not a valid option"
-+msgstr "n'est pas une option valable"
-+
-+#: ../libnm-core/nm-setting-bridge.c:1292
-+#, c-format
-+msgid "'%s' option must be a power of 2"
-+msgstr "L’option %s doit être un multiple de 2"
-+
-+#: ../libnm-core/nm-setting-connection.c:952
- #, 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:970
-+#: ../libnm-core/nm-setting-connection.c:991
- #, c-format
- msgid "'%s' is not a valid UUID"
- msgstr "« %s » n'est pas un UUID valide"
-
--#: ../libnm-core/nm-setting-connection.c:1020
-+#: ../libnm-core/nm-setting-connection.c:1027
- #, c-format
- msgid "connection type '%s' is not valid"
- msgstr "type de connexion « %s » non valide"
-
--#: ../libnm-core/nm-setting-connection.c:1056
-+#: ../libnm-core/nm-setting-connection.c:1120
- #, c-format
- msgid "Unknown slave type '%s'"
- msgstr "type d'esclave « %s » inconnu"
-
--#: ../libnm-core/nm-setting-connection.c:1067
-+#: ../libnm-core/nm-setting-connection.c:1131
- #, 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:1088
-+#: ../libnm-core/nm-setting-connection.c:1152
- #, c-format
- msgid "Cannot set '%s' without '%s'"
- msgstr "Ne peut pas définir « %s » sans « %s »"
-
--#: ../libnm-core/nm-setting-connection.c:1102
-+#: ../libnm-core/nm-setting-connection.c:1166
- #, 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:1116
-+#: ../libnm-core/nm-setting-connection.c:1180
- #, c-format
- msgid "metered value %d is not valid"
- msgstr "valeur contrôlée %d non valide"
-
--#: ../libnm-core/nm-setting-connection.c:1127
--#: ../libnm-core/nm-setting-connection.c:1138
--#: ../libnm-core/nm-setting-connection.c:1151
-+#: ../libnm-core/nm-setting-connection.c:1191
-+#: ../libnm-core/nm-setting-connection.c:1202
-+#: ../libnm-core/nm-setting-connection.c:1215
- #, c-format
- msgid "value %d is not valid"
- msgstr "la valeur %d n’est pas valide"
-
--#: ../libnm-core/nm-setting-connection.c:1164
-+#: ../libnm-core/nm-setting-connection.c:1228
- #, c-format
- msgid "wait-device-timeout requires %s"
- msgstr "wait-device-timeout requiert %s"
-
--#: ../libnm-core/nm-setting-connection.c:1186
-+#: ../libnm-core/nm-setting-connection.c:1247
-+msgid "DHCP option cannot be longer than 255 characters"
-+msgstr "L'option DHCP ne peut pas comporter plus de 255 caractères"
-+
-+#: ../libnm-core/nm-setting-connection.c:1253
-+msgid "MUD URL is not a valid URL"
-+msgstr "L'URL MUD n'est pas une URL valide"
-+
-+#: ../libnm-core/nm-setting-connection.c:1275
- #, 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:1201
-+#: ../libnm-core/nm-setting-connection.c:1290
- #, 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:1211
-+#: ../libnm-core/nm-setting-connection.c:1300
- #, c-format
- msgid ""
- "Detect a slave connection with '%s' set and a port type '%s'. '%s' should be "
- "set to '%s'"
- msgstr "Détecte une connexion esclave avec « %s » défini et un type de port « %s ». « %s » doit être défini sur « %s »"
-
--#: ../libnm-core/nm-setting-connection.c:1228
-+#: ../libnm-core/nm-setting-connection.c:1317
- #, 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:492
-+#: ../libnm-core/nm-setting-dcb.c:486
- msgid "flags invalid"
- msgstr "marqueurs non valides"
-
--#: ../libnm-core/nm-setting-dcb.c:501
-+#: ../libnm-core/nm-setting-dcb.c:495
- msgid "flags invalid - disabled"
- msgstr "marqueurs non valides - désactivé"
-
--#: ../libnm-core/nm-setting-dcb.c:527 ../libnm-core/nm-setting-dcb.c:576
-+#: ../libnm-core/nm-setting-dcb.c:521 ../libnm-core/nm-setting-dcb.c:570
- msgid "property invalid (not enabled)"
- msgstr "la propriété n'est pas valide (non activée)"
-
--#: ../libnm-core/nm-setting-dcb.c:536
-+#: ../libnm-core/nm-setting-dcb.c:530
- msgid "element invalid"
- msgstr "élément non valide"
-
--#: ../libnm-core/nm-setting-dcb.c:551
-+#: ../libnm-core/nm-setting-dcb.c:545
- msgid "sum not 100%"
- msgstr "la somme n'est pas à 100%"
-
--#: ../libnm-core/nm-setting-dcb.c:585 ../libnm-core/nm-setting-dcb.c:617
-+#: ../libnm-core/nm-setting-dcb.c:579 ../libnm-core/nm-setting-dcb.c:611
- msgid "property invalid"
- msgstr "propriété non valide"
-
--#: ../libnm-core/nm-setting-dcb.c:607
-+#: ../libnm-core/nm-setting-dcb.c:601
- msgid "property missing"
- msgstr "propriété manquante"
-
--#: ../libnm-core/nm-setting-ethtool.c:291
--msgid "unsupported offload feature"
--msgstr "fonctionnalité de déchargement non prise en charge"
-+#: ../libnm-core/nm-setting-ethtool.c:302
-+msgid "unsupported ethtool setting"
-+msgstr " configuration ethtool non prise en charge"
-
--#: ../libnm-core/nm-setting-ethtool.c:299
--msgid "offload feature has invalid variant type"
--msgstr "la fonctionnalité de déchargement a un type de variante non valide"
-+#: ../libnm-core/nm-setting-ethtool.c:311
-+msgid "setting has invalid variant type"
-+msgstr "le réglage a un type de variante non valide"
-
--#: ../libnm-core/nm-setting-ethtool.c:322
-+#: ../libnm-core/nm-setting-ethtool.c:323
-+msgid "coalesce option must be either 0 or 1"
-+msgstr "l'option coalesce doit correspondre à 0 ou 1"
-+
-+#: ../libnm-core/nm-setting-ethtool.c:348
- #, c-format
- msgid "unknown ethtool option '%s'"
- msgstr "option ethtool '%s' inconnue"
-
--#: ../libnm-core/nm-setting-gsm.c:302
-+#: ../libnm-core/nm-setting-gsm.c:296
- #, 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:334
-+#: ../libnm-core/nm-setting-gsm.c:328
- #, 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:361
-+#: ../libnm-core/nm-setting-gsm.c:355
- #, 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:372
-+#: ../libnm-core/nm-setting-gsm.c:366
- #, c-format
- msgid "'%s' is not a number"
- msgstr "« %s » n'est pas un numéro"
-
--#: ../libnm-core/nm-setting-gsm.c:406
-+#: ../libnm-core/nm-setting-gsm.c:400
- msgid "property is empty or wrong size"
- msgstr "la propriété est vide ou de la mauvaise taille"
-
--#: ../libnm-core/nm-setting-gsm.c:416
-+#: ../libnm-core/nm-setting-gsm.c:410
- msgid "property must contain only digits"
- msgstr "la propriété doit comprendre des chiffres uniquement"
-
--#: ../libnm-core/nm-setting-gsm.c:428
-+#: ../libnm-core/nm-setting-gsm.c:422
- msgid "can't be enabled when manual configuration is present"
- msgstr "ne peut pas être activé en présence d'une configuration manuelle"
-
--#: ../libnm-core/nm-setting-infiniband.c:193
-+#: ../libnm-core/nm-setting-infiniband.c:194
- 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:203
-+#: ../libnm-core/nm-setting-infiniband.c:204
- 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:241
-+#: ../libnm-core/nm-setting-infiniband.c:227
- #, c-format
- msgid ""
- "interface name of software infiniband device must be '%s' or unset (instead "
- "it is '%s')"
- msgstr "le nom d'interface du périphérique de logiciel infinisband doit correspondre à « %s » ou ne doit pas être défini (au lieu de « %s »)"
-
--#: ../libnm-core/nm-setting-infiniband.c:265
-+#: ../libnm-core/nm-setting-infiniband.c:250
- #, c-format
- msgid "mtu can be at most %u but it is %u"
- msgstr "mtu peut être %u au maximum but il est à %u"
-
--#: ../libnm-core/nm-setting-ip-config.c:120
-+#: ../libnm-core/nm-setting-ip-config.c:109
- #, c-format
- msgid "Missing IPv4 address"
- msgstr "adresse IPv4 manquante"
-
--#: ../libnm-core/nm-setting-ip-config.c:120
-+#: ../libnm-core/nm-setting-ip-config.c:109
- #, c-format
- msgid "Missing IPv6 address"
- msgstr "adresse IPv6 manquante"
-
--#: ../libnm-core/nm-setting-ip-config.c:125
-+#: ../libnm-core/nm-setting-ip-config.c:114
- #, c-format
- msgid "Invalid IPv4 address '%s'"
- msgstr "adresse IPv4 « %s » non valide"
-
--#: ../libnm-core/nm-setting-ip-config.c:125
-+#: ../libnm-core/nm-setting-ip-config.c:114
- #, c-format
- msgid "Invalid IPv6 address '%s'"
- msgstr "adresse IPv6 « %s » non valide"
-
--#: ../libnm-core/nm-setting-ip-config.c:140
-+#: ../libnm-core/nm-setting-ip-config.c:129
- #, c-format
- msgid "Invalid IPv4 address prefix '%u'"
- msgstr "préfixe d'adresse IPv4 « %u » non valide"
-
--#: ../libnm-core/nm-setting-ip-config.c:140
-+#: ../libnm-core/nm-setting-ip-config.c:129
- #, c-format
- msgid "Invalid IPv6 address prefix '%u'"
- msgstr "préfixe d'adresse IPv6 « %u » non valide"
-
--#: ../libnm-core/nm-setting-ip-config.c:155
-+#: ../libnm-core/nm-setting-ip-config.c:144
- #, c-format
- msgid "Invalid routing metric '%s'"
- msgstr "métrique de routage « %s » non valide"
-
--#: ../libnm-core/nm-setting-ip-config.c:1282
--#: ../libnm-core/nm-setting-sriov.c:409
-+#: ../libnm-core/nm-setting-ip-config.c:1272
-+#: ../libnm-core/nm-setting-sriov.c:413
- msgid "unknown attribute"
- msgstr "attribut inconnu"
-
--#: ../libnm-core/nm-setting-ip-config.c:1292
--#: ../libnm-core/nm-setting-sriov.c:419
-+#: ../libnm-core/nm-setting-ip-config.c:1282
-+#: ../libnm-core/nm-setting-sriov.c:423
- #, c-format
- msgid "invalid attribute type '%s'"
- msgstr "type d'attribut « %s » non valide"
-
--#: ../libnm-core/nm-setting-ip-config.c:1303
-+#: ../libnm-core/nm-setting-ip-config.c:1293
- #, 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:1304
-+#: ../libnm-core/nm-setting-ip-config.c:1294
- #, 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:1318
--#: ../libnm-core/nm-setting-ip-config.c:1346
-+#: ../libnm-core/nm-setting-ip-config.c:1308
-+#: ../libnm-core/nm-setting-ip-config.c:1336
- #, 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:1319
--#: ../libnm-core/nm-setting-ip-config.c:1347
-+#: ../libnm-core/nm-setting-ip-config.c:1309
-+#: ../libnm-core/nm-setting-ip-config.c:1337
- #, 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:1337
-+#: ../libnm-core/nm-setting-ip-config.c:1327
- #, c-format
- msgid "invalid prefix %s"
- msgstr "préfixe %s non valide"
-
--#: ../libnm-core/nm-setting-ip-config.c:2513
-+#: ../libnm-core/nm-setting-ip-config.c:1350
-+#, c-format
-+msgid "%s is not a valid route type"
-+msgstr "%s n'est pas un type d'itinéraire valable"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:1400
-+#, c-format
-+msgid "route scope is invalid"
-+msgstr "la portée de l'itinéraire n'est pas valable"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2541
- msgid "invalid priority"
- msgstr "priorité non valide"
-
--#: ../libnm-core/nm-setting-ip-config.c:2524
-+#: ../libnm-core/nm-setting-ip-config.c:2552
- msgid "missing table"
- msgstr "tableau manquant"
-
--#: ../libnm-core/nm-setting-ip-config.c:2530
-+#: ../libnm-core/nm-setting-ip-config.c:2558
- msgid "invalid action"
- msgstr "action non valide"
-
--#: ../libnm-core/nm-setting-ip-config.c:2537
-+#: ../libnm-core/nm-setting-ip-config.c:2565
- msgid "has from/src but the prefix-length is zero"
- msgstr "comprend « from/src » mais la longueur du préfixe est zéro"
-
--#: ../libnm-core/nm-setting-ip-config.c:2544
-+#: ../libnm-core/nm-setting-ip-config.c:2572
- msgid "missing from/src for a non zero prefix-length"
- msgstr "ne comprend pas « from/src » et la longueur du préfixe n'est pas zéro"
-
--#: ../libnm-core/nm-setting-ip-config.c:2549
-+#: ../libnm-core/nm-setting-ip-config.c:2577
- msgid "invalid from/src"
- msgstr "from/src non valide"
-
--#: ../libnm-core/nm-setting-ip-config.c:2554
-+#: ../libnm-core/nm-setting-ip-config.c:2582
- msgid "invalid prefix length for from/src"
- msgstr "longueur de préfixe non valide pour « from/src »"
-
--#: ../libnm-core/nm-setting-ip-config.c:2561
-+#: ../libnm-core/nm-setting-ip-config.c:2589
- msgid "has to/dst but the prefix-length is zero"
- msgstr "comprend « to/dst » mais la longueur du préfixe est zéro"
-
--#: ../libnm-core/nm-setting-ip-config.c:2568
-+#: ../libnm-core/nm-setting-ip-config.c:2596
- msgid "missing to/dst for a non zero prefix-length"
- msgstr "ne comprend pas « to/dst » et la longueur du préfixe n'est pas zéro"
-
--#: ../libnm-core/nm-setting-ip-config.c:2573
-+#: ../libnm-core/nm-setting-ip-config.c:2601
- msgid "invalid to/dst"
- msgstr "to/dst non valide"
-
--#: ../libnm-core/nm-setting-ip-config.c:2578
-+#: ../libnm-core/nm-setting-ip-config.c:2606
- msgid "invalid prefix length for to/dst"
- msgstr "longueur de préfixe non valide pour « to/dst »"
-
--#: ../libnm-core/nm-setting-ip-config.c:2586
-+#: ../libnm-core/nm-setting-ip-config.c:2614
- msgid "invalid iifname"
- msgstr "iifname non valide"
-
--#: ../libnm-core/nm-setting-ip-config.c:2594
-+#: ../libnm-core/nm-setting-ip-config.c:2622
- msgid "invalid oifname"
- msgstr "oifname non valide"
-
--#: ../libnm-core/nm-setting-ip-config.c:2600
-+#: ../libnm-core/nm-setting-ip-config.c:2628
- msgid "invalid source port range"
- msgstr "Plage de ports source non valide"
-
--#: ../libnm-core/nm-setting-ip-config.c:2606
-+#: ../libnm-core/nm-setting-ip-config.c:2634
- msgid "invalid destination port range"
- msgstr "Plage de ports de destination non valides"
-
--#: ../libnm-core/nm-setting-ip-config.c:2614
-+#: ../libnm-core/nm-setting-ip-config.c:2642
- msgid "suppress_prefixlength out of range"
- msgstr "suppress_prefixlength hors de portée"
-
--#: ../libnm-core/nm-setting-ip-config.c:2619
-+#: ../libnm-core/nm-setting-ip-config.c:2647
- msgid "suppress_prefixlength is only allowed with the to-table action"
- msgstr "suppress_prefixlength n'est permis qu'avec l'action to-table"
-
--#: ../libnm-core/nm-setting-ip-config.c:2726
-+#: ../libnm-core/nm-setting-ip-config.c:2754
- #, c-format
- msgid "duplicate key %s"
- msgstr "clé dupliquée %s"
-
--#: ../libnm-core/nm-setting-ip-config.c:2740
-+#: ../libnm-core/nm-setting-ip-config.c:2768
- #, c-format
- msgid "invalid key \"%s\""
- msgstr "clé non valide « %s »"
-
--#: ../libnm-core/nm-setting-ip-config.c:2753
-+#: ../libnm-core/nm-setting-ip-config.c:2781
- #, c-format
- msgid "invalid variant type '%s' for \"%s\""
- msgstr "type de variante '%s' pour \"%s\" non valide"
-
--#: ../libnm-core/nm-setting-ip-config.c:2762
-+#: ../libnm-core/nm-setting-ip-config.c:2790
- msgid "missing \""
- msgstr "manquant \""
-
--#: ../libnm-core/nm-setting-ip-config.c:2768
-+#: ../libnm-core/nm-setting-ip-config.c:2796
- msgid "invalid \""
- msgstr "non valid \""
-
--#: ../libnm-core/nm-setting-ip-config.c:2965
-+#: ../libnm-core/nm-setting-ip-config.c:2993
- msgid "Unsupported to-string-flags argument"
- msgstr "Argument to-string-flag non pris en charge"
-
--#: ../libnm-core/nm-setting-ip-config.c:2972
-+#: ../libnm-core/nm-setting-ip-config.c:3000
- msgid "Unsupported extra-argument"
- msgstr "extra-argument non pris en charge"
-
--#: ../libnm-core/nm-setting-ip-config.c:3239
-+#: ../libnm-core/nm-setting-ip-config.c:3267
- #, c-format
- msgid "unsupported key \"%s\""
- msgstr "clé « %s » non prise en charge"
-
--#: ../libnm-core/nm-setting-ip-config.c:3244
-+#: ../libnm-core/nm-setting-ip-config.c:3272
- #, c-format
- msgid "duplicate key \"%s\""
- msgstr "clé « %s » dupliquée"
-
--#: ../libnm-core/nm-setting-ip-config.c:3249
-+#: ../libnm-core/nm-setting-ip-config.c:3277
- #, c-format
- msgid "invalid value for \"%s\""
- msgstr "valeur de « %s » non valide"
-
--#: ../libnm-core/nm-setting-ip-config.c:3259
-+#: ../libnm-core/nm-setting-ip-config.c:3287
- msgid "empty text does not describe a rule"
- msgstr "texte vide qui ne décrit pas de règle"
-
--#: ../libnm-core/nm-setting-ip-config.c:3265
-+#: ../libnm-core/nm-setting-ip-config.c:3293
- #, c-format
- msgid "missing argument for \"%s\""
- msgstr "argument manquant pour « %s »"
-
--#: ../libnm-core/nm-setting-ip-config.c:3277
-+#: ../libnm-core/nm-setting-ip-config.c:3305
- msgid "invalid \"from\" part"
- msgstr "partie « from » non valide"
-
--#: ../libnm-core/nm-setting-ip-config.c:3291
-+#: ../libnm-core/nm-setting-ip-config.c:3319
- msgid "invalid \"to\" part"
- msgstr "parie « to » non valide"
-
--#: ../libnm-core/nm-setting-ip-config.c:3300
-+#: ../libnm-core/nm-setting-ip-config.c:3328
- #, c-format
- msgid "cannot detect address family for rule"
- msgstr "impossible de détecter la famille d'adresses pour la règle"
-
--#: ../libnm-core/nm-setting-ip-config.c:3360
--#: ../libnm-core/nm-setting-ip-config.c:3454
-+#: ../libnm-core/nm-setting-ip-config.c:3388
-+#: ../libnm-core/nm-setting-ip-config.c:3482
- #, c-format
- msgid "rule is invalid: %s"
- msgstr "règle suivante non valide : %s"
-
--#: ../libnm-core/nm-setting-ip-config.c:3437
-+#: ../libnm-core/nm-setting-ip-config.c:3465
- msgid "invalid address family"
- msgstr "famille d'adresses non valide"
-
--#: ../libnm-core/nm-setting-ip-config.c:4710
-+#: ../libnm-core/nm-setting-ip-config.c:4738
- #, c-format
- msgid "rule #%u is invalid: %s"
- msgstr "règle #%u non valide : %s"
-
--#: ../libnm-core/nm-setting-ip-config.c:4966
-+#: ../libnm-core/nm-setting-ip-config.c:4994
- #, 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:4982
-+#: ../libnm-core/nm-setting-ip-config.c:5010
- #, c-format
- msgid "%d. IP address is invalid"
- msgstr "%d. L'adresse IP n'est pas valide"
-
--#: ../libnm-core/nm-setting-ip-config.c:4994
-+#: ../libnm-core/nm-setting-ip-config.c:5022
- #, 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:5003
-+#: ../libnm-core/nm-setting-ip-config.c:5031
- #, 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:5017
-+#: ../libnm-core/nm-setting-ip-config.c:5045
- 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:5026
-+#: ../libnm-core/nm-setting-ip-config.c:5054
- msgid "gateway is invalid"
- msgstr "la passerelle n'est pas valide"
-
--#: ../libnm-core/nm-setting-ip-config.c:5040
-+#: ../libnm-core/nm-setting-ip-config.c:5069
- #, c-format
- msgid "%d. route is invalid"
- msgstr "%d. La route n'est pas valide"
-
--#: ../libnm-core/nm-setting-ip-config.c:5056
-+#: ../libnm-core/nm-setting-ip-config.c:5079
-+#, c-format
-+msgid "invalid attribute: %s"
-+msgstr "attribut : « %s » non valide"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:5098
- #, c-format
- msgid "%u. rule has wrong address-family"
- msgstr "la règle %u. a une mauvaise address-family"
-
--#: ../libnm-core/nm-setting-ip-config.c:5065
-+#: ../libnm-core/nm-setting-ip-config.c:5107
- #, c-format
- msgid "%u. rule is invalid: %s"
- msgstr "la règle %u. est non valide : %s"
-
--#: ../libnm-core/nm-setting-ip-config.c:5079
-+#: ../libnm-core/nm-setting-ip-config.c:5121
- #, c-format
- msgid "'%s' is not a valid IAID"
- msgstr "« %s » n’est pas un IAID valide"
-
--#: ../libnm-core/nm-setting-ip-config.c:5093
-+#: ../libnm-core/nm-setting-ip-config.c:5135
- #, c-format
- msgid "the property cannot be set when '%s' is disabled"
- msgstr "la propriété ne peut pas être définie lorsque «%s» est désactivé"
-
--#: ../libnm-core/nm-setting-ip-config.c:5115
-+#: ../libnm-core/nm-setting-ip-config.c:5157
- #, c-format
- msgid "a gateway is incompatible with '%s'"
- msgstr "une passerelle n'est pas compatible avec « %s »"
-
--#: ../libnm-core/nm-setting-ip-tunnel.c:325
-+#: ../libnm-core/nm-setting-ip-tunnel.c:333
- #, 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:348
--#: ../libnm-core/nm-setting-ip-tunnel.c:368
-+#: ../libnm-core/nm-setting-ip-tunnel.c:356
-+#: ../libnm-core/nm-setting-ip-tunnel.c:376
- #, 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:385
-+#: ../libnm-core/nm-setting-ip-tunnel.c:393
- 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:398
--#: ../libnm-core/nm-setting-ip-tunnel.c:414
-+#: ../libnm-core/nm-setting-ip-tunnel.c:406
-+#: ../libnm-core/nm-setting-ip-tunnel.c:422
- #, 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:426
-+#: ../libnm-core/nm-setting-ip-tunnel.c:434
- 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:439
-+#: ../libnm-core/nm-setting-ip-tunnel.c:447
- #, c-format
- msgid "some flags are invalid for the select mode: %s"
- msgstr "certains marqueurs ne sont pas valides pour le mode select : %s"
-
--#: ../libnm-core/nm-setting-ip-tunnel.c:453
-+#: ../libnm-core/nm-setting-ip-tunnel.c:459
- #, 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:112
--#: ../libnm-core/nm-setting-ip6-config.c:159
-+#: ../libnm-core/nm-setting-ip6-config.c:178
- #, c-format
- msgid "this property cannot be empty for '%s=%s'"
- msgstr "cette propriété ne peut pas demeurer vide pour « %s=%s »"
-@@ -10751,9 +11146,9 @@ msgstr "cette propriété ne peut pas demeurer vide pour « %s=%s »"
- #: ../libnm-core/nm-setting-ip4-config.c:124
- #: ../libnm-core/nm-setting-ip4-config.c:134
- #: ../libnm-core/nm-setting-ip4-config.c:146
--#: ../libnm-core/nm-setting-ip6-config.c:174
--#: ../libnm-core/nm-setting-ip6-config.c:184
--#: ../libnm-core/nm-setting-ip6-config.c:194
-+#: ../libnm-core/nm-setting-ip6-config.c:193
-+#: ../libnm-core/nm-setting-ip6-config.c:203
-+#: ../libnm-core/nm-setting-ip6-config.c:213
- #, c-format
- msgid "this property is not allowed for '%s=%s'"
- msgstr "cette propriété n'est pas autorisée pour « %s=%s »"
-@@ -10780,23 +11175,23 @@ msgstr "adresses multiples non autorisé pour « %s=%s »"
- 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:233
-+#: ../libnm-core/nm-setting-ip6-config.c:252
- msgid "value is not a valid token"
- msgstr "la valeur ne correspond pas à un jeton valide"
-
--#: ../libnm-core/nm-setting-ip6-config.c:244
-+#: ../libnm-core/nm-setting-ip6-config.c:263
- 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:255
-+#: ../libnm-core/nm-setting-ip6-config.c:274
- msgid "invalid DUID"
- msgstr "DUID non valide"
-
--#: ../libnm-core/nm-setting-ip6-config.c:267
-+#: ../libnm-core/nm-setting-ip6-config.c:286
- msgid "token is not in canonical form"
- msgstr "le jeton n'est pas dans une forme canonique"
-
--#: ../libnm-core/nm-setting-ip6-config.c:280
-+#: ../libnm-core/nm-setting-ip6-config.c:299
- msgid "property should be TRUE when method is set to ignore or disabled"
- msgstr "la propriété doit être sur TRUE lorsque la méthode est définie sur ignore ou désactivée"
-
-@@ -10841,13 +11236,19 @@ msgstr "uniquement valide en mode psk"
- 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-match.c:738 ../libnm-core/nm-setting-match.c:752
-+#: ../libnm-core/nm-setting-match.c:766 ../libnm-core/nm-setting-match.c:780
-+#, c-format
-+msgid "is empty"
-+msgstr "est vide"
-+
- #: ../libnm-core/nm-setting-olpc-mesh.c:94
--#: ../libnm-core/nm-setting-wireless.c:769
-+#: ../libnm-core/nm-setting-wireless.c:774
- 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:103
--#: ../libnm-core/nm-setting-wireless.c:809
-+#: ../libnm-core/nm-setting-wireless.c:814
- #, c-format
- msgid "'%d' is not a valid channel"
- msgstr "« %d » n'est pas un canal valide"
-@@ -10862,70 +11263,65 @@ msgstr "Une connexion avec une configuration '%s' doit avoir un master."
- msgid "'%s' is not allowed in fail_mode"
- msgstr "'%s' n'est pas autorisé en fail_mode"
-
--#: ../libnm-core/nm-setting-ovs-interface.c:94
-+#: ../libnm-core/nm-setting-ovs-interface.c:96
- #, c-format
- msgid "'%s' is not a valid interface type"
- msgstr "« %s » n'est pas un nom d'interface valide"
-
--#: ../libnm-core/nm-setting-ovs-interface.c:116
-+#: ../libnm-core/nm-setting-ovs-interface.c:120
- #, c-format
- msgid "A connection with a '%s' setting needs connection.type explicitly set"
- msgstr "Une connexion avec un paramètre '%s' nécessite connection.type explicitement défini"
-
--#: ../libnm-core/nm-setting-ovs-interface.c:128
-+#: ../libnm-core/nm-setting-ovs-interface.c:132
- #, c-format
- msgid "A connection of type '%s' cannot have ovs-interface.type \"system\""
- msgstr "Une connexion de type '%s' ne peut pas avoir une interface ovs-interface.type \"system\""
-
--#: ../libnm-core/nm-setting-ovs-interface.c:140
-+#: ../libnm-core/nm-setting-ovs-interface.c:144
- #, c-format
- msgid "A connection of type '%s' cannot have an ovs-interface.type \"%s\""
- msgstr "Une connexion de type '%s' ne peut pas avoir une interface ovs-interface.type \"%s\""
-
--#: ../libnm-core/nm-setting-ovs-interface.c:159
-+#: ../libnm-core/nm-setting-ovs-interface.c:163
- #, c-format
- msgid "A connection can not have both '%s' and '%s' settings at the same time"
- msgstr "Une connexion peut avoir à la fois '%s' et '%s' en même temps"
-
--#: ../libnm-core/nm-setting-ovs-interface.c:173
-+#: ../libnm-core/nm-setting-ovs-interface.c:177
- #, c-format
- msgid ""
- "A connection with '%s' setting must be of connection.type \"ovs-interface\" "
- "but is \"%s\""
- msgstr "Une connexion de type '%s' doit avoir connection.type \"ovs-interface\" mais est \"%s\""
-
--#: ../libnm-core/nm-setting-ovs-interface.c:185
-+#: ../libnm-core/nm-setting-ovs-interface.c:189
- #, c-format
- msgid ""
- "A connection with '%s' setting needs to be of '%s' interface type, not '%s'"
- msgstr "Une connexion de type '%s' doit être de type d’interface '%s' et non '%s'"
-
--#: ../libnm-core/nm-setting-ovs-interface.c:201
-+#: ../libnm-core/nm-setting-ovs-interface.c:206
- #, c-format
- msgid "A connection with ovs-interface.type '%s' setting a 'ovs-patch' setting"
- msgstr "Une connexion avec ovs-interface.type '%s' configurant 'ovs-patch'"
-
--#: ../libnm-core/nm-setting-ovs-interface.c:221
-+#: ../libnm-core/nm-setting-ovs-interface.c:231
- #, c-format
- msgid "Missing ovs interface setting"
- msgstr "Réglage de l'interface ovs manquante"
-
--#: ../libnm-core/nm-setting-ovs-interface.c:227
-+#: ../libnm-core/nm-setting-ovs-interface.c:237
- #, c-format
- msgid "Missing ovs interface type"
- msgstr "Type d’interface ovs manquant"
-
--#: ../libnm-core/nm-setting-ovs-interface.c:268
-+#: ../libnm-core/nm-setting-ovs-interface.c:278
- #: ../libnm-core/nm-setting-ovs-port.c:181
- #, c-format
- msgid "A connection with a '%s' setting must have a master."
- msgstr "Une connexion avec une configuration '%s' doit avoir un master."
-
--#: ../libnm-core/nm-setting-ovs-patch.c:89 ../libnm-core/nm-setting-vxlan.c:338
--#, c-format
--msgid "'%s' is not a valid IP address"
--msgstr "« %s » n'est pas une adresse IP valide"
--
- #: ../libnm-core/nm-setting-ovs-port.c:206
- #, c-format
- msgid "'%s' is not allowed in vlan_mode"
-@@ -10956,47 +11352,47 @@ msgstr "’%d’ est hors de la portée valide <128-16384>"
- 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:132
-+#: ../libnm-core/nm-setting-proxy.c:129
- #, c-format
- msgid "invalid proxy method"
- msgstr "méthode de proxy invalide"
-
--#: ../libnm-core/nm-setting-proxy.c:142 ../libnm-core/nm-setting-proxy.c:151
-+#: ../libnm-core/nm-setting-proxy.c:139 ../libnm-core/nm-setting-proxy.c:148
- #, 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:162
-+#: ../libnm-core/nm-setting-proxy.c:159
- #, c-format
- msgid "the script is too large"
- msgstr "ce script est trop grand"
-
--#: ../libnm-core/nm-setting-proxy.c:170
-+#: ../libnm-core/nm-setting-proxy.c:167
- #, c-format
- msgid "the script is not valid utf8"
- msgstr "le script n'est pas valide utf8"
-
--#: ../libnm-core/nm-setting-proxy.c:178
-+#: ../libnm-core/nm-setting-proxy.c:175
- #, c-format
- msgid "the script lacks FindProxyForURL function"
- msgstr "il manque à ce script la fonction FindProxyForURL"
-
--#: ../libnm-core/nm-setting-sriov.c:1066
-+#: ../libnm-core/nm-setting-sriov.c:1070
- #, c-format
- msgid "VF with index %u, but the total number of VFs is %u"
- msgstr "VF avec index %u, mais le nombre total de VF est %u"
-
--#: ../libnm-core/nm-setting-sriov.c:1077
-+#: ../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:1089
-+#: ../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:1110
-+#: ../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"
-@@ -11136,36 +11532,40 @@ msgstr "les marqueurs ne sont pas valides"
- 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:546
-+#: ../libnm-core/nm-setting-vrf.c:75
-+msgid "table cannot be zero"
-+msgstr "La taille ne peut pas être nulle"
-+
-+#: ../libnm-core/nm-setting-vpn.c:581
- 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:567
--#, c-format
--msgid "secret was empty"
--msgstr "secret vide"
--
--#: ../libnm-core/nm-setting-vpn.c:597
-+#: ../libnm-core/nm-setting-vpn.c:626
- msgid "setting contained a secret with an empty name"
- msgstr "configuration contenant un secret avec un nom vide"
-
--#: ../libnm-core/nm-setting-vpn.c:605
--#, c-format
--msgid "secret value was empty"
--msgstr "valeur de secret vide"
--
--#: ../libnm-core/nm-setting-vpn.c:652 ../libnm-core/nm-setting.c:2124
-+#: ../libnm-core/nm-setting-vpn.c:666 ../libnm-core/nm-setting.c:2138
- msgid "not a secret property"
- msgstr "ne correspond pas à une propriété secrète"
-
--#: ../libnm-core/nm-setting-vpn.c:658
-+#: ../libnm-core/nm-setting-vpn.c:672
- msgid "secret is not of correct type"
- msgstr "secret de type erroné"
-
--#: ../libnm-core/nm-setting-vpn.c:742
-+#: ../libnm-core/nm-setting-vpn.c:749 ../libnm-core/nm-setting-vpn.c:798
-+#, c-format
-+msgid "secret name cannot be empty"
-+msgstr "le nom de secret ne peut pas être vide"
-+
-+#: ../libnm-core/nm-setting-vpn.c:765
- msgid "secret flags property not found"
- msgstr "la propriété des marqueurs secrets n'a pas été trouvée"
-
-+#: ../libnm-core/nm-setting-vxlan.c:338
-+#, c-format
-+msgid "'%s' is not a valid IP address"
-+msgstr "« %s » n'est pas une adresse IP valide"
-+
- #: ../libnm-core/nm-setting-vxlan.c:351
- #, c-format
- msgid "'%s' is not a valid IP%c address"
-@@ -11281,71 +11681,71 @@ msgstr "l'homologue #%u n'a pas de clé publique"
- msgid "non-existing peer '%s'"
- msgstr "l'homologue « %s » n'existe pas"
-
--#: ../libnm-core/nm-setting-wireless-security.c:913
-+#: ../libnm-core/nm-setting-wireless-security.c:905
- #, c-format
- msgid "'%s' is not a valid value for '%s' mode connections"
- msgstr "« %s » n'est pas une valeur valide pour les connexions de type « %s »"
-
--#: ../libnm-core/nm-setting-wireless-security.c:936
-+#: ../libnm-core/nm-setting-wireless-security.c:928
- #, c-format
- msgid "'%s' security requires '%s=%s'"
- msgstr "la sécurité « %s » requiert « %s=%s »"
-
--#: ../libnm-core/nm-setting-wireless-security.c:957
-+#: ../libnm-core/nm-setting-wireless-security.c:949
- #, 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:978
-+#: ../libnm-core/nm-setting-wireless-security.c:970
- #, 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:1037
-+#: ../libnm-core/nm-setting-wireless-security.c:1029
- #, 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:1061
-+#: ../libnm-core/nm-setting-wireless-security.c:1053
- #, c-format
- msgid ""
- "'%s' can only be used with 'wpa-eap', 'wpa-psk' or 'sae' key management "
- msgstr "« %s » ne peut pas être utilisé avec les clés de gestion 'wpa-eap', 'wpa-psk', et 'sae' "
-
--#: ../libnm-core/nm-setting-wireless.c:778
-+#: ../libnm-core/nm-setting-wireless.c:783
- #, 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:788
-+#: ../libnm-core/nm-setting-wireless.c:793
- #, c-format
- msgid "'%s' is not a valid band"
- msgstr "« %s » n'est pas une bande valide"
-
--#: ../libnm-core/nm-setting-wireless.c:798
-+#: ../libnm-core/nm-setting-wireless.c:803
- #, c-format
- msgid "'%s' requires setting '%s' property"
- msgstr "« %s » requiert de paramétrer la propriété « %s »"
-
--#: ../libnm-core/nm-setting-wireless.c:820
-+#: ../libnm-core/nm-setting-wireless.c:825
- #, c-format
- msgid "'%s' requires '%s' and '%s' property"
- msgstr "« %s » requiert « %s » et la propriété « %s »"
-
--#: ../libnm-core/nm-setting-wireless.c:907 ../libnm-core/nm-team-utils.c:1990
-+#: ../libnm-core/nm-setting-wireless.c:912 ../libnm-core/nm-team-utils.c:1990
- #, c-format
- msgid "invalid value"
- msgstr "valeur non valide"
-
--#: ../libnm-core/nm-setting-wireless.c:917
-+#: ../libnm-core/nm-setting-wireless.c:922
- 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:926
-+#: ../libnm-core/nm-setting-wireless.c:931
- msgid "Wake-on-WLAN trying to set unknown flag"
- msgstr "Wake-on-WLAN essaye d'activer un marqueur inconnu"
-
--#: ../libnm-core/nm-setting-wireless.c:948
-+#: ../libnm-core/nm-setting-wireless.c:953
- #, 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"
-@@ -11364,32 +11764,32 @@ msgstr "page doit être entre %d et %d"
- msgid "channel must not be between %d and %d"
- msgstr "canal ne doit pas être entre %d et %d"
-
--#: ../libnm-core/nm-setting.c:806
-+#: ../libnm-core/nm-setting.c:809
- #, c-format
- msgid "duplicate property"
- msgstr "dupliquer la propriété"
-
--#: ../libnm-core/nm-setting.c:829
-+#: ../libnm-core/nm-setting.c:832
- #, c-format
- msgid "unknown property"
- msgstr "propriété inconnue"
-
--#: ../libnm-core/nm-setting.c:900 ../libnm-core/nm-setting.c:949
-+#: ../libnm-core/nm-setting.c:914 ../libnm-core/nm-setting.c:963
- #, 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:934
-+#: ../libnm-core/nm-setting.c:933 ../libnm-core/nm-setting.c:948
- #, c-format
- msgid "failed to set property: %s"
- msgstr "n'a pas pu définir la propriété : %s"
-
--#: ../libnm-core/nm-setting.c:964
-+#: ../libnm-core/nm-setting.c:978
- #, c-format
- msgid "can not set property: %s"
- msgstr "n'a pas pu définir la propriété : %s"
-
--#: ../libnm-core/nm-setting.c:2015
-+#: ../libnm-core/nm-setting.c:2029
- msgid "secret not found"
- msgstr "secret non trouvé"
-
-@@ -11454,7 +11854,7 @@ msgid "team config is not valid UTF-8"
- msgstr "la configuration de l'équipe n'est pas un UTF-8 valide"
-
- #: ../libnm-core/nm-team-utils.c:2104
--#: ../src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c:9025
-+#: ../src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c:9088
- #, c-format
- msgid "invalid json"
- msgstr "json non valide"
-@@ -11469,236 +11869,226 @@ msgstr "type de D-Bus non valide : « %s »"
- msgid "invalid link-watchers: %s"
- msgstr "observateurs de liens non valide : %s"
-
--#: ../libnm-core/nm-utils.c:2330
-+#: ../libnm-core/nm-utils.c:2298
- #, c-format
- msgid "'%s' is not a valid handle."
- msgstr "« %s » n'est pas un handle valide"
-
--#: ../libnm-core/nm-utils.c:2458
-+#: ../libnm-core/nm-utils.c:2446
- #, c-format
- msgid "'%s' unexpected: parent already specified."
- msgstr "« %s » inattendu : parent déjà spécifié."
-
--#: ../libnm-core/nm-utils.c:2474
-+#: ../libnm-core/nm-utils.c:2462
- #, c-format
- msgid "invalid handle: '%s'"
- msgstr "action non valide : '%s'"
-
--#: ../libnm-core/nm-utils.c:2496
-+#: ../libnm-core/nm-utils.c:2484
- msgid "parent not specified."
- msgstr "parent non spécifié"
-
--#: ../libnm-core/nm-utils.c:2558
-+#: ../libnm-core/nm-utils.c:2546
- #, c-format
- msgid "unsupported qdisc option: '%s'."
--msgstr "attribut « %s » de type « » non supporté"
-+msgstr "option « %s » qdisc non supportée"
-
--#: ../libnm-core/nm-utils.c:2680
-+#: ../libnm-core/nm-utils.c:2668
- msgid "action name missing."
- msgstr "nom de l'action manquant"
-
--#: ../libnm-core/nm-utils.c:2706
-+#: ../libnm-core/nm-utils.c:2694
- #, c-format
- msgid "unsupported action option: '%s'."
--msgstr "attribut « %s » de type « » non supporté"
-+msgstr "option « %s » d’action non supportée"
-
--#: ../libnm-core/nm-utils.c:2844
-+#: ../libnm-core/nm-utils.c:2832
- msgid "invalid action: "
- msgstr "option « » non valide : "
-
--#: ../libnm-core/nm-utils.c:2848
-+#: ../libnm-core/nm-utils.c:2836
- #, c-format
- msgid "unsupported tfilter option: '%s'."
--msgstr "attribut « %s » de type « » non supporté"
-+msgstr "option « %s » de tfilter non supportée"
-
--#: ../libnm-core/nm-utils.c:3449
-+#: ../libnm-core/nm-utils.c:3437
- #, c-format
- msgid "failed stat file %s: %s"
- msgstr "échec fichier stat %s: %s"
-
--#: ../libnm-core/nm-utils.c:3458
-+#: ../libnm-core/nm-utils.c:3446
- #, c-format
- msgid "not a file (%s)"
- msgstr "pas un fichier (%s)"
-
--#: ../libnm-core/nm-utils.c:3469
-+#: ../libnm-core/nm-utils.c:3457
- #, c-format
- msgid "invalid file owner %d for %s"
- msgstr "propriétaire de fichier non valide %d pour %s"
-
--#: ../libnm-core/nm-utils.c:3480
-+#: ../libnm-core/nm-utils.c:3468
- #, c-format
- msgid "file permissions for %s"
- msgstr "permissions de fichier pour %s"
-
--#: ../libnm-core/nm-utils.c:3490
-+#: ../libnm-core/nm-utils.c:3478
- #, c-format
- msgid "reject %s"
- msgstr "rejète %s"
-
--#: ../libnm-core/nm-utils.c:3509
-+#: ../libnm-core/nm-utils.c:3497
- #, c-format
- msgid "path is not absolute (%s)"
- msgstr "le chemin n'est pas absolu (%s)"
-
--#: ../libnm-core/nm-utils.c:3523
-+#: ../libnm-core/nm-utils.c:3511
- #, c-format
- msgid "Plugin file does not exist (%s)"
- msgstr "le fichier de greffon n'existe pas (%s)"
-
--#: ../libnm-core/nm-utils.c:3531
-+#: ../libnm-core/nm-utils.c:3519
- #, 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:3541
-+#: ../libnm-core/nm-utils.c:3529
- #, 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:3623
-+#: ../libnm-core/nm-utils.c:3611
- #, c-format
- msgid "Could not find \"%s\" binary"
- msgstr "N'a pas pu trouver le binaire « %s »"
-
--#: ../libnm-core/nm-utils.c:4517
-+#: ../libnm-core/nm-utils.c:4547
- msgid "unknown secret flags"
- msgstr "marqueurs de secret inconnus"
-
--#: ../libnm-core/nm-utils.c:4527
-+#: ../libnm-core/nm-utils.c:4557
- msgid "conflicting secret flags"
- msgstr "marqueurs de secret conflictueux"
-
--#: ../libnm-core/nm-utils.c:4538
-+#: ../libnm-core/nm-utils.c:4568
- msgid "secret flags must not be \"not-required\""
- msgstr "les marqueurs de secret non doivent pas être «non-requis»"
-
--#: ../libnm-core/nm-utils.c:4546
-+#: ../libnm-core/nm-utils.c:4576
- msgid "unsupported secret flags"
- msgstr "marqueurs de secret non pris en charge"
-
--#: ../libnm-core/nm-utils.c:4576
-+#: ../libnm-core/nm-utils.c:4606
- msgid "can't be simultaneously disabled and enabled"
- msgstr "ne peut pas être simultanément désactivé et activé"
-
--#: ../libnm-core/nm-utils.c:4584
-+#: ../libnm-core/nm-utils.c:4614
- msgid "WPS is required"
- msgstr "WPS requis"
-
--#: ../libnm-core/nm-utils.c:4650
-+#: ../libnm-core/nm-utils.c:4680
- #, 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:4665
-+#: ../libnm-core/nm-utils.c:4695
- #, 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:4725
--msgid "interface name is missing"
--msgstr "le nom d'interface est manquant"
--
--#: ../libnm-core/nm-utils.c:4731
--msgid "interface name is too short"
--msgstr "le nom de l'interface est trop court"
--
--#: ../libnm-core/nm-utils.c:4740
--msgid "interface name is reserved"
--msgstr "le nom d'interface est réservé"
--
--#: ../libnm-core/nm-utils.c:4752
--msgid "interface name contains an invalid character"
--msgstr "le nom de l'interface contient un caractère invalide"
--
--#: ../libnm-core/nm-utils.c:4758
--msgid "interface name is longer than 15 characters"
--msgstr "le nom de l'interface fait plus de 15 caractères"
--
--#: ../libnm-core/nm-utils.c:5425
-+#: ../libnm-core/nm-utils.c:5390
- msgid "not valid utf-8"
- msgstr "utf-8 invalide"
-
--#: ../libnm-core/nm-utils.c:5446 ../libnm-core/nm-utils.c:5499
-+#: ../libnm-core/nm-utils.c:5411 ../libnm-core/nm-utils.c:5464
- msgid "is not a JSON object"
- msgstr "n'est pas un objet JSON"
-
--#: ../libnm-core/nm-utils.c:5475 ../libnm-core/nm-utils.c:5512
-+#: ../libnm-core/nm-utils.c:5440 ../libnm-core/nm-utils.c:5477
- msgid "value is NULL"
- msgstr "la valeur est NULL"
-
--#: ../libnm-core/nm-utils.c:5475 ../libnm-core/nm-utils.c:5512
-+#: ../libnm-core/nm-utils.c:5440 ../libnm-core/nm-utils.c:5477
- msgid "value is empty"
- msgstr "la valeur est vide"
-
--#: ../libnm-core/nm-utils.c:5487
-+#: ../libnm-core/nm-utils.c:5452
- #, c-format
- msgid "invalid JSON at position %d (%s)"
- msgstr "JSON invalide à la position %d (%s)"
-
--#: ../libnm-core/nm-utils.c:5649 ../libnm-core/nm-utils.c:5669
-+#: ../libnm-core/nm-utils.c:5597 ../libnm-core/nm-utils.c:5617
- msgid "unterminated escape sequence"
- msgstr "séquence d'échappement no terminée"
-
--#: ../libnm-core/nm-utils.c:5694
-+#: ../libnm-core/nm-utils.c:5642
- #, c-format
- msgid "unknown attribute '%s'"
- msgstr "attribut inconnu « %s »"
-
--#: ../libnm-core/nm-utils.c:5709
-+#: ../libnm-core/nm-utils.c:5657
- #, 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:5725
-+#: ../libnm-core/nm-utils.c:5673
- #, c-format
- msgid "invalid uint32 value '%s' for attribute '%s'"
- msgstr "valeur « %s » uint32 invalide pour l'attribut « %s »"
-
--#: ../libnm-core/nm-utils.c:5734
-+#: ../libnm-core/nm-utils.c:5682
-+#, c-format
-+msgid "invalid int32 value '%s' for attribute '%s'"
-+msgstr "valeur « %s » int32 invalide pour l'attribut « %s »"
-+
-+#: ../libnm-core/nm-utils.c:5691
-+#, c-format
-+msgid "invalid uint64 value '%s' for attribute '%s'"
-+msgstr "valeur « %s » uint64 invalide pour l'attribut « %s »"
-+
-+#: ../libnm-core/nm-utils.c:5700
- #, c-format
- msgid "invalid uint8 value '%s' for attribute '%s'"
- msgstr "valeur « %s » uint8 invalide pour l'attribut « %s »"
-
--#: ../libnm-core/nm-utils.c:5744
-+#: ../libnm-core/nm-utils.c:5710
- #, 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:5754
-+#: ../libnm-core/nm-utils.c:5720
- #, c-format
- msgid "unsupported attribute '%s' of type '%s'"
- msgstr "attribut « %s » de type « %s » non supporté"
-
--#: ../libnm-core/nm-utils.c:6119
-+#: ../libnm-core/nm-utils.c:6020
- #, c-format
- msgid "Bridge VLANs %d and %d are not sorted by ascending vid"
- msgstr "Les VLAN %d et %d ne sont pas ordonnancés par vid ascendant"
-
--#: ../libnm-core/nm-utils.c:6143
-+#: ../libnm-core/nm-utils.c:6044
- #, c-format
- msgid "duplicate bridge VLAN vid %u"
- msgstr "VLAN vid %u de pontage dupliqué"
-
--#: ../libnm-core/nm-utils.c:6155
-+#: ../libnm-core/nm-utils.c:6056
- msgid "only one VLAN can be the PVID"
- msgstr "un VLAN uniquement peut correspondre au PVID"
-
--#: ../libnm-core/nm-utils.c:6205
-+#: ../libnm-core/nm-utils.c:6106
- #, c-format
- msgid "unknown flags 0x%x"
- msgstr "drapeaux inconnus 0x%x"
-
--#: ../libnm-core/nm-utils.c:6215
-+#: ../libnm-core/nm-utils.c:6116
- msgid ""
- "'fqdn-no-update' and 'fqdn-serv-update' flags cannot be set at the same time"
- msgstr "Les indicateurs \"fqdn-no-update\" et \"fqdn-serv-update\" ne peuvent pas être activés en même temps"
-
--#: ../libnm-core/nm-utils.c:6226
-+#: ../libnm-core/nm-utils.c:6127
- msgid "'fqdn-clear-flags' flag is incompatible with other FQDN flags"
- msgstr "Le drapeau 'fqdn-clear-flags' est incompatible avec les autres drapeaux FQDN"
-
--#: ../libnm-core/nm-utils.c:6235
-+#: ../libnm-core/nm-utils.c:6136
- msgid "DHCPv6 does not support the E (encoded) FQDN flag"
- msgstr "DHCPv6 ne prend pas en charge l'indicateur FQDN E (encodé)"
-
-@@ -11737,59 +12127,59 @@ 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:93
-+#: ../libnm-core/nm-vpn-plugin-info.c:111
- #, c-format
- msgid "missing filename"
- msgstr "nom de fichier manquant"
-
--#: ../libnm-core/nm-vpn-plugin-info.c:101
-+#: ../libnm-core/nm-vpn-plugin-info.c:119
- #, 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:110
-+#: ../libnm-core/nm-vpn-plugin-info.c:128
- #, 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:433
-+#: ../libnm-core/nm-vpn-plugin-info.c:419
- #, 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:471
-+#: ../libnm-core/nm-vpn-plugin-info.c:457
- #, 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:1053
-+#: ../libnm-core/nm-vpn-plugin-info.c:1045
- #, c-format
- msgid "missing \"plugin\" setting"
- msgstr "paramètre \"plugin\" manquant"
-
--#: ../libnm-core/nm-vpn-plugin-info.c:1063
-+#: ../libnm-core/nm-vpn-plugin-info.c:1055
- #, 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:1139
-+#: ../libnm-core/nm-vpn-plugin-info.c:1131
- 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:1151
-+#: ../libnm-core/nm-vpn-plugin-info.c:1143
- msgid "missing name for VPN plugin info"
- msgstr "nom manquant pour les informations de greffon VPN"
-
--#: ../libnm-core/nm-vpn-plugin-info.c:1160
-+#: ../libnm-core/nm-vpn-plugin-info.c:1152
- msgid "missing service for VPN plugin info"
- msgstr "service manquant pour les informations de greffon VPN"
-
--#: ../libnm/nm-client.c:3584
-+#: ../libnm/nm-client.c:3681
- #, c-format
- msgid "request succeeded with %s but object is in an unsuitable state"
- msgstr "requête réussie avec %smais l'objet est dans un état inapproprié"
-
--#: ../libnm/nm-client.c:3675
-+#: ../libnm/nm-client.c:3772
- #, c-format
- msgid "operation succeeded but object %s does not exist"
- msgstr "l'opération a réussi mais l'objet %sn'existe pas"
-@@ -11798,7 +12188,7 @@ msgstr "l'opération a réussi mais l'objet %sn'existe pas"
- msgid "The connection was not an ADSL connection."
- msgstr "La connexion n'était pas une connexion ADSL."
-
--#: ../libnm/nm-device-bond.c:104
-+#: ../libnm/nm-device-bond.c:105
- msgid "The connection was not a bond connection."
- msgstr "La connexion n'était pas un connexion de liaison"
-
-@@ -11829,11 +12219,11 @@ 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:68
-+#: ../libnm/nm-device-dummy.c:61
- msgid "The connection was not a dummy connection."
- msgstr "La connexion n'était pas une connexion factice."
-
--#: ../libnm/nm-device-dummy.c:75 ../libnm/nm-device-generic.c:91
-+#: ../libnm/nm-device-dummy.c:68 ../libnm/nm-device-generic.c:85
- #: ../libnm/nm-device-ovs-bridge.c:84 ../libnm/nm-device-ovs-interface.c:52
- #: ../libnm/nm-device-ovs-port.c:84
- msgid "The connection did not specify an interface name."
-@@ -11866,7 +12256,7 @@ msgstr "MAC non valide, dans la liste noire : %s"
- 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:84
-+#: ../libnm/nm-device-generic.c:78
- msgid "The connection was not a generic connection."
- msgstr "La connexion n'était pas une connexion standard"
-
-@@ -11886,7 +12276,7 @@ msgstr "Les MAC de périphérique et de la connexion ne correspondaient pas."
- 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:151
-+#: ../libnm/nm-device-macvlan.c:152
- msgid "The connection was not a MAC-VLAN connection."
- msgstr "La connexion n'était pas une connexion MAC-VLAN."
-
-@@ -11902,7 +12292,7 @@ msgstr "La connexion n'était pas une connexion de modem valide."
- 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:107
-+#: ../libnm/nm-device-olpc-mesh.c:101
- msgid "The connection was not an OLPC Mesh connection."
- msgstr "La connexion n'était pas une connexion « OLPC Mesh »."
-
-@@ -11918,7 +12308,7 @@ 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:131
-+#: ../libnm/nm-device-team.c:125
- msgid "The connection was not a team connection."
- msgstr "La connexion n'était pas une connexion team."
-
-@@ -11939,10 +12329,19 @@ msgstr "La connexion n'était pas une connexion VLAN."
- 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:143
-+#: ../libnm/nm-device-vlan.c:144
- 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-vrf.c:63
-+msgid "The connection was not a VRF connection."
-+msgstr "La connexion n'était pas une connexion VRF."
-+
-+# auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-+#: ../libnm/nm-device-vrf.c:70
-+msgid "The VRF table of the device and the connection didn't match."
-+msgstr "La table VTF du périphérique et de la connexion ne correspondaient pas."
-+
- #: ../libnm/nm-device-vxlan.c:381
- msgid "The connection was not a VXLAN connection."
- msgstr "La connexion n'était pas une connexion VXLAN."
-@@ -11967,95 +12366,99 @@ msgstr "Le périphérique ne possède pas les fonctionnalités WPA requises par
- 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-wpan.c:64
-+#: ../libnm/nm-device-wpan.c:54
- msgid "The connection was not a wpan connection."
- msgstr "La connexion n'était pas une connexion wpan."
-
--#: ../libnm/nm-device.c:1459
-+#: ../libnm/nm-device.c:1571
- msgid "Bluetooth"
- msgstr "Bluetooth"
-
--#: ../libnm/nm-device.c:1461
-+#: ../libnm/nm-device.c:1573
- msgid "OLPC Mesh"
- msgstr "OLPC Mesh"
-
--#: ../libnm/nm-device.c:1463
-+#: ../libnm/nm-device.c:1575
- msgid "Open vSwitch Interface"
- msgstr "Ouvrir l'interface vSwitch"
-
--#: ../libnm/nm-device.c:1465
-+#: ../libnm/nm-device.c:1577
- msgid "Open vSwitch Port"
- msgstr "Ouvrir le port vSwitch"
-
--#: ../libnm/nm-device.c:1467
-+#: ../libnm/nm-device.c:1579
- msgid "Open vSwitch Bridge"
- msgstr "Ouvrir le pont vSwitch"
-
--#: ../libnm/nm-device.c:1469
-+#: ../libnm/nm-device.c:1581
- msgid "WiMAX"
- msgstr "WiMAX"
-
--#: ../libnm/nm-device.c:1483
-+#: ../libnm/nm-device.c:1595
- msgid "ADSL"
- msgstr "ADSL"
-
--#: ../libnm/nm-device.c:1485
-+#: ../libnm/nm-device.c:1597
- msgid "MACVLAN"
- msgstr "MACVLAN"
-
--#: ../libnm/nm-device.c:1487
-+#: ../libnm/nm-device.c:1599
- msgid "VXLAN"
- msgstr "VXLAN"
-
--#: ../libnm/nm-device.c:1489
-+#: ../libnm/nm-device.c:1601
- msgid "IPTunnel"
- msgstr "IPTunnel"
-
--#: ../libnm/nm-device.c:1491
-+#: ../libnm/nm-device.c:1603
- msgid "Tun"
- msgstr "Tun"
-
--#: ../libnm/nm-device.c:1493
-+#: ../libnm/nm-device.c:1605
- msgid "Veth"
- msgstr "Veth"
-
--#: ../libnm/nm-device.c:1495
-+#: ../libnm/nm-device.c:1607
- msgid "MACsec"
- msgstr "MACsec"
-
--#: ../libnm/nm-device.c:1497
-+#: ../libnm/nm-device.c:1609
- msgid "Dummy"
- msgstr "Factice"
-
--#: ../libnm/nm-device.c:1499
-+#: ../libnm/nm-device.c:1611
- msgid "PPP"
- msgstr "PPP"
-
--#: ../libnm/nm-device.c:1501
-+#: ../libnm/nm-device.c:1613
- msgid "IEEE 802.15.4"
- msgstr "IEEE 802.15.4"
-
--#: ../libnm/nm-device.c:1503
-+#: ../libnm/nm-device.c:1615
- msgid "6LoWPAN"
- msgstr "6LoWPAN"
-
--#: ../libnm/nm-device.c:1505
-+#: ../libnm/nm-device.c:1617
- msgid "WireGuard"
- msgstr "WireGuard"
-
--#: ../libnm/nm-device.c:1507
-+#: ../libnm/nm-device.c:1619
- msgid "Wi-Fi P2P"
- msgstr "Wi-Fi P2P"
-
--#: ../libnm/nm-device.c:1539
-+#: ../libnm/nm-device.c:1621
-+msgid "VRF"
-+msgstr "VRF"
-+
-+#: ../libnm/nm-device.c:1653
- msgid "Wired"
- msgstr "Filaire"
-
--#: ../libnm/nm-device.c:1571
-+#: ../libnm/nm-device.c:1685
- msgid "PCI"
- msgstr "PCI"
-
--#: ../libnm/nm-device.c:1573
-+#: ../libnm/nm-device.c:1687
- msgid "USB"
- msgstr "USB"
-
-@@ -12065,22 +12468,27 @@ msgstr "USB"
- #. * "%2$s (%1$s)" if there's no grammatical way to combine
- #. * the strings otherwise.
- #.
--#: ../libnm/nm-device.c:1873 ../libnm/nm-device.c:1892
-+#: ../libnm/nm-device.c:1987 ../libnm/nm-device.c:2006
- #, c-format
- msgctxt "long device name"
- msgid "%s %s"
- msgstr "%s %s"
-
--#: ../libnm/nm-device.c:2569
-+#: ../libnm/nm-device.c:2683
- #, c-format
- msgid "The connection was not valid: %s"
- msgstr "La connexion n'était pas valide : %s"
-
--#: ../libnm/nm-device.c:2578
-+#: ../libnm/nm-device.c:2692
- #, 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."
-
-+# auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
-+#: ../libnm/nm-secret-agent-old.c:1412
-+msgid "registration failed"
-+msgstr "L'enregistrement a échoué."
-+
- #: ../libnm/nm-vpn-plugin-old.c:828 ../libnm/nm-vpn-service-plugin.c:1027
- msgid "No service name specified"
- msgstr "Aucun nom de service spécifié"
-@@ -12227,88 +12635,87 @@ msgstr "Activer ou désactiver le contrôle de connectivité"
- 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-glib-aux/nm-shared-utils.c:1669
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:2346
- #, c-format
- msgid "object class '%s' has no property named '%s'"
- msgstr "classe d'objet « %s » n'a pas de propriété nommée « %s »"
-
--#: ../shared/nm-glib-aux/nm-shared-utils.c:1676
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:2353
- #, c-format
- msgid "property '%s' of object class '%s' is not writable"
- msgstr "propriété « %s » de la classe d'objet « %s » n'est pas en écriture"
-
--#: ../shared/nm-glib-aux/nm-shared-utils.c:1683
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:2360
- #, c-format
- msgid ""
- "construct property \"%s\" for object '%s' can't be set after construction"
- msgstr "propriété de construction « %s » de l'objet « %s » ne peut pas être définie après la construction"
-
--#: ../shared/nm-glib-aux/nm-shared-utils.c:1691
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:2368
- #, 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-glib-aux/nm-shared-utils.c:1700
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:2377
- #, 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-glib-aux/nm-shared-utils.c:1711
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:2388
- #, c-format
- msgid ""
- "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
- "type '%s'"
- msgstr "valeur « %s » de type « %s » est non valide ou en dehors de la plage de valeurs pour la propriété « %s » de type « %s »"
-
--#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:221
--#, c-format
--msgid "'%s' is not valid: properties should be specified as 'key=value'"
--msgstr "« %s » n'est pas valide : les propriétés doivent être spécifiées sous la forme key=value"
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:4801
-+msgid "interface name is missing"
-+msgstr "le nom d'interface est manquant"
-
--#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:236
--#, c-format
--msgid "'%s' is not a valid key"
--msgstr "« %s » n’est pas une clé valide"
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:4807
-+msgid "interface name is too short"
-+msgstr "le nom de l'interface est trop court"
-
--#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:242
--#, c-format
--msgid "duplicate key '%s'"
--msgstr "clé dupliquée « %s »"
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:4816
-+msgid "interface name is reserved"
-+msgstr "le nom d'interface est réservé"
-
--#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:256
--#, c-format
--msgid "number for '%s' is out of range"
--msgstr "le nombre « %s » est en dehors de la plage autorisée"
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:4828
-+msgid "interface name contains an invalid character"
-+msgstr "le nom de l'interface contient un caractère invalide"
-+
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:4834
-+msgid "interface name is longer than 15 characters"
-+msgstr "le nom de l'interface fait plus de 15 caractères"
-
--#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:259
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:4857
- #, c-format
--msgid "value for '%s' must be a number"
--msgstr "« %s » n'est pas un numéro"
-+msgid "'%%' is not allowed in interface names"
-+msgstr "\"%%\" n'est pas autorisé dans les noms d'interface"
-
--#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:270
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:4870
- #, c-format
--msgid "value for '%s' must be a boolean"
--msgstr "« %s » n'est pas un boléen"
-+msgid "'%s' is not allowed as interface name"
-+msgstr "%s pas autorisé comme nom d'interface"
-
--#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:279
--msgid "missing 'name' attribute"
--msgstr "attribut de « nom » manquant"
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:4891
-+msgid ""
-+"interface name must be alphanumerical with no forward or backward slashes"
-+msgstr "le nom de l'interface doit être alphanumérique, sans barre oblique vers l'avant ou vers l'arrière"
-
--#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:286
--#, c-format
--msgid "invalid 'name' \"%s\""
--msgstr "« nom » non valide « %s »"
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:4908
-+msgid "interface name must not be empty"
-+msgstr "le nom de l'interface ne doit pas être vide"
-
--#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:298
--#, c-format
--msgid "attribute '%s' is invalid for \"%s\""
--msgstr "attribut '%s' non pas valide pour « %s »"
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:4914
-+msgid "interface name must be UTF-8 encoded"
-+msgstr "le nom de l'interface doit être encodé en UTF-8"
-
- #. TRANSLATORS: the first %s is a prefix for the connection id, such
- #. * as "Wired Connection" or "VPN Connection". The %d is a number
- #. * that is combined with the first argument to create a unique
- #. * connection id.
--#: ../src/NetworkManagerUtils.c:107
-+#: ../src/NetworkManagerUtils.c:109
- #, c-format
- msgctxt "connection id fallback"
- msgid "%s %u"
-@@ -12320,25 +12727,25 @@ msgid "Failed to read configuration: %s\n"
- msgstr "Échec de la lecture de la configuration : %s\n"
-
- #. Logging/debugging
--#: ../src/main.c:184 ../src/nm-iface-helper.c:295
-+#: ../src/main.c:184 ../src/nm-iface-helper.c:297
- msgid "Print NetworkManager version and exit"
- msgstr "Imprimer la version de NetworkManager et quitter"
-
--#: ../src/main.c:185 ../src/nm-iface-helper.c:296
-+#: ../src/main.c:185 ../src/nm-iface-helper.c:298
- msgid "Don't become a daemon"
- msgstr "Ne pas devenir un démon"
-
--#: ../src/main.c:186 ../src/nm-iface-helper.c:298
-+#: ../src/main.c:186 ../src/nm-iface-helper.c:300
- #, c-format
- msgid "Log level: one of [%s]"
- msgstr "Niveau du journal : un de [%s]"
-
--#: ../src/main.c:188 ../src/nm-iface-helper.c:300
-+#: ../src/main.c:188 ../src/nm-iface-helper.c:302
- #, 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:190 ../src/nm-iface-helper.c:302
-+#: ../src/main.c:190 ../src/nm-iface-helper.c:304
- msgid "Make all warnings fatal"
- msgstr "Rendre tous les avertissements fatals"
-
-@@ -12361,12 +12768,12 @@ msgstr "NetworkManager contrôle toutes les connexions réseau et choisit automa
- "de spécifier des points d'accès sans fil avec lesquels les cartes sans fil de\n"
- "l'ordinateur devraient s'associer."
-
--#: ../src/main.c:325 ../src/main-utils.c:275 ../src/nm-iface-helper.c:443
-+#: ../src/main.c:325 ../src/main-utils.c:275 ../src/nm-iface-helper.c:445
- #, 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:358 ../src/nm-iface-helper.c:456
-+#: ../src/main.c:358 ../src/nm-iface-helper.c:458
- #, c-format
- msgid "Could not daemonize: %s [error %u]\n"
- msgstr "Impossible de démoniser : %s [error %u]\n"
-@@ -12401,11 +12808,11 @@ msgstr "%s est déjà en cours d'exécution (pid %ld)\n"
- 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:303
-+#: ../src/dhcp/nm-dhcp-dhclient-utils.c:324
- msgid "# Created by NetworkManager\n"
- msgstr "# Créé par NetworkManager\n"
-
--#: ../src/dhcp/nm-dhcp-dhclient-utils.c:316
-+#: ../src/dhcp/nm-dhcp-dhclient-utils.c:337
- #, c-format
- msgid ""
- "# Merged from %s\n"
-@@ -12472,11 +12879,11 @@ msgstr "Connexion de pont"
- msgid "Dummy connection"
- msgstr "Connexion factice"
-
--#: ../src/devices/nm-device-ethernet.c:1506
-+#: ../src/devices/nm-device-ethernet.c:1618
- msgid "PPPoE connection"
- msgstr "Connexion PPPoE"
-
--#: ../src/devices/nm-device-ethernet.c:1506
-+#: ../src/devices/nm-device-ethernet.c:1618
- msgid "Wired connection"
- msgstr "Connexion filaire"
-
-@@ -12485,7 +12892,7 @@ msgstr "Connexion filaire"
- msgid "Wired connection %d"
- msgstr "Connexion filaire %d"
-
--#: ../src/devices/nm-device-ip-tunnel.c:407
-+#: ../src/devices/nm-device-ip-tunnel.c:408
- msgid "IP tunnel connection"
- msgstr "Connexion de tunnel IP"
-
-@@ -12501,7 +12908,7 @@ msgstr "Connexion TUN"
- msgid "WPAN connection"
- msgstr "Connexion WPAN"
-
--#: ../src/devices/team/nm-device-team.c:87
-+#: ../src/devices/team/nm-device-team.c:89
- msgid "Team connection"
- msgstr "Connexion Team"
-
-@@ -12645,182 +13052,182 @@ msgstr "L'authentification WPA n'est pas compatible avec un LEAP non-EAP (origin
- 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:776
-+#: ../src/devices/wifi/nm-wifi-utils.c:783
- msgid "Failed to determine AP security information"
- msgstr "N'a pas pu déterminer les informations de sécurité AP"
-
--#: ../src/nm-config.c:572
-+#: ../src/nm-config.c:565
- #, c-format
- msgid "Bad '%s' option: "
- msgstr "Option « %s » erronée : "
-
--#: ../src/nm-config.c:585
-+#: ../src/nm-config.c:578
- msgid "Config file location"
- msgstr "Emplacement du fichier de configuration"
-
--#: ../src/nm-config.c:586
-+#: ../src/nm-config.c:579
- msgid "Config directory location"
- msgstr "Emplacement du répertoire de configuration"
-
--#: ../src/nm-config.c:587
-+#: ../src/nm-config.c:580
- msgid "System config directory location"
- msgstr "Emplacement du répertoire de configuration système"
-
--#: ../src/nm-config.c:588
-+#: ../src/nm-config.c:581
- msgid "Internal config file location"
- msgstr "Emplacement du fichier de configuration interne"
-
--#: ../src/nm-config.c:589
-+#: ../src/nm-config.c:582
- msgid "State file location"
- msgstr "Indiquez l'emplacement du fichier"
-
--#: ../src/nm-config.c:590
-+#: ../src/nm-config.c:583
- 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:591
-+#: ../src/nm-config.c:584
- msgid "List of plugins separated by ','"
- msgstr "Liste des greffons séparée par des virgules « , »"
-
--#: ../src/nm-config.c:592
-+#: ../src/nm-config.c:585
- msgid "Quit after initial configuration"
- msgstr "Sortie après la configuration initiale"
-
--#: ../src/nm-config.c:593 ../src/nm-iface-helper.c:297
-+#: ../src/nm-config.c:586 ../src/nm-iface-helper.c:299
- 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:596
-+#: ../src/nm-config.c:589
- msgid "An http(s) address for checking internet connectivity"
- msgstr "Adresse http(s) pour vérifier la connectivité internet"
-
--#: ../src/nm-config.c:597
-+#: ../src/nm-config.c:590
- msgid "The interval between connectivity checks (in seconds)"
- msgstr "Intervalle entre les vérifications de connectivité (en secondes)"
-
--#: ../src/nm-config.c:598
-+#: ../src/nm-config.c:591
- msgid "The expected start of the response"
- msgstr "Début prévu de la réponse"
-
--#: ../src/nm-config.c:605
-+#: ../src/nm-config.c:598
- msgid "NetworkManager options"
- msgstr "Options NetworkManager"
-
--#: ../src/nm-config.c:605
-+#: ../src/nm-config.c:598
- msgid "Show NetworkManager options"
- msgstr "Afficher options NetworkManager"
-
- #. Interface/IP config
--#: ../src/nm-iface-helper.c:277
-+#: ../src/nm-iface-helper.c:279
- msgid "The interface to manage"
- msgstr "L'interface à gérer"
-
--#: ../src/nm-iface-helper.c:278
-+#: ../src/nm-iface-helper.c:280
- msgid "Connection UUID"
- msgstr "Connexion UUID"
-
--#: ../src/nm-iface-helper.c:279
-+#: ../src/nm-iface-helper.c:281
- msgid "Connection Token for Stable IDs"
- msgstr "Jeton de connexion pour les ID stables"
-
--#: ../src/nm-iface-helper.c:280
-+#: ../src/nm-iface-helper.c:282
- msgid "Whether to manage IPv6 SLAAC"
- msgstr "Indique si on doit gérer IPv6 SLAAC"
-
--#: ../src/nm-iface-helper.c:281
-+#: ../src/nm-iface-helper.c:283
- msgid "Whether SLAAC must be successful"
- msgstr "Indique si SLAAC doit avoir réussi"
-
--#: ../src/nm-iface-helper.c:282
-+#: ../src/nm-iface-helper.c:284
- msgid "Use an IPv6 temporary privacy address"
- msgstr "Utiliser une adresse privée temporaire d'IPv6"
-
--#: ../src/nm-iface-helper.c:283
-+#: ../src/nm-iface-helper.c:285
- msgid "Current DHCPv4 address"
- msgstr "Adresse DHCPv4 actuelle"
-
--#: ../src/nm-iface-helper.c:284
-+#: ../src/nm-iface-helper.c:286
- msgid "Whether DHCPv4 must be successful"
- msgstr "Indique si DHCPv4 doit avoir réussi"
-
--#: ../src/nm-iface-helper.c:285
-+#: ../src/nm-iface-helper.c:287
- msgid "Hex-encoded DHCPv4 client ID"
- msgstr "Identifiant de client DHCPv4 encodé en hexadécimal"
-
--#: ../src/nm-iface-helper.c:286
-+#: ../src/nm-iface-helper.c:288
- msgid "Hostname to send to DHCP server"
- msgstr "Nom d'hôte à envoyer au serveur DHCP"
-
--#: ../src/nm-iface-helper.c:286
-+#: ../src/nm-iface-helper.c:288
- msgid "barbar"
- msgstr "barbar"
-
--#: ../src/nm-iface-helper.c:287
-+#: ../src/nm-iface-helper.c:289
- msgid "FQDN to send to DHCP server"
- msgstr "FQDN à envoyer au serveur DHCP"
-
--#: ../src/nm-iface-helper.c:287
-+#: ../src/nm-iface-helper.c:289
- msgid "host.domain.org"
- msgstr "host.domain.org"
-
--#: ../src/nm-iface-helper.c:288
-+#: ../src/nm-iface-helper.c:290
- msgid "Route priority for IPv4"
- msgstr "Priorité de route pour IPv4"
-
--#: ../src/nm-iface-helper.c:288
-+#: ../src/nm-iface-helper.c:290
- msgid "0"
- msgstr "0"
-
--#: ../src/nm-iface-helper.c:289
-+#: ../src/nm-iface-helper.c:291
- msgid "Route priority for IPv6"
- msgstr "Priorité de route pour IPv6"
-
--#: ../src/nm-iface-helper.c:289
-+#: ../src/nm-iface-helper.c:291
- msgid "1024"
- msgstr "1024"
-
--#: ../src/nm-iface-helper.c:290
-+#: ../src/nm-iface-helper.c:292
- msgid "Hex-encoded Interface Identifier"
- msgstr "Identifiant d'interface encodé en hexadécimal"
-
--#: ../src/nm-iface-helper.c:291
-+#: ../src/nm-iface-helper.c:293
- msgid "IPv6 SLAAC address generation mode"
- msgstr "Mode de génération d'adresses IPv6 SLAAC"
-
--#: ../src/nm-iface-helper.c:292
-+#: ../src/nm-iface-helper.c:294
- msgid ""
- "The logging backend configuration value. See logging.backend in "
- "NetworkManager.conf"
- msgstr "La valeur de configuration du backend de journalisation. Voir logging.backend dans NetworkManager.conf"
-
--#: ../src/nm-iface-helper.c:312
-+#: ../src/nm-iface-helper.c:314
- msgid ""
- "nm-iface-helper is a small, standalone process that manages a single network "
- "interface."
- msgstr "nm-iface-helper est un petit processus autonome qui gère une interface de réseau unique."
-
--#: ../src/nm-iface-helper.c:423
-+#: ../src/nm-iface-helper.c:425
- #, c-format
- msgid "An interface name and UUID are required\n"
- msgstr "UUID et Nom d'interface obligatoires\n"
-
--#: ../src/nm-iface-helper.c:430
-+#: ../src/nm-iface-helper.c:432
- #, 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:448
-+#: ../src/nm-iface-helper.c:450
- #, 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:489
-+#: ../src/nm-iface-helper.c:491
- #, c-format
- msgid "(%s): Invalid IID %s\n"
- msgstr "(%s): IID non valide %s\n"
-
--#: ../src/nm-iface-helper.c:500
-+#: ../src/nm-iface-helper.c:502
- #, c-format
- msgid "(%s): Invalid DHCP client-id %s\n"
- msgstr "(%s) : id-client DHCP non valide %s\n"
-@@ -12835,6 +13242,85 @@ msgstr "Niveau de journalisation « %s » inconnu"
- msgid "Unknown log domain '%s'"
- msgstr "Domaine de journalisation « %s » inconnu"
-
-+#~ msgid "missing colon in 'password' entry '%s'"
-+#~ msgstr "Virgule manquant dans la saisie du mot de passe « %s »"
-+
-+#~ msgid "missing dot in 'password' entry '%s'"
-+#~ msgstr "Point manquant dans la saisie du mot de passe « %s »"
-+
-+#~ msgid "invalid setting name in 'password' entry '%s'"
-+#~ msgstr "Nom du paramètre non valide dans la saisie du mot de passe « %s »"
-+
-+#~ msgid "Error: '%s': %s"
-+#~ msgstr "Erreur : « %s » : %s"
-+
-+#~ msgid "Authentication message: %s\n"
-+#~ msgstr "Message d'authentication : %s\n"
-+
-+#~ msgid "Authentication error: %s\n"
-+#~ msgstr "Erreur d'authentication : %s\n"
-+
-+#~ 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"
-+
-+#~ msgid "An authentication session is already underway."
-+#~ msgstr "Il y a déjà une session d'authentification en cours."
-+
-+#~ msgid "A timeout for a DHCP transaction in seconds."
-+#~ msgstr "Un délai d'attente pour une transaction DHCP en secondes."
-+
-+#~ msgid ""
-+#~ "Array of DNS options as described in man 5 resolv.conf. NULL means that "
-+#~ "the options are unset and left at the default. In this case "
-+#~ "NetworkManager will use default options. This is distinct from an empty "
-+#~ "list of properties."
-+#~ msgstr ""
-+#~ "Tableau d'options DNS tel que décrit dans le fichier man 5 resolv.conf. "
-+#~ "NULL signifie que les options sont désactivées et laissées par défaut. "
-+#~ "Dans ce cas, NetworkManager utilisera les options par défaut, ce qui est "
-+#~ "différent d'une liste de propriétés vide."
-+
-+#~ msgid ""
-+#~ "The gateway associated with this configuration. This is only meaningful "
-+#~ "if \"addresses\" is also set."
-+#~ msgstr ""
-+#~ "La passerelle associée à cette configuration, qui n'a de sens que si l'on "
-+#~ "définit également des \"adresses\"."
-+
-+#~ msgid ""
-+#~ "A list of interface names to match. Each element is a shell wildcard "
-+#~ "pattern. When an element is prefixed with exclamation mark (!) the "
-+#~ "condition is inverted. A candidate interface name is considered matching "
-+#~ "when both these conditions are satisfied: (a) any of the elements not "
-+#~ "prefixed with '!' matches or there aren't such elements; (b) none of the "
-+#~ "elements prefixed with '!' match."
-+#~ msgstr ""
-+#~ "Une liste de noms d'interface à faire correspondre. Chaque élément est un "
-+#~ "caractères génériques de ligne de commande. Lorsqu'un élément est précédé "
-+#~ "d'un point d'exclamation ( !), la condition est inversée ; un nom "
-+#~ "d'interface candidat est considéré comme correspondant lorsque ces deux "
-+#~ "conditions sont remplies : (a) les éléments non précédés de '!' "
-+#~ "correspondent ou il n'existe aucun élément ; (b) aucun des éléments "
-+#~ "précédés de '' correspondent."
-+
-+#~ msgid ""
-+#~ "Specifies the unicast destination IP address of a remote Open vSwitch "
-+#~ "bridge port to connect to."
-+#~ msgstr ""
-+#~ "Spécifie l'adresse IP de destination unicast d'un port de pont vSwitch "
-+#~ "Open distant auquel se connecter."
-+
-+#~ msgid "only one of '%s' and '%s' can be set"
-+#~ msgstr "seul l'un de « %s » et « %s » peut être défini"
-+
-+#~ msgid "unsupported offload feature"
-+#~ msgstr "fonctionnalité de déchargement non prise en charge"
-+
-+#~ msgid "secret was empty"
-+#~ msgstr "secret vide"
-+
- #~ msgid "Unknown parameter: %s\n"
- #~ msgstr "Paramètre inconnu : %s\n"
-
-@@ -12874,9 +13360,3 @@ msgstr "Domaine de journalisation « %s » inconnu"
- #~ msgid "WPA Ad-Hoc authentication requires an Ad-Hoc mode AP"
- #~ msgstr "L'authentification WPA Ad-Hoc requiert un AP mode Ad-Hoc"
-
--#~ msgid ""
--#~ "Access point mode is Ad-Hoc but setting requires Infrastructure security"
--#~ msgstr ""
--#~ "Le mode de point d'accès est Ad-Hoc mais la configuration exige une "
--#~ "sécurité Infrastructure"
--
-diff --git a/po/ja.po b/po/ja.po
-index 01c4ad822d..7b87f710b6 100644
---- a/po/ja.po
-+++ b/po/ja.po
-@@ -11,7 +11,7 @@ msgid ""
- msgstr ""
- "Project-Id-Version: PACKAGE VERSION\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2019-12-23 18:47+0100\n"
-+"POT-Creation-Date: 2020-06-30 11:33+0200\n"
- "PO-Revision-Date: 2019-08-15 04:44+0000\n"
- "Last-Translator: kemorigu <kemorigu@redhat.com>\n"
- "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
-@@ -22,7 +22,7 @@ msgstr ""
- "Plural-Forms: nplurals=1; plural=0;\n"
- "X-Generator: Zanata 4.6.2\n"
-
--#: ../clients/cli/agent.c:23
-+#: ../clients/cli/agent.c:22
- #, c-format
- msgid ""
- "Usage: nmcli agent { COMMAND | help }\n"
-@@ -34,7 +34,7 @@ msgstr "使い方: nmcli agent { COMMAND | help }\n"
- "コマンド := { secret | polkit | all }\n"
- "\n"
-
--#: ../clients/cli/agent.c:31
-+#: ../clients/cli/agent.c:30
- #, c-format
- msgid ""
- "Usage: nmcli agent secret { help }\n"
-@@ -49,7 +49,7 @@ msgstr "使い方: nmcli agent secret { help }\n"
- "nmcli を NetworkManager シークレットエージェントとして実行します。NetworkManager がパスワードを必要とする場合は、登録したエージェントにパスワードを尋ねます。このコマンドにより、nmcli が引き続き実行し、パスワードが必要な場合はパスワード入力が求められます。\n"
- "\n"
-
--#: ../clients/cli/agent.c:41
-+#: ../clients/cli/agent.c:40
- #, c-format
- msgid ""
- "Usage: nmcli agent polkit { help }\n"
-@@ -65,7 +65,7 @@ msgstr "使い方: nmcli agent polkit { help }\n"
- "polkit デーモンが承認を必要とする場合は、nmcli から承認を求められ、その応答を polkit に返します。\n"
- "\n"
-
--#: ../clients/cli/agent.c:51
-+#: ../clients/cli/agent.c:50
- #, c-format
- msgid ""
- "Usage: nmcli agent all { help }\n"
-@@ -77,113 +77,113 @@ msgstr "使い方: nmcli agent all { help }\n"
- "nmcli を NetworkManager シークレットと polkit エージェントとして実行します。\n"
- "\n"
-
--#: ../clients/cli/agent.c:143
-+#: ../clients/cli/agent.c:142
- #, c-format
- msgid "nmcli successfully registered as a NetworkManager's secret agent.\n"
- msgstr "nmcli は NetworkManager のシークレットエージェントとして適切に登録されました。\n"
-
--#: ../clients/cli/agent.c:145
-+#: ../clients/cli/agent.c:144
- #, c-format
- msgid "Error: secret agent initialization failed"
- msgstr "エラー: シークレットエージェントの初期化に失敗しました"
-
--#: ../clients/cli/agent.c:164
--#, c-format
--msgid "Error: polkit agent initialization failed: %s"
--msgstr "エラー: polkit エージェントの初期化に失敗しました: %s"
--
--#: ../clients/cli/agent.c:172
-+#: ../clients/cli/agent.c:153
- #, c-format
- msgid "nmcli successfully registered as a polkit agent.\n"
- msgstr "nmcli が polkit エージェントとして適切に登録されました。\n"
-
--#: ../clients/cli/common.c:344 ../clients/cli/common.c:345
--#: ../clients/cli/common.c:376 ../clients/cli/common.c:377
--#: ../clients/cli/connections.c:1495
-+#: ../clients/cli/agent.c:176
-+#, c-format
-+msgid "Error: polkit agent initialization failed: %s"
-+msgstr "エラー: polkit エージェントの初期化に失敗しました: %s"
-+
-+#: ../clients/cli/common.c:347 ../clients/cli/common.c:348
-+#: ../clients/cli/common.c:379 ../clients/cli/common.c:380
-+#: ../clients/cli/connections.c:1523
- msgid "GROUP"
- msgstr "グループ"
-
--#: ../clients/cli/common.c:628
-+#: ../clients/cli/common.c:631
- #, c-format
- msgid "Error: openconnect failed: %s\n"
- msgstr "エラー: openconnect が失敗しました: %s\n"
-
--#: ../clients/cli/common.c:635
-+#: ../clients/cli/common.c:638
- #, c-format
- msgid "Error: openconnect failed with status %d\n"
- msgstr "エラー: openconnect がステータス %d で失敗しました\n"
-
--#: ../clients/cli/common.c:637
-+#: ../clients/cli/common.c:640
- #, c-format
- msgid "Error: openconnect failed with signal %d\n"
- msgstr "エラー: openconnect がシグナル %d で失敗しました\n"
-
--#: ../clients/cli/common.c:725
-+#: ../clients/cli/common.c:728
- #, c-format
- msgid ""
- "Warning: password for '%s' not given in 'passwd-file' and nmcli cannot ask "
- "without '--ask' option.\n"
- msgstr "警告: '%s' のパスワードが 'passwd-file' で提供されていません。nmcli は '--ask' オプションがないと尋ねることができません。\n"
-
--#: ../clients/cli/common.c:1227
-+#: ../clients/cli/common.c:1244
- #, c-format
- msgid "Error: Could not create NMClient object: %s."
- msgstr "エラー: NMClient オブジェクトを作成できませんでした: %s。"
-
--#: ../clients/cli/common.c:1246
-+#: ../clients/cli/common.c:1265
- msgid "Error: NetworkManager is not running."
- msgstr "エラー: NetworkManager が起動していません。"
-
--#: ../clients/cli/common.c:1339
-+#: ../clients/cli/common.c:1364
- #, c-format
- msgid "Error: argument '%s' not understood. Try passing --help instead."
- msgstr "エラー: 引数 '%s' が認識されません。代わりに --help を渡してください。"
-
--#: ../clients/cli/common.c:1347
-+#: ../clients/cli/common.c:1372
- msgid "Error: missing argument. Try passing --help."
- msgstr "エラー: 引数がありません。--help を渡してください。"
-
--#: ../clients/cli/common.c:1414
-+#: ../clients/cli/common.c:1439
- msgid "access denied"
- msgstr "アクセスは拒否されました"
-
--#: ../clients/cli/common.c:1416
-+#: ../clients/cli/common.c:1441
- msgid "NetworkManager is not running"
- msgstr "NetworkManager は実行していません"
-
--#: ../clients/cli/common.c:1442
-+#: ../clients/cli/common.c:1467
- #, c-format
- msgid "Error: error connecting to system bus: %s"
- msgstr "エラー: システムバスへの接続エラー: %s"
-
--#: ../clients/cli/common.c:1468 ../clients/cli/connections.c:66
--#: ../clients/cli/connections.c:75 ../clients/cli/devices.c:427
--#: ../clients/cli/devices.c:519 ../clients/cli/devices.c:526
--#: ../clients/cli/general.c:26 ../clients/cli/general.c:116
--#: ../clients/cli/general.c:121 ../clients/common/nm-client-utils.c:250
--#: ../clients/common/nm-client-utils.c:263
--#: ../clients/common/nm-client-utils.c:267
--#: ../clients/common/nm-client-utils.c:272
--#: ../clients/common/nm-meta-setting-desc.c:1724
--#: ../clients/common/nm-meta-setting-desc.c:1755
--#: ../clients/common/nm-meta-setting-desc.c:2687
--#: ../clients/common/nm-meta-setting-desc.c:2745
-+#: ../clients/cli/common.c:1493 ../clients/cli/connections.c:67
-+#: ../clients/cli/connections.c:77 ../clients/cli/devices.c:434
-+#: ../clients/cli/devices.c:526 ../clients/cli/devices.c:533
-+#: ../clients/cli/general.c:31 ../clients/cli/general.c:86
-+#: ../clients/cli/general.c:91 ../clients/common/nm-client-utils.c:252
-+#: ../clients/common/nm-client-utils.c:265
-+#: ../clients/common/nm-client-utils.c:301
-+#: ../clients/common/nm-client-utils.c:306
-+#: ../clients/common/nm-meta-setting-desc.c:1747
-+#: ../clients/common/nm-meta-setting-desc.c:1778
-+#: ../clients/common/nm-meta-setting-desc.c:2680
-+#: ../clients/common/nm-meta-setting-desc.c:2738
- msgid "unknown"
- msgstr "不明"
-
--#: ../clients/cli/common.c:1469
-+#: ../clients/cli/common.c:1494
- msgid "none"
- msgstr "なし"
-
--#: ../clients/cli/common.c:1470
-+#: ../clients/cli/common.c:1495
- msgid "portal"
- msgstr "ポータル"
-
--#: ../clients/cli/common.c:1471
-+#: ../clients/cli/common.c:1496
- msgid "limited"
- msgstr "制限付き"
-
--#: ../clients/cli/common.c:1472
-+#: ../clients/cli/common.c:1497
- msgid "full"
- msgstr "完全"
-
-@@ -217,55 +217,55 @@ msgstr "接続 (名前、UUID またはパス): "
- msgid "Connection(s) (name, UUID, path or apath): "
- msgstr "接続 (名前、UUID、パス または apath): "
-
--#: ../clients/cli/connections.c:67
-+#: ../clients/cli/connections.c:68
- msgid "activating"
- msgstr "アクティベート中"
-
--#: ../clients/cli/connections.c:68
-+#: ../clients/cli/connections.c:69
- msgid "activated"
- msgstr "アクティベート済み"
-
--#: ../clients/cli/connections.c:69 ../clients/common/nm-client-utils.c:261
-+#: ../clients/cli/connections.c:70 ../clients/common/nm-client-utils.c:263
- msgid "deactivating"
- msgstr "停止中"
-
--#: ../clients/cli/connections.c:70
-+#: ../clients/cli/connections.c:71
- msgid "deactivated"
- msgstr "停止しました"
-
--#: ../clients/cli/connections.c:76
-+#: ../clients/cli/connections.c:78
- msgid "VPN connecting (prepare)"
- msgstr "VPN 接続（準備）"
-
--#: ../clients/cli/connections.c:77
-+#: ../clients/cli/connections.c:79
- msgid "VPN connecting (need authentication)"
- msgstr "VPN 接続（認証が必要）"
-
--#: ../clients/cli/connections.c:78
-+#: ../clients/cli/connections.c:80
- msgid "VPN connecting"
- msgstr "VPN 接続"
-
--#: ../clients/cli/connections.c:79
-+#: ../clients/cli/connections.c:81
- msgid "VPN connecting (getting IP configuration)"
- msgstr "VPN 接続（IP 設定を取得）"
-
--#: ../clients/cli/connections.c:80
-+#: ../clients/cli/connections.c:82
- msgid "VPN connected"
- msgstr "VPN 接続済み"
-
--#: ../clients/cli/connections.c:81
-+#: ../clients/cli/connections.c:83
- msgid "VPN connection failed"
- msgstr "VPN 接続失敗"
-
--#: ../clients/cli/connections.c:82
-+#: ../clients/cli/connections.c:84
- msgid "VPN disconnected"
- msgstr "VPN 切断済み"
-
--#: ../clients/cli/connections.c:544
-+#: ../clients/cli/connections.c:546
- msgid "never"
- msgstr "しない"
-
--#: ../clients/cli/connections.c:904
-+#: ../clients/cli/connections.c:907
- #, c-format
- msgid ""
- "Usage: nmcli connection { COMMAND | help }\n"
-@@ -337,7 +337,7 @@ msgstr "使い方: nmcli connection { コマンド | help }\n"
- " export [id | uuid | path] <ID> [<output file>]\n"
- "\n"
-
--#: ../clients/cli/connections.c:926
-+#: ../clients/cli/connections.c:929
- #, c-format
- msgid ""
- "Usage: nmcli connection show { ARGUMENTS | help }\n"
-@@ -378,7 +378,7 @@ msgstr "使い方: nmcli connection show { 引数 | help }\n"
- "できます。--active オプションを指定すると、アクティブなプロファイルのみが考慮されます。\n"
- "関連するシークレットも表示する場合は、グローバルな --show-secrets オプションを使用します。\n"
-
--#: ../clients/cli/connections.c:947
-+#: ../clients/cli/connections.c:950
- #, c-format
- msgid ""
- "Usage: nmcli connection up { ARGUMENTS | help }\n"
-@@ -419,7 +419,7 @@ msgstr "使い方: nmcli connection up { 引数 | help }\n"
- "passwd-file - 接続をアクティブにするのに必要なパスワードを含むファイル\n"
- "\n"
-
--#: ../clients/cli/connections.c:968
-+#: ../clients/cli/connections.c:971
- #, c-format
- msgid ""
- "Usage: nmcli connection down { ARGUMENTS | help }\n"
-@@ -440,7 +440,7 @@ msgstr "使い方: nmcli connection down { 引数 | help }\n"
- "で識別します。\n"
- "\n"
-
--#: ../clients/cli/connections.c:980
-+#: ../clients/cli/connections.c:983
- #, c-format
- msgid ""
- "Usage: nmcli connection add { ARGUMENTS | help }\n"
-@@ -748,7 +748,7 @@ msgstr "使い方: nmcli connection add { 引数 | help }\n"
- " [ip6 <IPv6 address>] [gw6 <IPv6 gateway>]\n"
- "\n"
-
--#: ../clients/cli/connections.c:1104
-+#: ../clients/cli/connections.c:1107
- #, c-format
- msgid ""
- "Usage: nmcli connection modify { ARGUMENTS | help }\n"
-@@ -761,6 +761,10 @@ msgid ""
- "The '+' sign allows appending items instead of overwriting the whole value.\n"
- "The '-' sign allows removing selected items instead of the whole value.\n"
- "\n"
-+"ARGUMENTS := remove <setting>\n"
-+"\n"
-+"Remove a setting from the connection profile.\n"
-+"\n"
- "Examples:\n"
- "nmcli con mod home-wifi wifi.ssid rakosnicek\n"
- "nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, "
-@@ -770,8 +774,9 @@ msgid ""
- "nmcli con mod em1-1 -ipv6.addr \"abbe::cafe/56\"\n"
- "nmcli con mod bond0 +bond.options mii=500\n"
- "nmcli con mod bond0 -bond.options downdelay\n"
-+"nmcli con mod em1-1 remove sriov\n"
- "\n"
--msgstr "使い方: nmcli connection modify { 引数 | help }\n"
-+msgstr "使い方: nmcli connection modify { ARGUMENTS | help }\n"
- "\n"
- "引数 := [id | uuid | path] <ID> ([+|-]<setting>.<property> <value>)+\n"
- "\n"
-@@ -781,6 +786,10 @@ msgstr "使い方: nmcli connection modify { 引数 | help }\n"
- "'+' 記号を使用すると、値全体を上書きせずにアイテムを追加できます。\n"
- "'-' 記号を使用すると、値全体の代わりに、選択されたアイテムを削除できます。\n"
- "\n"
-+"引数 := remove <setting>\n"
-+"\n"
-+"接続プロファイルから設定を削除します。\n"
-+"\n"
- "例:\n"
- "nmcli con mod home-wifi wifi.ssid rakosnicek\n"
- "nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, 10.10.1.5/8\"\n"
-@@ -789,9 +798,10 @@ msgstr "使い方: nmcli connection modify { 引数 | help }\n"
- "nmcli con mod em1-1 -ipv6.addr \"abbe::cafe/56\"\n"
- "nmcli con mod bond0 +bond.options mii=500\n"
- "nmcli con mod bond0 -bond.options downdelay\n"
-+"nmcli con mod em1-1 remove sriov\n"
- "\n"
-
--#: ../clients/cli/connections.c:1127
-+#: ../clients/cli/connections.c:1135
- #, c-format
- msgid ""
- "Usage: nmcli connection clone { ARGUMENTS | help }\n"
-@@ -812,7 +822,7 @@ msgstr "使い方: nmcli connection clone { 引数 | help }\n"
- "を除き、<ID> の完全なコピーになります。\n"
- "\n"
-
--#: ../clients/cli/connections.c:1139
-+#: ../clients/cli/connections.c:1147
- #, c-format
- msgid ""
- "Usage: nmcli connection edit { ARGUMENTS | help }\n"
-@@ -838,7 +848,7 @@ msgstr "使い方: nmcli connection edit { 引数 | help }\n"
- "インテラクティブなエディターで新しい接続プロファイルを追加します。\n"
- "\n"
-
--#: ../clients/cli/connections.c:1154
-+#: ../clients/cli/connections.c:1162
- #, c-format
- msgid ""
- "Usage: nmcli connection delete { ARGUMENTS | help }\n"
-@@ -856,7 +866,7 @@ msgstr "使い方: nmcli connection delete { 引数 | help }\n"
- "プロファイルは名前、UUID、D-Bus パスで識別します。\n"
- "\n"
-
--#: ../clients/cli/connections.c:1165
-+#: ../clients/cli/connections.c:1173
- #, c-format
- msgid ""
- "Usage: nmcli connection monitor { ARGUMENTS | help }\n"
-@@ -876,7 +886,7 @@ msgstr "使い方: nmcli connection monitor { 引数 | help }\n"
- "何も指定されない場合は、すべての接続プロファイルを監視します。\n"
- "\n"
-
--#: ../clients/cli/connections.c:1177
-+#: ../clients/cli/connections.c:1185
- #, c-format
- msgid ""
- "Usage: nmcli connection reload { help }\n"
-@@ -888,7 +898,7 @@ msgstr "使い方: nmcli connection reload { help }\n"
- "ディスクからすべての接続ファイルを再読み込みします。\n"
- "\n"
-
--#: ../clients/cli/connections.c:1185
-+#: ../clients/cli/connections.c:1193
- #, c-format
- msgid ""
- "Usage: nmcli connection load { ARGUMENTS | help }\n"
-@@ -909,7 +919,7 @@ msgstr "使い方: nmcli connection load { 引数 | help }\n"
- "NetworkManager に最新の状態を認識させてください。\n"
- "\n"
-
--#: ../clients/cli/connections.c:1197
-+#: ../clients/cli/connections.c:1205
- #, c-format
- msgid ""
- "Usage: nmcli connection import { ARGUMENTS | help }\n"
-@@ -932,7 +942,7 @@ msgstr "使い方: nmcli connection import { 引数 | help }\n"
- "NetworkManager VPN プラグインによりインポートされます。\n"
- "\n"
-
--#: ../clients/cli/connections.c:1210
-+#: ../clients/cli/connections.c:1218
- #, c-format
- msgid ""
- "Usage: nmcli connection export { ARGUMENTS | help }\n"
-@@ -950,343 +960,347 @@ msgstr "使い方: nmcli connection export { 引数 | help }\n"
- "データは標準出力またはファイル (名前が指定された場合) に送信されます。\n"
- "\n"
-
--#: ../clients/cli/connections.c:1301
-+#: ../clients/cli/connections.c:1309
- #, c-format
- msgid "Error updating secrets for %s: %s\n"
- msgstr "%s のシークレットの更新中にエラーが発生しました: %s\n"
-
--#: ../clients/cli/connections.c:1348
-+#: ../clients/cli/connections.c:1356
- msgid "Connection profile details"
- msgstr "接続プロファイルの詳細"
-
--#: ../clients/cli/connections.c:1361 ../clients/cli/connections.c:1446
-+#: ../clients/cli/connections.c:1369 ../clients/cli/connections.c:1470
- #, c-format
- msgid "Error: 'connection show': %s"
- msgstr "エラー: 'connection show': %s"
-
--#: ../clients/cli/connections.c:1436
-+#: ../clients/cli/connections.c:1458
- msgid "Activate connection details"
- msgstr "アクティブな接続の詳細"
-
--#: ../clients/cli/connections.c:1544 ../clients/cli/devices.c:1485
--#: ../clients/cli/devices.c:1499 ../clients/cli/devices.c:1513
--#: ../clients/cli/devices.c:1528 ../clients/cli/devices.c:1586
--#: ../clients/cli/devices.c:1688
-+#: ../clients/cli/connections.c:1572 ../clients/cli/devices.c:1501
-+#: ../clients/cli/devices.c:1515 ../clients/cli/devices.c:1529
-+#: ../clients/cli/devices.c:1544 ../clients/cli/devices.c:1601
-+#: ../clients/cli/devices.c:1703
- msgid "NAME"
- msgstr "名前"
-
--#: ../clients/cli/connections.c:1637
-+#: ../clients/cli/connections.c:1665
- #, c-format
- msgid "invalid field '%s'; allowed fields: %s and %s, or %s,%s"
- msgstr "無効なフィールド '%s'; 使用できるフィールド: %s および %s、または %s、%s"
-
--#: ../clients/cli/connections.c:1647 ../clients/cli/connections.c:1655
-+#: ../clients/cli/connections.c:1675 ../clients/cli/connections.c:1683
- #, c-format
- msgid "'%s' has to be alone"
- msgstr "'%s' は孤立させる必要があります"
-
--#: ../clients/cli/connections.c:1915
-+#: ../clients/cli/connections.c:1943
- #, c-format
- msgid "incorrect string '%s' of '--order' option"
- msgstr "'--order' オプションの正しくない文字列 '%s'"
-
--#: ../clients/cli/connections.c:1940
-+#: ../clients/cli/connections.c:1968
- #, c-format
- msgid "incorrect item '%s' in '--order' option"
- msgstr "'--order' オプションの正しくないアイテム '%s'"
-
--#: ../clients/cli/connections.c:1978
-+#: ../clients/cli/connections.c:2006
- msgid "No connection specified"
- msgstr "接続が指定されていません。"
-
--#: ../clients/cli/connections.c:1989
-+#: ../clients/cli/connections.c:2017
- #, c-format
- msgid "%s argument is missing"
- msgstr "%s 引数がありません。"
-
--#: ../clients/cli/connections.c:2007
-+#: ../clients/cli/connections.c:2035
- #, c-format
- msgid "unknown connection '%s'"
- msgstr "不明な接続 '%s'"
-
--#: ../clients/cli/connections.c:2036
-+#: ../clients/cli/connections.c:2064
- msgid "'--order' argument is missing"
- msgstr "'--order' 引数がありません"
-
--#: ../clients/cli/connections.c:2096
-+#: ../clients/cli/connections.c:2125
- msgid "NetworkManager active profiles"
- msgstr "NetworkManager のアクティブなプロファイル"
-
--#: ../clients/cli/connections.c:2097
-+#: ../clients/cli/connections.c:2126
- msgid "NetworkManager connection profiles"
- msgstr "NetworkManager 接続プロファイル"
-
--#: ../clients/cli/connections.c:2149 ../clients/cli/connections.c:2895
--#: ../clients/cli/connections.c:2907 ../clients/cli/connections.c:2919
--#: ../clients/cli/connections.c:3149 ../clients/cli/connections.c:8969
--#: ../clients/cli/connections.c:8990 ../clients/cli/devices.c:3019
--#: ../clients/cli/devices.c:3031 ../clients/cli/devices.c:3044
--#: ../clients/cli/devices.c:3299 ../clients/cli/devices.c:3310
--#: ../clients/cli/devices.c:3328 ../clients/cli/devices.c:3337
--#: ../clients/cli/devices.c:3358 ../clients/cli/devices.c:3369
--#: ../clients/cli/devices.c:3387 ../clients/cli/devices.c:3905
--#: ../clients/cli/devices.c:3915 ../clients/cli/devices.c:3923
--#: ../clients/cli/devices.c:3935 ../clients/cli/devices.c:3950
--#: ../clients/cli/devices.c:3958 ../clients/cli/devices.c:4101
--#: ../clients/cli/devices.c:4112 ../clients/cli/devices.c:4326
--#: ../clients/cli/devices.c:4495
-+#: ../clients/cli/connections.c:2178 ../clients/cli/connections.c:2857
-+#: ../clients/cli/connections.c:2870 ../clients/cli/connections.c:2883
-+#: ../clients/cli/connections.c:3115 ../clients/cli/connections.c:8986
-+#: ../clients/cli/connections.c:9008 ../clients/cli/devices.c:3121
-+#: ../clients/cli/devices.c:3134 ../clients/cli/devices.c:3146
-+#: ../clients/cli/devices.c:3439 ../clients/cli/devices.c:3450
-+#: ../clients/cli/devices.c:3468 ../clients/cli/devices.c:3477
-+#: ../clients/cli/devices.c:3498 ../clients/cli/devices.c:3509
-+#: ../clients/cli/devices.c:3527 ../clients/cli/devices.c:4047
-+#: ../clients/cli/devices.c:4058 ../clients/cli/devices.c:4067
-+#: ../clients/cli/devices.c:4081 ../clients/cli/devices.c:4098
-+#: ../clients/cli/devices.c:4107 ../clients/cli/devices.c:4253
-+#: ../clients/cli/devices.c:4264 ../clients/cli/devices.c:4480
-+#: ../clients/cli/devices.c:4652
- #, c-format
- msgid "Error: %s argument is missing."
- msgstr "エラー: %s 引数がありません。"
-
--#: ../clients/cli/connections.c:2177
-+#: ../clients/cli/connections.c:2206
- #, c-format
- msgid "Error: %s - no such connection profile."
- msgstr "エラー: %s - そのような接続プロファイルはありません。"
-
--#: ../clients/cli/connections.c:2268 ../clients/cli/connections.c:2882
--#: ../clients/cli/connections.c:2947 ../clients/cli/connections.c:8506
--#: ../clients/cli/connections.c:8597 ../clients/cli/connections.c:9090
--#: ../clients/cli/devices.c:1773 ../clients/cli/devices.c:2041
--#: ../clients/cli/devices.c:2211 ../clients/cli/devices.c:2319
--#: ../clients/cli/devices.c:2511 ../clients/cli/devices.c:3178
--#: ../clients/cli/devices.c:4064 ../clients/cli/devices.c:4501
--#: ../clients/cli/general.c:982
-+#: ../clients/cli/connections.c:2297 ../clients/cli/connections.c:2843
-+#: ../clients/cli/connections.c:2913 ../clients/cli/connections.c:8527
-+#: ../clients/cli/connections.c:8619 ../clients/cli/connections.c:9113
-+#: ../clients/cli/devices.c:1801 ../clients/cli/devices.c:2069
-+#: ../clients/cli/devices.c:2239 ../clients/cli/devices.c:2352
-+#: ../clients/cli/devices.c:2541 ../clients/cli/devices.c:3318
-+#: ../clients/cli/devices.c:4217 ../clients/cli/devices.c:4659
-+#: ../clients/cli/general.c:997
- #, c-format
- msgid "Error: %s."
- msgstr "エラー: %s."
-
--#: ../clients/cli/connections.c:2361 ../clients/cli/devices.c:4278
-+#: ../clients/cli/connections.c:2389 ../clients/cli/devices.c:4431
- #, c-format
- msgid "no active connection on device '%s'"
- msgstr "デバイス '%s' 上にアクティブな接続はありません"
-
--#: ../clients/cli/connections.c:2369
-+#: ../clients/cli/connections.c:2397
- msgid "no active connection or device"
- msgstr "アクティブな接続またはデバイスがありません"
-
--#: ../clients/cli/connections.c:2389
-+#: ../clients/cli/connections.c:2417
- #, c-format
- msgid "device '%s' not compatible with connection '%s': "
- msgstr "デバイス '%s' は接続 '%s' と互換性がありません: "
-
--#: ../clients/cli/connections.c:2422
-+#: ../clients/cli/connections.c:2450
- #, c-format
- msgid "device '%s' not compatible with connection '%s'"
- msgstr "デバイス '%s' は接続 '%s' と互換性がありません"
-
--#: ../clients/cli/connections.c:2425
-+#: ../clients/cli/connections.c:2453
- #, c-format
- msgid "no device found for connection '%s'"
- msgstr "接続 '%s'用のデバイスが見つかりません"
-
--#: ../clients/cli/connections.c:2476
-+#: ../clients/cli/connections.c:2504
- #, c-format
- msgid "Hint: use '%s' to get more details."
- msgstr "ヒント: '%s' を使用して詳細を取得します。"
-
--#: ../clients/cli/connections.c:2494
-+#: ../clients/cli/connections.c:2522
- #, c-format
- msgid "Connection successfully activated (%s) (D-Bus active path: %s)\n"
- msgstr "接続が正常にアクティベートされました (%s) (D-Bus アクティブパス: %s)\n"
-
--#: ../clients/cli/connections.c:2498 ../clients/cli/connections.c:2648
--#: ../clients/cli/connections.c:6798
-+#: ../clients/cli/connections.c:2526 ../clients/cli/connections.c:2676
-+#: ../clients/cli/connections.c:6828
- #, c-format
- msgid "Connection successfully activated (D-Bus active path: %s)\n"
- msgstr "接続が正常にアクティベートされました (D-Bus アクティブパス: %s)\n"
-
--#: ../clients/cli/connections.c:2505 ../clients/cli/connections.c:2627
-+#: ../clients/cli/connections.c:2533 ../clients/cli/connections.c:2655
- #, c-format
- msgid "Error: Connection activation failed: %s"
- msgstr "エラー: 接続のアクティベーションに失敗: %s"
-
--#: ../clients/cli/connections.c:2542
-+#: ../clients/cli/connections.c:2570
- #, c-format
- msgid "Error: Timeout expired (%d seconds)"
- msgstr "エラー: タイムアウト (%d 秒) になりました"
-
--#: ../clients/cli/connections.c:2709
--#, c-format
--msgid "failed to read passwd-file '%s': %s"
--msgstr "passwd-file '%s'の読み込みに失敗: %s"
--
--#: ../clients/cli/connections.c:2722
--#, c-format
--msgid "missing colon in 'password' entry '%s'"
--msgstr "'password' エントリー '%s' にコロンがありません"
--
--#: ../clients/cli/connections.c:2730
--#, c-format
--msgid "missing dot in 'password' entry '%s'"
--msgstr "'password' エントリー '%s' にドットがありません"
--
- #: ../clients/cli/connections.c:2743
- #, c-format
--msgid "invalid setting name in 'password' entry '%s'"
--msgstr "'password' エントリー '%s' の設定名が無効です"
--
--#: ../clients/cli/connections.c:2800
--#, c-format
- msgid "unknown device '%s'."
- msgstr "不明なデバイス '%s' です。"
-
--#: ../clients/cli/connections.c:2805
-+#: ../clients/cli/connections.c:2748
- msgid "neither a valid connection nor device given"
- msgstr "有効な接続、デバイスいずれも指定されていません"
-
--#: ../clients/cli/connections.c:2929 ../clients/cli/connections.c:9000
--#: ../clients/cli/devices.c:1732 ../clients/cli/devices.c:1778
--#: ../clients/cli/devices.c:2216 ../clients/cli/devices.c:3076
--#: ../clients/cli/devices.c:3400 ../clients/cli/devices.c:3967
--#: ../clients/cli/devices.c:4118 ../clients/cli/devices.c:4335
--#: ../clients/cli/devices.c:4505
-+#: ../clients/cli/connections.c:2761
-+#, c-format
-+msgid "invalid passwd-file '%s' at line %zd: %s"
-+msgstr "%zd 行目の無効なパスワードファイル '%s': %s"
-+
-+#: ../clients/cli/connections.c:2767
-+#, c-format
-+msgid "invalid passwd-file '%s': %s"
-+msgstr "無効なパスワードファイル ’%s’: %s"
-+
-+#: ../clients/cli/connections.c:2894 ../clients/cli/connections.c:9019
-+#: ../clients/cli/devices.c:1759 ../clients/cli/devices.c:1807
-+#: ../clients/cli/devices.c:2245 ../clients/cli/devices.c:3181
-+#: ../clients/cli/devices.c:3540 ../clients/cli/devices.c:4117
-+#: ../clients/cli/devices.c:4270 ../clients/cli/devices.c:4490
-+#: ../clients/cli/devices.c:4664
- #, c-format
- msgid "Error: invalid extra argument '%s'."
- msgstr "エラー: '%s' は無効な追加引数です。"
-
--#: ../clients/cli/connections.c:2955
-+#: ../clients/cli/connections.c:2922
- msgid "preparing"
- msgstr "準備中"
-
--#: ../clients/cli/connections.c:3064
-+#: ../clients/cli/connections.c:3029
- #, c-format
- msgid "Connection '%s' (%s) successfully deleted.\n"
- msgstr "接続 '%s' (%s) が正常に削除されました。\n"
-
--#: ../clients/cli/connections.c:3080
-+#: ../clients/cli/connections.c:3045
- #, c-format
- msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n"
- msgstr "接続 '%s' が正常に非アクティブ化されました (D-Bus アクティブパス: %s)\n"
-
--#: ../clients/cli/connections.c:3131 ../clients/cli/connections.c:8693
--#: ../clients/cli/connections.c:8724 ../clients/cli/connections.c:8890
-+#: ../clients/cli/connections.c:3096 ../clients/cli/connections.c:8716
-+#: ../clients/cli/connections.c:8747 ../clients/cli/connections.c:8910
- #, c-format
- msgid "Error: No connection specified."
- msgstr "エラー: 接続が指定されていません。"
-
--#: ../clients/cli/connections.c:3161
-+#: ../clients/cli/connections.c:3128
- #, c-format
- msgid "Error: '%s' is not an active connection.\n"
- msgstr "エラー: '%s' はアクティブな接続ではありません。\n"
-
--#: ../clients/cli/connections.c:3162
-+#: ../clients/cli/connections.c:3129
- #, c-format
- msgid "Error: not all active connections found."
- msgstr "エラー: アクティブな一部の接続が見つかりません。"
-
--#: ../clients/cli/connections.c:3170
-+#: ../clients/cli/connections.c:3137
- #, c-format
- msgid "Error: no active connection provided."
- msgstr "エラー: アクティブな接続がありません。"
-
--#: ../clients/cli/connections.c:3201
-+#: ../clients/cli/connections.c:3169
- #, c-format
- msgid "Connection '%s' deactivation failed: %s\n"
- msgstr "接続 '%s' の非アクティブ化に失敗しました: %s\n"
-
--#: ../clients/cli/connections.c:3461 ../clients/cli/connections.c:3518
--#: ../clients/common/nm-client-utils.c:211
-+#: ../clients/cli/connections.c:3427 ../clients/cli/connections.c:3485
-+#: ../clients/common/nm-client-utils.c:213
- #, c-format
- msgid "'%s' not among [%s]"
- msgstr "'%s' は [%s] にはありません"
-
- #. We should not really come here
--#: ../clients/cli/connections.c:3481 ../clients/cli/connections.c:3541
--#: ../clients/common/nm-client-utils.c:279
-+#: ../clients/cli/connections.c:3447 ../clients/cli/connections.c:3506
-+#: ../clients/common/nm-client-utils.c:313
- #, c-format
- msgid "Unknown error"
- msgstr "不明なエラー"
-
--#: ../clients/cli/connections.c:3675
-+#: ../clients/cli/connections.c:3640
- #, c-format
- msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
- msgstr "警告: master='%s' は既存のプロファイルを参照しません。\n"
-
--#: ../clients/cli/connections.c:4038
-+#: ../clients/cli/connections.c:4000
- #, c-format
- msgid "Error: invalid property '%s': %s."
- msgstr "エラー: 無効なプロパティー '%s': %s。"
-
--#: ../clients/cli/connections.c:4053
-+#: ../clients/cli/connections.c:4015
- #, c-format
- msgid "Error: failed to %s %s.%s: %s."
- msgstr "エラー: %s %s.%s: %s. に失敗しました"
-
--#: ../clients/cli/connections.c:4095
-+#: ../clients/cli/connections.c:4057
- #, c-format
- msgid "Error: '%s' is mandatory."
- msgstr "エラー: '%s' は必須です。"
-
--#: ../clients/cli/connections.c:4122
-+#: ../clients/cli/connections.c:4084
- #, c-format
- msgid "Error: invalid slave type; %s."
- msgstr "エラー: 無効なスレーブタイプ; %s。"
-
--#: ../clients/cli/connections.c:4130
-+#: ../clients/cli/connections.c:4092
- #, c-format
- msgid "Error: invalid connection type; %s."
- msgstr "エラー: 無効な接続タイプ; %s。"
-
--#: ../clients/cli/connections.c:4207
-+#: ../clients/cli/connections.c:4169
- #, c-format
- msgid "Error: bad connection type: %s"
- msgstr "エラー: 問題のある接続タイプ: %s"
-
--#: ../clients/cli/connections.c:4263
--#, c-format
--msgid "Error: '%s': %s"
--msgstr "エラー: '%s': %s"
--
--#: ../clients/cli/connections.c:4290
-+#: ../clients/cli/connections.c:4244
- msgid "Error: master is required"
- msgstr "エラー: マスターが必要です"
-
--#: ../clients/cli/connections.c:4359
-+#: ../clients/cli/connections.c:4313
- #, c-format
- msgid "Error: error adding bond option '%s=%s'."
- msgstr "エラー: ボンドオプション '%s=%s' の追加中にエラー。"
-
--#: ../clients/cli/connections.c:4390
-+#: ../clients/cli/connections.c:4344
- #, 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:4421
-+#: ../clients/cli/connections.c:4375
- #, 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:4686
-+#: ../clients/cli/connections.c:4669
-+#, c-format
-+msgid "Error: setting '%s' is mandatory and cannot be removed."
-+msgstr "エラー: 設定 '%s' は必須のため削除できません。"
-+
-+#: ../clients/cli/connections.c:4679
- #, c-format
- msgid "Error: value for '%s' is missing."
- msgstr "エラー: '%s' の値が見つかりません。"
-
--#: ../clients/cli/connections.c:4730
-+#: ../clients/cli/connections.c:4724
- msgid "Error: <setting>.<property> argument is missing."
- msgstr "エラー: <setting>.<property> 引数がありません。"
-
--#: ../clients/cli/connections.c:4756
-+#: ../clients/cli/connections.c:4750
-+msgid "Error: missing setting."
-+msgstr "エラー: 設定がありません。"
-+
-+#: ../clients/cli/connections.c:4768
-+#, c-format
-+msgid "Setting '%s' is not present in the connection."
-+msgstr "この接続には、設定 '%s' はありません。"
-+
-+#: ../clients/cli/connections.c:4772
-+#, c-format
-+msgid "Error: invalid setting argument '%s'."
-+msgstr "エラー: 無効な設定引数 %s です。"
-+
-+#: ../clients/cli/connections.c:4796
- #, c-format
- msgid "Error: invalid or not allowed setting '%s': %s."
- msgstr "エラー: 無効または許可されていない設定 '%s' です: %s。"
-
--#: ../clients/cli/connections.c:4805 ../clients/cli/connections.c:4821
-+#: ../clients/cli/connections.c:4845 ../clients/cli/connections.c:4861
- #, c-format
- msgid "Error: '%s' is ambiguous (%s.%s or %s.%s)."
- msgstr "エラー:'%s' があいまいです (%s.%s または %s.%s)。"
-
--#: ../clients/cli/connections.c:4837
-+#: ../clients/cli/connections.c:4881
- #, c-format
- msgid "Error: invalid <setting>.<property> '%s'."
- msgstr "エラー: 無効な <setting>.<property> '%s' です。"
-
--#: ../clients/cli/connections.c:4876 ../clients/cli/connections.c:8545
-+#: ../clients/cli/connections.c:4919 ../clients/cli/connections.c:8567
- #, c-format
- msgid "Error: Failed to add '%s' connection: %s"
- msgstr "エラー: '%s' 接続の追加に失敗しました: %s"
-
--#: ../clients/cli/connections.c:4894
-+#: ../clients/cli/connections.c:4937
- #, c-format
- msgid ""
- "Warning: There is another connection with the name '%1$s'. Reference the "
-@@ -1294,66 +1308,66 @@ msgid ""
- msgid_plural "Warning: There are %3$u other connections with the name '%1$s'. Reference the connection by its uuid '%2$s'\n"
- msgstr[0] "警告: 名前が '%1$s' の接続が他に %3$u 個あります。uuid が '%2$s' の接続を参照してください。\n"
-
--#: ../clients/cli/connections.c:4903
-+#: ../clients/cli/connections.c:4946
- #, c-format
- msgid "Connection '%s' (%s) successfully added.\n"
- msgstr "接続 '%s' (%s) が正常に追加されました。\n"
-
--#: ../clients/cli/connections.c:4965 ../clients/cli/connections.c:6921
--#: ../clients/cli/connections.c:6922 ../clients/cli/devices.c:518
--#: ../clients/cli/devices.c:525 ../clients/cli/devices.c:1239
--#: ../clients/cli/general.c:123 ../clients/cli/utils.h:291
--#: ../clients/common/nm-client-utils.c:269
--#: ../clients/common/nm-meta-setting-desc.c:866
--#: ../clients/common/nm-meta-setting-desc.c:2682
-+#: ../clients/cli/connections.c:5008 ../clients/cli/connections.c:6934
-+#: ../clients/cli/connections.c:6935 ../clients/cli/devices.c:525
-+#: ../clients/cli/devices.c:532 ../clients/cli/devices.c:1250
-+#: ../clients/cli/general.c:93 ../clients/cli/utils.h:294
-+#: ../clients/common/nm-client-utils.c:303
-+#: ../clients/common/nm-meta-setting-desc.c:871
-+#: ../clients/common/nm-meta-setting-desc.c:2675
- msgid "no"
- msgstr "いいえ"
-
--#: ../clients/cli/connections.c:4966 ../clients/cli/connections.c:6921
--#: ../clients/cli/connections.c:6922 ../clients/cli/devices.c:517
--#: ../clients/cli/devices.c:524 ../clients/cli/devices.c:1239
--#: ../clients/cli/general.c:122 ../clients/cli/utils.h:291
--#: ../clients/common/nm-client-utils.c:268
--#: ../clients/common/nm-meta-setting-desc.c:866
--#: ../clients/common/nm-meta-setting-desc.c:2679
-+#: ../clients/cli/connections.c:5009 ../clients/cli/connections.c:6934
-+#: ../clients/cli/connections.c:6935 ../clients/cli/devices.c:524
-+#: ../clients/cli/devices.c:531 ../clients/cli/devices.c:1250
-+#: ../clients/cli/general.c:92 ../clients/cli/utils.h:294
-+#: ../clients/common/nm-client-utils.c:302
-+#: ../clients/common/nm-meta-setting-desc.c:871
-+#: ../clients/common/nm-meta-setting-desc.c:2672
- msgid "yes"
- msgstr "はい"
-
--#: ../clients/cli/connections.c:5052
-+#: ../clients/cli/connections.c:5095
- #, c-format
- msgid ""
- "You can specify this option more than once. Press <Enter> when you're done.\n"
- msgstr "このオプションは複数回指定することができます。終了したら <Enter> を押してください。\n"
-
- #. Ask for optional arguments.
--#: ../clients/cli/connections.c:5154
-+#: ../clients/cli/connections.c:5197
- #, 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:5160
-+#: ../clients/cli/connections.c:5203
- #, 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:5292 ../clients/cli/utils.c:279
-+#: ../clients/cli/connections.c:5335 ../clients/cli/utils.c:279
- #, c-format
- msgid "Error: value for '%s' argument is required."
- msgstr "エラー: '%s' 引数の値が必要です。"
-
--#: ../clients/cli/connections.c:5299
-+#: ../clients/cli/connections.c:5342
- #, c-format
- msgid "Error: 'save': %s."
- msgstr "エラー: 'save': %s。"
-
--#: ../clients/cli/connections.c:5384 ../clients/cli/connections.c:5395
-+#: ../clients/cli/connections.c:5427 ../clients/cli/connections.c:5438
- #, c-format
- msgid "Error: '%s' argument is required."
- msgstr "エラー: '%s' 引数が必要です。"
-
--#: ../clients/cli/connections.c:6354
-+#: ../clients/cli/connections.c:6384
- #, c-format
- msgid "['%s' setting values]\n"
- msgstr "['%s' 設定値]\n"
-@@ -1361,7 +1375,7 @@ msgstr "['%s' 設定値]\n"
- #. TRANSLATORS: do not translate command names and keywords before ::
- #. * However, you should translate terms enclosed in <>.
- #.
--#: ../clients/cli/connections.c:6463
-+#: ../clients/cli/connections.c:6493
- #, c-format
- msgid ""
- "---[ Main menu ]---\n"
-@@ -1392,7 +1406,7 @@ msgstr "---[ メインメニュー ]---\n"
- "nmcli <conf-option> <value> :: nmcli 設定\n"
- "quit :: nmcli を終了する\n"
-
--#: ../clients/cli/connections.c:6490
-+#: ../clients/cli/connections.c:6520
- #, c-format
- msgid ""
- "goto <setting>[.<prop>] | <prop> :: enter setting/property for editing\n"
-@@ -1410,7 +1424,7 @@ msgstr "goto <setting>[.<prop>] | <prop> :: 設定/プロパティーに入り
- " nmcli connection> goto secondaries\n"
- " nmcli> goto ipv4.addresses\n"
-
--#: ../clients/cli/connections.c:6497
-+#: ../clients/cli/connections.c:6527
- #, c-format
- msgid ""
- "remove <setting>[.<prop>] :: remove setting or reset property value\n"
-@@ -1429,7 +1443,7 @@ msgstr "remove <setting>[.<prop>] :: 設定を削除する、またはプロパ
- "例: nmcli> remove wifi-sec\n"
- " nmcli> remove eth.mtu\n"
-
--#: ../clients/cli/connections.c:6504
-+#: ../clients/cli/connections.c:6534
- #, c-format
- msgid ""
- "set [<setting>.<prop> <value>] :: set property value\n"
-@@ -1443,7 +1457,7 @@ msgstr "set [<setting>.<prop> <value>] :: プロパティー値を設定する\
- "\n"
- "例: nmcli> set con.id My connection\n"
-
--#: ../clients/cli/connections.c:6509
-+#: ../clients/cli/connections.c:6539
- #, c-format
- msgid ""
- "describe [<setting>.<prop>] :: describe property\n"
-@@ -1454,7 +1468,7 @@ msgstr "describe [<setting>.<prop>] :: プロパティー値を表示する\n"
- "\n"
- "プロパティー詳細を表示します。NM の設定およびプロパティーの全詳細については、nm-settings(5) の man ページを参照してください。\n"
-
--#: ../clients/cli/connections.c:6514
-+#: ../clients/cli/connections.c:6544
- #, c-format
- msgid ""
- "print [all] :: print setting or connection values\n"
-@@ -1468,7 +1482,7 @@ msgstr "print [all] :: 設定または接続値を出力する\n"
- "\n"
- "例: nmcli ipv4> print all\n"
-
--#: ../clients/cli/connections.c:6519
-+#: ../clients/cli/connections.c:6549
- #, c-format
- msgid ""
- "verify [all | fix] :: verify setting or connection validity\n"
-@@ -1491,7 +1505,7 @@ msgstr "verify [all | fix] :: 設定または接続の有効性を確認する\
- " nmcli> verify fix\n"
- " nmcli bond> verify\n"
-
--#: ../clients/cli/connections.c:6528
-+#: ../clients/cli/connections.c:6558
- #, c-format
- msgid ""
- "save [persistent|temporary] :: save the connection\n"
-@@ -1516,7 +1530,7 @@ msgstr "save [persistent|temporary] :: 接続を保存する\n"
- "永続的な接続を完全に削除する場合は、接続プロファイルを削除する\n"
- "必要があります。\n"
-
--#: ../clients/cli/connections.c:6539
-+#: ../clients/cli/connections.c:6569
- #, c-format
- msgid ""
- "activate [<ifname>] [/<ap>|<nsp>] :: activate the connection\n"
-@@ -1535,7 +1549,7 @@ msgstr "activate [<ifname>] [/<ap>|<nsp>] :: 接続をアクティベートす
- "<ifname> - このデバイスで接続をアクティベートする\n"
- "/<ap>|<nsp> - AP (Wi-Fi) または NSP (WiMAX) (<ifname> が指定されていない場合は / を先頭に付ける)\n"
-
--#: ../clients/cli/connections.c:6546 ../clients/cli/connections.c:6704
-+#: ../clients/cli/connections.c:6576 ../clients/cli/connections.c:6734
- #, c-format
- msgid ""
- "back :: go to upper menu level\n"
-@@ -1543,7 +1557,7 @@ msgid ""
- msgstr "back :: 一つ上のメニューレベルに移動\n"
- "\n"
-
--#: ../clients/cli/connections.c:6549
-+#: ../clients/cli/connections.c:6579
- #, c-format
- msgid ""
- "help/? [<command>] :: help for the nmcli commands\n"
-@@ -1551,7 +1565,7 @@ msgid ""
- msgstr "help/? [<command>] :: nmcli コマンドのヘルプ\n"
- "\n"
-
--#: ../clients/cli/connections.c:6552
-+#: ../clients/cli/connections.c:6582
- #, c-format
- msgid ""
- "nmcli [<conf-option> <value>] :: nmcli configuration\n"
-@@ -1577,7 +1591,7 @@ msgstr "nmcli [<conf-option> <value>] :: nmcli 設定\n"
- " nmcli> nmcli save-confirmation no\n"
- " nmcli> nmcli prompt-color 3\n"
-
--#: ../clients/cli/connections.c:6574 ../clients/cli/connections.c:6710
-+#: ../clients/cli/connections.c:6604 ../clients/cli/connections.c:6740
- #, c-format
- msgid ""
- "quit :: exit nmcli\n"
-@@ -1588,8 +1602,8 @@ msgstr "quit :: nmcli の終了\n"
- "\n"
- "nmcli を終了します。変更した接続の保存を行なっていない場合、この動作の確認が求められます。\n"
-
--#: ../clients/cli/connections.c:6579 ../clients/cli/connections.c:6715
--#: ../clients/cli/connections.c:7126 ../clients/cli/connections.c:8129
-+#: ../clients/cli/connections.c:6609 ../clients/cli/connections.c:6745
-+#: ../clients/cli/connections.c:7140 ../clients/cli/connections.c:8149
- #, c-format
- msgid "Unknown command: '%s'\n"
- msgstr "不明なコマンド: '%s'\n"
-@@ -1597,7 +1611,7 @@ msgstr "不明なコマンド: '%s'\n"
- #. TRANSLATORS: do not translate command names and keywords before ::
- #. * However, you should translate terms enclosed in <>.
- #.
--#: ../clients/cli/connections.c:6644
-+#: ../clients/cli/connections.c:6674
- #, c-format
- msgid ""
- "---[ Property menu ]---\n"
-@@ -1622,7 +1636,7 @@ msgstr "---[ プロパティーメニュー]---\n"
- "help/? [<command>] :: このヘルプまたはコマンドの詳細を表示\n"
- "quit :: nmcli の終了\n"
-
--#: ../clients/cli/connections.c:6669
-+#: ../clients/cli/connections.c:6699
- #, c-format
- msgid ""
- "set [<value>] :: set new value\n"
-@@ -1632,7 +1646,7 @@ msgstr "set [<value>] :: 新しい値の設定\n"
- "\n"
- "このプロパティーに指定した <value> を設定します。\n"
-
--#: ../clients/cli/connections.c:6673
-+#: ../clients/cli/connections.c:6703
- #, c-format
- msgid ""
- "add [<value>] :: append new value to the property\n"
-@@ -1644,7 +1658,7 @@ msgstr "add [<value>] :: プロパティーに新しい値を追加する\n"
- "\n"
- "このコマンドを実行すると、プロパティーのタイプがコンテナーの場合に、指定した <value> がこのプロパティーに追加されます。単一値のプロパティーの場合は、そのプロパティー値が置換されます ('set' の場合と同じ)。\n"
-
--#: ../clients/cli/connections.c:6679
-+#: ../clients/cli/connections.c:6709
- #, c-format
- msgid ""
- "change :: change current value\n"
-@@ -1654,7 +1668,7 @@ msgstr "change :: 現在の値を変更\n"
- "\n"
- "現在の値を表示し、その値を変更することができます。\n"
-
--#: ../clients/cli/connections.c:6683
-+#: ../clients/cli/connections.c:6713
- #, c-format
- msgid ""
- "remove [<value>|<index>|<option name>] :: delete the value\n"
-@@ -1685,7 +1699,7 @@ msgstr "remove [<value>|<index>|<option name>] :: 値を削除する\n"
- " nmcli bond.options> remove downdelay\n"
- "\n"
-
--#: ../clients/cli/connections.c:6694
-+#: ../clients/cli/connections.c:6724
- #, c-format
- msgid ""
- "describe :: describe property\n"
-@@ -1696,7 +1710,7 @@ msgstr "describe :: プロパティーの詳細表示\n"
- "\n"
- "プロパティーの詳細を表示します。NM 設定とプロパティーの詳細は、nm-settings(5) man ページを参照してください。\n"
-
--#: ../clients/cli/connections.c:6699
-+#: ../clients/cli/connections.c:6729
- #, c-format
- msgid ""
- "print [property|setting|connection] :: print property (setting, connection) "
-@@ -1708,7 +1722,7 @@ msgstr "print [property|setting|connection] :: プロパティー値の表示 (
- "\n"
- "プロパティー値を表示します。引数を指定すると、設定または接続全体の値を表示させることもできます。\n"
-
--#: ../clients/cli/connections.c:6707
-+#: ../clients/cli/connections.c:6737
- #, c-format
- msgid ""
- "help/? [<command>] :: help for nmcli commands\n"
-@@ -1716,88 +1730,83 @@ msgid ""
- msgstr "help/? [<command>] :: nmcli コマンドのヘルプ\n"
- "\n"
-
--#: ../clients/cli/connections.c:6804
-+#: ../clients/cli/connections.c:6834
- #, c-format
- msgid "Error: Connection activation failed.\n"
- msgstr "エラー: 接続のアクティベートに失敗しました。\n"
-
--#: ../clients/cli/connections.c:6901
--#, c-format
--msgid "Error: setting '%s' is mandatory and cannot be removed.\n"
--msgstr "エラー: 設定 '%s' は必須のため削除できません。\n"
--
- #. TRANSLATORS: status line in nmcli connection editor
--#: ../clients/cli/connections.c:6919
-+#: ../clients/cli/connections.c:6932
- #, 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:6955
-+#: ../clients/cli/connections.c:6968
- #, c-format
- msgid "The connection is not saved. Do you really want to quit? %s"
- msgstr "この接続は保存されません。本当に終了しますか? %s"
-
--#: ../clients/cli/connections.c:6996
-+#: ../clients/cli/connections.c:7009
- #, c-format
- msgid ""
- "The connection profile has been removed from another client. You may type "
- "'save' in the main menu to restore it.\n"
- msgstr "この接続プロファイルは別のクライアントからは削除されています。メインメニューで 'save' と入力すると元に戻すことができます。\n"
-
--#: ../clients/cli/connections.c:7030 ../clients/cli/connections.c:7424
--#: ../clients/cli/connections.c:7488
-+#: ../clients/cli/connections.c:7043 ../clients/cli/connections.c:7437
-+#: ../clients/cli/connections.c:7501
- #, c-format
- msgid "Allowed values for '%s' property: %s\n"
- msgstr "'%s' プロパティーに使用できる値: %s\n"
-
--#: ../clients/cli/connections.c:7034 ../clients/cli/connections.c:7428
--#: ../clients/cli/connections.c:7492
-+#: ../clients/cli/connections.c:7047 ../clients/cli/connections.c:7441
-+#: ../clients/cli/connections.c:7505
- #, c-format
- msgid "Enter '%s' value: "
- msgstr "'%s' 値を入力してください: "
-
--#: ../clients/cli/connections.c:7048 ../clients/cli/connections.c:7066
--#: ../clients/cli/connections.c:7437 ../clients/cli/connections.c:7505
-+#: ../clients/cli/connections.c:7061 ../clients/cli/connections.c:7079
-+#: ../clients/cli/connections.c:7450 ../clients/cli/connections.c:7518
- #, c-format
- msgid "Error: failed to set '%s' property: %s\n"
- msgstr "エラー: '%s' プロパティーの設定に失敗しました: %s\n"
-
--#: ../clients/cli/connections.c:7057
-+#: ../clients/cli/connections.c:7070
- #, c-format
- msgid "Edit '%s' value: "
- msgstr "'%s' 値の編集: "
-
--#: ../clients/cli/connections.c:7080 ../clients/cli/settings.c:400
-+#: ../clients/cli/connections.c:7093 ../clients/cli/settings.c:400
- #, c-format
- msgid "Error: %s\n"
- msgstr "エラー: %s\n"
-
--#: ../clients/cli/connections.c:7099
-+#: ../clients/cli/connections.c:7112
- #, c-format
- msgid "Unknown command argument: '%s'\n"
- msgstr "不明なコマンド引数: '%s'\n"
-
--#: ../clients/cli/connections.c:7190
-+#: ../clients/cli/connections.c:7204
- #, c-format
- msgid "Available settings: %s\n"
- msgstr "使用可能な設定: %s\n"
-
--#: ../clients/cli/connections.c:7202
-+#: ../clients/cli/connections.c:7216
- #, c-format
- msgid "Error: invalid setting name; %s\n"
- msgstr "エラー: 無効な設定名; %s\n"
-
--#: ../clients/cli/connections.c:7220
-+#: ../clients/cli/connections.c:7233
- #, c-format
- msgid "Available properties: %s\n"
- msgstr "利用可能なプロパティー: %s\n"
-
--#: ../clients/cli/connections.c:7228
-+#: ../clients/cli/connections.c:7242
- #, c-format
- msgid "Error: property %s\n"
- msgstr "エラー: プロパティー %s\n"
-
--#: ../clients/cli/connections.c:7273
-+#: ../clients/cli/connections.c:7286
- #, c-format
- msgid ""
- "Saving the connection with 'autoconnect=yes'. That might result in an "
-@@ -1806,426 +1815,426 @@ msgid ""
- msgstr "'autoconnect=yes' でこの接続を保存しています。これにより直ちに接続がアクティベートされる可能性があります。\n"
- "本当に保存しますか? %s"
-
--#: ../clients/cli/connections.c:7358
-+#: ../clients/cli/connections.c:7371
- #, c-format
- msgid "You may edit the following settings: %s\n"
- msgstr "次の設定を変更することができます: %s\n"
-
--#: ../clients/cli/connections.c:7389
-+#: ../clients/cli/connections.c:7402
- #, 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:7441 ../clients/cli/connections.c:7709
--#: ../clients/cli/connections.c:7741
-+#: ../clients/cli/connections.c:7454 ../clients/cli/connections.c:7729
-+#: ../clients/cli/connections.c:7761
- #, c-format
- msgid "Error: no setting selected; valid are [%s]\n"
- msgstr "エラー: 設定が選択されていません。有効な設定は [%s] になります\n"
-
--#: ../clients/cli/connections.c:7442
-+#: ../clients/cli/connections.c:7455
- #, c-format
- msgid "use 'goto <setting>' first, or 'set <setting>.<property>'\n"
- msgstr "まず先に 'goto <setting>' を使用するか、'set <setting>.<property>' を使用してください。\n"
-
--#: ../clients/cli/connections.c:7457 ../clients/cli/connections.c:7634
--#: ../clients/cli/connections.c:7731
-+#: ../clients/cli/connections.c:7470 ../clients/cli/connections.c:7647
-+#: ../clients/cli/connections.c:7751
- #, c-format
- msgid "Error: invalid setting argument '%s'; valid are [%s]\n"
- msgstr "エラー: 無効な設定引数 %s です。[%s] が有効な引数になります\n"
-
--#: ../clients/cli/connections.c:7466
-+#: ../clients/cli/connections.c:7479
- #, c-format
- msgid "Error: missing setting for '%s' property\n"
- msgstr "エラー: '%s' プロパティー用の設定がありません\n"
-
--#: ../clients/cli/connections.c:7473
-+#: ../clients/cli/connections.c:7486
- #, c-format
- msgid "Error: invalid property: %s\n"
- msgstr "エラー: 無効なプロパティー: %s\n"
-
--#: ../clients/cli/connections.c:7537
-+#: ../clients/cli/connections.c:7550
- #, c-format
- msgid "Error: unknown setting '%s'\n"
- msgstr "エラー: 不明な設定 '%s'\n"
-
--#: ../clients/cli/connections.c:7562
-+#: ../clients/cli/connections.c:7575
- #, c-format
- msgid "You may edit the following properties: %s\n"
- msgstr "変更できるのは次のプロパティーになります: %s\n"
-
--#: ../clients/cli/connections.c:7607 ../clients/cli/connections.c:7662
-+#: ../clients/cli/connections.c:7620 ../clients/cli/connections.c:7679
- #, c-format
- msgid "Error: failed to remove value of '%s': %s\n"
- msgstr "エラー: '%s' の値の削除に失敗しました: %s\n"
-
--#: ../clients/cli/connections.c:7612
-+#: ../clients/cli/connections.c:7625
- #, c-format
- msgid "Error: no argument given; valid are [%s]\n"
- msgstr "エラー: 引数が指定されていません。[%s] が有効な引数になります\n"
-
--#: ../clients/cli/connections.c:7631
-+#: ../clients/cli/connections.c:7644
- #, c-format
- msgid "Setting '%s' is not present in the connection.\n"
- msgstr "この接続には、設定 '%s' はありません。\n"
-
--#: ../clients/cli/connections.c:7685
-+#: ../clients/cli/connections.c:7705
- #, c-format
- msgid "Error: %s properties, nor it is a setting name.\n"
- msgstr "エラー: %s プロパティー、設定名でもありません。\n"
-
--#: ../clients/cli/connections.c:7710 ../clients/cli/connections.c:7742
-+#: ../clients/cli/connections.c:7730 ../clients/cli/connections.c:7762
- #, c-format
- msgid "use 'goto <setting>' first, or 'describe <setting>.<property>'\n"
- msgstr "まず先に 'goto <setting>' を使用するか、'describe <setting>.<property>' を使用してください\n"
-
--#: ../clients/cli/connections.c:7765
-+#: ../clients/cli/connections.c:7785
- #, c-format
- msgid "Error: invalid property: %s, neither a valid setting name.\n"
- msgstr "エラー: 無効なプロパティー: %s、有効な設定名でもありません。\n"
-
--#: ../clients/cli/connections.c:7795
-+#: ../clients/cli/connections.c:7815
- #, c-format
- msgid "Error: unknown setting: '%s'\n"
- msgstr "エラー: 不明な設定: '%s'\n"
-
--#: ../clients/cli/connections.c:7800
-+#: ../clients/cli/connections.c:7820
- #, c-format
- msgid "Error: '%s' setting not present in the connection\n"
- msgstr "エラー: この接続には、設定 '%s' がありません。\n"
-
--#: ../clients/cli/connections.c:7831
-+#: ../clients/cli/connections.c:7851
- #, c-format
- msgid "Error: invalid property: %s%s\n"
- msgstr "エラー: 無効なプロパティー: %s%s\n"
-
--#: ../clients/cli/connections.c:7833
-+#: ../clients/cli/connections.c:7853
- msgid ", neither a valid setting name"
- msgstr "有効な設定名でもありません。"
-
--#: ../clients/cli/connections.c:7849
-+#: ../clients/cli/connections.c:7869
- #, c-format
- msgid "Invalid verify option: %s\n"
- msgstr "無効な検証オプション: %s\n"
-
--#: ../clients/cli/connections.c:7858
-+#: ../clients/cli/connections.c:7878
- #, c-format
- msgid "Verify setting '%s': %s\n"
- msgstr "設定 '%s' の確認: %s\n"
-
--#: ../clients/cli/connections.c:7874
-+#: ../clients/cli/connections.c:7894
- #, c-format
- msgid "Verify connection: %s\n"
- msgstr "接続の確認: %s\n"
-
--#: ../clients/cli/connections.c:7877
-+#: ../clients/cli/connections.c:7897
- #, c-format
- msgid "The error cannot be fixed automatically.\n"
- msgstr "エラーを自動的に修正できません。\n"
-
--#: ../clients/cli/connections.c:7897
-+#: ../clients/cli/connections.c:7917
- #, c-format
- msgid "Error: invalid argument '%s'\n"
- msgstr "エラー: 無効な引数 '%s'\n"
-
--#: ../clients/cli/connections.c:7947
-+#: ../clients/cli/connections.c:7967
- #, c-format
- msgid "Error: Failed to save '%s' (%s) connection: %s\n"
- msgstr "エラー: '%s' (%s) 接続の保存に失敗しました: %s\n"
-
--#: ../clients/cli/connections.c:7953
-+#: ../clients/cli/connections.c:7973
- #, c-format
- msgid "Error: Timeout saving '%s' (%s) connection\n"
- msgstr "エラー: %s' (%s) 接続の保存に失敗しました\n"
-
--#: ../clients/cli/connections.c:7958
-+#: ../clients/cli/connections.c:7978
- #, c-format
- msgid "Connection '%s' (%s) successfully saved.\n"
- msgstr "接続 '%s' (%s) が正常に保存されました。\n"
-
--#: ../clients/cli/connections.c:7959
-+#: ../clients/cli/connections.c:7979
- #, c-format
- msgid "Connection '%s' (%s) successfully updated.\n"
- msgstr "接続 '%s' (%s) が正常に更新されました。\n"
-
--#: ../clients/cli/connections.c:7992
-+#: ../clients/cli/connections.c:8012
- #, c-format
- msgid "Error: connection verification failed: %s\n"
- msgstr "エラー: 接続の確認に失敗しました: %s\n"
-
--#: ../clients/cli/connections.c:7993
-+#: ../clients/cli/connections.c:8013
- msgid "(unknown error)"
- msgstr "(不明なエラー)"
-
--#: ../clients/cli/connections.c:7994
-+#: ../clients/cli/connections.c:8014
- #, c-format
- msgid "You may try running 'verify fix' to fix errors.\n"
- msgstr "エラーを修正するために 'verify fix' の実行を試行できます。\n"
-
- #. TRANSLATORS: do not translate 'save', leave it as it is
--#: ../clients/cli/connections.c:8017
-+#: ../clients/cli/connections.c:8037
- #, c-format
- msgid "Error: connection is not saved. Type 'save' first.\n"
- msgstr "エラー: 接続は保存されていません。まず 'save' と入力します。\n"
-
--#: ../clients/cli/connections.c:8021
-+#: ../clients/cli/connections.c:8041
- #, c-format
- msgid "Error: connection is not valid: %s\n"
- msgstr "エラー: 接続は無効です: %s\n"
-
--#: ../clients/cli/connections.c:8031
-+#: ../clients/cli/connections.c:8051
- #, c-format
- msgid "Error: Cannot activate connection: %s.\n"
- msgstr "エラー: 接続をアクティベートできません: %s。\n"
-
--#: ../clients/cli/connections.c:8040
-+#: ../clients/cli/connections.c:8060
- #, c-format
- msgid "Error: Failed to activate '%s' (%s) connection: %s\n"
- msgstr "エラー: '%s' (%s) 接続のアクティベートに失敗しました: %s\n"
-
--#: ../clients/cli/connections.c:8047
-+#: ../clients/cli/connections.c:8067
- msgid "Monitoring connection activation (press any key to continue)\n"
- msgstr "モニタリング接続のアクティベート (いずれかのキーを押して続行する)\n"
-
--#: ../clients/cli/connections.c:8083
-+#: ../clients/cli/connections.c:8103
- #, c-format
- msgid "Error: status-line: %s\n"
- msgstr "エラー: status-line: %s\n"
-
--#: ../clients/cli/connections.c:8091
-+#: ../clients/cli/connections.c:8111
- #, c-format
- msgid "Error: save-confirmation: %s\n"
- msgstr "エラー: save-confirmation: %s\n"
-
--#: ../clients/cli/connections.c:8099
-+#: ../clients/cli/connections.c:8119
- #, c-format
- msgid "Error: show-secrets: %s\n"
- msgstr "エラー: show-secrets: %s\n"
-
--#: ../clients/cli/connections.c:8106
-+#: ../clients/cli/connections.c:8126
- #, c-format
- msgid "Current nmcli configuration:\n"
- msgstr "現在の nmcli 設定:\n"
-
--#: ../clients/cli/connections.c:8114
-+#: ../clients/cli/connections.c:8134
- #, c-format
- msgid "Invalid configuration option '%s'; allowed [%s]\n"
- msgstr "無効な設定オプション '%s'; [%s] は指定できます\n"
-
--#: ../clients/cli/connections.c:8335
-+#: ../clients/cli/connections.c:8356
- #, 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:8349 ../clients/cli/connections.c:8513
-+#: ../clients/cli/connections.c:8371 ../clients/cli/connections.c:8535
- #, c-format
- msgid "Error: Unknown connection '%s'."
- msgstr "エラー: 不明な接続 '%s' です。"
-
--#: ../clients/cli/connections.c:8365
-+#: ../clients/cli/connections.c:8388
- #, c-format
- msgid "Warning: editing existing connection '%s'; 'type' argument is ignored\n"
- msgstr "警告: 既存の接続 '%s' を編集しています。'type' 引数は無視されます\n"
-
--#: ../clients/cli/connections.c:8368
-+#: ../clients/cli/connections.c:8391
- #, c-format
- msgid ""
- "Warning: editing existing connection '%s'; 'con-name' argument is ignored\n"
- msgstr "警告: 既存の接続 '%s' を編集しています。'con-name' 引数は無視されます\n"
-
--#: ../clients/cli/connections.c:8395
-+#: ../clients/cli/connections.c:8418
- #, c-format
- msgid "Valid connection types: %s\n"
- msgstr "有効な接続タイプ: %s\n"
-
--#: ../clients/cli/connections.c:8397
-+#: ../clients/cli/connections.c:8420
- #, c-format
- msgid "Error: invalid connection type; %s\n"
- msgstr "エラー: 無効な接続タイプ; %s\n"
-
--#: ../clients/cli/connections.c:8433
-+#: ../clients/cli/connections.c:8456
- #, c-format
- msgid "===| nmcli interactive connection editor |==="
- msgstr "===| nmcli インテラクティブ接続エディター |==="
-
--#: ../clients/cli/connections.c:8436
-+#: ../clients/cli/connections.c:8459
- #, c-format
- msgid "Editing existing '%s' connection: '%s'"
- msgstr "既存の '%s' 接続を編集中: '%s'"
-
--#: ../clients/cli/connections.c:8438
-+#: ../clients/cli/connections.c:8461
- #, c-format
- msgid "Adding a new '%s' connection"
- msgstr "新規の '%s' 接続を追加中"
-
- #. TRANSLATORS: do not translate 'help', leave it as it is
--#: ../clients/cli/connections.c:8441
-+#: ../clients/cli/connections.c:8464
- #, c-format
- msgid "Type 'help' or '?' for available commands."
- msgstr "使用できるコマンドを表示するには 'help' または '?' を入力します。"
-
- #. TRANSLATORS: do not translate 'print', leave it as it is
--#: ../clients/cli/connections.c:8444
-+#: ../clients/cli/connections.c:8467
- #, c-format
- msgid "Type 'print' to show all the connection properties."
- msgstr "すべての接続プロパティーを表示するには 'print' とタイプします。"
-
- #. TRANSLATORS: do not translate 'describe', leave it as it is
--#: ../clients/cli/connections.c:8447
-+#: ../clients/cli/connections.c:8470
- #, c-format
- msgid "Type 'describe [<setting>.<prop>]' for detailed property description."
- msgstr "プロパティー詳細を表示するには、'describe [<setting>.<prop>]' を入力します。"
-
--#: ../clients/cli/connections.c:8475
-+#: ../clients/cli/connections.c:8498
- #, c-format
- msgid "Error: Failed to modify connection '%s': %s"
- msgstr "エラー: 接続 '%s' の変更に失敗しました: %s"
-
--#: ../clients/cli/connections.c:8481
-+#: ../clients/cli/connections.c:8504
- #, c-format
- msgid "Connection '%s' (%s) successfully modified.\n"
- msgstr "接続 '%s' (%s) が正常に変更されました。\n"
-
--#: ../clients/cli/connections.c:8549
-+#: ../clients/cli/connections.c:8571
- #, c-format
- msgid "%s (%s) cloned as %s (%s).\n"
- msgstr "%s (%s) が %s (%s) としてクローンされました。\n"
-
--#: ../clients/cli/connections.c:8608
-+#: ../clients/cli/connections.c:8631
- msgid "New connection name: "
- msgstr "新規の接続名: "
-
--#: ../clients/cli/connections.c:8610
-+#: ../clients/cli/connections.c:8633
- #, c-format
- msgid "Error: <new name> argument is missing."
- msgstr "エラー: <new name> 引数がありません。"
-
--#: ../clients/cli/connections.c:8615 ../clients/cli/connections.c:9101
-+#: ../clients/cli/connections.c:8639 ../clients/cli/connections.c:9124
- #, c-format
- msgid "Error: unknown extra argument: '%s'."
- msgstr "エラー: 不明な追加の引数: '%s'。"
-
--#: ../clients/cli/connections.c:8648
-+#: ../clients/cli/connections.c:8671
- #, c-format
- msgid "Error: not all connections deleted."
- msgstr "エラー: 一部の接続が削除されていません。"
-
--#: ../clients/cli/connections.c:8649
-+#: ../clients/cli/connections.c:8672
- #, c-format
- msgid "Error: Connection deletion failed: %s\n"
- msgstr "エラー: 接続の削除に失敗しました: %s\n"
-
--#: ../clients/cli/connections.c:8705 ../clients/cli/connections.c:8826
-+#: ../clients/cli/connections.c:8728 ../clients/cli/connections.c:8848
- #, c-format
- msgid "Error: %s.\n"
- msgstr "エラー: %s。\n"
-
--#: ../clients/cli/connections.c:8706 ../clients/cli/connections.c:8827
-+#: ../clients/cli/connections.c:8729 ../clients/cli/connections.c:8849
- #, c-format
- msgid "Error: not all connections found."
- msgstr "エラー: 一部の接続が見つかりません。"
-
- #. truncate trailing ", "
--#: ../clients/cli/connections.c:8757
-+#: ../clients/cli/connections.c:8780
- #, c-format
- msgid "Error: cannot delete unknown connection(s): %s."
- msgstr "エラー: 不明な接続を削除できません: %s。"
-
--#: ../clients/cli/connections.c:8767
-+#: ../clients/cli/connections.c:8789
- #, c-format
- msgid "%s: connection profile changed\n"
- msgstr "%s: 接続プロファイルが変更されました\n"
-
--#: ../clients/cli/connections.c:8793
-+#: ../clients/cli/connections.c:8815
- #, c-format
- msgid "%s: connection profile created\n"
- msgstr "%s: 接続プロファイルが作成されました\n"
-
--#: ../clients/cli/connections.c:8802
-+#: ../clients/cli/connections.c:8824
- #, c-format
- msgid "%s: connection profile removed\n"
- msgstr "%s: 接続プロファイルが削除されました\n"
-
--#: ../clients/cli/connections.c:8873
-+#: ../clients/cli/connections.c:8894
- #, c-format
- msgid "Error: failed to reload connections: %s."
- msgstr "エラー: 接続の再ロードに失敗しました: %s。"
-
--#: ../clients/cli/connections.c:8905
-+#: ../clients/cli/connections.c:8924
- #, c-format
- msgid "Error: failed to load connection: %s."
- msgstr "エラー: 接続のロードに失敗しました: %s。"
-
--#: ../clients/cli/connections.c:8913
-+#: ../clients/cli/connections.c:8932
- #, c-format
- msgid "Could not load file '%s'\n"
- msgstr "'%s' ファイルを読み込めませんでした。\n"
-
--#: ../clients/cli/connections.c:8920
-+#: ../clients/cli/connections.c:8936
- msgid "File to import: "
- msgstr "インポートするファイル: "
-
--#: ../clients/cli/connections.c:8953
-+#: ../clients/cli/connections.c:8969
- #, c-format
- msgid "Error: No arguments provided."
- msgstr "エラー: 引数がありません。"
-
--#: ../clients/cli/connections.c:8984
-+#: ../clients/cli/connections.c:9002
- #, c-format
- msgid "Warning: 'type' already specified, ignoring extra one.\n"
- msgstr "警告: 'type' はすでに指定されています。追加のものは無視されます。\n"
-
--#: ../clients/cli/connections.c:8998
-+#: ../clients/cli/connections.c:9017
- #, c-format
- msgid "Warning: 'file' already specified, ignoring extra one.\n"
- msgstr "警告: 'file' はすでに指定されています。追加のものは無視されます。\n"
-
--#: ../clients/cli/connections.c:9011
-+#: ../clients/cli/connections.c:9031
- #, c-format
- msgid "Error: 'type' argument is required."
- msgstr "エラー: 'type' 引数が必要です。"
-
--#: ../clients/cli/connections.c:9015
-+#: ../clients/cli/connections.c:9036
- #, c-format
- msgid "Error: 'file' argument is required."
- msgstr "エラー: 'file' 引数が必要です。"
-
--#: ../clients/cli/connections.c:9024
-+#: ../clients/cli/connections.c:9046
- #, c-format
- msgid "Error: failed to find VPN plugin for %s."
- msgstr "エラー: %s 用の VPN プラグインが見つかりません。"
-
--#: ../clients/cli/connections.c:9031 ../clients/cli/connections.c:9122
-+#: ../clients/cli/connections.c:9054 ../clients/cli/connections.c:9145
- #, c-format
- msgid "Error: failed to load VPN plugin: %s."
- msgstr "エラー: VPN プラグインのロードに失敗しました: %s。"
-
--#: ../clients/cli/connections.c:9040
-+#: ../clients/cli/connections.c:9064
- #, c-format
- msgid "Error: failed to import '%s': %s."
- msgstr "エラー: '%s' のインポートに失敗しました: %s。"
-
--#: ../clients/cli/connections.c:9108
-+#: ../clients/cli/connections.c:9131
- msgid "Output file name: "
- msgstr "出力ファイル名: "
-
--#: ../clients/cli/connections.c:9113
-+#: ../clients/cli/connections.c:9136
- #, c-format
- msgid "Error: the connection is not VPN."
- msgstr "エラー: 接続は VPN ではありません。"
-
--#: ../clients/cli/connections.c:9135
-+#: ../clients/cli/connections.c:9158
- #, c-format
- msgid "Error: failed to create temporary file %s."
- msgstr "エラー: 一時ファイル %s の作成に失敗しました。"
-
--#: ../clients/cli/connections.c:9143
-+#: ../clients/cli/connections.c:9166
- #, c-format
- msgid "Error: failed to export '%s': %s."
- msgstr "エラー: '%s' のエクスポートに失敗しました: %s。"
-
--#: ../clients/cli/connections.c:9155
-+#: ../clients/cli/connections.c:9178
- #, c-format
- msgid "Error: failed to read temporary file '%s': %s."
- msgstr "エラー: 一時ファイル '%s' の読み取りに失敗しました: %s。"
-@@ -2239,29 +2248,29 @@ msgstr "インターフェース: "
- msgid "Interface(s): "
- msgstr "インターフェース: "
-
--#: ../clients/cli/devices.c:59 ../clients/cli/devices.c:1267
-+#: ../clients/cli/devices.c:64 ../clients/cli/devices.c:1278
- msgid "(none)"
- msgstr "（なし）"
-
--#: ../clients/cli/devices.c:166 ../clients/cli/devices.c:173
-+#: ../clients/cli/devices.c:171 ../clients/cli/devices.c:178
- msgid "(unknown)"
- msgstr "(不明)"
-
--#: ../clients/cli/devices.c:322
-+#: ../clients/cli/devices.c:329
- #, c-format
- msgid "<invisible> | %s"
- msgstr "<invisible> | %s"
-
--#: ../clients/cli/devices.c:323
-+#: ../clients/cli/devices.c:330
- msgid "<invisible>"
- msgstr "<invisible>"
-
--#: ../clients/cli/devices.c:424
-+#: ../clients/cli/devices.c:431
- #, c-format
- msgid "%u Mb/s"
- msgstr "%u Mb/s"
-
--#: ../clients/cli/devices.c:725
-+#: ../clients/cli/devices.c:732
- #, c-format
- msgid ""
- "Usage: nmcli device { COMMAND | help }\n"
-@@ -2339,7 +2348,7 @@ msgstr "使い方: nmcli device { COMMAND | help }\n"
- " lldp [list [ifname <ifname>]]\n"
- "\n"
-
--#: ../clients/cli/devices.c:749
-+#: ../clients/cli/devices.c:756
- #, c-format
- msgid ""
- "Usage: nmcli device status { help }\n"
-@@ -2367,7 +2376,7 @@ msgstr "使い方: nmcli device status { help }\n"
- "'status' はデフォルトのコマンドで、'nmcli device' を実行すると 'nmcli device status' を実行したことになります。\n"
- "\n"
-
--#: ../clients/cli/devices.c:764
-+#: ../clients/cli/devices.c:771
- #, c-format
- msgid ""
- "Usage: nmcli device show { ARGUMENTS | help }\n"
-@@ -2385,7 +2394,7 @@ msgstr "使い方: nmcli device show { 引数 | help }\n"
- "このコマンドですべてのデバイスまたは指定デバイスの詳細を表示させます。\n"
- "\n"
-
--#: ../clients/cli/devices.c:775
-+#: ../clients/cli/devices.c:782
- #, c-format
- msgid ""
- "Usage: nmcli device connect { ARGUMENTS | help }\n"
-@@ -2406,7 +2415,7 @@ msgstr "使い方: nmcli device connect { 引数 | help }\n"
- "auto-connect に設定されていない接続についても考慮されます。\n"
- "\n"
-
--#: ../clients/cli/devices.c:787
-+#: ../clients/cli/devices.c:794
- #, c-format
- msgid ""
- "Usage: nmcli device reapply { ARGUMENTS | help }\n"
-@@ -2424,7 +2433,7 @@ msgstr "使い方: n nmcli device reapply { 引数 | help }\n"
- "行った変更で、デバイスの更新を試行します。\n"
- "\n"
-
--#: ../clients/cli/devices.c:798
-+#: ../clients/cli/devices.c:805
- #, c-format
- msgid ""
- "Usage: nmcli device modify { ARGUMENTS | --help }\n"
-@@ -2461,7 +2470,7 @@ msgstr "使い方: nmcli device modify { 引数 | --help }\n"
- "nmcli dev mod em1 -ipv4.dns 1\n"
- "nmcli dev mod em1 -ipv6.addr \"abbe::cafe/56\"\n"
-
--#: ../clients/cli/devices.c:818
-+#: ../clients/cli/devices.c:825
- #, c-format
- msgid ""
- "Usage: nmcli device disconnect { ARGUMENTS | help }\n"
-@@ -2481,7 +2490,7 @@ msgstr "使い方: nmcli device disconnect { 引数 | help }\n"
- "それ以降の接続が自動アクティベートされることがなくなります。\n"
- "\n"
-
--#: ../clients/cli/devices.c:830
-+#: ../clients/cli/devices.c:837
- #, c-format
- msgid ""
- "Usage: nmcli device delete { ARGUMENTS | help }\n"
-@@ -2503,7 +2512,7 @@ msgstr "使い方: nmcli device delete { 引数 | help }\n"
- "コマンドで削除できません。\n"
- "\n"
-
--#: ../clients/cli/devices.c:843
-+#: ../clients/cli/devices.c:850
- #, c-format
- msgid ""
- "Usage: nmcli device set { ARGUMENTS | help }\n"
-@@ -2525,7 +2534,7 @@ msgstr "使い方: nmcli device set { ARGUMENTS | help }\n"
- "デバイスプロパティーを変更します。\n"
- "\n"
-
--#: ../clients/cli/devices.c:856
-+#: ../clients/cli/devices.c:863
- #, c-format
- msgid ""
- "Usage: nmcli device monitor { ARGUMENTS | help }\n"
-@@ -2545,7 +2554,7 @@ msgstr "使い方: nmcli device monitor { 引数 | help }\n"
- "インターフェースが指定されない場合は、すべてのデバイスを監視します。\n"
- "\n"
-
--#: ../clients/cli/devices.c:868
-+#: ../clients/cli/devices.c:875
- #, c-format
- msgid ""
- "Usage: nmcli device wifi { ARGUMENTS | help }\n"
-@@ -2642,7 +2651,7 @@ msgstr "使い方: nmcli device wifi { 引数 | help }\n"
- "表示するためのコマンドは 'nmcli device wifi list' です。\n"
- "\n"
-
--#: ../clients/cli/devices.c:915
-+#: ../clients/cli/devices.c:922
- #, c-format
- msgid ""
- "Usage: nmcli device lldp { ARGUMENTS | help }\n"
-@@ -2661,464 +2670,465 @@ msgstr "使い方: nmcli device lldp { 引数 | help }\n"
- "特定のインターフェースの近接デバイスを一覧表示できます。\n"
- "\n"
-
--#: ../clients/cli/devices.c:1013
-+#: ../clients/cli/devices.c:1021
- #, c-format
- msgid "Error: No interface specified."
- msgstr "エラー: インターフェースが指定されていません。"
-
--#: ../clients/cli/devices.c:1036
-+#: ../clients/cli/devices.c:1044
- #, c-format
- msgid "Warning: argument '%s' is duplicated.\n"
- msgstr "警告: 引数 '%s' が重複しています。\n"
-
--#: ../clients/cli/devices.c:1039
-+#: ../clients/cli/devices.c:1047
- #, c-format
- msgid "Error: Device '%s' not found.\n"
- msgstr "エラー: デバイス'%s' が見つかりません。\n"
-
--#: ../clients/cli/devices.c:1040
-+#: ../clients/cli/devices.c:1048
- #, c-format
- msgid "Error: not all devices found."
- msgstr "エラー: 一部のデバイスが見つかりません。"
-
--#: ../clients/cli/devices.c:1071
-+#: ../clients/cli/devices.c:1079
- msgid "No interface specified"
- msgstr "インターフェースが指定されていません"
-
--#: ../clients/cli/devices.c:1090
-+#: ../clients/cli/devices.c:1098
- #, c-format
- msgid "Device '%s' not found"
- msgstr "デバイス'%s' が見つかりません"
-
--#: ../clients/cli/devices.c:1186
-+#: ../clients/cli/devices.c:1194
- #, c-format
- msgid "%u MHz"
- msgstr "%u MHz"
-
--#: ../clients/cli/devices.c:1187
-+#: ../clients/cli/devices.c:1195
- #, c-format
- msgid "%u Mbit/s"
- msgstr "%u Mbit/s"
-
--#: ../clients/cli/devices.c:1226
-+#: ../clients/cli/devices.c:1237
- msgid "Ad-Hoc"
- msgstr "アドホック"
-
--#: ../clients/cli/devices.c:1227
-+#: ../clients/cli/devices.c:1238
- msgid "Infra"
- msgstr "インフラ"
-
--#: ../clients/cli/devices.c:1228 ../src/devices/wifi/nm-device-olpc-mesh.c:118
-+#: ../clients/cli/devices.c:1239 ../src/devices/wifi/nm-device-olpc-mesh.c:118
- msgid "Mesh"
- msgstr "メッシュ"
-
--#: ../clients/cli/devices.c:1229
-+#: ../clients/cli/devices.c:1240
- msgid "N/A"
- msgstr "なし"
-
--#: ../clients/cli/devices.c:1424
-+#: ../clients/cli/devices.c:1435
- msgid "Device details"
- msgstr "デバイスの詳細"
-
--#: ../clients/cli/devices.c:1435
-+#: ../clients/cli/devices.c:1447
- #, c-format
- msgid "Error: 'device show': %s"
- msgstr "エラー: 'device show': %s"
-
--#: ../clients/cli/devices.c:1747
-+#: ../clients/cli/devices.c:1776
- msgid "Status of devices"
- msgstr "デバイスの状態"
-
--#: ../clients/cli/devices.c:1751
-+#: ../clients/cli/devices.c:1780
- #, c-format
- msgid "Error: 'device status': %s"
- msgstr "エラー: 'device status': %s"
-
--#: ../clients/cli/devices.c:1814 ../clients/cli/general.c:537
-+#: ../clients/cli/devices.c:1842 ../clients/cli/general.c:511
- #, c-format
- msgid "Error: Timeout %d sec expired."
- msgstr "エラー: 制限時間の %d 秒が経過"
-
--#: ../clients/cli/devices.c:1886
-+#: ../clients/cli/devices.c:1914
- #, c-format
- msgid "Device '%s' successfully activated with '%s'.\n"
- msgstr "デバイス '%s' が '%s' で正常にアクティベートされました。\n"
-
--#: ../clients/cli/devices.c:1891
-+#: ../clients/cli/devices.c:1919
- #, c-format
- msgid ""
- "Hint: \"nmcli dev wifi show-password\" shows the Wi-Fi name and password.\n"
- msgstr "ヒント: \"nmcli dev wifi show-password\" は、Wi-Fi 名とパスワードを表示します。\n"
-
--#: ../clients/cli/devices.c:1895
-+#: ../clients/cli/devices.c:1923
- #, c-format
- msgid "Error: Connection activation failed: (%d) %s.\n"
- msgstr "エラー: 接続のアクティベーションに失敗しました: (%d) %s.\n"
-
--#: ../clients/cli/devices.c:1925
-+#: ../clients/cli/devices.c:1953
- #, c-format
- msgid "Error: Failed to setup a Wi-Fi hotspot: %s"
- msgstr "エラー: Wi-Fi hotspot の設定に失敗しました: %s"
-
--#: ../clients/cli/devices.c:1928
-+#: ../clients/cli/devices.c:1956
- #, c-format
- msgid "Error: Failed to add/activate new connection: %s"
- msgstr "エラー: 新規接続の追加またはアクティベートに失敗しました: %s"
-
--#: ../clients/cli/devices.c:1931
-+#: ../clients/cli/devices.c:1959
- #, c-format
- msgid "Error: Failed to activate connection: %s"
- msgstr "エラー: 接続のアクティベートに失敗しました: %s"
-
--#: ../clients/cli/devices.c:1996
-+#: ../clients/cli/devices.c:2024
- #, c-format
- msgid "Error: Device activation failed: %s"
- msgstr "エラー: デバイスのアクティベートに失敗しました: %s"
-
--#: ../clients/cli/devices.c:2046
-+#: ../clients/cli/devices.c:2075
- #, c-format
- msgid "Error: extra argument not allowed: '%s'."
- msgstr "エラー: 追加の引数は許可されていません: '%s'。"
-
--#: ../clients/cli/devices.c:2116 ../clients/cli/devices.c:2131
--#: ../clients/cli/devices.c:2368
-+#: ../clients/cli/devices.c:2144 ../clients/cli/devices.c:2159
-+#: ../clients/cli/devices.c:2400
- #, c-format
- msgid "Device '%s' successfully disconnected.\n"
- msgstr "デバイス '%s' が正常に切断されました。\n"
-
--#: ../clients/cli/devices.c:2119 ../clients/cli/devices.c:2442
-+#: ../clients/cli/devices.c:2147 ../clients/cli/devices.c:2473
- #, c-format
- msgid "Device '%s' successfully removed.\n"
- msgstr "デバイス '%s' が正常に削除されました。\n"
-
--#: ../clients/cli/devices.c:2181 ../clients/cli/devices.c:2251
-+#: ../clients/cli/devices.c:2209 ../clients/cli/devices.c:2279
- #, c-format
- msgid "Error: Reapplying connection to device '%s' (%s) failed: %s"
- msgstr "エラー: デバイス '%s' (%s) への接続の再適用に失敗しました: %s"
-
--#: ../clients/cli/devices.c:2191 ../clients/cli/devices.c:2260
-+#: ../clients/cli/devices.c:2219 ../clients/cli/devices.c:2288
- #, c-format
- msgid "Connection successfully reapplied to device '%s'.\n"
- msgstr "接続がデバイス '%s' に正常に再適用されました。\n"
-
--#: ../clients/cli/devices.c:2285
-+#: ../clients/cli/devices.c:2315
- #, c-format
- msgid "Error: Reading applied connection from device '%s' (%s) failed: %s"
- msgstr "エラー: デバイス '%s' (%s) からの適用済み接続の読み取りに失敗しました: %s"
-
--#: ../clients/cli/devices.c:2352
-+#: ../clients/cli/devices.c:2384
- #, c-format
- msgid "Error: not all devices disconnected."
- msgstr "エラー: 一部のデバイスが切断されませんでした。"
-
--#: ../clients/cli/devices.c:2353
-+#: ../clients/cli/devices.c:2385
- #, c-format
- msgid "Error: Device '%s' (%s) disconnecting failed: %s\n"
- msgstr "エラー: デバイス '%s' (%s) の切断に失敗しました: %s\n"
-
--#: ../clients/cli/devices.c:2433
-+#: ../clients/cli/devices.c:2464
- #, c-format
- msgid "Error: not all devices deleted."
- msgstr "エラー: 一部のデバイスが削除されませんでした。"
-
--#: ../clients/cli/devices.c:2434
-+#: ../clients/cli/devices.c:2465
- #, c-format
- msgid "Error: Device '%s' (%s) deletion failed: %s\n"
- msgstr "エラー: デバイス '%s' (%s) の削除に失敗しました: %s\n"
-
--#: ../clients/cli/devices.c:2516
-+#: ../clients/cli/devices.c:2547
- #, c-format
- msgid "Error: No property specified."
- msgstr "エラー: プロパティーが指定されていません。"
-
--#: ../clients/cli/devices.c:2531 ../clients/cli/devices.c:2548
--#: ../clients/cli/general.c:777 ../clients/cli/general.c:789
-+#: ../clients/cli/devices.c:2563 ../clients/cli/devices.c:2582
-+#: ../clients/cli/general.c:773 ../clients/cli/general.c:786
- #, c-format
- msgid "Error: '%s' argument is missing."
- msgstr "エラー: '%s' 引数がありません。"
-
--#: ../clients/cli/devices.c:2537
-+#: ../clients/cli/devices.c:2570
- #, c-format
- msgid "Error: 'managed': %s."
- msgstr "エラー: 'managed': %s。"
-
--#: ../clients/cli/devices.c:2554
-+#: ../clients/cli/devices.c:2589
- #, c-format
- msgid "Error: 'autoconnect': %s."
- msgstr "エラー: '自動接続': %s。"
-
--#: ../clients/cli/devices.c:2562 ../clients/cli/general.c:803
-+#: ../clients/cli/devices.c:2598 ../clients/cli/general.c:801
- #, c-format
- msgid "Error: property '%s' is not known."
- msgstr "エラー: プロパティー '%s' が不明です。"
-
--#: ../clients/cli/devices.c:2611
-+#: ../clients/cli/devices.c:2644
- #, c-format
- msgid "%s: using connection '%s'\n"
- msgstr "%s: 接続 '%s' を使用中\n"
-
--#: ../clients/cli/devices.c:2637
-+#: ../clients/cli/devices.c:2670
- #, c-format
- msgid "%s: device created\n"
- msgstr "%s: デバイスが作成されました\n"
-
--#: ../clients/cli/devices.c:2644
-+#: ../clients/cli/devices.c:2677
- #, c-format
- msgid "%s: device removed\n"
- msgstr "%s: デバイスが削除されました\n"
-
--#: ../clients/cli/devices.c:2824
-+#: ../clients/cli/devices.c:2856
- msgid "Wi-Fi scan list"
- msgstr "Wi-Fi スキャン一覧"
-
--#: ../clients/cli/devices.c:2911
-+#: ../clients/cli/devices.c:2974 ../clients/cli/devices.c:3251
- #, c-format
- msgid "Error: Access point with bssid '%s' not found."
- msgstr "エラー: bssid '%s' のアクセスポイントが見つかりません。"
-
--#: ../clients/cli/devices.c:3067
-+#: ../clients/cli/devices.c:3174
- #, c-format
- msgid "Error: 'device wifi': %s"
- msgstr "エラー: 'dev wifi': %s"
-
--#: ../clients/cli/devices.c:3087
-+#: ../clients/cli/devices.c:3193
- #, c-format
- msgid "Error: invalid rescan argument: '%s' not among [auto, no, yes]"
- msgstr "エラー: 無効な再スキャン引数です: '%s' は [auto、no、yes] にはありません"
-
--#: ../clients/cli/devices.c:3094
-+#: ../clients/cli/devices.c:3232
- #, c-format
- msgid "Error: Device '%s' not found."
- msgstr "エラー: デバイス'%s' が見つかりません"
-
--#: ../clients/cli/devices.c:3105
-+#: ../clients/cli/devices.c:3237
- #, c-format
- msgid ""
- "Error: Device '%s' was not recognized as a Wi-Fi device, check "
- "NetworkManager Wi-Fi plugin."
- msgstr "エラー: デバイス '%s' が Wi-Fi デバイスとして認識されませんでした。NetworkManager Wi-Fi プラグインを確認してください。"
-
--#: ../clients/cli/devices.c:3109 ../clients/cli/devices.c:3430
--#: ../clients/cli/devices.c:4006 ../clients/cli/devices.c:4134
--#: ../clients/cli/devices.c:4266
-+#: ../clients/cli/devices.c:3241 ../clients/cli/devices.c:3570
-+#: ../clients/cli/devices.c:4159 ../clients/cli/devices.c:4286
-+#: ../clients/cli/devices.c:4419
- #, c-format
- msgid "Error: Device '%s' is not a Wi-Fi device."
- msgstr "エラー: デバイス '%s' は Wi-Fi デバイスではありません。"
-
--#: ../clients/cli/devices.c:3277
-+#: ../clients/cli/devices.c:3417
- msgid "SSID or BSSID: "
- msgstr "SSID または BSSID: "
-
--#: ../clients/cli/devices.c:3282
-+#: ../clients/cli/devices.c:3422
- #, c-format
- msgid "Error: SSID or BSSID are missing."
- msgstr "エラー: SSID または BSSID がありません。"
-
--#: ../clients/cli/devices.c:3319
-+#: ../clients/cli/devices.c:3459
- #, c-format
- msgid "Error: bssid argument value '%s' is not a valid BSSID."
- msgstr "エラー: bssid の引数値 '%s' は、有効な BSSID ではありません。"
-
--#: ../clients/cli/devices.c:3349
-+#: ../clients/cli/devices.c:3489
- #, 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:3376 ../clients/cli/devices.c:3394
-+#: ../clients/cli/devices.c:3516 ../clients/cli/devices.c:3534
- #, c-format
- msgid "Error: %s: %s."
- msgstr "エラー: %s: %s。"
-
--#: ../clients/cli/devices.c:3413
-+#: ../clients/cli/devices.c:3553
- #, c-format
- msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
- msgstr "エラー: (%s) が接続先となる BSSID は、bssid 引数 (%s) により異なります。"
-
--#: ../clients/cli/devices.c:3419
-+#: ../clients/cli/devices.c:3559
- #, c-format
- msgid "Error: Parameter '%s' is neither SSID nor BSSID."
- msgstr "エラー: パラメーター '%s' は、SSID、BSSID のいずれでもありません。"
-
--#: ../clients/cli/devices.c:3432 ../clients/cli/devices.c:4008
--#: ../clients/cli/devices.c:4136 ../clients/cli/devices.c:4367
-+#: ../clients/cli/devices.c:3572 ../clients/cli/devices.c:4161
-+#: ../clients/cli/devices.c:4288 ../clients/cli/devices.c:4524
- #, c-format
- msgid "Error: No Wi-Fi device found."
- msgstr "エラー: Wi-Fi デバイスが見つかりませんでした。"
-
--#: ../clients/cli/devices.c:3452
-+#: ../clients/cli/devices.c:3592
- #, c-format
- msgid "Error: Failed to scan hidden SSID: %s."
- msgstr "エラー: 非表示の SSID のスキャンに失敗しました: %s。"
-
--#: ../clients/cli/devices.c:3479
-+#: ../clients/cli/devices.c:3619
- #, c-format
- msgid "Error: No network with SSID '%s' found."
- msgstr "エラー: SSID が '%s' のネットワークが見つかりませんでした。"
-
--#: ../clients/cli/devices.c:3481
-+#: ../clients/cli/devices.c:3621
- #, c-format
- msgid "Error: No access point with BSSID '%s' found."
- msgstr "エラー: BSSID が '%s' のアクセスポイントが見つかりませんでした。"
-
--#: ../clients/cli/devices.c:3508
-+#: ../clients/cli/devices.c:3648
- #, c-format
- msgid "Error: Connection '%s' exists but properties don't match."
- msgstr "エラー: 接続 '%s' は存在しますが、プロパティーが一致しません。"
-
--#: ../clients/cli/devices.c:3551
-+#: ../clients/cli/devices.c:3691
- #, 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:3588
-+#: ../clients/cli/devices.c:3732
- msgid "Password: "
- msgstr "パスワード: "
-
--#: ../clients/cli/devices.c:3729
-+#: ../clients/cli/devices.c:3871
- #, c-format
- msgid "'%s' is not valid WPA PSK"
- msgstr "'%s' は有効な WPA PSK ではありません"
-
--#: ../clients/cli/devices.c:3746
-+#: ../clients/cli/devices.c:3888
- #, 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:3762
-+#: ../clients/cli/devices.c:3904
- #, c-format
- msgid "Hotspot password: %s\n"
- msgstr "ホットスポットのパスワード: %s\n"
-
--#: ../clients/cli/devices.c:3927
-+#: ../clients/cli/devices.c:4072
- #, c-format
- msgid "Error: ssid is too long."
- msgstr "エラー: ssid が長すぎます。"
-
--#: ../clients/cli/devices.c:3942
-+#: ../clients/cli/devices.c:4089
- #, c-format
- msgid "Error: band argument value '%s' is invalid; use 'a' or 'bg'."
- msgstr "エラー: バンド引数値 '%s' は無効です。'a' または 'bg' を使用してください。"
-
--#: ../clients/cli/devices.c:3989
-+#: ../clients/cli/devices.c:4140
- #, c-format
- msgid "Error: channel requires band too."
- msgstr "エラー: チャネルにはバンドも必要です。"
-
--#: ../clients/cli/devices.c:3994
-+#: ../clients/cli/devices.c:4146
- #, c-format
- msgid "Error: channel '%s' not valid for band '%s'."
- msgstr "エラー: チャンネル '%s' は、バンド '%s' に対して有効ではありません。"
-
--#: ../clients/cli/devices.c:4019
-+#: ../clients/cli/devices.c:4173
- #, c-format
- msgid "Error: Device '%s' supports neither AP nor Ad-Hoc mode."
- msgstr "エラー: デバイス '%s' は、AP またはアドホックモードのいずれもサポートしません。"
-
--#: ../clients/cli/devices.c:4041
-+#: ../clients/cli/devices.c:4195
- #, c-format
- msgid "Error: Invalid 'password': %s."
- msgstr "エラー: 無効なパスワード: %s。"
-
--#: ../clients/cli/devices.c:4094 ../clients/cli/devices.c:4318
-+#: ../clients/cli/devices.c:4246 ../clients/cli/devices.c:4471
- #, c-format
- msgid "Error: '%s' cannot repeat."
- msgstr "エラー: '%s' を繰り返すことはできません。"
-
--#: ../clients/cli/devices.c:4227 ../clients/cli/devices.c:4231
--#: ../clients/cli/devices.c:4236 ../clients/tui/nmt-page-wifi.c:249
-+#: ../clients/cli/devices.c:4377 ../clients/cli/devices.c:4381
-+#: ../clients/cli/devices.c:4386 ../clients/cli/devices.c:4389
-+#: ../clients/tui/nmt-page-wifi.c:250
- msgid "Security"
- msgstr "セキュリティー"
-
--#: ../clients/cli/devices.c:4227
-+#: ../clients/cli/devices.c:4377
- msgid "None"
- msgstr "なし"
-
--#: ../clients/cli/devices.c:4240 ../clients/common/nm-secret-agent-simple.c:273
-+#: ../clients/cli/devices.c:4393 ../clients/common/nm-secret-agent-simple.c:273
- #: ../clients/common/nm-secret-agent-simple.c:310
- #: ../clients/common/nm-secret-agent-simple.c:333
- #: ../clients/common/nm-secret-agent-simple.c:366
- #: ../clients/common/nm-secret-agent-simple.c:903
- #: ../clients/common/nm-secret-agent-simple.c:938
- #: ../clients/common/nm-secret-agent-simple.c:961
--#: ../clients/common/nm-vpn-helpers.c:110
--#: ../clients/common/nm-vpn-helpers.c:114
--#: ../clients/common/nm-vpn-helpers.c:120
--#: ../clients/common/nm-vpn-helpers.c:125 ../clients/tui/nmt-page-dsl.c:62
--#: ../clients/tui/nmt-page-wifi.c:265 ../clients/tui/nmt-page-wifi.c:297
--#: ../clients/tui/nmt-page-wifi.c:330
-+#: ../clients/common/nm-vpn-helpers.c:137
-+#: ../clients/common/nm-vpn-helpers.c:143
-+#: ../clients/common/nm-vpn-helpers.c:151
-+#: ../clients/common/nm-vpn-helpers.c:160 ../clients/tui/nmt-page-dsl.c:62
-+#: ../clients/tui/nmt-page-wifi.c:266 ../clients/tui/nmt-page-wifi.c:298
-+#: ../clients/tui/nmt-page-wifi.c:331
- msgid "Password"
- msgstr "パスワード"
-
--#: ../clients/cli/devices.c:4355
-+#: ../clients/cli/devices.c:4511
- #, c-format
- msgid "%s"
- msgstr "%s"
-
- #. Main header name
--#: ../clients/cli/devices.c:4411
-+#: ../clients/cli/devices.c:4565
- msgid "Device LLDP neighbors"
- msgstr "LLDP 近接デバイス"
-
--#: ../clients/cli/devices.c:4521
-+#: ../clients/cli/devices.c:4682
- #, c-format
- msgid "Error: 'device lldp list': %s"
- msgstr "エラー: 'device lldp list': %s"
-
--#: ../clients/cli/general.c:27
-+#: ../clients/cli/general.c:32
- msgid "asleep"
- msgstr "休止中"
-
--#: ../clients/cli/general.c:28
-+#: ../clients/cli/general.c:33
- msgid "connecting"
- msgstr "接続中"
-
--#: ../clients/cli/general.c:29
-+#: ../clients/cli/general.c:34
- msgid "connected (local only)"
- msgstr "接続完了 (ローカルのみ)"
-
--#: ../clients/cli/general.c:30
-+#: ../clients/cli/general.c:35
- msgid "connected (site only)"
- msgstr "接続完了 (サイトのみ)"
-
--#: ../clients/cli/general.c:31 ../clients/common/nm-client-utils.c:260
-+#: ../clients/cli/general.c:36 ../clients/common/nm-client-utils.c:262
- msgid "connected"
- msgstr "接続済み"
-
--#: ../clients/cli/general.c:32
-+#: ../clients/cli/general.c:37
- msgid "disconnecting"
- msgstr "切断中"
-
--#: ../clients/cli/general.c:33 ../clients/common/nm-client-utils.c:253
-+#: ../clients/cli/general.c:38 ../clients/common/nm-client-utils.c:255
- msgid "disconnected"
- msgstr "切断済み"
-
--#: ../clients/cli/general.c:124
-+#: ../clients/cli/general.c:94
- msgid "auth"
- msgstr "認証"
-
--#: ../clients/cli/general.c:152
-+#: ../clients/cli/general.c:123
- msgid "running"
- msgstr "実行中"
-
--#: ../clients/cli/general.c:166
-+#: ../clients/cli/general.c:137
- msgid "starting"
- msgstr "起動中"
-
--#: ../clients/cli/general.c:166
-+#: ../clients/cli/general.c:137
- msgid "started"
- msgstr "起動しました"
-
--#: ../clients/cli/general.c:200
-+#: ../clients/cli/general.c:171
- msgid "enabled"
- msgstr "有効"
-
--#: ../clients/cli/general.c:200
-+#: ../clients/cli/general.c:171
- msgid "disabled"
- msgstr "無効"
-
--#: ../clients/cli/general.c:318
-+#: ../clients/cli/general.c:289
- #, c-format
- msgid ""
- "Usage: nmcli general { COMMAND | help }\n"
-@@ -3146,7 +3156,7 @@ msgstr "使い方: nmcli general { コマンド | help }\n"
- " logging [level <ログレベル>] [domains <ログドメイン>]\n"
- "\n"
-
--#: ../clients/cli/general.c:329
-+#: ../clients/cli/general.c:300
- #, c-format
- msgid ""
- "Usage: nmcli general status { help }\n"
-@@ -3161,7 +3171,7 @@ msgstr "使い方: nmcli general status { help }\n"
- "'status' はデフォルトの動作となるため、'nmcli gen' を実行すると 'nmcli gen status' を実行したことになります。\n"
- "\n"
-
--#: ../clients/cli/general.c:338
-+#: ../clients/cli/general.c:309
- #, c-format
- msgid ""
- "Usage: nmcli general hostname { ARGUMENTS | help }\n"
-@@ -3182,7 +3192,7 @@ msgstr "使い方: nmcli general hostname { 引数 | help }\n"
- "渡すと、そのホスト名をシステムの永続的なホスト名として新たに設定します。\n"
- "\n"
-
--#: ../clients/cli/general.c:350
-+#: ../clients/cli/general.c:321
- #, c-format
- msgid ""
- "Usage: nmcli general permissions { help }\n"
-@@ -3194,7 +3204,7 @@ msgstr "使い方: nmcli general permissions { help }\n"
- "認証されている操作に対する呼び出し側のパーミッションを表示します。\n"
- "\n"
-
--#: ../clients/cli/general.c:358
-+#: ../clients/cli/general.c:329
- #, c-format
- msgid ""
- "Usage: nmcli general reload { ARGUMENTS | help }\n"
-@@ -3252,7 +3262,7 @@ msgstr "使い方: nmcli general reload { 引数 | help }\n"
- "フラグなしでは、サポートされているものすべてが再ロードされます。これは、\n"
- "SIGHUP を送信することと同じです。\n"
-
--#: ../clients/cli/general.c:390
-+#: ../clients/cli/general.c:361
- #, c-format
- msgid ""
- "Usage: nmcli general logging { ARGUMENTS | help }\n"
-@@ -3276,7 +3286,7 @@ msgstr "使い方: nmcli general logging { 引数 | help }\n"
- "使用できるログ記録のドメイン一覧については man ページを参照してください。\n"
- "\n"
-
--#: ../clients/cli/general.c:403
-+#: ../clients/cli/general.c:374
- #, c-format
- msgid ""
- "Usage: nmcli networking { COMMAND | help }\n"
-@@ -3300,7 +3310,7 @@ msgstr "使い方: nmcli networking { コマンド | help }\n"
- " connectivity [check]\n"
- "\n"
-
--#: ../clients/cli/general.c:413
-+#: ../clients/cli/general.c:384
- #, c-format
- msgid ""
- "Usage: nmcli networking on { help }\n"
-@@ -3312,7 +3322,7 @@ msgstr "使い方: nmcli networking on { help }\n"
- "ネットワークをオンに切り替えます。\n"
- "\n"
-
--#: ../clients/cli/general.c:421
-+#: ../clients/cli/general.c:392
- #, c-format
- msgid ""
- "Usage: nmcli networking off { help }\n"
-@@ -3324,7 +3334,7 @@ msgstr "使い方: nmcli networking off { help }\n"
- "ネットワークをオフに切り替えます。\n"
- "\n"
-
--#: ../clients/cli/general.c:429
-+#: ../clients/cli/general.c:400
- #, c-format
- msgid ""
- "Usage: nmcli networking connectivity { ARGUMENTS | help }\n"
-@@ -3343,7 +3353,7 @@ msgstr "使い方: nmcli networking connectivity { 引数 | help }\n"
- "オプションの 'check' 引数を付けると接続を再チェックします。\n"
- "\n"
-
--#: ../clients/cli/general.c:441
-+#: ../clients/cli/general.c:412
- #, c-format
- msgid ""
- "Usage: nmcli radio { COMMAND | help }\n"
-@@ -3359,7 +3369,7 @@ msgstr "使い方: nmcli radio { コマンド | help }\n"
- " all | wifi | wwan [ on | off ]\n"
- "\n"
-
--#: ../clients/cli/general.c:450
-+#: ../clients/cli/general.c:421
- #, c-format
- msgid ""
- "Usage: nmcli radio all { ARGUMENTS | help }\n"
-@@ -3375,7 +3385,7 @@ msgstr "使い方: nmcli radio all { 引数 | help }\n"
- "すべてのラジオスイッチの状態を取得、またはオンかオフにします。\n"
- "\n"
-
--#: ../clients/cli/general.c:460
-+#: ../clients/cli/general.c:431
- #, c-format
- msgid ""
- "Usage: nmcli radio wifi { ARGUMENTS | help }\n"
-@@ -3391,7 +3401,7 @@ msgstr "使い方: nmcli radio wifi { 引数 | help }\n"
- "Wi-Fi ラジオスイッチの状態を取得、またはオンかオフにします。\n"
- "\n"
-
--#: ../clients/cli/general.c:470
-+#: ../clients/cli/general.c:441
- #, c-format
- msgid ""
- "Usage: nmcli radio wwan { ARGUMENTS | help }\n"
-@@ -3407,7 +3417,7 @@ msgstr "使い方: nmcli radio wwan { 引数 | help }\n"
- "モバイルブロードバンドのラジオスイッチの状態を取得、またはオンかオフにします。\n"
- "\n"
-
--#: ../clients/cli/general.c:480
-+#: ../clients/cli/general.c:451
- #, c-format
- msgid ""
- "Usage: nmcli monitor\n"
-@@ -3421,203 +3431,219 @@ msgstr "使い方: nmcli monitor\n"
- "NetworkManager で変更が行われるたびに行を出力します。\n"
- "\n"
-
--#: ../clients/cli/general.c:510
-+#: ../clients/cli/general.c:481
- msgid "NetworkManager status"
- msgstr "NetworkManager のステータス"
-
--#: ../clients/cli/general.c:514
-+#: ../clients/cli/general.c:485
- #, c-format
- msgid "Error: only these fields are allowed: %s"
- msgstr "エラー: 使用できるのは次のフィールドのみです: %s"
-
--#: ../clients/cli/general.c:567
-+#. NetworkManager quit while we were waiting.
-+#: ../clients/cli/general.c:541 ../clients/tui/nmtui.c:246
-+#, c-format
-+msgid "NetworkManager is not running."
-+msgstr "NetworkManager が実行していません。"
-+
-+#: ../clients/cli/general.c:563
- msgid "NetworkManager permissions"
- msgstr "NetworkManager のパーミッション"
-
--#: ../clients/cli/general.c:571
-+#: ../clients/cli/general.c:567
- #, c-format
- msgid "Error: 'general permissions': %s"
- msgstr "エラー: 'general permissions': %s"
-
--#: ../clients/cli/general.c:664
-+#: ../clients/cli/general.c:644
- #, c-format
- msgid "Error: invalid reload flag '%s'. Allowed flags are: %s"
- msgstr "エラー: 再ロードフラグ '%s' は無効です。許可されたフラグは以下のとおりです: %s"
-
--#: ../clients/cli/general.c:674
-+#: ../clients/cli/general.c:655
- #, c-format
- msgid "Error: extra argument '%s'"
- msgstr "エラー: 追加の引数 '%s'"
-
--#: ../clients/cli/general.c:688
-+#: ../clients/cli/general.c:670
- #, c-format
- msgid "Error: failed to reload: %s"
- msgstr "エラー: 再ロードに失敗しました: %s"
-
--#: ../clients/cli/general.c:727
-+#: ../clients/cli/general.c:708
- msgid "NetworkManager logging"
- msgstr "NetworkManager のロギング"
-
--#: ../clients/cli/general.c:731
-+#: ../clients/cli/general.c:712
- #, c-format
- msgid "Error: 'general logging': %s"
- msgstr "エラー: 'general logging': %s"
-
--#: ../clients/cli/general.c:813
-+#: ../clients/cli/general.c:744
- #, c-format
- msgid "Error: failed to set logging: %s"
- msgstr "エラー: ロギングの設定に失敗しました: %s"
-
--#: ../clients/cli/general.c:830
-+#: ../clients/cli/general.c:834
- #, c-format
- msgid "Error: failed to set hostname: %s"
- msgstr "エラー: ホスト名の設定に失敗しました: %s"
-
--#: ../clients/cli/general.c:900
-+#: ../clients/cli/general.c:895
- #, c-format
- msgid "Error: '--fields' value '%s' is not valid here (allowed field: %s)"
- msgstr "エラー: '--fields' の値 '%s' はここでは無効です (使用できるフィールド: %s)"
-
--#: ../clients/cli/general.c:925
-+#: ../clients/cli/general.c:920
- #, c-format
- msgid "Error: invalid '%s' argument: '%s' (use on/off)."
- msgstr "エラー: 無効な '%s' 引数です: '%s' (on か off を使用してください)。"
-
-+#: ../clients/cli/general.c:943
-+#, c-format
-+msgid "Error: failed to set networking: %s"
-+msgstr "エラー: ネットワークの設定に失敗しました: %s"
-+
- #. no arguments -> get current state
--#: ../clients/cli/general.c:973 ../clients/cli/general.c:985
-+#: ../clients/cli/general.c:988 ../clients/cli/general.c:1000
- msgid "Connectivity"
- msgstr "接続性"
-
--#: ../clients/cli/general.c:988
-+#: ../clients/cli/general.c:1003
- #, c-format
- msgid "Error: 'networking' command '%s' is not valid."
- msgstr "エラー: 'networking' のコマンド '%s' は、有効なコマンドではありません。"
-
--#: ../clients/cli/general.c:1002
-+#: ../clients/cli/general.c:1015
- msgid "Networking"
- msgstr "ネットワーキング"
-
- #. no argument, show all radio switches
--#: ../clients/cli/general.c:1037
-+#: ../clients/cli/general.c:1043
- msgid "Radio switches"
- msgstr "ラジオスイッチ"
-
-+#: ../clients/cli/general.c:1068
-+#, c-format
-+msgid "Error: failed to set Wi-Fi radio: %s"
-+msgstr "エラー：Wi-Fi 無線の設定に失敗しました: %s"
-+
- #. no argument, show current Wi-Fi state
--#: ../clients/cli/general.c:1067
-+#: ../clients/cli/general.c:1086
- msgid "Wi-Fi radio switch"
- msgstr "Wi-Fi ラジオスイッチ"
-
- #. no argument, show current WWAN (mobile broadband) state
--#: ../clients/cli/general.c:1094
-+#: ../clients/cli/general.c:1122
- msgid "WWAN radio switch"
- msgstr "WWAN ラジオスイッチ"
-
--#: ../clients/cli/general.c:1142
-+#: ../clients/cli/general.c:1162
- msgid "NetworkManager has started"
- msgstr "NetworkManager が起動されました"
-
--#: ../clients/cli/general.c:1142
-+#: ../clients/cli/general.c:1162
- msgid "NetworkManager has stopped"
- msgstr "NetworkManager が停止しました"
-
--#: ../clients/cli/general.c:1153
-+#: ../clients/cli/general.c:1173
- #, c-format
- msgid "Hostname set to '%s'\n"
- msgstr "ホスト名が '%s' に設定されました\n"
-
--#: ../clients/cli/general.c:1168
-+#: ../clients/cli/general.c:1188
- #, c-format
- msgid "'%s' is now the primary connection\n"
- msgstr "'%s' はプライマリー接続です\n"
-
--#: ../clients/cli/general.c:1170
-+#: ../clients/cli/general.c:1190
- #, c-format
- msgid "There's no primary connection\n"
- msgstr "プライマリー接続がありません\n"
-
--#: ../clients/cli/general.c:1182
-+#: ../clients/cli/general.c:1202
- #, c-format
- msgid "Connectivity is now '%s'\n"
- msgstr "接続性は '%s' です\n"
-
--#: ../clients/cli/general.c:1196
-+#: ../clients/cli/general.c:1216
- #, c-format
- msgid "Networkmanager is now in the '%s' state\n"
- msgstr "Networkmanager の状態は '%s' です\n"
-
--#: ../clients/cli/general.c:1216
-+#: ../clients/cli/general.c:1236
- msgid "connection available"
- msgstr "接続が利用可能"
-
--#: ../clients/cli/general.c:1218
-+#: ../clients/cli/general.c:1238
- msgid "connections available"
- msgstr "接続が利用可能"
-
--#: ../clients/cli/general.c:1236
-+#: ../clients/cli/general.c:1256
- msgid "autoconnect"
- msgstr "自動接続"
-
--#: ../clients/cli/general.c:1238
-+#: ../clients/cli/general.c:1258
- msgid "fw missing"
- msgstr "fw がありません"
-
--#: ../clients/cli/general.c:1243
-+#: ../clients/cli/general.c:1263
- msgid "plugin missing"
- msgstr "プラグインがありません"
-
--#: ../clients/cli/general.c:1253 ../clients/cli/general.c:1267
-+#: ../clients/cli/general.c:1273 ../clients/cli/general.c:1287
- msgid "sw disabled"
- msgstr "sw は無効化されました"
-
--#: ../clients/cli/general.c:1258 ../clients/cli/general.c:1272
-+#: ../clients/cli/general.c:1278 ../clients/cli/general.c:1292
- msgid "hw disabled"
- msgstr "hw は無効化されました"
-
--#: ../clients/cli/general.c:1283
-+#: ../clients/cli/general.c:1303
- msgid "sw"
- msgstr "sw"
-
--#: ../clients/cli/general.c:1285
-+#: ../clients/cli/general.c:1305
- msgid "hw"
- msgstr "hw"
-
--#: ../clients/cli/general.c:1290
-+#: ../clients/cli/general.c:1310
- msgid "iface"
- msgstr "iface"
-
--#: ../clients/cli/general.c:1293
-+#: ../clients/cli/general.c:1313
- msgid "port"
- msgstr "ポート"
-
--#: ../clients/cli/general.c:1296
-+#: ../clients/cli/general.c:1316
- msgid "mtu"
- msgstr "mtu"
-
--#: ../clients/cli/general.c:1313
-+#: ../clients/cli/general.c:1333
- msgid "master"
- msgstr "マスター"
-
--#: ../clients/cli/general.c:1317 ../clients/tui/nm-editor-utils.c:235
-+#: ../clients/cli/general.c:1337 ../clients/tui/nm-editor-utils.c:230
- #: ../clients/tui/nmt-connect-connection-list.c:394
- msgid "VPN"
- msgstr "VPN"
-
--#: ../clients/cli/general.c:1319
-+#: ../clients/cli/general.c:1339
- msgid "ip4 default"
- msgstr "ip4 デフォルト"
-
--#: ../clients/cli/general.c:1321
-+#: ../clients/cli/general.c:1341
- msgid "ip6 default"
- msgstr "ip6 デフォルト"
-
--#: ../clients/cli/general.c:1403
-+#: ../clients/cli/general.c:1417
- #, c-format
- msgid "%s VPN connection"
- msgstr "%s VPN 接続"
-
- #. TRANSLATORS: prints header line for activated device in plain `nmcli` overview output as
- #. * "<interface-name>: <device-state> to <connection-id>"
--#: ../clients/cli/general.c:1423
-+#: ../clients/cli/general.c:1436
- #, c-format
- msgctxt "nmcli-overview"
- msgid "%s: %s to %s"
-@@ -3625,13 +3651,13 @@ msgstr "%s: %s から %s"
-
- #. TRANSLATORS: prints header line for not active device in plain `nmcli` overview output as
- #. * "<interface-name>: <device-state>"
--#: ../clients/cli/general.c:1430
-+#: ../clients/cli/general.c:1443
- #, c-format
- msgctxt "nmcli-overview"
- msgid "%s: %s"
- msgstr "%s: %s"
-
--#: ../clients/cli/general.c:1480
-+#: ../clients/cli/general.c:1493
- #, c-format
- msgid ""
- "Use \"nmcli device show\" to get complete information about known devices "
-@@ -3645,16 +3671,16 @@ msgstr "既知のデバイスに関する情報を取得するには、\"nmcli d
- "\n"
- "使用方法の詳細情報については、nmcli(1) と nmcli-examples(7) の man ページを参照してください。\n"
-
--#: ../clients/cli/general.c:1501
-+#: ../clients/cli/general.c:1509
- #, c-format
- msgid "Error: 'monitor' command '%s' is not valid."
- msgstr "エラー: 'monitor' コマンド '%s' は有効ではありません。"
-
--#: ../clients/cli/general.c:1513
-+#: ../clients/cli/general.c:1521
- msgid "Networkmanager is not running (waiting for it)\n"
- msgstr "Networkmanager が実行されていません (待機中)\n"
-
--#: ../clients/cli/nmcli.c:230
-+#: ../clients/cli/nmcli.c:233
- #, c-format
- msgid ""
- "Usage: nmcli [OPTIONS] OBJECT { COMMAND | help }\n"
-@@ -3712,96 +3738,91 @@ msgstr "使い方: nmcli [OPTIONS] OBJECT { COMMAND | help }\n"
- " m[onitor] monitor NetworkManager changes\n"
- "\n"
-
--#: ../clients/cli/nmcli.c:310
-+#: ../clients/cli/nmcli.c:308
- #, c-format
- msgid "Error: missing argument for '%s' option."
- msgstr "エラー: %s オプション用の引数がありません。"
-
--#: ../clients/cli/nmcli.c:618
-+#: ../clients/cli/nmcli.c:621
- #, c-format
- msgid "Unexpected end of file following '%s'\n"
- msgstr "'%s' に続く、予期せぬファイルの終了\n"
-
--#: ../clients/cli/nmcli.c:626
-+#: ../clients/cli/nmcli.c:629
- #, c-format
- msgid "Expected whitespace following '%s'\n"
- msgstr "'%s' に続く、必要なホワイトスペース\n"
-
--#: ../clients/cli/nmcli.c:638
-+#: ../clients/cli/nmcli.c:641
- #, c-format
- msgid "Expected a value for '%s'\n"
- msgstr "'%s' には値が必要です\n"
-
--#: ../clients/cli/nmcli.c:652
-+#: ../clients/cli/nmcli.c:655
- #, c-format
- msgid "Expected a line break following '%s'\n"
- msgstr "'%s' に続く改行が必要です\n"
-
--#: ../clients/cli/nmcli.c:741
-+#: ../clients/cli/nmcli.c:761
- #, c-format
- msgid "Error: Option '--terse' is specified the second time."
- msgstr "エラー: オプション '--terse' が二度指定されています。"
-
--#: ../clients/cli/nmcli.c:746
-+#: ../clients/cli/nmcli.c:766
- #, c-format
- msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
- msgstr "エラー: オプション '--terse' は '--pretty' と相互に排他的です。"
-
--#: ../clients/cli/nmcli.c:754
-+#: ../clients/cli/nmcli.c:774
- #, c-format
- msgid "Error: Option '--pretty' is specified the second time."
- msgstr "エラー: オプション '--pretty' が二度指定されています。"
-
--#: ../clients/cli/nmcli.c:759
-+#: ../clients/cli/nmcli.c:779
- #, c-format
- msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
- msgstr "エラー: オプション '--pretty' は '--terse' と相互に排他的です。"
-
--#: ../clients/cli/nmcli.c:774
-+#: ../clients/cli/nmcli.c:794
- #, c-format
- msgid "Error: '%s' is not a valid argument for '%s' option."
- msgstr "エラー: '%s' は、'%s' オプションの有効な引数ではありません。"
-
--#: ../clients/cli/nmcli.c:788 ../clients/cli/nmcli.c:800
-+#: ../clients/cli/nmcli.c:808 ../clients/cli/nmcli.c:820
- #, c-format
- msgid "Error: '%s' is not valid argument for '%s' option."
- msgstr "エラー: '%s' は、'%s' オプション用の有効な引数ではありません。"
-
--#: ../clients/cli/nmcli.c:824
-+#: ../clients/cli/nmcli.c:844
- #, c-format
- msgid "Error: '%s' is not a valid timeout."
- msgstr "エラー: '%s' は有効なタイムアウトではありません。"
-
--#: ../clients/cli/nmcli.c:831
-+#: ../clients/cli/nmcli.c:851
- #, c-format
- msgid "nmcli tool, version %s\n"
- msgstr "nmcli ツール、バージョン %s\n"
-
--#: ../clients/cli/nmcli.c:839
-+#: ../clients/cli/nmcli.c:859
- #, c-format
- msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
- msgstr "エラー: オプション '%s' は不明です。'nmcli -help' で確認してください。"
-
--#: ../clients/cli/nmcli.c:895 ../clients/cli/nmcli.c:902
-+#: ../clients/cli/nmcli.c:915 ../clients/cli/nmcli.c:922
- #, c-format
- msgid "Error: nmcli terminated by signal %s (%d)"
- msgstr "エラー: nmcli がシグナル %s (%d) で終了しました"
-
--#: ../clients/cli/nmcli.c:968
-+#: ../clients/cli/nmcli.c:990
- msgid "Success"
- msgstr "成功"
-
--#: ../clients/cli/polkit-agent.c:54
--#, c-format
--msgid "Authentication message: %s\n"
--msgstr "認証メッセージ: %s\n"
--
--#: ../clients/cli/polkit-agent.c:62
-+#: ../clients/cli/polkit-agent.c:41
- #, c-format
--msgid "Authentication error: %s\n"
--msgstr "認証エラー: %s\n"
-+msgid "Error: polkit agent failed: %s\n"
-+msgstr "エラー: polkit エージェントに失敗しました: %s\n"
-
--#: ../clients/cli/polkit-agent.c:122
-+#: ../clients/cli/polkit-agent.c:99
- #, c-format
- msgid "Warning: polkit agent initialization failed: %s\n"
- msgstr "警告: polkit エージェントの初期化に失敗しました: %s\n"
-@@ -3856,19 +3877,19 @@ msgstr "警告: %s\n"
- msgid "Info: %s\n"
- msgstr "情報: %s\n"
-
--#: ../clients/cli/settings.c:490
-+#: ../clients/cli/settings.c:488
- msgid "don't know how to get the property value"
- msgstr "プロパティー値の取得方法がわかりません"
-
--#: ../clients/cli/settings.c:580
-+#: ../clients/cli/settings.c:578
- msgid "the property can't be changed"
- msgstr "このプロパティーは変更できません"
-
--#: ../clients/cli/settings.c:658
-+#: ../clients/cli/settings.c:656
- msgid "[NM property description]"
- msgstr "[NM プロパティーの詳細]"
-
--#: ../clients/cli/settings.c:668
-+#: ../clients/cli/settings.c:666
- msgid "[nmcli specific description]"
- msgstr "[nmcli 固有の詳細]"
-
-@@ -3882,60 +3903,60 @@ msgstr "エラー: 引数 '%s' が必要ですが、'%s' が指定されまし
- msgid "Error: Unexpected argument '%s'"
- msgstr "エラー: 予期しない引数 '%s' です"
-
--#: ../clients/cli/utils.c:695
-+#: ../clients/cli/utils.c:691
- #, c-format
- msgid "invalid field '%s%s%s'; no such field"
- msgstr "無効なフィールド '%s%s%s'。そのようなフィールドはありません"
-
--#: ../clients/cli/utils.c:699
-+#: ../clients/cli/utils.c:695
- #, c-format
- msgid "invalid field '%s%s%s'; allowed fields: [%s]"
- msgstr "無効なフィールド '%s%s%s'。使用できるフィールド: [%s]"
-
--#: ../clients/cli/utils.c:795
-+#: ../clients/cli/utils.c:791
- #, c-format
- msgid "failure to select field"
- msgstr "フィールドの選択に失敗しました"
-
--#: ../clients/cli/utils.c:1424
-+#: ../clients/cli/utils.c:1427
- #, c-format
- msgid "Error reading nmcli output: %s\n"
- msgstr "nmcli 出力の読み込み中にエラーが発生しました: %s\n"
-
--#: ../clients/cli/utils.c:1429
-+#: ../clients/cli/utils.c:1432
- #, c-format
- msgid "Error writing nmcli output: %s\n"
- msgstr "nmcli 出力の書き込み中にエラーが発生しました: %s\n"
-
--#: ../clients/cli/utils.c:1455
-+#: ../clients/cli/utils.c:1458
- #, c-format
- msgid "Failed to create pager pipe: %s\n"
- msgstr "ページャーパイプの作成に失敗しました: %s\n"
-
--#: ../clients/cli/utils.c:1464
-+#: ../clients/cli/utils.c:1467
- #, c-format
- msgid "Failed to fork pager: %s\n"
- msgstr "ページャーのフォークに失敗しました: %s\n"
-
--#: ../clients/cli/utils.c:1511 ../clients/cli/utils.c:1515
-+#: ../clients/cli/utils.c:1514 ../clients/cli/utils.c:1518
- #, c-format
- msgid "Failed to duplicate pager pipe: %s\n"
- msgstr "ページャーパイプの複製に失敗しました: %s\n"
-
--#: ../clients/cli/utils.h:297 ../clients/common/nm-meta-setting-desc.c:4136
-+#: ../clients/cli/utils.h:300 ../clients/common/nm-meta-setting-desc.c:4129
- msgid "on"
- msgstr "オン"
-
--#: ../clients/cli/utils.h:297 ../clients/common/nm-meta-setting-desc.c:4138
-+#: ../clients/cli/utils.h:300 ../clients/common/nm-meta-setting-desc.c:4130
- msgid "off"
- msgstr "オフ"
-
--#: ../clients/cli/utils.h:323
-+#: ../clients/cli/utils.h:326
- #, c-format
- msgid "%lld (%s)"
- msgstr "%lld (%s)"
-
--#: ../clients/cli/utils.h:330
-+#: ../clients/cli/utils.h:333
- #, c-format
- msgid "%lld - %s"
- msgstr "%lld - %s"
-@@ -3943,412 +3964,459 @@ 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:107
--#: ../clients/common/nm-client-utils.c:138
-+#: ../clients/common/nm-client-utils.c:109
-+#: ../clients/common/nm-client-utils.c:140
- #, c-format
- msgid "'%s' is ambiguous (%s)"
- msgstr "'%s' が不明瞭です (%s)"
-
--#: ../clients/common/nm-client-utils.c:117
-+#: ../clients/common/nm-client-utils.c:119
- #, c-format
- msgid "'%s' is not valid; use [%s] or [%s]"
- msgstr "'%s' は無効です。[%s] か [%s] を使用してください"
-
--#: ../clients/common/nm-client-utils.c:150
-+#: ../clients/common/nm-client-utils.c:152
- #, c-format
- msgid "'%s' is not valid; use [%s], [%s] or [%s]"
- msgstr "'%s' は無効です。[%s]、[%s]、または [%s] を使用してください"
-
--#: ../clients/common/nm-client-utils.c:199
-+#: ../clients/common/nm-client-utils.c:201
- #, c-format
- msgid "'%s' is ambiguous: %s"
- msgstr "'%s' が不明瞭です: %s"
-
--#: ../clients/common/nm-client-utils.c:209
-+#: ../clients/common/nm-client-utils.c:211
- #, c-format
- msgid "missing name, try one of [%s]"
- msgstr "名前がありません、[%s] のうちのいずれかで試してみてください"
-
--#: ../clients/common/nm-client-utils.c:251
-+#: ../clients/common/nm-client-utils.c:253
- msgid "unmanaged"
- msgstr "管理無し"
-
--#: ../clients/common/nm-client-utils.c:252
-+#: ../clients/common/nm-client-utils.c:254
- msgid "unavailable"
- msgstr "利用不可"
-
--#: ../clients/common/nm-client-utils.c:254
-+#: ../clients/common/nm-client-utils.c:256
- msgid "connecting (prepare)"
- msgstr "接続中 (準備)"
-
--#: ../clients/common/nm-client-utils.c:255
-+#: ../clients/common/nm-client-utils.c:257
- msgid "connecting (configuring)"
- msgstr "接続中 (設定中)"
-
--#: ../clients/common/nm-client-utils.c:256
-+#: ../clients/common/nm-client-utils.c:258
- msgid "connecting (need authentication)"
- msgstr "接続中 (認証が必要)"
-
--#: ../clients/common/nm-client-utils.c:257
-+#: ../clients/common/nm-client-utils.c:259
- msgid "connecting (getting IP configuration)"
- msgstr "接続中 (IP 設定を取得中)"
-
--#: ../clients/common/nm-client-utils.c:258
-+#: ../clients/common/nm-client-utils.c:260
- msgid "connecting (checking IP connectivity)"
- msgstr "接続中 (IP の接続性チェック)"
-
--#: ../clients/common/nm-client-utils.c:259
-+#: ../clients/common/nm-client-utils.c:261
- msgid "connecting (starting secondary connections)"
- msgstr "接続中 (セカンダリー接続を開始)"
-
--#: ../clients/common/nm-client-utils.c:262
-+#: ../clients/common/nm-client-utils.c:264
- msgid "connection failed"
- msgstr "接続に失敗"
-
--#: ../clients/common/nm-client-utils.c:270
-+#: ../clients/common/nm-client-utils.c:271
-+#: ../clients/common/nm-client-utils.c:272
-+#: ../clients/common/nm-client-utils.c:273
-+#: ../clients/common/nm-client-utils.c:274
-+#: ../clients/common/nm-client-utils.c:275
-+#: ../clients/common/nm-client-utils.c:276
-+msgid "connecting (externally)"
-+msgstr "接続 (外部)"
-+
-+#: ../clients/common/nm-client-utils.c:277
-+msgid "connected (externally)"
-+msgstr "接続済み (外部)"
-+
-+#: ../clients/common/nm-client-utils.c:278
-+#: ../clients/common/nm-client-utils.c:279
-+msgid "deactivating (externally)"
-+msgstr "非アクティブ化 (外部)"
-+
-+#: ../clients/common/nm-client-utils.c:304
- msgid "yes (guessed)"
- msgstr "はい (推測)"
-
--#: ../clients/common/nm-client-utils.c:271
-+#: ../clients/common/nm-client-utils.c:305
- 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:277
--#: ../clients/common/nm-client-utils.c:350 ../libnm/nm-device.c:1514
-+#: ../clients/common/nm-client-utils.c:311
-+#: ../clients/common/nm-client-utils.c:384 ../libnm/nm-device.c:1628
- msgid "Unknown"
- msgstr "不明"
-
--#: ../clients/common/nm-client-utils.c:278
-+#: ../clients/common/nm-client-utils.c:312
- msgid "No reason given"
- msgstr "原因不明"
-
--#: ../clients/common/nm-client-utils.c:280
-+#: ../clients/common/nm-client-utils.c:314
- msgid "Device is now managed"
- msgstr "デバイスが管理下に置かれました"
-
--#: ../clients/common/nm-client-utils.c:281
-+#: ../clients/common/nm-client-utils.c:315
- msgid "Device is now unmanaged"
- msgstr "デバイスが管理下から外れました"
-
--#: ../clients/common/nm-client-utils.c:282
-+#: ../clients/common/nm-client-utils.c:316
- msgid "The device could not be readied for configuration"
- msgstr "デバイスの設定準備ができませんでした"
-
--#: ../clients/common/nm-client-utils.c:283
-+#: ../clients/common/nm-client-utils.c:317
- msgid ""
- "IP configuration could not be reserved (no available address, timeout, etc.)"
- msgstr "IP 設定を確保できませんでした (利用可能なアドレスがない、タイムアウトなど)"
-
--#: ../clients/common/nm-client-utils.c:284
-+#: ../clients/common/nm-client-utils.c:318
- msgid "The IP configuration is no longer valid"
- msgstr "この IP 設定は無効になりました"
-
--#: ../clients/common/nm-client-utils.c:285
-+#: ../clients/common/nm-client-utils.c:319
- msgid "Secrets were required, but not provided"
- msgstr "シークレットが必要でしたが入力されませんでした"
-
--#: ../clients/common/nm-client-utils.c:286
-+#: ../clients/common/nm-client-utils.c:320
- msgid "802.1X supplicant disconnected"
- msgstr "802.1X サプリカントが切断されました"
-
--#: ../clients/common/nm-client-utils.c:287
-+#: ../clients/common/nm-client-utils.c:321
- msgid "802.1X supplicant configuration failed"
- msgstr "802.1X サプリカントの設定に失敗しました"
-
--#: ../clients/common/nm-client-utils.c:288
-+#: ../clients/common/nm-client-utils.c:322
- msgid "802.1X supplicant failed"
- msgstr "802.1X サプリカントが失敗しました"
-
--#: ../clients/common/nm-client-utils.c:289
-+#: ../clients/common/nm-client-utils.c:323
- msgid "802.1X supplicant took too long to authenticate"
- msgstr "802.1X サプリカントの認証に時間がかかり過ぎました"
-
--#: ../clients/common/nm-client-utils.c:290
-+#: ../clients/common/nm-client-utils.c:324
- msgid "PPP service failed to start"
- msgstr "PPP サービスの開始に失敗しました"
-
--#: ../clients/common/nm-client-utils.c:291
-+#: ../clients/common/nm-client-utils.c:325
- msgid "PPP service disconnected"
- msgstr "PPP サービスの接続が切断されました"
-
--#: ../clients/common/nm-client-utils.c:292
-+#: ../clients/common/nm-client-utils.c:326
- msgid "PPP failed"
- msgstr "PPP の失敗"
-
--#: ../clients/common/nm-client-utils.c:293
-+#: ../clients/common/nm-client-utils.c:327
- msgid "DHCP client failed to start"
- msgstr "DHCP クライアントの開始に失敗しました"
-
--#: ../clients/common/nm-client-utils.c:294
-+#: ../clients/common/nm-client-utils.c:328
- msgid "DHCP client error"
- msgstr "DHCP クライアントエラー"
-
--#: ../clients/common/nm-client-utils.c:295
-+#: ../clients/common/nm-client-utils.c:329
- msgid "DHCP client failed"
- msgstr "DHCP クライアントの失敗"
-
--#: ../clients/common/nm-client-utils.c:296
-+#: ../clients/common/nm-client-utils.c:330
- msgid "Shared connection service failed to start"
- msgstr "共有接続サービスの開始に失敗しました"
-
--#: ../clients/common/nm-client-utils.c:297
-+#: ../clients/common/nm-client-utils.c:331
- msgid "Shared connection service failed"
- msgstr "共有接続サービスの失敗"
-
--#: ../clients/common/nm-client-utils.c:298
-+#: ../clients/common/nm-client-utils.c:332
- msgid "AutoIP service failed to start"
- msgstr "AutoIP サービスの開始に失敗しました"
-
--#: ../clients/common/nm-client-utils.c:299
-+#: ../clients/common/nm-client-utils.c:333
- msgid "AutoIP service error"
- msgstr "AutoIP サービスエラー"
-
--#: ../clients/common/nm-client-utils.c:300
-+#: ../clients/common/nm-client-utils.c:334
- msgid "AutoIP service failed"
- msgstr "AutoIP サービスの失敗"
-
--#: ../clients/common/nm-client-utils.c:301
-+#: ../clients/common/nm-client-utils.c:335
- msgid "The line is busy"
- msgstr "回線が使用中です"
-
--#: ../clients/common/nm-client-utils.c:302
-+#: ../clients/common/nm-client-utils.c:336
- msgid "No dial tone"
- msgstr "ダイアル音がありません"
-
--#: ../clients/common/nm-client-utils.c:303
-+#: ../clients/common/nm-client-utils.c:337
- msgid "No carrier could be established"
- msgstr "確立できるキャリアがありませんでした"
-
--#: ../clients/common/nm-client-utils.c:304
-+#: ../clients/common/nm-client-utils.c:338
- msgid "The dialing request timed out"
- msgstr "ダイアル要求がタイムアウトしました"
-
--#: ../clients/common/nm-client-utils.c:305
-+#: ../clients/common/nm-client-utils.c:339
- msgid "The dialing attempt failed"
- msgstr "ダイアルの試行に失敗しました"
-
--#: ../clients/common/nm-client-utils.c:306
-+#: ../clients/common/nm-client-utils.c:340
- msgid "Modem initialization failed"
- msgstr "モデムの初期化に失敗しました"
-
--#: ../clients/common/nm-client-utils.c:307
-+#: ../clients/common/nm-client-utils.c:341
- msgid "Failed to select the specified APN"
- msgstr "指定された APN の選択に失敗しました"
-
--#: ../clients/common/nm-client-utils.c:308
-+#: ../clients/common/nm-client-utils.c:342
- msgid "Not searching for networks"
- msgstr "ネットワーク検索をしていません"
-
--#: ../clients/common/nm-client-utils.c:309
-+#: ../clients/common/nm-client-utils.c:343
- msgid "Network registration denied"
- msgstr "ネットワークの登録が拒否されました"
-
--#: ../clients/common/nm-client-utils.c:310
-+#: ../clients/common/nm-client-utils.c:344
- msgid "Network registration timed out"
- msgstr "ネットワークの登録がタイムアウトになりました"
-
--#: ../clients/common/nm-client-utils.c:311
-+#: ../clients/common/nm-client-utils.c:345
- msgid "Failed to register with the requested network"
- msgstr "要求されたネットワークへの登録に失敗しました"
-
--#: ../clients/common/nm-client-utils.c:312
-+#: ../clients/common/nm-client-utils.c:346
- msgid "PIN check failed"
- msgstr "PIN 確認に失敗しました"
-
--#: ../clients/common/nm-client-utils.c:313
-+#: ../clients/common/nm-client-utils.c:347
- msgid "Necessary firmware for the device may be missing"
- msgstr "このデバイスに必要なファームウェアがない可能性があります"
-
--#: ../clients/common/nm-client-utils.c:314
-+#: ../clients/common/nm-client-utils.c:348
- msgid "The device was removed"
- msgstr "このデバイスは削除されました"
-
--#: ../clients/common/nm-client-utils.c:315
-+#: ../clients/common/nm-client-utils.c:349
- msgid "NetworkManager went to sleep"
- msgstr "NetworkManager がスリープ状態に入りました"
-
--#: ../clients/common/nm-client-utils.c:316
-+#: ../clients/common/nm-client-utils.c:350
- msgid "The device's active connection disappeared"
- msgstr "このデバイスのアクティブな接続が消滅しました"
-
--#: ../clients/common/nm-client-utils.c:317
-+#: ../clients/common/nm-client-utils.c:351
- msgid "Device disconnected by user or client"
- msgstr "ユーザーまたはクライアントによりデバイスが切断されました"
-
--#: ../clients/common/nm-client-utils.c:318
-+#: ../clients/common/nm-client-utils.c:352
- msgid "Carrier/link changed"
- msgstr "キャリア/リンクが変更されました"
-
--#: ../clients/common/nm-client-utils.c:319
-+#: ../clients/common/nm-client-utils.c:353
- msgid "The device's existing connection was assumed"
- msgstr "デバイスの既存の接続とみなされました"
-
--#: ../clients/common/nm-client-utils.c:320
-+#: ../clients/common/nm-client-utils.c:354
- msgid "The supplicant is now available"
- msgstr "サプリカントが使用できるようになりました"
-
--#: ../clients/common/nm-client-utils.c:321
-+#: ../clients/common/nm-client-utils.c:355
- msgid "The modem could not be found"
- msgstr "モデムが見つかりませんでした"
-
--#: ../clients/common/nm-client-utils.c:322
-+#: ../clients/common/nm-client-utils.c:356
- msgid "The Bluetooth connection failed or timed out"
- msgstr "Bluetooth 接続が失敗またはタイムアウトしました"
-
--#: ../clients/common/nm-client-utils.c:323
-+#: ../clients/common/nm-client-utils.c:357
- msgid "GSM Modem's SIM card not inserted"
- msgstr "GSM モデムの SIM カードが挿入されていません"
-
--#: ../clients/common/nm-client-utils.c:324
-+#: ../clients/common/nm-client-utils.c:358
- msgid "GSM Modem's SIM PIN required"
- msgstr "GSM モデムの SIM PIN が必要です"
-
--#: ../clients/common/nm-client-utils.c:325
-+#: ../clients/common/nm-client-utils.c:359
- msgid "GSM Modem's SIM PUK required"
- msgstr "GSM モデムの SIM PUK が必要です"
-
--#: ../clients/common/nm-client-utils.c:326
-+#: ../clients/common/nm-client-utils.c:360
- msgid "GSM Modem's SIM wrong"
- msgstr "GSM モデムの SIM が間違っています"
-
--#: ../clients/common/nm-client-utils.c:327
-+#: ../clients/common/nm-client-utils.c:361
- msgid "InfiniBand device does not support connected mode"
- msgstr "InfiniBand デバイスでは接続モードに対応していません"
-
--#: ../clients/common/nm-client-utils.c:328
-+#: ../clients/common/nm-client-utils.c:362
- msgid "A dependency of the connection failed"
- msgstr "接続依存性の失敗"
-
--#: ../clients/common/nm-client-utils.c:329
-+#: ../clients/common/nm-client-utils.c:363
- msgid "A problem with the RFC 2684 Ethernet over ADSL bridge"
- msgstr "ADSL ブリッジ経由の RFC 2684 Ethernet に問題が発生しました"
-
--#: ../clients/common/nm-client-utils.c:330
-+#: ../clients/common/nm-client-utils.c:364
- msgid "ModemManager is unavailable"
- msgstr "ModemManager は使用できません"
-
--#: ../clients/common/nm-client-utils.c:331
-+#: ../clients/common/nm-client-utils.c:365
- msgid "The Wi-Fi network could not be found"
- msgstr "Wi-Fi ネットワークが見つかりませんでした"
-
--#: ../clients/common/nm-client-utils.c:332
-+#: ../clients/common/nm-client-utils.c:366
- msgid "A secondary connection of the base connection failed"
- msgstr "ベース接続のセカンダリー接続に失敗しました"
-
--#: ../clients/common/nm-client-utils.c:333
-+#: ../clients/common/nm-client-utils.c:367
- msgid "DCB or FCoE setup failed"
- msgstr "DCB または FCoE のセットアップに失敗しました"
-
--#: ../clients/common/nm-client-utils.c:334
-+#: ../clients/common/nm-client-utils.c:368
- msgid "teamd control failed"
- msgstr "teamd の制御に失敗しました"
-
--#: ../clients/common/nm-client-utils.c:335
-+#: ../clients/common/nm-client-utils.c:369
- msgid "Modem failed or no longer available"
- msgstr "モデムで障害が発生したか、モデムが利用できなくなりました"
-
--#: ../clients/common/nm-client-utils.c:336
-+#: ../clients/common/nm-client-utils.c:370
- msgid "Modem now ready and available"
- msgstr "モデムが準備されましたので利用可能です"
-
--#: ../clients/common/nm-client-utils.c:337
-+#: ../clients/common/nm-client-utils.c:371
- msgid "SIM PIN was incorrect"
- msgstr "SIM PIN が間違っています"
-
--#: ../clients/common/nm-client-utils.c:338
-+#: ../clients/common/nm-client-utils.c:372
- msgid "New connection activation was enqueued"
- msgstr "新規接続アクティベーションがキューに格納されました"
-
--#: ../clients/common/nm-client-utils.c:339
-+#: ../clients/common/nm-client-utils.c:373
- msgid "The device's parent changed"
- msgstr "デバイスの親が変更されました"
-
--#: ../clients/common/nm-client-utils.c:340
-+#: ../clients/common/nm-client-utils.c:374
- msgid "The device parent's management changed"
- msgstr "デバイスの親の管理が変更されました"
-
--#: ../clients/common/nm-client-utils.c:341
-+#: ../clients/common/nm-client-utils.c:375
- msgid "Open vSwitch database connection failed"
- msgstr "Open vSwitch データベースの接続に失敗しました"
-
--#: ../clients/common/nm-client-utils.c:342
-+#: ../clients/common/nm-client-utils.c:376
- msgid "A duplicate IP address was detected"
- msgstr "複製された IP アドレスが検出されました"
-
--#: ../clients/common/nm-client-utils.c:343
-+#: ../clients/common/nm-client-utils.c:377
- msgid "The selected IP method is not supported"
- msgstr "選択された IP メソッドには対応していません"
-
--#: ../clients/common/nm-client-utils.c:344
-+#: ../clients/common/nm-client-utils.c:378
- msgid "Failed to configure SR-IOV parameters"
- msgstr "SR-IOV パラメーターの設定に失敗しました"
-
--#: ../clients/common/nm-client-utils.c:345
-+#: ../clients/common/nm-client-utils.c:379
- msgid "The Wi-Fi P2P peer could not be found"
- msgstr "Wi-Fi P2P ピアが見つかりませんでした"
-
--#: ../clients/common/nm-client-utils.c:351
-+#: ../clients/common/nm-client-utils.c:385
- msgid "Unknown reason"
- msgstr "不明な理由"
-
--#: ../clients/common/nm-client-utils.c:352
-+#: ../clients/common/nm-client-utils.c:386
- msgid "The connection was disconnected"
- msgstr "接続が切断されました"
-
--#: ../clients/common/nm-client-utils.c:353
-+#: ../clients/common/nm-client-utils.c:387
- msgid "Disconnected by user"
- msgstr "ユーザーにより切断"
-
--#: ../clients/common/nm-client-utils.c:354
-+#: ../clients/common/nm-client-utils.c:388
- msgid "The base network connection was interrupted"
- msgstr "基本ネットワーク接続が中断されました。"
-
--#: ../clients/common/nm-client-utils.c:355
-+#: ../clients/common/nm-client-utils.c:389
- msgid "The VPN service stopped unexpectedly"
- msgstr "VPN サービスが予期せず停止しました"
-
--#: ../clients/common/nm-client-utils.c:356
-+#: ../clients/common/nm-client-utils.c:390
- msgid "The VPN service returned invalid configuration"
- msgstr "VPN サービスが無効な設定を返しました"
-
--#: ../clients/common/nm-client-utils.c:357
-+#: ../clients/common/nm-client-utils.c:391
- msgid "The connection attempt timed out"
- msgstr "接続試行がタイムアウトしました"
-
--#: ../clients/common/nm-client-utils.c:358
-+#: ../clients/common/nm-client-utils.c:392
- msgid "The VPN service did not start in time"
- msgstr "VPN サービスは時間内に開始しませんでした"
-
--#: ../clients/common/nm-client-utils.c:359
-+#: ../clients/common/nm-client-utils.c:393
- msgid "The VPN service failed to start"
- msgstr "VPN サービスの開始に失敗しました"
-
--#: ../clients/common/nm-client-utils.c:360
-+#: ../clients/common/nm-client-utils.c:394
- msgid "No valid secrets"
- msgstr "有効なシークレットはありません"
-
--#: ../clients/common/nm-client-utils.c:361
-+#: ../clients/common/nm-client-utils.c:395
- msgid "Invalid secrets"
- msgstr "無効なシークレット"
-
--#: ../clients/common/nm-client-utils.c:362
-+#: ../clients/common/nm-client-utils.c:396
- msgid "The connection was removed"
- msgstr "接続は削除されました"
-
--#: ../clients/common/nm-client-utils.c:363
-+#: ../clients/common/nm-client-utils.c:397
- msgid "Master connection failed"
- msgstr "マスター接続に失敗しました"
-
--#: ../clients/common/nm-client-utils.c:364
-+#: ../clients/common/nm-client-utils.c:398
- msgid "Could not create a software link"
- msgstr "ソフトウェアリンクを作成できませんでした"
-
--#: ../clients/common/nm-client-utils.c:365
-+#: ../clients/common/nm-client-utils.c:399
- msgid "The device disappeared"
- msgstr "デバイスが消滅しました"
-
-+#: ../clients/common/nm-client-utils.c:722
-+msgid "missing colon for \"<setting>.<property>:<secret>\" format"
-+msgstr "\"<setting>.<property><secret>\" フォーマットのコロンが欠落しています。"
-+
-+#: ../clients/common/nm-client-utils.c:738
-+msgid "missing dot for \"<setting>.<property>:<secret>\" format"
-+msgstr "”<setting>.<property><secret>” のドットが欠落しています。"
-+
-+#: ../clients/common/nm-client-utils.c:743
-+msgid "missing setting for \"<setting>.<property>:<secret>\" format"
-+msgstr "\"<setting>.<property><secret>\" フォーマットの設定がありません。"
-+
-+#: ../clients/common/nm-client-utils.c:753
-+msgid "missing property for \"<setting>.<property>:<secret>\" format"
-+msgstr "\"<setting>.<property><secret>\" フォーマットのプロパティが欠落しています。"
-+
-+#: ../clients/common/nm-client-utils.c:764
-+msgid "invalid setting name"
-+msgstr "無効な設定名"
-+
-+#: ../clients/common/nm-client-utils.c:780
-+msgid "property name is not UTF-8"
-+msgstr "プロパティー名が UTF-8 ではない"
-+
-+#: ../clients/common/nm-client-utils.c:795
-+#: ../clients/common/nm-client-utils.c:802
-+msgid "secret is not UTF-8"
-+msgstr "シークレットは UTF-8 ではありません。"
-+
- #: ../clients/common/nm-meta-setting-access.c:496
- #, c-format
- msgid "field '%s' has to be alone"
-@@ -4359,206 +4427,208 @@ msgstr "フィールド '%s' は孤立する必要があります"
- 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:297
--#: ../clients/common/nm-meta-setting-desc.c:358
-+#: ../clients/common/nm-meta-setting-desc.c:276
-+#: ../clients/common/nm-meta-setting-desc.c:337
- #, c-format
- msgid "invalid prefix '%s'; <1-%d> allowed"
- msgstr "無効なプレフィックス '%s'; <1-%d> 許可"
-
--#: ../clients/common/nm-meta-setting-desc.c:305
-+#: ../clients/common/nm-meta-setting-desc.c:284
- #, c-format
- msgid "invalid IP address: %s"
- msgstr "無効な IP アドレス: %s"
-
--#: ../clients/common/nm-meta-setting-desc.c:330
-+#: ../clients/common/nm-meta-setting-desc.c:309
- msgid ""
- "The valid syntax is: 'ip[/prefix] [next-hop] [metric] [attribute=val]... [,"
- "ip[/prefix] ...]'"
- msgstr "有効な構文は以下のようになります: 'ip[/prefix] [next-hop] [metric] [attribute=val]... [,ip[/prefix] ...]'"
-
--#: ../clients/common/nm-meta-setting-desc.c:369
-+#: ../clients/common/nm-meta-setting-desc.c:348
- #, c-format
- msgid "the next hop ('%s') must be first"
- msgstr "次のホップ ('%s') が初回である必要があります"
-
--#: ../clients/common/nm-meta-setting-desc.c:375
-+#: ../clients/common/nm-meta-setting-desc.c:354
- #, c-format
- msgid "the metric ('%s') must be before attributes"
- msgstr "メトリック ('%s') が属性の前にある必要があります"
-
--#: ../clients/common/nm-meta-setting-desc.c:423
-+#: ../clients/common/nm-meta-setting-desc.c:402
- #, c-format
- msgid "invalid route: %s. %s"
- msgstr "無効なルート: %s. %s"
-
--#: ../clients/common/nm-meta-setting-desc.c:489
-+#: ../clients/common/nm-meta-setting-desc.c:468
- #, c-format
- msgid "cannot read pac-script from file '%s'"
- msgstr "ファイル '%s' から pac-script を読み込めません"
-
--#: ../clients/common/nm-meta-setting-desc.c:496
-+#: ../clients/common/nm-meta-setting-desc.c:475
- #, c-format
- msgid "file '%s' contains non-valid utf-8"
- msgstr "ファイル '%s' には無効な utf-8 が含まれています"
-
--#: ../clients/common/nm-meta-setting-desc.c:509
-+#: ../clients/common/nm-meta-setting-desc.c:488
- #, c-format
- msgid "'%s' does not contain a valid PAC Script"
- msgstr "'%s' には有効な PAC スクリプトが含まれていません"
-
--#: ../clients/common/nm-meta-setting-desc.c:512
-+#: ../clients/common/nm-meta-setting-desc.c:491
- #, c-format
- msgid "Not a valid PAC Script"
- msgstr "有効な PAC スクリプトではありません"
-
--#: ../clients/common/nm-meta-setting-desc.c:565
-+#: ../clients/common/nm-meta-setting-desc.c:544
- #, c-format
- msgid "cannot read team config from file '%s'"
- msgstr "ファイル '%s' からチーム設定を読み込めません"
-
--#: ../clients/common/nm-meta-setting-desc.c:572
-+#: ../clients/common/nm-meta-setting-desc.c:551
- #, c-format
- msgid "team config file '%s' contains non-valid utf-8"
- msgstr "チーム設定ファイル '%s' には無効な utf-8 が含まれています"
-
--#: ../clients/common/nm-meta-setting-desc.c:1029
-+#: ../clients/common/nm-meta-setting-desc.c:1036
- msgid "auto"
- msgstr "自動"
-
--#: ../clients/common/nm-meta-setting-desc.c:1181
-+#: ../clients/common/nm-meta-setting-desc.c:1188
- #, c-format
- msgid "%s (%s)"
- msgstr "%s (%s)"
-
--#: ../clients/common/nm-meta-setting-desc.c:1329
--#: ../clients/common/nm-meta-setting-desc.c:1333
-+#: ../clients/common/nm-meta-setting-desc.c:1352
-+#: ../clients/common/nm-meta-setting-desc.c:1356
-+#: ../clients/common/nm-meta-setting-desc.c:4153
- msgid "'%s' is out of range [%"
- msgstr "'%s' は [% の範囲外です"
-
--#: ../clients/common/nm-meta-setting-desc.c:1338
-+#: ../clients/common/nm-meta-setting-desc.c:1361
- #, c-format
- msgid "'%s' is not a valid number"
- msgstr "'%s' は有効な数値ではありません"
-
--#: ../clients/common/nm-meta-setting-desc.c:1395
-+#: ../clients/common/nm-meta-setting-desc.c:1418
- #, c-format
- msgid "'%s' is out of range [0, %u]"
- msgstr "'%s' は、[0, %u] の範囲外です"
-
--#: ../clients/common/nm-meta-setting-desc.c:1441
-+#: ../clients/common/nm-meta-setting-desc.c:1464
- #, c-format
- msgid "'%s' is not a valid Ethernet MAC"
- msgstr "'%s' は有効な Ethernet MAC ではありません"
-
--#: ../clients/common/nm-meta-setting-desc.c:1567
-+#: ../clients/common/nm-meta-setting-desc.c:1590
- #, c-format
- msgid "invalid option '%s', use a combination of [%s]"
- msgstr "無効なオプション '%s' です。[%s] の組み合わせを使用してください"
-
--#: ../clients/common/nm-meta-setting-desc.c:1572 ../libnm-core/nm-keyfile.c:926
-+#: ../clients/common/nm-meta-setting-desc.c:1595
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1076
- #, c-format
- msgid "invalid option '%s', use one of [%s]"
- msgstr "無効なオプション '%s' です。[%s] のいずれかを使用してください"
-
--#: ../clients/common/nm-meta-setting-desc.c:1691
-+#: ../clients/common/nm-meta-setting-desc.c:1714
- #, c-format
- msgid "%d (key)"
- msgstr "%d (key)"
-
--#: ../clients/common/nm-meta-setting-desc.c:1693
-+#: ../clients/common/nm-meta-setting-desc.c:1716
- #, c-format
- msgid "%d (passphrase)"
- msgstr "%d (パスフレーズ)"
-
--#: ../clients/common/nm-meta-setting-desc.c:1696
-+#: ../clients/common/nm-meta-setting-desc.c:1719
- #, c-format
- msgid "%d (unknown)"
- msgstr "%d (不明)"
-
--#: ../clients/common/nm-meta-setting-desc.c:1709
-+#: ../clients/common/nm-meta-setting-desc.c:1732
- msgid "0 (NONE)"
- msgstr "0 (なし)"
-
--#: ../clients/common/nm-meta-setting-desc.c:1715
-+#: ../clients/common/nm-meta-setting-desc.c:1738
- msgid "REORDER_HEADERS, "
- msgstr "ヘッダーの順序変更、 "
-
--#: ../clients/common/nm-meta-setting-desc.c:1717
-+#: ../clients/common/nm-meta-setting-desc.c:1740
- msgid "GVRP, "
- msgstr "GVRP、 "
-
--#: ../clients/common/nm-meta-setting-desc.c:1719
-+#: ../clients/common/nm-meta-setting-desc.c:1742
- msgid "LOOSE_BINDING, "
- msgstr "ルースバインディング、 "
-
--#: ../clients/common/nm-meta-setting-desc.c:1721
-+#: ../clients/common/nm-meta-setting-desc.c:1744
- msgid "MVRP, "
- msgstr "MVRP、 "
-
--#: ../clients/common/nm-meta-setting-desc.c:1742
-+#: ../clients/common/nm-meta-setting-desc.c:1765
- msgid "0 (none)"
- msgstr "0 (なし)"
-
--#: ../clients/common/nm-meta-setting-desc.c:1748
-+#: ../clients/common/nm-meta-setting-desc.c:1771
- msgid "agent-owned, "
- msgstr "エージェント所有、 "
-
--#: ../clients/common/nm-meta-setting-desc.c:1750
-+#: ../clients/common/nm-meta-setting-desc.c:1773
- msgid "not saved, "
- msgstr "未保存、 "
-
--#: ../clients/common/nm-meta-setting-desc.c:1752
-+#: ../clients/common/nm-meta-setting-desc.c:1775
- msgid "not required, "
- msgstr "不必要、 "
-
--#: ../clients/common/nm-meta-setting-desc.c:1970
-+#: ../clients/common/nm-meta-setting-desc.c:1975
- #, c-format
- msgid "'%s' is not valid; use <option>=<value>"
- msgstr "'%s' は無効です; <option>=<value> を使用してください"
-
--#: ../clients/common/nm-meta-setting-desc.c:1980
-+#: ../clients/common/nm-meta-setting-desc.c:1985
- #, c-format
- msgid "cannot set empty \"%s\" option"
- msgstr "空の \"%s\" オプションを設定できません"
-
--#: ../clients/common/nm-meta-setting-desc.c:2039
-+#: ../clients/common/nm-meta-setting-desc.c:2044
- #, c-format
- msgid "'%u' flags are not valid; use combination of %s"
- msgstr "'%u' フラグは有効ではありません。%s の組み合わせを使用してください"
-
--#: ../clients/common/nm-meta-setting-desc.c:2056
-+#: ../clients/common/nm-meta-setting-desc.c:2061
- #, c-format
- msgid "'%s' is not a valid number (or out of range)"
- msgstr "'%s' は有効な数字ではありません (または範囲外になります)"
-
--#: ../clients/common/nm-meta-setting-desc.c:2077
--#: ../clients/common/nm-meta-setting-desc.c:4052
--#: ../libnm-core/nm-setting-ovs-bridge.c:183 ../src/nm-config.c:556
-+#: ../clients/common/nm-meta-setting-desc.c:2082
-+#: ../clients/common/nm-meta-setting-desc.c:4026
-+#: ../libnm-core/nm-setting-ovs-bridge.c:183 ../src/nm-config.c:549
- #, c-format
- msgid "'%s' is not valid"
- msgstr "'%s' は無効です"
-
--#: ../clients/common/nm-meta-setting-desc.c:2174
-+#: ../clients/common/nm-meta-setting-desc.c:2177
- msgid "not a valid hex-string"
- msgstr "有効な 16 進数の文字列ではありません"
-
--#: ../clients/common/nm-meta-setting-desc.c:2190
-+#: ../clients/common/nm-meta-setting-desc.c:2193
- #, c-format
- msgid "'%s' is not a valid hex character"
- msgstr "'%s' は有効な 16 進文字ではありません"
-
--#: ../clients/common/nm-meta-setting-desc.c:2269
-+#: ../clients/common/nm-meta-setting-desc.c:2272
- msgid ""
- "too many arguments. Please only specify a private key file and optionally a "
- "password"
- msgstr "引数が多すぎます。プライベートのキーファイルのみを指定してください。オプションでパスワードを指定します"
-
--#: ../clients/common/nm-meta-setting-desc.c:2376
-+#: ../clients/common/nm-meta-setting-desc.c:2387
- #, c-format
- msgid "failed to set bond option \"%s\""
- msgstr "ボンドオプション \"%s\" の設定に失敗しました"
-
--#: ../clients/common/nm-meta-setting-desc.c:2393
-+#: ../clients/common/nm-meta-setting-desc.c:2404
- #, c-format
- msgid ""
- "Enter a list of bonding options formatted as:\n"
-@@ -4595,125 +4665,120 @@ 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:2458
-+#: ../clients/common/nm-meta-setting-desc.c:2469
- #, c-format
- msgid "Can not change the connection type"
- msgstr "接続タイプを変更できません"
-
--#: ../clients/common/nm-meta-setting-desc.c:2543
-+#: ../clients/common/nm-meta-setting-desc.c:2554
- #, c-format
- msgid "invalid permission \"%s\""
- msgstr "無効なパーミッション \"%s\""
-
--#: ../clients/common/nm-meta-setting-desc.c:2580
--#, c-format
--msgid "'%s' is not valid master; use ifname or connection UUID"
--msgstr "'%s' は 有効なマスターではありません: ifname か、接続 UUID を使用してください。"
--
--#: ../clients/common/nm-meta-setting-desc.c:2661
-+#: ../clients/common/nm-meta-setting-desc.c:2654
- #, c-format
- msgid "the value '%s' is not a valid UUID"
- msgstr "値 '%s' は有効な UUID ではありません"
-
--#: ../clients/common/nm-meta-setting-desc.c:2732
-+#: ../clients/common/nm-meta-setting-desc.c:2725
- msgid "0 (disabled)"
- msgstr "0 (無効)"
-
--#: ../clients/common/nm-meta-setting-desc.c:2738
-+#: ../clients/common/nm-meta-setting-desc.c:2731
- msgid "enabled, "
- msgstr "有効、 "
-
--#: ../clients/common/nm-meta-setting-desc.c:2740
-+#: ../clients/common/nm-meta-setting-desc.c:2733
- msgid "advertise, "
- msgstr "公表、 "
-
--#: ../clients/common/nm-meta-setting-desc.c:2742
-+#: ../clients/common/nm-meta-setting-desc.c:2735
- msgid "willing, "
- msgstr "用意がある、 "
-
--#: ../clients/common/nm-meta-setting-desc.c:2831
-+#: ../clients/common/nm-meta-setting-desc.c:2824
- #, c-format
- msgid "'%s' is not a valid DCB flag"
- msgstr "'%s' は有効な DCB フラグではありません"
-
--#: ../clients/common/nm-meta-setting-desc.c:2858
-+#: ../clients/common/nm-meta-setting-desc.c:2851
- msgid "must contain 8 comma-separated numbers"
- msgstr "コンマで区切った 8 つの番号を含ませてください"
-
--#: ../clients/common/nm-meta-setting-desc.c:2872
-+#: ../clients/common/nm-meta-setting-desc.c:2865
- #, 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:2875
-+#: ../clients/common/nm-meta-setting-desc.c:2868
- #, c-format
- msgid "'%s' not a number between 0 and %u (inclusive)"
- msgstr "'%s' は 0 と %u (含む) の間の数ではありません"
-
--#: ../clients/common/nm-meta-setting-desc.c:2896
-+#: ../clients/common/nm-meta-setting-desc.c:2889
- #, c-format
- msgid "changes will have no effect until '%s' includes 1 (enabled)"
- msgstr "変更は、'%s' に 1 (有効) が含まれるまで効果はありません"
-
--#: ../clients/common/nm-meta-setting-desc.c:2926
-+#: ../clients/common/nm-meta-setting-desc.c:2919
- #, c-format
- msgid "bandwidth percentages must total 100%%"
- msgstr "帯域幅のパーセンテージの合計は 100%% にならなければなりません"
-
--#: ../clients/common/nm-meta-setting-desc.c:2997
--#: ../clients/common/nm-meta-setting-desc.c:3003
-+#: ../clients/common/nm-meta-setting-desc.c:2990
-+#: ../clients/common/nm-meta-setting-desc.c:2996
- 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:3027
-+#: ../clients/common/nm-meta-setting-desc.c:3020
- #, c-format
- msgid "'%s' is not a valid IBoIP P_Key"
- msgstr "'%s' は有効な IBoIP P_Key ではありません"
-
--#: ../clients/common/nm-meta-setting-desc.c:3050
-+#: ../clients/common/nm-meta-setting-desc.c:3043
- msgid "default"
- msgstr "デフォルト"
-
--#: ../clients/common/nm-meta-setting-desc.c:3214
-+#: ../clients/common/nm-meta-setting-desc.c:3207
- #, c-format
- msgid "invalid IPv%c address '%s'"
- msgstr "無効な IPv%c アドレス '%s'"
-
--#: ../clients/common/nm-meta-setting-desc.c:3341
-+#: ../clients/common/nm-meta-setting-desc.c:3334
- #, c-format
- msgid "invalid gateway address '%s'"
- msgstr "無効なゲートウェイアドレス '%s'"
-
--#: ../clients/common/nm-meta-setting-desc.c:3491
-+#: ../clients/common/nm-meta-setting-desc.c:3461
- #, c-format
- msgid "'%s' is not a valid channel; use <1-13>"
- msgstr "'%s' は有効なチャンネルではありません。<1-13> を使用してください"
-
--#: ../clients/common/nm-meta-setting-desc.c:3571
-+#: ../clients/common/nm-meta-setting-desc.c:3541
- 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:3595
--#: ../clients/common/nm-meta-setting-desc.c:3675
-+#: ../clients/common/nm-meta-setting-desc.c:3565
-+#: ../clients/common/nm-meta-setting-desc.c:3645
- msgid ""
- "The valid syntax is: '[root | parent <handle>] [handle <handle>] <kind>'"
- msgstr "有効な構文: '[root | parent <handle>] [handle <handle>] <kind>'"
-
--#: ../clients/common/nm-meta-setting-desc.c:3620
-+#: ../clients/common/nm-meta-setting-desc.c:3590
- msgid "The valid syntax is: '<vid>[-<vid>] [pvid] [untagged]'"
- msgstr "有効な構文: '<vid>[-<vid>] [pvid] [untagged]'"
-
--#: ../clients/common/nm-meta-setting-desc.c:3816
-+#: ../clients/common/nm-meta-setting-desc.c:3786
- #, c-format
- msgid "invalid priority map '%s'"
- msgstr "無効な優先度マップ '%s'"
-
--#: ../clients/common/nm-meta-setting-desc.c:3904
-+#: ../clients/common/nm-meta-setting-desc.c:3878
- #, 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:3943
-+#: ../clients/common/nm-meta-setting-desc.c:3917
- #, c-format
- msgid ""
- "Enter a list of S/390 options formatted as:\n"
-@@ -4723,88 +4788,88 @@ msgstr "S/390 のオプション一覧を次の形式で入力します。\n"
- " option = <value>, option = <value>,...\n"
- "次が有効なオプションになります: %s\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:3978
-+#: ../clients/common/nm-meta-setting-desc.c:3952
- #, c-format
- msgid "'%s' is not a valid channel"
- msgstr "'%s' は有効なチャンネルではありません"
-
--#: ../clients/common/nm-meta-setting-desc.c:3984
-+#: ../clients/common/nm-meta-setting-desc.c:3958
- #, c-format
- msgid "'%ld' is not a valid channel"
- msgstr "'%ld' は有効なチャンネルではありません"
-
--#: ../clients/common/nm-meta-setting-desc.c:4001
--#: ../libnm-core/nm-setting-sriov.c:434 ../libnm-core/nm-setting-wired.c:758
-+#: ../clients/common/nm-meta-setting-desc.c:3975
-+#: ../libnm-core/nm-setting-sriov.c:438 ../libnm-core/nm-setting-wired.c:758
- #: ../libnm-core/nm-setting-wired.c:771 ../libnm-core/nm-setting-wired.c:824
--#: ../libnm-core/nm-setting-wired.c:867 ../libnm-core/nm-setting-wireless.c:876
--#: ../libnm-core/nm-setting-wireless.c:892
-+#: ../libnm-core/nm-setting-wired.c:867 ../libnm-core/nm-setting-wireless.c:881
-+#: ../libnm-core/nm-setting-wireless.c:897
- #, c-format
- msgid "'%s' is not a valid MAC address"
- msgstr "'%s' は有効な MAC アドレスではありません"
-
--#: ../clients/common/nm-meta-setting-desc.c:4061
-+#: ../clients/common/nm-meta-setting-desc.c:4035
- #, 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:4071
-+#: ../clients/common/nm-meta-setting-desc.c:4045
- #, c-format
- msgid "WEP key is guessed to be of '%s'"
- msgstr "WEP キーは '%s' であると仮定しています"
-
--#: ../clients/common/nm-meta-setting-desc.c:4076
-+#: ../clients/common/nm-meta-setting-desc.c:4050
- #, c-format
- msgid "WEP key index set to '%d'"
- msgstr "WEP キーインデックスは '%d' に設定されます"
-
--#: ../clients/common/nm-meta-setting-desc.c:4115
-+#: ../clients/common/nm-meta-setting-desc.c:4089
- #, 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:4172
-+#: ../clients/common/nm-meta-setting-desc.c:4175
- #, c-format
- msgid "'%s' is not valid; use 'on', 'off', or 'ignore'"
- msgstr "'%s' は無効です; 'on'、'off'、または 'ignore' を使用してください"
-
--#: ../clients/common/nm-meta-setting-desc.c:4232
-+#: ../clients/common/nm-meta-setting-desc.c:4244
- msgid "Bonding primary interface [none]"
- msgstr "ボンドのプライマリインターフェース [none]"
-
- #. this is a virtual property, only needed during "ask" mode.
--#: ../clients/common/nm-meta-setting-desc.c:4239
-+#: ../clients/common/nm-meta-setting-desc.c:4251
- msgid "Bonding monitoring mode"
- msgstr "ボンディングモニタリングモード"
-
--#: ../clients/common/nm-meta-setting-desc.c:4248
-+#: ../clients/common/nm-meta-setting-desc.c:4260
- msgid "Bonding miimon [100]"
- msgstr "ボンドの miimon [100]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4256
-+#: ../clients/common/nm-meta-setting-desc.c:4268
- msgid "Bonding downdelay [0]"
- msgstr "ボンドの downdelay [0]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4264
-+#: ../clients/common/nm-meta-setting-desc.c:4276
- msgid "Bonding updelay [0]"
- msgstr "ボンドの updelay [0]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4272
-+#: ../clients/common/nm-meta-setting-desc.c:4284
- msgid "Bonding arp-interval [0]"
- msgstr "ボンドの arp-interval [0]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4280
-+#: ../clients/common/nm-meta-setting-desc.c:4292
- msgid "Bonding arp-ip-target [none]"
- msgstr "ボンドの arp-ip-target [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4288
-+#: ../clients/common/nm-meta-setting-desc.c:4300
- msgid "LACP rate ('slow' or 'fast') [slow]"
- msgstr "LACP レート ('slow' または 'fast') [slow]"
-
- #. macro that returns @func as const (guint32(*)(NMSetting*)) type, but checks
- #. * that the actual type is (guint32(*)(type *)).
--#: ../clients/common/nm-meta-setting-desc.c:4455
-+#: ../clients/common/nm-meta-setting-desc.c:4467
- 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 "
-@@ -4818,7 +4883,7 @@ msgstr "nmcli では、JSON 設定データそのものと、設定を含むフ
- "例: set team.config { \"device\": \"team0\", \"runner\": {\"name\": \"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n"
- " set team.config /etc/my-team.conf\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:4463
-+#: ../clients/common/nm-meta-setting-desc.c:4475
- 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 "
-@@ -4858,11 +4923,11 @@ msgstr "キーが teamd のプロパティーになっているディクショ
- "例:\n"
- " name=arp_ping source-host=172.16.1.1 target-host=172.16.1.254, name=ethtool delay-up=3\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:4496
-+#: ../clients/common/nm-meta-setting-desc.c:4524
- 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:4532
-+#: ../clients/common/nm-meta-setting-desc.c:4560
- msgid ""
- "Enter file path to CA certificate (optionally prefixed with file://).\n"
- " [file://]<file path>\n"
-@@ -4873,7 +4938,7 @@ msgstr "CA 証明書へのファイルパスを入力します (オプション
- "nmcli では、証明書を、生の blob データとして指定できないことに注意してください。\n"
- "例: /home/cimrman/cacert.crt\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:4571
-+#: ../clients/common/nm-meta-setting-desc.c:4602
- msgid ""
- "Enter file path to client certificate (optionally prefixed with file://).\n"
- " [file://]<file path>\n"
-@@ -4884,7 +4949,7 @@ msgstr "クライアント証明書へのファイルパスを入力します (
- "nmcli では、証明書を、生の blob データとして指定できないことに注意してください。\n"
- "例: /home/cimrman/jara.crt\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:4628
-+#: ../clients/common/nm-meta-setting-desc.c:4659
- msgid ""
- "Enter file path to CA certificate for inner authentication (optionally "
- "prefixed\n"
-@@ -4898,7 +4963,7 @@ msgstr "内部認証のために CA 証明書へのファイルパスを入力
- "nmcli では、証明書を、生の blob データとして指定できないことに注意してください。\n"
- "例: /home/cimrman/ca-zweite-phase.crt\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:4668
-+#: ../clients/common/nm-meta-setting-desc.c:4702
- msgid ""
- "Enter file path to client certificate for inner authentication (optionally "
- "prefixed\n"
-@@ -4912,7 +4977,7 @@ msgstr "内部認証のためにクライアント証明書へのファイルパ
- "nmcli では、証明書を生の blob データとして指定できないことに注意してください。\n"
- "例: /home/cimrman/jara-zweite-phase.crt\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:4695
-+#: ../clients/common/nm-meta-setting-desc.c:4729
- msgid ""
- "Enter bytes as a list of hexadecimal values.\n"
- "Two formats are accepted:\n"
-@@ -4931,8 +4996,8 @@ msgstr "16 進値の一覧のバイトを入力してください。\n"
- "例: ab0455a6ea3a74C2\n"
- " ab 4 55 0xa6 ea 3a 74 C2\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:4712
--#: ../clients/common/nm-meta-setting-desc.c:4730
-+#: ../clients/common/nm-meta-setting-desc.c:4746
-+#: ../clients/common/nm-meta-setting-desc.c:4764
- msgid ""
- "Enter path to a private key and the key password (if not set yet):\n"
- " [file://]<file path> [<password>]\n"
-@@ -4943,84 +5008,84 @@ msgstr "プライベートキーへのパスとキーパスワード (まだ設
- "nmcli では、プライベートキーを、生の blob データとして指定できないことに注意してください。\n"
- "例: /home/cimrman/jara-priv-key Dardanely\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:4769
-+#: ../clients/common/nm-meta-setting-desc.c:4803
- #: ../clients/common/nm-secret-agent-simple.c:268
- #: ../clients/common/nm-secret-agent-simple.c:356
--#: ../clients/tui/nmt-page-dsl.c:53 ../clients/tui/nmt-page-wifi.c:321
-+#: ../clients/tui/nmt-page-dsl.c:53 ../clients/tui/nmt-page-wifi.c:322
- msgid "Username"
- msgstr "ユーザー名"
-
--#: ../clients/common/nm-meta-setting-desc.c:4775
--#: ../clients/common/nm-meta-setting-desc.c:4990
--#: ../clients/common/nm-meta-setting-desc.c:5385
--#: ../clients/common/nm-meta-setting-desc.c:6328
-+#: ../clients/common/nm-meta-setting-desc.c:4809
-+#: ../clients/common/nm-meta-setting-desc.c:5093
-+#: ../clients/common/nm-meta-setting-desc.c:5520
-+#: ../clients/common/nm-meta-setting-desc.c:6492
- msgid "Password [none]"
- msgstr "パスワード [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4821
-+#: ../clients/common/nm-meta-setting-desc.c:4855
- msgid "Bluetooth device address"
- msgstr "Bluetooth デバイスアドレス"
-
--#: ../clients/common/nm-meta-setting-desc.c:4869
--#: ../clients/common/nm-meta-setting-desc.c:5438
--#: ../clients/common/nm-meta-setting-desc.c:7024
--#: ../clients/common/nm-meta-setting-desc.c:7062
--#: ../clients/common/nm-meta-setting-desc.c:7244
--#: ../clients/common/nm-meta-setting-desc.c:7474
-+#: ../clients/common/nm-meta-setting-desc.c:4903
-+#: ../clients/common/nm-meta-setting-desc.c:5573
-+#: ../clients/common/nm-meta-setting-desc.c:7200
-+#: ../clients/common/nm-meta-setting-desc.c:7238
-+#: ../clients/common/nm-meta-setting-desc.c:7420
-+#: ../clients/common/nm-meta-setting-desc.c:7650
- msgid "MAC [none]"
- msgstr "MAC [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4875
-+#: ../clients/common/nm-meta-setting-desc.c:4909
- msgid "Enable STP [no]"
- msgstr "STP の有効化 [no]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4881
-+#: ../clients/common/nm-meta-setting-desc.c:4915
- msgid "STP priority [32768]"
- msgstr "STP の優先度 [32768]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4887
-+#: ../clients/common/nm-meta-setting-desc.c:4921
- msgid "Forward delay [15]"
- msgstr "フォワード遅延 [15]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4893
-+#: ../clients/common/nm-meta-setting-desc.c:4927
- msgid "Hello time [2]"
- msgstr "Hello タイム [2]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4899
-+#: ../clients/common/nm-meta-setting-desc.c:4933
- msgid "Max age [20]"
- msgstr "最大エイジ [20]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4905
-+#: ../clients/common/nm-meta-setting-desc.c:4939
- msgid "MAC address ageing time [300]"
- msgstr "MAC アドレスのエージングタイム [300]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4911
-+#: ../clients/common/nm-meta-setting-desc.c:4949
- msgid "Group forward mask [0]"
- msgstr "グループの前方マスク [0]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4917
-+#: ../clients/common/nm-meta-setting-desc.c:4991
- msgid "Enable IGMP snooping [no]"
- msgstr "IGMP スヌーピングの有効化 [no]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4946
-+#: ../clients/common/nm-meta-setting-desc.c:5049
- msgid "Bridge port priority [32]"
- msgstr "ブリッジポートの優先度 [32]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4952
-+#: ../clients/common/nm-meta-setting-desc.c:5055
- msgid "Bridge port STP path cost [100]"
- msgstr "ブリッジポートの STP パスコスト [100]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4958
-+#: ../clients/common/nm-meta-setting-desc.c:5061
- msgid "Hairpin [no]"
- msgstr "ヘアピン [no]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4984
--#: ../clients/common/nm-meta-setting-desc.c:5379
--#: ../clients/common/nm-meta-setting-desc.c:6882
-+#: ../clients/common/nm-meta-setting-desc.c:5087
-+#: ../clients/common/nm-meta-setting-desc.c:5514
-+#: ../clients/common/nm-meta-setting-desc.c:7046
- msgid "Username [none]"
- msgstr "ユーザー名 [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5086
-+#: ../clients/common/nm-meta-setting-desc.c:5189
- msgid ""
- "Enter a list of user permissions. This is a list of user names formatted "
- "as:\n"
-@@ -5034,7 +5099,7 @@ msgstr "ユーザーのパーミッション一覧を入力します。ユーザ
- "\n"
- "例: alice bob charlie\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5138
-+#: ../clients/common/nm-meta-setting-desc.c:5242
- msgid ""
- "Enter secondary connections that should be activated when this connection "
- "is\n"
-@@ -5053,7 +5118,7 @@ msgstr "この接続がアクティベートされたときにアクティベー
- "\n"
- "例: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5161
-+#: ../clients/common/nm-meta-setting-desc.c:5265
- 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"
-@@ -5066,25 +5131,25 @@ msgstr "接続がデータクォータ、使用コスト、または他の制限
- "接続を非測定として設定する場合は 'false'、'no'、'off'\n"
- "NetworkManager でヒューリスティックを使用して値を選択できるようにする場合は 'unknown'\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5395
-+#: ../clients/common/nm-meta-setting-desc.c:5530
- msgid "APN"
- msgstr "APN"
-
--#: ../clients/common/nm-meta-setting-desc.c:5447
--#: ../clients/common/nm-meta-setting-desc.c:7093
--#: ../clients/common/nm-meta-setting-desc.c:7284
-+#: ../clients/common/nm-meta-setting-desc.c:5582
-+#: ../clients/common/nm-meta-setting-desc.c:7269
-+#: ../clients/common/nm-meta-setting-desc.c:7460
- msgid "MTU [auto]"
- msgstr "MTU [auto]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5466
-+#: ../clients/common/nm-meta-setting-desc.c:5601
- msgid "P_KEY [none]"
- msgstr "P_KEY [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5475
-+#: ../clients/common/nm-meta-setting-desc.c:5610
- msgid "Parent interface [none]"
- msgstr "親インターフェース [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5502
-+#: ../clients/common/nm-meta-setting-desc.c:5637
- msgid ""
- "Enter a list of IPv4 addresses of DNS servers.\n"
- "\n"
-@@ -5093,11 +5158,11 @@ msgstr "DNS サーバーの IPv4 アドレス一覧を入力してください
- "\n"
- "例: 8.8.8.8, 8.8.4.4\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5550
-+#: ../clients/common/nm-meta-setting-desc.c:5685
- msgid "IPv4 address (IP[/plen]) [none]"
- msgstr "IPv4 アドレス (IP[/plen]) [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5552
-+#: ../clients/common/nm-meta-setting-desc.c:5687
- msgid ""
- "Enter a list of IPv4 addresses formatted as:\n"
- " ip[/prefix], ip[/prefix],...\n"
-@@ -5110,11 +5175,11 @@ msgstr "次のような形式で IPv4 アドレスの一覧を入力してくだ
- "\n"
- "例: 192.168.1.5/24, 10.0.0.11/24\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5571
-+#: ../clients/common/nm-meta-setting-desc.c:5706
- msgid "IPv4 gateway [none]"
- msgstr "IPv4 ゲートウェイ [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5579
-+#: ../clients/common/nm-meta-setting-desc.c:5714
- msgid ""
- "Enter a list of IPv4 routes formatted as:\n"
- " ip[/prefix] [next-hop] [metric],...\n"
-@@ -5135,7 +5200,7 @@ msgstr "IPv4 ルートの一覧を次の形式で入力します。\n"
- "例: 192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n"
- " 10.1.2.0/24\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5619
-+#: ../clients/common/nm-meta-setting-desc.c:5754
- msgid ""
- "Enter a list of IPv4 routing rules formatted as:\n"
- " priority [prio] [from [src]] [to [dst]], ,...\n"
-@@ -5144,7 +5209,7 @@ msgstr "次のような形式で IPv4 ルーティングルールの一覧を入
- " priority [prio] [from [src]] [to [dst]], ,...\n"
- "\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5721
-+#: ../clients/common/nm-meta-setting-desc.c:5845
- 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 "
-@@ -5158,11 +5223,11 @@ msgstr "DNS サーバーの IPv6 アドレス一覧を入力します。IPv6 設
- "\n"
- "例: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5775
-+#: ../clients/common/nm-meta-setting-desc.c:5899
- msgid "IPv6 address (IP[/plen]) [none]"
- msgstr "IPv6 アドレス (IP[/plen]) [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5777
-+#: ../clients/common/nm-meta-setting-desc.c:5901
- msgid ""
- "Enter a list of IPv6 addresses formatted as:\n"
- " ip[/prefix], ip[/prefix],...\n"
-@@ -5175,11 +5240,11 @@ msgstr "次のような形式で IPv6 アドレスの一覧を入力してくだ
- "\n"
- "例: 2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5796
-+#: ../clients/common/nm-meta-setting-desc.c:5920
- msgid "IPv6 gateway [none]"
- msgstr "IPv6 ゲートウェイ [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5804
-+#: ../clients/common/nm-meta-setting-desc.c:5928
- msgid ""
- "Enter a list of IPv6 routes formatted as:\n"
- " ip[/prefix] [next-hop] [metric],...\n"
-@@ -5201,7 +5266,7 @@ msgstr "IPv6 ルートの一覧を次の形式で入力します。\n"
- "例: 2001:db8:beef:2::/64 2001:db8:beef::2, 2001:db8:beef:3::/64 2001:db8:beef::3 2\n"
- " abbe::/64 55\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5844
-+#: ../clients/common/nm-meta-setting-desc.c:5968
- msgid ""
- "Enter a list of IPv6 routing rules formatted as:\n"
- " priority [prio] [from [src]] [to [dst]], ,...\n"
-@@ -5210,166 +5275,170 @@ msgstr "次のような形式で IPv6 ルーティングルールの一覧を入
- " priority [prio] [from [src]] [to [dst]], ,...\n"
- "\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5943
--#: ../clients/common/nm-meta-setting-desc.c:6923
-+#: ../clients/common/nm-meta-setting-desc.c:6075
-+#: ../clients/common/nm-meta-setting-desc.c:7099
- msgid "Parent device [none]"
- msgstr "親デバイス [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5949
-+#: ../clients/common/nm-meta-setting-desc.c:6081
- msgid "Local endpoint [none]"
- msgstr "ローカルエンドポイント [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5956
--#: ../clients/common/nm-meta-setting-desc.c:6943
-+#: ../clients/common/nm-meta-setting-desc.c:6088
-+#: ../clients/common/nm-meta-setting-desc.c:7119
- msgid "Remote"
- msgstr "リモート"
-
--#: ../clients/common/nm-meta-setting-desc.c:6001
-+#: ../clients/common/nm-meta-setting-desc.c:6133
- msgid "MACsec parent device or connection UUID"
- msgstr "MACsec 親デバイスまたは接続 UUID"
-
--#: ../clients/common/nm-meta-setting-desc.c:6022
-+#: ../clients/common/nm-meta-setting-desc.c:6154
- msgid "Enable encryption [yes]"
- msgstr "暗号化の有効化 [yes]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6028
-+#: ../clients/common/nm-meta-setting-desc.c:6160
- #: ../clients/common/nm-secret-agent-simple.c:917
- msgid "MKA CAK"
- msgstr "MKA CAK"
-
--#: ../clients/common/nm-meta-setting-desc.c:6038
-+#: ../clients/common/nm-meta-setting-desc.c:6170
- msgid "MKA_CKN"
- msgstr "MKA_CKN"
-
--#: ../clients/common/nm-meta-setting-desc.c:6044
-+#: ../clients/common/nm-meta-setting-desc.c:6176
- msgid "SCI port [1]"
- msgstr "SCI ポート [1]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6070
-+#: ../clients/common/nm-meta-setting-desc.c:6202
- msgid "MACVLAN parent device or connection UUID"
- msgstr "MACVLAN 親デバイスまたは接続 UUID"
-
--#: ../clients/common/nm-meta-setting-desc.c:6091
-+#: ../clients/common/nm-meta-setting-desc.c:6223
- msgid "Tap [no]"
- msgstr "Tap [no]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6126
--#: ../clients/common/nm-meta-setting-desc.c:7198
--#: ../clients/tui/nmt-page-wifi.c:212
-+#: ../clients/common/nm-meta-setting-desc.c:6290
-+#: ../clients/common/nm-meta-setting-desc.c:7374
-+#: ../clients/tui/nmt-page-wifi.c:213
- msgid "SSID"
- msgstr "SSID"
-
--#: ../clients/common/nm-meta-setting-desc.c:6135
-+#: ../clients/common/nm-meta-setting-desc.c:6299
- msgid "OLPC Mesh channel [1]"
- msgstr "OLPC メッシュチャンネル [1]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6144
-+#: ../clients/common/nm-meta-setting-desc.c:6308
- msgid "DHCP anycast MAC address [none]"
- msgstr "DHCP anycast MAC アドレス [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6309
-+#: ../clients/common/nm-meta-setting-desc.c:6473
- msgid "PPPoE parent device"
- msgstr "PPPoE 親デバイス"
-
--#: ../clients/common/nm-meta-setting-desc.c:6315
-+#: ../clients/common/nm-meta-setting-desc.c:6479
- msgid "Service [none]"
- msgstr "サービス [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6322
-+#: ../clients/common/nm-meta-setting-desc.c:6486
- msgid "PPPoE username"
- msgstr "PPPoE ユーザー名"
-
--#: ../clients/common/nm-meta-setting-desc.c:6358
-+#: ../clients/common/nm-meta-setting-desc.c:6522
- msgid "Browser only [no]"
- msgstr "ブラウザー専用 [no]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6364
-+#: ../clients/common/nm-meta-setting-desc.c:6528
- msgid "PAC URL"
- msgstr "PAC URL"
-
--#: ../clients/common/nm-meta-setting-desc.c:6370
-+#: ../clients/common/nm-meta-setting-desc.c:6534
- msgid "PAC script"
- msgstr "PAC スクリプト"
-
--#: ../clients/common/nm-meta-setting-desc.c:6494
--#: ../clients/common/nm-meta-setting-desc.c:6682
-+#: ../clients/common/nm-meta-setting-desc.c:6658
-+#: ../clients/common/nm-meta-setting-desc.c:6846
- msgid "Team JSON configuration [none]"
- msgstr "team JSON 設定 [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6785
-+#: ../clients/common/nm-meta-setting-desc.c:6949
- msgid "User ID [none]"
- msgstr "ユーザー ID [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6791
-+#: ../clients/common/nm-meta-setting-desc.c:6955
- msgid "Group ID [none]"
- msgstr "グループ ID [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6797
-+#: ../clients/common/nm-meta-setting-desc.c:6961
- msgid "Enable PI [no]"
- msgstr "PI の有効化 [no]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6803
-+#: ../clients/common/nm-meta-setting-desc.c:6967
- msgid "Enable VNET header [no]"
- msgstr "VNET ヘッダー の有効化 [no]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6809
-+#: ../clients/common/nm-meta-setting-desc.c:6973
- msgid "Enable multi queue [no]"
- msgstr "複数のキューの有効化 [no]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6822
-+#: ../clients/common/nm-meta-setting-desc.c:6986
- msgid "VLAN parent device or connection UUID"
- msgstr "VLAN 親デバイスまたは接続 UUID"
-
--#: ../clients/common/nm-meta-setting-desc.c:6829
-+#: ../clients/common/nm-meta-setting-desc.c:6993
- msgid "VLAN ID (<0-4094>)"
- msgstr "VLAN ID (<0-4094>)"
-
--#: ../clients/common/nm-meta-setting-desc.c:6835
-+#: ../clients/common/nm-meta-setting-desc.c:6999
- msgid "VLAN flags (<0-7>) [none]"
- msgstr "VLAN フラグ (<0-7>) [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6844
-+#: ../clients/common/nm-meta-setting-desc.c:7008
- msgid "Ingress priority maps [none]"
- msgstr "イングレス優先度マップ [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6854
-+#: ../clients/common/nm-meta-setting-desc.c:7018
- msgid "Egress priority maps [none]"
- msgstr "イーグレス優先度マップ [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6930
-+#: ../clients/common/nm-meta-setting-desc.c:7086
-+msgid "Table [0]"
-+msgstr "表 [0]"
-+
-+#: ../clients/common/nm-meta-setting-desc.c:7106
- msgid "VXLAN ID"
- msgstr "VXLAN ID"
-
--#: ../clients/common/nm-meta-setting-desc.c:6936
-+#: ../clients/common/nm-meta-setting-desc.c:7112
- msgid "Local address [none]"
- msgstr "ローカルアドレス [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6949
-+#: ../clients/common/nm-meta-setting-desc.c:7125
- msgid "Minimum source port [0]"
- msgstr "最小ソースポート数 [0]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6955
-+#: ../clients/common/nm-meta-setting-desc.c:7131
- msgid "Maximum source port [0]"
- msgstr "最大ソースポート数 [0]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6961
-+#: ../clients/common/nm-meta-setting-desc.c:7137
- msgid "Destination port [8472]"
- msgstr "接続先ポート [8472]"
-
--#: ../clients/common/nm-meta-setting-desc.c:7001
-+#: ../clients/common/nm-meta-setting-desc.c:7177
- msgid "Peer"
- msgstr "ピア"
-
--#: ../clients/common/nm-meta-setting-desc.c:7031
-+#: ../clients/common/nm-meta-setting-desc.c:7207
- msgid "WiMAX NSP name"
- msgstr "WiMAX NSP 名"
-
--#: ../clients/common/nm-meta-setting-desc.c:7068
--#: ../clients/common/nm-meta-setting-desc.c:7249
-+#: ../clients/common/nm-meta-setting-desc.c:7244
-+#: ../clients/common/nm-meta-setting-desc.c:7425
- msgid "Cloned MAC [none]"
- msgstr "クローンした MAC [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:7101
-+#: ../clients/common/nm-meta-setting-desc.c:7277
- msgid ""
- "Enter a list of subchannels (comma or space separated).\n"
- "\n"
-@@ -5378,228 +5447,239 @@ msgstr "サブチャネルの一覧を入力します (コンマまたはスペ
- "\n"
- "例: 0.0.0e20 0.0.0e21 0.0.0e22\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:7423
-+#: ../clients/common/nm-meta-setting-desc.c:7599
- msgid ""
- "Enter the type of WEP keys. The accepted values are: 0 or unknown, 1 or key, "
- "and 2 or passphrase.\n"
- msgstr "WEP キーのタイプを入力します。使用できる値は、0 または unknown、1 または key、2 または passphrase です。\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:7482
-+#: ../clients/common/nm-meta-setting-desc.c:7658
- msgid "Short address (<0x0000-0xffff>)"
- msgstr "ショートアドレス (<0x0000-0xffff>)"
-
--#: ../clients/common/nm-meta-setting-desc.c:7498
-+#: ../clients/common/nm-meta-setting-desc.c:7674
- msgid "PAN Identifier (<0x0000-0xffff>)"
- msgstr "PAN 識別子 (<0x0000-0xffff>)"
-
--#: ../clients/common/nm-meta-setting-desc.c:7513
-+#: ../clients/common/nm-meta-setting-desc.c:7689
- msgid "Page (<default|0-31>)"
- msgstr "ページ (<default|0-31>)"
-
--#: ../clients/common/nm-meta-setting-desc.c:7527
-+#: ../clients/common/nm-meta-setting-desc.c:7703
- msgid "Channel (<default|0-26>)"
- msgstr "チャンネル (<default|0-26>)"
-
- #. ***************************************************************************
--#: ../clients/common/nm-meta-setting-desc.c:7662
-+#: ../clients/common/nm-meta-setting-desc.c:7838
- msgid "6LOWPAN settings"
- msgstr "6LOWPAN 設定"
-
--#: ../clients/common/nm-meta-setting-desc.c:7663
-+#: ../clients/common/nm-meta-setting-desc.c:7839
- msgid "802-1x settings"
- msgstr "802-1x 設定"
-
--#: ../clients/common/nm-meta-setting-desc.c:7664
-+#: ../clients/common/nm-meta-setting-desc.c:7840
- #: ../src/devices/adsl/nm-device-adsl.c:117
- msgid "ADSL connection"
- msgstr "ADSL 接続"
-
--#: ../clients/common/nm-meta-setting-desc.c:7665
-+#: ../clients/common/nm-meta-setting-desc.c:7841
- msgid "bluetooth connection"
- msgstr "bluetooth 接続"
-
--#: ../clients/common/nm-meta-setting-desc.c:7666
-+#: ../clients/common/nm-meta-setting-desc.c:7842
- msgid "Bond device"
- msgstr "Bond デバイス"
-
--#: ../clients/common/nm-meta-setting-desc.c:7667
-+#: ../clients/common/nm-meta-setting-desc.c:7843
- msgid "Bridge device"
- msgstr "ブリッジデバイス"
-
--#: ../clients/common/nm-meta-setting-desc.c:7668
-+#: ../clients/common/nm-meta-setting-desc.c:7844
- msgid "Bridge port"
- msgstr "ブリッジポート"
-
--#: ../clients/common/nm-meta-setting-desc.c:7669
-+#: ../clients/common/nm-meta-setting-desc.c:7845
- msgid "CDMA mobile broadband connection"
- msgstr "CDMA モバイルブロードバンド接続"
-
--#: ../clients/common/nm-meta-setting-desc.c:7670
-+#: ../clients/common/nm-meta-setting-desc.c:7846
- msgid "General settings"
- msgstr "一般設定"
-
--#: ../clients/common/nm-meta-setting-desc.c:7671
-+#: ../clients/common/nm-meta-setting-desc.c:7847
- msgid "DCB settings"
- msgstr "DCB 設定"
-
--#: ../clients/common/nm-meta-setting-desc.c:7672
-+#: ../clients/common/nm-meta-setting-desc.c:7848
- msgid "Dummy settings"
- msgstr "ダミー設定"
-
--#: ../clients/common/nm-meta-setting-desc.c:7673
-+#: ../clients/common/nm-meta-setting-desc.c:7849
- msgid "Ethtool settings"
- msgstr "Ethtool 設定"
-
--#: ../clients/common/nm-meta-setting-desc.c:7674
-+#: ../clients/common/nm-meta-setting-desc.c:7850
- msgid "Generic settings"
- msgstr "汎用設定"
-
--#: ../clients/common/nm-meta-setting-desc.c:7675
-+#: ../clients/common/nm-meta-setting-desc.c:7851
- msgid "GSM mobile broadband connection"
- msgstr "GSM モバイルブロードバンド接続"
-
--#: ../clients/common/nm-meta-setting-desc.c:7676
-+#: ../clients/common/nm-meta-setting-desc.c:7852
- #: ../src/devices/nm-device-infiniband.c:158
- msgid "InfiniBand connection"
- msgstr "InfiniBand 接続"
-
--#: ../clients/common/nm-meta-setting-desc.c:7677
-+#: ../clients/common/nm-meta-setting-desc.c:7853
- msgid "IPv4 protocol"
- msgstr "IPv4 プロトコル"
-
--#: ../clients/common/nm-meta-setting-desc.c:7678
-+#: ../clients/common/nm-meta-setting-desc.c:7854
- msgid "IPv6 protocol"
- msgstr "IPv6 プロトコル"
-
--#: ../clients/common/nm-meta-setting-desc.c:7679
-+#: ../clients/common/nm-meta-setting-desc.c:7855
- msgid "IP-tunnel settings"
- msgstr "IP トンネル設定"
-
--#: ../clients/common/nm-meta-setting-desc.c:7680
-+#: ../clients/common/nm-meta-setting-desc.c:7856
- msgid "MACsec connection"
- msgstr "MACsec 接続"
-
--#: ../clients/common/nm-meta-setting-desc.c:7681
-+#: ../clients/common/nm-meta-setting-desc.c:7857
- msgid "macvlan connection"
- msgstr "macvlan 接続"
-
--#: ../clients/common/nm-meta-setting-desc.c:7682
-+#: ../clients/common/nm-meta-setting-desc.c:7858
- msgid "Match"
- msgstr "一致"
-
--#: ../clients/common/nm-meta-setting-desc.c:7683
-+#: ../clients/common/nm-meta-setting-desc.c:7859
- msgid "OLPC Mesh connection"
- msgstr "OLPC Mesh 接続"
-
--#: ../clients/common/nm-meta-setting-desc.c:7684
-+#: ../clients/common/nm-meta-setting-desc.c:7860
- msgid "Open vSwitch bridge settings"
- msgstr "Open vSwitch ブリッジ設定"
-
--#: ../clients/common/nm-meta-setting-desc.c:7685
-+#: ../clients/common/nm-meta-setting-desc.c:7861
- msgid "Open vSwitch DPDK interface settings"
- msgstr "Open vSwitch DPDK インターフェース設定"
-
--#: ../clients/common/nm-meta-setting-desc.c:7686
-+#: ../clients/common/nm-meta-setting-desc.c:7862
- msgid "Open vSwitch interface settings"
- msgstr "Open vSwitch インターフェース設定"
-
--#: ../clients/common/nm-meta-setting-desc.c:7687
-+#: ../clients/common/nm-meta-setting-desc.c:7863
- msgid "Open vSwitch patch interface settings"
- msgstr "Open vSwitch パッチインターフェース設定"
-
--#: ../clients/common/nm-meta-setting-desc.c:7688
-+#: ../clients/common/nm-meta-setting-desc.c:7864
- msgid "Open vSwitch port settings"
- msgstr "Open vSwitch ポート設定"
-
--#: ../clients/common/nm-meta-setting-desc.c:7689
-+#: ../clients/common/nm-meta-setting-desc.c:7865
- msgid "PPP settings"
- msgstr "PPP 設定"
-
--#: ../clients/common/nm-meta-setting-desc.c:7690
-+#: ../clients/common/nm-meta-setting-desc.c:7866
- msgid "PPPoE"
- msgstr "PPPoE"
-
--#: ../clients/common/nm-meta-setting-desc.c:7691
-+#: ../clients/common/nm-meta-setting-desc.c:7867
- msgid "Proxy"
- msgstr "プロキシ"
-
--#: ../clients/common/nm-meta-setting-desc.c:7692
-+#: ../clients/common/nm-meta-setting-desc.c:7868
- msgid "Serial settings"
- msgstr "シリアル設定"
-
--#: ../clients/common/nm-meta-setting-desc.c:7693
-+#: ../clients/common/nm-meta-setting-desc.c:7869
- msgid "SR-IOV settings"
- msgstr "SR-IOV 設定"
-
--#: ../clients/common/nm-meta-setting-desc.c:7694
-+#: ../clients/common/nm-meta-setting-desc.c:7870
- msgid "Traffic controls"
- msgstr "トラフィックコントロール"
-
--#: ../clients/common/nm-meta-setting-desc.c:7695
-+#: ../clients/common/nm-meta-setting-desc.c:7871
- msgid "Team device"
- msgstr "Team デバイス"
-
--#: ../clients/common/nm-meta-setting-desc.c:7696
-+#: ../clients/common/nm-meta-setting-desc.c:7872
- msgid "Team port"
- msgstr "Team ポート"
-
--#: ../clients/common/nm-meta-setting-desc.c:7697
-+#: ../clients/common/nm-meta-setting-desc.c:7873
- msgid "Tun device"
- msgstr "TUN デバイス"
-
--#: ../clients/common/nm-meta-setting-desc.c:7698
-+#: ../clients/common/nm-meta-setting-desc.c:7874
- msgid "User settings"
- msgstr "ユーザー設定"
-
--#: ../clients/common/nm-meta-setting-desc.c:7699
-+#: ../clients/common/nm-meta-setting-desc.c:7875
- #: ../src/devices/nm-device-vlan.c:385
- msgid "VLAN connection"
- msgstr "VLAN 接続"
-
--#: ../clients/common/nm-meta-setting-desc.c:7700 ../src/nm-manager.c:5652
-+#: ../clients/common/nm-meta-setting-desc.c:7876 ../src/nm-manager.c:5697
- msgid "VPN connection"
- msgstr "VPN 接続"
-
--#: ../clients/common/nm-meta-setting-desc.c:7701
-+#: ../clients/common/nm-meta-setting-desc.c:7877
-+#: ../src/devices/nm-device-vrf.c:175
-+msgid "VRF connection"
-+msgstr "VRF 接続"
-+
-+#: ../clients/common/nm-meta-setting-desc.c:7878
- #: ../src/devices/nm-device-vxlan.c:354
- msgid "VXLAN connection"
- msgstr "VXLAN 接続"
-
--#: ../clients/common/nm-meta-setting-desc.c:7702
-+#: ../clients/common/nm-meta-setting-desc.c:7879
- msgid "Wi-Fi P2P connection"
- msgstr "Wi-Fi P2P 接続"
-
--#: ../clients/common/nm-meta-setting-desc.c:7703
-+#: ../clients/common/nm-meta-setting-desc.c:7880
- msgid "WiMAX connection"
- msgstr "WiMAX 接続"
-
--#: ../clients/common/nm-meta-setting-desc.c:7704
-+#: ../clients/common/nm-meta-setting-desc.c:7881
- msgid "Wired Ethernet"
- msgstr "有線 Ethernet"
-
--#: ../clients/common/nm-meta-setting-desc.c:7705
-+#: ../clients/common/nm-meta-setting-desc.c:7882
- msgid "WireGuard VPN settings"
- msgstr "WireGuard VPN 設定"
-
--#: ../clients/common/nm-meta-setting-desc.c:7706
-+#: ../clients/common/nm-meta-setting-desc.c:7883
- msgid "Wi-Fi connection"
- msgstr "Wi-Fi 接続"
-
--#: ../clients/common/nm-meta-setting-desc.c:7707
-+#: ../clients/common/nm-meta-setting-desc.c:7884
- msgid "Wi-Fi security settings"
- msgstr "Wi-Fi セキュリティー設定"
-
--#: ../clients/common/nm-meta-setting-desc.c:7708
-+#: ../clients/common/nm-meta-setting-desc.c:7885
- msgid "WPAN settings"
- msgstr "WPAN 設定"
-
--#: ../clients/common/nm-meta-setting-desc.c:8074
-+#: ../clients/common/nm-meta-setting-desc.c:8262
- msgid "name"
- msgstr "名前"
-
--#: ../clients/common/nm-polkit-listener.c:225
--msgid "An authentication session is already underway."
--msgstr "認証セッションはすでに実行されています。"
-+#: ../clients/common/nm-polkit-listener.c:368
-+#, c-format
-+msgid "Could not find any session id for uid %d"
-+msgstr "uid %d のセッション ID が見つかりませんでした。"
-+
-+#: ../clients/common/nm-polkit-listener.c:370
-+#, c-format
-+msgid "Could not retrieve session id: %s"
-+msgstr "セッション ID %s を取得できませんでした。"
-
- #: ../clients/common/nm-secret-agent-simple.c:217
- #, c-format
-@@ -5615,7 +5695,7 @@ msgid "Private key password"
- msgstr "プライベートキーのパスワード"
-
- #: ../clients/common/nm-secret-agent-simple.c:323
--#: ../clients/tui/nmt-page-wifi.c:278
-+#: ../clients/tui/nmt-page-wifi.c:279
- msgid "Key"
- msgstr "キー"
-
-@@ -5731,59 +5811,59 @@ msgstr "'%s' がないため VPN プラグイン '%s' を読み込めません
- msgid "failed to load VPN plugin \"%s\": %s"
- msgstr "VPN プラグイン '%s' の読み込みに失敗しました: %s"
-
--#: ../clients/common/nm-vpn-helpers.c:115
-+#: ../clients/common/nm-vpn-helpers.c:144
- msgid "Certificate password"
- msgstr "証明書のパスワード"
-
--#: ../clients/common/nm-vpn-helpers.c:116
-+#: ../clients/common/nm-vpn-helpers.c:145
- msgid "HTTP proxy password"
- msgstr "HTTP プロキシのパスワード"
-
--#: ../clients/common/nm-vpn-helpers.c:121
--#: ../clients/common/nm-vpn-helpers.c:126
-+#: ../clients/common/nm-vpn-helpers.c:152
-+#: ../clients/common/nm-vpn-helpers.c:161
- msgid "Group password"
- msgstr "グループパスワード"
-
--#: ../clients/common/nm-vpn-helpers.c:130 ../clients/tui/nmt-page-ip4.c:130
-+#: ../clients/common/nm-vpn-helpers.c:167 ../clients/tui/nmt-page-ip4.c:130
- #: ../clients/tui/nmt-page-ip6.c:131
- msgid "Gateway"
- msgstr "ゲートウェイ"
-
--#: ../clients/common/nm-vpn-helpers.c:131
-+#: ../clients/common/nm-vpn-helpers.c:168
- msgid "Cookie"
- msgstr "クッキー"
-
--#: ../clients/common/nm-vpn-helpers.c:132
-+#: ../clients/common/nm-vpn-helpers.c:169
- msgid "Gateway certificate hash"
- msgstr "ゲートウェイ証明書ハッシュ"
-
--#: ../clients/common/nm-vpn-helpers.c:257
-+#: ../clients/common/nm-vpn-helpers.c:267
- #, c-format
- msgid "Invalid peer starting at %s:%zu: %s"
- msgstr "%s:%zu で始まる無効なピア: %s"
-
--#: ../clients/common/nm-vpn-helpers.c:377
-+#: ../clients/common/nm-vpn-helpers.c:388
- msgid ""
--"The WireGuard config file must be a valid interface name followed by \".conf"
--"\""
--msgstr "WireGuard 設定ファイルは、\".conf\" があとに続く有効なインターフェース名でなければなりません"
-+"The name of the WireGuard config must be a valid interface name followed by "
-+"\".conf\""
-+msgstr "WireGuard 設定の名前は、\".conf\" があとに続く有効なインターフェース名でなければなりません"
-
--#: ../clients/common/nm-vpn-helpers.c:666
-+#: ../clients/common/nm-vpn-helpers.c:680
- #, c-format
- msgid "unrecognized line at %s:%zu"
- msgstr "%s:%zu に未認識の行があります"
-
--#: ../clients/common/nm-vpn-helpers.c:671
--#, fuzzy, c-format
-+#: ../clients/common/nm-vpn-helpers.c:685
-+#, c-format
- msgid "invalid value for '%s' at %s:%zu"
--msgstr "%s:%zu における '%s' の値は無効です"
-+msgstr "%s での '%s' の値は無効です:%zu"
-
--#: ../clients/common/nm-vpn-helpers.c:676
--#, fuzzy, c-format
-+#: ../clients/common/nm-vpn-helpers.c:690
-+#, c-format
- msgid "invalid secret '%s' at %s:%zu"
--msgstr "%s:%zu のシークレット '%s' は無効です"
-+msgstr "%s でのシークレット '%s' は無効です:%zu"
-
--#: ../clients/common/nm-vpn-helpers.c:789
-+#: ../clients/common/nm-vpn-helpers.c:823
- #, c-format
- msgid "Failed to create WireGuard connection: %s"
- msgstr "WireGuard 接続の作成に失敗しました: %s"
-@@ -5853,7 +5933,7 @@ msgid ""
- msgstr "これを指定した場合は、デバイスが、その永続化 MAC アドレスの代わりにこの MAC アドレスを使用する必要があります。これは、MAC クローニングまたはスプーフィングとして知られています。明示的に MAC アドレスを指定する以外に、\"preserve\"、\"permanent\"、\"random\"、\"stable\" の値がサポートされます。\"preserve\" では、アクティベーション時に MAC アドレスを変更しません。\"permanent\" では、デバイスに永続化ハードウェアアドレスを使用します。\"random\" では、各接続にランダムの MAC アドレスを作成します。\"stable\" では、connection.stable-id と機種依存キーに基づいて、ハッシュ化した MAC アドレスを作成します。指定しない場合、その値はグローバルのデフォルトにより上書きされます。NetworkManager.conf を参照してください。それでも指定しない場合は、デフォルトの \"permanent\" が設定されます。D-Bus において、このフィールドは \"assigned-mac-address\" または廃止予定の \"cloned-mac-address\" として表示されます。"
-
- #: ../clients/common/settings-docs.h.in:11
--#: ../clients/common/settings-docs.h.in:92
-+#: ../clients/common/settings-docs.h.in:94
- msgid ""
- "With \"cloned-mac-address\" setting \"random\" or \"stable\", by default all "
- "bits of the MAC address are scrambled and a locally-administered, unicast "
-@@ -5924,7 +6004,7 @@ msgid ""
- msgstr "Wi-Fi ネットワークモード; \"infrastructure\"、\"mesh\"、\"adhoc\"、または \"ap\" のいずれかになります。空白にすると、インフラストラクチャーは推測されます。"
-
- #: ../clients/common/settings-docs.h.in:17
--#: ../clients/common/settings-docs.h.in:95
-+#: ../clients/common/settings-docs.h.in:97
- msgid ""
- "If non-zero, only transmit packets of the specified size or smaller, "
- "breaking larger packets up into multiple Ethernet frames."
-@@ -6016,10 +6096,10 @@ msgstr "グループ/ブロードキャストの暗号化アルゴリズムの
- #: ../clients/common/settings-docs.h.in:27
- msgid ""
- "Key management used for the connection. One of \"none\" (WEP), \"ieee8021x"
--"\" (Dynamic WEP), \"wpa-psk\" (infrastructure WPA-PSK), \"sae\" (SAE) or "
--"\"wpa-eap\" (WPA-Enterprise). This property must be set for any Wi-Fi "
--"connection that uses security."
--msgstr "接続に使用されるキー管理。\"none\" (WEP)、\"ieee8021x\" (Dynamic WEP)、\"wpa-psk\" (infrastructure WPA-PSK)、\"sae\" (SAE)、または \"wpa-eap\" (WPA-Enterprise) のいずれかになります。このプロパティーは、セキュリティーを使用する Wi-Fi 接続に対して設定する必要があります。"
-+"\" (Dynamic WEP), \"wpa-psk\" (infrastructure WPA-PSK), \"sae\" (SAE), \"owe"
-+"\" (Opportunistic Wireless Encryption) or \"wpa-eap\" (WPA-Enterprise). "
-+"This property must be set for any Wi-Fi connection that uses security."
-+msgstr "接続に使用されるキー管理。\"none\" (WEP)、\"ieee8021x\" (Dynamic WEP)、\"wpa-psk\" (infrastructure WPA-PSK)、\"sae\" (SAE)、\"owe\" (Opportunistic Wireless Encription) または \"wpa-eap\" (WPA-Enterprise) のいずれかになります。このプロパティーは、セキュリティーを使用する Wi-Fi 接続に対して設定する必要があります。"
-
- #: ../clients/common/settings-docs.h.in:28
- msgid ""
-@@ -6157,15 +6237,17 @@ msgstr "認証のタイムアウト。ゼロはグローバルのデフォルト
- #: ../clients/common/settings-docs.h.in:47
- msgid ""
- "Contains the CA certificate if used by the EAP method specified in the \"eap"
--"\" property. Certificate data is specified using a \"scheme\"; two are "
--"currently supported: blob and path. When using the blob scheme (which is "
--"backwards compatible with NM 0.7.x) this property should be set to the "
--"certificate's DER encoded data. When using the path scheme, this property "
--"should be set to the full UTF-8 encoded path of the certificate, prefixed "
--"with the string \"file://\" and ending with a terminating NUL byte. This "
--"property can be unset even if the EAP method supports CA certificates, but "
--"this allows man-in-the-middle attacks and is NOT recommended."
--msgstr "\"eap\" プロパティーに指定した EAP メソッドが使用する場合は、CA 証明書を含めます。証明書データは \"scheme\" を使用して指定されます。現在、ブロブとパスの 2 つがサポートされます。(NM 0.7.x との後方互換性である) ブロブスキームを使用する場合は、このプロパティーを、証明書の DER エンコードデータに設定する必要があります。パススキームを使用する場合は、このプロパティーを、文字列 \"file://\" で始まり、終了 NUL バイトで終わる UTF-8 エンコードのフルパスで指定する証明書に設定する必要があります。このプロパティーは、EAP メソッドが CA 証明書をサポートする場合でも設定する必要はありませんが、設定しないと中間者攻撃が可能になるため、推奨されません。"
-+"\" property. Certificate data is specified using a \"scheme\"; three are "
-+"currently supported: blob, path and pkcs#11 URL. When using the blob scheme "
-+"this property should be set to the certificate's DER encoded data. When "
-+"using the path scheme, this property should be set to the full UTF-8 encoded "
-+"path of the certificate, prefixed with the string \"file://\" and ending "
-+"with a terminating NUL byte. This property can be unset even if the EAP "
-+"method supports CA certificates, but this allows man-in-the-middle attacks "
-+"and is NOT recommended. Note that enabling NMSetting8021x:system-ca-certs "
-+"will override this setting to use the built-in path, if the built-in path is "
-+"not a directory."
-+msgstr "\"eap\" プロパティーに指定した EAP メソッドが使用する場合は、CA 証明書を含めます。証明書データは \"scheme\" を使用して指定されます。現在、ブロブとパスの 3 つがサポートされます。ブロブスキームを使用する場合は、このプロパティーを、証明書の DER エンコードデータに設定する必要があります。パススキームを使用する場合は、このプロパティーを、文字列 \"file://\" で始まり、終了 NUL バイトで終わる UTF-8 エンコードのフルパスで指定する証明書に設定する必要があります。このプロパティーは、EAP メソッドが CA 証明書をサポートする場合でも設定する必要はありませんが、設定しないと中間者攻撃が可能になるため、推奨されません。NMSetting8021x:system-ca-certs は、ビルトインパスがディレクトリーでない場合、この設定を上書きしてビルトインパスを使用します。"
-
- #: ../clients/common/settings-docs.h.in:48
- msgid ""
-@@ -6182,8 +6264,10 @@ msgstr "\"ca-cert-password\" プロパティーの処理方法を示すフラグ
- msgid ""
- "UTF-8 encoded path to a directory containing PEM or DER formatted "
- "certificates to be added to the verification chain in addition to the "
--"certificate specified in the \"ca-cert\" property."
--msgstr "\"ca-cert\" プロパティーに指定された証明書に追加する際に、検証チェインに追加される PEM フォーマットまたは DER フォーマットの証明書を含むディレクトリーへの UTF-8 エンコードパス。"
-+"certificate specified in the \"ca-cert\" property. If NMSetting8021x:system-"
-+"ca-certs is enabled and the built-in CA path is an existing directory, then "
-+"this setting is ignored."
-+msgstr "\"ca-cert\" プロパティーに指定された証明書に追加する際に、検証チェインに追加される PEM フォーマットまたは DER フォーマットの証明書を含むディレクトリーへの UTF-8 エンコードパス。NMSetting8021x:system-ca-certs が有効で、組み込み CA パスが既存のディレクトリである場合、この設定は無視されます。"
-
- #: ../clients/common/settings-docs.h.in:51
- msgid ""
-@@ -6209,15 +6293,26 @@ msgstr "\"client-cert-password\" プロパティーの処理方法を示すフ
-
- #: ../clients/common/settings-docs.h.in:54
- msgid ""
--"Constraint for server domain name. If set, this FQDN is used as a suffix "
-+"Constraint for server domain name. If set, this list of FQDNs is used as a "
- "match requirement for dNSName element(s) of the certificate presented by the "
- "authentication server. If a matching dNSName is found, this constraint is "
- "met. If no dNSName values are present, this constraint is matched against "
--"SubjectName CN using same suffix match comparison."
--msgstr "サーバードメイン名の制約。設定すると、この FQDN が、認証サーバーが表示する証明書の dNSName 要素に対して、サフィックス一致要件として使用されます。一致する dNSName が見つかると、この制約が満たされます。dNSName 値が表示されないと、この制約は、同じサフィックス一致比較を使用して SubjectName CN を照合します。"
-+"SubjectName CN using the same comparison. Multiple valid FQDNs can be passed "
-+"as a \";\" delimited list."
-+msgstr "サーバードメイン名の制約。設定すると、この FQDN のリストが、認証サーバーが表示する証明書の dNSName 要素に対して、一致要件として使用されます。一致する dNSName が見つかると、この制約が満たされます。dNSName 値が表示されないと、この制約は、同じ比較を使用して SubjectName CN を照合します。複数の有効な FQDN は、「；」で区切られた一覧として渡すことができます。"
-
- #: ../clients/common/settings-docs.h.in:55
- msgid ""
-+"Constraint for server domain name. If set, this FQDN is used as a suffix "
-+"match requirement for dNSName element(s) of the certificate presented by the "
-+"authentication server. If a matching dNSName is found, this constraint is "
-+"met. If no dNSName values are present, this constraint is matched against "
-+"SubjectName CN using same suffix match comparison. Since version 1.24, "
-+"multiple valid FQDNs can be passed as a \";\" delimited list."
-+msgstr "サーバードメイン名の制約。設定すると、この FQDN が、認証サーバーが表示する証明書の dNSName 要素に対して、サフィックス一致要件として使用されます。一致する dNSName が見つかると、この制約が満たされます。dNSName 値が表示されないと、この制約は、同じサフィックス一致比較を使用して SubjectName CN を照合します。バージョン 1.24 以降では、複数の有効な FQDN は、「；」で区切った一覧として渡すことができます。"
-+
-+#: ../clients/common/settings-docs.h.in:56
-+msgid ""
- "The allowed EAP method to be used when authenticating to the network with "
- "802.1x. Valid methods are: \"leap\", \"md5\", \"tls\", \"peap\", \"ttls\", "
- "\"pwd\", and \"fast\". Each method requires different configuration using "
-@@ -6225,13 +6320,13 @@ msgid ""
- "the allowed combinations."
- msgstr "802.1x でネットワークに認証する際に使用できる EAP メソッド。有効なメソッドは、\"leap\"、\"md5\"、\"tls\"、\"peap\"、\"ttls\"、\"pwd\"、および \"fast\" になります。メソッドには、この設定のプロパティーを使用した設定がそれぞれ必要になります。可能な組み合わせについては、wpa_supplicant ドキュメントを参照してください。"
-
--#: ../clients/common/settings-docs.h.in:56
-+#: ../clients/common/settings-docs.h.in:57
- msgid ""
- "Identity string for EAP authentication methods. Often the user's user or "
- "login name."
- msgstr "EAP 認証方法のアイデンティティ文字列。しばしば、ユーザーのユーザー名またはログイン名になります。"
-
--#: ../clients/common/settings-docs.h.in:57
-+#: ../clients/common/settings-docs.h.in:58
- msgid ""
- "Whether the 802.1X authentication is optional. If TRUE, the activation will "
- "continue even after a timeout or an authentication failure. Setting the "
-@@ -6239,26 +6334,26 @@ msgid ""
- "to FALSE, the activation can continue only after a successful authentication."
- msgstr "802.1X 認証がオプションかどうか。TRUE の場合、タイムアウトまたは認証エラーが発生した後でも、アクティベーションが続行されます。現在、プロパティーを TRUE に設定できるのは、イーサネット接続の場合のみです。FALSE に設定すると、認証が成功した後にのみアクティベーションを続行できます。"
-
--#: ../clients/common/settings-docs.h.in:58
-+#: ../clients/common/settings-docs.h.in:59
- msgid "UTF-8 encoded file path containing PAC for EAP-FAST."
- msgstr "EAP-FAST の PAC を含む UTF-8 エンコーディングファイルパス。"
-
--#: ../clients/common/settings-docs.h.in:59
-+#: ../clients/common/settings-docs.h.in:60
- msgid ""
- "UTF-8 encoded password used for EAP authentication methods. If both the "
- "\"password\" property and the \"password-raw\" property are specified, "
- "\"password\" is preferred."
- msgstr "EAP 認証方法に使用する UTF-8 エンコードのパスワード。\"password\" プロパティーと \"password-raw\" プロパティーの両方を指定すると、\"password\" が優先されます。"
-
--#: ../clients/common/settings-docs.h.in:60
--#: ../clients/common/settings-docs.h.in:105
--#: ../clients/common/settings-docs.h.in:132
--#: ../clients/common/settings-docs.h.in:181
--#: ../clients/common/settings-docs.h.in:299
-+#: ../clients/common/settings-docs.h.in:61
-+#: ../clients/common/settings-docs.h.in:107
-+#: ../clients/common/settings-docs.h.in:149
-+#: ../clients/common/settings-docs.h.in:199
-+#: ../clients/common/settings-docs.h.in:321
- msgid "Flags indicating how to handle the \"password\" property."
- msgstr "\"password\" プロパティーの処理方法を示すフラグ。"
-
--#: ../clients/common/settings-docs.h.in:61
-+#: ../clients/common/settings-docs.h.in:62
- msgid ""
- "Password used for EAP authentication methods, given as a byte array to allow "
- "passwords in other encodings than UTF-8 to be used. If both the \"password\" "
-@@ -6266,11 +6361,11 @@ msgid ""
- "preferred."
- msgstr "EAP 認証方法に使用するパスワード。UTF-8 以外のエンコーディングを使用したパスワードが使用できるバイト配列として指定します。\"password\" プロパティーと \"password-raw\" プロパティーの両方を指定すると、\"password\" が優先されます。"
-
--#: ../clients/common/settings-docs.h.in:62
-+#: ../clients/common/settings-docs.h.in:63
- msgid "Flags indicating how to handle the \"password-raw\" property."
- msgstr "\"password-raw\" プロパティーの処理方法を示すフラグ。"
-
--#: ../clients/common/settings-docs.h.in:63
-+#: ../clients/common/settings-docs.h.in:64
- msgid ""
- "Specifies authentication flags to use in \"phase 1\" outer authentication "
- "using NMSetting8021xAuthFlags options. The individual TLS versions can be "
-@@ -6280,7 +6375,7 @@ msgid ""
- "details."
- msgstr "NMSetting8021xAuthFlags オプションを使用して、\"phase 1\" の外部認証を使用する認証フラグを指定します。各 TLS バージョンは明示的に無効にできます。特定の TLS 無効フラグが設定されていない場合は、サプリカントが許可または拒否します。TLS オプションは tls_disable_tlsv1_x 設定にマッピングされます。詳細は、wpa_supplicant ドキュメントを参照してください。"
-
--#: ../clients/common/settings-docs.h.in:64
-+#: ../clients/common/settings-docs.h.in:65
- msgid ""
- "Enables or disables in-line provisioning of EAP-FAST credentials when FAST "
- "is specified as the EAP method in the \"eap\" property. Recognized values "
-@@ -6290,7 +6385,7 @@ msgid ""
- "documentation for more details."
- msgstr "\"eap\" プロパティーに EAP メソッド FAST を指定した場合は、EAP-FAST 信用情報のインラインプロビジョニングを有効または無効にします。認識される値は \"0\" (無効)、\"1\" (非認証プロビジョニングを許可)、\"2\" (認証されたプロビジョニングを許可)、および \"3\" (認証されたプロビジョニングと、非認証プロビジョニングを許可) となります。詳細は、wpa_supplicant ドキュメントを参照してください。"
-
--#: ../clients/common/settings-docs.h.in:65
-+#: ../clients/common/settings-docs.h.in:66
- msgid ""
- "Forces use of the new PEAP label during key derivation. Some RADIUS servers "
- "may require forcing the new PEAP label to interoperate with PEAPv1. Set to "
-@@ -6298,7 +6393,7 @@ msgid ""
- "documentation for more details."
- msgstr "キー派生時に、新しい PEAP ラベルを使用することを強制します。一部の RADIUS サーバーでは、新しいラベルを、PEAPv1 と同時に使用するように強制する必要があります。\"1\" に設定すると、新しい PEAP ラベルを使用することを強制します。詳細は、wpa_supplicant ドキュメントを参照してください。"
-
--#: ../clients/common/settings-docs.h.in:66
-+#: ../clients/common/settings-docs.h.in:67
- msgid ""
- "Forces which PEAP version is used when PEAP is set as the EAP method in the "
- "\"eap\" property. When unset, the version reported by the server will be "
-@@ -6307,7 +6402,7 @@ msgid ""
- "set to \"0\" or \"1\" to force that specific PEAP version."
- msgstr "\"eap\" プロパティーに EAP メソッド PEAP を設定する場合に使用する PEAP バージョンを強制します。これを設定しないと、サーバーが報告するバージョンが使用されます。以前の RADIUS サーバーが使用される場合があり、クライアントが特定の PEAP バージョンを使用するように強制する必要があります。そのためには、このプロパティーを \"0\" または \"1\" に設定して、その PEAP バージョンを強制します。"
-
--#: ../clients/common/settings-docs.h.in:67
-+#: ../clients/common/settings-docs.h.in:68
- msgid ""
- "List of strings to be matched against the altSubjectName of the certificate "
- "presented by the authentication server during the inner \"phase 2\" "
-@@ -6315,7 +6410,7 @@ msgid ""
- "certificate's altSubjectName is performed."
- msgstr "内部の \"phase 2\" 認証時に、認証サーバーが表示する証明書の altSubjectName に一致した文字列の一覧。この一覧が空の場合は、サーバー証明書の altSubjectName が検証されません。"
-
--#: ../clients/common/settings-docs.h.in:68
-+#: ../clients/common/settings-docs.h.in:69
- msgid ""
- "Specifies the allowed \"phase 2\" inner non-EAP authentication method when "
- "an EAP method that uses an inner TLS tunnel is specified in the \"eap\" "
-@@ -6325,7 +6420,7 @@ msgid ""
- "authentication; see the wpa_supplicant documentation for more details."
- msgstr "内部 TLS トンネルを使用する EAP 方式が \"eap\" プロパティーで指定されている場合、許可される \"phase 2\" 内部非 EAP 認証方式を指定します。認識される非 EAP \"phase 2\" 方式は \"pap\"、\"chap\"、\"mschap\"、\"mschapv2\"、\"gtc\"、\"otp\"、\"md5\"、および \"tls\" です。各 \"phase 2\" 内部方式では、認証を成功させるための特定のパラメーターが必要です。詳細については、wpa_supplicant のドキュメントを参照してください。"
-
--#: ../clients/common/settings-docs.h.in:69
-+#: ../clients/common/settings-docs.h.in:70
- msgid ""
- "Specifies the allowed \"phase 2\" inner EAP-based authentication method when "
- "an EAP method that uses an inner TLS tunnel is specified in the \"eap\" "
-@@ -6335,40 +6430,43 @@ msgid ""
- "wpa_supplicant documentation for more details."
- msgstr "内部 TLS トンネルを使用する EAP 方式が \"eap\" プロパティーで指定されている場合、許可される \"phase 2\" 内部 EAP ベースの認証方式を指定します。認識される EAP ベースの \"phase 2\" 方式は、\"md5\"、\"mschapv2\"、\"otp\"、\"gtc\"、および \"tls\" です。各 \"phase 2\" 内部方式では、認証を成功させるための特定のパラメーターが必要です。詳細については、wpa_supplicant のドキュメントを参照してください。"
-
--#: ../clients/common/settings-docs.h.in:70
-+#: ../clients/common/settings-docs.h.in:71
- msgid ""
- "Contains the \"phase 2\" CA certificate if used by the EAP method specified "
- "in the \"phase2-auth\" or \"phase2-autheap\" properties. Certificate data is "
--"specified using a \"scheme\"; two are currently supported: blob and path. "
--"When using the blob scheme (which is backwards compatible with NM 0.7.x) "
--"this property should be set to the certificate's DER encoded data. When "
--"using the path scheme, this property should be set to the full UTF-8 encoded "
--"path of the certificate, prefixed with the string \"file://\" and ending "
--"with a terminating NUL byte. This property can be unset even if the EAP "
--"method supports CA certificates, but this allows man-in-the-middle attacks "
--"and is NOT recommended."
--msgstr "\"phase2-auth\" プロパティーまたは \"phase2-autheap\" プロパティーで指定した EAP メソッドで使用する場合は、\"phase 2\" の CA 証明書を含めます。証明書データは \"scheme\" を使用して指定されます。現在、ブロブとパスの 2 つがサポートされます。(NM 0.7.x との後方互換性である) ブロブスキームを使用する場合は、このプロパティーを、証明書の DER エンコードデータに設定する必要があります。パススキームを使用する場合は、このプロパティーを、文字列 \"file://\" で始まり、終了 NUL バイトで終わる UTF-8 エンコードのフル パスで指定する証明書に設定する必要があります。このプロパティーは、EAP メソッドが CA 証明書をサポートする場合でも設定する必要はありませんが、設定しないと中間者攻撃が可能になるため、推奨されません。"
-+"specified using a \"scheme\"; three are currently supported: blob, path and "
-+"pkcs#11 URL. When using the blob scheme this property should be set to the "
-+"certificate's DER encoded data. When using the path scheme, this property "
-+"should be set to the full UTF-8 encoded path of the certificate, prefixed "
-+"with the string \"file://\" and ending with a terminating NUL byte. This "
-+"property can be unset even if the EAP method supports CA certificates, but "
-+"this allows man-in-the-middle attacks and is NOT recommended. Note that "
-+"enabling NMSetting8021x:system-ca-certs will override this setting to use "
-+"the built-in path, if the built-in path is not a directory."
-+msgstr "\"phase2-auth\" または \"phase2-atueap\" プロパティーに指定した EAP メソッドで使用する場合は、\"phase 2\" CA 証明書を含めます。証明書データは \"scheme\" を使用して指定されます。現在、ブロブとパスの 3 つがサポートされます。ブロブスキームを使用する場合は、このプロパティーを、証明書の DER エンコードデータに設定する必要があります。パススキームを使用する場合は、このプロパティーを、文字列 \"file://\" で始まり、終了 NUL バイトで終わる UTF-8 エンコードのフルパスで指定する証明書に設定する必要があります。このプロパティーは、EAP メソッドが CA 証明書をサポートする場合でも設定する必要はありませんが、設定しないと中間者攻撃が可能になるため、推奨されません。NMSetting8021x:system-ca-certs は、ビルトインパスがディレクトリーでない場合、この設定を上書きしてビルトインパスを使用します。"
-
--#: ../clients/common/settings-docs.h.in:71
-+#: ../clients/common/settings-docs.h.in:72
- msgid ""
- "The password used to access the \"phase2\" CA certificate stored in \"phase2-"
- "ca-cert\" property. Only makes sense if the certificate is stored on a "
- "PKCS#11 token that requires a login."
- msgstr "\"phase2-ca-cert\" プロパティーに保存されている \"phase2\" の CA 証明書にアクセスするのに使用されるパスワード。この証明書が、ログが必要な PKCS#11 トークンに保存されている場合に適用されます。"
-
--#: ../clients/common/settings-docs.h.in:72
-+#: ../clients/common/settings-docs.h.in:73
- msgid ""
- "Flags indicating how to handle the \"phase2-ca-cert-password\" property."
- msgstr "\"phase2-ca-cert-password\" プロパティーの処理方法を示すフラグ。"
-
--#: ../clients/common/settings-docs.h.in:73
-+#: ../clients/common/settings-docs.h.in:74
- msgid ""
- "UTF-8 encoded path to a directory containing PEM or DER formatted "
- "certificates to be added to the verification chain in addition to the "
--"certificate specified in the \"phase2-ca-cert\" property."
--msgstr "\"phase2-ca-cert\" プロパティーに指定した証明書に追加する際に、検証チェインに追加された PEM フォーマットまたは DER フォーマットの証明書が保存されているディレクトリーへの UTF-8 エンコードのパス。"
-+"certificate specified in the \"phase2-ca-cert\" property. If NMSetting8021x:"
-+"system-ca-certs is enabled and the built-in CA path is an existing "
-+"directory, then this setting is ignored."
-+msgstr "\"phase2-ca-cert\" プロパティーに指定された証明書に追加する際に、検証チェインに追加される PEM フォーマットまたは DER フォーマットの証明書を含むディレクトリーへの UTF-8 エンコードパス。NMSetting8021x:system-ca-certs が有効で、組み込み CA パスが既存のディレクトリである場合、この設定は無視されます。"
-
--#: ../clients/common/settings-docs.h.in:74
-+#: ../clients/common/settings-docs.h.in:75
- msgid ""
- "Contains the \"phase 2\" client certificate if used by the EAP method "
- "specified in the \"phase2-auth\" or \"phase2-autheap\" properties. "
-@@ -6382,29 +6480,40 @@ msgid ""
- "in-the-middle attacks and is NOT recommended."
- msgstr "\"phase2-auth\" プロパティーまたは \"phase2-autheap\" プロパティーに指定した EAP メソッドが使用する場合は、\"phase 2\" クライアント証明書を含めます。証明書データは \"scheme\" を使用して指定されます。現在、ブロブとパスの 2 つがサポートされます。(NM 0.7.x との後方互換性である) ブロブスキームを使用する場合は、このプロパティーを、証明書の DER エンコードデータに設定する必要があります。パススキームを使用する場合は、このプロパティーを、文字列 \"file://\" で始まり、終了 NUL バイトで終わる UTF-8 エンコードのフル パスで指定する証明書に設定する必要があります。このプロパティーは、EAP メソッドが CA 証明書をサポートする場合でも設定する必要はありませんが、設定しないと中間者攻撃が可能になるため、推奨されません。"
-
--#: ../clients/common/settings-docs.h.in:75
-+#: ../clients/common/settings-docs.h.in:76
- msgid ""
- "The password used to access the \"phase2\" client certificate stored in "
- "\"phase2-client-cert\" property. Only makes sense if the certificate is "
- "stored on a PKCS#11 token that requires a login."
- msgstr "\"phase2-client-cert\" プロパティーに保存されている \"phase2\" クライアント証明書にアクセスするのに使用されるパスワード。この証明書が、ログインが必要な PKCS#11 トークンに保存されている場合にのみ適用されます。"
-
--#: ../clients/common/settings-docs.h.in:76
-+#: ../clients/common/settings-docs.h.in:77
- msgid ""
- "Flags indicating how to handle the \"phase2-client-cert-password\" property."
- msgstr "\"phase2-client-cert-password\" プロパティーの処理方法を示すフラグ。"
-
--#: ../clients/common/settings-docs.h.in:77
-+#: ../clients/common/settings-docs.h.in:78
-+msgid ""
-+"Constraint for server domain name. If set, this list of FQDNs is used as a "
-+"match requirement for dNSName element(s) of the certificate presented by the "
-+"authentication server during the inner \"phase 2\" authentication. If a "
-+"matching dNSName is found, this constraint is met. If no dNSName values are "
-+"present, this constraint is matched against SubjectName CN using the same "
-+"comparison. Multiple valid FQDNs can be passed as a \";\" delimited list."
-+msgstr "サーバードメイン名の制約。設定すると、内部 \"phase 2\" 認証時に、内部の \"phase 2\" 認証中に、認証サーバーが表示する証明書の dNSName 要素に対して、この FQDN がサフィックス一致要件として使用されます。一致する dNSName が見つかると、この制約が満たされます。dNSName 値が表示されないと、この制約は、同じサフィックス一致比較を使用して SubjectName CN を照合します。"
-+
-+#: ../clients/common/settings-docs.h.in:79
- msgid ""
- "Constraint for server domain name. If set, this FQDN is used as a suffix "
- "match requirement for dNSName element(s) of the certificate presented by the "
- "authentication server during the inner \"phase 2\" authentication. If a "
- "matching dNSName is found, this constraint is met. If no dNSName values are "
- "present, this constraint is matched against SubjectName CN using same suffix "
--"match comparison."
--msgstr "サーバードメイン名の制約。設定すると、内部 \"phase 2\" 認証時に、認証サーバーが表示する証明書の dNSName 要素に対して、この FQDN がサフィックス一致要件として使用されます。一致する dNSName が見つかると、この制約が満たされます。dNSName 値が表示されないと、この制約は、同じサフィックス一致比較を使用して SubjectName CN を照合します。"
-+"match comparison. Since version 1.24, multiple valid FQDNs can be passed as "
-+"a \";\" delimited list."
-+msgstr "サーバードメイン名の制約。設定すると、内部 \"phase 2\" 認証時に、認証サーバーが表示する証明書の dNSName 要素に対して、この FQDN がサフィックス一致要件として使用されます。一致する dNSName が見つかると、この制約が満たされます。dNSName 値が表示されないと、この制約は、同じサフィックス一致比較を使用して SubjectName CN を照合します。1.24 バージョン以降では、複数の有効な FQDN は \";\" 区切りの一覧として渡すことができます。"
-
--#: ../clients/common/settings-docs.h.in:78
-+#: ../clients/common/settings-docs.h.in:80
- msgid ""
- "Contains the \"phase 2\" inner private key when the \"phase2-auth\" or "
- "\"phase2-autheap\" property is set to \"tls\". Key data is specified using a "
-@@ -6423,19 +6532,19 @@ msgid ""
- "decode the PKCS#12 private key and certificate."
- msgstr "\"phase2-auth\" プロパティーまたは \"phase2-autheap\" プロパティーを \"tls\" に設定する場合は、\"phase 2\" 内部秘密鍵を含めます。キーデータは \"scheme\" を使用して指定されます。現在、ブロブとパスの 2 つがサポートされます。ブロブスキームと秘密鍵を使用している場合は、このプロパティーをキーの暗号化 PEM エンコードデータに設定する必要があります。パススキームで秘密鍵を使用している場合は、このプロパティーを、文字列 \"file://\" で始まり、終了 NUL バイトで終わる UTF-8 エンコードのフル パスで指定するキーに設定する必要があります。PKCS#12 フォーマットの秘密鍵とブロブスキームを設定している場合は、このプロパティーを、PKCS#12 データに設定し、\"phase2-private-key-password\" プロパティーを、PKCS#12 証明書およびキーを復号するのに使用するパスワードに設定する必要があります。PKCS#12 ファイルとパススキームを使用している場合は、このプロパティーを、文字列 \"file://\" で始まり、終了 NUL バイトで終わる UTF-8 エンコードのフル パスで指定するキーに設定する必要があります。ブロブスキームを使用した場合は、\"phase2-private-key-password\" プロパティーを、PKCS#12 秘密鍵および証明書を復号するパスワードに設定する必要があるためです。"
-
--#: ../clients/common/settings-docs.h.in:79
-+#: ../clients/common/settings-docs.h.in:81
- msgid ""
- "The password used to decrypt the \"phase 2\" private key specified in the "
- "\"phase2-private-key\" property when the private key either uses the path "
- "scheme, or is a PKCS#12 format key."
- msgstr "秘密鍵がパススキーマを使用するか、PKCS#12 フォーマットキーである場合に、\"phase2-private-key\" プロパティーに指定した \"phase 2\" 秘密鍵の複号に使用されるパスワード。"
-
--#: ../clients/common/settings-docs.h.in:80
-+#: ../clients/common/settings-docs.h.in:82
- msgid ""
- "Flags indicating how to handle the \"phase2-private-key-password\" property."
- msgstr "\"phase2-private-key-password\" プロパティーの処理方法を示すフラグ。"
-
--#: ../clients/common/settings-docs.h.in:81
-+#: ../clients/common/settings-docs.h.in:83
- msgid ""
- "Substring to be matched against the subject of the certificate presented by "
- "the authentication server during the inner \"phase 2\" authentication. When "
-@@ -6444,16 +6553,16 @@ msgid ""
- "deprecated in favor of NMSetting8021x:phase2-domain-suffix-match."
- msgstr "内部の \"phase 2\" 認証時に、認証サーバーで表示される証明書の subject に一致する従属文字列。設定しない場合は、認証サーバーの証明書の subject が検証されません。このプロパティーではセキュリティーがほぼ保護されないため、使用することは推奨されず、代わりに NMSetting8021x:phase2-domain-suffix-match が使用されます。"
-
--#: ../clients/common/settings-docs.h.in:82
-+#: ../clients/common/settings-docs.h.in:84
- msgid "PIN used for EAP authentication methods."
- msgstr "EAP 認証方法に使用される PIN"
-
--#: ../clients/common/settings-docs.h.in:83
--#: ../clients/common/settings-docs.h.in:183
-+#: ../clients/common/settings-docs.h.in:85
-+#: ../clients/common/settings-docs.h.in:201
- msgid "Flags indicating how to handle the \"pin\" property."
- msgstr "\"pin\" プロパティーの処理方法を示すフラグ。"
-
--#: ../clients/common/settings-docs.h.in:84
-+#: ../clients/common/settings-docs.h.in:86
- msgid ""
- "Contains the private key when the \"eap\" property is set to \"tls\". Key "
- "data is specified using a \"scheme\"; two are currently supported: blob and "
-@@ -6475,18 +6584,18 @@ msgid ""
- "to prevent unauthorized access to unencrypted private key data."
- msgstr "\"eap\" プロパティーを \"tls\" に設定する場合は、秘密鍵を含めます。キーデータは \"scheme\" を使用して指定されます。現在、ブロブとパスの 2 つがサポートされます。ブロブスキームと秘密鍵を使用している場合は、このプロパティーを、キーの暗号化 PEM エンコードデータに設定する必要があります。パススキームで秘密鍵を使用している場合は、このプロパティーを、文字列 \"file://\" で始まり、終了 NUL バイトで終わる UTF-8 エンコードのフル パスで指定するキーに設定する必要があります。PKCS#12 フォーマットの秘密鍵とブロブスキームを使用している場合は、このプロパティーを PKCS#12 データに設定し、\"private-key-password\" プロパティーを、PKCS#12 証明書およびキーを復号するのに使用するパスワードに設定する必要があります。PKCS#12 ファイルとパススキームを使用している場合は、このプロパティーを、文字列 \"file://\" で始まり、終了 NUL バイトで終わる UTF-8 エンコードのフル パスで指定するキーに設定する必要があります。ブロブスキームを使用している場合は、\"private-key-password\" プロパティーに、PKCS#12 秘密鍵と証明書を復号するのに使用するパスワード設定する必要があります。警告: \"秘密鍵\" は \"シークレット\" プロパティーではないため、BLOB スキームを使用する暗号化していない秘密鍵データは、特権を持たないユーザーが読み込める場合があります。秘密鍵は常に秘密鍵パスワードで暗号化し、暗号化されていない秘密鍵データに非認証アクセスが行われないようにする必要があります。"
-
--#: ../clients/common/settings-docs.h.in:85
-+#: ../clients/common/settings-docs.h.in:87
- msgid ""
- "The password used to decrypt the private key specified in the \"private-key"
- "\" property when the private key either uses the path scheme, or if the "
- "private key is a PKCS#12 format key."
- msgstr "秘密鍵がパススキーマを使用するか、秘密鍵が PKCS#12 フォーマットを使用している場合に、\"private-key\" プロパティーに指定した秘密鍵の復号化に使用されるパスワード。"
-
--#: ../clients/common/settings-docs.h.in:86
-+#: ../clients/common/settings-docs.h.in:88
- msgid "Flags indicating how to handle the \"private-key-password\" property."
- msgstr "\"private-key-password\" プロパティーの処理方法を示すフラグ。"
-
--#: ../clients/common/settings-docs.h.in:87
-+#: ../clients/common/settings-docs.h.in:89
- msgid ""
- "Substring to be matched against the subject of the certificate presented by "
- "the authentication server. When unset, no verification of the authentication "
-@@ -6495,7 +6604,7 @@ msgid ""
- "domain-suffix-match."
- msgstr "認証サーバーで表示される証明書の subject に一致する従属文字列。設定しない場合は、認証サーバーの証明書の subject が検証されません。このプロパティーはセキュリティーがほぼ保護されないため、その使用は非推奨になり、代わりに NMSetting8021x:domain-suffix-match が使用されます。"
-
--#: ../clients/common/settings-docs.h.in:88
-+#: ../clients/common/settings-docs.h.in:90
- msgid ""
- "When TRUE, overrides the \"ca-path\" and \"phase2-ca-path\" properties using "
- "the system CA directory specified at configure time with the --system-ca-"
-@@ -6507,7 +6616,7 @@ msgid ""
- "options for wpa_supplicant)."
- msgstr "TRUE の場合は、--system-ca-path スイッチで設定時に指定したシステムの CA ディレクトリーを使用して、\"ca-path\" プロパティーと \"phase2-ca-path\" プロパティーをオーバーライドします。このディレクトリーの証明書が、\"ca-cert\" プロパティーと \"phase2-ca-cert\" プロパティーで指定した証明書とともに検証チェインに追加されます。--system-ca-path で提供されるパスがファイル名 (信頼された CA 証明書のバンドル) の場合は、\"ca-cert\" プロパティーと \"phase2-ca-cert\" プロパティーが代わりにオーバーライドされます (wpa_supplicant に ca_cert オプションおよび ca_cert2 オプションを設定します)。"
-
--#: ../clients/common/settings-docs.h.in:89
-+#: ../clients/common/settings-docs.h.in:91
- msgid ""
- "When TRUE, enforce auto-negotiation of speed and duplex mode. If \"speed\" "
- "and \"duplex\" properties are both specified, only that single mode will be "
-@@ -6518,7 +6627,7 @@ msgid ""
- "be skipped."
- msgstr "TRUE の場合は、速度と二重モードの自動ネゴシエーションを強制します。\"speed\" プロパティーと \"duplex\" プロパティーが両方とも指定される場合、リンク自動ネゴシエーションのプロセスの間、1 つのモードのみがアドバタイズされ、受け入れられます。これは、BASE-T 802.3 仕様のみで機能し、ギガビットモードの強制に役立ちます。なぜなら、このようなケースでは、リンクネゴシエーションは必須だからです。FALSE の場合は、\"speed\" プロパティーと \"duplex\" プロパティーが両方とも設定されるか、リンク設定がスキップされます。"
-
--#: ../clients/common/settings-docs.h.in:90
-+#: ../clients/common/settings-docs.h.in:92
- msgid ""
- "If specified, request that the device use this MAC address instead. This is "
- "known as MAC cloning or spoofing. Beside explicitly specifying a MAC "
-@@ -6535,7 +6644,7 @@ msgid ""
- "\"cloned-mac-address\"."
- msgstr "指定した場合は、デバイスが、その永続化 MAC アドレスの代わりにこの MAC アドレスを使用する必要があります。これは、MAC クローニングまたはスプーフィングとして知られています。明示的に MAC アドレスを指定する以外に、\"preserve\"、\"permanent\"、\"random\"、\"stable\" の値がサポートされます。\"preserve\" では、アクティベーション時に MAC アドレスを変更しません。\"permanent\" では、デバイスに永続化ハードウェアアドレスがある場合にそれを使用します (アドレスがない場合は \"preserve\" と同じ)。\"random\" では、各接続に対してランダムの MAC アドレスを作成します。\"stable\" では、connection.stable-id と機種依存キーに基づいて、ハッシュ化した MAC アドレスを作成します。指定しないと、その値はグローバルのデフォルトにより上書きされます。NetworkManager.conf を参照してください。それでも指定しない場合は、デフォルトの \"permanent\" が設定されます。D-Bus において、このフィールドは \"assigned-mac-address\" または廃止予定の \"cloned-mac-address\" として表示されます。"
-
--#: ../clients/common/settings-docs.h.in:91
-+#: ../clients/common/settings-docs.h.in:93
- msgid ""
- "When a value is set, either \"half\" or \"full\", configures the device to "
- "use the specified duplex mode. If \"auto-negotiate\" is \"yes\" the "
-@@ -6550,21 +6659,21 @@ msgid ""
- "your device supports it."
- msgstr "値が \"half\" または \"full\" のいずれかに設定されている場合、指定された二重モードを使用するようにデバイスを設定します。\"auto-negotiate\" が \"yes\" の場合、リンクネゴシエーションの間にアドバタイズされるのは、指定された二重モードだけになります。これは、BASE-T 802.3 仕様のみで機能し、ギガビットモードの強制に役立ちます。なぜなら、このようなケースでは、リンクネゴシエーションは必須だからです。値が設定されていない場合 (デフォルト)、リンクの設定はスキップされるか (\"auto-negotiate\" が \"no\" の場合 = デフォルト)、自動ネゴシエートされるか (\"auto-negotiate\" が \"yes\" の場合) のいずれかとなり、ローカルデバイスはすべてのサポートされる二重モードをアドバタイズします。指定する場合は \"speed\" プロパティーも設定する必要があります。二重モードを指定する前に、デバイスがそのモードをサポートすることを確認してください。"
-
--#: ../clients/common/settings-docs.h.in:93
-+#: ../clients/common/settings-docs.h.in:95
- msgid ""
- "If specified, this connection will only apply to the Ethernet device whose "
- "permanent MAC address matches. This property does not change the MAC address "
- "of the device (i.e. MAC spoofing)."
- msgstr "指定すると、この接続は永続的な MAC アドレスに一致する Ethernet デバイスにのみ適用されます。このプロパティーは、デバイスの MAC アドレスを変更しません (MAC スプーフィング)。"
-
--#: ../clients/common/settings-docs.h.in:94
-+#: ../clients/common/settings-docs.h.in:96
- msgid ""
- "If specified, this connection will never apply to the Ethernet device whose "
- "permanent MAC address matches an address in the list. Each MAC address is "
- "in the standard hex-digits-and-colons notation (00:11:22:33:44:55)."
- msgstr "指定すると、この接続は、永続的な MAC アドレスがリストのアドレスに一致する Ethernet デバイスには適用されません。 各 MAC アドレスは、標準の 16 進数とコロン (00:11:22:33:44:55) で指定する必要があります。"
-
--#: ../clients/common/settings-docs.h.in:96
-+#: ../clients/common/settings-docs.h.in:98
- msgid ""
- "Specific port type to use if the device supports multiple attachment "
- "methods. One of \"tp\" (Twisted Pair), \"aui\" (Attachment Unit Interface), "
-@@ -6572,13 +6681,13 @@ msgid ""
- "device supports only one port type, this setting is ignored."
- msgstr "デバイスが複数の割り当て方法をサポートする場合に使用するポートタイプ。\"tp\" (ツイストペア)、\"aui\" (接続機構インターフェース)、\"bnc\" (シンイーサーネット)、または \"mii\" (メディア独立インターフェース) のいずれかになります。デバイスがポートのタイプを 1 つだけサポートする場合、この設定は無視されます。"
-
--#: ../clients/common/settings-docs.h.in:97
-+#: ../clients/common/settings-docs.h.in:99
- msgid ""
- "s390 network device type; one of \"qeth\", \"lcs\", or \"ctc\", representing "
- "the different types of virtual network devices available on s390 systems."
- msgstr "s390 ネットワークデバイスのタイプ。\"qeth\"、\"lcs\"、または \"ctc\" のいずれかになります。s390 システムで利用可能なさまざまな仮想ネットワークデバイスになります。"
-
--#: ../clients/common/settings-docs.h.in:98
-+#: ../clients/common/settings-docs.h.in:100
- msgid ""
- "Dictionary of key/value pairs of s390-specific device options. Both keys "
- "and values must be strings. Allowed keys include \"portno\", \"layer2\", "
-@@ -6586,7 +6695,7 @@ msgid ""
- "alphanumeric characters (ie, [a-zA-Z0-9])."
- msgstr "s390 固有のデバイスオプションにおける、キーと値がペアになったディクショナリー。キーと値の両方を文字列にする必要があります。\"portno\"、\"layer2\"、\"portname\"、\"protocol\" などのキーが使用できます。キー名には、英数字のみ (つまり [a-zA-Z0-9]) が使用できます。"
-
--#: ../clients/common/settings-docs.h.in:99
-+#: ../clients/common/settings-docs.h.in:101
- msgid ""
- "Identifies specific subchannels that this network device uses for "
- "communication with z/VM or s390 host. Like the \"mac-address\" property for "
-@@ -6596,7 +6705,7 @@ msgid ""
- "hexadecimal characters and the period (.) character."
- msgstr "このネットワークデバイスが、z/VM または s390 ホストとの接続に使用する特定のサブチャンネルを識別します。z/VM 以外のデバイスに対する \"mac-address\" プロパティーのように、このプロパティーを使用して、この接続が、このサブチャンネルを使用するネットワークデバイスにのみ適用されるようにします。この一覧には 3 つの文字列が含まれている必要があり、各文字列には、16 進数とピリオド (.) だけを使用できます。"
-
--#: ../clients/common/settings-docs.h.in:100
-+#: ../clients/common/settings-docs.h.in:102
- msgid ""
- "When a value greater than 0 is set, configures the device to use the "
- "specified speed. If \"auto-negotiate\" is \"yes\" the specified speed will "
-@@ -6611,7 +6720,7 @@ msgid ""
- "supports it."
- msgstr "0 より大きな値が設定されている場合、指定された速度を使用するようにデバイスを設定します。\"auto-negotiate\" が \"yes\" の場合、リンクネゴシエーションの間にアドバタイズされるのは、指定された速度だけになります。これは、BASE-T 802.3 仕様のみで機能し、ギガビット速度の強制に役立ちます。なぜなら、このケースでは、リンクネゴシエーションは必須だからです。値が設定されていない場合 (0 = デフォルト)、リンクの設定はスキップされるか (\"auto-negotiate\" が \"no\" の場合 = デフォルト)、自動ネゴシエートされるか (\"auto-negotiate\" が \"yes\" の場合) のいずれかとなり、ローカルデバイスはすべてのサポートされる速度をアドバタイズします。Mbit/s では 100 == 100Mbit/s です。ゼロ以外にする場合は、\"duplex\" プロパティーも設定する必要があります。速度値を指定する前に、デバイスがその速度をサポートすることを確認してください。"
-
--#: ../clients/common/settings-docs.h.in:101
-+#: ../clients/common/settings-docs.h.in:103
- msgid ""
- "The NMSettingWiredWakeOnLan options to enable. Not all devices support all "
- "options. May be any combination of NM_SETTING_WIRED_WAKE_ON_LAN_PHY (0x2), "
-@@ -6624,63 +6733,71 @@ msgid ""
- "disable management of Wake-on-LAN in NetworkManager)."
- msgstr "有効にする NMSettingWiredWakeOnLan オプション。すべてのデバイスがすべてのオプションをサポートするわけではありません。NM_SETTING_WIRED_WAKE_ON_LAN_PHY (0x2)、NM_SETTING_WIRED_WAKE_ON_LAN_UNICAST (0x4)、NM_SETTING_WIRED_WAKE_ON_LAN_MULTICAST (0x8)、NM_SETTING_WIRED_WAKE_ON_LAN_BROADCAST (0x10)、NM_SETTING_WIRED_WAKE_ON_LAN_ARP (0x20)、NM_SETTING_WIRED_WAKE_ON_LAN_MAGIC (0x40)、または特別な値 NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT (0x1) (グローバル設定を使用) および NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE (0x8000) (NetworkManager で Wake-on-LAN の管理を無効) から組み合わせることができます。"
-
--#: ../clients/common/settings-docs.h.in:102
-+#: ../clients/common/settings-docs.h.in:104
- msgid ""
- "If specified, the password used with magic-packet-based Wake-on-LAN, "
- "represented as an Ethernet MAC address. If NULL, no password will be "
- "required."
- msgstr "指定すると、マジックパケットベースの Wake-on-LAN で使用されるパスワードが、Ethernet の MAC アドレスとして表示されます。NULL にすると、パスワードは要求されません。"
-
--#: ../clients/common/settings-docs.h.in:103
-+#: ../clients/common/settings-docs.h.in:105
- msgid "Encapsulation of ADSL connection. Can be \"vcmux\" or \"llc\"."
- msgstr "ADSL 接続のカプセル化。\"vcmux\" または \"llc\" にできます。"
-
--#: ../clients/common/settings-docs.h.in:104
-+#: ../clients/common/settings-docs.h.in:106
- msgid "Password used to authenticate with the ADSL service."
- msgstr "ADSL サービスでの認証に使用するパスワード。"
-
--#: ../clients/common/settings-docs.h.in:106
-+#: ../clients/common/settings-docs.h.in:108
- msgid "ADSL connection protocol. Can be \"pppoa\", \"pppoe\" or \"ipoatm\"."
- msgstr "ADSL 接続プロトコル。\"pppoa\"、\"pppoe\"、または \"ipoatm\" にできます。"
-
--#: ../clients/common/settings-docs.h.in:107
-+#: ../clients/common/settings-docs.h.in:109
- msgid "Username used to authenticate with the ADSL service."
- msgstr "ユーザー名は、ADSL サービスでの認証に使用されました。"
-
--#: ../clients/common/settings-docs.h.in:108
-+#: ../clients/common/settings-docs.h.in:110
- msgid "VCI of ADSL connection"
- msgstr "ADSL 接続の VCI"
-
--#: ../clients/common/settings-docs.h.in:109
-+#: ../clients/common/settings-docs.h.in:111
- msgid "VPI of ADSL connection"
- msgstr "ADSL 接続の VPI"
-
--#: ../clients/common/settings-docs.h.in:110
-+#: ../clients/common/settings-docs.h.in:112
- msgid "The Bluetooth address of the device."
- msgstr "デバイスの Bluetooth アドレス。"
-
--#: ../clients/common/settings-docs.h.in:111
-+#: ../clients/common/settings-docs.h.in:113
- msgid ""
- "Either \"dun\" for Dial-Up Networking connections or \"panu\" for Personal "
- "Area Networking connections to devices supporting the NAP profile."
- msgstr "NAP プロファイルをサポートするデバイスへの \"dun\" (ダイアルアップネットワーキング接続の場合) または \"panu\" (パーソナルエリアネットワーキング接続の場合) のいずれかになります。"
-
--#: ../clients/common/settings-docs.h.in:112
-+#: ../clients/common/settings-docs.h.in:114
- msgid ""
- "Dictionary of key/value pairs of bonding options. Both keys and values must "
- "be strings. Option names must contain only alphanumeric characters (ie, [a-"
- "zA-Z0-9])."
- msgstr "ボンディングオプションにおける、キーと値がペアになったディクショナリー。キーと値の両方を文字列にする必要があります。オプション名には英数字のみ (つまり [a-zA-Z0-9]) を使用できます。"
-
--#: ../clients/common/settings-docs.h.in:113
-+#: ../clients/common/settings-docs.h.in:115
- msgid "The Ethernet MAC address aging time, in seconds."
- msgstr "Ethernet MAC アドレスのエージングタイム (秒単位)。"
-
--#: ../clients/common/settings-docs.h.in:114
-+#: ../clients/common/settings-docs.h.in:116
- msgid "The Spanning Tree Protocol (STP) forwarding delay, in seconds."
- msgstr "スパニングツリープロトコル (STP) フォワード遅延 (秒単位)。"
-
--#: ../clients/common/settings-docs.h.in:115
-+#: ../clients/common/settings-docs.h.in:117
-+msgid ""
-+"If specified, The MAC address of the multicast group this bridge uses for "
-+"STP. The address must be a link-local address in standard Ethernet MAC "
-+"address format, ie an address of the form 01:80:C2:00:00:0X, with X in [0, "
-+"4..F]. If not specified the default value is 01:80:C2:00:00:00."
-+msgstr "指定されている場合は、このブリッジが STP に使用するマルチキャストグループの MAC アドレスです。このアドレスは、標準イーサネット MAC アドレス形式のリンクローカルアドレスでなければなりません。指定しない場合、デフォルト値は 01:80:C2:00:00:00 です。"
-+
-+#: ../clients/common/settings-docs.h.in:118
- msgid ""
- "A mask of group addresses to forward. Usually, group addresses in the range "
- "from 01:80:C2:00:00:00 to 01:80:C2:00:00:0F are not forwarded according to "
-@@ -6689,11 +6806,11 @@ msgid ""
- "or 2 set because they are used for STP, MAC pause frames and LACP."
- msgstr "転送するグループアドレスのマスク。仕様により、通常、01:80:C2:00:00:00 - 01:80:C2:00:00:0F の範囲にあるグループアドレスは転送されません。このプロパティーは 16 ビットのマスクで、それぞれ転送が必要な範囲内のグループアドレスに対応します。マスクは、STP、MAC 停止フレーム、および LACP に使用されているため、ビット 0、1、または 2 を設定することはできません。"
-
--#: ../clients/common/settings-docs.h.in:116
-+#: ../clients/common/settings-docs.h.in:119
- msgid "The Spanning Tree Protocol (STP) hello time, in seconds."
- msgstr "スパニングツリープロトコル (STP) Hello タイム (秒単位)。"
-
--#: ../clients/common/settings-docs.h.in:117
-+#: ../clients/common/settings-docs.h.in:120
- msgid ""
- "If specified, the MAC address of bridge. When creating a new bridge, this "
- "MAC address will be set. If this field is left unspecified, the \"ethernet."
-@@ -6703,40 +6820,119 @@ msgid ""
- "property is deprecated. Deprecated: 1"
- msgstr "指定した場合は、ブリッジの MAC アドレス。新しいブリッジを作成すると、この MAC アドレスが設定されます。このフィールドを指定しないと、\"ethernet.cloned-mac-address\" が代わりに参照され、初期 MAC アドレスが生成されます。\"ethernet.cloned-mac-address\" は、ブリッジのアクティベート中に、ブリッジの MAC アドレスを上書きします。したがって、このプロパティーは廃止されます。非推奨: 1"
-
--#: ../clients/common/settings-docs.h.in:118
-+#: ../clients/common/settings-docs.h.in:121
- msgid "The Spanning Tree Protocol (STP) maximum message age, in seconds."
- msgstr "スパニングツリープロトコル (STP) メッセージ最大期間 (秒単位)。"
-
--#: ../clients/common/settings-docs.h.in:119
-+#: ../clients/common/settings-docs.h.in:122
-+msgid "Set maximum size of multicast hash table (value must be a power of 2)."
-+msgstr "マルチキャストハッシュテーブルの最大サイズを設定します (値は 2 の乗算である必要があります)。"
-+
-+#: ../clients/common/settings-docs.h.in:123
-+msgid ""
-+"Set the number of queries the bridge will send before stopping forwarding a "
-+"multicast group after a \"leave\" message has been received."
-+msgstr "\"leave\" メッセージを受信した後で、マルチキャストグループの転送を停止する前にブリッジが送信するクエリーの数を設定します。"
-+
-+#: ../clients/common/settings-docs.h.in:124
-+msgid ""
-+"Set interval (in deciseconds) between queries to find remaining members of a "
-+"group, after a \"leave\" message is received."
-+msgstr "\"leave\" メッセージを受信した後、グループの残りのメンバーを見つけるためのクエリーの間隔を設定します (deciseconds) 。"
-+
-+#: ../clients/common/settings-docs.h.in:125
-+msgid ""
-+"Set delay (in deciseconds) after which the bridge will leave a group, if no "
-+"membership reports for this group are received."
-+msgstr "このグループのメンバーシップレポートを受信しない場合は、ブリッジがグループから離れるまでの遅延時間 (秒単位) を設定します。"
-+
-+#: ../clients/common/settings-docs.h.in:126
-+msgid ""
-+"Enable or disable sending of multicast queries by the bridge. If not "
-+"specified the option is disabled."
-+msgstr "ブリッジによるマルチキャストクエリの送信を有効または無効にします。指定しない場合、このオプションは無効になります。"
-+
-+#: ../clients/common/settings-docs.h.in:127
-+msgid ""
-+"If no queries are seen after this delay (in deciseconds) has passed, the "
-+"bridge will start to send its own queries."
-+msgstr "この遅延時間 (deciseconds) が経過してもクエリーが見られない場合、ブリッジは自身のクエリーの送信を開始します。"
-+
-+#: ../clients/common/settings-docs.h.in:128
-+msgid ""
-+"Interval (in deciseconds) between queries sent by the bridge after the end "
-+"of the startup phase."
-+msgstr "起動フェーズの終了後、ブリッジが送信するクエリー間の間隔 (deciseconds)。"
-+
-+#: ../clients/common/settings-docs.h.in:129
-+msgid ""
-+"Set the Max Response Time/Max Response Delay (in deciseconds) for IGMP/MLD "
-+"queries sent by the bridge."
-+msgstr "ブリッジが送信する IGMP/MLD クエリの Max Response Time/Max Response Delay (deciseconds) を設定します。"
-+
-+#: ../clients/common/settings-docs.h.in:130
-+msgid ""
-+"If enabled the bridge's own IP address is used as the source address for "
-+"IGMP queries otherwise the default of 0.0.0.0 is used."
-+msgstr "有効にすると、ブリッジ自身の IP アドレスが IGMP クエリのソースアドレスとして使用され、それ以外の場合はデフォルトの 0.0.0.0 が使用されます。"
-+
-+#: ../clients/common/settings-docs.h.in:131
-+msgid ""
-+"Sets bridge's multicast router. Multicast-snooping must be enabled for this "
-+"option to work. Supported values are: 'auto', 'disabled', 'enabled'. If not "
-+"specified the default value is 'auto'."
-+msgstr "ブリッジのマルチキャストルータを設定します。このオプションを有効にするには、マルチキャストスヌーピングを有効にする必要があります。サポートされている値は、'auto'、'disabled'、'enabled' です。指定しない場合のデフォルト値は「auto」です。"
-+
-+#: ../clients/common/settings-docs.h.in:132
- msgid ""
- "Controls whether IGMP snooping is enabled for this bridge. Note that if "
- "snooping was automatically disabled due to hash collisions, the system may "
- "refuse to enable the feature until the collisions are resolved."
- msgstr "このブリッジにおいて、IGMP スヌーピングが有効かどうかを制御します。ハッシュの不一致が原因でスヌーピングが自動的に無効になっている場合は、その矛盾が解決するまでこの機能が有効にならないことがあります。"
-
--#: ../clients/common/settings-docs.h.in:120
-+#: ../clients/common/settings-docs.h.in:133
-+msgid "Set the number of IGMP queries to send during startup phase."
-+msgstr "起動フェーズで送信する IGMP クエリーの数を設定します。"
-+
-+#: ../clients/common/settings-docs.h.in:134
-+msgid ""
-+"Sets the time (in deciseconds) between queries sent out at startup to "
-+"determine membership information."
-+msgstr "起動時に送信されたクエリーの間の時間 (秒単位) を設定して、メンバーシップ情報を決定します。"
-+
-+#: ../clients/common/settings-docs.h.in:135
- msgid ""
- "Sets the Spanning Tree Protocol (STP) priority for this bridge. Lower "
- "values are \"better\"; the lowest priority bridge will be elected the root "
- "bridge."
- msgstr "このブリッジにおけるスパニングツリープロトコル (STP) の優先度を設定します。値が小さい方が優先度が高くなります。優先度が一番低いブリッジが root ブリッジに選択されます。"
-
--#: ../clients/common/settings-docs.h.in:121
-+#: ../clients/common/settings-docs.h.in:136
- msgid ""
- "Controls whether Spanning Tree Protocol (STP) is enabled for this bridge."
- msgstr "このブリッジにおいて、スパニングツリープロトコル (STP) が有効かどうかを制御します。"
-
--#: ../clients/common/settings-docs.h.in:122
-+#: ../clients/common/settings-docs.h.in:137
- 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:123
-+#: ../clients/common/settings-docs.h.in:138
- msgid "Control whether VLAN filtering is enabled on the bridge."
- msgstr "このブリッジにおいて、VLAN フィルタリングが有効かどうかを制御します。"
-
--#: ../clients/common/settings-docs.h.in:124
-+#: ../clients/common/settings-docs.h.in:139
-+msgid ""
-+"If specified, the protocol used for VLAN filtering. Supported values are: "
-+"'802.1Q', '802.1ad'. If not specified the default value is '802.1Q'."
-+msgstr "指定された場合、VLAN フィルタリングに使用するプロトコル。サポートされている値は、'802.1Q'、'802.1ad'です。指定しない場合、デフォルト値は「802.1Q」です。"
-+
-+#: ../clients/common/settings-docs.h.in:140
-+msgid "Controls whether per-VLAN stats accounting is enabled."
-+msgstr "VLAN ごとのスタッツアカウンティングを有効にするかどうかを制御します。"
-+
-+#: ../clients/common/settings-docs.h.in:141
- 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-"
-@@ -6746,22 +6942,22 @@ msgid ""
- "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:125
-+#: ../clients/common/settings-docs.h.in:142
- 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:126
-+#: ../clients/common/settings-docs.h.in:143
- msgid ""
- "The Spanning Tree Protocol (STP) port cost for destinations via this port."
- msgstr "このポートを経由した、宛先のスパニングツリープロトコル (STP) ポートコスト。"
-
--#: ../clients/common/settings-docs.h.in:127
-+#: ../clients/common/settings-docs.h.in:144
- msgid "The Spanning Tree Protocol (STP) priority of this bridge port."
- msgstr "このブリッジポートのスパニングツリープロトコル (STP) の優先度。"
-
--#: ../clients/common/settings-docs.h.in:128
-+#: ../clients/common/settings-docs.h.in:145
- 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 "
-@@ -6771,38 +6967,38 @@ msgid ""
- "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:129
--#: ../clients/common/settings-docs.h.in:177
--#: ../clients/common/settings-docs.h.in:188
-+#: ../clients/common/settings-docs.h.in:146
-+#: ../clients/common/settings-docs.h.in:195
-+#: ../clients/common/settings-docs.h.in:206
- 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:130
-+#: ../clients/common/settings-docs.h.in:147
- msgid ""
- "The number to dial to establish the connection to the CDMA-based mobile "
- "broadband network, if any. If not specified, the default number (#777) is "
- "used when required."
- msgstr "CDMA ベースのモバイルブロードバンドネットワークへの接続を確立するダイアルの番号があれば指定します。指定しない場合は、必要に応じてデフォルトの番号 (#777) が使用されます。"
-
--#: ../clients/common/settings-docs.h.in:131
--#: ../clients/common/settings-docs.h.in:180
-+#: ../clients/common/settings-docs.h.in:148
-+#: ../clients/common/settings-docs.h.in:198
- msgid ""
- "The password used to authenticate with the network, if required. Many "
- "providers do not require a password, or accept any password. But if a "
- "password is required, it is specified here."
- msgstr "必要に応じて、ネットワークで認証するのに使用するパスワード。多くのプロバイダーでパスワードを必要としないか、いかなるパスワードも許可されます。パスワードが必要な場合は、ここで指定します。"
-
--#: ../clients/common/settings-docs.h.in:133
--#: ../clients/common/settings-docs.h.in:186
-+#: ../clients/common/settings-docs.h.in:150
-+#: ../clients/common/settings-docs.h.in:204
- msgid ""
- "The username used to authenticate with the network, if required. Many "
- "providers do not require a username, or accept any username. But if a "
- "username is required, it is specified here."
- msgstr "必要に応じて、ネットワークで認証するのに使用するユーザー名。多くのプロバイダーでユーザー名を必要としないか、いかなるユーザー名も許可されます。ユーザー名が必要な場合は、ここで指定します。"
-
--#: ../clients/common/settings-docs.h.in:134
-+#: ../clients/common/settings-docs.h.in:151
- 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 "
-@@ -6810,7 +7006,7 @@ msgid ""
- "Currently this only applies to 802-1x authentication."
- msgstr "認証の再試行数。ゼロは無限に再試行することを意味してます。-1 はグローバルのデフォルトを使用することを意味します。グローバルデフォルトが設定されない場合は、認証を 3 回再試行したら接続に失敗します。現在、これは 802-1x 認証にのみ適用されます。"
-
--#: ../clients/common/settings-docs.h.in:135
-+#: ../clients/common/settings-docs.h.in:152
- msgid ""
- "Whether or not the connection should be automatically connected by "
- "NetworkManager when the resources for the connection are available. TRUE to "
-@@ -6820,14 +7016,14 @@ msgid ""
- "profiles."
- msgstr "接続のリソースが利用可能な場合に、NetworkManager が接続を自動的に行うかどうか。TRUE の場合は接続が自動的に有効になり、FALSE の場合は手作業で接続を有効化します。自動接続は VPN プロファイルでは実装されない点に注意してください。VPN プロファイル を自動接続する別の方法として \"secondaries\" を参照してください。"
-
--#: ../clients/common/settings-docs.h.in:136
-+#: ../clients/common/settings-docs.h.in:153
- msgid ""
- "The autoconnect priority. If the connection is set to autoconnect, "
- "connections with higher priority will be preferred. Defaults to 0. The "
- "higher number means higher priority."
- msgstr "自動接続の優先度。接続を自動接続に設定すると、優先度の高い接続が優先されます。デフォルトは 0 です。数値が高くなると、優先度が高くなります。"
-
--#: ../clients/common/settings-docs.h.in:137
-+#: ../clients/common/settings-docs.h.in:154
- 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 "
-@@ -6836,7 +7032,7 @@ msgid ""
- "autoconnect again."
- msgstr "接続を自動的に試行するのを止めるまでの回数。ゼロに設定すると無限に行われます。-1 は、グローバルデフォルト (上書きされていない場合は 4 回) です。1 に設定すると、1 度だけ有効にしてから自動接続をブロックします。タイムアウト後、NetworkManager が再度、自動接続を試行することに注意してください。"
-
--#: ../clients/common/settings-docs.h.in:138
-+#: ../clients/common/settings-docs.h.in:155
- msgid ""
- "Whether or not slaves of this connection should be automatically brought up "
- "when NetworkManager activates this connection. This only has a real effect "
-@@ -6848,19 +7044,19 @@ msgid ""
- "value. If it is default as well, this fallbacks to 0."
- msgstr "NetworkManager がこの接続を有効にした場合に、この接続のスレーブが自動的に起動するかどうか。これは、マスター接続にのみ有効です。\"autoconnect\"、\"autoconnect-priority\"、および \"autoconnect-retries\" の各プロパティーは、この設定とは関係ありません。利用できる値は、0: スレーブ接続は変更しない、1: この接続のスレーブ接続をすべてアクティブにする、-1: デフォルトになります。-1 (デフォルト) に設定されている場合は、グローバルの connection.autoconnect-slaves が読み込まれて値が決定します。これもデフォルトに設定されている場合は、0 にフォールバックされます。"
-
--#: ../clients/common/settings-docs.h.in:139
-+#: ../clients/common/settings-docs.h.in:156
- msgid ""
- "If greater than zero, delay success of IP addressing until either the "
- "timeout is reached, or an IP gateway replies to a ping."
- msgstr "ゼロより大きくすると、タイムアウトに到達するか、IP ゲートウェイが ping に応答するまで、IP アドレスの遅延に成功します。"
-
--#: ../clients/common/settings-docs.h.in:140
-+#: ../clients/common/settings-docs.h.in:157
- 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:141
-+#: ../clients/common/settings-docs.h.in:158
- 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 "
-@@ -6873,48 +7069,64 @@ msgid ""
- "interface."
- msgstr "この接続がバインドされるネットワークインターフェースの名前。設定しないと、接続は、タイプが適切であれば、どのインターフェースにも割り当てることができます (その他の設定によって制限が課せられる場合があります)。ソフトウェアデバイスの場合は、これにより、作成したデバイスの名前が指定されます。インターフェース名が簡単に持続しない接続の場合 (モバイルブロードバンドまたは USB Ethernet など)、このプロパティーは使用しないでください。このプロパティーの設定は、接続が使用できるインターフェースを制限し、インターフェース名を変更したり、順番を変更すると、誤ったインターフェースに接続が適用される場合があります。"
-
--#: ../clients/common/settings-docs.h.in:142
-+#: ../clients/common/settings-docs.h.in:159
- msgid "Whether LLDP is enabled for the connection."
- msgstr "この接続に対して LLDP が有効であるかどうか。"
-
--#: ../clients/common/settings-docs.h.in:143
-+#: ../clients/common/settings-docs.h.in:160
- 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 "
- "format that allows both IPv4 and IPv6 hosts to perform name resolution for "
--"hosts on the same local link. The permitted values are: yes: register "
--"hostname and resolving for the connection, no: disable LLMNR for the "
--"interface, resolve: do not register hostname but allow resolving of LLMNR "
--"host names. This feature requires a plugin which supports LLMNR. One such "
--"plugin is dns-systemd-resolved."
--msgstr "LLMNR (リンクローカルマルチキャスト名前解決) を接続で有効にするかどうか。LLMNR はドメインネームシステム (DNS) パケット形式をベースとしたプロトコルで、IPv4 と IPv6 の両方のホストが同一のローカルリンク上でホストの名前解決を実行できるようにするものです。利用できる値は、yes: ホスト名を登録して接続を解決、no: インターフェースに対して LLMNR を無効にする 、resolve: ホスト名を登録せずに LLMNR ホスト名の解決を許可、の 3 つになります。この機能には、LLMNR をサポートするプラグインが必要です。たとえば、dns-systemd-resolved などです。"
-+"hosts on the same local link. The permitted values are: \"yes\" (2) register "
-+"hostname and resolving for the connection, \"no\" (0) disable LLMNR for the "
-+"interface, \"resolve\" (1) do not register hostname but allow resolving of "
-+"LLMNR host names If unspecified, \"default\" ultimately depends on the DNS "
-+"plugin (which for systemd-resolved currently means \"yes\"). This feature "
-+"requires a plugin which supports LLMNR. Otherwise the setting has no effect. "
-+"One such plugin is dns-systemd-resolved."
-+msgstr "LLMNR (リンクローカルマルチキャスト名前解決) を接続で有効にするかどうか。LLMNR はドメインネームシステム (DNS) パケット形式をベースとしたプロトコルで、IPv4 と IPv6 の両方のホストが同一のローカルリンク上でホストの名前解決を実行できるようにするものです。利用できる値は、\"yes\" (2): ホスト名を登録して接続を解決、\"no\" (0): インターフェースに対して LLMNR を無効にする、\"resolve\" (1): ホスト名を登録せずに LLMNR ホスト名の解決を許可、の 3 つになります。指定されていない場合は、\"default\" は DNS プラグライン (systemd-resolved が現在 \"yes\" を意味する) に最終的に依存します。この機能には、LLMNR をサポートするプラグインが必要です。たとえば、dns-systemd-resolved などです。"
-
--#: ../clients/common/settings-docs.h.in:144
-+#: ../clients/common/settings-docs.h.in:161
- msgid "Interface name of the master device or UUID of the master connection."
- msgstr "マスター接続のマスターデバイスまたは UUID のインターフェース名。"
-
--#: ../clients/common/settings-docs.h.in:145
-+#: ../clients/common/settings-docs.h.in:162
- msgid ""
--"Whether mDNS is enabled for the connection. The permitted values are: yes: "
--"register hostname and resolving for the connection, no: disable mDNS for the "
--"interface, resolve: do not register hostname but allow resolving of mDNS "
--"host names. This feature requires a plugin which supports mDNS. One such "
--"plugin is dns-systemd-resolved."
--msgstr "mDNS の接続が実行されるかどうか。利用できる値は、yes: ホスト名を登録して接続を解決、no: インターフェースに対して mDNS を無効にする、resolve: ホスト名を登録せずに mDNS ホスト名の解決を許可、の 3 つになります。この機能には、mDNS をサポートするプラグインが必要です。たとえば、dns-systemd-resolved などです。"
-+"Whether mDNS is enabled for the connection. The permitted values are: \"yes"
-+"\" (2) register hostname and resolving for the connection, \"no\" (0) "
-+"disable mDNS for the interface, \"resolve\" (1) do not register hostname but "
-+"allow resolving of mDNS host names and \"default\" (-1) to allow lookup of a "
-+"global default in NetworkManager.conf. If unspecified, \"default\" "
-+"ultimately depends on the DNS plugin (which for systemd-resolved currently "
-+"means \"no\"). This feature requires a plugin which supports mDNS. Otherwise "
-+"the setting has no effect. One such plugin is dns-systemd-resolved."
-+msgstr "接続に対して mDNS が有効になっているかどうかを指定します。許可される値は、\"yes\" (2) はホスト名を登録して接続を解決。\"no\" (0) はインターフェイスの mDNS を無効にし、\"resolve\" (1) ホスト名を登録しませんが mDNS ホスト名の解決を許可します。また、\"default\" (-1) が NetworkManager.conf のグローバルデフォルトを検索できるようにします。指定されていない場合、\"default\" は最終的に DNS プラグインに依存します (systemd-resolvedの場合、現在は \"no\" を意味します)。この機能を使用するには、mDNS をサポートするプラグインが必要です。それ以外の場合では、設定は何の効果もありません。そのようなプラグインの一つが dns-systemd-resolved です。"
-
--#: ../clients/common/settings-docs.h.in:146
-+#: ../clients/common/settings-docs.h.in:163
- 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:147
-+#: ../clients/common/settings-docs.h.in:164
-+msgid ""
-+"If configured, set to a Manufacturer Usage Description (MUD) URL that points "
-+"to manufacturer-recommended network policies for IoT devices. It is "
-+"transmitted as a DHCPv4 or DHCPv6 option. The value must be a valid URL "
-+"starting with \"https://\". The special value \"none\" is allowed to "
-+"indicate that no MUD URL is used. If the per-profile value is unspecified "
-+"(the default), a global connection default gets consulted. If still "
-+"unspecified, the ultimate default is \"none\"."
-+msgstr "設定されている場合は、IoT デバイスの製造元推奨のネットワークポリシーを指す製造元使用説明 (MUD) URL を設定します。これは、DHCPv4 または DHCPv6 オプションとして送信されます。この値は「https://」で始まる有効な URL でなければなりません。特別な値 \"none\" は、MUD URL が使用されていないことを示すために使用できます。プロファイルごとの値が指定されていない場合 (デフォルト)、グローバル接続のデフォルトが参照されます。それでも指定されていない場合、最終的なデフォルトは \"none\" です。"
-+
-+#: ../clients/common/settings-docs.h.in:165
- 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:148
-+#: ../clients/common/settings-docs.h.in:166
- 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 "
-@@ -6929,26 +7141,26 @@ msgid ""
- "[id], and [reserved] must be valid UTF-8."
- msgstr "指定したユーザーによるこの接続へのアクセスの種類を定義する文字列の配列。これを NULL または空にすると、すべてのユーザーがこの接続にアクセスできるようになります。それ以外の場合は、この一覧に挙げられているユーザーだけが許可されます。これが空になっていないと、指定したユーザーの 1 人がアクティブなセッションにログインした場合に限り、接続はアクティブになります。各エントリーの形式は \"[type]:[id]:[reserved]\" (たとえば \"user:dcbw:blah\") となります。その他の値は無視され、今後の使用のために予約されます。現時点では、\"user\" の [type] だけが利用できます。[id] は、この権限が参照するユーザー名で、\":\" 文字は使用できません。表示されている [reserved] 情報は無視され、今後使用されるために予約される必要があります。[type]、[id]、および [reserved] はすべて有効な UTF-8 にする必要があります。"
-
--#: ../clients/common/settings-docs.h.in:149
-+#: ../clients/common/settings-docs.h.in:167
- msgid ""
- "FALSE if the connection can be modified using the provided settings "
- "service's D-Bus interface with the right privileges, or TRUE if the "
- "connection is read-only and cannot be modified."
- msgstr "正しい権限で、提供された設定サービスの D-Bus インターフェースを使用して接続が修正できる場合は FALSE、接続が読み取り専用で修正できない場合は TRUE。"
-
--#: ../clients/common/settings-docs.h.in:150
-+#: ../clients/common/settings-docs.h.in:168
- 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:151
-+#: ../clients/common/settings-docs.h.in:169
- msgid ""
- "Setting name of the device type of this slave's master connection (eg, \"bond"
- "\"), or NULL if this connection is not a slave."
- msgstr "このスレーブのマスター接続 (\"bond\" など) のデバイスタイプの設定名。この接続がスレーブではない場合は NULL。"
-
--#: ../clients/common/settings-docs.h.in:152
-+#: ../clients/common/settings-docs.h.in:170
- msgid ""
- "This represents the identity of the connection used for various purposes. It "
- "allows to configure multiple profiles to share the identity. Also, the "
-@@ -6979,7 +7191,7 @@ msgid ""
- "uses a unique, fixed ID for the connection."
- msgstr "これは、様々な目的で使用される接続のアイデンティティーを示しています。これにより、複数のプロファイルを設定してアイデンティティーを共有できます。また、stable-id には、コンテキストによって動的および確定的に置換されるプレースホルダーを含むことができます。stable-id は、ipv6.addr-gen-mode=stable-privacy で IPv6 の安定したプライベートアドレスを生成するのに使用されます。また、ethernet.cloned-mac-address=stable および wifi.cloned-mac-address=stable に対して生成されるクローンの MAC アドレスのシードにも使用されます。これは、ipv4.dhcp-client-id=stable の DHCP クライアント識別子としても使用され、ipv6.dhcp-duid=stable-[llt,ll,uuid] を使って DHCP DUID を取得する場合にも使用されます。使用される場所のコンテキストによっては、他のパラメーターも生成アルゴリズムにシードされることに注意してください。たとえば、別々のシステムが別々の ID を生成する結果となるように、一般にホストごとのキーも含まれています。または、ipv6.addr-gen-mode=stable-privacy では、別々のインターフェースが別々のアドレスを生成するようにデバイス名も含まれています。この '$' 文字は、ランタイム時に動的置換を実行するのに使用されます。現在サポートされているのは、\"${CONNECTION}\"、\"${DEVICE}\"、\"${MAC}\"、\"${BOOT}\"、\"${RANDOM}\" です。これは、各接続時、各デバイスごと、各起動時、または毎回、固有の ID を効果的に作成します。\"${DEVICE}\" は、デバイスのインターフェース名に対応し、\"${MAC}\" はデバイスの永続的 MAC アドレスという点に注意してください。'$' に続く認識されていないパターンは文字通りに扱われますが、今後使用されるために予約されます。したがって、これは '$' を使用しないか、またはエスケープ文字 \"$$\" として使用することが推奨されます。たとえば、これを \"${CONNECTION}-${BOOT}-${DEVICE}\" に設定すると、この接続に対して固有の ID を作成します。これは、システムを再起動するたびに変更され、プロファイルがアクティベートされるインターフェースに応じて異なってきます。値が設定されていない場合は、グローバルな接続デフォルトを参考にします。引き続き値が設定されない場合は、デフォルトは \"${CONNECTION}\" と類似し、接続に固有の固定 ID を使用します。"
-
--#: ../clients/common/settings-docs.h.in:153
-+#: ../clients/common/settings-docs.h.in:171
- msgid ""
- "The time, in seconds since the Unix Epoch, that the connection was last "
- "_successfully_ fully activated. NetworkManager updates the connection "
-@@ -6988,7 +7200,7 @@ msgid ""
- "reading (changes to this property will not be preserved)."
- msgstr "接続が最後に完全に有効になってからの、Unix エポック時間 (秒単位)。NetworkManager は、アクティブな接続に最新のタイムスタンプがあることを確認するために、接続がアクティブの時に、接続のタイムスタンプを定期的に更新します。このプロパティーは読み込みのためにのみ使用されます (このプロパティーへの変更は保存されません)。"
-
--#: ../clients/common/settings-docs.h.in:154
-+#: ../clients/common/settings-docs.h.in:172
- msgid ""
- "Base type of the connection. For hardware-dependent connections, should "
- "contain the setting name of the hardware-type specific setting (ie, \"802-3-"
-@@ -6997,7 +7209,7 @@ msgid ""
- "setting name of that setting type (ie, \"vpn\" or \"bridge\", etc)."
- msgstr "接続のベースタイプ。ハードウェアに依存する接続の場合は、ハードウェアの種類に固有する設定の名前 (つまり \"802-3-ethernet\"、\"802-11-wireless\"、\"bluetooth\" など) が含まれる必要があります。VPN など、ハードウェアに依存しない接続には、その設定のタイプ名 (つまり \"vpn\"、\"bridge\" など) が含まれる必要があります。"
-
--#: ../clients/common/settings-docs.h.in:155
-+#: ../clients/common/settings-docs.h.in:173
- msgid ""
- "A universally unique identifier for the connection, for example generated "
- "with libuuid. It should be assigned when the connection is created, and "
-@@ -7009,7 +7221,7 @@ msgid ""
- "contains only hexadecimal characters and \"-\")."
- msgstr "この接続に対するユニバーサル一意識別子。たとえば、libuuid で生成されます。これは、接続が作成されたときに割り当てられる必要があり、接続が同じネットワークに適用されている場合に限り変更しません。たとえば、これは、\"id\" プロパティーまたは NMSettingIP4Config が変更する場合は変更しませんが、Wi-Fi SSID、モバイルのブロードバンドネットワークプロバイダー、または \"type\" プロパティーが変更する場合には再作成が必要になる場合があります。UUID のフォーマットは \"2815492f-7e56-435e-b2e9-246bd7cdc664\" (16 進数の文字と \"-\" だけが含まれる) になります。"
-
--#: ../clients/common/settings-docs.h.in:156
-+#: ../clients/common/settings-docs.h.in:174
- msgid ""
- "Timeout in milliseconds to wait for device at startup. During boot, devices "
- "may take a while to be detected by the driver. This property will cause to "
-@@ -7020,7 +7232,7 @@ msgid ""
- "currently has the same meaning as no wait time."
- msgstr "デバイス起動時の待ち時間はミリ秒単位でタイムアウト。起動時、ドライバーがデバイスを検出するまでに時間がかかる場合があります。このプロパティーが原因で、NetworkManager-wait-online.service および nm-online がデバイスに表示するチャンスを与えることが遅くなります。このプロパティーは、待機するデバイスを特定する際に、 NMSettingConnection:interface-name とのみ機能する点に注意してください。値が 0 の場合は待ち時間はありません。デフォルト値は -1 で、これは現時点で待ち時間なしと同じ意味になります。"
-
--#: ../clients/common/settings-docs.h.in:157
-+#: ../clients/common/settings-docs.h.in:175
- msgid ""
- "The trust level of a the connection. Free form case-insensitive string (for "
- "example \"Home\", \"Work\", \"Public\"). NULL or unspecified zone means the "
-@@ -7029,53 +7241,53 @@ msgid ""
- "takes effect immediately."
- msgstr "接続のトラストレベル。自由形式で、大文字と小文字を区別しない文字列 (たとえば \"Home\"、\"Work\"、\"Public\")。NULL にするか、ゾーンを指定しないと、接続は、ファイアウォールで定義したデフォルトゾーンに設定されます。現在アクティブな接続でこのプロパティーをアップデートすると、接続はすぐに有効になります。"
-
--#: ../clients/common/settings-docs.h.in:158
-+#: ../clients/common/settings-docs.h.in:176
- msgid ""
- "Specifies the NMSettingDcbFlags for the DCB FCoE application. Flags may be "
- "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
- "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
- msgstr "DCB FCoE アプリケーションには NMSettingDcbFlags を指定します。フラグは、NM_SETTING_DCB_FLAG_ENABLE (0x1)、NM_SETTING_DCB_FLAG_ADVERTISE (0x2)、および NM_SETTING_DCB_FLAG_WILLING (0x4) から組み合わせることができます。"
-
--#: ../clients/common/settings-docs.h.in:159
-+#: ../clients/common/settings-docs.h.in:177
- msgid "The FCoE controller mode; either \"fabric\" (default) or \"vn2vn\"."
- msgstr "FCoE コントローラーモード; \"fabric\" (デフォルト) または \"vn2vn\" のいずれかになります。"
-
--#: ../clients/common/settings-docs.h.in:160
-+#: ../clients/common/settings-docs.h.in:178
- msgid ""
- "The highest User Priority (0 - 7) which FCoE frames should use, or -1 for "
- "default priority. Only used when the \"app-fcoe-flags\" property includes "
- "the NM_SETTING_DCB_FLAG_ENABLE (0x1) flag."
- msgstr "FCoE フレームが使用するユーザーの最高優先度 (0 - 7)、もしくは -1 (デフォルトの優先度)。\"app-fcoe-flags\" プロパティーには NM_SETTING_DCB_FLAG_ENABLE (0x1) フラグを含む場合に限り使用されます。"
-
--#: ../clients/common/settings-docs.h.in:161
-+#: ../clients/common/settings-docs.h.in:179
- msgid ""
- "Specifies the NMSettingDcbFlags for the DCB FIP application. Flags may be "
- "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
- "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
- msgstr "DCB FIP アプリケーションに NMSettingDcbFlags を指定します。フラグは、NM_SETTING_DCB_FLAG_ENABLE (0x1)、NM_SETTING_DCB_FLAG_ADVERTISE (0x2)、および NM_SETTING_DCB_FLAG_WILLING (0x4) から組み合わせることができます。"
-
--#: ../clients/common/settings-docs.h.in:162
-+#: ../clients/common/settings-docs.h.in:180
- msgid ""
- "The highest User Priority (0 - 7) which FIP frames should use, or -1 for "
- "default priority. Only used when the \"app-fip-flags\" property includes "
- "the NM_SETTING_DCB_FLAG_ENABLE (0x1) flag."
- msgstr "FIP フレームが使用するユーザーの最高優先度 (0 - 7)、もしくは -1 (デフォルトの優先度)。\"app-fip-flags\" プロパティーに NM_SETTING_DCB_FLAG_ENABLE (0x1) フラグを含める場合に限り使用します。"
-
--#: ../clients/common/settings-docs.h.in:163
-+#: ../clients/common/settings-docs.h.in:181
- msgid ""
- "Specifies the NMSettingDcbFlags for the DCB iSCSI application. Flags may be "
- "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
- "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
- msgstr "DCB iSCSI アプリケーションに NMSettingDcbFlags を指定します。フラグは、NM_SETTING_DCB_FLAG_ENABLE (0x1)、NM_SETTING_DCB_FLAG_ADVERTISE (0x2)、および NM_SETTING_DCB_FLAG_WILLING (0x4) から組み合わせることができます。"
-
--#: ../clients/common/settings-docs.h.in:164
-+#: ../clients/common/settings-docs.h.in:182
- msgid ""
- "The highest User Priority (0 - 7) which iSCSI frames should use, or -1 for "
- "default priority. Only used when the \"app-iscsi-flags\" property includes "
- "the NM_SETTING_DCB_FLAG_ENABLE (0x1) flag."
- msgstr "iSCSI フレームが使用するユーザーの最高優先度 (0 - 7)、もしくは -1 (デフォルトの優先度)。\"app-iscsi-flags\" プロパティーに NM_SETTING_DCB_FLAG_ENABLE (0x1) フラグを追加する場合に限り使用します。"
-
--#: ../clients/common/settings-docs.h.in:165
-+#: ../clients/common/settings-docs.h.in:183
- 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 "
-@@ -7084,21 +7296,21 @@ msgid ""
- "percents."
- msgstr "8 個の uint 値の配列。配列のインデックスはユーザーの優先度 (0 - 7) に対応します。値は、優先度が割り当てられているグループの帯域幅の中から、その優先度が使用するパーセンテージを示します。グループ内の合計を 100% にする必要があります。"
-
--#: ../clients/common/settings-docs.h.in:166
-+#: ../clients/common/settings-docs.h.in:184
- msgid ""
- "An array of 8 boolean values, where the array index corresponds to the User "
- "Priority (0 - 7) and the value indicates whether or not the corresponding "
- "priority should transmit priority pause."
- msgstr "8 個のブール値の配列。配列のインデックスは、ユーザーの優先度 (0 - 7) に対応します。値は、対応する優先度が、優先度の停止を送信するかどうかを示します。"
-
--#: ../clients/common/settings-docs.h.in:167
-+#: ../clients/common/settings-docs.h.in:185
- msgid ""
- "Specifies the NMSettingDcbFlags for DCB Priority Flow Control (PFC). Flags "
- "may be any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
- "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
- msgstr "DCB 優先フロー制御 (PFC) に NMSettingDcbFlags を指定します。フラグは、NM_SETTING_DCB_FLAG_ENABLE (0x1)、NM_SETTING_DCB_FLAG_ADVERTISE (0x2)、および NM_SETTING_DCB_FLAG_WILLING (0x4) から組み合わせることができます。"
-
--#: ../clients/common/settings-docs.h.in:168
-+#: ../clients/common/settings-docs.h.in:186
- 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 "
-@@ -7106,35 +7318,35 @@ msgid ""
- "values must total 100 percents."
- msgstr "8 個の uint 値の配列。配列のインデックスは、優先度グループ ID (0 - 7) に対応します。値は、そのグループに割り当てられたリンク帯域幅のパーセンテージを示します。使用できる値は 0 - 100 で、合計を 100 パーセントにする必要があります。"
-
--#: ../clients/common/settings-docs.h.in:169
-+#: ../clients/common/settings-docs.h.in:187
- msgid ""
- "Specifies the NMSettingDcbFlags for DCB Priority Groups. Flags may be any "
- "combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
- "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
- msgstr "DCB 優先度グループの NMSettingDcbFlags を指定します。フラグは、NM_SETTING_DCB_FLAG_ENABLE (0x1)、NM_SETTING_DCB_FLAG_ADVERTISE (0x2)、および NM_SETTING_DCB_FLAG_WILLING (0x4) から組み合わせることができます。"
-
--#: ../clients/common/settings-docs.h.in:170
-+#: ../clients/common/settings-docs.h.in:188
- msgid ""
- "An array of 8 uint values, where the array index corresponds to the User "
- "Priority (0 - 7) and the value indicates the Priority Group ID. Allowed "
- "Priority Group ID values are 0 - 7 or 15 for the unrestricted group."
- msgstr "8 つの uint 値の配列。配列のインデックスはユーザーの優先度 (0 - 7) に対応します。値は優先度グループ ID を示します。使用できる優先度グループ ID の値は 0 - 7 で、15 にすると無制限グループになります。"
-
--#: ../clients/common/settings-docs.h.in:171
-+#: ../clients/common/settings-docs.h.in:189
- msgid ""
- "An array of 8 boolean values, where the array index corresponds to the User "
- "Priority (0 - 7) and the value indicates whether or not the priority may use "
- "all of the bandwidth allocated to its assigned group."
- msgstr "8 個のブール値の配列。配列のインデックスはユーザーの優先度 (0 - 7) に対応します。値は、その優先度を割り当てたグループに割り当てられたすべての帯域幅を、その優先度が使用するかどうかを示します。"
-
--#: ../clients/common/settings-docs.h.in:172
-+#: ../clients/common/settings-docs.h.in:190
- msgid ""
- "An array of 8 uint values, where the array index corresponds to the User "
- "Priority (0 - 7) and the value indicates the traffic class (0 - 7) to which "
- "the priority is mapped."
- msgstr "8 uint 値の配列。配列のインデックスはユーザーの優先度 (0 - 7) に対応します。値は、優先度がマッピングされるトラフィッククラス (0 - 7) を示しています。"
-
--#: ../clients/common/settings-docs.h.in:173
-+#: ../clients/common/settings-docs.h.in:191
- 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 "
-@@ -7145,27 +7357,27 @@ msgid ""
- "14.9."
- msgstr "GSM ベースのネットワークでデータセッションを確立する際に使用する APN を指定する GPRS アクセスポイント名。この APN は、しばしば、ネットワーク利用料金の支払い方法と、インターネットにアクセスするかもしくはプロバイダー固有のウォールドガーデンだけにアクセスするかを決定します。したがって、ユーザーのモバイルブロードバンドプランに対して正しい APN を使用することが重要です。APN の文字列は、a- z と 0 - 9 だけが使用でき、GSM 03.60 セクション 14.9 に準拠します。"
-
--#: ../clients/common/settings-docs.h.in:174
-+#: ../clients/common/settings-docs.h.in:192
- msgid ""
- "When TRUE, the settings such as APN, username, or password will default to "
- "values that match the network the modem will register to in the Mobile "
- "Broadband Provider database."
- msgstr "TRUE の場合、APN、ユーザー名、または パスワードなどの設定は、モデムがモバイルブロードバンドプロバイダーデータベースに登録するネットワークに一致する値にデフォルト設定されます。"
-
--#: ../clients/common/settings-docs.h.in:175
-+#: ../clients/common/settings-docs.h.in:193
- msgid ""
- "The device unique identifier (as given by the WWAN management service) which "
- "this connection applies to. If given, the connection will only apply to the "
- "specified device."
- msgstr "(WWAN 管理サービスで指定されたように) この接続が適用されるデバイスの一意識別子。これを指定すると、接続は、指定したデバイスにのみ適用されます。"
-
--#: ../clients/common/settings-docs.h.in:176
-+#: ../clients/common/settings-docs.h.in:194
- 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:178
-+#: ../clients/common/settings-docs.h.in:196
- msgid ""
- "The Network ID (GSM LAI format, ie MCC-MNC) to force specific network "
- "registration. If the Network ID is specified, NetworkManager will attempt "
-@@ -7174,20 +7386,20 @@ msgid ""
- "the device is not otherwise possible."
- msgstr "特定のネットワーク登録を強制するネットワーク ID (GSM LAI フォーマット MCC-MNC)。ネットワーク ID を指定すると、NetworkManager は、指定したネットワークにのみデバイスの登録を強制しようとします。これは、デバイスのローミングを阻止するために使用できます。 これ以外に、ローミングを直接制御することはできません。"
-
--#: ../clients/common/settings-docs.h.in:179
-+#: ../clients/common/settings-docs.h.in:197
- 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:182
-+#: ../clients/common/settings-docs.h.in:200
- msgid ""
- "If the SIM is locked with a PIN it must be unlocked before any other "
- "operations are requested. Specify the PIN here to allow operation of the "
- "device."
- msgstr "PIN で SIM がロックされた場合は、その他の操作を行う前にアンロックする必要があります。ここで PIN を指定すると、デバイスの操作が可能になります。"
-
--#: ../clients/common/settings-docs.h.in:184
-+#: ../clients/common/settings-docs.h.in:202
- 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 "
-@@ -7195,7 +7407,7 @@ msgid ""
- "the given identifier."
- msgstr "(WWAN 管理サービスによって指定されたように) この接続が適用される SIM カードの一意識別子。これを指定すると、接続は、\"device-id\" にも許可されているデバイスに適用されます。これには、指定した識別子に一致する SIM カードが含まれます。"
-
--#: ../clients/common/settings-docs.h.in:185
-+#: ../clients/common/settings-docs.h.in:203
- msgid ""
- "A MCC/MNC string like \"310260\" or \"21601\" identifying the specific "
- "mobile network operator which this connection applies to. If given, the "
-@@ -7203,39 +7415,39 @@ msgid ""
- "id\" which contains a SIM card provisioned by the given operator."
- msgstr "\"310260\"、\"21601\" などの MCC/MNC 文字列。この接続が適用される特定のモバイルネットワークオペレーターを識別します。これを指定すると、接続は、\"device-id\" および \"sim-id\" で許可されるデバイスにも適用されます。これには、指定したオペレーターから提供される SIM カードが含まれます。"
-
--#: ../clients/common/settings-docs.h.in:187
-+#: ../clients/common/settings-docs.h.in:205
- msgid ""
- "If specified, this connection will only apply to the IPoIB device whose "
- "permanent MAC address matches. This property does not change the MAC address "
- "of the device (i.e. MAC spoofing)."
- msgstr "指定すると、この接続は永続的な MAC アドレスに一致する IPoIB デバイスにのみ適用されます。このプロパティーはデバイスの MAC アドレスを変更しません (MAC スプーフィング)。"
-
--#: ../clients/common/settings-docs.h.in:189
-+#: ../clients/common/settings-docs.h.in:207
- msgid ""
- "The InfiniBand P_Key to use for this device. A value of -1 means to use the "
- "default P_Key (aka \"the P_Key at index 0\"). Otherwise it is a 16-bit "
- "unsigned integer, whose high bit is set if it is a \"full membership\" P_Key."
- msgstr "このデバイスに使用する InfiniBand P_Key。-1 は、デフォルトの P_Key (別名 \"インデックス 0 の P_Key\") を使用することを示しています。 もしくは、16 ビットの署名なし整数です。\"完全メンバーシップ\" の P_Key の場合は、その高ビットが設定されます。"
-
--#: ../clients/common/settings-docs.h.in:190
-+#: ../clients/common/settings-docs.h.in:208
- msgid ""
- "The interface name of the parent device of this device. Normally NULL, but "
- "if the \"p_key\" property is set, then you must specify the base device by "
- "setting either this property or \"mac-address\"."
- msgstr "このデバイスの親デバイスのインターフェース名。通常は NULL ですが、\"p_key\" プロパティーが設定されると、このプロパティーまたは \"mac-address\" のいずれかを設定して、ベースデバイスを指定する必要があります。"
-
--#: ../clients/common/settings-docs.h.in:191
-+#: ../clients/common/settings-docs.h.in:209
- msgid ""
- "The IP-over-InfiniBand transport mode. Either \"datagram\" or \"connected\"."
- msgstr "IPoIB トランスポートモード。\"datagram\" または \"connected\" のいずれかになります。"
-
--#: ../clients/common/settings-docs.h.in:192
-+#: ../clients/common/settings-docs.h.in:210
- 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:193
-+#: ../clients/common/settings-docs.h.in:211
- msgid ""
- "Tunnel flags. Currently the following values are supported: "
- "NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT (0x1), "
-@@ -7246,78 +7458,78 @@ msgid ""
- "for IPv6 tunnels."
- msgstr "トンネルフラグ。現在、以下の値がサポートされています。 NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT (0x1), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_TCLASS (0x2), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FLOWLABEL (0x4), NM_IP_TUNNEL_FLAG_IP6_MIP6_DEV (0x8), NM_IP_TUNNEL_FLAG_IP6_RCV_DSCP_COPY (0x10), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK (0x20). これらは、IPv6 トンネルのみに有効です。"
-
--#: ../clients/common/settings-docs.h.in:194
-+#: ../clients/common/settings-docs.h.in:212
- msgid ""
- "The flow label to assign to tunnel packets. This property applies only to "
- "IPv6 tunnels."
- msgstr "トンネルパケットに割り当てるフローラベル。このプロパティーは、IPv6 にのみ適用されます。"
-
--#: ../clients/common/settings-docs.h.in:195
-+#: ../clients/common/settings-docs.h.in:213
- msgid ""
- "The key used for tunnel input packets; the property is valid only for "
- "certain tunnel modes (GRE, IP6GRE). If empty, no key is used."
- msgstr "トンネル入力パケットに使用されるキー。このプロパティーは、特定のトンネルモード (GRE、IP6GRE) に対してのみ有効です。空にすると、キーは使用されません。"
-
--#: ../clients/common/settings-docs.h.in:196
-+#: ../clients/common/settings-docs.h.in:214
- 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:197
-+#: ../clients/common/settings-docs.h.in:215
- 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:198
-+#: ../clients/common/settings-docs.h.in:216
- 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:199
-+#: ../clients/common/settings-docs.h.in:217
- msgid ""
- "The key used for tunnel output packets; the property is valid only for "
- "certain tunnel modes (GRE, IP6GRE). If empty, no key is used."
- msgstr "トンネル出力パケットに使用されるキー。このプロパティーは、特定のトンネルモード (GRE、IP6GRE) に対してのみ有効です。空にすると、キーは使用されません。"
-
--#: ../clients/common/settings-docs.h.in:200
-+#: ../clients/common/settings-docs.h.in:218
- msgid ""
- "If given, specifies the parent interface name or parent connection UUID the "
- "new device will be bound to so that tunneled packets will only be routed via "
- "that interface."
- msgstr "指定した場合は、トンネル化したパケットにだけそのインターフェースから向かうように、新しいデバイスがバインドされる親インターフェース名または親接続の UUID を指定します。"
-
--#: ../clients/common/settings-docs.h.in:201
-+#: ../clients/common/settings-docs.h.in:219
- msgid "Whether to enable Path MTU Discovery on this tunnel."
- msgstr "このトンネルで、パス MTU 検出を有効にするかどうか。"
-
--#: ../clients/common/settings-docs.h.in:202
-+#: ../clients/common/settings-docs.h.in:220
- 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:203
-+#: ../clients/common/settings-docs.h.in:221
- 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:204
-+#: ../clients/common/settings-docs.h.in:222
- 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:205
--#: ../clients/common/settings-docs.h.in:228
-+#: ../clients/common/settings-docs.h.in:223
-+#: ../clients/common/settings-docs.h.in:246
- msgid "Array of IP addresses."
- msgstr "IP アドレスの配列。"
-
--#: ../clients/common/settings-docs.h.in:206
--#: ../clients/common/settings-docs.h.in:229
-+#: ../clients/common/settings-docs.h.in:224
-+#: ../clients/common/settings-docs.h.in:247
- msgid ""
- "Timeout in milliseconds used to check for the presence of duplicate IP "
- "addresses on the network. If an address conflict is detected, the "
-@@ -7327,7 +7539,7 @@ msgid ""
- "in milliseconds. The property is currently implemented only for IPv4."
- msgstr "ネットワーク上で IP アドレスの重複を確認するのに使用されるタイムアウト (ミリ秒単位)。アドレスの競合が検出されると、アクティベーションは失敗します。この値をゼロにすると、重複アドレスの検出は行われません。-1 は、デフォルト値 (設定 ipvx.dad-timeout をオーバーライドまたはゼロのいずれか) になります。値がゼロより大きい場合はタイムアウト (ミリ秒) になります。現在、このプロパティーは IPv4 にのみ実装されています。"
-
--#: ../clients/common/settings-docs.h.in:207
-+#: ../clients/common/settings-docs.h.in:225
- 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 "
-@@ -7350,23 +7562,23 @@ msgid ""
- "plugin."
- msgstr "DHCP サーバーに送られる文字列。DHCP サーバーが DHCP リースとオプションをカスタマイズするのに使用するローカルマシンを識別します。プロパティーが 16 進数 ('aa:bb:cc') の場合は、バイナリーのクライアント ID として解釈されます。この場合、最初のバイトは、RFC 2132 のセクション 9.14 に指定されているように、'type' フィールドとなり、残りのバイトはハードウェアアドレス ('01:xx:xx:xx:xx:xx:xx' など。1 は Ethernet の ARP タイプで、残りは MAC アドレス) になります。文字列が 16 進数ではない場合は、非ハードウェアアドレスのクライアント ID と見なされ、'type' フィールドは 0 に設定されます。特別値である \"mac\" および \"perm-mac\" はサポートされています。これらは、デバイスの現在または永続的 MAC アドレスを使用して、type ethernet (01) でクライアント識別子を生成します。現在、これらのオプションは、ethernet リンクでのみ有効です。特別値 \"duid\" は、IAID および /etc/machine-id としてインターフェース名のハッシュに基づいた RFC4361 準拠のクライアント識別子を生成します。特別値 \"stable\" は、stable-id (connection.stable-id を参照) およびホストごとのキーを基に、type 0 のクライアント識別子を生成するようサポートされています。stable-id を設定する場合は、デバイスごとのキーを取得するために \"${DEVICE}\" または \"${MAC}\" の指定子を含むことをおすすめします。値が設定されない場合は、グローバルに設定されたデフォルトが使用されます。引き続き値が設定されない場合は、デフォルトで DHCP プラグインに依存するよう設定されます。"
-
--#: ../clients/common/settings-docs.h.in:208
-+#: ../clients/common/settings-docs.h.in:226
- msgid ""
- "If the \"dhcp-send-hostname\" property is TRUE, then the specified FQDN will "
- "be sent to the DHCP server when acquiring a lease. This property and \"dhcp-"
- "hostname\" are mutually exclusive and cannot be set at the same time."
- msgstr "\"dhcp-send-hostname\" プロパティーが TRUE の場合は、リースを取得する際に、指定した FQDN が DHCP サーバーに送られます。この優先度および \"dhcp-hostname\" は相互に排他的で、同時に設定できません。"
-
--#: ../clients/common/settings-docs.h.in:209
--#: ../clients/common/settings-docs.h.in:231
-+#: ../clients/common/settings-docs.h.in:227
-+#: ../clients/common/settings-docs.h.in:249
- msgid ""
- "If the \"dhcp-send-hostname\" property is TRUE, then the specified name will "
- "be sent to the DHCP server when acquiring a lease. This property and \"dhcp-"
- "fqdn\" are mutually exclusive and cannot be set at the same time."
- msgstr "\"dhcp-send-hostname\" プロパティーが TRUE の場合は、リースを取得する際に、指定した名前が DHCP サーバーに送られます。このプロパティーと \"dhcp-fqdn\" は相互に排他的で、同時に設定できません。"
-
--#: ../clients/common/settings-docs.h.in:210
--#: ../clients/common/settings-docs.h.in:232
-+#: ../clients/common/settings-docs.h.in:228
-+#: ../clients/common/settings-docs.h.in:250
- msgid ""
- "Flags for the DHCP hostname and FQDN. Currently this property only includes "
- "flags to control the FQDN flags set in the DHCP FQDN option. Supported FQDN "
-@@ -7385,8 +7597,8 @@ msgid ""
- "above are sent in the DHCP requests."
- msgstr "DHCP ホスト名と FQDN のフラグ。現在、このプロパティーには、DHCP FQDN オプションで設定された FQDN フラグを制御するフラグのみが含まれています。サポートされているFQDN フラグは、NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1)、NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2)、および NM_DHCP_HOSTNAME_FLAG_FQDN_NO_UPDATE (0x4) です。FQDN フラグが設定されておらず、NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) が設定されている場合、DHCP FQDN オプションにはフラグが含まれません。または、FQDN フラグが設定されておらず、NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) が設定されていない場合、標準 FQDN フラグはリクエストで設定されます: IPv4 用に NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1) と NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2)、IPv6 用に NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1) となります。このプロパティーがデフォルト値 NM_DHCP_HOSTNAME_FLAG_NONE (0x0) に設定されている場合、NetworkManager 設定でグローバルデフォルトが検索されます。この値が未設定の場合、または NM_DHCP_HOSTNAME_FLAG_NONE (0x0) の場合は、上述した標準 FQDN フラグが DHCP リクエストで送信されます。"
-
--#: ../clients/common/settings-docs.h.in:211
--#: ../clients/common/settings-docs.h.in:233
-+#: ../clients/common/settings-docs.h.in:229
-+#: ../clients/common/settings-docs.h.in:251
- msgid ""
- "A string containing the \"Identity Association Identifier\" (IAID) used by "
- "the DHCP client. The property is a 32-bit decimal value or a special value "
-@@ -7401,8 +7613,8 @@ msgid ""
- "for IPv6 by dhclient, which always derives the IAID from the MAC address."
- msgstr "DHCP クライアントが使用する \"Identity Association Identifier\" (IAID) を含む文字列。プロパティーは、32 ビットの 10 進数値、または \"mac\"、\"perm-mac\"、\"ifname\"、および \"stable\" のうちの特別な値になります。\"mac\" (または \"perm-mac\") に設定されると、現在の (または永続的な) MAC アドレスの最後の 4 バイトが IAID として使用されます。\"ifname\" に設定すると、IAID はインターフェイス名をハッシュすることによって計算されます。特別な値の \"stable\" を使用して、stable-id (connection.stable-id を参照)、ホストごとのキー、およびインターフェイス名に基づいて IAID を生成できます。プロパティーが設定されていない場合は、グローバル設定の値が使用されます。デフォルトのグローバル設定がない場合は、IAID は \"ifname\" と見なされます。現時点では、このプロパティーは dhclient によって IPv6 に対して無視される点に注意してください。dhclient は常に、MAC アドレスから IAID を取得します。"
-
--#: ../clients/common/settings-docs.h.in:212
--#: ../clients/common/settings-docs.h.in:234
-+#: ../clients/common/settings-docs.h.in:230
-+#: ../clients/common/settings-docs.h.in:252
- 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 "
-@@ -7411,54 +7623,66 @@ msgid ""
- "of the computer is sent."
- msgstr "TRUE の場合、リースを取得する際にホスト名が DHCP サーバーに送信されます。一部の DHCP サーバーはこのホスト名を使用して DNS データベースをアップデートし、コンピューターの静的ホスト名を提供します。\"dhcp-hostname\" プロパティーが NULL で、このプロパティーが TRUE の場合は、そのコンピューターの現在の永続ホスト名が送られます。"
-
--#: ../clients/common/settings-docs.h.in:213
--#: ../clients/common/settings-docs.h.in:235
--msgid "A timeout for a DHCP transaction in seconds."
--msgstr "DHCP トランザクションのタイムアウト (秒単位)。"
-+#: ../clients/common/settings-docs.h.in:231
-+#: ../clients/common/settings-docs.h.in:253
-+msgid ""
-+"A timeout for a DHCP transaction in seconds. If zero (the default), a "
-+"globally configured default is used. If still unspecified, a device specific "
-+"timeout is used (usually 45 seconds). Set to 2147483647 (MAXINT32) for "
-+"infinity."
-+msgstr "DHCP トランザクションのタイムアウトを秒単位で指定します。ゼロ (デフォルト) の場合は、グローバルに設定されたデフォルトが使用されます。それでも指定されない場合は、デバイス固有のタイムアウトが使用されます (通常は45秒)。2147483647 (MAXINT32) に設定すると無限大になります。"
-
--#: ../clients/common/settings-docs.h.in:214
--#: ../clients/common/settings-docs.h.in:236
-+#: ../clients/common/settings-docs.h.in:232
-+#: ../clients/common/settings-docs.h.in:254
- msgid "Array of IP addresses of DNS servers."
- msgstr "DNS サーバーの IP アドレス配列。"
-
--#: ../clients/common/settings-docs.h.in:215
--#: ../clients/common/settings-docs.h.in:237
-+#: ../clients/common/settings-docs.h.in:233
-+#: ../clients/common/settings-docs.h.in:255
- msgid ""
- "Array of DNS options as described in man 5 resolv.conf. NULL means that the "
- "options are unset and left at the default. In this case NetworkManager will "
--"use default options. This is distinct from an empty list of properties."
--msgstr "DNS オプションの配列。man 5 resolv.conf で説明されています。NULL は、オプションが設定されていないか、デフォルトになっていることを示しています。この場合、NetworkManager はデフォルトのオプションを使用し、プロパティーのリストが空になっている場合とは区別されます。"
-+"use default options. This is distinct from an empty list of properties. The "
-+"currently supported options are \"attempts\", \"debug\", \"edns0\", "
-+"\"inet6\", \"ip6-bytestring\", \"ip6-dotint\", \"ndots\", \"no-check-names"
-+"\", \"no-ip6-dotint\", \"no-reload\", \"no-tld-query\", \"rotate\", \"single-"
-+"request\", \"single-request-reopen\", \"timeout\", \"trust-ad\", \"use-vc\". "
-+"The \"trust-ad\" setting is only honored if the profile contributes name "
-+"servers to resolv.conf, and if all contributing profiles have \"trust-ad\" "
-+"enabled."
-+msgstr "man 5 の resolv.conf で説明されている DNS オプションの配列。NULL は、オプションが設定されておらず、デフォルトのままになっていることを意味します。この場合、NetworkManager はデフォルトのオプションを使用します。これは空のプロパティのリストとは異なります。現在サポートされているオプションは、\"attends\"、\"debug\"、\"edns0\"、\"inet6\"、\"ip6-bytestring\"、\"ip6-dotint\"、\"ndots\"、\"no-check-names\"、\"no-ip6-dotint\"、\"no-reload\"、\"no-tld-query\"、\"rotate\"、\"single-request\"、\"single-request-reopen\"、\"timeout\"、\"trust-ad\"、\"use-vc\"。trust-ad\" 設定は、そのプロファイルがresolv.confにネームサーバーを投稿している場合にのみ有効であり、投稿しているすべてのプロファイルが\"trust-ad\"を有効にしている場合にのみ有効になります。"
-
--#: ../clients/common/settings-docs.h.in:216
--#: ../clients/common/settings-docs.h.in:238
-+#: ../clients/common/settings-docs.h.in:234
-+#: ../clients/common/settings-docs.h.in:256
- msgid ""
- "DNS servers priority. The relative priority for DNS servers specified by "
- "this setting. A lower value is better (higher priority). Zero selects a "
- "globally configured default value. If the latter is missing or zero too, it "
--"defaults to 50 for VPNs and 100 for other connections. Note that the "
--"priority is to order DNS settings for multiple active connections. It does "
--"not disambiguate multiple DNS servers within the same connection profile. "
--"When using dns=default, servers with higher priority will be on top of "
--"resolv.conf. To prioritize a given server over another one within the same "
--"connection, just specify them in the desired order. When multiple devices "
--"have configurations with the same priority, the one with an active default "
--"route will be preferred. Negative values have the special effect of "
--"excluding other configurations with a greater priority value; so in presence "
--"of at least a negative priority, only DNS servers from connections with the "
--"lowest priority value will be used. When using a DNS resolver that supports "
--"Conditional Forwarding as dns=dnsmasq or dns=systemd-resolved, each "
--"connection is used to query domains in its search list. Queries for domains "
--"not present in any search list are routed through connections having the "
--"'~.' special wildcard domain, which is added automatically to connections "
--"with the default route (or can be added manually). When multiple "
--"connections specify the same domain, the one with the highest priority "
--"(lowest numerical value) wins. If a connection specifies a domain which is "
--"subdomain of another domain with a negative DNS priority value, the "
--"subdomain is ignored."
--msgstr "DNS サーバー優先度。この設定により指定された DNS サーバーの関連優先度。値が低い方が良い (優先度が高い) です。値がゼロの場合、グローバルに設定されたデフォルト値が使用されます。グローバルに設定されたデフォルト値がないか、または同じくゼロの場合、デフォルト値 (VPN の場合は 50、その他の接続の場合は 100) を選択します。複数のアクティブな接続に対する DNS 設定の順番の設定を優先するよう注意してください。同じ接続プロファイルにある複数の DNS サーバーの曖昧さは解消されません。dns=default を使用する場合、優先度の高いサーバーは resolv.conf の上に置かれます。同じ接続内で、特定のサーバーを別のサーバーよりも優先したい場合は、優先順位を指定します。複数のデバイスで優先度が同じものがある場合は、アクティブなデフォルトルートを持つものが優先されます。負の値は、より大きな優先度を持つその他の設定を除外します。したがって、優先度が負の場合は、一番低い優先度が設定されている接続の DNS サーバーだけが使用されます。dns=dnsmasq または dns=systemd-resolved として split-DNS をサポートする DNS リゾルバーを使用する際、各接続を使用して、検索リストのドメインをクエリーします。検索リストにないドメインのクエリーは、特別なワイルドカードドメインである '~.' を保持する接続でルーティングされます。'~.' は、デフォルトのルートで接続に自動的に追加されます (または手動での追加も可能です)。複数の接続が同じドメインを指定した場合、優先度が最も高い接続 (数値が最も低い接続) が選ばれます。接続がドメインを指定し、そのドメインが、DNS の優先度の値が負である別のドメインのサブドメインである場合、そのサブドメインは無視されます。"
-+"defaults to 50 for VPNs (including WireGuard) and 100 for other connections. "
-+"Note that the priority is to order DNS settings for multiple active "
-+"connections. It does not disambiguate multiple DNS servers within the same "
-+"connection profile. When using dns=default, servers with higher priority "
-+"will be on top of resolv.conf. To prioritize a given server over another "
-+"one within the same connection, just specify them in the desired order. "
-+"When multiple devices have configurations with the same priority, VPNs will "
-+"be considered first, then devices with the best (lowest metric) default "
-+"route and then all other devices. Negative values have the special effect "
-+"of excluding other configurations with a greater priority value; so in "
-+"presence of at least one negative priority, only DNS servers from "
-+"connections with the lowest priority value will be used. When using a DNS "
-+"resolver that supports Conditional Forwarding as dns=dnsmasq or dns=systemd-"
-+"resolved, each connection is used to query domains in its search list. "
-+"Queries for domains not present in any search list are routed through "
-+"connections having the '~.' special wildcard domain, which is added "
-+"automatically to connections with the default route (or can be added "
-+"manually). When multiple connections specify the same domain, the one with "
-+"the highest priority (lowest numerical value) wins. If a connection "
-+"specifies a domain which is subdomain of another domain with a negative DNS "
-+"priority value, the subdomain is ignored."
-+msgstr "DNS サーバー優先度。この設定により指定された DNS サーバーの関連優先度。値が低い方が良い (優先度が高い) です。値がゼロの場合、グローバルに設定されたデフォルト値が使用されます。グローバルに設定されたデフォルト値がないか、または同じくゼロの場合、デフォルト値 (VPN (WireGuard を含む) の場合は 50、その他の接続の場合は 100) を選択します。複数のアクティブな接続に対する DNS 設定の順番の設定を優先するよう注意してください。同じ接続プロファイルにある複数の DNS サーバーの曖昧さは解消されません。dns=default を使用する場合、優先度の高いサーバーは resolv.conf の上に置かれます。同じ接続内で、特定のサーバーを別のサーバーよりも優先したい場合は、優先順位を指定します。複数のデバイスで優先度が同じものがある場合は、VPN が最初に考慮され、次に最適な (メトリクスが最低のもの) デフォルトルートが考慮されます。そして最後にすべてのデバイスが考慮されます。負の値は、より大きな優先度を持つその他の設定を除外します。したがって、優先度が負の場合は、一番低い優先度が設定されている接続の DNS サーバーだけが使用されます。dns=dnsmasq または dns=systemd-resolved として split-DNS をサポートする DNS リゾルバーを使用する際、各接続を使用して、検索リストのドメインをクエリーします。検索リストにないドメインのクエリーは、特別なワイルドカードドメインである '~.' を保持する接続でルーティングされます。'~.' は、デフォルトのルートで接続に自動的に追加されます (または手動での追加も可能です)。複数の接続が同じドメインを指定した場合、優先度が最も高い接続 (数値が最も低い接続) が選ばれます。接続がドメインを指定し、そのドメインが、DNS の優先度の値が負である別のドメインのサブドメインである場合、そのサブドメインは無視されます。"
-
--#: ../clients/common/settings-docs.h.in:217
--#: ../clients/common/settings-docs.h.in:239
-+#: ../clients/common/settings-docs.h.in:235
-+#: ../clients/common/settings-docs.h.in:257
- msgid ""
- "Array of DNS search domains. Domains starting with a tilde ('~') are "
- "considered 'routing' domains and are used only to decide the interface over "
-@@ -7466,15 +7690,19 @@ msgid ""
- "host names."
- msgstr "DNS 検索ドメインの配列。チルダ ('~') で始まるドメインは、ドメインを 'routing' していると考えられ、どのインターフェースにクエリーを転送すべきかを決める際にのみ使用されます。これらは、非修飾ホスト名を完成させるためには使用されません。"
-
--#: ../clients/common/settings-docs.h.in:218
--#: ../clients/common/settings-docs.h.in:240
-+#: ../clients/common/settings-docs.h.in:236
-+#: ../clients/common/settings-docs.h.in:258
- msgid ""
- "The gateway associated with this configuration. This is only meaningful if "
--"\"addresses\" is also set."
--msgstr "ゲートウェイは、この設定に関連付けられています。\"アドレス\" とともに設定した場合に限り有効になります。"
-+"\"addresses\" is also set. The gateway's main purpose is to control the next "
-+"hop of the standard default route on the device. Hence, the gateway property "
-+"conflicts with \"never-default\" and will be automatically dropped if the IP "
-+"configuration is set to never-default. As an alternative to set the gateway, "
-+"configure a static default route with /0 as prefix length."
-+msgstr "この設定に関連付けられたゲートウェイ。これは \"address\" も設定されている場合にのみ意味があります。ゲートウェイの主な目的は、デバイス上の標準デフォルトルートの次のホップを制御することです。したがって、ゲートウェイプロパティーは \"never-default\" と競合し、IP 設定が never-default に設定されている場合は自動的に削除されます。ゲートウェイを設定する代わりに、/0 をプレフィックス長として静的なデフォルトルートを設定します。"
-
--#: ../clients/common/settings-docs.h.in:219
--#: ../clients/common/settings-docs.h.in:241
-+#: ../clients/common/settings-docs.h.in:237
-+#: ../clients/common/settings-docs.h.in:259
- msgid ""
- "When \"method\" is set to \"auto\" and this property to TRUE, automatically "
- "configured nameservers and search domains are ignored and only nameservers "
-@@ -7482,16 +7710,16 @@ msgid ""
- "if any, are used."
- msgstr "\"method\" を \"auto\" に設定し、このプロパティーを TRUE に設定すると、自動的に設定されるネームサーバーと検索ドメインは無視されます。\"dns\" プロパティーと \"dns-search\" プロパティーに指定したネームサーバーと検索ドメインだけが使用されます。"
-
--#: ../clients/common/settings-docs.h.in:220
--#: ../clients/common/settings-docs.h.in:242
-+#: ../clients/common/settings-docs.h.in:238
-+#: ../clients/common/settings-docs.h.in:260
- msgid ""
- "When \"method\" is set to \"auto\" and this property to TRUE, automatically "
- "configured routes are ignored and only routes specified in the \"routes\" "
- "property, if any, are used."
- msgstr "\"method\" を \"auto\" に設定し、このプロパティーを TRUE に設定すると、自動的に設定したルートは無視され、ルートを \"routes\" プロパティーに指定した場合は、そのルートだけが使用されます。"
-
--#: ../clients/common/settings-docs.h.in:221
--#: ../clients/common/settings-docs.h.in:244
-+#: ../clients/common/settings-docs.h.in:239
-+#: ../clients/common/settings-docs.h.in:262
- msgid ""
- "If TRUE, allow overall network configuration to proceed even if the "
- "configuration specified by this property times out. Note that at least one "
-@@ -7501,8 +7729,8 @@ msgid ""
- "if IPv4 configuration fails but IPv6 configuration completes successfully."
- msgstr "TRUE の場合は、このプロパティーで指定した設定がタイムアウトになっても、全体のネットワーク設定は続行します。IP 設定が最低 1 つは成功する必要があり、成功しないとネットワーク全体の設定が失敗します。たとえば、IPv6 限定のネットワークにおいて、NMSettingIP4Config でこのプロパティーを TRUE に設定すると、IPv4 設定が失敗し、IPv6 設定が完全に成功しても、全体のネットワーク設定が成功します。"
-
--#: ../clients/common/settings-docs.h.in:222
--#: ../clients/common/settings-docs.h.in:245
-+#: ../clients/common/settings-docs.h.in:240
-+#: ../clients/common/settings-docs.h.in:263
- msgid ""
- "IP configuration method. NMSettingIP4Config and NMSettingIP6Config both "
- "support \"disabled\", \"auto\", \"manual\", and \"link-local\". See the "
-@@ -7518,15 +7746,15 @@ msgid ""
- "the uplink which is shared."
- msgstr "IP 設定方法。NMSettingIP4Config と NMSettingIP6Config はともに \"disabled\"、\"auto\"、\"manual\"、および \"link-local\" をサポートします。その他の値は、サブクラスに関するドキュメントを参照してください。一般的に、\"auto\" 方法では、\"dns\"、\"routes\" などのプロパティーは、自動設定から返された情報に追加する情報を指定します。\"ignore-auto-routes\" プロパティーと \"ignore-auto-dns\" プロパティーは、この動作を修正します。アップストリームのネットワークなしを意味する \"shared\" または \"link-local\" などの方法では、これらのプロパティーを空にする必要があります。IPv4 方法 \"shared\" の場合は、手動で IPv4 アドレスを 1 つ追加して IP サブネットを設定できます。設定しない場合は 10.42.x.0/24 が選択されます。\"shared\" 方法は、共有される uplink ではなく、インターネットをサブネットに共有するインターフェース上で設定される必要があることに注意してください。"
-
--#: ../clients/common/settings-docs.h.in:223
--#: ../clients/common/settings-docs.h.in:246
-+#: ../clients/common/settings-docs.h.in:241
-+#: ../clients/common/settings-docs.h.in:264
- msgid ""
- "If TRUE, this connection will never be the default connection for this IP "
- "type, meaning it will never be assigned the default route by NetworkManager."
- msgstr "TRUE にすると、この接続はこの IP タイプに対するデフォルトの接続にはならないため、NetworkManager によってデフォルトルートに割り当てられません。"
-
--#: ../clients/common/settings-docs.h.in:224
--#: ../clients/common/settings-docs.h.in:247
-+#: ../clients/common/settings-docs.h.in:242
-+#: ../clients/common/settings-docs.h.in:266
- 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 "
-@@ -7537,8 +7765,8 @@ msgid ""
- "mean setting it to 1024. For IPv4, zero is a regular value for the metric."
- msgstr "メトリックを明示的に指定しないルートに対するデフォルトのメトリック。デフォルトの値 -1 は、デバイスタイプに基づいて自動的にメトリックが選択されることを示しています。このメトリックは、明示的なメトリック設定がない動的ルートおよび手動 (静的) ルートに適用されます。IPv6 では、カーネルはゼロ (0) を許可しますが、強制的に 1024 (ユーザーデフォルト) になります。したがって、このプロパティーをゼロに設定すると、実際には 1024 になることに注意してください。IPv4 では、ゼロはメトリックの正則値となります。"
-
--#: ../clients/common/settings-docs.h.in:225
--#: ../clients/common/settings-docs.h.in:248
-+#: ../clients/common/settings-docs.h.in:243
-+#: ../clients/common/settings-docs.h.in:267
- msgid ""
- "Enable policy routing (source routing) and set the routing table used when "
- "adding routes. This affects all routes, including device-routes, IPv4LL, "
-@@ -7555,12 +7783,12 @@ msgid ""
- "tables outside of NetworkManager."
- msgstr "ポリシールーティング (ソースルーティング) を有効にし、ルートの追加時に使用するルーティングテーブルを設定します。これは、device-routes、IPv4LL、DHCP、SLAAC、デフォルトルート、静的ルートなど、すべてのルートに影響します。ただし、静的ルートは、ゼロ以外のルーティングテーブルを明示的に指定することで、この設定を個別に上書きできることに注意してください。ただし、このテーブル設定をゼロのままにすると、グローバル設定から上書きできるようになります。グローバル設定値を適用してからプロパティーをゼロにしても、ポリシールーティングはこの接続のアドレスファミリーに対して無効になります。ポリシールーティングを無効にすると、NetworkManager はすべてのルートをメインテーブルに追加します (ただし、別のテーブルに明示的に設定した静的ルートは除きます)。また、NetworkManager は、メインテーブル以外のテーブルから外部ルートを削除しません。これにより、NetworkManager 以外のルーティングテーブルを管理するための後方互換性を確保します。"
-
--#: ../clients/common/settings-docs.h.in:226
--#: ../clients/common/settings-docs.h.in:249
-+#: ../clients/common/settings-docs.h.in:244
-+#: ../clients/common/settings-docs.h.in:268
- msgid "Array of IP routes."
- msgstr "IP ルートの配列。"
-
--#: ../clients/common/settings-docs.h.in:227
-+#: ../clients/common/settings-docs.h.in:245
- msgid ""
- "Configure method for creating the address for use with RFC4862 IPv6 "
- "Stateless Address Autoconfiguration. The permitted values are: "
-@@ -7582,7 +7810,7 @@ msgid ""
- "affect the temporary addresses configured with this option."
- msgstr "RFC4862 IPv6 ステートレスアドレスの自動設定で使用するアドレスを作成する方法を設定します。利用できる値は NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_EUI64 (0) または NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_STABLE_PRIVACY (1) です。このプロパティーを EUI64 に設定すると、アドレスは、ハードウェアアドレスから取得したインターフェーストークンを使用して生成されます。これにより、アドレスのホスト部分は一定となり、ネットワークを変更する際にホストの存在を追跡できます。インターフェースのハードウェアを交換するとアドレスは変更します。stable-privacy の値は、RFC7217 で指定されているように、接続の stable-id とネットワークアドレスとともに、ホスト固有の秘密鍵で、暗号で保護されているハッシュの使用を有効にします。これにより、アドレスでホストの存在を追跡することはできなくなり、ネットワークインターフェースのハードウェアを交換する際にアドレスが安定します。D-Bus では、addr-gen-mode 設定がないことと、stable-privacy を有効にすることは同じです。keyfile プラグインでは、ディスクに設定がない場合は EUI64 を意味し、プロパティーは以前のバージョンからのアップグレードで変更しません。この設定は、\"ip6-privacy\" プロパティーにより設定されたプライバシー拡張とは異なり、このオプションで設定した一時アドレスには影響しないことに注意してください。"
-
--#: ../clients/common/settings-docs.h.in:230
-+#: ../clients/common/settings-docs.h.in:248
- 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 "
-@@ -7611,7 +7839,7 @@ msgid ""
- "assumed."
- msgstr "DHCP クライアントが、DHCPv6 サーバー (RFC 3315) に識別してもらうために使用する DHCPv6 一意識別子 (DUID) を含む文字列。DUID は、クライアント識別子のオプションにあります。プロパティーが 16 進数 ('aa:bb:cc') の場合は、バイナリーの DUID として解釈され、クライアント識別子のオプションに不透明な値として記入されます。特別値の \"lease\" は、接続のリースファイルから以前使用した DUID を取得します。DUID が見つからず、\"dhclient\" が設定された DHCP クライアントの場合、システム全体の dhclient リースファイル内で DUID を検索します。引き続き DUID が見つからない場合、または別の DHCP クライアントが使用されている場合は、グローバルかつ永続的な DUID-UUID (RFC 6355) が machine-id に基づいて生成されます。特別値の \"llt\" および \"ll\" は、デバイスの現在の MAC アドレスに基づいて、LLT または LL (RFC 3315 を参照) タイプの DUID を生成します。安定した DUID-LLT を提供するために、タイムフィールドには、(すべてのプロファイル向けに) グローバルに使用され、ディスクに永続する一定のタイムスタンプが含まれます。特別値の \"stable-llt\"、\"stable-ll\"、および \"stable-uuid\" は、対応するタイプの DUID を生成します。これは、接続の stable-id およびホストごとの固有のキーから取得したものです。このプロファイルが複数のデバイスでアクティベートされる場合は、stable-id に \"${DEVICE}\" または \"${MAC}\" の指定子を含むことをおすすめします。したがって、\"stable-ll\" および \"stable-llt\" のリンク層のアドレスは、stable id から算出される生成されたアドレスになります。\"stable-llt\" オプションの DUID-LLT タイム値は、3 年という静的タイムスパンの中から選ばれます (インターバルの上限は、\"llt\" で使用される一定のタイムスタンプと同じです)。プロパティーが設定されていない場合、\"ipv6.dhcp-duid\" に提供されるグローバル値が使用されます。グローバル値が提供されない場合は、デフォルトの \"lease\" 値が想定されます。"
-
--#: ../clients/common/settings-docs.h.in:243
-+#: ../clients/common/settings-docs.h.in:261
- msgid ""
- "Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941. If "
- "enabled, it makes the kernel generate a temporary IPv6 address in addition "
-@@ -7628,38 +7856,46 @@ msgid ""
- "IPv6 addresses."
- msgstr "RFC4941 で説明されているように、SLAAC に IPv6 プライバシー拡張を設定します。これを有効にすると、カーネルは、修正された EUI-64 により、MA アドレスから生成したパブリックアドレスに加えて、IPv6 アドレスを一時的に生成します。これにより、プライバシーは強化されますが、アプリケーションによっては問題が発生する場合もあります。利用できる値は、-1: 不明、0: 無効、1: 有効 (パブリックアドレスを優先)、2: 有効 (一時アドレスを優先) となります。各接続の設定を \"-1\" (不明) にすると、グローバル設定 \"ipv6.ip6-privacy\" にフォールバックされます。また、グローバル設定を指定しないか、\"-1\" に設定すると、\"/proc/sys/net/ipv6/conf/default/use_tempaddr\" の読み込みにフォールバックされます。この設定は、IPv6 アドレスでホストの追跡を回避する別の方法として \"addr-gen-mode\" プロパティーの \"stable-privacy\" 設定で有効にできる、安定したプライバシーアドレスとは区別されます。"
-
--#: ../clients/common/settings-docs.h.in:250
-+#: ../clients/common/settings-docs.h.in:265
-+msgid ""
-+"A timeout for waiting Router Advertisements in seconds. If zero (the "
-+"default), a globally configured default is used. If still unspecified, the "
-+"timeout depends on the sysctl settings of the device. Set to 2147483647 "
-+"(MAXINT32) for infinity."
-+msgstr "Router Advertisements の待機のタイムアウト (秒単位)。ゼロ (デフォルト) の場合、グローバルに設定されたデフォルトが使用されます。未指定の場合、タイムアウトはデバイスの sysctl 設定に依存します。無限には 2147483647(MAXINT32) に設定します。"
-+
-+#: ../clients/common/settings-docs.h.in:269
- msgid ""
- "Configure the token for draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 "
- "tokenized interface identifiers. Useful with eui64 addr-gen-mode."
- msgstr "IPv6 トークン化したインターフェース識別子 draft-chown-6man-tokenised-ipv6-identifiers-02 にトークンを設定します。eui64 addr-gen-mode で行うと便利です。"
-
--#: ../clients/common/settings-docs.h.in:251
-+#: ../clients/common/settings-docs.h.in:270
- msgid "Whether the transmitted traffic must be encrypted."
- msgstr "転送トラフィックの暗号化が必要かどうか。"
-
--#: ../clients/common/settings-docs.h.in:252
-+#: ../clients/common/settings-docs.h.in:271
- msgid ""
- "The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement."
- msgstr "MACsec キー一致における共有前の CAK (接続関連キー)。"
-
--#: ../clients/common/settings-docs.h.in:253
-+#: ../clients/common/settings-docs.h.in:272
- msgid "Flags indicating how to handle the \"mka-cak\" property."
- msgstr "\"mka-cak\" プロパティーの処理方法を示すフラグ。"
-
--#: ../clients/common/settings-docs.h.in:254
-+#: ../clients/common/settings-docs.h.in:273
- msgid ""
- "The pre-shared CKN (Connectivity-association Key Name) for MACsec Key "
- "Agreement."
- msgstr "MACsec キー一致における共有前の CKN (接続に関連するキー名)。"
-
--#: ../clients/common/settings-docs.h.in:255
-+#: ../clients/common/settings-docs.h.in:274
- 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:256
-+#: ../clients/common/settings-docs.h.in:275
- 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 "
-@@ -7667,29 +7903,29 @@ msgid ""
- "\"mac-address\" property."
- msgstr "指定した場合は、この MACSEC インターフェースを作成する、親インターフェース名または親接続の UUID を指定します。このプロパティーが指定されていないと、接続には、\"mac-address\" プロパティーが追加された \"802-3-ethernet\" 設定を含める必要があります。"
-
--#: ../clients/common/settings-docs.h.in:257
-+#: ../clients/common/settings-docs.h.in:276
- msgid ""
- "The port component of the SCI (Secure Channel Identifier), between 1 and "
- "65534."
- msgstr "SCI (セキュアチャネル識別子) のポートコンポーネント (1 - 65534)。"
-
--#: ../clients/common/settings-docs.h.in:258
-+#: ../clients/common/settings-docs.h.in:277
- msgid ""
- "Specifies whether the SCI (Secure Channel Identifier) is included in every "
- "packet."
- msgstr "パケットごとに SCI (セキュアチャネル識別子) が含まれているかどうかを指定します。"
-
--#: ../clients/common/settings-docs.h.in:259
-+#: ../clients/common/settings-docs.h.in:278
- msgid "Specifies the validation mode for incoming frames."
- msgstr "入力フレームの検証モードを指定します。"
-
--#: ../clients/common/settings-docs.h.in:260
-+#: ../clients/common/settings-docs.h.in:279
- msgid ""
- "The macvlan mode, which specifies the communication mechanism between "
- "multiple macvlans on the same lower device."
- msgstr "同じ低いデバイスで、複数の macvlans 間で通信メカニズムを指定する macvlan モード。"
-
--#: ../clients/common/settings-docs.h.in:261
-+#: ../clients/common/settings-docs.h.in:280
- 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 "
-@@ -7697,102 +7933,145 @@ msgid ""
- "\"mac-address\" property."
- msgstr "指定した場合は、この MAC-VLAN インターフェースを作成する、親インターフェース名または親接続の UUID を指定します。このプロパティーを指定しない場合は、接続に、\"mac-address\" プロパティーが追加された \"802-3-ethernet\" 設定を含める必要があります。"
-
--#: ../clients/common/settings-docs.h.in:262
-+#: ../clients/common/settings-docs.h.in:281
- msgid "Whether the interface should be put in promiscuous mode."
- msgstr "インターフェースをプロミスキャスモードにするべきかどうか。"
-
--#: ../clients/common/settings-docs.h.in:263
-+#: ../clients/common/settings-docs.h.in:282
- msgid "Whether the interface should be a MACVTAP."
- msgstr "インターフェースが MACVTAP にすべきかどうか。"
-
--#: ../clients/common/settings-docs.h.in:264
-+#: ../clients/common/settings-docs.h.in:283
-+msgid ""
-+"A list of driver names to match. Each element is a shell wildcard pattern. "
-+"See NMSettingMatch:interface-name for how special characters '|', '&', '!' "
-+"and '\\' are used for optional and mandatory matches and inverting the "
-+"pattern."
-+msgstr "一致するドライバ名のリスト。各要素はシェルのワイルドカードパターンです。特殊文字 '|'、'&'、'!' および '\\' が、オプションおよび必須のマッチおよびパターンの反転にどのように使用されるかについては、NMSettingMatch:interface-name を参照してください。"
-+
-+#: ../clients/common/settings-docs.h.in:284
- msgid ""
- "A list of interface names to match. Each element is a shell wildcard "
--"pattern. When an element is prefixed with exclamation mark (!) the "
--"condition is inverted. A candidate interface name is considered matching "
--"when both these conditions are satisfied: (a) any of the elements not "
--"prefixed with '!' matches or there aren't such elements; (b) none of the "
--"elements prefixed with '!' match."
--msgstr "一致するインターフェース名の一覧。各要素は、シェルワイルドカードパターンです。感嘆符 (!) が要素の先頭に付いている場合、条件は反転します。以下の (a) および (b) の条件が両方とも満たされている場合、候補のインターフェース名が一致していると考えられます。(a) 感嘆符 (!) が先頭に付いていない要素が一致する、またはこのような要素がない場合、(b) 感嘆符 (!) が先頭に付いている要素がどれも一致しない。"
-+"pattern. An element can be prefixed with a pipe symbol (|) or an ampersand "
-+"(&). The former means that the element is optional and the latter means that "
-+"it is mandatory. If there are any optional elements, than the match "
-+"evaluates to true if at least one of the optional element matches (logical "
-+"OR). If there are any mandatory elements, then they all must match (logical "
-+"AND). By default, an element is optional. This means that an element \"foo\" "
-+"behaves the same as \"|foo\". An element can also be inverted with "
-+"exclamation mark (!) between the pipe symbol (or the ampersand) and before "
-+"the pattern. Note that \"!foo\" is a shortcut for the mandatory match \"&!foo"
-+"\". Finally, a backslash can be used at the beginning of the element (after "
-+"the optional special characters) to escape the start of the pattern. For "
-+"example, \"&\\!a\" is an mandatory match for literally \"!a\"."
-+msgstr "一致するインターフェース名のリスト。各要素はシェルのワイルドカードパターンです。要素の前にパイプ記号 (|) やアンパサンド (&) を付けることができます。前者はその要素がオプションであることを意味し、後者は必須であることを意味します。オプションの要素がある場合、オプションの要素のうち少なくとも1つがマッチした場合には、マッチは真と評価されます(論理 OR)。必須要素がある場合は、すべて一致しなければなりません (論理 AND)。デフォルトでは、要素はオプションです。これは、要素 \"foo\" は \"|foo\" と同じように動作することを意味します。また、パイプ記号 (またはアンパサンド) とパターンの前の間にエクスクラメーションマーク (!) を入れて要素を反転させることもできます。foo\" は必須一致の \"&!foo\" のショートカットであることに注意してください。最後に、要素の先頭 (オプションの特殊文字の後) にバックスラッシュを使用して、パターンの先頭をエスケープすることができます。例えば、\"&\\!a\" は、文字通り「!a」の必須マッチです。"
-
--#: ../clients/common/settings-docs.h.in:265
-+#: ../clients/common/settings-docs.h.in:285
-+msgid ""
-+"A list of kernel command line arguments to match. This may be used to check "
-+"whether a specific kernel command line option is set (or if prefixed with "
-+"the exclamation mark unset). The argument must either be a single word, or "
-+"an assignment (i.e. two words, separated \"=\"). In the former case the "
-+"kernel command line is searched for the word appearing as is, or as left "
-+"hand side of an assignment. In the latter case, the exact assignment is "
-+"looked for with right and left hand side matching. See NMSettingMatch:"
-+"interface-name for how special characters '|', '&', '!' and '\\' are used "
-+"for optional and mandatory matches and inverting the pattern."
-+msgstr "マッチするカーネルコマンドライン引数のリスト。これは、特定のカーネルコマンドラインオプションが設定されているかどうかをチェックするのに使われます (または、感嘆符が接頭辞として設定されていないか)。引数は単一の単語または代入 (つまり 2 つの単語を \"=\" で区切ったもの) のどちらかでなければなりません。前者の場合、カーネルのコマンドラインでは、そのまま、または代入の左側として現れる単語が検索されます。後者の場合は、右手と左手のマッチングで正確な代入が検索されます。特殊文字 '|'、'&'、'!'、'\\' がオプションマッチや必須マッチ、パターンの反転にどのように使用されるかは NMSettingMatch:interface-name を参照してください。"
-+
-+#: ../clients/common/settings-docs.h.in:286
-+msgid ""
-+"A list of paths to match against the ID_PATH udev property of devices. "
-+"ID_PATH represents the topological persistent path of a device. It typically "
-+"contains a subsystem string (pci, usb, platform, etc.) and a subsystem-"
-+"specific identifier. For PCI devices the path has the form \"pci-$domain:"
-+"$bus:$device.$function\", where each variable is an hexadecimal value; for "
-+"example \"pci-0000:0a:00.0\". The path of a device can be obtained with "
-+"\"udevadm info /sys/class/net/$dev | grep ID_PATH=\" or by looking at the "
-+"\"path\" property exported by NetworkManager (\"nmcli -f general.path device "
-+"show $dev\"). Each element of the list is a shell wildcard pattern. See "
-+"NMSettingMatch:interface-name for how special characters '|', '&', '!' and "
-+"'\\' are used for optional and mandatory matches and inverting the pattern."
-+msgstr "デバイスの ID_PATH udev プロパティーに対してマッチするパスのリスト。ID_PATH は、デバイスのトポロジカルな永続パスを表します。通常、これはサブシステム文字列 (pci、usb、プラットフォームなど) とサブシステム固有の識別子を含みます。PCI デバイスの場合、パスは「\"pci-$domain:$bus:$device.$function\" という形式で、各変数は \"pci-0000:0a:00.0\" のような 16 進数の値になります。デバイスのパスは、udevadm info /sys/class/net/$dev | grep ID_PATH=\" で取得するか、NetworkManager がエクスポートした \"path\" プロパティー (\"nmcli -f general.path device show\") で取得することができます。リストの各要素はシェルのワイルドカードパターンです。特殊文字 '|'、'&'、'!'、'\\' がオプションマッチと必須マッチにどのように使用され、パターンを反転させるかについては、NMSettingMatch:interface-name を参照してください。"
-+
-+#: ../clients/common/settings-docs.h.in:287
- msgid "The data path type. One of \"system\", \"netdev\" or empty."
- msgstr "データパスの種類。\"system\"、\"netdev\"、または空のいずれかになります。"
-
--#: ../clients/common/settings-docs.h.in:266
-+#: ../clients/common/settings-docs.h.in:288
- msgid "The bridge failure mode. One of \"secure\", \"standalone\" or empty."
- msgstr "ブリッジの失敗モード。\"secure\"、\"standalone\"、または空のいずれかになります。"
-
--#: ../clients/common/settings-docs.h.in:267
-+#: ../clients/common/settings-docs.h.in:289
- msgid "Enable or disable multicast snooping."
- msgstr "マルチキャストのスヌーピングを有効化または無効化にします。"
-
--#: ../clients/common/settings-docs.h.in:268
-+#: ../clients/common/settings-docs.h.in:290
- msgid "Enable or disable RSTP."
- msgstr "RSTP を有効化または無効化にします。"
-
--#: ../clients/common/settings-docs.h.in:269
-+#: ../clients/common/settings-docs.h.in:291
- msgid "Enable or disable STP."
- msgstr "STP を有効化または無効化にします。"
-
--#: ../clients/common/settings-docs.h.in:270
-+#: ../clients/common/settings-docs.h.in:292
- msgid "Open vSwitch DPDK device arguments."
- msgstr "Open vSwitch DPDK デバイス引数。"
-
--#: ../clients/common/settings-docs.h.in:271
-+#: ../clients/common/settings-docs.h.in:293
- msgid ""
- "The interface type. Either \"internal\", \"system\", \"patch\", \"dpdk\", or "
- "empty."
- msgstr "インターフェースの種類。\"internal\"、 \"system\"、\"patch\"、\"dpdk\"、または空のいずれかになります。"
-
--#: ../clients/common/settings-docs.h.in:272
-+#: ../clients/common/settings-docs.h.in:294
- msgid ""
--"Specifies the unicast destination IP address of a remote Open vSwitch bridge "
--"port to connect to."
--msgstr "接続するリモートの Open vSwitch ブリッジポートのユニキャスト宛先 IP アドレスを指定します。"
-+"Specifies the name of the interface for the other side of the patch. The "
-+"patch on the other side must also set this interface as peer."
-+msgstr "パッチの相手側のインターフェースの名前を指定します。相手側のパッチは、このインターフェイスもピアに設定しなければなりません。"
-
--#: ../clients/common/settings-docs.h.in:273
-+#: ../clients/common/settings-docs.h.in:295
- msgid "The time port must be inactive in order to be considered down."
- msgstr "ダウンしたと見なすためには、タイムポートを非アクティブにする必要があります。"
-
--#: ../clients/common/settings-docs.h.in:274
-+#: ../clients/common/settings-docs.h.in:296
- 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:275
-+#: ../clients/common/settings-docs.h.in:297
- msgid "The time port must be active before it starts forwarding traffic."
- msgstr "トラフィックの転送を始める前に、タイムポートをアクティブにする必要があります。"
-
--#: ../clients/common/settings-docs.h.in:276
-+#: ../clients/common/settings-docs.h.in:298
- msgid "LACP mode. One of \"active\", \"off\", or \"passive\"."
- msgstr "LACP モード。\"active\"、\"off\"、または \"passive\" のいずれかになります。"
-
--#: ../clients/common/settings-docs.h.in:277
-+#: ../clients/common/settings-docs.h.in:299
- msgid "The VLAN tag in the range 0-4095."
- msgstr "VLAN タグは 0 - 4095 の範囲内にあります。"
-
--#: ../clients/common/settings-docs.h.in:278
-+#: ../clients/common/settings-docs.h.in:300
- msgid ""
- "The VLAN mode. One of \"access\", \"native-tagged\", \"native-untagged\", "
- "\"trunk\" or unset."
- msgstr "VLAN モード。\"access\"、\"native-tagged\"、\"native-untagged\"、\"trunk\" のいずれかに設定するか、何も設定しません。"
-
--#: ../clients/common/settings-docs.h.in:279
-+#: ../clients/common/settings-docs.h.in:301
- msgid ""
- "If non-zero, instruct pppd to set the serial port to the specified "
- "baudrate. This value should normally be left as 0 to automatically choose "
- "the speed."
- msgstr "ゼロ以外は、pppd より指定したボーレートにシリアルポートを設定します。速度が自動的に選択されるように、通常は、この値を 0 にします。"
-
--#: ../clients/common/settings-docs.h.in:280
-+#: ../clients/common/settings-docs.h.in:302
- msgid ""
- "If TRUE, specify that pppd should set the serial port to use hardware flow "
- "control with RTS and CTS signals. This value should normally be set to "
- "FALSE."
- msgstr "TRUE の場合、pppd は、RTS シグナルおよび CTS シグナルを使用して、ハードウェアフロー制御を使用するシリアルポートを設定する必要があります。この値は、通常は FALSE に設定する必要があります。"
-
--#: ../clients/common/settings-docs.h.in:281
-+#: ../clients/common/settings-docs.h.in:303
- 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 "
-@@ -7800,7 +8079,7 @@ msgid ""
- "property is used."
- msgstr "ゼロ以外にすると、LCP echo-requests が指定した数値にピアが応答しない場合、pppd は、ピアへの接続が失敗したと推測します。このプロパティーが使用されている場合は、\"lcp-echo-interval\" プロパティーもゼロ以外の値に設定する必要があります。"
-
--#: ../clients/common/settings-docs.h.in:282
-+#: ../clients/common/settings-docs.h.in:304
- 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 "
-@@ -7808,78 +8087,78 @@ msgid ""
- "autodetect this."
- msgstr "ゼロ以外にすると、pppd が、n 秒ごとにピアに LCP echo-request フレームを送るようになります (n は指定した値)。PPP ピアの一部だけがエコー要求に応答します。これを自動検出することはできません。"
-
--#: ../clients/common/settings-docs.h.in:283
-+#: ../clients/common/settings-docs.h.in:305
- msgid ""
- "If TRUE, stateful MPPE is used. See pppd documentation for more information "
- "on stateful MPPE."
- msgstr "TRUE の場合は、ステートフル MPPE が使用されます。ステートフル MPPE の詳細は pppd ドキュメントを参照してください。"
-
--#: ../clients/common/settings-docs.h.in:284
-+#: ../clients/common/settings-docs.h.in:306
- msgid ""
- "If non-zero, instruct pppd to request that the peer send packets no larger "
- "than the specified size. If non-zero, the MRU should be between 128 and "
- "16384."
- msgstr "ゼロ以外は、指定したサイズ以下のパケットをピアが送信するように pppd が要求します。ゼロ以外では、MRU は 128 から 16384 の間にする必要があります。"
-
--#: ../clients/common/settings-docs.h.in:285
-+#: ../clients/common/settings-docs.h.in:307
- msgid ""
- "If non-zero, instruct pppd to send packets no larger than the specified size."
- msgstr "ゼロ以外は、pppd により、指定したサイズ以下のパケットが送信されます。"
-
--#: ../clients/common/settings-docs.h.in:286
-+#: ../clients/common/settings-docs.h.in:308
- msgid "If TRUE, Van Jacobsen TCP header compression will not be requested."
- msgstr "TRUE の場合は、Van Jacobsen TCP ヘッダー圧縮が要求されません。"
-
--#: ../clients/common/settings-docs.h.in:287
-+#: ../clients/common/settings-docs.h.in:309
- msgid ""
- "If TRUE, do not require the other side (usually the PPP server) to "
- "authenticate itself to the client. If FALSE, require authentication from "
- "the remote side. In almost all cases, this should be TRUE."
- msgstr "TRUE の場合は、クライアントに認証するのに相手側 (通常は PPP サーバー) が要求されません。FALSE の場合は、リモート側からの認証が必要になります。ほとんどすべての場合で、これは TRUE にする必要があります。"
-
--#: ../clients/common/settings-docs.h.in:288
-+#: ../clients/common/settings-docs.h.in:310
- msgid "If TRUE, BSD compression will not be requested."
- msgstr "TRUE の場合は、BSD 圧縮が要求されません。"
-
--#: ../clients/common/settings-docs.h.in:289
-+#: ../clients/common/settings-docs.h.in:311
- msgid "If TRUE, \"deflate\" compression will not be requested."
- msgstr "TRUE の場合は、\"deflate\" 圧縮が要求されません。"
-
--#: ../clients/common/settings-docs.h.in:290
-+#: ../clients/common/settings-docs.h.in:312
- msgid "If TRUE, the CHAP authentication method will not be used."
- msgstr "TRUE の場合は、CHAP 認証方法が使用されません。"
-
--#: ../clients/common/settings-docs.h.in:291
-+#: ../clients/common/settings-docs.h.in:313
- msgid "If TRUE, the EAP authentication method will not be used."
- msgstr "TRUE の場合は、EAP 認証方法が使用されません。"
-
--#: ../clients/common/settings-docs.h.in:292
-+#: ../clients/common/settings-docs.h.in:314
- msgid "If TRUE, the MSCHAP authentication method will not be used."
- msgstr "TRUE の場合は、MSCHAP 認証方法が使用されません。"
-
--#: ../clients/common/settings-docs.h.in:293
-+#: ../clients/common/settings-docs.h.in:315
- msgid "If TRUE, the MSCHAPv2 authentication method will not be used."
- msgstr "TRUE の場合は、MSCHAPv2 認証方法が使用されません。"
-
--#: ../clients/common/settings-docs.h.in:294
-+#: ../clients/common/settings-docs.h.in:316
- msgid "If TRUE, the PAP authentication method will not be used."
- msgstr "TRUE の場合は、PAP 認証方法が使用されません。"
-
--#: ../clients/common/settings-docs.h.in:295
-+#: ../clients/common/settings-docs.h.in:317
- msgid ""
- "If TRUE, MPPE (Microsoft Point-to-Point Encryption) will be required for the "
- "PPP session. If either 64-bit or 128-bit MPPE is not available the session "
- "will fail. Note that MPPE is not used on mobile broadband connections."
- msgstr "TRUE の場合は、PPP セッションに MPPE (Microsoft ポイントツーポイント暗号化) が必要になります。64 ビットまたは 128 ビットのいずれかの MPPE が利用できなくなると、セッションは失敗します。MPPE がモバイルブロードバンド接続に使用されない点に注意してください。"
-
--#: ../clients/common/settings-docs.h.in:296
-+#: ../clients/common/settings-docs.h.in:318
- msgid ""
- "If TRUE, 128-bit MPPE (Microsoft Point-to-Point Encryption) will be required "
- "for the PPP session, and the \"require-mppe\" property must also be set to "
- "TRUE. If 128-bit MPPE is not available the session will fail."
- msgstr "TRUE の場合は、PPP セッションに、128 ビット MPPE (Microsoft ポイントツーポイント暗号化) が必要になります。また、\"require-mppe\" プロパティーを TRUE に設定する必要があります。128 ビットの MPPE が利用できないと、セッションは失敗します。"
-
--#: ../clients/common/settings-docs.h.in:297
-+#: ../clients/common/settings-docs.h.in:319
- 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 "
-@@ -7887,11 +8166,11 @@ msgid ""
- "NMSettingConnection."
- msgstr "指定した場合は、この PPPoE 接続が作成される親インターフェース名を指定します。このプロパティーを指定しないと、この接続は、NMSettingConnection の \"interface-name\" に指定したインターフェースで接続が有効になります。"
-
--#: ../clients/common/settings-docs.h.in:298
-+#: ../clients/common/settings-docs.h.in:320
- msgid "Password used to authenticate with the PPPoE service."
- msgstr "PPPoE サービスでの認証に使用するパスワード。"
-
--#: ../clients/common/settings-docs.h.in:300
-+#: ../clients/common/settings-docs.h.in:322
- msgid ""
- "If specified, instruct PPPoE to only initiate sessions with access "
- "concentrators that provide the specified service. For most providers, this "
-@@ -7899,53 +8178,53 @@ msgid ""
- "concentrators or a specific service is known to be required."
- msgstr "指定すると、PPPoE は、セッションを開始するために、指定したサービスを提供するアクセス集線装置のみを使用するようになります。多くのプロバイダーでは、この設定を空白のままにする必要があります。これは、アクセス集線装置が複数ある場合や、特別なサービスが必要であることが分かっている場合に限り必要になります。"
-
--#: ../clients/common/settings-docs.h.in:301
-+#: ../clients/common/settings-docs.h.in:323
- msgid "Username used to authenticate with the PPPoE service."
- msgstr "PPPoE サービスでの認証に使用するユーザー名。"
-
--#: ../clients/common/settings-docs.h.in:302
-+#: ../clients/common/settings-docs.h.in:324
- msgid "Whether the proxy configuration is for browser only."
- msgstr "プロキシー設定がブラウザー専用であるかどうか。"
-
--#: ../clients/common/settings-docs.h.in:303
-+#: ../clients/common/settings-docs.h.in:325
- 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:304
-+#: ../clients/common/settings-docs.h.in:326
- msgid "PAC script for the connection."
- msgstr "接続の PAC スクリプト。"
-
--#: ../clients/common/settings-docs.h.in:305
-+#: ../clients/common/settings-docs.h.in:327
- msgid "PAC URL for obtaining PAC file."
- msgstr "PAC ファイルを取得する PAC URL"
-
--#: ../clients/common/settings-docs.h.in:306
-+#: ../clients/common/settings-docs.h.in:328
- msgid ""
- "Speed to use for communication over the serial port. Note that this value "
- "usually has no effect for mobile broadband modems as they generally ignore "
- "speed settings and use the highest available speed."
- msgstr "シリアルポートでの接続に使用する速度。この値は、通常、モバイルのブロードバンドモデムには影響しません。通常は速度設定を無視し、利用可能な最高の速度を使用します。"
-
--#: ../clients/common/settings-docs.h.in:307
-+#: ../clients/common/settings-docs.h.in:329
- msgid "Byte-width of the serial communication. The 8 in \"8n1\" for example."
- msgstr "シリアル接続のバイト幅。たとえば、\"8n1\" の 8 です。"
-
--#: ../clients/common/settings-docs.h.in:308
-+#: ../clients/common/settings-docs.h.in:330
- msgid "Parity setting of the serial port."
- msgstr "シリアルポートのパリティ設定。"
-
--#: ../clients/common/settings-docs.h.in:309
-+#: ../clients/common/settings-docs.h.in:331
- msgid "Time to delay between each byte sent to the modem, in microseconds."
- msgstr "モデムに送信したバイト間の遅延時間 (マイクロ秒単位)。"
-
--#: ../clients/common/settings-docs.h.in:310
-+#: ../clients/common/settings-docs.h.in:332
- 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:311
-+#: ../clients/common/settings-docs.h.in:333
- 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 "
-@@ -7956,15 +8235,16 @@ msgid ""
- "assumed to be NM_TERNARY_TRUE (1)."
- msgstr "互換性のあるドライバーによって仮想関数を autoprobe するかどうか。NM_TERNARY_TRUE (1) に設定されている場合、カーネルは VF を互換性のあるドライバーにバインドしようとし、これが成功した場合、新規のネットワークインターフェースが各 VF のインスタンスを作成します。NM_TERNARY_FALSE (0) に設定されている場合、VF は要求されず、VF 用のネットワークインターフェースは作成されません。NM_TERNARY_DEFAULT (-1) に設定されている場合、グローバルデフォルトが使用されます。グローバルデフォルトが指定されていない場合は、NM_TERNARY_TRUE (1) に設定されていると推測されます。"
-
--#: ../clients/common/settings-docs.h.in:312
-+#: ../clients/common/settings-docs.h.in:334
- msgid ""
- "The total number of virtual functions to create. Note that when the sriov "
- "setting is present NetworkManager enforces the number of virtual functions "
--"on the interface also when it is zero. To prevent any changes to SR-IOV "
--"parameters don't add a sriov setting to the connection."
--msgstr "作成する仮想関数の総数。sriov 設定が有効な場合、NetworkManager はインターフェース上の仮想関数の数を強化し、ゼロの場合も同様である点に注意してください。SR-IOV パラメーターへの変更を阻止するには、sriov 設定を接続に追加しないでください。"
-+"on the interface (also when it is zero) during activation and resets it upon "
-+"deactivation. 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:313
-+#: ../clients/common/settings-docs.h.in:335
- msgid ""
- "Array of virtual function descriptors. Each VF descriptor is a dictionary "
- "mapping attribute names to GVariant values. The 'index' entry is mandatory "
-@@ -7978,15 +8258,15 @@ msgid ""
- "default) or 'ad' for 802.1ad."
- msgstr "仮想関数記述子の配列。各 VF 記述子は、GVariant 値に対する辞書マッピング属性名です。各 VF にとって 'index' エントリーは必須です。文字列で表す場合、VF の形式は \"INDEX [ATTR=VALUE[ ATTR=VALUE]...]\" となります。たとえば、\"2 mac=00:11:22:33:44:55 spoof-check=true\" などです。複数の VF は、コンマをセパレーターとして使用することで指定できます。現在サポートされている属性は、mac、spoof-check、trust、min-tx-rate、max-tx-rate、および vlans です。\"vlans\" 属性は、VLAN 記述子の semicolon-separated 一覧として表されます。ここでは、各記述子の形式は \"ID[.PRIORITY[.PROTO]]\" となります。PROTO は 'q' (802.1Q、デフォルト) または 'ad' (802.1ad) のいずれかになります。"
-
--#: ../clients/common/settings-docs.h.in:314
-+#: ../clients/common/settings-docs.h.in:336
- msgid "Array of TC queueing disciplines."
- msgstr "TC キュー処理の配列"
-
--#: ../clients/common/settings-docs.h.in:315
-+#: ../clients/common/settings-docs.h.in:337
- msgid "Array of TC traffic filters."
- msgstr "TC トラフィックフィルターの配列"
-
--#: ../clients/common/settings-docs.h.in:316
-+#: ../clients/common/settings-docs.h.in:338
- msgid ""
- "The JSON configuration for the team network interface. The property should "
- "contain raw JSON configuration data suitable for teamd, because the value is "
-@@ -7994,8 +8274,8 @@ msgid ""
- "used. See man teamd.conf for the format details."
- msgstr "チームネットワークインターフェースの JSON 設定。プロパティーには、teamd に適切な生の JSON 設定データを含む必要があります。値を teamd に直接渡すためです。指定しないと、デフォルトの設定が使用されます。フォーマットの詳細は、man teamd.conf を参照してください。"
-
--#: ../clients/common/settings-docs.h.in:317
--#: ../clients/common/settings-docs.h.in:335
-+#: ../clients/common/settings-docs.h.in:339
-+#: ../clients/common/settings-docs.h.in:357
- msgid ""
- "Link watchers configuration for the connection: each link watcher is defined "
- "by a dictionary, whose keys depend upon the selected link watcher. Available "
-@@ -8007,65 +8287,65 @@ msgid ""
- "for more details."
- msgstr "接続のリンクウォッチャー設定: リンクウォッチャーはそれぞれディクショナリーによって定義され、キーは選択したリンクウォッチャーによって異なります。利用できるリンクウォッチャーは 'ethtool'、'nsna_ping'、'arp_ping' に加え、キーの 'name' でディクショナリーに指定したものになります。利用できるキー: ethtool では 'delay-up'、'delay-down'、'init-wait'。nsna_ping では 'init-wait'、'interval'、'missed-max'、'target-host'。arp_ping では、nsna_ping の全キーおよび 'source-host'、'validate-active'、'validate-inactive'、'send-always'。詳細は teamd.conf の man ページを参照してください。"
-
--#: ../clients/common/settings-docs.h.in:318
-+#: ../clients/common/settings-docs.h.in:340
- msgid "Corresponds to the teamd mcast_rejoin.count."
- msgstr "teamd mcast_rejoin.count に相当します。"
-
--#: ../clients/common/settings-docs.h.in:319
-+#: ../clients/common/settings-docs.h.in:341
- msgid "Corresponds to the teamd mcast_rejoin.interval."
- msgstr "teamd mcast_rejoin.interval に相当します。"
-
--#: ../clients/common/settings-docs.h.in:320
-+#: ../clients/common/settings-docs.h.in:342
- msgid "Corresponds to the teamd notify_peers.count."
- msgstr "teamd notify_peers.count に相当します。"
-
--#: ../clients/common/settings-docs.h.in:321
-+#: ../clients/common/settings-docs.h.in:343
- msgid "Corresponds to the teamd notify_peers.interval."
- msgstr "teamd notify_peers.interval に相当します。"
-
--#: ../clients/common/settings-docs.h.in:322
-+#: ../clients/common/settings-docs.h.in:344
- msgid ""
- "Corresponds to the teamd runner.name. Permitted values are: \"roundrobin\", "
- "\"broadcast\", \"activebackup\", \"loadbalance\", \"lacp\", \"random\"."
- msgstr "teamd runner.name に相当します。可能な値: \"roundrobin\"、\"broadcast\"、\"activebackup\"、\"loadbalance\"、\"lacp\"、\"random\"。"
-
--#: ../clients/common/settings-docs.h.in:323
-+#: ../clients/common/settings-docs.h.in:345
- msgid "Corresponds to the teamd runner.active."
- msgstr "teamd runner.active に相当します。"
-
--#: ../clients/common/settings-docs.h.in:324
-+#: ../clients/common/settings-docs.h.in:346
- msgid "Corresponds to the teamd runner.agg_select_policy."
- msgstr "teamd runner.agg_select_policy に相当します"
-
--#: ../clients/common/settings-docs.h.in:325
-+#: ../clients/common/settings-docs.h.in:347
- msgid "Corresponds to the teamd runner.fast_rate."
- msgstr "teamd runner.fast_rate に相当します。"
-
--#: ../clients/common/settings-docs.h.in:326
-+#: ../clients/common/settings-docs.h.in:348
- msgid "Corresponds to the teamd runner.hwaddr_policy."
- msgstr "teamd runner.hwaddr_policy に相当します。"
-
--#: ../clients/common/settings-docs.h.in:327
-+#: ../clients/common/settings-docs.h.in:349
- msgid "Corresponds to the teamd runner.min_ports."
- msgstr "teamd runner.min_ports に相当します。"
-
--#: ../clients/common/settings-docs.h.in:328
-+#: ../clients/common/settings-docs.h.in:350
- msgid "Corresponds to the teamd runner.sys_prio."
- msgstr "teamd runner.sys_prio に相当します。"
-
--#: ../clients/common/settings-docs.h.in:329
-+#: ../clients/common/settings-docs.h.in:351
- msgid "Corresponds to the teamd runner.tx_balancer.name."
- msgstr "teamd runner.tx_balancer.name に相当します。"
-
--#: ../clients/common/settings-docs.h.in:330
-+#: ../clients/common/settings-docs.h.in:352
- msgid "Corresponds to the teamd runner.tx_balancer.interval."
- msgstr "teamd runner.tx_balancer.interval に相当します。"
-
--#: ../clients/common/settings-docs.h.in:331
-+#: ../clients/common/settings-docs.h.in:353
- msgid "Corresponds to the teamd runner.tx_hash."
- msgstr "teamd runner.tx_hash に相当します。"
-
--#: ../clients/common/settings-docs.h.in:332
-+#: ../clients/common/settings-docs.h.in:354
- msgid ""
- "The JSON configuration for the team port. The property should contain raw "
- "JSON configuration data suitable for teamd, because the value is passed "
-@@ -8073,67 +8353,67 @@ msgid ""
- "man teamd.conf for the format details."
- msgstr "チームポートの JSON 設定。プロパティーには、teamd に適した生の JSON 設定データを含める必要があります。値は teamd に直接渡されるためです。指定しない場合は、デフォルト設定が使用されます。フォーマットの詳細は、man teamd.conf を参照してください。"
-
--#: ../clients/common/settings-docs.h.in:333
-+#: ../clients/common/settings-docs.h.in:355
- msgid "Corresponds to the teamd ports.PORTIFNAME.lacp_key."
- msgstr "teamd ports.PORTIFNAME.lacp_key に相当します。"
-
--#: ../clients/common/settings-docs.h.in:334
-+#: ../clients/common/settings-docs.h.in:356
- msgid "Corresponds to the teamd ports.PORTIFNAME.lacp_prio."
- msgstr "teamd ports.PORTIFNAME.lacp_prio に相当します。"
-
--#: ../clients/common/settings-docs.h.in:336
-+#: ../clients/common/settings-docs.h.in:358
- msgid "Corresponds to the teamd ports.PORTIFNAME.prio."
- msgstr "teamd ports.PORTIFNAME.prio に相当します。"
-
--#: ../clients/common/settings-docs.h.in:337
-+#: ../clients/common/settings-docs.h.in:359
- msgid ""
- "Corresponds to the teamd ports.PORTIFNAME.queue_id. When set to -1 means the "
- "parameter is skipped from the json config."
- msgstr "teamd ports.PORTIFNAME.queue_id に相当します。-1 に設定すると、このパラメーターは json 設定で無視されます。"
-
--#: ../clients/common/settings-docs.h.in:338
-+#: ../clients/common/settings-docs.h.in:360
- msgid "Corresponds to the teamd ports.PORTIFNAME.sticky."
- msgstr "teamd ports.PORTIFNAME.sticky に相当します。"
-
--#: ../clients/common/settings-docs.h.in:339
-+#: ../clients/common/settings-docs.h.in:361
- 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:340
-+#: ../clients/common/settings-docs.h.in:362
- msgid ""
- "The operating mode of the virtual device. Allowed values are "
- "NM_SETTING_TUN_MODE_TUN (1) to create a layer 3 device and "
- "NM_SETTING_TUN_MODE_TAP (2) to create an Ethernet-like layer 2 one."
- msgstr "仮想デバイスのオペレーティングモード。利用できる値は、レイヤー 3 デバイスを作成する NM_SETTING_TUN_MODE_TUN (1) と、Ethernet のようなレイヤー 2 デバイスを作成する NM_SETTING_TUN_MODE_TAP (2) です。"
-
--#: ../clients/common/settings-docs.h.in:341
-+#: ../clients/common/settings-docs.h.in:363
- msgid ""
- "If the property is set to TRUE, the interface will support multiple file "
- "descriptors (queues) to parallelize packet sending or receiving. Otherwise, "
- "the interface will only support a single queue."
- msgstr "プロパティーを TRUE に設定すると、インターフェースは複数のファイルディスクリプター (キュー) を使用して、パケットの送受信を並行して処理します。TRUE に設定しないと、インターフェースは 1 つのキューしかサポートしません。"
-
--#: ../clients/common/settings-docs.h.in:342
-+#: ../clients/common/settings-docs.h.in:364
- 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:343
-+#: ../clients/common/settings-docs.h.in:365
- 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:344
-+#: ../clients/common/settings-docs.h.in:366
- msgid ""
- "If TRUE the IFF_VNET_HDR the tunnel packets will include a virtio network "
- "header."
- msgstr "IFF_VNET_HDR を TRUE にすると、トンネルパケットには、virtio ネットワークヘッダーが含まれます。"
-
--#: ../clients/common/settings-docs.h.in:345
-+#: ../clients/common/settings-docs.h.in:367
- 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 "
-@@ -8141,14 +8421,14 @@ msgid ""
- "up to a certain length."
- msgstr "ユーザーデータでのキーと値のペアのディクショナリー。このデータは NetworkManager で無視され、ユーザーの判断で使用できます。このキーは、厳密な ascii フォーマットのみをサポートしますが、値は、指定した長さまでの任意の UTF8 文字列にできます。"
-
--#: ../clients/common/settings-docs.h.in:346
-+#: ../clients/common/settings-docs.h.in:368
- msgid ""
- "For outgoing packets, a list of mappings from Linux SKB priorities to 802.1p "
- "priorities. The mapping is given in the format \"from:to\" where both \"from"
- "\" and \"to\" are unsigned integers, ie \"7:3\"."
- msgstr "出力パケットの場合、Linux SKB 優先度から 802.1p 優先度へのマッピングの一覧。このマッピングは、\"from:to\" の形式で指定し、\"from\" と \"to\" は、\"7:3\" など、署名なし整数にします。"
-
--#: ../clients/common/settings-docs.h.in:347
-+#: ../clients/common/settings-docs.h.in:369
- 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 "
-@@ -8161,20 +8441,20 @@ msgid ""
- "missing property on D-Bus is still considered as 0."
- msgstr "VLAN インターフェースの動作と機能を制御する 1 つ以上のフラグ。NM_VLAN_FLAG_REORDER_HEADERS (0x1) (出力のパケットヘッダーの順序を変更)、NM_VLAN_FLAG_GVRP (0x2) (GVRP プロトコルを使用)、NM_VLAN_FLAG_LOOSE_BINDING (0x4) (マスターデバイスの動作状態へのインターフェースのルーズバインディング)、NM_VLAN_FLAG_MVRP (0x8) (MVRP プロトコルの使用) などがあります。このプロパティーのデフォルト値は NM_VLAN_FLAG_REORDER_HEADERS ですが、以前は 0 でした。後方互換性を確保するには D-Bus API のデフォルト値を 0 のままにし、D-Bus における不明なプロパティーは引き続き 0 と見なされます。"
-
--#: ../clients/common/settings-docs.h.in:348
-+#: ../clients/common/settings-docs.h.in:370
- msgid ""
- "The VLAN identifier that the interface created by this connection should be "
- "assigned. The valid range is from 0 to 4094, without the reserved id 4095."
- msgstr "この接続が作成するインターフェースを割り当てる必要がある VLAN 識別子。有効は範囲は 0 - 4094 となり、予約されている id 4095 は除外されます。"
-
--#: ../clients/common/settings-docs.h.in:349
-+#: ../clients/common/settings-docs.h.in:371
- msgid ""
- "For incoming packets, a list of mappings from 802.1p priorities to Linux SKB "
- "priorities. The mapping is given in the format \"from:to\" where both \"from"
- "\" and \"to\" are unsigned integers, ie \"7:3\"."
- msgstr "入力パケットの場合は、802.1p 優先度から Linux SKB 優先度へのマッピング一覧。このマッピングは、\"from:to\" の形式で指定し、\"from\" と \"to\" は、\"7:3\" など、署名なし整数にします。"
-
--#: ../clients/common/settings-docs.h.in:350
-+#: ../clients/common/settings-docs.h.in:372
- 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 "
-@@ -8182,32 +8462,32 @@ msgid ""
- "\"mac-address\" property."
- msgstr "指定した場合は、この VLAN インターフェースを作成する、親インターフェース名または親接続の UUID を指定します。このプロパティーを指定しない場合は、接続に、\"mac-address\" プロパティーが指定されている \"802-3-ethernet\" 設定を含める必要があります。"
-
--#: ../clients/common/settings-docs.h.in:351
-+#: ../clients/common/settings-docs.h.in:373
- 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:352
-+#: ../clients/common/settings-docs.h.in:374
- msgid ""
- "If the VPN service supports persistence, and this property is TRUE, the VPN "
- "will attempt to stay connected across link changes and outages, until "
- "explicitly disconnected."
- msgstr "VPN サービスが持続性をサポートすると、このプロパティーは TRUE になります。VPN は、明示的に切断されるまで、リンクが変更され、停止しても接続されたままになります。"
-
--#: ../clients/common/settings-docs.h.in:353
-+#: ../clients/common/settings-docs.h.in:375
- 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 プラグイン特有のシークレットに関するキーと値のペアのディクショナリー。キーと値はともに文字列にする必要があります。"
-
--#: ../clients/common/settings-docs.h.in:354
-+#: ../clients/common/settings-docs.h.in:376
- msgid ""
- "D-Bus service name of the VPN plugin that this setting uses to connect to "
- "its network. i.e. org.freedesktop.NetworkManager.vpnc for the vpnc plugin."
- msgstr "この設定がネットワークに接続するのに使用する VPN プラグインの D-Bus サービス名。vpnc プラグインの場合は org.freedesktop.NetworkManager.vpnc です。"
-
--#: ../clients/common/settings-docs.h.in:355
-+#: ../clients/common/settings-docs.h.in:377
- 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 "
-@@ -8215,7 +8495,7 @@ msgid ""
- "Values greater than zero mean timeout in seconds."
- msgstr "VPN の接続確立に関するタイムアウト。一部のサービスでは接続に時間がかかる場合があります。値を 0 にすると、デフォルトのタイムアウトの 60 秒となります (設定ファイルで vpn.timeout を上書きしていない場合)。ゼロ以外の値を設定した場合は、それがタイムアウト (秒単位) となります。"
-
--#: ../clients/common/settings-docs.h.in:356
-+#: ../clients/common/settings-docs.h.in:378
- 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 "
-@@ -8225,92 +8505,96 @@ msgid ""
- "connection."
- msgstr "VPN 接続で、認証のユーザー名が必要になる場合は、ここで提供する必要があります。その接続が複数のユーザーで利用でき、VPN で各ユーザーの名前を提供する必要がある場合は、このプロパティーを空にしたままにします。このプロパティーを空にすると、NetworkManager は、VPN 接続を要求するユーザーのユーザー名を自動的に提供します。"
-
--#: ../clients/common/settings-docs.h.in:357
-+#: ../clients/common/settings-docs.h.in:379
-+msgid "The routing table for this VRF."
-+msgstr "この VRF のルーティングテーブル。"
-+
-+#: ../clients/common/settings-docs.h.in:380
- msgid "Specifies the lifetime in seconds of FDB entries learnt by the kernel."
- msgstr "カーネルが学習する FDB エントリーの存続時間 (秒単位) を指定します。"
-
--#: ../clients/common/settings-docs.h.in:358
-+#: ../clients/common/settings-docs.h.in:381
- msgid ""
- "Specifies the UDP destination port to communicate to the remote VXLAN tunnel "
- "endpoint."
- msgstr "リモートの VXLAN トンネルエンドポイントに接続する UDP 宛先ポートを指定します。"
-
--#: ../clients/common/settings-docs.h.in:359
-+#: ../clients/common/settings-docs.h.in:382
- msgid ""
- "Specifies the VXLAN Network Identifier (or VXLAN Segment Identifier) to use."
- msgstr "使用する VXLAN ネットワーク識別子 (または VXLAN セグメント識別子) を指定します。"
-
--#: ../clients/common/settings-docs.h.in:360
-+#: ../clients/common/settings-docs.h.in:383
- msgid "Specifies whether netlink LL ADDR miss notifications are generated."
- msgstr "ネットリンク LL ADDR が欠落している通知が生成されるかどうかを指定します。"
-
--#: ../clients/common/settings-docs.h.in:361
-+#: ../clients/common/settings-docs.h.in:384
- msgid "Specifies whether netlink IP ADDR miss notifications are generated."
- msgstr "ネットリンク IP ADDR が欠落している通知が生成されるかどうかを指定します。"
-
--#: ../clients/common/settings-docs.h.in:362
-+#: ../clients/common/settings-docs.h.in:385
- 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:363
-+#: ../clients/common/settings-docs.h.in:386
- 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:364
-+#: ../clients/common/settings-docs.h.in:387
- msgid "If given, specifies the source IP address to use in outgoing packets."
- msgstr "指定した場合は、送信パケットで使用するソースの IP アドレスを指定します。"
-
--#: ../clients/common/settings-docs.h.in:365
-+#: ../clients/common/settings-docs.h.in:388
- msgid ""
- "If given, specifies the parent interface name or parent connection UUID."
- msgstr "指定した場合は、親インターフェース名または親接続の UUID を指定します。"
-
--#: ../clients/common/settings-docs.h.in:366
-+#: ../clients/common/settings-docs.h.in:389
- msgid "Specifies whether ARP proxy is turned on."
- msgstr "ARP プロキシーをオンにするかどうかを指定します"
-
--#: ../clients/common/settings-docs.h.in:367
-+#: ../clients/common/settings-docs.h.in:390
- msgid ""
- "Specifies the unicast destination IP address to use in outgoing packets when "
- "the destination link layer address is not known in the VXLAN device "
- "forwarding database, or the multicast IP address to join."
- msgstr "宛先リンクレイヤーアドレスが VXLAN デバイス転送データベースにない場合に、出力パケットで使用するユニキャストの宛先 IP アドレス、または参加するマルチキャスト IP アドレスを指定します。"
-
--#: ../clients/common/settings-docs.h.in:368
-+#: ../clients/common/settings-docs.h.in:391
- msgid "Specifies whether route short circuit is turned on."
- msgstr "ルートのショートサーキットがオンになっているかどうかを指定します。"
-
--#: ../clients/common/settings-docs.h.in:369
-+#: ../clients/common/settings-docs.h.in:392
- msgid ""
- "Specifies the maximum UDP source port to communicate to the remote VXLAN "
- "tunnel endpoint."
- msgstr "リモート VXLAN のトンネルエンドポイントに接続する最大 UDP ソースポートを指定します。"
-
--#: ../clients/common/settings-docs.h.in:370
-+#: ../clients/common/settings-docs.h.in:393
- msgid ""
- "Specifies the minimum UDP source port to communicate to the remote VXLAN "
- "tunnel endpoint."
- msgstr "リモートの VXLAN トンネルエンドポイントに接続するための最小 UDP ソースポートを指定します。"
-
--#: ../clients/common/settings-docs.h.in:371
-+#: ../clients/common/settings-docs.h.in:394
- msgid "Specifies the TOS value to use in outgoing packets."
- msgstr "送信パケットで使用する TOS 値を指定します。"
-
--#: ../clients/common/settings-docs.h.in:372
-+#: ../clients/common/settings-docs.h.in:395
- msgid "Specifies the time-to-live value to use in outgoing packets."
- msgstr "送信パケットで使用する生存時間の値を使用します。"
-
--#: ../clients/common/settings-docs.h.in:373
-+#: ../clients/common/settings-docs.h.in:396
- 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:374
-+#: ../clients/common/settings-docs.h.in:397
- 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 "
-@@ -8319,27 +8603,27 @@ msgid ""
- "client."
- msgstr "Wi-Fi Display (WFD) Information Elements (IEs) の設定。Wi-Fi Display は、特定の Wi-Fi フレームにプロトコル指定の情報エレメントを設定する必要があります。これらは、接続を確立する目的でここで指定できます。この設定は、Wi-Fi Display クライアントを実装する場合にのみ役立ちます。"
-
--#: ../clients/common/settings-docs.h.in:375
-+#: ../clients/common/settings-docs.h.in:398
- 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 が最適なメソッドの使用を自動的に決定するため、デフォルト設定を変更する利点はほとんどありません。"
-
--#: ../clients/common/settings-docs.h.in:376
-+#: ../clients/common/settings-docs.h.in:399
- msgid ""
- "If specified, this connection will only apply to the WiMAX device whose MAC "
- "address matches. This property does not change the MAC address of the device "
- "(known as MAC spoofing). Deprecated: 1"
- msgstr "指定すると、この接続は MAC アドレスに一致する WiMAX デバイスにのみ適用されます。このプロパティーはデバイスの MAC アドレスを変更しません (MAC スプーフィングとして知られています)。非推奨: 1"
-
--#: ../clients/common/settings-docs.h.in:377
-+#: ../clients/common/settings-docs.h.in:400
- 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:378
-+#: ../clients/common/settings-docs.h.in:401
- msgid ""
- "The use of fwmark is optional and is by default off. Setting it to 0 "
- "disables it. Otherwise it is a 32-bit fwmark for outgoing packets. Note that "
-@@ -8347,29 +8631,32 @@ msgid ""
- "automatically choose a fwmark."
- msgstr "fwmark の使用はオプションで、デフォルトでオフに設定されています。これを 0 に設定すると、無効化されます。無効化されなければ、出力パケットでは 32 ビットの fwmark です。\"ip4-auto-default-route\" または \"ip6-auto-default-route\" が有効化されている場合は、自動的に fwmark が選択されることを意味する点に注意してください。"
-
--#: ../clients/common/settings-docs.h.in:379
-+#: ../clients/common/settings-docs.h.in:402
- msgid ""
- "Whether to enable special handling of the IPv4 default route. If enabled, "
--"the IPv4 default route will be placed to a dedicated routing-table and two "
--"policy routing rules will be added. The fwmark number is also used as "
--"routing-table for the default-route, and if fwmark is zero, a unused fwmark/"
--"table is chosen automatically. This corresponds to what wg-quick does with "
--"Table=auto. Leaving this at the default will enable this option "
--"automatically if ipv4.never-default is not set and there are any peers that "
--"use a default-route as allowed-ips."
--msgstr "IPv4 デフォルトルートの特別処理を有効化するかどうか。有効化された場合、IPv4 デフォルトルートは専用のルーティングテーブルに置かれ、2 つのポリシールーティングルールが追加されます。fwmark 番号はデフォルトルートのルーティングテーブルとしても使用され、fwmark がゼロの場合、未使用の fwmark/table が自動的に選択されます。これは、wg-quick が Table=auto で行っていることに対応しています。ipv4.never-default が設定されておらず、デフォルトルートを allowed-ips として使用するピアがある場合、これをデフォルトのままにしておくと、このオプションが自動的に有効化されます。"
--
--#: ../clients/common/settings-docs.h.in:380
-+"the IPv4 default route from wireguard.peer-routes will be placed to a "
-+"dedicated routing-table and two policy routing rules will be added. The "
-+"fwmark number is also used as routing-table for the default-route, and if "
-+"fwmark is zero, an unused fwmark/table is chosen automatically. This "
-+"corresponds to what wg-quick does with Table=auto and what WireGuard calls "
-+"\"Improved Rule-based Routing\". Note that for this automatism to work, you "
-+"usually don't want to set ipv4.gateway, because that will result in a "
-+"conflicting default route. Leaving this at the default will enable this "
-+"option automatically if ipv4.never-default is not set and there are any "
-+"peers that use a default-route as allowed-ips."
-+msgstr "IPv4デフォルトルートの特別な処理を有効にするかどうか。有効にすると、wireguard.peer-routes からの IPv4 デフォルトルートが専用のルーティングテーブルに置かれ、2 つのポリシールーティングルールが追加されます。fwmark 番号は default-route のルーティングテーブルとしても使用されます。fwmark がゼロの場合は、未使用の fwmark/テーブルが自動的に選択されます。これは wg-quick が Table=auto と WireGuard が \"Improved Rule-based Routing\" と呼ぶものに対応します。このオートマティズムが動作するために、通常は ipv4.gateway は設定しないほうがよい点に注意してください。ipv4.never-default が設定されておらず、デフォルトルートを使用しているピアがある場合は、これをデフォルトのままにしておくと、自動的にこのオプションが有効になります。"
-+
-+#: ../clients/common/settings-docs.h.in:403
- msgid "Like ip4-auto-default-route, but for the IPv6 default route."
- msgstr "ip4-auto-default-route と同じだが、IPv6 デフォルトルート向け。"
-
--#: ../clients/common/settings-docs.h.in:381
-+#: ../clients/common/settings-docs.h.in:404
- 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:382
-+#: ../clients/common/settings-docs.h.in:405
- 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 "
-@@ -8377,94 +8664,98 @@ msgid ""
- "account the current routes at the time of activation."
- msgstr "ゼロ以外は、指定したサイズ以下のパケットだけが送信されます。指定より大きなパケットは、複数のフラグメントに分割されます。ゼロの場合は、デフォルトの MTU を使用します。wg-quick の MTU 設定とは対照的に、これはアクティベーション時に現行のルートについて考慮しない点に注意してください。"
-
--#: ../clients/common/settings-docs.h.in:383
-+#: ../clients/common/settings-docs.h.in:406
- msgid ""
- "Whether to automatically add routes for the AllowedIPs ranges of the peers. "
- "If TRUE (the default), NetworkManager will automatically add routes in the "
--"routing tables according to ipv4.route-table and ipv6.route-table. If FALSE, "
--"no such routes are added automatically. In this case, the user may want to "
--"configure static routes in ipv4.routes and ipv6.routes, respectively."
--msgstr "ピアの AllowedIPs 範囲にルートを自動的に追加するかどうか。TRUE (デフォルト) の場合、NetworkManager は ipv4.route-table および ipv6.route-table に従って、ルーティングテーブルにルートを自動的に追加します。FALSE の場合、このようなルートは自動的に追加されません。この場合、ユーザーが ipv4.routes および ipv6.routes のそれぞれに静的ルートを設定することをおすすめします。"
--
--#: ../clients/common/settings-docs.h.in:384
-+"routing tables according to ipv4.route-table and ipv6.route-table. Usually "
-+"you want this automatism enabled. 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. Note that if the peer's "
-+"AllowedIPs is \"0.0.0.0/0\" or \"::/0\" and the profile's ipv4.never-default "
-+"or ipv6.never-default setting is enabled, the peer route for this peer won't "
-+"be added automatically."
-+msgstr "ピアの AllowedIPs 範囲のルートを自動的に追加するかどうか。TRUE (デフォルト) の場合、NetworkManager は ipv4.route-table および ipv6.route-table に従ってルーティングテーブルに自動的にルートを追加します。通常はこの自動化を有効にします。FALSE の場合、そのようなルートは自動的に追加されません。この場合、ipv4.routes と ipv6.routes にそれぞれ静的なルートを設定したい場合があります。ピアの AllowedIPs が \"0.0.0.0.0/0\" または \"::/0\" で、プロファイルの ipv4.never-default または ipv6.never-default の設定が有効になっている場合、このピアのピアルートは自動的に追加されないことに注意してください。"
-+
-+#: ../clients/common/settings-docs.h.in:407
- msgid "The 256 bit private-key in base64 encoding."
- msgstr "base64 エンコードにおける 256 ビットのプライベートキー。"
-
--#: ../clients/common/settings-docs.h.in:385
-+#: ../clients/common/settings-docs.h.in:408
- msgid "Flags indicating how to handle the \"private-key\" property."
- msgstr "\"private-key\" プロパティーの処理方法を示すフラグ。"
-
--#: ../clients/common/settings-docs.h.in:386
-+#: ../clients/common/settings-docs.h.in:409
- 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:387
-+#: ../clients/common/settings-docs.h.in:410
- msgid ""
- "If specified, this connection will only apply to the IEEE 802.15.4 (WPAN) "
- "MAC layer device whose permanent MAC address matches."
- msgstr "指定すると、この接続は永続的な MAC アドレスに一致する IEEE 802.15.4 (WPAN) MAC 層デバイスにのみ適用されます。"
-
--#: ../clients/common/settings-docs.h.in:388
-+#: ../clients/common/settings-docs.h.in:411
- 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:389
-+#: ../clients/common/settings-docs.h.in:412
- msgid "IEEE 802.15.4 Personal Area Network (PAN) identifier."
- msgstr "IEEE 802.15.4 パーソナルエリアネットワーク (PAN) 識別子。"
-
--#: ../clients/common/settings-docs.h.in:390
-+#: ../clients/common/settings-docs.h.in:413
- msgid "Short IEEE 802.15.4 address to be used within a restricted environment."
- msgstr "限定環境内にて使用される IEEE 802.15.4 のショートアドレス"
-
--#: ../clients/nm-online.c:75
-+#: ../clients/nm-online.c:77
- msgid "Connecting"
- msgstr "接続中"
-
--#: ../clients/nm-online.c:191
-+#: ../clients/nm-online.c:193
- #, c-format
- msgid "Error: timeout creating NMClient object\n"
- msgstr "エラー: NMClient オブジェクトの作成でタイムアウト\n"
-
--#: ../clients/nm-online.c:211
-+#: ../clients/nm-online.c:216
- #, c-format
- msgid "Error: Could not create NMClient object: %s\n"
- msgstr "エラー: NMClient オブジェクトを作成できませんでした: %s\n"
-
--#: ../clients/nm-online.c:237
-+#: ../clients/nm-online.c:240
- msgid "Don't print anything"
- msgstr "出力を抑制する"
-
--#: ../clients/nm-online.c:238
-+#: ../clients/nm-online.c:241
- msgid "Wait for NetworkManager startup instead of a connection"
- msgstr "接続の代わりに NetworkManager の起動を待機します"
-
--#: ../clients/nm-online.c:239
-+#: ../clients/nm-online.c:242
- msgid ""
- "Time to wait for a connection, in seconds (without the option, default value "
- "is 30)"
- msgstr "接続を待機する時間を秒単位で指定する (オプションなしの場合、デフォルト値は 30)"
-
--#: ../clients/nm-online.c:240
-+#: ../clients/nm-online.c:243
- msgid "Exit immediately if NetworkManager is not running or connecting"
- msgstr "NetworkManager が実行中または接続中でない場合は直ちに終了します"
-
--#: ../clients/nm-online.c:260
-+#: ../clients/nm-online.c:265
- msgid ""
- "Waits for NetworkManager to finish activating startup network connections."
- msgstr "NetworkManager により、スタートアップネットワーク接続のアクティベートが完了されるのを待機します。"
-
--#: ../clients/nm-online.c:267 ../clients/nm-online.c:273
-+#: ../clients/nm-online.c:272 ../clients/nm-online.c:278
- msgid "Invalid option. Please use --help to see a list of valid options."
- msgstr "無効なオプションです。--help を使用して有効なオプションの一覧を確認してください。"
-
- #: ../clients/tui/newt/nmt-newt-utils.c:163 ../clients/tui/nmt-editor.c:420
- #: ../clients/tui/nmt-password-dialog.c:161
- #: ../clients/tui/nmt-route-editor.c:109 ../clients/tui/nmtui-hostname.c:56
--#: ../clients/tui/nmtui.c:121
-+#: ../clients/tui/nmtui.c:123
- msgid "OK"
- msgstr "OK"
-
-@@ -8484,105 +8775,105 @@ msgstr "エディタが失敗しました: %s"
- msgid "Could not re-read file: %s"
- msgstr "ファイルの再読み込みができませんでした: %s"
-
--#: ../clients/tui/nm-editor-utils.c:140 ../libnm/nm-device.c:1455
-+#: ../clients/tui/nm-editor-utils.c:135 ../libnm/nm-device.c:1567
- msgid "Ethernet"
- msgstr "Ethernet"
-
--#: ../clients/tui/nm-editor-utils.c:144
-+#: ../clients/tui/nm-editor-utils.c:139
- #, c-format
- msgid "Ethernet connection %d"
- msgstr "Ethernet 接続 %d"
-
--#: ../clients/tui/nm-editor-utils.c:148 ../libnm/nm-device.c:1457
-+#: ../clients/tui/nm-editor-utils.c:143 ../libnm/nm-device.c:1569
- msgid "Wi-Fi"
- msgstr "Wi-Fi"
-
--#: ../clients/tui/nm-editor-utils.c:152
-+#: ../clients/tui/nm-editor-utils.c:147
- #, c-format
- msgid "Wi-Fi connection %d"
- msgstr "Wi-Fi 接続 %d"
-
--#: ../clients/tui/nm-editor-utils.c:157 ../libnm-core/nm-connection.c:2752
--#: ../libnm/nm-device.c:1473
-+#: ../clients/tui/nm-editor-utils.c:152 ../libnm-core/nm-connection.c:2713
-+#: ../libnm/nm-device.c:1585
- msgid "InfiniBand"
- msgstr "InfiniBand"
-
--#: ../clients/tui/nm-editor-utils.c:161
-+#: ../clients/tui/nm-editor-utils.c:156
- #, c-format
- msgid "InfiniBand connection %d"
- msgstr "InfiniBand 接続 %d"
-
--#: ../clients/tui/nm-editor-utils.c:166 ../libnm/nm-device.c:1471
-+#: ../clients/tui/nm-editor-utils.c:161 ../libnm/nm-device.c:1583
- msgid "Mobile Broadband"
- msgstr "モバイルブロードバンド"
-
--#: ../clients/tui/nm-editor-utils.c:169
-+#: ../clients/tui/nm-editor-utils.c:164
- #, c-format
- msgid "Mobile broadband connection %d"
- msgstr "モバイルブロードバンド接続 %d"
-
--#: ../clients/tui/nm-editor-utils.c:175 ../clients/tui/nmt-page-dsl.c:49
-+#: ../clients/tui/nm-editor-utils.c:170 ../clients/tui/nmt-page-dsl.c:49
- msgid "DSL"
- msgstr "DSL"
-
--#: ../clients/tui/nm-editor-utils.c:179
-+#: ../clients/tui/nm-editor-utils.c:174
- #, c-format
- msgid "DSL connection %d"
- msgstr "DSL 接続 %d"
-
--#: ../clients/tui/nm-editor-utils.c:184 ../libnm-core/nm-connection.c:2744
--#: ../libnm/nm-device.c:1475
--#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4959
-+#: ../clients/tui/nm-editor-utils.c:179 ../libnm-core/nm-connection.c:2705
-+#: ../libnm/nm-device.c:1587
-+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5216
- msgid "Bond"
- msgstr "ボンド"
-
--#: ../clients/tui/nm-editor-utils.c:188
-+#: ../clients/tui/nm-editor-utils.c:183
- #, c-format
- msgid "Bond connection %d"
- msgstr "ボンド接続 %d"
-
--#: ../clients/tui/nm-editor-utils.c:193 ../libnm-core/nm-connection.c:2748
--#: ../libnm/nm-device.c:1479
--#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5314
-+#: ../clients/tui/nm-editor-utils.c:188 ../libnm-core/nm-connection.c:2709
-+#: ../libnm/nm-device.c:1591
-+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5599
- msgid "Bridge"
- msgstr "ブリッジ"
-
--#: ../clients/tui/nm-editor-utils.c:198
-+#: ../clients/tui/nm-editor-utils.c:193
- #, c-format
- msgid "Bridge connection %d"
- msgstr "ブリッジ接続 %d"
-
--#: ../clients/tui/nm-editor-utils.c:202 ../libnm-core/nm-connection.c:2746
--#: ../libnm/nm-device.c:1477
--#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5032
-+#: ../clients/tui/nm-editor-utils.c:197 ../libnm-core/nm-connection.c:2707
-+#: ../libnm/nm-device.c:1589
-+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5289
- msgid "Team"
- msgstr "team"
-
--#: ../clients/tui/nm-editor-utils.c:207
-+#: ../clients/tui/nm-editor-utils.c:202
- #, c-format
- msgid "Team connection %d"
- msgstr "team 接続 %d"
-
--#: ../clients/tui/nm-editor-utils.c:211 ../clients/tui/nmt-page-vlan.c:69
--#: ../libnm-core/nm-connection.c:2750 ../libnm/nm-device.c:1481
-+#: ../clients/tui/nm-editor-utils.c:206 ../clients/tui/nmt-page-vlan.c:69
-+#: ../libnm-core/nm-connection.c:2711 ../libnm/nm-device.c:1593
- msgid "VLAN"
- msgstr "VLAN"
-
--#: ../clients/tui/nm-editor-utils.c:215
-+#: ../clients/tui/nm-editor-utils.c:210
- #, c-format
- msgid "VLAN connection %d"
- msgstr "VLAN 接続 %d"
-
--#: ../clients/tui/nm-editor-utils.c:219 ../clients/tui/nmt-page-ip-tunnel.c:123
-+#: ../clients/tui/nm-editor-utils.c:214 ../clients/tui/nmt-page-ip-tunnel.c:123
- msgid "IP tunnel"
- msgstr "IP トンネル"
-
--#: ../clients/tui/nm-editor-utils.c:223
-+#: ../clients/tui/nm-editor-utils.c:218
- #, c-format
- msgid "IP tunnel connection %d"
- msgstr "IP トンネル接続 %d"
-
--#: ../clients/tui/nm-editor-utils.c:238
-+#: ../clients/tui/nm-editor-utils.c:233
- #, c-format
- msgid "VPN connection %d"
- msgstr "VPN 接続 %d"
-@@ -8719,7 +9010,7 @@ msgid "Slaves"
- msgstr "スレーブ"
-
- #: ../clients/tui/nmt-page-bond.c:365 ../clients/tui/nmt-page-ip-tunnel.c:135
--#: ../clients/tui/nmt-page-wifi.c:218
-+#: ../clients/tui/nmt-page-wifi.c:219
- msgid "Mode"
- msgstr "モード"
-
-@@ -8754,7 +9045,7 @@ msgid "ARP targets"
- msgstr "ARP ターゲット"
-
- #: ../clients/tui/nmt-page-bond.c:418 ../clients/tui/nmt-page-ethernet.c:64
--#: ../clients/tui/nmt-page-vlan.c:97 ../clients/tui/nmt-page-wifi.c:353
-+#: ../clients/tui/nmt-page-vlan.c:97 ../clients/tui/nmt-page-wifi.c:354
- msgid "Cloned MAC address"
- msgstr "クローンの MAC アドレス"
-
-@@ -8819,7 +9110,7 @@ msgstr "Ethernet"
- #: ../clients/tui/nmt-page-ethernet.c:70
- #: ../clients/tui/nmt-page-infiniband.c:81
- #: ../clients/tui/nmt-page-ip-tunnel.c:173 ../clients/tui/nmt-page-vlan.c:103
--#: ../clients/tui/nmt-page-wifi.c:359
-+#: ../clients/tui/nmt-page-wifi.c:360
- msgid "MTU"
- msgstr "MTU"
-
-@@ -9111,63 +9402,67 @@ msgstr "動的 WEP (802.1x)"
- msgid "LEAP"
- msgstr "LEAP"
-
--#: ../clients/tui/nmt-page-wifi.c:79
-+#: ../clients/tui/nmt-page-wifi.c:75
-+msgid "Enhanced Open (OWE)"
-+msgstr "Enhanced Open (OWE)"
-+
-+#: ../clients/tui/nmt-page-wifi.c:80
- msgctxt "WEP key index"
- msgid "1 (Default)"
- msgstr "1 (デフォルト)"
-
--#: ../clients/tui/nmt-page-wifi.c:80
-+#: ../clients/tui/nmt-page-wifi.c:81
- msgctxt "WEP key index"
- msgid "2"
- msgstr "2"
-
--#: ../clients/tui/nmt-page-wifi.c:81
-+#: ../clients/tui/nmt-page-wifi.c:82
- msgctxt "WEP key index"
- msgid "3"
- msgstr "3"
-
--#: ../clients/tui/nmt-page-wifi.c:82
-+#: ../clients/tui/nmt-page-wifi.c:83
- msgctxt "WEP key index"
- msgid "4"
- msgstr "4"
-
--#: ../clients/tui/nmt-page-wifi.c:87
-+#: ../clients/tui/nmt-page-wifi.c:88
- msgid "Open System"
- msgstr "Open System"
-
--#: ../clients/tui/nmt-page-wifi.c:88
-+#: ../clients/tui/nmt-page-wifi.c:89
- msgid "Shared Key"
- msgstr "共有キー"
-
--#: ../clients/tui/nmt-page-wifi.c:202
-+#: ../clients/tui/nmt-page-wifi.c:203
- msgid "WI-FI"
- msgstr "WI-FI"
-
--#: ../clients/tui/nmt-page-wifi.c:244
-+#: ../clients/tui/nmt-page-wifi.c:245
- msgid "Channel"
- msgstr "チャンネル"
-
- #. "wpa-enterprise"
- #. FIXME
--#: ../clients/tui/nmt-page-wifi.c:271
-+#: ../clients/tui/nmt-page-wifi.c:272
- msgid "(No support for wpa-enterprise yet...)"
- msgstr "(現在、WPA エンタープライズには対応していません...)"
-
--#: ../clients/tui/nmt-page-wifi.c:281 ../clients/tui/nmt-page-wifi.c:300
-+#: ../clients/tui/nmt-page-wifi.c:282 ../clients/tui/nmt-page-wifi.c:301
- msgid "WEP index"
- msgstr "WEP インデックス"
-
--#: ../clients/tui/nmt-page-wifi.c:289 ../clients/tui/nmt-page-wifi.c:308
-+#: ../clients/tui/nmt-page-wifi.c:290 ../clients/tui/nmt-page-wifi.c:309
- msgid "Authentication"
- msgstr "認証"
-
- #. "dynamic-wep"
- #. FIXME
--#: ../clients/tui/nmt-page-wifi.c:314
-+#: ../clients/tui/nmt-page-wifi.c:315
- msgid "(No support for dynamic-wep yet...)"
- msgstr "(現在、動的 WEP には対応していません...)"
-
--#: ../clients/tui/nmt-page-wifi.c:347
-+#: ../clients/tui/nmt-page-wifi.c:348
- msgid "BSSID"
- msgstr "BSSID"
-
-@@ -9238,38 +9533,43 @@ msgstr "openconnect がシグナル %d で失敗しました"
- msgid "Activation failed: %s"
- msgstr "アクティベーションに失敗: %s"
-
--#: ../clients/tui/nmtui-connect.c:241
-+#: ../clients/tui/nmtui-connect.c:230
-+#, c-format
-+msgid "Could not deactivate connection: %s"
-+msgstr "接続を解除できませんでした: %s"
-+
-+#: ../clients/tui/nmtui-connect.c:252
- msgid "Connecting..."
- msgstr "接続中..."
-
--#: ../clients/tui/nmtui-connect.c:279 ../clients/tui/nmtui-connect.c:316
-+#: ../clients/tui/nmtui-connect.c:290 ../clients/tui/nmtui-connect.c:327
- #, c-format
- msgid "Could not activate connection: %s"
- msgstr "接続をアクティベートできませんでした: %s"
-
--#: ../clients/tui/nmtui-connect.c:378 ../clients/tui/nmtui-connect.c:427
-+#: ../clients/tui/nmtui-connect.c:389 ../clients/tui/nmtui-connect.c:438
- msgid "Activate"
- msgstr "アクティベート"
-
--#: ../clients/tui/nmtui-connect.c:380
-+#: ../clients/tui/nmtui-connect.c:391
- msgid "Deactivate"
- msgstr "解除"
-
--#: ../clients/tui/nmtui-connect.c:432 ../clients/tui/nmtui-edit.c:105
--#: ../clients/tui/nmtui.c:115
-+#: ../clients/tui/nmtui-connect.c:443 ../clients/tui/nmtui-edit.c:105
-+#: ../clients/tui/nmtui.c:117
- msgid "Quit"
- msgstr "終了"
-
--#: ../clients/tui/nmtui-connect.c:432 ../clients/tui/nmtui-edit.c:105
-+#: ../clients/tui/nmtui-connect.c:443 ../clients/tui/nmtui-edit.c:105
- msgid "Back"
- msgstr "戻る"
-
--#: ../clients/tui/nmtui-connect.c:455
-+#: ../clients/tui/nmtui-connect.c:466
- #, c-format
- msgid "No such connection '%s'"
- msgstr "そのような接続 '%s' はありません"
-
--#: ../clients/tui/nmtui-connect.c:457
-+#: ../clients/tui/nmtui-connect.c:468
- msgid "Connection is already active"
- msgstr "接続はすでにアクティブになっています"
-
-@@ -9325,51 +9625,47 @@ msgstr "ホスト名を '%s' に設定します"
- msgid "Unable to set hostname: %s"
- msgstr "ホスト名を設定できません: %s"
-
--#: ../clients/tui/nmtui.c:38 ../clients/tui/nmtui.c:41
-+#: ../clients/tui/nmtui.c:40 ../clients/tui/nmtui.c:43
- msgid "connection"
- msgstr "接続"
-
--#: ../clients/tui/nmtui.c:39
-+#: ../clients/tui/nmtui.c:41
- msgid "Edit a connection"
- msgstr "接続の編集"
-
--#: ../clients/tui/nmtui.c:42
-+#: ../clients/tui/nmtui.c:44
- msgid "Activate a connection"
- msgstr "接続をアクティベートする"
-
--#: ../clients/tui/nmtui.c:44
-+#: ../clients/tui/nmtui.c:46
- msgid "new hostname"
- msgstr "新規のホスト名"
-
--#: ../clients/tui/nmtui.c:45
-+#: ../clients/tui/nmtui.c:47
- msgid "Set system hostname"
- msgstr "システムのホスト名を設定する"
-
--#: ../clients/tui/nmtui.c:89
-+#: ../clients/tui/nmtui.c:91
- msgid "NetworkManager TUI"
- msgstr "NetworkManager TUI"
-
--#: ../clients/tui/nmtui.c:97
-+#: ../clients/tui/nmtui.c:99
- msgid "Please select an option"
- msgstr "オプションを選択してください"
-
--#: ../clients/tui/nmtui.c:145
-+#: ../clients/tui/nmtui.c:147
- msgid "Usage"
- msgstr "使い方"
-
--#: ../clients/tui/nmtui.c:226
-+#: ../clients/tui/nmtui.c:228
- msgid "Could not parse arguments"
- msgstr "引数を解析できませんでした"
-
--#: ../clients/tui/nmtui.c:236
-+#: ../clients/tui/nmtui.c:241
- #, c-format
- msgid "Could not contact NetworkManager: %s.\n"
- msgstr "NetworkManager に接続できませんでした: %s.\n"
-
--#: ../clients/tui/nmtui.c:241
--msgid "NetworkManager is not running."
--msgstr "NetworkManager が実行していません。"
--
- #: ../libnm-core/nm-crypto.c:204
- #, c-format
- msgid "PEM key file had no start tag"
-@@ -9496,12 +9792,12 @@ msgstr "無効なプライベートキー"
- msgid "Failed to initialize the crypto engine."
- msgstr "暗号化エンジンの初期化に失敗しました。"
-
--#: ../libnm-core/nm-crypto-gnutls.c:90 ../libnm-core/nm-crypto-nss.c:112
-+#: ../libnm-core/nm-crypto-gnutls.c:90 ../libnm-core/nm-crypto-nss.c:114
- #, c-format
- msgid "Unsupported key cipher for decryption"
- msgstr "解読がサポートされていないキーの暗号文"
-
--#: ../libnm-core/nm-crypto-gnutls.c:100 ../libnm-core/nm-crypto-nss.c:119
-+#: ../libnm-core/nm-crypto-gnutls.c:100 ../libnm-core/nm-crypto-nss.c:121
- #, c-format
- msgid "Invalid IV length (must be at least %u)."
- msgstr "IV の長さが無効です (最低でも %u が必要)。"
-@@ -9516,17 +9812,17 @@ msgstr "復号化暗号文コンテキストの初期化に失敗しました: %
- msgid "Failed to decrypt the private key: %s (%s)"
- msgstr "プライベートキーの復号に失敗しました: %s (%s)"
-
--#: ../libnm-core/nm-crypto-gnutls.c:143 ../libnm-core/nm-crypto-nss.c:206
-+#: ../libnm-core/nm-crypto-gnutls.c:143 ../libnm-core/nm-crypto-nss.c:208
- #, c-format
- msgid "Failed to decrypt the private key: unexpected padding length."
- msgstr "プライベートキーの復号に失敗しました: 予想外の不要語句の長さです。"
-
--#: ../libnm-core/nm-crypto-gnutls.c:154 ../libnm-core/nm-crypto-nss.c:217
-+#: ../libnm-core/nm-crypto-gnutls.c:154 ../libnm-core/nm-crypto-nss.c:219
- #, c-format
- msgid "Failed to decrypt the private key."
- msgstr "プライベートキーの復号に失敗しました。"
-
--#: ../libnm-core/nm-crypto-gnutls.c:188 ../libnm-core/nm-crypto-nss.c:272
-+#: ../libnm-core/nm-crypto-gnutls.c:188 ../libnm-core/nm-crypto-nss.c:274
- #, c-format
- msgid "Unsupported key cipher for encryption"
- msgstr "暗号化がサポートされていないキーの暗号文"
-@@ -9576,107 +9872,107 @@ msgstr "PKCS#8 デコーダーを初期化できませんでした: %s"
- msgid "Couldn't decode PKCS#8 file: %s"
- msgstr "PKCS#8 ファイルをデコードできませんでした: %s"
-
--#: ../libnm-core/nm-crypto-nss.c:65
-+#: ../libnm-core/nm-crypto-nss.c:67
- #, c-format
- msgid "Failed to initialize the crypto engine: %d."
- msgstr "暗号化エンジンの初期化に失敗しました: %d。"
-
--#: ../libnm-core/nm-crypto-nss.c:131
-+#: ../libnm-core/nm-crypto-nss.c:133
- #, c-format
- msgid "Failed to initialize the decryption cipher slot."
- msgstr "復号化暗号文スロットの初期化に失敗しました。"
-
--#: ../libnm-core/nm-crypto-nss.c:141
-+#: ../libnm-core/nm-crypto-nss.c:143
- #, c-format
- msgid "Failed to set symmetric key for decryption."
- msgstr "復号化用シンメトリックキーの設定に失敗しました。"
-
--#: ../libnm-core/nm-crypto-nss.c:151
-+#: ../libnm-core/nm-crypto-nss.c:153
- #, c-format
- msgid "Failed to set IV for decryption."
- msgstr "復号化用 IV の設定に失敗しました。"
-
--#: ../libnm-core/nm-crypto-nss.c:159
-+#: ../libnm-core/nm-crypto-nss.c:161
- #, c-format
- msgid "Failed to initialize the decryption context."
- msgstr "復号化コンテキストの初期化に失敗しました。"
-
--#: ../libnm-core/nm-crypto-nss.c:175
-+#: ../libnm-core/nm-crypto-nss.c:177
- #, c-format
- msgid "Failed to decrypt the private key: %d."
- msgstr "プライベートキーの復号に失敗しました: %d"
-
--#: ../libnm-core/nm-crypto-nss.c:183
-+#: ../libnm-core/nm-crypto-nss.c:185
- #, c-format
- msgid "Failed to decrypt the private key: decrypted data too large."
- msgstr "プライベートキーの復号に失敗しました: 復号したデータが大きすぎます。"
-
--#: ../libnm-core/nm-crypto-nss.c:194
-+#: ../libnm-core/nm-crypto-nss.c:196
- #, c-format
- msgid "Failed to finalize decryption of the private key: %d."
- msgstr "プライベートキー復号化の完了に失敗しました: %d"
-
--#: ../libnm-core/nm-crypto-nss.c:283
-+#: ../libnm-core/nm-crypto-nss.c:285
- #, c-format
- msgid "Failed to initialize the encryption cipher slot."
- msgstr "暗号化暗号文スロットの初期化に失敗しました。"
-
--#: ../libnm-core/nm-crypto-nss.c:291
-+#: ../libnm-core/nm-crypto-nss.c:293
- #, c-format
- msgid "Failed to set symmetric key for encryption."
- msgstr "暗号化用のシンメトリックキーの設定に失敗しました。"
-
--#: ../libnm-core/nm-crypto-nss.c:299
-+#: ../libnm-core/nm-crypto-nss.c:301
- #, c-format
- msgid "Failed to set IV for encryption."
- msgstr "暗号化用の IV の設定に失敗しました。"
-
--#: ../libnm-core/nm-crypto-nss.c:307
-+#: ../libnm-core/nm-crypto-nss.c:309
- #, c-format
- msgid "Failed to initialize the encryption context."
- msgstr "暗号化コンテキストの初期化に失敗しました。"
-
--#: ../libnm-core/nm-crypto-nss.c:330
-+#: ../libnm-core/nm-crypto-nss.c:332
- #, c-format
- msgid "Failed to encrypt: %d."
- msgstr "暗号化に失敗しました: %d"
-
--#: ../libnm-core/nm-crypto-nss.c:338
-+#: ../libnm-core/nm-crypto-nss.c:340
- #, c-format
- msgid "Unexpected amount of data after encrypting."
- msgstr "暗号化の後に予期しないデータの量があります。"
-
--#: ../libnm-core/nm-crypto-nss.c:376
-+#: ../libnm-core/nm-crypto-nss.c:378
- #, c-format
- msgid "Couldn't decode certificate: %d"
- msgstr "証明書のデコードができません: %d"
-
--#: ../libnm-core/nm-crypto-nss.c:422
-+#: ../libnm-core/nm-crypto-nss.c:424
- #, c-format
- msgid "Password must be UTF-8"
- msgstr "パスワードは UTF-8 である必要があります"
-
--#: ../libnm-core/nm-crypto-nss.c:445
-+#: ../libnm-core/nm-crypto-nss.c:447
- #, c-format
- msgid "Couldn't initialize slot"
- msgstr "スロットを初期化できませんでした"
-
--#: ../libnm-core/nm-crypto-nss.c:453
-+#: ../libnm-core/nm-crypto-nss.c:455
- #, c-format
- msgid "Couldn't initialize PKCS#12 decoder: %d"
- msgstr "PKCS#12 デコーダーを初期化できません: %d"
-
--#: ../libnm-core/nm-crypto-nss.c:462
-+#: ../libnm-core/nm-crypto-nss.c:464
- #, c-format
- msgid "Couldn't decode PKCS#12 file: %d"
- msgstr "PKCS#12 ファイルをデコードできません: %d"
-
--#: ../libnm-core/nm-crypto-nss.c:471
-+#: ../libnm-core/nm-crypto-nss.c:473
- #, c-format
- msgid "Couldn't verify PKCS#12 file: %d"
- msgstr "PKCS#12 ファイルを確証できません: %d"
-
--#: ../libnm-core/nm-crypto-nss.c:521
-+#: ../libnm-core/nm-crypto-nss.c:523
- msgid "Could not generate random data."
- msgstr "ランダムデータを生成できません。"
-
-@@ -9692,57 +9988,57 @@ msgstr "不明な設定名"
- msgid "duplicate setting name"
- msgstr "重複する設定名"
-
--#: ../libnm-core/nm-connection.c:1423
-+#: ../libnm-core/nm-connection.c:1424
- msgid "setting not found"
- msgstr "設定が見つかりません"
-
--#: ../libnm-core/nm-connection.c:1489 ../libnm-core/nm-connection.c:1514
--#: ../libnm-core/nm-connection.c:1539
-+#: ../libnm-core/nm-connection.c:1476 ../libnm-core/nm-connection.c:1501
-+#: ../libnm-core/nm-connection.c:1526
- msgid "setting is required for non-slave connections"
- msgstr "設定は非スレーブ接続で必要です"
-
--#: ../libnm-core/nm-connection.c:1502 ../libnm-core/nm-connection.c:1527
--#: ../libnm-core/nm-connection.c:1552
-+#: ../libnm-core/nm-connection.c:1489 ../libnm-core/nm-connection.c:1514
-+#: ../libnm-core/nm-connection.c:1539
- msgid "setting not allowed in slave connection"
- msgstr "設定がスレーブ接続で許可されません"
-
--#: ../libnm-core/nm-connection.c:1657
-+#: ../libnm-core/nm-connection.c:1644
- msgid "Unexpected failure to normalize the connection"
- msgstr "接続を正規化するときの予期しない障害"
-
--#: ../libnm-core/nm-connection.c:1720
-+#: ../libnm-core/nm-connection.c:1707
- msgid "Unexpected failure to verify the connection"
- msgstr "接続を確認するときの予期しない障害"
-
--#: ../libnm-core/nm-connection.c:1756
-+#: ../libnm-core/nm-connection.c:1743
- #, c-format
- msgid "unexpected uuid %s instead of %s"
- msgstr "%s ではなく、予期せぬ uuid %s"
-
--#: ../libnm-core/nm-connection.c:2609 ../libnm-core/nm-setting-8021x.c:2574
--#: ../libnm-core/nm-setting-8021x.c:2591 ../libnm-core/nm-setting-8021x.c:2622
--#: ../libnm-core/nm-setting-8021x.c:2639 ../libnm-core/nm-setting-8021x.c:2681
--#: ../libnm-core/nm-setting-8021x.c:2693 ../libnm-core/nm-setting-8021x.c:2711
--#: ../libnm-core/nm-setting-8021x.c:2723 ../libnm-core/nm-setting-8021x.c:2747
--#: ../libnm-core/nm-setting-8021x.c:2840 ../libnm-core/nm-setting-adsl.c:158
-+#: ../libnm-core/nm-connection.c:2569 ../libnm-core/nm-setting-8021x.c:2610
-+#: ../libnm-core/nm-setting-8021x.c:2627 ../libnm-core/nm-setting-8021x.c:2658
-+#: ../libnm-core/nm-setting-8021x.c:2675 ../libnm-core/nm-setting-8021x.c:2717
-+#: ../libnm-core/nm-setting-8021x.c:2729 ../libnm-core/nm-setting-8021x.c:2747
-+#: ../libnm-core/nm-setting-8021x.c:2759 ../libnm-core/nm-setting-8021x.c:2783
-+#: ../libnm-core/nm-setting-8021x.c:2876 ../libnm-core/nm-setting-adsl.c:158
- #: ../libnm-core/nm-setting-bluetooth.c:109
- #: ../libnm-core/nm-setting-bluetooth.c:167
- #: ../libnm-core/nm-setting-bluetooth.c:181 ../libnm-core/nm-setting-cdma.c:128
--#: ../libnm-core/nm-setting-connection.c:954
--#: ../libnm-core/nm-setting-connection.c:997
--#: ../libnm-core/nm-setting-connection.c:1177
--#: ../libnm-core/nm-setting-ip-config.c:4946
--#: ../libnm-core/nm-setting-ip-tunnel.c:359
-+#: ../libnm-core/nm-setting-connection.c:975
-+#: ../libnm-core/nm-setting-connection.c:1004
-+#: ../libnm-core/nm-setting-connection.c:1266
-+#: ../libnm-core/nm-setting-ip-config.c:4974
-+#: ../libnm-core/nm-setting-ip-tunnel.c:367
- #: ../libnm-core/nm-setting-olpc-mesh.c:84
- #: ../libnm-core/nm-setting-ovs-patch.c:77 ../libnm-core/nm-setting-pppoe.c:130
--#: ../libnm-core/nm-setting-vpn.c:516 ../libnm-core/nm-setting-vxlan.c:323
-+#: ../libnm-core/nm-setting-vpn.c:551 ../libnm-core/nm-setting-vxlan.c:323
- #: ../libnm-core/nm-setting-wifi-p2p.c:122 ../libnm-core/nm-setting-wimax.c:94
--#: ../libnm-core/nm-setting-wireless-security.c:902
--#: ../libnm-core/nm-setting-wireless.c:759
-+#: ../libnm-core/nm-setting-wireless-security.c:894
-+#: ../libnm-core/nm-setting-wireless.c:764
- msgid "property is missing"
- msgstr "プロパティーがありません"
-
--#: ../libnm-core/nm-connection.c:2755
-+#: ../libnm-core/nm-connection.c:2716
- msgid "IP Tunnel"
- msgstr "IP トンネル"
-
-@@ -9751,215 +10047,275 @@ msgstr "IP トンネル"
- msgid "Method returned type '%s', but expected '%s'"
- msgstr "メソッドはタイプ '%s' を返しましたが、'%s' を想定していました"
-
--#: ../libnm-core/nm-keyfile-utils.c:242
-+#: ../libnm-core/nm-keyfile/nm-keyfile-utils.c:171
-+#, c-format
-+msgid "Value cannot be interpreted as a list of numbers."
-+msgstr "値を数字のリストとして解釈することはできません。"
-+
-+#: ../libnm-core/nm-keyfile/nm-keyfile-utils.c:307
- #, c-format
- msgid "value is not an integer in range [%lld, %lld]"
- msgstr "値は、[%lld, %lld] の範囲の整数ではありません"
-
--#: ../libnm-core/nm-keyfile.c:196
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:271
- msgid "ignoring missing number"
- msgstr "不明な数字を無視"
-
--#: ../libnm-core/nm-keyfile.c:204
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:283
- #, c-format
- msgid "ignoring invalid number '%s'"
- msgstr "無効な数字 '%s' を無視"
-
--#: ../libnm-core/nm-keyfile.c:225
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:312
- #, c-format
- msgid "ignoring invalid %s address: %s"
- msgstr "無効な %s アドレスを無視: %s"
-
--#: ../libnm-core/nm-keyfile.c:268
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:359
- #, c-format
- msgid "ignoring invalid gateway '%s' for %s route"
- msgstr "無効なゲートウェイ '%s' (%s ルート用) を無視"
-
--#: ../libnm-core/nm-keyfile.c:292
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:391
- #, c-format
- msgid "ignoring invalid %s route: %s"
- msgstr "無効な %s ルートを無視: %s"
-
--#: ../libnm-core/nm-keyfile.c:464
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:566
- #, c-format
- msgid "unexpected character '%c' for address %s: '%s' (position %td)"
- msgstr "アドレス %c の予期しない文字 '%s': '%s' (位置 %td)"
-
--#: ../libnm-core/nm-keyfile.c:474
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:582
- #, c-format
- msgid "unexpected character '%c' for %s: '%s' (position %td)"
- msgstr "%c の予期しない文字 '%s': '%s' (位置 %td)"
-
--#: ../libnm-core/nm-keyfile.c:483
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:597
- #, c-format
- msgid "unexpected character '%c' in prefix length for %s: '%s' (position %td)"
- msgstr "%c の予期しないプレフィックス長の文字 '%s': '%s' (位置 %td)"
-
--#: ../libnm-core/nm-keyfile.c:494
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:614
- #, c-format
- msgid "garbage at the end of value %s: '%s'"
- msgstr "値 %s の後のガベッジ: '%s'"
-
--#: ../libnm-core/nm-keyfile.c:500
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:624
- #, c-format
- msgid "deprecated semicolon at the end of value %s: '%s'"
- msgstr "値 %s の後の非推奨のセミコロン: '%s'"
-
--#: ../libnm-core/nm-keyfile.c:514
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:647
- #, c-format
- msgid "invalid prefix length for %s '%s', defaulting to %d"
- msgstr "%s '%s' の無効なプレフィックス長 (デフォルト値は %d)"
-
--#: ../libnm-core/nm-keyfile.c:521
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:659
- #, c-format
- msgid "missing prefix length for %s '%s', defaulting to %d"
- msgstr "%s '%s' の不明なプレフィックス長 (デフォルト値は %d)"
-
--#: ../libnm-core/nm-keyfile.c:856 ../libnm-core/nm-setting-user.c:358
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1001
-+#: ../libnm-core/nm-setting-user.c:358
- #, c-format
- msgid "invalid value for \"%s\": %s"
- msgstr "'%s' の無効な値: %s"
-
--#: ../libnm-core/nm-keyfile.c:894
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1041
- #, c-format
- msgid "ignoring invalid DNS server IPv%c address '%s'"
- msgstr "無効な DNS サーバー IPv%c アドレス '%s' を無視"
-
--#: ../libnm-core/nm-keyfile.c:990 ../libnm-core/nm-keyfile.c:3143
--#, c-format
--msgid "ignoring invalid byte element '%d' (not between 0 and 255 inclusive)"
--msgstr "無効なバイト要素 '%d' (0〜255 以外) を無視"
--
--#: ../libnm-core/nm-keyfile.c:1001
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1132
- msgid "ignoring invalid MAC address"
- msgstr "有効な MAC アドレスを無視"
-
--#: ../libnm-core/nm-keyfile.c:1260
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1391
- msgid "ignoring invalid SSID"
- msgstr "無効な SSID を無視"
-
--#: ../libnm-core/nm-keyfile.c:1276
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1409
- msgid "ignoring invalid raw password"
- msgstr "無効な生パスワードを無視"
-
--#: ../libnm-core/nm-keyfile.c:1416
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1554
- msgid "invalid key/cert value"
- msgstr "無効なキー/証明書値"
-
--#: ../libnm-core/nm-keyfile.c:1427
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1568
- #, c-format
- msgid "invalid key/cert value path \"%s\""
- msgstr "無効なキー/証明書値パス \"%s\""
-
--#: ../libnm-core/nm-keyfile.c:1447 ../libnm-core/nm-keyfile.c:1530
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1592
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1688
- #, c-format
- msgid "certificate or key file '%s' does not exist"
- msgstr "証明書またはキーファイル '%s' が存在しません"
-
--#: ../libnm-core/nm-keyfile.c:1456
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1604
- #, c-format
- msgid "invalid PKCS#11 URI \"%s\""
- msgstr "無効な PKCS#11 URI \"%s\""
-
--#: ../libnm-core/nm-keyfile.c:1500
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1652
- msgid "invalid key/cert value data:;base64, is not base64"
- msgstr "無効なキー/証明書値 data:;base64, が base64 ではありません"
-
--#: ../libnm-core/nm-keyfile.c:1509
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1664
- msgid "invalid key/cert value data:;base64,file://"
- msgstr "無効なキー/証明書値 data:;base64,file://"
-
--#: ../libnm-core/nm-keyfile.c:1542
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1703
- msgid "invalid key/cert value is not a valid blob"
- msgstr "無効なキー/証明書値は、有効なブロブではありません"
-
--#: ../libnm-core/nm-keyfile.c:1644
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1808
- #, c-format
- msgid "invalid parity value '%s'"
- msgstr "無効なパリティー値 '%s'"
-
--#: ../libnm-core/nm-keyfile.c:1661 ../libnm-core/nm-keyfile.c:3198
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1826
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3391
- #, c-format
- msgid "invalid setting: %s"
- msgstr "無効な設定: %s"
-
--#: ../libnm-core/nm-keyfile.c:1678
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1847
- #, c-format
- msgid "ignoring invalid team configuration: %s"
- msgstr "無効な team 設定を無視: %s"
-
--#: ../libnm-core/nm-keyfile.c:1756
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1932
- #, c-format
- msgid "invalid qdisc: %s"
- msgstr "無効な qdisc: %s"
-
--#: ../libnm-core/nm-keyfile.c:1802
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1981
- #, c-format
- msgid "invalid tfilter: %s"
- msgstr "無効な tfilter: %s"
-
--#: ../libnm-core/nm-keyfile.c:3042
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3234
- #, c-format
- msgid "error loading setting value: %s"
- msgstr "設定値のロード中にエラーが発生しました: %s"
-
--#: ../libnm-core/nm-keyfile.c:3070 ../libnm-core/nm-keyfile.c:3081
--#: ../libnm-core/nm-keyfile.c:3099 ../libnm-core/nm-keyfile.c:3110
--#: ../libnm-core/nm-keyfile.c:3121 ../libnm-core/nm-keyfile.c:3173
--#: ../libnm-core/nm-keyfile.c:3184
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3262
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3273
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3291
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3302
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3313
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3365
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3376
- msgid "value cannot be interpreted as integer"
- msgstr "値は整数として解釈できません"
-
--#: ../libnm-core/nm-keyfile.c:3219
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3338
-+#, c-format
-+msgid "ignoring invalid byte element '%u' (not between 0 and 255 inclusive)"
-+msgstr "無効なバイト要素 '%u' (0〜255 以外) を無視"
-+
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3416
- #, c-format
- msgid "invalid setting name '%s'"
- msgstr "無効な設定名 '%s'"
-
--#: ../libnm-core/nm-keyfile.c:3264
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3465
- #, c-format
- msgid "invalid key '%s.%s'"
- msgstr "無効なキー '%s.%s'"
-
--#: ../libnm-core/nm-keyfile.c:3279
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3484
- #, c-format
- msgid "key '%s.%s' is not boolean"
- msgstr "キー '%s.%s' はブール値ではありません"
-
--#: ../libnm-core/nm-keyfile.c:3336
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3504
-+#, c-format
-+msgid "key '%s.%s' is not a uint32"
-+msgstr "キー '%s.%s' は uint32 ではありません"
-+
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3565
- #, c-format
- msgid "invalid peer public key in section '%s'"
- msgstr "セクション '%s' のピア公開鍵が無効です"
-
--#: ../libnm-core/nm-keyfile.c:3348
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3580
- #, 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:3361
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3597
- #, c-format
- msgid "key '%s.%s' is not a valid secret flag"
- msgstr "キー '%s.%s' は、有効なシークレットフラグではありません"
-
--#: ../libnm-core/nm-keyfile.c:3373
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3613
- #, c-format
- msgid "key '%s.%s' is not a integer in range 0 to 2^32"
- msgstr "キー '%s.%s' は、0 から 2^32 の範囲の整数ではありません"
-
--#: ../libnm-core/nm-keyfile.c:3385
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3629
- #, c-format
- msgid "key '%s.%s' is not a valid endpoint"
- msgstr "キー '%s.%s' は、有効なエンドポイントではありません"
-
--#: ../libnm-core/nm-keyfile.c:3407
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3655
- #, c-format
- msgid "key '%s.%s' has invalid allowed-ips"
- msgstr "キー '%s.%s' の allowed-ips は無効です"
-
--#: ../libnm-core/nm-keyfile.c:3419
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3670
- #, c-format
- msgid "peer '%s' is invalid: %s"
- msgstr "ピア '%s' は無効です: %s"
-
-+#: ../libnm-core/nm-libnm-core-aux/nm-libnm-core-aux.c:221
-+#, c-format
-+msgid "'%s' is not valid: properties should be specified as 'key=value'"
-+msgstr "'%s' は無効です。プロパティーは 'key=value' と指定される必要があります"
-+
-+#: ../libnm-core/nm-libnm-core-aux/nm-libnm-core-aux.c:236
-+#, c-format
-+msgid "'%s' is not a valid key"
-+msgstr "'%s' は有効なキーではありません"
-+
-+#: ../libnm-core/nm-libnm-core-aux/nm-libnm-core-aux.c:242
-+#, c-format
-+msgid "duplicate key '%s'"
-+msgstr "重複キー '%s'"
-+
-+#: ../libnm-core/nm-libnm-core-aux/nm-libnm-core-aux.c:256
-+#, c-format
-+msgid "number for '%s' is out of range"
-+msgstr "'%s' の番号は範囲外です"
-+
-+#: ../libnm-core/nm-libnm-core-aux/nm-libnm-core-aux.c:259
-+#, c-format
-+msgid "value for '%s' must be a number"
-+msgstr "'%s' の値は番号でなければなりません"
-+
-+#: ../libnm-core/nm-libnm-core-aux/nm-libnm-core-aux.c:270
-+#, c-format
-+msgid "value for '%s' must be a boolean"
-+msgstr "'%s' の値はブール値でなければなりません"
-+
-+#: ../libnm-core/nm-libnm-core-aux/nm-libnm-core-aux.c:279
-+msgid "missing 'name' attribute"
-+msgstr "'name' 属性がありません"
-+
-+#: ../libnm-core/nm-libnm-core-aux/nm-libnm-core-aux.c:286
-+#, c-format
-+msgid "invalid 'name' \"%s\""
-+msgstr "'name' \"%s\" が無効です"
-+
-+#: ../libnm-core/nm-libnm-core-aux/nm-libnm-core-aux.c:298
-+#, c-format
-+msgid "attribute '%s' is invalid for \"%s\""
-+msgstr "属性 '%s' は \"%s\" には無効です"
-+
- #: ../libnm-core/nm-setting-6lowpan.c:79
- #, c-format
- msgid "property is not specified"
-@@ -9972,122 +10328,123 @@ msgid "'%s' value doesn't match '%s=%s'"
- msgstr "'%s' の値は '%s=%s' と一致しません"
-
- #: ../libnm-core/nm-setting-6lowpan.c:112
--#: ../libnm-core/nm-setting-ip-tunnel.c:337
-+#: ../libnm-core/nm-setting-ip-tunnel.c:345
- #: ../libnm-core/nm-setting-macsec.c:298 ../libnm-core/nm-setting-macvlan.c:127
- #: ../libnm-core/nm-setting-vlan.c:611 ../libnm-core/nm-setting-vxlan.c:366
- #, c-format
- msgid "'%s' is neither an UUID nor an interface name"
- msgstr "'%s' は UUID、インターフェース名のいずれでもありません"
-
--#: ../libnm-core/nm-setting-8021x.c:213
-+#: ../libnm-core/nm-setting-8021x.c:217
- msgid "binary data missing"
- msgstr "バイナリーデータがありません"
-
--#: ../libnm-core/nm-setting-8021x.c:241
-+#: ../libnm-core/nm-setting-8021x.c:245
- msgid "URI not NUL terminated"
- msgstr "URI が NUL でないため終了しました"
-
--#: ../libnm-core/nm-setting-8021x.c:250
-+#: ../libnm-core/nm-setting-8021x.c:254
- msgid "URI is empty"
- msgstr "URI が空です"
-
--#: ../libnm-core/nm-setting-8021x.c:258
-+#: ../libnm-core/nm-setting-8021x.c:262
- msgid "URI is not valid UTF-8"
- msgstr "URI が有効な UTF-8 ではありません"
-
--#: ../libnm-core/nm-setting-8021x.c:276
-+#: ../libnm-core/nm-setting-8021x.c:280
- msgid "data missing"
- msgstr "データがありません"
-
--#: ../libnm-core/nm-setting-8021x.c:299 ../libnm-core/nm-setting-8021x.c:666
-+#: ../libnm-core/nm-setting-8021x.c:303 ../libnm-core/nm-setting-8021x.c:670
- #, c-format
- msgid "certificate is invalid: %s"
- msgstr "証明書が無効です: %s"
-
--#: ../libnm-core/nm-setting-8021x.c:307
-+#: ../libnm-core/nm-setting-8021x.c:311
- #, c-format
- msgid "certificate detected as invalid scheme"
- msgstr "証明書が無効なスキームと検出されました"
-
--#: ../libnm-core/nm-setting-8021x.c:521
-+#: ../libnm-core/nm-setting-8021x.c:525
- msgid "CA certificate must be in X.509 format"
- msgstr "CA 証明書は X.509 形式である必要があります"
-
--#: ../libnm-core/nm-setting-8021x.c:537
-+#: ../libnm-core/nm-setting-8021x.c:541
- msgid "invalid certificate format"
- msgstr "無効な証明書形式"
-
--#: ../libnm-core/nm-setting-8021x.c:676
-+#: ../libnm-core/nm-setting-8021x.c:680
- #, 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:2581 ../libnm-core/nm-setting-8021x.c:2598
--#: ../libnm-core/nm-setting-8021x.c:2629 ../libnm-core/nm-setting-8021x.c:2646
--#: ../libnm-core/nm-setting-8021x.c:2687 ../libnm-core/nm-setting-8021x.c:2699
--#: ../libnm-core/nm-setting-8021x.c:2717 ../libnm-core/nm-setting-8021x.c:2729
--#: ../libnm-core/nm-setting-8021x.c:2754 ../libnm-core/nm-setting-adsl.c:165
-+#: ../libnm-core/nm-setting-8021x.c:2617 ../libnm-core/nm-setting-8021x.c:2634
-+#: ../libnm-core/nm-setting-8021x.c:2665 ../libnm-core/nm-setting-8021x.c:2682
-+#: ../libnm-core/nm-setting-8021x.c:2723 ../libnm-core/nm-setting-8021x.c:2735
-+#: ../libnm-core/nm-setting-8021x.c:2753 ../libnm-core/nm-setting-8021x.c:2765
-+#: ../libnm-core/nm-setting-8021x.c:2790 ../libnm-core/nm-setting-adsl.c:166
- #: ../libnm-core/nm-setting-cdma.c:135 ../libnm-core/nm-setting-cdma.c:144
--#: ../libnm-core/nm-setting-connection.c:961
--#: ../libnm-core/nm-setting-connection.c:1009
--#: ../libnm-core/nm-setting-gsm.c:289 ../libnm-core/nm-setting-gsm.c:347
--#: ../libnm-core/nm-setting-gsm.c:384 ../libnm-core/nm-setting-gsm.c:393
--#: ../libnm-core/nm-setting-ip-config.c:4953
-+#: ../libnm-core/nm-setting-connection.c:982
-+#: ../libnm-core/nm-setting-connection.c:1016
-+#: ../libnm-core/nm-setting-connection.c:1238
-+#: ../libnm-core/nm-setting-gsm.c:283 ../libnm-core/nm-setting-gsm.c:341
-+#: ../libnm-core/nm-setting-gsm.c:378 ../libnm-core/nm-setting-gsm.c:387
-+#: ../libnm-core/nm-setting-ip-config.c:4981
- #: ../libnm-core/nm-setting-ip4-config.c:167
- #: ../libnm-core/nm-setting-ip4-config.c:174
- #: ../libnm-core/nm-setting-pppoe.c:137 ../libnm-core/nm-setting-pppoe.c:146
--#: ../libnm-core/nm-setting-vpn.c:525 ../libnm-core/nm-setting-vpn.c:535
-+#: ../libnm-core/nm-setting-vpn.c:559 ../libnm-core/nm-setting-vpn.c:570
- #: ../libnm-core/nm-setting-wimax.c:103
--#: ../libnm-core/nm-setting-wireless-security.c:945
--#: ../libnm-core/nm-setting-wireless-security.c:969
--#: ../libnm-core/nm-setting.c:1243
-+#: ../libnm-core/nm-setting-wireless-security.c:937
-+#: ../libnm-core/nm-setting-wireless-security.c:961
-+#: ../libnm-core/nm-setting.c:1257
- msgid "property is empty"
- msgstr "プロパティーが空です"
-
--#: ../libnm-core/nm-setting-8021x.c:2611 ../libnm-core/nm-setting-8021x.c:2659
-+#: ../libnm-core/nm-setting-8021x.c:2647 ../libnm-core/nm-setting-8021x.c:2695
- #, c-format
- msgid "has to match '%s' property for PKCS#12"
- msgstr "PKCS#12 の '%s' プロパティーと一致しなければなりません"
-
--#: ../libnm-core/nm-setting-8021x.c:2831
-+#: ../libnm-core/nm-setting-8021x.c:2867
- msgid "can be enabled only on Ethernet connections"
- msgstr "イーサネット接続でのみ有効化できます"
-
--#: ../libnm-core/nm-setting-8021x.c:2849
-+#: ../libnm-core/nm-setting-8021x.c:2885
- #: ../libnm-core/nm-setting-bluetooth.c:94
--#: ../libnm-core/nm-setting-infiniband.c:162
--#: ../libnm-core/nm-setting-infiniband.c:172
-+#: ../libnm-core/nm-setting-infiniband.c:163
-+#: ../libnm-core/nm-setting-infiniband.c:173
- #: ../libnm-core/nm-setting-ip4-config.c:158
--#: ../libnm-core/nm-setting-ip6-config.c:207
--#: ../libnm-core/nm-setting-ip6-config.c:218
-+#: ../libnm-core/nm-setting-ip6-config.c:226
-+#: ../libnm-core/nm-setting-ip6-config.c:237
- #: ../libnm-core/nm-setting-olpc-mesh.c:113
- #: ../libnm-core/nm-setting-wifi-p2p.c:131 ../libnm-core/nm-setting-wimax.c:112
- #: ../libnm-core/nm-setting-wired.c:785 ../libnm-core/nm-setting-wired.c:795
--#: ../libnm-core/nm-setting-wireless-security.c:988
--#: ../libnm-core/nm-setting-wireless-security.c:997
--#: ../libnm-core/nm-setting-wireless-security.c:1006
--#: ../libnm-core/nm-setting-wireless-security.c:1016
--#: ../libnm-core/nm-setting-wireless-security.c:1026
--#: ../libnm-core/nm-setting-wireless-security.c:1049
--#: ../libnm-core/nm-setting-wireless-security.c:1087
--#: ../libnm-core/nm-setting-wireless-security.c:1128
--#: ../libnm-core/nm-setting-wireless.c:830
--#: ../libnm-core/nm-setting-wireless.c:839
--#: ../libnm-core/nm-setting-wireless.c:850 ../libnm-core/nm-setting-wpan.c:162
--#: ../libnm-core/nm-utils.c:4566
-+#: ../libnm-core/nm-setting-wireless-security.c:980
-+#: ../libnm-core/nm-setting-wireless-security.c:989
-+#: ../libnm-core/nm-setting-wireless-security.c:998
-+#: ../libnm-core/nm-setting-wireless-security.c:1008
-+#: ../libnm-core/nm-setting-wireless-security.c:1018
-+#: ../libnm-core/nm-setting-wireless-security.c:1041
-+#: ../libnm-core/nm-setting-wireless-security.c:1079
-+#: ../libnm-core/nm-setting-wireless-security.c:1120
-+#: ../libnm-core/nm-setting-wireless.c:835
-+#: ../libnm-core/nm-setting-wireless.c:844
-+#: ../libnm-core/nm-setting-wireless.c:855 ../libnm-core/nm-setting-wpan.c:162
-+#: ../libnm-core/nm-utils.c:4596
- msgid "property is invalid"
- msgstr "プロパティーが無効です"
-
--#: ../libnm-core/nm-setting-8021x.c:2876 ../libnm-core/nm-setting-8021x.c:2888
--#: ../libnm-core/nm-setting-8021x.c:2902 ../libnm-core/nm-setting-8021x.c:2929
--#: ../libnm-core/nm-setting-8021x.c:2944 ../libnm-core/nm-setting-adsl.c:177
-+#: ../libnm-core/nm-setting-8021x.c:2912 ../libnm-core/nm-setting-8021x.c:2924
-+#: ../libnm-core/nm-setting-8021x.c:2938 ../libnm-core/nm-setting-8021x.c:2965
-+#: ../libnm-core/nm-setting-8021x.c:2980 ../libnm-core/nm-setting-adsl.c:177
- #: ../libnm-core/nm-setting-adsl.c:189 ../libnm-core/nm-setting-bluetooth.c:122
--#: ../libnm-core/nm-setting-wireless-security.c:923
-+#: ../libnm-core/nm-setting-wireless-security.c:915
- #, c-format
- msgid "'%s' is not a valid value for the property"
- msgstr "'%s' はプロパティーの有効な値ではありません"
-
--#: ../libnm-core/nm-setting-8021x.c:2912
-+#: ../libnm-core/nm-setting-8021x.c:2948
- msgid "invalid auth flags"
- msgstr "無効な auth フラグ"
-
-@@ -10101,93 +10458,92 @@ msgstr "'%s' 接続には '%s' または '%s' 設定が必要です"
- msgid "'%s' connection requires '%s' setting"
- msgstr "'%s' 接続には '%s' 設定が必要です"
-
--#: ../libnm-core/nm-setting-bond.c:541
-+#: ../libnm-core/nm-setting-bond.c:757
- #, c-format
- msgid "invalid option '%s' or its value '%s'"
- msgstr "無効なオプション '%s'、またはその値 '%s' です"
-
--#: ../libnm-core/nm-setting-bond.c:566
--#, c-format
--msgid "only one of '%s' and '%s' can be set"
--msgstr "設定できるのは '%s' と '%s' の一つのみです"
--
--#: ../libnm-core/nm-setting-bond.c:579
-+#: ../libnm-core/nm-setting-bond.c:789
- #, c-format
- msgid "mandatory option '%s' is missing"
- msgstr "必須オプションの '%s' がありません"
-
--#: ../libnm-core/nm-setting-bond.c:589
-+#: ../libnm-core/nm-setting-bond.c:799
- #, c-format
- msgid "'%s' is not a valid value for '%s'"
- msgstr "'%s' は有効な '%s' の値ではありません"
-
--#: ../libnm-core/nm-setting-bond.c:603
-+#: ../libnm-core/nm-setting-bond.c:816
- #, c-format
- msgid "'%s=%s' is incompatible with '%s > 0'"
- msgstr "'%s=%s' は '%s > 0' とは互換性がありません"
-
--#: ../libnm-core/nm-setting-bond.c:618
-+#: ../libnm-core/nm-setting-bond.c:836
- #, c-format
- msgid "'%s' is not valid for the '%s' option: %s"
- msgstr "'%s' は '%s' オプションに無効です: %s"
-
--#: ../libnm-core/nm-setting-bond.c:629
-+#: ../libnm-core/nm-setting-bond.c:849
- #, c-format
- msgid "'%s' option is only valid for '%s=%s'"
- msgstr "'%s' オプションは '%s=%s' の場合に限り有効です"
-
--#: ../libnm-core/nm-setting-bond.c:642
-+#: ../libnm-core/nm-setting-bond.c:862
- #, c-format
- msgid "'%s=%s' is not a valid configuration for '%s'"
- msgstr "'%s=%s' は '%s' の有効な設定ではありません"
-
--#: ../libnm-core/nm-setting-bond.c:655 ../libnm-core/nm-setting-bond.c:664
--#: ../libnm-core/nm-setting-bond.c:684 ../libnm-core/nm-setting-bond.c:720
-+#: ../libnm-core/nm-setting-bond.c:877 ../libnm-core/nm-setting-bond.c:890
-+#, c-format
-+msgid "'%s' option requires '%s' option to be enabled"
-+msgstr "'%s' オプションを使用する場合は、'%s' オプションを有効にする必要があります"
-+
-+#: ../libnm-core/nm-setting-bond.c:912 ../libnm-core/nm-setting-bond.c:958
- #, c-format
- msgid "'%s' option requires '%s' option to be set"
- msgstr "'%s' オプションを使用する場合は、'%s' オプションを設定する必要があります"
-
--#: ../libnm-core/nm-setting-bond.c:695
-+#: ../libnm-core/nm-setting-bond.c:927
- #, c-format
- msgid "'%s' option is empty"
- msgstr "'%s' オプションが空白です"
-
--#: ../libnm-core/nm-setting-bond.c:707
-+#: ../libnm-core/nm-setting-bond.c:941
- #, c-format
- msgid "'%s' is not a valid IPv4 address for '%s' option"
- msgstr "'%s' は '%s' オプション用の有効な IPv4 アドレスではありません"
-
--#: ../libnm-core/nm-setting-bond.c:735
-+#: ../libnm-core/nm-setting-bond.c:975
- #, c-format
- msgid "'%s' option is only valid with mode '%s'"
- msgstr "'%s' オプションはモード '%s' でのみ有効です"
-
--#: ../libnm-core/nm-setting-bond.c:746
-+#: ../libnm-core/nm-setting-bond.c:987
- #, c-format
- msgid "'%s' and '%s' cannot have different values"
- msgstr "'%s' と '%s' の値は同じである必要があります"
-
--#: ../libnm-core/nm-setting-bond.c:762
-+#: ../libnm-core/nm-setting-bond.c:1010
- #, c-format
- msgid "'%s' option should be string"
- msgstr "'%s' オプションは文字列である必要があります"
-
--#: ../libnm-core/nm-setting-bond.c:778
-+#: ../libnm-core/nm-setting-bond.c:1023
- #, c-format
- msgid "'%s' option is not valid with mode '%s'"
- msgstr "'%s' オプションは、'%s' モードでは有効ではありません。"
-
--#: ../libnm-core/nm-setting-bridge-port.c:301
-+#: ../libnm-core/nm-setting-bridge-port.c:303
- #: ../libnm-core/nm-setting-ovs-bridge.c:153
--#: ../libnm-core/nm-setting-ovs-interface.c:259
-+#: ../libnm-core/nm-setting-ovs-interface.c:269
- #: ../libnm-core/nm-setting-ovs-port.c:172
- #: ../libnm-core/nm-setting-team-port.c:299
- #, c-format
- msgid "missing setting"
- msgstr "設定がありません"
-
--#: ../libnm-core/nm-setting-bridge-port.c:312
--#: ../libnm-core/nm-setting-ovs-interface.c:280
-+#: ../libnm-core/nm-setting-bridge-port.c:314
-+#: ../libnm-core/nm-setting-ovs-interface.c:290
- #: ../libnm-core/nm-setting-ovs-port.c:193
- #: ../libnm-core/nm-setting-team-port.c:310
- #, c-format
-@@ -10196,505 +10552,549 @@ msgid ""
- "Instead it is '%s'"
- msgstr "'%s' 設定の接続では、スレーブタイプは '%s' に設定する必要がありますが、'%s' に設定されています。"
-
--#: ../libnm-core/nm-setting-bridge.c:896
-+#: ../libnm-core/nm-setting-bridge.c:1180
- #, c-format
- msgid "value '%d' is out of range <%d-%d>"
- msgstr "値 '%d' は <%d-%d> の範囲外です"
-
--#: ../libnm-core/nm-setting-bridge.c:913
-+#: ../libnm-core/nm-setting-bridge.c:1197
- msgid "is not a valid MAC address"
- msgstr "は有効な MAC アドレスではありません"
-
--#: ../libnm-core/nm-setting-bridge.c:954
-+#: ../libnm-core/nm-setting-bridge.c:1238
- 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:931
-+#: ../libnm-core/nm-setting-bridge.c:1258
-+msgid "is not a valid link local MAC address"
-+msgstr "有効なリンクローカル MAC アドレスではありません"
-+
-+#: ../libnm-core/nm-setting-bridge.c:1270
-+msgid "is not a valid VLAN filtering protocol"
-+msgstr "有効な VLAN フィルタリングプロトコルではありません"
-+
-+#: ../libnm-core/nm-setting-bridge.c:1283
-+msgid "is not a valid option"
-+msgstr "有効なオプションではありません"
-+
-+#: ../libnm-core/nm-setting-bridge.c:1292
-+#, c-format
-+msgid "'%s' option must be a power of 2"
-+msgstr "’%s’ オプションは 2 の累乗でなければなりません。"
-+
-+#: ../libnm-core/nm-setting-connection.c:952
- #, c-format
- msgid "setting required for connection of type '%s'"
- msgstr "タイプ '%s' の接続には設定が必要です"
-
--#: ../libnm-core/nm-setting-connection.c:970
-+#: ../libnm-core/nm-setting-connection.c:991
- #, c-format
- msgid "'%s' is not a valid UUID"
- msgstr "'%s' は有効な UUID ではありません"
-
--#: ../libnm-core/nm-setting-connection.c:1020
-+#: ../libnm-core/nm-setting-connection.c:1027
- #, c-format
- msgid "connection type '%s' is not valid"
- msgstr "接続タイプ '%s' は無効です"
-
--#: ../libnm-core/nm-setting-connection.c:1056
-+#: ../libnm-core/nm-setting-connection.c:1120
- #, c-format
- msgid "Unknown slave type '%s'"
- msgstr "不明なスレーブタイプ '%s'"
-
--#: ../libnm-core/nm-setting-connection.c:1067
-+#: ../libnm-core/nm-setting-connection.c:1131
- #, c-format
- msgid "Slave connections need a valid '%s' property"
- msgstr "スレーブ接続には有効な '%s' プロパティーが必要です"
-
--#: ../libnm-core/nm-setting-connection.c:1088
-+#: ../libnm-core/nm-setting-connection.c:1152
- #, c-format
- msgid "Cannot set '%s' without '%s'"
- msgstr "'%s' を '%s' なしで設定できません"
-
--#: ../libnm-core/nm-setting-connection.c:1102
-+#: ../libnm-core/nm-setting-connection.c:1166
- #, c-format
- msgid "'%s' connections must be enslaved to '%s', not '%s'"
- msgstr "'%s' 接続は、'%s' ではなく '%s' にスレーブ化される必要があります"
-
--#: ../libnm-core/nm-setting-connection.c:1116
-+#: ../libnm-core/nm-setting-connection.c:1180
- #, c-format
- msgid "metered value %d is not valid"
- msgstr "測定値 %d は無効です"
-
--#: ../libnm-core/nm-setting-connection.c:1127
--#: ../libnm-core/nm-setting-connection.c:1138
--#: ../libnm-core/nm-setting-connection.c:1151
-+#: ../libnm-core/nm-setting-connection.c:1191
-+#: ../libnm-core/nm-setting-connection.c:1202
-+#: ../libnm-core/nm-setting-connection.c:1215
- #, c-format
- msgid "value %d is not valid"
- msgstr "値 %d は無効です"
-
--#: ../libnm-core/nm-setting-connection.c:1164
-+#: ../libnm-core/nm-setting-connection.c:1228
- #, c-format
- msgid "wait-device-timeout requires %s"
- msgstr "wait-device-timeout には、%s が必要です"
-
--#: ../libnm-core/nm-setting-connection.c:1186
-+#: ../libnm-core/nm-setting-connection.c:1247
-+msgid "DHCP option cannot be longer than 255 characters"
-+msgstr "DHCP オプションは 255 文字より長くすることはできません。"
-+
-+#: ../libnm-core/nm-setting-connection.c:1253
-+msgid "MUD URL is not a valid URL"
-+msgstr "MUD の URL は有効な URL ではありません"
-+
-+#: ../libnm-core/nm-setting-connection.c:1275
- #, c-format
- msgid "property type should be set to '%s'"
- msgstr "プロパティータイプは '%s' に設定する必要があります"
-
--#: ../libnm-core/nm-setting-connection.c:1201
-+#: ../libnm-core/nm-setting-connection.c:1290
- #, c-format
- msgid "slave-type '%s' requires a '%s' setting in the connection"
- msgstr "スレーブタイプ '%s' の接続には '%s' 設定が必要です"
-
--#: ../libnm-core/nm-setting-connection.c:1211
-+#: ../libnm-core/nm-setting-connection.c:1300
- #, c-format
- msgid ""
- "Detect a slave connection with '%s' set and a port type '%s'. '%s' should be "
- "set to '%s'"
- msgstr "'%s' が設定され、ポートタイプが '%s' のスレーブ接続を検出します。'%s' は '%s' に設定する必要があります"
-
--#: ../libnm-core/nm-setting-connection.c:1228
-+#: ../libnm-core/nm-setting-connection.c:1317
- #, 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:492
-+#: ../libnm-core/nm-setting-dcb.c:486
- msgid "flags invalid"
- msgstr "フラグは無効です"
-
--#: ../libnm-core/nm-setting-dcb.c:501
-+#: ../libnm-core/nm-setting-dcb.c:495
- msgid "flags invalid - disabled"
- msgstr "フラグは無効です - 無効"
-
--#: ../libnm-core/nm-setting-dcb.c:527 ../libnm-core/nm-setting-dcb.c:576
-+#: ../libnm-core/nm-setting-dcb.c:521 ../libnm-core/nm-setting-dcb.c:570
- msgid "property invalid (not enabled)"
- msgstr "プロパティーは無効です (有効になっていません)"
-
--#: ../libnm-core/nm-setting-dcb.c:536
-+#: ../libnm-core/nm-setting-dcb.c:530
- msgid "element invalid"
- msgstr "エレメントは無効です"
-
--#: ../libnm-core/nm-setting-dcb.c:551
-+#: ../libnm-core/nm-setting-dcb.c:545
- msgid "sum not 100%"
- msgstr "合計が 100% ではありません"
-
--#: ../libnm-core/nm-setting-dcb.c:585 ../libnm-core/nm-setting-dcb.c:617
-+#: ../libnm-core/nm-setting-dcb.c:579 ../libnm-core/nm-setting-dcb.c:611
- msgid "property invalid"
- msgstr "プロパティーは無効です"
-
--#: ../libnm-core/nm-setting-dcb.c:607
-+#: ../libnm-core/nm-setting-dcb.c:601
- msgid "property missing"
- msgstr "プロパティーがありません"
-
--#: ../libnm-core/nm-setting-ethtool.c:291
--msgid "unsupported offload feature"
--msgstr "サポートされていないオフロード機能"
-+#: ../libnm-core/nm-setting-ethtool.c:302
-+msgid "unsupported ethtool setting"
-+msgstr "サポートされていない ethool 設定"
-+
-+#: ../libnm-core/nm-setting-ethtool.c:311
-+msgid "setting has invalid variant type"
-+msgstr "設定に無効なバリアント型がある"
-
--#: ../libnm-core/nm-setting-ethtool.c:299
--msgid "offload feature has invalid variant type"
--msgstr "オフロード機能には、無効のバリアントタイプがあります"
-+#: ../libnm-core/nm-setting-ethtool.c:323
-+msgid "coalesce option must be either 0 or 1"
-+msgstr "coalesce オプションは 0 または 1 のいずれかでなければなりません。"
-
--#: ../libnm-core/nm-setting-ethtool.c:322
-+#: ../libnm-core/nm-setting-ethtool.c:348
- #, c-format
- msgid "unknown ethtool option '%s'"
- msgstr "不明な ethtool オプション '%s'"
-
--#: ../libnm-core/nm-setting-gsm.c:302
-+#: ../libnm-core/nm-setting-gsm.c:296
- #, c-format
- msgid "property value '%s' is empty or too long (>64)"
- msgstr "プロパティー値 '%s' が空白、または長過ぎます (>64)"
-
--#: ../libnm-core/nm-setting-gsm.c:334
-+#: ../libnm-core/nm-setting-gsm.c:328
- #, c-format
- msgid "'%s' contains invalid char(s) (use [A-Za-z._-])"
- msgstr "'%s' に無効な文字が含まれています ([A-Za-z._-] を使用してください)"
-
--#: ../libnm-core/nm-setting-gsm.c:361
-+#: ../libnm-core/nm-setting-gsm.c:355
- #, c-format
- msgid "'%s' length is invalid (should be 5 or 6 digits)"
- msgstr "'%s' の長さは無効です (5 桁または 6 桁にしてください)"
-
--#: ../libnm-core/nm-setting-gsm.c:372
-+#: ../libnm-core/nm-setting-gsm.c:366
- #, c-format
- msgid "'%s' is not a number"
- msgstr "'%s' は数字ではありません"
-
--#: ../libnm-core/nm-setting-gsm.c:406
-+#: ../libnm-core/nm-setting-gsm.c:400
- msgid "property is empty or wrong size"
- msgstr "プロパティーが空、または間違ったサイズです"
-
--#: ../libnm-core/nm-setting-gsm.c:416
-+#: ../libnm-core/nm-setting-gsm.c:410
- msgid "property must contain only digits"
- msgstr "プロパティーには数字のみ含めることができます"
-
--#: ../libnm-core/nm-setting-gsm.c:428
-+#: ../libnm-core/nm-setting-gsm.c:422
- msgid "can't be enabled when manual configuration is present"
- msgstr "手動設定が存在する場合、有効化できません"
-
--#: ../libnm-core/nm-setting-infiniband.c:193
-+#: ../libnm-core/nm-setting-infiniband.c:194
- msgid "Must specify a P_Key if specifying parent"
- msgstr "親を指定している場合は P_Key を指定する必要があります"
-
--#: ../libnm-core/nm-setting-infiniband.c:203
-+#: ../libnm-core/nm-setting-infiniband.c:204
- msgid "InfiniBand P_Key connection did not specify parent interface name"
- msgstr "InfiniBand P_Key 接続で親インターフェース名が指定されていませんでした"
-
--#: ../libnm-core/nm-setting-infiniband.c:241
-+#: ../libnm-core/nm-setting-infiniband.c:227
- #, c-format
- msgid ""
- "interface name of software infiniband device must be '%s' or unset (instead "
- "it is '%s')"
- msgstr "ソフトウェア infiniband デバイスのインターフェース名は '%s' であるか、未設定である必要があります (実際には '%s')"
-
--#: ../libnm-core/nm-setting-infiniband.c:265
-+#: ../libnm-core/nm-setting-infiniband.c:250
- #, c-format
- msgid "mtu can be at most %u but it is %u"
- msgstr "mtu は最大で %u になり得ますが、%u です"
-
--#: ../libnm-core/nm-setting-ip-config.c:120
-+#: ../libnm-core/nm-setting-ip-config.c:109
- #, c-format
- msgid "Missing IPv4 address"
- msgstr "IPv4 アドレスがありません"
-
--#: ../libnm-core/nm-setting-ip-config.c:120
-+#: ../libnm-core/nm-setting-ip-config.c:109
- #, c-format
- msgid "Missing IPv6 address"
- msgstr "IPv6 アドレスがありません"
-
--#: ../libnm-core/nm-setting-ip-config.c:125
-+#: ../libnm-core/nm-setting-ip-config.c:114
- #, c-format
- msgid "Invalid IPv4 address '%s'"
- msgstr "無効な IPv4 アドレス '%s'"
-
--#: ../libnm-core/nm-setting-ip-config.c:125
-+#: ../libnm-core/nm-setting-ip-config.c:114
- #, c-format
- msgid "Invalid IPv6 address '%s'"
- msgstr "無効な IPv6 アドレス '%s'"
-
--#: ../libnm-core/nm-setting-ip-config.c:140
-+#: ../libnm-core/nm-setting-ip-config.c:129
- #, c-format
- msgid "Invalid IPv4 address prefix '%u'"
- msgstr "無効な IPv4 アドレスプレフィックス '%u'"
-
--#: ../libnm-core/nm-setting-ip-config.c:140
-+#: ../libnm-core/nm-setting-ip-config.c:129
- #, c-format
- msgid "Invalid IPv6 address prefix '%u'"
- msgstr "無効な IPv6 アドレスプレフィックス '%u'"
-
--#: ../libnm-core/nm-setting-ip-config.c:155
-+#: ../libnm-core/nm-setting-ip-config.c:144
- #, c-format
- msgid "Invalid routing metric '%s'"
- msgstr "無効なルーティングメトリック '%s'"
-
--#: ../libnm-core/nm-setting-ip-config.c:1282
--#: ../libnm-core/nm-setting-sriov.c:409
-+#: ../libnm-core/nm-setting-ip-config.c:1272
-+#: ../libnm-core/nm-setting-sriov.c:413
- msgid "unknown attribute"
- msgstr "不明な属性"
-
--#: ../libnm-core/nm-setting-ip-config.c:1292
--#: ../libnm-core/nm-setting-sriov.c:419
-+#: ../libnm-core/nm-setting-ip-config.c:1282
-+#: ../libnm-core/nm-setting-sriov.c:423
- #, c-format
- msgid "invalid attribute type '%s'"
- msgstr "無効な属性タイプ '%s'"
-
--#: ../libnm-core/nm-setting-ip-config.c:1303
-+#: ../libnm-core/nm-setting-ip-config.c:1293
- #, c-format
- msgid "attribute is not valid for a IPv4 route"
- msgstr "属性は IPv4 ルートには無効です"
-
--#: ../libnm-core/nm-setting-ip-config.c:1304
-+#: ../libnm-core/nm-setting-ip-config.c:1294
- #, c-format
- msgid "attribute is not valid for a IPv6 route"
- msgstr "属性は IPv6 ルートには無効です"
-
--#: ../libnm-core/nm-setting-ip-config.c:1318
--#: ../libnm-core/nm-setting-ip-config.c:1346
-+#: ../libnm-core/nm-setting-ip-config.c:1308
-+#: ../libnm-core/nm-setting-ip-config.c:1336
- #, c-format
- msgid "'%s' is not a valid IPv4 address"
- msgstr "'%s' は有効な IPv4 アドレスではありません"
-
--#: ../libnm-core/nm-setting-ip-config.c:1319
--#: ../libnm-core/nm-setting-ip-config.c:1347
-+#: ../libnm-core/nm-setting-ip-config.c:1309
-+#: ../libnm-core/nm-setting-ip-config.c:1337
- #, c-format
- msgid "'%s' is not a valid IPv6 address"
- msgstr "'%s' は有効な IPv6 アドレスではありません"
-
--#: ../libnm-core/nm-setting-ip-config.c:1337
-+#: ../libnm-core/nm-setting-ip-config.c:1327
- #, c-format
- msgid "invalid prefix %s"
- msgstr "無効なプレフィックス %s"
-
--#: ../libnm-core/nm-setting-ip-config.c:2513
-+#: ../libnm-core/nm-setting-ip-config.c:1350
-+#, c-format
-+msgid "%s is not a valid route type"
-+msgstr "%s は有効なルートタイプではありません。"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:1400
-+#, c-format
-+msgid "route scope is invalid"
-+msgstr "ルートスコープが無効"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2541
- msgid "invalid priority"
- msgstr "無効な優先度"
-
--#: ../libnm-core/nm-setting-ip-config.c:2524
-+#: ../libnm-core/nm-setting-ip-config.c:2552
- msgid "missing table"
- msgstr "テーブルがありません"
-
--#: ../libnm-core/nm-setting-ip-config.c:2530
-+#: ../libnm-core/nm-setting-ip-config.c:2558
- msgid "invalid action"
- msgstr "無効なアクション"
-
--#: ../libnm-core/nm-setting-ip-config.c:2537
-+#: ../libnm-core/nm-setting-ip-config.c:2565
- msgid "has from/src but the prefix-length is zero"
- msgstr "from/src があっても、プレフィックス長はゼロです"
-
--#: ../libnm-core/nm-setting-ip-config.c:2544
-+#: ../libnm-core/nm-setting-ip-config.c:2572
- msgid "missing from/src for a non zero prefix-length"
- msgstr "ゼロではないプレフィックス長には from/src がありません"
-
--#: ../libnm-core/nm-setting-ip-config.c:2549
-+#: ../libnm-core/nm-setting-ip-config.c:2577
- msgid "invalid from/src"
- msgstr "無効な from/src"
-
--#: ../libnm-core/nm-setting-ip-config.c:2554
-+#: ../libnm-core/nm-setting-ip-config.c:2582
- msgid "invalid prefix length for from/src"
- msgstr "from/src のプレフィックス長は無効です"
-
--#: ../libnm-core/nm-setting-ip-config.c:2561
-+#: ../libnm-core/nm-setting-ip-config.c:2589
- msgid "has to/dst but the prefix-length is zero"
- msgstr "to/dst があっても、プレフィックス長はゼロです"
-
--#: ../libnm-core/nm-setting-ip-config.c:2568
-+#: ../libnm-core/nm-setting-ip-config.c:2596
- msgid "missing to/dst for a non zero prefix-length"
- msgstr "ゼロではないプレフィックス長には to/dst がありません"
-
--#: ../libnm-core/nm-setting-ip-config.c:2573
-+#: ../libnm-core/nm-setting-ip-config.c:2601
- msgid "invalid to/dst"
- msgstr "無効な to/dst"
-
--#: ../libnm-core/nm-setting-ip-config.c:2578
-+#: ../libnm-core/nm-setting-ip-config.c:2606
- msgid "invalid prefix length for to/dst"
- msgstr "to/dst のプレフィックス長は無効です"
-
--#: ../libnm-core/nm-setting-ip-config.c:2586
-+#: ../libnm-core/nm-setting-ip-config.c:2614
- msgid "invalid iifname"
- msgstr "無効な iifname"
-
--#: ../libnm-core/nm-setting-ip-config.c:2594
-+#: ../libnm-core/nm-setting-ip-config.c:2622
- msgid "invalid oifname"
- msgstr "無効な oifname"
-
--#: ../libnm-core/nm-setting-ip-config.c:2600
-+#: ../libnm-core/nm-setting-ip-config.c:2628
- msgid "invalid source port range"
- msgstr "ソースポートの範囲が無効です"
-
--#: ../libnm-core/nm-setting-ip-config.c:2606
-+#: ../libnm-core/nm-setting-ip-config.c:2634
- msgid "invalid destination port range"
- msgstr "接続先ポートの範囲が無効です"
-
--#: ../libnm-core/nm-setting-ip-config.c:2614
-+#: ../libnm-core/nm-setting-ip-config.c:2642
- msgid "suppress_prefixlength out of range"
- msgstr "suppress_prefixlength は範囲外です"
-
--#: ../libnm-core/nm-setting-ip-config.c:2619
-+#: ../libnm-core/nm-setting-ip-config.c:2647
- msgid "suppress_prefixlength is only allowed with the to-table action"
- msgstr "suppress_prefixlength は、to-table アクションでのみ許可されます"
-
--#: ../libnm-core/nm-setting-ip-config.c:2726
-+#: ../libnm-core/nm-setting-ip-config.c:2754
- #, c-format
- msgid "duplicate key %s"
- msgstr "重複キー %s"
-
--#: ../libnm-core/nm-setting-ip-config.c:2740
-+#: ../libnm-core/nm-setting-ip-config.c:2768
- #, c-format
- msgid "invalid key \"%s\""
- msgstr "無効なキー \"%s\""
-
--#: ../libnm-core/nm-setting-ip-config.c:2753
-+#: ../libnm-core/nm-setting-ip-config.c:2781
- #, c-format
- msgid "invalid variant type '%s' for \"%s\""
- msgstr "\"%s\" のバリアントタイプ '%s' が無効です"
-
--#: ../libnm-core/nm-setting-ip-config.c:2762
-+#: ../libnm-core/nm-setting-ip-config.c:2790
- msgid "missing \""
- msgstr "\" がありません"
-
--#: ../libnm-core/nm-setting-ip-config.c:2768
-+#: ../libnm-core/nm-setting-ip-config.c:2796
- msgid "invalid \""
- msgstr "\" は無効です"
-
--#: ../libnm-core/nm-setting-ip-config.c:2965
-+#: ../libnm-core/nm-setting-ip-config.c:2993
- msgid "Unsupported to-string-flags argument"
- msgstr "to-string-flags 引数はサポートされていません"
-
--#: ../libnm-core/nm-setting-ip-config.c:2972
-+#: ../libnm-core/nm-setting-ip-config.c:3000
- msgid "Unsupported extra-argument"
- msgstr "サポートなしの追加の引数"
-
--#: ../libnm-core/nm-setting-ip-config.c:3239
-+#: ../libnm-core/nm-setting-ip-config.c:3267
- #, c-format
- msgid "unsupported key \"%s\""
- msgstr "サポートされていないキー \"%s\""
-
--#: ../libnm-core/nm-setting-ip-config.c:3244
-+#: ../libnm-core/nm-setting-ip-config.c:3272
- #, c-format
- msgid "duplicate key \"%s\""
- msgstr "重複キー \"%s\""
-
--#: ../libnm-core/nm-setting-ip-config.c:3249
-+#: ../libnm-core/nm-setting-ip-config.c:3277
- #, c-format
- msgid "invalid value for \"%s\""
- msgstr "\"%s\" の値は無効です"
-
--#: ../libnm-core/nm-setting-ip-config.c:3259
-+#: ../libnm-core/nm-setting-ip-config.c:3287
- msgid "empty text does not describe a rule"
- msgstr "空のテキストはルールを説明していません"
-
--#: ../libnm-core/nm-setting-ip-config.c:3265
-+#: ../libnm-core/nm-setting-ip-config.c:3293
- #, c-format
- msgid "missing argument for \"%s\""
- msgstr "\"%s\" の引数がありません"
-
--#: ../libnm-core/nm-setting-ip-config.c:3277
-+#: ../libnm-core/nm-setting-ip-config.c:3305
- msgid "invalid \"from\" part"
- msgstr "\"from\" の部分が無効です"
-
--#: ../libnm-core/nm-setting-ip-config.c:3291
-+#: ../libnm-core/nm-setting-ip-config.c:3319
- msgid "invalid \"to\" part"
- msgstr "\"to\" の部分が無効です"
-
--#: ../libnm-core/nm-setting-ip-config.c:3300
-+#: ../libnm-core/nm-setting-ip-config.c:3328
- #, c-format
- msgid "cannot detect address family for rule"
- msgstr "ルールのアドレスファミリーを検出できません"
-
--#: ../libnm-core/nm-setting-ip-config.c:3360
--#: ../libnm-core/nm-setting-ip-config.c:3454
-+#: ../libnm-core/nm-setting-ip-config.c:3388
-+#: ../libnm-core/nm-setting-ip-config.c:3482
- #, c-format
- msgid "rule is invalid: %s"
- msgstr "ルールが無効です: %s"
-
--#: ../libnm-core/nm-setting-ip-config.c:3437
-+#: ../libnm-core/nm-setting-ip-config.c:3465
- msgid "invalid address family"
- msgstr "アドレスファミリーが無効です"
-
--#: ../libnm-core/nm-setting-ip-config.c:4710
-+#: ../libnm-core/nm-setting-ip-config.c:4738
- #, c-format
- msgid "rule #%u is invalid: %s"
- msgstr "ルール #%u は無効です: %s"
-
--#: ../libnm-core/nm-setting-ip-config.c:4966
-+#: ../libnm-core/nm-setting-ip-config.c:4994
- #, c-format
- msgid "%d. DNS server address is invalid"
- msgstr "%d. DNS サーバーアドレスは無効です"
-
--#: ../libnm-core/nm-setting-ip-config.c:4982
-+#: ../libnm-core/nm-setting-ip-config.c:5010
- #, c-format
- msgid "%d. IP address is invalid"
- msgstr "%d. IP アドレスは無効です"
-
--#: ../libnm-core/nm-setting-ip-config.c:4994
-+#: ../libnm-core/nm-setting-ip-config.c:5022
- #, c-format
- msgid "%d. IP address has 'label' property with invalid type"
- msgstr "%d. IP アドレスには、無効なタイプの 'label' プロパティーがあります"
-
--#: ../libnm-core/nm-setting-ip-config.c:5003
-+#: ../libnm-core/nm-setting-ip-config.c:5031
- #, c-format
- msgid "%d. IP address has invalid label '%s'"
- msgstr "%d. IP アドレスには、無効なラベル '%s' があります"
-
--#: ../libnm-core/nm-setting-ip-config.c:5017
-+#: ../libnm-core/nm-setting-ip-config.c:5045
- msgid "gateway cannot be set if there are no addresses configured"
- msgstr "アドレスが設定されない場合は、ゲートウェイを設定できません"
-
--#: ../libnm-core/nm-setting-ip-config.c:5026
-+#: ../libnm-core/nm-setting-ip-config.c:5054
- msgid "gateway is invalid"
- msgstr "ゲートウェイが無効です"
-
--#: ../libnm-core/nm-setting-ip-config.c:5040
-+#: ../libnm-core/nm-setting-ip-config.c:5069
- #, c-format
- msgid "%d. route is invalid"
- msgstr "%d. ルートは無効です"
-
--#: ../libnm-core/nm-setting-ip-config.c:5056
-+#: ../libnm-core/nm-setting-ip-config.c:5079
-+#, c-format
-+msgid "invalid attribute: %s"
-+msgstr "無効な属性タイプ: %s"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:5098
- #, c-format
- msgid "%u. rule has wrong address-family"
- msgstr "%u. ルールのアドレスファミリーは間違っています"
-
--#: ../libnm-core/nm-setting-ip-config.c:5065
-+#: ../libnm-core/nm-setting-ip-config.c:5107
- #, c-format
- msgid "%u. rule is invalid: %s"
- msgstr "%u. ルールは無効です: %s"
-
--#: ../libnm-core/nm-setting-ip-config.c:5079
-+#: ../libnm-core/nm-setting-ip-config.c:5121
- #, c-format
- msgid "'%s' is not a valid IAID"
- msgstr "'%s' は有効な IAID ではありません"
-
--#: ../libnm-core/nm-setting-ip-config.c:5093
-+#: ../libnm-core/nm-setting-ip-config.c:5135
- #, c-format
- msgid "the property cannot be set when '%s' is disabled"
- msgstr "'%s' が無効の場合、プロパティーは設定できません"
-
--#: ../libnm-core/nm-setting-ip-config.c:5115
-+#: ../libnm-core/nm-setting-ip-config.c:5157
- #, c-format
- msgid "a gateway is incompatible with '%s'"
- msgstr "ゲートウェイは '%s' と互換性がありません"
-
--#: ../libnm-core/nm-setting-ip-tunnel.c:325
-+#: ../libnm-core/nm-setting-ip-tunnel.c:333
- #, c-format
- msgid "'%d' is not a valid tunnel mode"
- msgstr "'%d' は有効なトンネルモードではありません"
-
--#: ../libnm-core/nm-setting-ip-tunnel.c:348
--#: ../libnm-core/nm-setting-ip-tunnel.c:368
-+#: ../libnm-core/nm-setting-ip-tunnel.c:356
-+#: ../libnm-core/nm-setting-ip-tunnel.c:376
- #, c-format
- msgid "'%s' is not a valid IPv%c address"
- msgstr "'%s' は有効な IPv%c アドレスではありません"
-
--#: ../libnm-core/nm-setting-ip-tunnel.c:385
-+#: ../libnm-core/nm-setting-ip-tunnel.c:393
- msgid "tunnel keys can only be specified for GRE tunnels"
- msgstr "トンネルキーは GRE トンネルに対してのみ指定できます"
-
--#: ../libnm-core/nm-setting-ip-tunnel.c:398
--#: ../libnm-core/nm-setting-ip-tunnel.c:414
-+#: ../libnm-core/nm-setting-ip-tunnel.c:406
-+#: ../libnm-core/nm-setting-ip-tunnel.c:422
- #, c-format
- msgid "'%s' is not a valid tunnel key"
- msgstr "'%s' は有効なトンネルキーではありません"
-
--#: ../libnm-core/nm-setting-ip-tunnel.c:426
-+#: ../libnm-core/nm-setting-ip-tunnel.c:434
- msgid "a fixed TTL is allowed only when path MTU discovery is enabled"
- msgstr "固定 TTL は、パス MTU 検出が有効な場合のみ許可されます"
-
--#: ../libnm-core/nm-setting-ip-tunnel.c:439
-+#: ../libnm-core/nm-setting-ip-tunnel.c:447
- #, c-format
- msgid "some flags are invalid for the select mode: %s"
- msgstr "選択されたモードに対して一部のフラグは無効です: %s"
-
--#: ../libnm-core/nm-setting-ip-tunnel.c:453
-+#: ../libnm-core/nm-setting-ip-tunnel.c:459
- #, c-format
- msgid "wired setting not allowed for mode %s"
- msgstr "モード %s には有線設定が許可されていません"
-
- #: ../libnm-core/nm-setting-ip4-config.c:112
--#: ../libnm-core/nm-setting-ip6-config.c:159
-+#: ../libnm-core/nm-setting-ip6-config.c:178
- #, c-format
- msgid "this property cannot be empty for '%s=%s'"
- msgstr "'%s=%s' のこのプロパティーを空にすることはできません"
-@@ -10702,9 +11102,9 @@ msgstr "'%s=%s' のこのプロパティーを空にすることはできませ
- #: ../libnm-core/nm-setting-ip4-config.c:124
- #: ../libnm-core/nm-setting-ip4-config.c:134
- #: ../libnm-core/nm-setting-ip4-config.c:146
--#: ../libnm-core/nm-setting-ip6-config.c:174
--#: ../libnm-core/nm-setting-ip6-config.c:184
--#: ../libnm-core/nm-setting-ip6-config.c:194
-+#: ../libnm-core/nm-setting-ip6-config.c:193
-+#: ../libnm-core/nm-setting-ip6-config.c:203
-+#: ../libnm-core/nm-setting-ip6-config.c:213
- #, c-format
- msgid "this property is not allowed for '%s=%s'"
- msgstr "このプロパティーは '%s=%s' には許可されていません"
-@@ -10731,23 +11131,23 @@ msgstr "'%s=%s' では複数のアドレスは許可されていません"
- msgid "property should be TRUE when method is set to disabled"
- msgstr "メソッドが無効に設定されている場合は、プロパティーは TRUE にします"
-
--#: ../libnm-core/nm-setting-ip6-config.c:233
-+#: ../libnm-core/nm-setting-ip6-config.c:252
- msgid "value is not a valid token"
- msgstr "値は有効なトークンではありません"
-
--#: ../libnm-core/nm-setting-ip6-config.c:244
-+#: ../libnm-core/nm-setting-ip6-config.c:263
- msgid "only makes sense with EUI64 address generation mode"
- msgstr "EUI64 アドレス生成モードでのみ、意味が通じます"
-
--#: ../libnm-core/nm-setting-ip6-config.c:255
-+#: ../libnm-core/nm-setting-ip6-config.c:274
- msgid "invalid DUID"
- msgstr "無効な DUID"
-
--#: ../libnm-core/nm-setting-ip6-config.c:267
-+#: ../libnm-core/nm-setting-ip6-config.c:286
- msgid "token is not in canonical form"
- msgstr "トークンが正規形式ではありません"
-
--#: ../libnm-core/nm-setting-ip6-config.c:280
-+#: ../libnm-core/nm-setting-ip6-config.c:299
- msgid "property should be TRUE when method is set to ignore or disabled"
- msgstr "メソッドが ignore または無効に設定されている場合は、プロパティーは TRUE にします"
-
-@@ -10792,13 +11192,19 @@ msgstr "PSK モードでのみ有効です"
- msgid "non promiscuous operation is allowed only in passthru mode"
- msgstr "非プロミスキャス操作はパススルーモードでのみ許可されます"
-
-+#: ../libnm-core/nm-setting-match.c:738 ../libnm-core/nm-setting-match.c:752
-+#: ../libnm-core/nm-setting-match.c:766 ../libnm-core/nm-setting-match.c:780
-+#, c-format
-+msgid "is empty"
-+msgstr "空です"
-+
- #: ../libnm-core/nm-setting-olpc-mesh.c:94
--#: ../libnm-core/nm-setting-wireless.c:769
-+#: ../libnm-core/nm-setting-wireless.c:774
- msgid "SSID length is out of range <1-32> bytes"
- msgstr "SSID の長さは範囲外 <1-32> バイトです"
-
- #: ../libnm-core/nm-setting-olpc-mesh.c:103
--#: ../libnm-core/nm-setting-wireless.c:809
-+#: ../libnm-core/nm-setting-wireless.c:814
- #, c-format
- msgid "'%d' is not a valid channel"
- msgstr "'%d' は無効なチャンネルです"
-@@ -10813,70 +11219,65 @@ msgstr "'%s' 設定の接続では、マスターが必要ありません。"
- msgid "'%s' is not allowed in fail_mode"
- msgstr "'%s' は、fail_mode では利用できません。"
-
--#: ../libnm-core/nm-setting-ovs-interface.c:94
-+#: ../libnm-core/nm-setting-ovs-interface.c:96
- #, c-format
- msgid "'%s' is not a valid interface type"
- msgstr "'%s' は、有効なインターフェースタイプではありません"
-
--#: ../libnm-core/nm-setting-ovs-interface.c:116
-+#: ../libnm-core/nm-setting-ovs-interface.c:120
- #, c-format
- msgid "A connection with a '%s' setting needs connection.type explicitly set"
- msgstr "'%s' 設定の接続には、connection.type を明示的に設定する必要があります"
-
--#: ../libnm-core/nm-setting-ovs-interface.c:128
-+#: ../libnm-core/nm-setting-ovs-interface.c:132
- #, c-format
- msgid "A connection of type '%s' cannot have ovs-interface.type \"system\""
- msgstr "'%s' タイプの接続では、ovs-interface.type に \"system\" を設定できません"
-
--#: ../libnm-core/nm-setting-ovs-interface.c:140
-+#: ../libnm-core/nm-setting-ovs-interface.c:144
- #, c-format
- msgid "A connection of type '%s' cannot have an ovs-interface.type \"%s\""
- msgstr "'%s' タイプの接続では、ovs-interface.type に \"%s\" を設定できません"
-
--#: ../libnm-core/nm-setting-ovs-interface.c:159
-+#: ../libnm-core/nm-setting-ovs-interface.c:163
- #, c-format
- msgid "A connection can not have both '%s' and '%s' settings at the same time"
- msgstr "接続は、'%s' および '%s' の両方を同時に設定することはできません"
-
--#: ../libnm-core/nm-setting-ovs-interface.c:173
-+#: ../libnm-core/nm-setting-ovs-interface.c:177
- #, c-format
- msgid ""
- "A connection with '%s' setting must be of connection.type \"ovs-interface\" "
- "but is \"%s\""
- msgstr "'%s' 設定の接続では、connection.type は \"ovs-interface\" に設定する必要がありますが、\"%s\" に設定されています。"
-
--#: ../libnm-core/nm-setting-ovs-interface.c:185
-+#: ../libnm-core/nm-setting-ovs-interface.c:189
- #, c-format
- msgid ""
- "A connection with '%s' setting needs to be of '%s' interface type, not '%s'"
- msgstr "'%s' 設定の接続では、インターフェースタイプを '%s' ではなく '%s' にする必要があります。"
-
--#: ../libnm-core/nm-setting-ovs-interface.c:201
-+#: ../libnm-core/nm-setting-ovs-interface.c:206
- #, c-format
- msgid "A connection with ovs-interface.type '%s' setting a 'ovs-patch' setting"
- msgstr "ovs-interface.type '%s' 設定の接続では、'ovs-patch' が設定されています。"
-
--#: ../libnm-core/nm-setting-ovs-interface.c:221
-+#: ../libnm-core/nm-setting-ovs-interface.c:231
- #, c-format
- msgid "Missing ovs interface setting"
- msgstr "ovs インターフェース設定がありません"
-
--#: ../libnm-core/nm-setting-ovs-interface.c:227
-+#: ../libnm-core/nm-setting-ovs-interface.c:237
- #, c-format
- msgid "Missing ovs interface type"
- msgstr "ovs インターフェースのタイプがありません"
-
--#: ../libnm-core/nm-setting-ovs-interface.c:268
-+#: ../libnm-core/nm-setting-ovs-interface.c:278
- #: ../libnm-core/nm-setting-ovs-port.c:181
- #, c-format
- msgid "A connection with a '%s' setting must have a master."
- msgstr "'%s' 設定の接続ではマスターが必要です。"
-
--#: ../libnm-core/nm-setting-ovs-patch.c:89 ../libnm-core/nm-setting-vxlan.c:338
--#, c-format
--msgid "'%s' is not a valid IP address"
--msgstr "'%s' は、有効な IP アドレスではありません"
--
- #: ../libnm-core/nm-setting-ovs-port.c:206
- #, c-format
- msgid "'%s' is not allowed in vlan_mode"
-@@ -10907,47 +11308,47 @@ msgstr "'%d' は有効な範囲 <128-16384> の外にあります"
- msgid "setting this property requires non-zero '%s' property"
- msgstr "このプロパティーを設定するにはゼロ以外の '%s' プロパティーが必要です"
-
--#: ../libnm-core/nm-setting-proxy.c:132
-+#: ../libnm-core/nm-setting-proxy.c:129
- #, c-format
- msgid "invalid proxy method"
- msgstr "無効なプロキシメソッド"
-
--#: ../libnm-core/nm-setting-proxy.c:142 ../libnm-core/nm-setting-proxy.c:151
-+#: ../libnm-core/nm-setting-proxy.c:139 ../libnm-core/nm-setting-proxy.c:148
- #, c-format
- msgid "this property is not allowed for method none"
- msgstr "このプロパティーは、メソッド none には許可されていません"
-
--#: ../libnm-core/nm-setting-proxy.c:162
-+#: ../libnm-core/nm-setting-proxy.c:159
- #, c-format
- msgid "the script is too large"
- msgstr "スクリプトが長すぎます"
-
--#: ../libnm-core/nm-setting-proxy.c:170
-+#: ../libnm-core/nm-setting-proxy.c:167
- #, c-format
- msgid "the script is not valid utf8"
- msgstr "スクリプトは有効な utf8 ではありません"
-
--#: ../libnm-core/nm-setting-proxy.c:178
-+#: ../libnm-core/nm-setting-proxy.c:175
- #, c-format
- msgid "the script lacks FindProxyForURL function"
- msgstr "スクリプトには FindProxyForURL 関数がありません"
-
--#: ../libnm-core/nm-setting-sriov.c:1066
-+#: ../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:1077
-+#: ../libnm-core/nm-setting-sriov.c:1081
- #, c-format
- msgid "invalid VF %u: %s"
- msgstr "無効な VF %u: %s"
-
--#: ../libnm-core/nm-setting-sriov.c:1089
-+#: ../libnm-core/nm-setting-sriov.c:1093
- #, c-format
- msgid "duplicate VF index %u"
- msgstr "VF インデックス %u を複製します"
-
--#: ../libnm-core/nm-setting-sriov.c:1110
-+#: ../libnm-core/nm-setting-sriov.c:1114
- #, c-format
- msgid "VFs %d and %d are not sorted by ascending index"
- msgstr "VFs %d および %d は、上昇するインデックスでソートされません"
-@@ -11087,36 +11488,40 @@ msgstr "フラグが無効です"
- msgid "vlan setting should have a ethernet setting as well"
- msgstr "vlan 設定には Ethernet 設定も必要です"
-
--#: ../libnm-core/nm-setting-vpn.c:546
-+#: ../libnm-core/nm-setting-vrf.c:75
-+msgid "table cannot be zero"
-+msgstr "テーブルはゼロにすることができません"
-+
-+#: ../libnm-core/nm-setting-vpn.c:581
- msgid "cannot set connection.multi-connect for VPN setting"
- msgstr "VPN 設定用に connection.multi-connect を設定できません"
-
--#: ../libnm-core/nm-setting-vpn.c:567
--#, c-format
--msgid "secret was empty"
--msgstr "シークレットが空です"
--
--#: ../libnm-core/nm-setting-vpn.c:597
-+#: ../libnm-core/nm-setting-vpn.c:626
- msgid "setting contained a secret with an empty name"
- msgstr "設定に空の名前のシークレットが含まれていました"
-
--#: ../libnm-core/nm-setting-vpn.c:605
--#, c-format
--msgid "secret value was empty"
--msgstr "シークレット値が空でした"
--
--#: ../libnm-core/nm-setting-vpn.c:652 ../libnm-core/nm-setting.c:2124
-+#: ../libnm-core/nm-setting-vpn.c:666 ../libnm-core/nm-setting.c:2138
- msgid "not a secret property"
- msgstr "シークレットプロパティーではありません"
-
--#: ../libnm-core/nm-setting-vpn.c:658
-+#: ../libnm-core/nm-setting-vpn.c:672
- msgid "secret is not of correct type"
- msgstr "シークレットのタイプが正しくありません"
-
--#: ../libnm-core/nm-setting-vpn.c:742
-+#: ../libnm-core/nm-setting-vpn.c:749 ../libnm-core/nm-setting-vpn.c:798
-+#, c-format
-+msgid "secret name cannot be empty"
-+msgstr "シークレット名は空にできません"
-+
-+#: ../libnm-core/nm-setting-vpn.c:765
- msgid "secret flags property not found"
- msgstr "シークレットフラグプロパティーが見つかりません"
-
-+#: ../libnm-core/nm-setting-vxlan.c:338
-+#, c-format
-+msgid "'%s' is not a valid IP address"
-+msgstr "'%s' は、有効な IP アドレスではありません"
-+
- #: ../libnm-core/nm-setting-vxlan.c:351
- #, c-format
- msgid "'%s' is not a valid IP%c address"
-@@ -11232,71 +11637,71 @@ msgstr "ピア #%u には公開鍵がありません"
- msgid "non-existing peer '%s'"
- msgstr "ピア '%s' は存在しません"
-
--#: ../libnm-core/nm-setting-wireless-security.c:913
-+#: ../libnm-core/nm-setting-wireless-security.c:905
- #, c-format
- msgid "'%s' is not a valid value for '%s' mode connections"
- msgstr "'%s' は '%s' モード接続の有効な値ではありません"
-
--#: ../libnm-core/nm-setting-wireless-security.c:936
-+#: ../libnm-core/nm-setting-wireless-security.c:928
- #, c-format
- msgid "'%s' security requires '%s=%s'"
- msgstr "'%s' セキュリティーには、'%s=%s' が必要です"
-
--#: ../libnm-core/nm-setting-wireless-security.c:957
-+#: ../libnm-core/nm-setting-wireless-security.c:949
- #, c-format
- msgid "'%s' security requires '%s' setting presence"
- msgstr "'%s' セキュリティーには、'%s' の設定が必要になります"
-
--#: ../libnm-core/nm-setting-wireless-security.c:978
-+#: ../libnm-core/nm-setting-wireless-security.c:970
- #, c-format
- msgid "'%d' value is out of range <0-3>"
- msgstr "'%d' の値は <0-3> の範囲外になります"
-
--#: ../libnm-core/nm-setting-wireless-security.c:1037
-+#: ../libnm-core/nm-setting-wireless-security.c:1029
- #, c-format
- msgid "'%s' can only be used with '%s=%s' (WEP)"
- msgstr "'%s' は '%s=%s' (WEP) でしか使用できません"
-
--#: ../libnm-core/nm-setting-wireless-security.c:1061
-+#: ../libnm-core/nm-setting-wireless-security.c:1053
- #, c-format
- msgid ""
- "'%s' can only be used with 'wpa-eap', 'wpa-psk' or 'sae' key management "
- msgstr "'%s' は、'wpa-eap'、'wpa-psk' または 'sae' のキー管理でのみ使用できます "
-
--#: ../libnm-core/nm-setting-wireless.c:778
-+#: ../libnm-core/nm-setting-wireless.c:783
- #, c-format
- msgid "'%s' is not a valid Wi-Fi mode"
- msgstr "'%s' は有効な Wi-Fi モードではありません"
-
--#: ../libnm-core/nm-setting-wireless.c:788
-+#: ../libnm-core/nm-setting-wireless.c:793
- #, c-format
- msgid "'%s' is not a valid band"
- msgstr "'%s' は有効なバンドではありません"
-
--#: ../libnm-core/nm-setting-wireless.c:798
-+#: ../libnm-core/nm-setting-wireless.c:803
- #, c-format
- msgid "'%s' requires setting '%s' property"
- msgstr "'%s' の場合は、'%s' プロパティーを設定する必要があります"
-
--#: ../libnm-core/nm-setting-wireless.c:820
-+#: ../libnm-core/nm-setting-wireless.c:825
- #, c-format
- msgid "'%s' requires '%s' and '%s' property"
- msgstr "'%s' には、'%s' および '%s' のプロパティーが必要です"
-
--#: ../libnm-core/nm-setting-wireless.c:907 ../libnm-core/nm-team-utils.c:1990
-+#: ../libnm-core/nm-setting-wireless.c:912 ../libnm-core/nm-team-utils.c:1990
- #, c-format
- msgid "invalid value"
- msgstr "無効な値"
-
--#: ../libnm-core/nm-setting-wireless.c:917
-+#: ../libnm-core/nm-setting-wireless.c:922
- msgid "Wake-on-WLAN mode 'default' and 'ignore' are exclusive flags"
- msgstr "Wake-on-WLAN モードの 'default' と 'ignore' は排他的なフラグです"
-
--#: ../libnm-core/nm-setting-wireless.c:926
-+#: ../libnm-core/nm-setting-wireless.c:931
- msgid "Wake-on-WLAN trying to set unknown flag"
- msgstr "Wake-on-WLAN は、未知のフラグの設定を試みています"
-
--#: ../libnm-core/nm-setting-wireless.c:948
-+#: ../libnm-core/nm-setting-wireless.c:953
- #, c-format
- msgid "conflicting value of mac-address-randomization and cloned-mac-address"
- msgstr "mac-address-randomization と cloned-mac-address の値の競合"
-@@ -11315,32 +11720,32 @@ msgstr "ページは %d から %d の間でなければなりません"
- msgid "channel must not be between %d and %d"
- msgstr "チャンネルは %d から %d の間であってはなりません"
-
--#: ../libnm-core/nm-setting.c:806
-+#: ../libnm-core/nm-setting.c:809
- #, c-format
- msgid "duplicate property"
- msgstr "重複するプロパティー"
-
--#: ../libnm-core/nm-setting.c:829
-+#: ../libnm-core/nm-setting.c:832
- #, c-format
- msgid "unknown property"
- msgstr "不明なプロパティー"
-
--#: ../libnm-core/nm-setting.c:900 ../libnm-core/nm-setting.c:949
-+#: ../libnm-core/nm-setting.c:914 ../libnm-core/nm-setting.c:963
- #, 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:934
-+#: ../libnm-core/nm-setting.c:933 ../libnm-core/nm-setting.c:948
- #, c-format
- msgid "failed to set property: %s"
- msgstr "プロパティーの設定に失敗しました: %s"
-
--#: ../libnm-core/nm-setting.c:964
-+#: ../libnm-core/nm-setting.c:978
- #, c-format
- msgid "can not set property: %s"
- msgstr "プロパティーを設定できません: %s"
-
--#: ../libnm-core/nm-setting.c:2015
-+#: ../libnm-core/nm-setting.c:2029
- msgid "secret not found"
- msgstr "シークレットが見つかりません"
-
-@@ -11405,7 +11810,7 @@ msgid "team config is not valid UTF-8"
- msgstr "team 設定は有効な UTF-8 ではありません"
-
- #: ../libnm-core/nm-team-utils.c:2104
--#: ../src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c:9025
-+#: ../src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c:9088
- #, c-format
- msgid "invalid json"
- msgstr "無効な json"
-@@ -11420,236 +11825,226 @@ msgstr "無効な D-Bus タイプ \"%s\""
- msgid "invalid link-watchers: %s"
- msgstr "無効なリンクウオッチャー: %s"
-
--#: ../libnm-core/nm-utils.c:2330
-+#: ../libnm-core/nm-utils.c:2298
- #, c-format
- msgid "'%s' is not a valid handle."
- msgstr "'%s' は有効なハンドラーはありません。"
-
--#: ../libnm-core/nm-utils.c:2458
-+#: ../libnm-core/nm-utils.c:2446
- #, c-format
- msgid "'%s' unexpected: parent already specified."
- msgstr "予期せぬ '%s': 親はすでに選択されています。"
-
--#: ../libnm-core/nm-utils.c:2474
-+#: ../libnm-core/nm-utils.c:2462
- #, c-format
- msgid "invalid handle: '%s'"
- msgstr "無効なハンドラー: '%s'"
-
--#: ../libnm-core/nm-utils.c:2496
-+#: ../libnm-core/nm-utils.c:2484
- msgid "parent not specified."
- msgstr "親が指定されていません。"
-
--#: ../libnm-core/nm-utils.c:2558
-+#: ../libnm-core/nm-utils.c:2546
- #, c-format
- msgid "unsupported qdisc option: '%s'."
- msgstr "サポートされていない qdisc オプション: '%s'"
-
--#: ../libnm-core/nm-utils.c:2680
-+#: ../libnm-core/nm-utils.c:2668
- msgid "action name missing."
- msgstr "アクション名がありません。"
-
--#: ../libnm-core/nm-utils.c:2706
-+#: ../libnm-core/nm-utils.c:2694
- #, c-format
- msgid "unsupported action option: '%s'."
- msgstr "サポートされていないアクションのオプション: '%s'"
-
--#: ../libnm-core/nm-utils.c:2844
-+#: ../libnm-core/nm-utils.c:2832
- msgid "invalid action: "
- msgstr "無効なアクション: "
-
--#: ../libnm-core/nm-utils.c:2848
-+#: ../libnm-core/nm-utils.c:2836
- #, c-format
- msgid "unsupported tfilter option: '%s'."
- msgstr "サポートされていない tfilter オプション: '%s'."
-
--#: ../libnm-core/nm-utils.c:3449
-+#: ../libnm-core/nm-utils.c:3437
- #, c-format
- msgid "failed stat file %s: %s"
- msgstr "ファイル %s に対する stat の実行に失敗しました: %s"
-
--#: ../libnm-core/nm-utils.c:3458
-+#: ../libnm-core/nm-utils.c:3446
- #, c-format
- msgid "not a file (%s)"
- msgstr "ファイルではありません (%s)"
-
--#: ../libnm-core/nm-utils.c:3469
-+#: ../libnm-core/nm-utils.c:3457
- #, c-format
- msgid "invalid file owner %d for %s"
- msgstr "%2$s の無効なファイル所有者 %1$d"
-
--#: ../libnm-core/nm-utils.c:3480
-+#: ../libnm-core/nm-utils.c:3468
- #, c-format
- msgid "file permissions for %s"
- msgstr "%s のファイルパーミッション"
-
--#: ../libnm-core/nm-utils.c:3490
-+#: ../libnm-core/nm-utils.c:3478
- #, c-format
- msgid "reject %s"
- msgstr "%s の拒否"
-
--#: ../libnm-core/nm-utils.c:3509
-+#: ../libnm-core/nm-utils.c:3497
- #, c-format
- msgid "path is not absolute (%s)"
- msgstr "パスが絶対パスではありません (%s)"
-
--#: ../libnm-core/nm-utils.c:3523
-+#: ../libnm-core/nm-utils.c:3511
- #, c-format
- msgid "Plugin file does not exist (%s)"
- msgstr "プラグインファイルが存在しません (%s)"
-
--#: ../libnm-core/nm-utils.c:3531
-+#: ../libnm-core/nm-utils.c:3519
- #, c-format
- msgid "Plugin is not a valid file (%s)"
- msgstr "プラグインが有効なファイルではありません (%s)"
-
--#: ../libnm-core/nm-utils.c:3541
-+#: ../libnm-core/nm-utils.c:3529
- #, c-format
- msgid "libtool archives are not supported (%s)"
- msgstr "libtool アーカイブはサポートされていません (%s)"
-
--#: ../libnm-core/nm-utils.c:3623
-+#: ../libnm-core/nm-utils.c:3611
- #, c-format
- msgid "Could not find \"%s\" binary"
- msgstr "\"%s\" バイナリーを見つけることができませんでした"
-
--#: ../libnm-core/nm-utils.c:4517
-+#: ../libnm-core/nm-utils.c:4547
- msgid "unknown secret flags"
- msgstr "不明なシークレットフラグ"
-
--#: ../libnm-core/nm-utils.c:4527
-+#: ../libnm-core/nm-utils.c:4557
- msgid "conflicting secret flags"
- msgstr "競合するシークレットフラグ"
-
--#: ../libnm-core/nm-utils.c:4538
-+#: ../libnm-core/nm-utils.c:4568
- msgid "secret flags must not be \"not-required\""
- msgstr "シークレットフラグは \"not-required\" であってはなりません"
-
--#: ../libnm-core/nm-utils.c:4546
-+#: ../libnm-core/nm-utils.c:4576
- msgid "unsupported secret flags"
- msgstr "サポートされていないシークレットフラグ"
-
--#: ../libnm-core/nm-utils.c:4576
-+#: ../libnm-core/nm-utils.c:4606
- msgid "can't be simultaneously disabled and enabled"
- msgstr "同時に無効または有効にすることはできません"
-
--#: ../libnm-core/nm-utils.c:4584
-+#: ../libnm-core/nm-utils.c:4614
- msgid "WPS is required"
- msgstr "WPS が必要です"
-
--#: ../libnm-core/nm-utils.c:4650
-+#: ../libnm-core/nm-utils.c:4680
- #, c-format
- msgid "not a valid ethernet MAC address for mask at position %lld"
- msgstr "%lld の場所で、マスクに有効な Ethernet MAC アドレスではありません"
-
--#: ../libnm-core/nm-utils.c:4665
-+#: ../libnm-core/nm-utils.c:4695
- #, 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:4725
--msgid "interface name is missing"
--msgstr "インターフェース名がありません"
--
--#: ../libnm-core/nm-utils.c:4731
--msgid "interface name is too short"
--msgstr "インターフェース名が短すぎます"
--
--#: ../libnm-core/nm-utils.c:4740
--msgid "interface name is reserved"
--msgstr "インターフェース名が予約されています"
--
--#: ../libnm-core/nm-utils.c:4752
--msgid "interface name contains an invalid character"
--msgstr "インターフェース名に無効な文字が含まれています"
--
--#: ../libnm-core/nm-utils.c:4758
--msgid "interface name is longer than 15 characters"
--msgstr "インターフェース名が 15 文字を超えています"
--
--#: ../libnm-core/nm-utils.c:5425
-+#: ../libnm-core/nm-utils.c:5390
- msgid "not valid utf-8"
- msgstr "utf-8 ではありません"
-
--#: ../libnm-core/nm-utils.c:5446 ../libnm-core/nm-utils.c:5499
-+#: ../libnm-core/nm-utils.c:5411 ../libnm-core/nm-utils.c:5464
- msgid "is not a JSON object"
- msgstr "JSON オブジェクトではありません"
-
--#: ../libnm-core/nm-utils.c:5475 ../libnm-core/nm-utils.c:5512
-+#: ../libnm-core/nm-utils.c:5440 ../libnm-core/nm-utils.c:5477
- msgid "value is NULL"
- msgstr "値が NULL です"
-
--#: ../libnm-core/nm-utils.c:5475 ../libnm-core/nm-utils.c:5512
-+#: ../libnm-core/nm-utils.c:5440 ../libnm-core/nm-utils.c:5477
- msgid "value is empty"
- msgstr "値が空です"
-
--#: ../libnm-core/nm-utils.c:5487
-+#: ../libnm-core/nm-utils.c:5452
- #, c-format
- msgid "invalid JSON at position %d (%s)"
- msgstr "%d (%s) で無効な JSON"
-
--#: ../libnm-core/nm-utils.c:5649 ../libnm-core/nm-utils.c:5669
-+#: ../libnm-core/nm-utils.c:5597 ../libnm-core/nm-utils.c:5617
- msgid "unterminated escape sequence"
- msgstr "未終了のエスケープシーケンス"
-
--#: ../libnm-core/nm-utils.c:5694
-+#: ../libnm-core/nm-utils.c:5642
- #, c-format
- msgid "unknown attribute '%s'"
- msgstr "不明な属性 '%s'"
-
--#: ../libnm-core/nm-utils.c:5709
--#, fuzzy, c-format
-+#: ../libnm-core/nm-utils.c:5657
-+#, c-format
- msgid "missing key-value separator '%c' after '%s'"
- msgstr "'%s' の後に、キー/値のセパレーター '%c' がありません"
-
--#: ../libnm-core/nm-utils.c:5725
-+#: ../libnm-core/nm-utils.c:5673
- #, c-format
- msgid "invalid uint32 value '%s' for attribute '%s'"
- msgstr "属性 '%s' の無効な uint32 値 '%s'"
-
--#: ../libnm-core/nm-utils.c:5734
-+#: ../libnm-core/nm-utils.c:5682
-+#, c-format
-+msgid "invalid int32 value '%s' for attribute '%s'"
-+msgstr "属性 '%s' の無効な uint32 値 '%s'"
-+
-+#: ../libnm-core/nm-utils.c:5691
-+#, c-format
-+msgid "invalid uint64 value '%s' for attribute '%s'"
-+msgstr "属性 '%s' の無効な uint8 値 '%s'"
-+
-+#: ../libnm-core/nm-utils.c:5700
- #, c-format
- msgid "invalid uint8 value '%s' for attribute '%s'"
- msgstr "属性 '%s' の無効な uint8 値 '%s'"
-
--#: ../libnm-core/nm-utils.c:5744
-+#: ../libnm-core/nm-utils.c:5710
- #, c-format
- msgid "invalid boolean value '%s' for attribute '%s'"
- msgstr "属性 '%s' の無効なブール値 '%s'"
-
--#: ../libnm-core/nm-utils.c:5754
-+#: ../libnm-core/nm-utils.c:5720
- #, c-format
- msgid "unsupported attribute '%s' of type '%s'"
- msgstr "タイプ '%s' のサポートされていない属性 '%s'"
-
--#: ../libnm-core/nm-utils.c:6119
-+#: ../libnm-core/nm-utils.c:6020
- #, c-format
- msgid "Bridge VLANs %d and %d are not sorted by ascending vid"
- msgstr "ブリッジ VLANs %d および %d は、上昇する vid でソートされません"
-
--#: ../libnm-core/nm-utils.c:6143
-+#: ../libnm-core/nm-utils.c:6044
- #, c-format
- msgid "duplicate bridge VLAN vid %u"
- msgstr "ブリッジ VLAN vid %u を複製します"
-
--#: ../libnm-core/nm-utils.c:6155
-+#: ../libnm-core/nm-utils.c:6056
- msgid "only one VLAN can be the PVID"
- msgstr "PVID になれるのは 1 つの VLAN のみです"
-
--#: ../libnm-core/nm-utils.c:6205
-+#: ../libnm-core/nm-utils.c:6106
- #, c-format
- msgid "unknown flags 0x%x"
- msgstr "不明なフラグ 0x%x"
-
--#: ../libnm-core/nm-utils.c:6215
-+#: ../libnm-core/nm-utils.c:6116
- msgid ""
- "'fqdn-no-update' and 'fqdn-serv-update' flags cannot be set at the same time"
- msgstr "'fqdn-no-update' フラグおよび 'fqdn-serv-update' フラグを同時に設定することはできません"
-
--#: ../libnm-core/nm-utils.c:6226
-+#: ../libnm-core/nm-utils.c:6127
- msgid "'fqdn-clear-flags' flag is incompatible with other FQDN flags"
- msgstr "'fqdn-clear-flags' フラグは他の FQDN フラグと互換性がありません"
-
--#: ../libnm-core/nm-utils.c:6235
-+#: ../libnm-core/nm-utils.c:6136
- msgid "DHCPv6 does not support the E (encoded) FQDN flag"
- msgstr "DHCPv6 は E (エンコード済み) FQDN フラグをサポートしません"
-
-@@ -11688,59 +12083,59 @@ msgstr "プラグインはインポート機能をサポートしません"
- msgid "the plugin does not support export capability"
- msgstr "プラグインはエクスポート機能をサポートしません"
-
--#: ../libnm-core/nm-vpn-plugin-info.c:93
-+#: ../libnm-core/nm-vpn-plugin-info.c:111
- #, c-format
- msgid "missing filename"
- msgstr "ファイル名がありません"
-
--#: ../libnm-core/nm-vpn-plugin-info.c:101
-+#: ../libnm-core/nm-vpn-plugin-info.c:119
- #, c-format
- msgid "filename must be an absolute path (%s)"
- msgstr "ファイル名は絶対パスである必要があります (%s)"
-
--#: ../libnm-core/nm-vpn-plugin-info.c:110
-+#: ../libnm-core/nm-vpn-plugin-info.c:128
- #, c-format
- msgid "filename has invalid format (%s)"
- msgstr "ファイル名の形式が無効です (%s)"
-
--#: ../libnm-core/nm-vpn-plugin-info.c:433
-+#: ../libnm-core/nm-vpn-plugin-info.c:419
- #, 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:471
-+#: ../libnm-core/nm-vpn-plugin-info.c:457
- #, c-format
- msgid "there exists a conflicting plugin with the same name (%s)"
- msgstr "同じ名前 (%s) の競合するプラグインが存在します"
-
--#: ../libnm-core/nm-vpn-plugin-info.c:1053
-+#: ../libnm-core/nm-vpn-plugin-info.c:1045
- #, c-format
- msgid "missing \"plugin\" setting"
- msgstr "\"plugin\" 設定がありません"
-
--#: ../libnm-core/nm-vpn-plugin-info.c:1063
-+#: ../libnm-core/nm-vpn-plugin-info.c:1055
- #, c-format
- msgid "%s: don't retry loading plugin which already failed previously"
- msgstr "%s: 以前に失敗したプラグインのロードは再試行しないでください"
-
--#: ../libnm-core/nm-vpn-plugin-info.c:1139
-+#: ../libnm-core/nm-vpn-plugin-info.c:1131
- msgid "missing filename to load VPN plugin info"
- msgstr "VPN プラグイン情報をロードするファイル名がありません"
-
--#: ../libnm-core/nm-vpn-plugin-info.c:1151
-+#: ../libnm-core/nm-vpn-plugin-info.c:1143
- msgid "missing name for VPN plugin info"
- msgstr "VPN プラグイン情報の名前がありません"
-
--#: ../libnm-core/nm-vpn-plugin-info.c:1160
-+#: ../libnm-core/nm-vpn-plugin-info.c:1152
- msgid "missing service for VPN plugin info"
- msgstr "VPN プラグイン情報のサービスがありません"
-
--#: ../libnm/nm-client.c:3584
-+#: ../libnm/nm-client.c:3681
- #, c-format
- msgid "request succeeded with %s but object is in an unsuitable state"
- msgstr "%s によりリクエストは成功しましたが、オブジェクトは不適切な状態にあります"
-
--#: ../libnm/nm-client.c:3675
-+#: ../libnm/nm-client.c:3772
- #, c-format
- msgid "operation succeeded but object %s does not exist"
- msgstr "操作は成功しましたが、オブジェクト %s は存在しません"
-@@ -11749,7 +12144,7 @@ msgstr "操作は成功しましたが、オブジェクト %s は存在しま
- msgid "The connection was not an ADSL connection."
- msgstr "接続は、ADSL 接続ではありませんでした。"
-
--#: ../libnm/nm-device-bond.c:104
-+#: ../libnm/nm-device-bond.c:105
- msgid "The connection was not a bond connection."
- msgstr "接続は、ボンド接続ではありませんでした。"
-
-@@ -11780,11 +12175,11 @@ msgid ""
- "The device is lacking Bluetooth capabilities required by the connection."
- msgstr "デバイスには、接続に必要な Bluetooth 機能がありません。"
-
--#: ../libnm/nm-device-dummy.c:68
-+#: ../libnm/nm-device-dummy.c:61
- msgid "The connection was not a dummy connection."
- msgstr "接続は、ダミー接続ではありませんでした。"
-
--#: ../libnm/nm-device-dummy.c:75 ../libnm/nm-device-generic.c:91
-+#: ../libnm/nm-device-dummy.c:68 ../libnm/nm-device-generic.c:85
- #: ../libnm/nm-device-ovs-bridge.c:84 ../libnm/nm-device-ovs-interface.c:52
- #: ../libnm/nm-device-ovs-port.c:84
- msgid "The connection did not specify an interface name."
-@@ -11817,7 +12212,7 @@ msgstr "ブラックリストの無効な MAC: %s。"
- msgid "Device MAC (%s) is blacklisted by the connection."
- msgstr "デバイス MAC (%s) は、接続によりブラックリスト化されています。"
-
--#: ../libnm/nm-device-generic.c:84
-+#: ../libnm/nm-device-generic.c:78
- msgid "The connection was not a generic connection."
- msgstr "接続は汎用的な接続ではありませんでした。"
-
-@@ -11837,7 +12232,7 @@ msgstr "デバイスと接続の MAC アドレスが一致しませんでした
- msgid "The connection was not an IP tunnel connection."
- msgstr "接続は IP トンネル接続ではありませんでした。"
-
--#: ../libnm/nm-device-macvlan.c:151
-+#: ../libnm/nm-device-macvlan.c:152
- msgid "The connection was not a MAC-VLAN connection."
- msgstr "接続は MAC-VLAN 接続ではありませんでした。"
-
-@@ -11853,7 +12248,7 @@ msgstr "接続は有効なモデム接続ではありませんでした。"
- msgid "The device is lacking capabilities required by the connection."
- msgstr "デバイスには接続に必要な機能がありません。"
-
--#: ../libnm/nm-device-olpc-mesh.c:107
-+#: ../libnm/nm-device-olpc-mesh.c:101
- msgid "The connection was not an OLPC Mesh connection."
- msgstr "接続は OLPC メッシュ接続ではありませんでした。"
-
-@@ -11869,7 +12264,7 @@ msgstr "接続は、ovs_interface 接続ではありませんでした。"
- msgid "The connection was not a ovs_port connection."
- msgstr "接続は、ovs_port 接続ではありませんでした。"
-
--#: ../libnm/nm-device-team.c:131
-+#: ../libnm/nm-device-team.c:125
- msgid "The connection was not a team connection."
- msgstr "接続は team 接続ではありませんでした。"
-
-@@ -11889,10 +12284,18 @@ msgstr "接続は VLAN 接続ではありませんでした。"
- msgid "The VLAN identifiers of the device and the connection didn't match."
- msgstr "デバイスと接続の VLAN ID が一致しませんでした。"
-
--#: ../libnm/nm-device-vlan.c:143
-+#: ../libnm/nm-device-vlan.c:144
- msgid "The hardware address of the device and the connection didn't match."
- msgstr "デバイスと接続のハードウェアアドレスが一致しませんでした。"
-
-+#: ../libnm/nm-device-vrf.c:63
-+msgid "The connection was not a VRF connection."
-+msgstr "接続は VRF 接続ではありませんでした。"
-+
-+#: ../libnm/nm-device-vrf.c:70
-+msgid "The VRF table of the device and the connection didn't match."
-+msgstr "デバイスと接続の VRF テーブルが一致しませんでした"
-+
- #: ../libnm/nm-device-vxlan.c:381
- msgid "The connection was not a VXLAN connection."
- msgstr "接続は VXLAN 接続ではありませんでした。"
-@@ -11917,95 +12320,99 @@ msgstr "デバイスには接続に必要な WPA 機能がありません。"
- msgid "The device is lacking WPA2/RSN capabilities required by the connection."
- msgstr "デバイスには接続に必要な WPA2/RSN 機能がありません。"
-
--#: ../libnm/nm-device-wpan.c:64
-+#: ../libnm/nm-device-wpan.c:54
- msgid "The connection was not a wpan connection."
- msgstr "接続は WPAN 接続ではありませんでした。"
-
--#: ../libnm/nm-device.c:1459
-+#: ../libnm/nm-device.c:1571
- msgid "Bluetooth"
- msgstr "Bluetooth"
-
--#: ../libnm/nm-device.c:1461
-+#: ../libnm/nm-device.c:1573
- msgid "OLPC Mesh"
- msgstr "OLPC メッシュ"
-
--#: ../libnm/nm-device.c:1463
-+#: ../libnm/nm-device.c:1575
- msgid "Open vSwitch Interface"
- msgstr "Open vSwitch インターフェース"
-
--#: ../libnm/nm-device.c:1465
-+#: ../libnm/nm-device.c:1577
- msgid "Open vSwitch Port"
- msgstr "Open vSwitch ポート"
-
--#: ../libnm/nm-device.c:1467
-+#: ../libnm/nm-device.c:1579
- msgid "Open vSwitch Bridge"
- msgstr "Open vSwitch ブリッジ"
-
--#: ../libnm/nm-device.c:1469
-+#: ../libnm/nm-device.c:1581
- msgid "WiMAX"
- msgstr "WiMAX"
-
--#: ../libnm/nm-device.c:1483
-+#: ../libnm/nm-device.c:1595
- msgid "ADSL"
- msgstr "ADSL"
-
--#: ../libnm/nm-device.c:1485
-+#: ../libnm/nm-device.c:1597
- msgid "MACVLAN"
- msgstr "MACVLAN"
-
--#: ../libnm/nm-device.c:1487
-+#: ../libnm/nm-device.c:1599
- msgid "VXLAN"
- msgstr "VXLAN"
-
--#: ../libnm/nm-device.c:1489
-+#: ../libnm/nm-device.c:1601
- msgid "IPTunnel"
- msgstr "IPTunnel"
-
--#: ../libnm/nm-device.c:1491
-+#: ../libnm/nm-device.c:1603
- msgid "Tun"
- msgstr "Tun"
-
--#: ../libnm/nm-device.c:1493
-+#: ../libnm/nm-device.c:1605
- msgid "Veth"
- msgstr "Veth"
-
--#: ../libnm/nm-device.c:1495
-+#: ../libnm/nm-device.c:1607
- msgid "MACsec"
- msgstr "MACsec"
-
--#: ../libnm/nm-device.c:1497
-+#: ../libnm/nm-device.c:1609
- msgid "Dummy"
- msgstr "ダミー"
-
--#: ../libnm/nm-device.c:1499
-+#: ../libnm/nm-device.c:1611
- msgid "PPP"
- msgstr "PPP"
-
--#: ../libnm/nm-device.c:1501
-+#: ../libnm/nm-device.c:1613
- msgid "IEEE 802.15.4"
- msgstr "IEEE 802.15.4"
-
--#: ../libnm/nm-device.c:1503
-+#: ../libnm/nm-device.c:1615
- msgid "6LoWPAN"
- msgstr "6LoWPAN"
-
--#: ../libnm/nm-device.c:1505
-+#: ../libnm/nm-device.c:1617
- msgid "WireGuard"
- msgstr "WireGuard"
-
--#: ../libnm/nm-device.c:1507
-+#: ../libnm/nm-device.c:1619
- msgid "Wi-Fi P2P"
- msgstr "Wi-Fi P2P"
-
--#: ../libnm/nm-device.c:1539
-+#: ../libnm/nm-device.c:1621
-+msgid "VRF"
-+msgstr "VRF"
-+
-+#: ../libnm/nm-device.c:1653
- msgid "Wired"
- msgstr "有線"
-
--#: ../libnm/nm-device.c:1571
-+#: ../libnm/nm-device.c:1685
- msgid "PCI"
- msgstr "PCI"
-
--#: ../libnm/nm-device.c:1573
-+#: ../libnm/nm-device.c:1687
- msgid "USB"
- msgstr "USB"
-
-@@ -12015,22 +12422,26 @@ msgstr "USB"
- #. * "%2$s (%1$s)" if there's no grammatical way to combine
- #. * the strings otherwise.
- #.
--#: ../libnm/nm-device.c:1873 ../libnm/nm-device.c:1892
-+#: ../libnm/nm-device.c:1987 ../libnm/nm-device.c:2006
- #, c-format
- msgctxt "long device name"
- msgid "%s %s"
- msgstr "%s %s"
-
--#: ../libnm/nm-device.c:2569
-+#: ../libnm/nm-device.c:2683
- #, c-format
- msgid "The connection was not valid: %s"
- msgstr "接続は有効ではありませんでした: %s"
-
--#: ../libnm/nm-device.c:2578
-+#: ../libnm/nm-device.c:2692
- #, c-format
- msgid "The interface names of the device and the connection didn't match."
- msgstr "デバイスと接続のインターフェース名が一致しませんでした。"
-
-+#: ../libnm/nm-secret-agent-old.c:1412
-+msgid "registration failed"
-+msgstr "登録に失敗しました"
-+
- #: ../libnm/nm-vpn-plugin-old.c:828 ../libnm/nm-vpn-service-plugin.c:1027
- msgid "No service name specified"
- msgstr "サービス名が指定されていません"
-@@ -12177,88 +12588,87 @@ msgstr "接続確認を有効または無効にする"
- msgid "System policy prevents enabling or disabling connectivity checking"
- msgstr "システムポリシーにより、接続確認を有効化または無効化できません"
-
--#: ../shared/nm-glib-aux/nm-shared-utils.c:1669
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:2346
- #, c-format
- msgid "object class '%s' has no property named '%s'"
- msgstr "オブジェクトクラス '%s' には、'%s' という名前のプロパティーがありません"
-
--#: ../shared/nm-glib-aux/nm-shared-utils.c:1676
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:2353
- #, c-format
- msgid "property '%s' of object class '%s' is not writable"
- msgstr "プロパティー '%s' (オブジェクトクラス '%s') が書き込み可能ではありません"
-
--#: ../shared/nm-glib-aux/nm-shared-utils.c:1683
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:2360
- #, c-format
- msgid ""
- "construct property \"%s\" for object '%s' can't be set after construction"
- msgstr "コンストラクトプロパティー \"%s\" (オブジェクト '%s') は構築後に設定できません"
-
--#: ../shared/nm-glib-aux/nm-shared-utils.c:1691
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:2368
- #, c-format
- msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
- msgstr "'%s::%s' は有効なプロパティー名ではありません。'%s' は GObject サブタイプではありません"
-
--#: ../shared/nm-glib-aux/nm-shared-utils.c:1700
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:2377
- #, c-format
- msgid "unable to set property '%s' of type '%s' from value of type '%s'"
- msgstr "プロパティー '%s' (タイプ '%s') をタイプ '%s' の値から設定できません"
-
--#: ../shared/nm-glib-aux/nm-shared-utils.c:1711
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:2388
- #, c-format
- msgid ""
- "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
- "type '%s'"
- msgstr "値 \"%s\" (タイプ '%s') が、プロパティー '%s' (タイプ '%s') に対して無効または範囲外です"
-
--#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:221
--#, c-format
--msgid "'%s' is not valid: properties should be specified as 'key=value'"
--msgstr "'%s' は無効です。プロパティーは 'key=value' と指定される必要があります"
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:4801
-+msgid "interface name is missing"
-+msgstr "インターフェース名がありません"
-
--#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:236
--#, c-format
--msgid "'%s' is not a valid key"
--msgstr "'%s' は有効なキーではありません"
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:4807
-+msgid "interface name is too short"
-+msgstr "インターフェース名が短すぎます"
-
--#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:242
--#, c-format
--msgid "duplicate key '%s'"
--msgstr "重複キー '%s'"
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:4816
-+msgid "interface name is reserved"
-+msgstr "インターフェース名が予約されています"
-
--#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:256
--#, c-format
--msgid "number for '%s' is out of range"
--msgstr "'%s' の番号は範囲外です"
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:4828
-+msgid "interface name contains an invalid character"
-+msgstr "インターフェース名に無効な文字が含まれています"
-+
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:4834
-+msgid "interface name is longer than 15 characters"
-+msgstr "インターフェース名が 15 文字を超えています"
-
--#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:259
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:4857
- #, c-format
--msgid "value for '%s' must be a number"
--msgstr "'%s' の値は番号でなければなりません"
-+msgid "'%%' is not allowed in interface names"
-+msgstr "インターフェイス名に '%%' は許可されていません"
-
--#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:270
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:4870
- #, c-format
--msgid "value for '%s' must be a boolean"
--msgstr "'%s' の値はブール値でなければなりません"
-+msgid "'%s' is not allowed as interface name"
-+msgstr "インターフェイス名には '%s' は使用できません"
-
--#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:279
--msgid "missing 'name' attribute"
--msgstr "'name' 属性がありません"
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:4891
-+msgid ""
-+"interface name must be alphanumerical with no forward or backward slashes"
-+msgstr "インターフェイス名は、通常スラッシュと逆スラッシュ (/ \\) を含まない英数字でなければなりません。"
-
--#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:286
--#, c-format
--msgid "invalid 'name' \"%s\""
--msgstr "'name' \"%s\" が無効です"
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:4908
-+msgid "interface name must not be empty"
-+msgstr "インターフェイス名の指定は必須です"
-
--#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:298
--#, c-format
--msgid "attribute '%s' is invalid for \"%s\""
--msgstr "属性 '%s' は \"%s\" には無効です"
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:4914
-+msgid "interface name must be UTF-8 encoded"
-+msgstr "インターフェイス名は UTF-8 でエンコードされている必要があります。"
-
- #. TRANSLATORS: the first %s is a prefix for the connection id, such
- #. * as "Wired Connection" or "VPN Connection". The %d is a number
- #. * that is combined with the first argument to create a unique
- #. * connection id.
--#: ../src/NetworkManagerUtils.c:107
-+#: ../src/NetworkManagerUtils.c:109
- #, c-format
- msgctxt "connection id fallback"
- msgid "%s %u"
-@@ -12270,25 +12680,25 @@ msgid "Failed to read configuration: %s\n"
- msgstr "設定の読み込みに失敗しました: %s\n"
-
- #. Logging/debugging
--#: ../src/main.c:184 ../src/nm-iface-helper.c:295
-+#: ../src/main.c:184 ../src/nm-iface-helper.c:297
- msgid "Print NetworkManager version and exit"
- msgstr "NetworkManager のバージョンを表示して終了する"
-
--#: ../src/main.c:185 ../src/nm-iface-helper.c:296
-+#: ../src/main.c:185 ../src/nm-iface-helper.c:298
- msgid "Don't become a daemon"
- msgstr "デーモンにしない"
-
--#: ../src/main.c:186 ../src/nm-iface-helper.c:298
-+#: ../src/main.c:186 ../src/nm-iface-helper.c:300
- #, c-format
- msgid "Log level: one of [%s]"
- msgstr "ログレベル: [%s] のいずれか"
-
--#: ../src/main.c:188 ../src/nm-iface-helper.c:300
-+#: ../src/main.c:188 ../src/nm-iface-helper.c:302
- #, c-format
- msgid "Log domains separated by ',': any combination of [%s]"
- msgstr "',' で区切ったログドメイン: [%s] の組み合わせ"
-
--#: ../src/main.c:190 ../src/nm-iface-helper.c:302
-+#: ../src/main.c:190 ../src/nm-iface-helper.c:304
- msgid "Make all warnings fatal"
- msgstr "すべての警告を致命的にする"
-
-@@ -12311,12 +12721,12 @@ msgstr "NetworkManager によりすべてのネットワーク接続が監視さ
- "ワイヤレスカードを関連付けるべきワイヤレスアクセスポイントの\n"
- "ユーザーによる指定も許可されます。"
-
--#: ../src/main.c:325 ../src/main-utils.c:275 ../src/nm-iface-helper.c:443
-+#: ../src/main.c:325 ../src/main-utils.c:275 ../src/nm-iface-helper.c:445
- #, c-format
- msgid "%s. Please use --help to see a list of valid options.\n"
- msgstr "%s --help を使用して有効なオプションの一覧を確認してください。\n"
-
--#: ../src/main.c:358 ../src/nm-iface-helper.c:456
-+#: ../src/main.c:358 ../src/nm-iface-helper.c:458
- #, c-format
- msgid "Could not daemonize: %s [error %u]\n"
- msgstr "デーモン化できませんでした: %s [エラー %u]\n"
-@@ -12351,11 +12761,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:303
-+#: ../src/dhcp/nm-dhcp-dhclient-utils.c:324
- msgid "# Created by NetworkManager\n"
- msgstr "# NetworkManager で作成されています\n"
-
--#: ../src/dhcp/nm-dhcp-dhclient-utils.c:316
-+#: ../src/dhcp/nm-dhcp-dhclient-utils.c:337
- #, c-format
- msgid ""
- "# Merged from %s\n"
-@@ -12422,11 +12832,11 @@ msgstr "ブリッジ接続"
- msgid "Dummy connection"
- msgstr "ダミー接続"
-
--#: ../src/devices/nm-device-ethernet.c:1506
-+#: ../src/devices/nm-device-ethernet.c:1618
- msgid "PPPoE connection"
- msgstr "PPPoE 接続"
-
--#: ../src/devices/nm-device-ethernet.c:1506
-+#: ../src/devices/nm-device-ethernet.c:1618
- msgid "Wired connection"
- msgstr "有線接続"
-
-@@ -12435,7 +12845,7 @@ msgstr "有線接続"
- msgid "Wired connection %d"
- msgstr "有線接続 %d"
-
--#: ../src/devices/nm-device-ip-tunnel.c:407
-+#: ../src/devices/nm-device-ip-tunnel.c:408
- msgid "IP tunnel connection"
- msgstr "IP トンネル接続"
-
-@@ -12451,7 +12861,7 @@ msgstr "TUN 接続"
- msgid "WPAN connection"
- msgstr "WPAN 接続"
-
--#: ../src/devices/team/nm-device-team.c:87
-+#: ../src/devices/team/nm-device-team.c:89
- msgid "Team connection"
- msgstr "team 接続"
-
-@@ -12595,182 +13005,182 @@ msgstr "WPA 認証は、非 EAP (オリジナル) LEAP または動的 WEP と
- msgid "WPA authentication is incompatible with Shared Key authentication"
- msgstr "WPA 認証は、共有キー認証と互換性がありません"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:776
-+#: ../src/devices/wifi/nm-wifi-utils.c:783
- msgid "Failed to determine AP security information"
- msgstr "AP セキュリティー情報の決定に失敗しました。"
-
--#: ../src/nm-config.c:572
-+#: ../src/nm-config.c:565
- #, c-format
- msgid "Bad '%s' option: "
- msgstr "不正な '%s' オプション: "
-
--#: ../src/nm-config.c:585
-+#: ../src/nm-config.c:578
- msgid "Config file location"
- msgstr "設定ファイルの場所"
-
--#: ../src/nm-config.c:586
-+#: ../src/nm-config.c:579
- msgid "Config directory location"
- msgstr "設定ディレクトリの場所"
-
--#: ../src/nm-config.c:587
-+#: ../src/nm-config.c:580
- msgid "System config directory location"
- msgstr "システム設定ディレクトリーの場所"
-
--#: ../src/nm-config.c:588
-+#: ../src/nm-config.c:581
- msgid "Internal config file location"
- msgstr "内部設定ファイルの場所"
-
--#: ../src/nm-config.c:589
-+#: ../src/nm-config.c:582
- msgid "State file location"
- msgstr "状態ファイルの場所"
-
--#: ../src/nm-config.c:590
-+#: ../src/nm-config.c:583
- msgid "State file for no-auto-default devices"
- msgstr "no-auto-default デバイスの状態ファイル"
-
--#: ../src/nm-config.c:591
-+#: ../src/nm-config.c:584
- msgid "List of plugins separated by ','"
- msgstr "複数のプラグインを ',' で区切った一覧"
-
--#: ../src/nm-config.c:592
-+#: ../src/nm-config.c:585
- msgid "Quit after initial configuration"
- msgstr "初期設定後に終了する"
-
--#: ../src/nm-config.c:593 ../src/nm-iface-helper.c:297
-+#: ../src/nm-config.c:586 ../src/nm-iface-helper.c:299
- msgid "Don't become a daemon, and log to stderr"
- msgstr "デーモンにせず、stderr にログ記録する"
-
- #. These three are hidden for now, and should eventually just go away.
--#: ../src/nm-config.c:596
-+#: ../src/nm-config.c:589
- msgid "An http(s) address for checking internet connectivity"
- msgstr "インターネットの接続性を確認するための http(s) アドレス"
-
--#: ../src/nm-config.c:597
-+#: ../src/nm-config.c:590
- msgid "The interval between connectivity checks (in seconds)"
- msgstr "接続性チェックの間隔 (秒単位)"
-
--#: ../src/nm-config.c:598
-+#: ../src/nm-config.c:591
- msgid "The expected start of the response"
- msgstr "期待されている応答の開始点"
-
--#: ../src/nm-config.c:605
-+#: ../src/nm-config.c:598
- msgid "NetworkManager options"
- msgstr "NetworkManager オプション"
-
--#: ../src/nm-config.c:605
-+#: ../src/nm-config.c:598
- msgid "Show NetworkManager options"
- msgstr "NetworkManager オプションを表示"
-
- #. Interface/IP config
--#: ../src/nm-iface-helper.c:277
-+#: ../src/nm-iface-helper.c:279
- msgid "The interface to manage"
- msgstr "管理するインターフェース"
-
--#: ../src/nm-iface-helper.c:278
-+#: ../src/nm-iface-helper.c:280
- msgid "Connection UUID"
- msgstr "接続 UUID"
-
--#: ../src/nm-iface-helper.c:279
-+#: ../src/nm-iface-helper.c:281
- msgid "Connection Token for Stable IDs"
- msgstr "安定 ID の接続トークン"
-
--#: ../src/nm-iface-helper.c:280
-+#: ../src/nm-iface-helper.c:282
- msgid "Whether to manage IPv6 SLAAC"
- msgstr "IPv6 SLAAC を管理するかどうか"
-
--#: ../src/nm-iface-helper.c:281
-+#: ../src/nm-iface-helper.c:283
- msgid "Whether SLAAC must be successful"
- msgstr "SLAAC が成功する必要があるかどうか"
-
--#: ../src/nm-iface-helper.c:282
-+#: ../src/nm-iface-helper.c:284
- msgid "Use an IPv6 temporary privacy address"
- msgstr "IPv6 一時プライバシーアドレスの使用"
-
--#: ../src/nm-iface-helper.c:283
-+#: ../src/nm-iface-helper.c:285
- msgid "Current DHCPv4 address"
- msgstr "現在の DHCPv4 アドレス"
-
--#: ../src/nm-iface-helper.c:284
-+#: ../src/nm-iface-helper.c:286
- msgid "Whether DHCPv4 must be successful"
- msgstr "DHCPv4 が成功する必要があるかどうか"
-
--#: ../src/nm-iface-helper.c:285
-+#: ../src/nm-iface-helper.c:287
- msgid "Hex-encoded DHCPv4 client ID"
- msgstr "16 進エンコードされた DHCPv4 クライアント ID"
-
--#: ../src/nm-iface-helper.c:286
-+#: ../src/nm-iface-helper.c:288
- msgid "Hostname to send to DHCP server"
- msgstr "DHCP サーバーに送信するホスト名"
-
--#: ../src/nm-iface-helper.c:286
-+#: ../src/nm-iface-helper.c:288
- msgid "barbar"
- msgstr "barbar"
-
--#: ../src/nm-iface-helper.c:287
-+#: ../src/nm-iface-helper.c:289
- msgid "FQDN to send to DHCP server"
- msgstr "DHCP サーバーに送信する FQDN"
-
--#: ../src/nm-iface-helper.c:287
-+#: ../src/nm-iface-helper.c:289
- msgid "host.domain.org"
- msgstr "host.domain.org"
-
--#: ../src/nm-iface-helper.c:288
-+#: ../src/nm-iface-helper.c:290
- msgid "Route priority for IPv4"
- msgstr "IPv4 のルート優先度"
-
--#: ../src/nm-iface-helper.c:288
-+#: ../src/nm-iface-helper.c:290
- msgid "0"
- msgstr "0"
-
--#: ../src/nm-iface-helper.c:289
-+#: ../src/nm-iface-helper.c:291
- msgid "Route priority for IPv6"
- msgstr "IPv6 のルート優先度"
-
--#: ../src/nm-iface-helper.c:289
-+#: ../src/nm-iface-helper.c:291
- msgid "1024"
- msgstr "1024"
-
--#: ../src/nm-iface-helper.c:290
-+#: ../src/nm-iface-helper.c:292
- msgid "Hex-encoded Interface Identifier"
- msgstr "16 進エンコードされたインターフェース ID"
-
--#: ../src/nm-iface-helper.c:291
-+#: ../src/nm-iface-helper.c:293
- msgid "IPv6 SLAAC address generation mode"
- msgstr "IPv6 SLAAC アドレス生成モード"
-
--#: ../src/nm-iface-helper.c:292
-+#: ../src/nm-iface-helper.c:294
- msgid ""
- "The logging backend configuration value. See logging.backend in "
- "NetworkManager.conf"
- msgstr "ロギングバックエンド設定値。NetworkManager.conf の logging.backend を参照してください"
-
--#: ../src/nm-iface-helper.c:312
-+#: ../src/nm-iface-helper.c:314
- msgid ""
- "nm-iface-helper is a small, standalone process that manages a single network "
- "interface."
- msgstr "nm-iface-helper は、単一のネットワークインターフェースを管理する小さいスタンドアロンプロセスです。"
-
--#: ../src/nm-iface-helper.c:423
-+#: ../src/nm-iface-helper.c:425
- #, c-format
- msgid "An interface name and UUID are required\n"
- msgstr "インターフェース名と UUID が’必要です\n"
-
--#: ../src/nm-iface-helper.c:430
-+#: ../src/nm-iface-helper.c:432
- #, c-format
- msgid "Failed to find interface index for %s (%s)\n"
- msgstr "%s (%s) のインターフェースインデックスの検出に失敗しました\n"
-
--#: ../src/nm-iface-helper.c:448
-+#: ../src/nm-iface-helper.c:450
- #, c-format
- msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n"
- msgstr "コマンドラインに渡された未認識のログドメイン '%s' を無視します。\n"
-
--#: ../src/nm-iface-helper.c:489
-+#: ../src/nm-iface-helper.c:491
- #, c-format
- msgid "(%s): Invalid IID %s\n"
- msgstr "(%s): 無効な IID %s\n"
-
--#: ../src/nm-iface-helper.c:500
-+#: ../src/nm-iface-helper.c:502
- #, c-format
- msgid "(%s): Invalid DHCP client-id %s\n"
- msgstr "(%s): 無効な DHCP client-id %s\n"
-@@ -12785,6 +13195,84 @@ msgstr "不明なログレベル '%s'"
- msgid "Unknown log domain '%s'"
- msgstr "不明なログドメイン '%s'"
-
-+#~ msgid "missing colon in 'password' entry '%s'"
-+#~ msgstr "'password' エントリー '%s' にコロンがありません"
-+
-+#~ msgid "missing dot in 'password' entry '%s'"
-+#~ msgstr "'password' エントリー '%s' にドットがありません"
-+
-+#~ msgid "invalid setting name in 'password' entry '%s'"
-+#~ msgstr "'password' エントリー '%s' の設定名が無効です"
-+
-+#~ msgid "Error: '%s': %s"
-+#~ msgstr "エラー: '%s': %s"
-+
-+#~ msgid "Authentication message: %s\n"
-+#~ msgstr "認証メッセージ: %s\n"
-+
-+#~ msgid "Authentication error: %s\n"
-+#~ msgstr "認証エラー: %s\n"
-+
-+#~ msgid "'%s' is not valid master; use ifname or connection UUID"
-+#~ msgstr ""
-+#~ "'%s' は 有効なマスターではありません: ifname か、接続 UUID を使用してくだ"
-+#~ "さい。"
-+
-+#~ msgid "An authentication session is already underway."
-+#~ msgstr "認証セッションはすでに実行されています。"
-+
-+#~ msgid "A timeout for a DHCP transaction in seconds."
-+#~ msgstr "DHCP トランザクションのタイムアウト (秒単位)。"
-+
-+#~ msgid ""
-+#~ "Array of DNS options as described in man 5 resolv.conf. NULL means that "
-+#~ "the options are unset and left at the default. In this case "
-+#~ "NetworkManager will use default options. This is distinct from an empty "
-+#~ "list of properties."
-+#~ msgstr ""
-+#~ "DNS オプションの配列。man 5 resolv.conf で説明されています。NULL は、オプ"
-+#~ "ションが設定されていないか、デフォルトになっていることを示しています。この"
-+#~ "場合、NetworkManager はデフォルトのオプションを使用し、プロパティーのリス"
-+#~ "トが空になっている場合とは区別されます。"
-+
-+#~ msgid ""
-+#~ "The gateway associated with this configuration. This is only meaningful "
-+#~ "if \"addresses\" is also set."
-+#~ msgstr ""
-+#~ "ゲートウェイは、この設定に関連付けられています。\"アドレス\" とともに設定"
-+#~ "した場合に限り有効になります。"
-+
-+#~ msgid ""
-+#~ "A list of interface names to match. Each element is a shell wildcard "
-+#~ "pattern. When an element is prefixed with exclamation mark (!) the "
-+#~ "condition is inverted. A candidate interface name is considered matching "
-+#~ "when both these conditions are satisfied: (a) any of the elements not "
-+#~ "prefixed with '!' matches or there aren't such elements; (b) none of the "
-+#~ "elements prefixed with '!' match."
-+#~ msgstr ""
-+#~ "一致するインターフェース名の一覧。各要素は、シェルワイルドカードパターンで"
-+#~ "す。感嘆符 (!) が要素の先頭に付いている場合、条件は反転します。以下の (a) "
-+#~ "および (b) の条件が両方とも満たされている場合、候補のインターフェース名が"
-+#~ "一致していると考えられます。(a) 感嘆符 (!) が先頭に付いていない要素が一致"
-+#~ "する、またはこのような要素がない場合、(b) 感嘆符 (!) が先頭に付いている要"
-+#~ "素がどれも一致しない。"
-+
-+#~ msgid ""
-+#~ "Specifies the unicast destination IP address of a remote Open vSwitch "
-+#~ "bridge port to connect to."
-+#~ msgstr ""
-+#~ "接続するリモートの Open vSwitch ブリッジポートのユニキャスト宛先 IP アドレ"
-+#~ "スを指定します。"
-+
-+#~ msgid "only one of '%s' and '%s' can be set"
-+#~ msgstr "設定できるのは '%s' と '%s' の一つのみです"
-+
-+#~ msgid "unsupported offload feature"
-+#~ msgstr "サポートされていないオフロード機能"
-+
-+#~ msgid "secret was empty"
-+#~ msgstr "シークレットが空です"
-+
- #~ msgid "Unknown parameter: %s\n"
- #~ msgstr "不明なパラメーター: %s\n"
-
-@@ -12822,9 +13310,3 @@ msgstr "不明なログドメイン '%s'"
- #~ msgid "WPA Ad-Hoc authentication requires an Ad-Hoc mode AP"
- #~ msgstr "WPA アドホック認証にはアドホックモード AP が必要です"
-
--#~ msgid ""
--#~ "Access point mode is Ad-Hoc but setting requires Infrastructure security"
--#~ msgstr ""
--#~ "アクセスポイントモードはアドホックですが、設定ではインフラストラクチャーセ"
--#~ "キュリティーが必要です"
--
-diff --git a/po/ko.po b/po/ko.po
-index 5d4874a1f1..c80b1f638e 100644
---- a/po/ko.po
-+++ b/po/ko.po
-@@ -2,15 +2,15 @@
- # networkmanager korean translation.
- # Copyright (C) 2007 THE NetworkManager'S COPYRIGHT HOLDER
- # This file is distributed under the same license as the NetworkManager package.
--#
--#
-+#
-+#
- # Young-Ho Cha <ganadist@gmail.com>, 2006-2007.
- # Namhyung Kim <namhyung@gmail.com>, 2007.
- # Hyunsok Oh <enshahar@gmail.com>, 2010.
- # Hyunsok Oh <hoh@redhat.com>, 2010.
- # Changwoo Ryu <cwryu@debian.org>, 2011.
- # Seongho Cho <darkcircle.0426@gmail.com>, 2011.
--#
-+#
- # 주의:
- # - 이 프로그램의 이름인 "Network Manager"는 "네트워크 관리" 혹은
- # "네트워크 관리 프로그램"으로 번역.
-@@ -19,18 +19,18 @@ msgid ""
- msgstr ""
- "Project-Id-Version: PACKAGE VERSION\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2019-07-31 17:50+0200\n"
--"MIME-Version: 1.0\n"
--"Content-Type: text/plain; charset=UTF-8\n"
--"Content-Transfer-Encoding: 8bit\n"
-+"POT-Creation-Date: 2020-06-30 11:33+0200\n"
- "PO-Revision-Date: 2019-08-13 10:03+0000\n"
- "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
- "Language-Team: GNOME Korea <gnome-kr@googlegroups.com>\n"
- "Language: ko\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: 8bit\n"
- "Plural-Forms: nplurals=1; plural=0;\n"
- "X-Generator: Zanata 4.6.2\n"
-
--#: ../clients/cli/agent.c:39
-+#: ../clients/cli/agent.c:22
- #, c-format
- msgid ""
- "Usage: nmcli agent { COMMAND | help }\n"
-@@ -42,7 +42,7 @@ msgstr "사용법: nmcli 에이전트 { 명령 | 도움말 }\n"
- "COMMAND := { Secret | polkit | 전체 }\n"
- "\n"
-
--#: ../clients/cli/agent.c:47
-+#: ../clients/cli/agent.c:30
- #, c-format
- msgid ""
- "Usage: nmcli agent secret { help }\n"
-@@ -52,15 +52,14 @@ msgid ""
- "running\n"
- "and if a password is required asks the user for it.\n"
- "\n"
--msgstr ""
--"사용법: nmcli agent secret { 도움말 }\n"
-+msgstr "사용법: nmcli agent secret { 도움말 }\n"
- "\n"
- "nmcli를 네트워크 관리자 Secret 에이전트로 실행합니다. 네트워크 관리자가\n"
- "암호를 요구하는 경우 등록된 에이전트에게 이를 요청합니다. 이 명령은 계속해서 nmcli를 실행하며\n"
- " 암호가 필요한 경우 사용자에게 요청합니다.\n"
- "\n"
-
--#: ../clients/cli/agent.c:57
-+#: ../clients/cli/agent.c:40
- #, c-format
- msgid ""
- "Usage: nmcli agent polkit { help }\n"
-@@ -70,212 +69,214 @@ msgid ""
- "gives\n"
- "the response back to polkit.\n"
- "\n"
--msgstr ""
--"사용법: nmcli agent polkit { 도움말 }\n"
-+msgstr "사용법: nmcli agent polkit { 도움말 }\n"
- "\n"
- "nmcli를 사용자 세션의 polkit 작업으로 등록합니다.\n"
- "polkit 디먼에서 권한 부여를 요구하고, nmcli는 사용자에게 요청하고\n"
- "polkit에 다시 응답을 보냅니다.\n"
- "\n"
-
--#: ../clients/cli/agent.c:67
-+#: ../clients/cli/agent.c:50
- #, c-format
- msgid ""
- "Usage: nmcli agent all { help }\n"
- "\n"
- "Runs nmcli as both NetworkManager secret and a polkit agent.\n"
- "\n"
--msgstr ""
--"사용법: nmcli agent all { 도움말 }\n"
-+msgstr "사용법: nmcli agent all { 도움말 }\n"
- "\n"
- "nmcli를 네트워크 관리자 Secret 및 polkit 에이전트로 실행합니다.\n"
- "\n"
-
--#: ../clients/cli/agent.c:159
-+#: ../clients/cli/agent.c:142
- #, c-format
- msgid "nmcli successfully registered as a NetworkManager's secret agent.\n"
- msgstr "nmcli가 네트워크 관리자의 Secret 에이전트로 등록되었습니다.\n"
-
--#: ../clients/cli/agent.c:161
-+#: ../clients/cli/agent.c:144
- #, c-format
- msgid "Error: secret agent initialization failed"
- msgstr "오류: secret 에이전트 초기화 실패"
-
--#: ../clients/cli/agent.c:180
--#, c-format
--msgid "Error: polkit agent initialization failed: %s"
--msgstr "오류: polkit 에이전트 초기화 실패: %s"
--
--#: ../clients/cli/agent.c:188
-+#: ../clients/cli/agent.c:153
- #, c-format
- msgid "nmcli successfully registered as a polkit agent.\n"
- msgstr "nmcli가 polkit 에이전트로 등록되었습니다.\n"
-
--#: ../clients/cli/common.c:360 ../clients/cli/common.c:361
--#: ../clients/cli/common.c:392 ../clients/cli/common.c:393
--#: ../clients/cli/connections.c:1503
-+#: ../clients/cli/agent.c:176
-+#, c-format
-+msgid "Error: polkit agent initialization failed: %s"
-+msgstr "오류: polkit 에이전트 초기화 실패: %s"
-+
-+#: ../clients/cli/common.c:347 ../clients/cli/common.c:348
-+#: ../clients/cli/common.c:379 ../clients/cli/common.c:380
-+#: ../clients/cli/connections.c:1523
- msgid "GROUP"
- msgstr "그룹 "
-
--#: ../clients/cli/common.c:644
-+#: ../clients/cli/common.c:631
- #, c-format
- msgid "Error: openconnect failed: %s\n"
- msgstr "오류: openconnect 실패: %s\n"
-
--#: ../clients/cli/common.c:651
-+#: ../clients/cli/common.c:638
- #, c-format
- msgid "Error: openconnect failed with status %d\n"
- msgstr "오류: openconnect 실패, 상태: %d\n"
-
--#: ../clients/cli/common.c:653
-+#: ../clients/cli/common.c:640
- #, c-format
- msgid "Error: openconnect failed with signal %d\n"
- msgstr "오류: openconnect 실패, 신호: %d\n"
-
--#: ../clients/cli/common.c:741
-+#: ../clients/cli/common.c:728
- #, c-format
- msgid ""
- "Warning: password for '%s' not given in 'passwd-file' and nmcli cannot ask "
- "without '--ask' option.\n"
--msgstr ""
--"경고: '%s'의 암호가 'passwd-file'에 제공되지 않았으며 '--ask' 옵션 없이는 nmcli 요청이 불가능합니다.\n"
-+msgstr "경고: '%s'의 암호가 'passwd-file'에 제공되지 않았으며 '--ask' 옵션 없이는 nmcli 요청이 불가능합니다.\n"
-
--#: ../clients/cli/common.c:1241
-+#: ../clients/cli/common.c:1244
- #, c-format
- msgid "Error: Could not create NMClient object: %s."
- msgstr "오류: NMClient 개체를 생성할 수 없음: %s."
-
--#: ../clients/cli/common.c:1261
-+#: ../clients/cli/common.c:1265
- msgid "Error: NetworkManager is not running."
- msgstr "오류: 네트워크 관리 프로그램이 실행 중이 아닙니다."
-
--#: ../clients/cli/common.c:1357
-+#: ../clients/cli/common.c:1364
- #, c-format
- msgid "Error: argument '%s' not understood. Try passing --help instead."
- msgstr "오류 : 인수 '%s' 이해되지. 대신 --help를 전달하십시오."
-
--#: ../clients/cli/common.c:1367
-+#: ../clients/cli/common.c:1372
- msgid "Error: missing argument. Try passing --help."
- msgstr "오류 : 인수가 누락되었습니다. --help를 전달하십시오."
-
--#: ../clients/cli/common.c:1436
-+#: ../clients/cli/common.c:1439
- msgid "access denied"
- msgstr "접근이 거부됨"
-
--#: ../clients/cli/common.c:1444 ../clients/cli/connections.c:80
--#: ../clients/cli/connections.c:89 ../clients/cli/devices.c:438
--#: ../clients/cli/devices.c:530 ../clients/cli/devices.c:537
--#: ../clients/cli/general.c:40 ../clients/cli/general.c:130
--#: ../clients/cli/general.c:135 ../clients/common/nm-client-utils.c:264
--#: ../clients/common/nm-client-utils.c:277
--#: ../clients/common/nm-client-utils.c:281
--#: ../clients/common/nm-client-utils.c:286
--#: ../clients/common/nm-meta-setting-desc.c:1711
--#: ../clients/common/nm-meta-setting-desc.c:1742
--#: ../clients/common/nm-meta-setting-desc.c:2674
--#: ../clients/common/nm-meta-setting-desc.c:2732
-+#: ../clients/cli/common.c:1441
-+msgid "NetworkManager is not running"
-+msgstr "NetworkManager가 실행되고 있지 않습니다."
-+
-+#: ../clients/cli/common.c:1467
-+#, c-format
-+msgid "Error: error connecting to system bus: %s"
-+msgstr "오류 : 시스템 버스 연결 오류 : %s"
-+
-+#: ../clients/cli/common.c:1493 ../clients/cli/connections.c:67
-+#: ../clients/cli/connections.c:77 ../clients/cli/devices.c:434
-+#: ../clients/cli/devices.c:526 ../clients/cli/devices.c:533
-+#: ../clients/cli/general.c:31 ../clients/cli/general.c:86
-+#: ../clients/cli/general.c:91 ../clients/common/nm-client-utils.c:252
-+#: ../clients/common/nm-client-utils.c:265
-+#: ../clients/common/nm-client-utils.c:301
-+#: ../clients/common/nm-client-utils.c:306
-+#: ../clients/common/nm-meta-setting-desc.c:1747
-+#: ../clients/common/nm-meta-setting-desc.c:1778
-+#: ../clients/common/nm-meta-setting-desc.c:2680
-+#: ../clients/common/nm-meta-setting-desc.c:2738
- msgid "unknown"
- msgstr "알 수 없음"
-
--#: ../clients/cli/common.c:1445
-+#: ../clients/cli/common.c:1494
- msgid "none"
- msgstr "없음"
-
--#: ../clients/cli/common.c:1446
-+#: ../clients/cli/common.c:1495
- msgid "portal"
- msgstr "포털 "
-
--#: ../clients/cli/common.c:1447
-+#: ../clients/cli/common.c:1496
- msgid "limited"
- msgstr "제한됨 "
-
--#: ../clients/cli/common.c:1448
-+#: ../clients/cli/common.c:1497
- msgid "full"
- msgstr "전체"
-
- #. define some prompts for connection editor
--#: ../clients/cli/connections.c:64
-+#: ../clients/cli/connections.c:50
- msgid "Setting name? "
- msgstr "설정 이름은?"
-
--#: ../clients/cli/connections.c:65
-+#: ../clients/cli/connections.c:51
- msgid "Property name? "
- msgstr "속성 이름은?"
-
--#: ../clients/cli/connections.c:66
-+#: ../clients/cli/connections.c:52
- msgid "Enter connection type: "
- msgstr "연결 유형 입력: "
-
- #. define some other prompts
--#: ../clients/cli/connections.c:70
--#, fuzzy
-+#: ../clients/cli/connections.c:56
- msgid "Connection (name, UUID, or path): "
--msgstr "연결 (이름, UUID, 또는 경로): "
-+msgstr "연결 (이름, UUID 또는 경로) : "
-
--#: ../clients/cli/connections.c:71
--#, fuzzy
-+#: ../clients/cli/connections.c:57
- msgid "VPN connection (name, UUID, or path): "
--msgstr "연결 (이름, UUID, 또는 경로): "
-+msgstr "VPN 연결 (이름, UUID 또는 경로) : "
-
--#: ../clients/cli/connections.c:72
--#, fuzzy
-+#: ../clients/cli/connections.c:58
- msgid "Connection(s) (name, UUID, or path): "
--msgstr "연결 (이름, UUID, 또는 경로): "
-+msgstr "연결 (이름, UUID 또는 경로) : "
-
--#: ../clients/cli/connections.c:73
--#, fuzzy
-+#: ../clients/cli/connections.c:59
- msgid "Connection(s) (name, UUID, path or apath): "
--msgstr "연결 (이름, UUID, 또는 경로): "
-+msgstr "연결 (이름, UUID, 경로 또는 경로) : "
-
--#: ../clients/cli/connections.c:81
-+#: ../clients/cli/connections.c:68
- msgid "activating"
- msgstr "활성화중"
-
--#: ../clients/cli/connections.c:82
-+#: ../clients/cli/connections.c:69
- msgid "activated"
- msgstr "활성화됨"
-
--#: ../clients/cli/connections.c:83 ../clients/common/nm-client-utils.c:275
-+#: ../clients/cli/connections.c:70 ../clients/common/nm-client-utils.c:263
- msgid "deactivating"
- msgstr "활성화 해제하는 중"
-
--#: ../clients/cli/connections.c:84
-+#: ../clients/cli/connections.c:71
- msgid "deactivated"
- msgstr "비활성화됨"
-
--#: ../clients/cli/connections.c:90
-+#: ../clients/cli/connections.c:78
- msgid "VPN connecting (prepare)"
- msgstr "VPN 연결 중 (준비)"
-
--#: ../clients/cli/connections.c:91
-+#: ../clients/cli/connections.c:79
- msgid "VPN connecting (need authentication)"
- msgstr "VPN 연결 중 (인증 필요)"
-
--#: ../clients/cli/connections.c:92
-+#: ../clients/cli/connections.c:80
- msgid "VPN connecting"
- msgstr "VPN 연결 중"
-
--#: ../clients/cli/connections.c:93
-+#: ../clients/cli/connections.c:81
- msgid "VPN connecting (getting IP configuration)"
- msgstr "VPN 연결 중 (IP 설정 얻는 중)"
-
--#: ../clients/cli/connections.c:94
-+#: ../clients/cli/connections.c:82
- msgid "VPN connected"
- msgstr "VPN 연결 됨"
-
--#: ../clients/cli/connections.c:95
-+#: ../clients/cli/connections.c:83
- msgid "VPN connection failed"
- msgstr "VPN 연결 실패"
-
--#: ../clients/cli/connections.c:96
-+#: ../clients/cli/connections.c:84
- msgid "VPN disconnected"
- msgstr "VPN 연결 끊겼음"
-
--#: ../clients/cli/connections.c:558
-+#: ../clients/cli/connections.c:546
- msgid "never"
- msgstr "하지않음"
-
--#: ../clients/cli/connections.c:911
-+#: ../clients/cli/connections.c:907
- #, c-format
- msgid ""
- "Usage: nmcli connection { COMMAND | help }\n"
-@@ -291,8 +292,8 @@ msgid ""
- "\n"
- " down [id | uuid | path | apath] <ID> ...\n"
- "\n"
--" add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- ([+|-"
--"]<setting>.<property> <value>)+]\n"
-+" add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- "
-+"([+|-]<setting>.<property> <value>)+]\n"
- "\n"
- " modify [--temporary] [id | uuid | path] <ID> ([+|-]<setting>.<property> "
- "<value>)+\n"
-@@ -314,21 +315,10 @@ msgid ""
- "\n"
- " export [id | uuid | path] <ID> [<output file>]\n"
- "\n"
--msgstr ""
--"사용법 : nmcli 연결 {명령 | help} 명령 : = {show | 위로 | 다운 | 추가 | 수정 | 클론 | 편집 | 삭제 | "
--"모니터 | 다시로드 | 로드 | 수입품 | 내보내기} show [--active] [--order <order spec>] show [- "
--"액티브] [id | uuid | 경로 | apath] <ID> ... 위로 [[id | uuid | 통로] <ID>] [ifname "
--"<ifname>] [ap <BSSID>] [passwd-file <file with passwords>] down [id | uuid | "
--"경로 | apath] <ID> ... COMMON_OPTIONS 추가 TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS "
--"IP_OPTIONS [- ([+ | -]<setting>.<property> <value>) +] 수정 [--temporary] [id "
--"| uuid | 통로] <ID> ([+ | -]<setting>.<property> <value>) + 복제 [--temporary] "
--"[id | uuid | 경로] <ID> <new name>편집 [id | uuid | 통로] <ID>편집 [유형 "
--"<new_con_type>] [이름 <new_con_name>] delete [id | uuid | 통로] <ID>모니터 [id | "
--"uuid | 통로] <ID> ... 재 장전 <filename> [ <filename>...] import [--temporary] 유형 "
--"<type> 파일 <file to import>수출 [id | uuid | 통로] <ID> [<output file>]\n"
-+msgstr "사용법 : nmcli 연결 {명령 | help} 명령 : = {show | 위로 | 다운 | 추가 | 수정 | 클론 | 편집 | 삭제 | 모니터 | 다시로드 | 로드 | 수입품 | 내보내기} show [--active] [--order <order spec>] show [- 액티브] [id | uuid | 경로 | apath] <ID> ... 위로 [[id | uuid | 통로] <ID>] [ifname <ifname>] [ap <BSSID>] [passwd-file <file with passwords>] down [id | uuid | 경로 | apath] <ID> ... COMMON_OPTIONS 추가 TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [- ([+ | -]<setting>.<property> <value>) +] 수정 [--temporary] [id | uuid | 통로] <ID> ([+ | -]<setting>.<property> <value>) + 복제 [--temporary] [id | uuid | 경로] <ID> <new name>편집 [id | uuid | 통로] <ID>편집 [유형 <new_con_type>] [이름 <new_con_name>] delete [id | uuid | 통로] <ID>모니터 [id | uuid | 통로] <ID> ... 재 장전 <filename> [ <filename>...] import [--temporary] 유형 <type> 파일 <file to import>수출 [id | uuid | 통로] <ID> [<output file>]\n"
- "\n"
-
--#: ../clients/cli/connections.c:933
-+#: ../clients/cli/connections.c:929
- #, c-format
- msgid ""
- "Usage: nmcli connection show { ARGUMENTS | help }\n"
-@@ -353,8 +343,7 @@ msgid ""
- "When --active option is specified, only the active profiles are taken into\n"
- "account. Use global --show-secrets option to reveal associated secrets as "
- "well.\n"
--msgstr ""
--"사용법: nmcli connection show { 인수 | 도움말 }\n"
-+msgstr "사용법: nmcli connection show { 인수 | 도움말 }\n"
- "\n"
- "인수 := [--active] [--order <순서 지정>]\n"
- "\n"
-@@ -371,7 +360,7 @@ msgstr ""
- "--active 옵션이 지정된 경우 활성 프로필만 \n"
- "고려됩니다. 글로벌 --show-secrets 옵션을 사용하면 관련 Secret도 함께 표시할 수 있습니다.\n"
-
--#: ../clients/cli/connections.c:954
-+#: ../clients/cli/connections.c:950
- #, c-format
- msgid ""
- "Usage: nmcli connection up { ARGUMENTS | help }\n"
-@@ -394,11 +383,9 @@ msgid ""
- "nsp - specifies NSP to connect to (only valid for WiMAX)\n"
- "passwd-file - file with password(s) required to activate the connection\n"
- "\n"
--msgstr ""
--"사용법: nmcli connection up { 인수 | help }\n"
-+msgstr "사용법: nmcli connection up { 인수 | help }\n"
- "\n"
--"인수 := [id | uuid | path] <ID> [ifname <ifname>] [ap <BSSID>] [nsp <이름>] "
--"[passwd-file <암호가 있는 파일>]\n"
-+"인수 := [id | uuid | path] <ID> [ifname <ifname>] [ap <BSSID>] [nsp <이름>] [passwd-file <암호가 있는 파일>]\n"
- "\n"
- "장치에서 연결을 활성화합니다. 활성화할 프로파일은 장치의\n"
- "이름, UUID 또는 D-Bus 경로에 의해 식별됩니다.\n"
-@@ -414,7 +401,7 @@ msgstr ""
- "passwd-file - 연결을 활성화하는 데 필요한 암호가 있는 파일\n"
- "\n"
-
--#: ../clients/cli/connections.c:975
-+#: ../clients/cli/connections.c:971
- #, c-format
- msgid ""
- "Usage: nmcli connection down { ARGUMENTS | help }\n"
-@@ -426,8 +413,7 @@ msgid ""
- "name,\n"
- "UUID or D-Bus path.\n"
- "\n"
--msgstr ""
--"사용법: nmcli connection down { 인수 | help }\n"
-+msgstr "사용법: nmcli connection down { 인수 | help }\n"
- "\n"
- "인수 := [id | uuid | path | apath] <ID> ...\n"
- "\n"
-@@ -436,13 +422,13 @@ msgstr ""
- "식별됩니다.\n"
- "\n"
-
--#: ../clients/cli/connections.c:987
-+#: ../clients/cli/connections.c:983
- #, c-format
- msgid ""
- "Usage: nmcli connection add { ARGUMENTS | help }\n"
- "\n"
--"ARGUMENTS := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-"
--"- ([+|-]<setting>.<property> <value>)+]\n"
-+"ARGUMENTS := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS "
-+"[-- ([+|-]<setting>.<property> <value>)+]\n"
- "\n"
- " COMMON_OPTIONS:\n"
- " type <type>\n"
-@@ -529,8 +515,8 @@ msgid ""
- " [path-cost <1-65535>]\n"
- " [hairpin yes|no]\n"
- "\n"
--" vpn: vpn-type "
--"vpnc|openvpn|pptp|openconnect|openswan|libreswan|ssh|l2tp|iodine|...\n"
-+" vpn: vpn-type vpnc|openvpn|pptp|openconnect|openswan|libreswan|"
-+"ssh|l2tp|iodine|...\n"
- " [user <username>]\n"
- "\n"
- " olpc-mesh: ssid <SSID>\n"
-@@ -593,48 +579,10 @@ msgid ""
- " [ip4 <IPv4 address>] [gw4 <IPv4 gateway>]\n"
- " [ip6 <IPv6 address>] [gw6 <IPv6 gateway>]\n"
- "\n"
--msgstr ""
--"사용법 : nmcli connection add {ARGUMENTS | 도움말} 논증 : = COMMON_OPTIONS "
--"TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [- ([+ | -]<setting>."
--"<property> <value>) +] COMMON_OPTIONS : 유형 <type>ifname <interface name> | "
--"\"*\"[con-name <connection name>] [autoconnect yes | no] [save yes | no] "
--"[master <master (ifname, or connection UUID or name)>] [노예형 <master "
--"connection type>] TYPE_SPECIFIC_OPTIONS : 이더넷 : [맥 <MAC address>] [복제 된 맥 "
--"<cloned MAC address>] [mtu <MTU>] wifi : ssid <SSID>[맥 <MAC address>] [복제 된 "
--"맥 <cloned MAC address>] [mtu <MTU>] [모드 인프라 스트럭처 | ap | adhoc] wimax : [mac "
--"<MAC address>] [nsp] <NSP>] pppoe : 사용자 이름 <PPPoE username>[암호 <PPPoE "
--"password>] [서비스 <PPPoE service name>] [mtu <MTU>] [맥 <MAC address>] gsm : "
--"apn <APN>[사용자 <username>] [암호 <password>] cdma : [사용자 <username>] [암호 "
--"<password>] infiniband : [맥 <MAC address>] [mtu <MTU>] [전송 모드 데이터 그램 | 연결된] "
--"[부모 <ifname>] [p- 키 <IPoIB P_Key>] 블루투스 : [addr <bluetooth address>] [bt 유형 "
--"panu | nap | dun-gsm | dun-cdma] vlan : dev <parent device (connection UUID, "
--"ifname, or MAC)>신분증 <VLAN ID>[깃발 <VLAN flags>] [진입 <ingress priority "
--"mapping>] [출구 <egress priority mapping>] [mtu <MTU>] bond : [mode balance-rr "
--"(0) | 활성 백업 (1) | balance-xor (2) | 방송 (3) | 802.3ad (4) | balance-tlb (5) | "
--"밸런스 - alb (6)] [기본 <ifname>] [miimon <num>] [downdelay <num>] [updelay "
--"<num>] [arp-interval <num>] [arp-ip-target <num>] [lacp-rate slow (0) | 빠른 "
--"(1)] 본드 - 슬레이브 : 마스터 <master (ifname, or connection UUID or name)>팀 : "
--"[config <file>|<raw JSON data>] 팀 - 슬레이브 : 마스터 <master (ifname, or "
--"connection UUID or name)>[설정 <file>|<raw JSON data>] bridge : [stp yes | no] "
--"[priority <num>] [순방향 지연 <2-30>] [안녕하세요. <1-10>] [최대 연령 <6-40>] [숙성 시간 <0-"
--"1000000>] [멀티 캐스트 - 스누핑 예 | 아니오] [mac] <MAC address>] 브리지 - 슬레이브 : 마스터 "
--"<master (ifname, or connection UUID or name)>[우선 순위 <0-63>] [경로 비용 <1-"
--"65535>] [머리핀 예 | 아니오] vpn : VPN 유형 vpnc | openvpn | pptp | openconnect | "
--"openswan | libreswan | ssh | l2tp | iodine | ... [사용자 <username>] olpc-mesh :"
--" ssid <SSID>[채널 <1-13>] [dhcp-anycast] <MAC address>] adsl : 사용자 이름 "
--"<username>프로토콜 pppoa | pppoe | ipoatm [password <password>] [캡슐화 vcmux | "
--"llc] tun : 모드 tun | 탭 [owner <UID>] [그룹 <GID>] [파이 yes | no] [vnet-hdr yes | "
--"no] [멀티 큐 yes | no] ip-tunnel : mode ipip | gre | sit | isatap | vti | "
--"ip6ip6 | ipip6 | ip6gre | vti6 remote <remote endpoint IP>[노동 조합 지부 <local "
--"endpoint IP>] [dev <parent device (ifname or connection UUID)>] macsec : dev "
--"<parent device (connection UUID, ifname, or MAC)>방법 <psk|eap>[cak <key> ckn "
--"<key>] [암호화 예 | 아니오] [포트 1-65534] macvlan : dev <parent device (connection "
--"UUID, ifname, or MAC)>모드 vepa | 브리지 | 개인 | 패스 스루 | 소스 [tap yes | no] vxlan : "
--"id <VXLAN ID>먼 <IP of multicast group or remote address>[노동 조합 지부 <source "
--"IP>] [dev <parent device (ifname or connection UUID)>]\n"
--"\n"
--
--#: ../clients/cli/connections.c:1111
-+msgstr "사용법 : nmcli connection add {ARGUMENTS | 도움말} 논증 : = COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [- ([+ | -]<setting>.<property> <value>) +] COMMON_OPTIONS : 유형 <type>ifname <interface name> | \"*\"[con-name <connection name>] [autoconnect yes | no] [save yes | no] [master <master (ifname, or connection UUID or name)>] [노예형 <master connection type>] TYPE_SPECIFIC_OPTIONS : 이더넷 : [맥 <MAC address>] [복제 된 맥 <cloned MAC address>] [mtu <MTU>] wifi : ssid <SSID>[맥 <MAC address>] [복제 된 맥 <cloned MAC address>] [mtu <MTU>] [모드 인프라 스트럭처 | ap | adhoc] wimax : [mac <MAC address>] [nsp] <NSP>] pppoe : 사용자 이름 <PPPoE username>[암호 <PPPoE password>] [서비스 <PPPoE service name>] [mtu <MTU>] [맥 <MAC address>] gsm : apn <APN>[사용자 <username>] [암호 <password>] cdma : [사용자 <username>] [암호 <password>] infiniband : [맥 <MAC address>] [mtu <MTU>] [전송 모드 데이터 그램 | 연결된] [부모 <ifname>] [p- 키 <IPoIB P_Key>] 블루투스 : [addr <bluetooth address>] [bt 유형 panu | nap | dun-gsm | dun-cdma] vlan : dev <parent device (connection UUID, ifname, or MAC)>신분증 <VLAN ID>[깃발 <VLAN flags>] [진입 <ingress priority mapping>] [출구 <egress priority mapping>] [mtu <MTU>] bond : [mode balance-rr (0) | 활성 백업 (1) | balance-xor (2) | 방송 (3) | 802.3ad (4) | balance-tlb (5) | 밸런스 - alb (6)] [기본 <ifname>] [miimon <num>] [downdelay <num>] [updelay <num>] [arp-interval <num>] [arp-ip-target <num>] [lacp-rate slow (0) | 빠른 (1)] 본드 - 슬레이브 : 마스터 <master (ifname, or connection UUID or name)>팀 : [config <file>|<raw JSON data>] 팀 - 슬레이브 : 마스터 <master (ifname, or connection UUID or name)>[설정 <file>|<raw JSON data>] bridge : [stp yes | no] [priority <num>] [순방향 지연 <2-30>] [안녕하세요. <1-10>] [최대 연령 <6-40>] [숙성 시간 <0-1000000>] [멀티 캐스트 - 스누핑 예 | 아니오] [mac] <MAC address>] 브리지 - 슬레이브 : 마스터 <master (ifname, or connection UUID or name)>[우선 순위 <0-63>] [경로 비용 <1-65535>] [머리핀 예 | 아니오] vpn : VPN 유형 vpnc | openvpn | pptp | openconnect | openswan | libreswan | ssh | l2tp | iodine | ... [사용자 <username>] olpc-mesh : ssid <SSID>[채널 <1-13>] [dhcp-anycast] <MAC address>] adsl : 사용자 이름 <username>프로토콜 pppoa | pppoe | ipoatm [password <password>] [캡슐화 vcmux | llc] tun : 모드 tun | 탭 [owner <UID>] [그룹 <GID>] [파이 yes | no] [vnet-hdr yes | no] [멀티 큐 yes | no] ip-tunnel : mode ipip | gre | sit | isatap | vti | ip6ip6 | ipip6 | ip6gre | vti6 remote <remote endpoint IP>[노동 조합 지부 <local endpoint IP>] [dev <parent device (ifname or connection UUID)>] macsec : dev <parent device (connection UUID, ifname, or MAC)>방법 <psk|eap>[cak <key> ckn <key>] [암호화 예 | 아니오] [포트 1-65534] macvlan : dev <parent device (connection UUID, ifname, or MAC)>모드 vepa | 브리지 | 개인 | 패스 스루 | 소스 [tap yes | no] vxlan : id <VXLAN ID>먼 <IP of multicast group or remote address>[노동 조합 지부 <source IP>] [dev <parent device (ifname or connection UUID)>]\n"
-+"\n"
-+
-+#: ../clients/cli/connections.c:1107
- #, c-format
- msgid ""
- "Usage: nmcli connection modify { ARGUMENTS | help }\n"
-@@ -647,39 +595,25 @@ msgid ""
- "The '+' sign allows appending items instead of overwriting the whole value.\n"
- "The '-' sign allows removing selected items instead of the whole value.\n"
- "\n"
--"Examples:\n"
--"nmcli con mod home-wifi wifi.ssid rakosnicek\n"
--"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, 10.10.1.5/"
--"8\"\n"
--"nmcli con mod em1-1 +ipv4.dns 8.8.4.4\n"
--"nmcli con mod em1-1 -ipv4.dns 1\n"
--"nmcli con mod em1-1 -ipv6.addr \"abbe::cafe/56\"\n"
--"nmcli con mod bond0 +bond.options mii=500\n"
--"nmcli con mod bond0 -bond.options downdelay\n"
--"\n"
--msgstr ""
--"사용법: nmcli connection modify { 인수 | 도움말 }\n"
--"\n"
--"인수 := [id | uuid | path] <ID> ([+|-]<설정>.<속성> <값>)+\n"
-+"ARGUMENTS := remove <setting>\n"
- "\n"
--"연결 프로필 속성을 1개 이상 수정합니다.\n"
--"프로필은 이름, UUID 또는 D-Bus 경로를 기준으로 식별됩니다. 값이 여러 개인\n"
--"속성의 경우 선택 사항인 '+' 또는 '-' 접두사를 속성 이름에 사용할 수 있습니다.\n"
--"'+' 기호를 사용하면 전체 값을 덮어쓰는 대신 항목을 추가할 수 있습니다.\n"
--"'-' 기호를 사용하면 전체 값이 아닌 선택한 항목만 제거할 수 있습니다.\n"
-+"Remove a setting from the connection profile.\n"
- "\n"
--"예:\n"
-+"Examples:\n"
- "nmcli con mod home-wifi wifi.ssid rakosnicek\n"
--"nmcli con mod em1-1 ipv4.method manual ipv4.addr \\\"192.168.1.2/24, 10.10.1."
--"5/8\"\n"
-+"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, "
-+"10.10.1.5/8\"\n"
- "nmcli con mod em1-1 +ipv4.dns 8.8.4.4\n"
- "nmcli con mod em1-1 -ipv4.dns 1\n"
- "nmcli con mod em1-1 -ipv6.addr \"abbe::cafe/56\"\n"
- "nmcli con mod bond0 +bond.options mii=500\n"
- "nmcli con mod bond0 -bond.options downdelay\n"
-+"nmcli con mod em1-1 remove sriov\n"
-+"\n"
-+msgstr "사용법 : nmcli 연결 수정 { ARGUMENTS | help } 인수 : = [id | UUID | 통로] <ID> ([+ |-] <setting> . <property><value> ) + 연결 프로필의 하나 이상의 속성을 수정합니다. 프로파일은 이름, UUID 또는 D- 버스 경로로 식별됩니다. 다중 값 속성의 경우 속성 이름에 선택적 '+'또는 '-'접두사를 사용할 수 있습니다. '+'부호를 사용하면 전체 값을 덮어 쓰지 않고 항목을 추가 할 수 있습니다. '-'기호를 사용하면 전체 값 대신 선택된 항목을 제거 할 수 있습니다. 인수 : = 제거 <setting> 연결 프로파일에서 설정을 제거하십시오. 예 : nmcli con mod home-wifi wifi.ssid rakosnicek nmcli con mod em1-1 ipv4.method 설명서 ipv4.addr \"192.168.1.2/24, 10.10.1.5/8\"nmcli con mod em1-1 + ipv4.dns 8.8. 4.4 nmcli con mod em1-1 -ipv4.dns 1 nmcli con mod em1-1 -ipv6.addr \"abbe :: cafe / 56\"nmcli con mod bond0 + bond.options mii = 500 nmcli con mod bond0 -bond.options 다운 딜레이 nmcli con mod em1-1 제거 sriov\n"
- "\n"
-
--#: ../clients/cli/connections.c:1134
-+#: ../clients/cli/connections.c:1135
- #, c-format
- msgid ""
- "Usage: nmcli connection clone { ARGUMENTS | help }\n"
-@@ -687,11 +621,11 @@ msgid ""
- "ARGUMENTS := [--temporary] [id | uuid | path] <ID> <new name>\n"
- "\n"
- "Clone an existing connection profile. The newly created connection will be\n"
--"the exact copy of the <ID>, except the uuid property (will be generated) and\n"
-+"the exact copy of the <ID>, except the uuid property (will be generated) "
-+"and\n"
- "id (provided as <new name> argument).\n"
- "\n"
--msgstr ""
--"사용법: nmcli connection clone { 인수 | 도움말 }\n"
-+msgstr "사용법: nmcli connection clone { 인수 | 도움말 }\n"
- "\n"
- "인수 := [--temporary] [id | uuid | path] <ID> <새 이름>\n"
- "\n"
-@@ -700,7 +634,7 @@ msgstr ""
- "ID(<새 이름> 인수로 제공됨)는 예외입니다.\n"
- "\n"
-
--#: ../clients/cli/connections.c:1146
-+#: ../clients/cli/connections.c:1147
- #, c-format
- msgid ""
- "Usage: nmcli connection edit { ARGUMENTS | help }\n"
-@@ -714,8 +648,7 @@ msgid ""
- "\n"
- "Add a new connection profile in an interactive editor.\n"
- "\n"
--msgstr ""
--"사용법: nmcli connection edit { 인수 | help }\n"
-+msgstr "사용법: nmcli connection edit { 인수 | help }\n"
- "\n"
- "인수 := [id | uuid | path] <ID>\n"
- "\n"
-@@ -727,7 +660,7 @@ msgstr ""
- "상호 대화식 편집기에서 새 연결 프로파일을 추가합니다.\n"
- "\n"
-
--#: ../clients/cli/connections.c:1161
-+#: ../clients/cli/connections.c:1162
- #, c-format
- msgid ""
- "Usage: nmcli connection delete { ARGUMENTS | help }\n"
-@@ -737,8 +670,7 @@ msgid ""
- "Delete a connection profile.\n"
- "The profile is identified by its name, UUID or D-Bus path.\n"
- "\n"
--msgstr ""
--"사용법: nmcli connection delete { 인수 | help }\n"
-+msgstr "사용법: nmcli connection delete { 인수 | help }\n"
- "\n"
- "인수 := [id | uuid | path] <ID>\n"
- "\n"
-@@ -746,7 +678,7 @@ msgstr ""
- "프로파일은 이름, UUID, D-Bus 경로로 식별합니다.\n"
- "\n"
-
--#: ../clients/cli/connections.c:1172
-+#: ../clients/cli/connections.c:1173
- #, c-format
- msgid ""
- "Usage: nmcli connection monitor { ARGUMENTS | help }\n"
-@@ -757,8 +689,7 @@ msgid ""
- "This command prints a line whenever the specified connection changes.\n"
- "Monitors all connection profiles in case none is specified.\n"
- "\n"
--msgstr ""
--"사용법: nmcli connection monitor { 인수 | help }\n"
-+msgstr "사용법: nmcli connection monitor { 인수 | help }\n"
- "\n"
- "인수 := [id | uuid | path] <ID> ...\n"
- "\n"
-@@ -767,7 +698,7 @@ msgstr ""
- "아무 것도 지정되지 않은 경우 모든 연결 프로파일을 모니터링합니다.\n"
- "\n"
-
--#: ../clients/cli/connections.c:1184
-+#: ../clients/cli/connections.c:1185
- #, c-format
- msgid ""
- "Usage: nmcli connection reload { help }\n"
-@@ -779,7 +710,7 @@ msgstr "사용법: nmcli connection reload { help }\n"
- "디스크에서 모든 연결 파일을 다시 불러옵니다.\n"
- "\n"
-
--#: ../clients/cli/connections.c:1192
-+#: ../clients/cli/connections.c:1193
- #, c-format
- msgid ""
- "Usage: nmcli connection load { ARGUMENTS | help }\n"
-@@ -791,8 +722,7 @@ msgid ""
- "latest\n"
- "state.\n"
- "\n"
--msgstr ""
--"사용법: nmcli connection load { 인수 | help }\n"
-+msgstr "사용법: nmcli connection load { 인수 | help }\n"
- "\n"
- "인수 := <filename> [<filename>...]\n"
- "\n"
-@@ -801,7 +731,7 @@ msgstr ""
- "이 명령을 사용합니다.\n"
- "\n"
-
--#: ../clients/cli/connections.c:1204
-+#: ../clients/cli/connections.c:1205
- #, c-format
- msgid ""
- "Usage: nmcli connection import { ARGUMENTS | help }\n"
-@@ -814,8 +744,7 @@ msgid ""
- "Only VPN configurations are supported at the moment. The configuration\n"
- "is imported by NetworkManager VPN plugins.\n"
- "\n"
--msgstr ""
--"사용법: nmcli connection import { 인수 | 도움말 }\n"
-+msgstr "사용법: nmcli connection import { 인수 | 도움말 }\n"
- "\n"
- "인수 := [--temporary] type <유형> file <가져올 파일>\n"
- "\n"
-@@ -825,7 +754,7 @@ msgstr ""
- "네트워크 관리자 VPN 플러그인을 통해 가져옵니다.\n"
- "\n"
-
--#: ../clients/cli/connections.c:1217
-+#: ../clients/cli/connections.c:1218
- #, c-format
- msgid ""
- "Usage: nmcli connection export { ARGUMENTS | help }\n"
-@@ -835,8 +764,7 @@ msgid ""
- "Export a connection. Only VPN connections are supported at the moment.\n"
- "The data are directed to standard output or to a file if a name is given.\n"
- "\n"
--msgstr ""
--"사용법: nmcli connection export { 인수 | help }\n"
-+msgstr "사용법: nmcli connection export { 인수 | help }\n"
- "\n"
- "인수 := [id | uuid | path] <ID> [<출력 파일>]\n"
- "\n"
-@@ -844,7 +772,7 @@ msgstr ""
- "데이터는 표준 출력으로 이동되거나 파일로 디렉션됩니다(이름이 주어진 경우).\n"
- "\n"
-
--#: ../clients/cli/connections.c:1307
-+#: ../clients/cli/connections.c:1309
- #, c-format
- msgid "Error updating secrets for %s: %s\n"
- msgstr "%s의 secret 업데이트 도중 오류 발생: %s\n"
-@@ -853,407 +781,413 @@ msgstr "%s의 secret 업데이트 도중 오류 발생: %s\n"
- msgid "Connection profile details"
- msgstr "연결 프로파일 세부 정보"
-
--#: ../clients/cli/connections.c:1369 ../clients/cli/connections.c:1454
-+#: ../clients/cli/connections.c:1369 ../clients/cli/connections.c:1470
- #, c-format
- msgid "Error: 'connection show': %s"
- msgstr "오류: 'connection show': %s"
-
--#: ../clients/cli/connections.c:1444
-+#: ../clients/cli/connections.c:1458
- msgid "Activate connection details"
- msgstr "연결 세부 정보 활성화"
-
--#: ../clients/cli/connections.c:1552 ../clients/cli/devices.c:1452
--#: ../clients/cli/devices.c:1466 ../clients/cli/devices.c:1481
--#: ../clients/cli/devices.c:1539 ../clients/cli/devices.c:1641
-+#: ../clients/cli/connections.c:1572 ../clients/cli/devices.c:1501
-+#: ../clients/cli/devices.c:1515 ../clients/cli/devices.c:1529
-+#: ../clients/cli/devices.c:1544 ../clients/cli/devices.c:1601
-+#: ../clients/cli/devices.c:1703
- msgid "NAME"
- msgstr "이름"
-
--#: ../clients/cli/connections.c:1645
-+#: ../clients/cli/connections.c:1665
- #, c-format
- msgid "invalid field '%s'; allowed fields: %s and %s, or %s,%s"
- msgstr "잘못된 필드 '%s', 허용된 필드: %s 및 %s 또는 %s,%s"
-
--#: ../clients/cli/connections.c:1655 ../clients/cli/connections.c:1663
-+#: ../clients/cli/connections.c:1675 ../clients/cli/connections.c:1683
- #, c-format
- msgid "'%s' has to be alone"
- msgstr "'%s'은(는) 독립형이어야 합니다."
-
--#: ../clients/cli/connections.c:1923
-+#: ../clients/cli/connections.c:1943
- #, c-format
- msgid "incorrect string '%s' of '--order' option"
- msgstr "'--order' 옵션의 문자열 '%s'이(가) 잘못되었습니다."
-
--#: ../clients/cli/connections.c:1948
-+#: ../clients/cli/connections.c:1968
- #, c-format
- msgid "incorrect item '%s' in '--order' option"
- msgstr "'--order' 옵션의 항목 '%s'이(가) 잘못되었습니다."
-
--#: ../clients/cli/connections.c:1986
-+#: ../clients/cli/connections.c:2006
- msgid "No connection specified"
- msgstr "연결이 지정되지 않았습니다."
-
--#: ../clients/cli/connections.c:1997
-+#: ../clients/cli/connections.c:2017
- #, c-format
- msgid "%s argument is missing"
- msgstr "%s 인수가 누락되었습니다."
-
--#: ../clients/cli/connections.c:2015
-+#: ../clients/cli/connections.c:2035
- #, c-format
- msgid "unknown connection '%s'"
- msgstr "알 수없는 연결 '%s'"
-
--#: ../clients/cli/connections.c:2044
-+#: ../clients/cli/connections.c:2064
- msgid "'--order' argument is missing"
- msgstr "'--order' 인수가 누락되었습니다."
-
--#: ../clients/cli/connections.c:2104
-+#: ../clients/cli/connections.c:2125
- msgid "NetworkManager active profiles"
- msgstr "NetworkManager 활성 프로파일"
-
--#: ../clients/cli/connections.c:2105
-+#: ../clients/cli/connections.c:2126
- msgid "NetworkManager connection profiles"
- msgstr "NetworkManager 연결 프로파일"
-
--#: ../clients/cli/connections.c:2157 ../clients/cli/connections.c:2902
--#: ../clients/cli/connections.c:2914 ../clients/cli/connections.c:2926
--#: ../clients/cli/connections.c:3155 ../clients/cli/connections.c:8873
--#: ../clients/cli/connections.c:8894 ../clients/cli/devices.c:2974
--#: ../clients/cli/devices.c:2986 ../clients/cli/devices.c:2999
--#: ../clients/cli/devices.c:3193 ../clients/cli/devices.c:3204
--#: ../clients/cli/devices.c:3222 ../clients/cli/devices.c:3231
--#: ../clients/cli/devices.c:3252 ../clients/cli/devices.c:3263
--#: ../clients/cli/devices.c:3281 ../clients/cli/devices.c:3725
--#: ../clients/cli/devices.c:3735 ../clients/cli/devices.c:3743
--#: ../clients/cli/devices.c:3755 ../clients/cli/devices.c:3770
--#: ../clients/cli/devices.c:3778 ../clients/cli/devices.c:3953
--#: ../clients/cli/devices.c:3964 ../clients/cli/devices.c:4135
-+#: ../clients/cli/connections.c:2178 ../clients/cli/connections.c:2857
-+#: ../clients/cli/connections.c:2870 ../clients/cli/connections.c:2883
-+#: ../clients/cli/connections.c:3115 ../clients/cli/connections.c:8986
-+#: ../clients/cli/connections.c:9008 ../clients/cli/devices.c:3121
-+#: ../clients/cli/devices.c:3134 ../clients/cli/devices.c:3146
-+#: ../clients/cli/devices.c:3439 ../clients/cli/devices.c:3450
-+#: ../clients/cli/devices.c:3468 ../clients/cli/devices.c:3477
-+#: ../clients/cli/devices.c:3498 ../clients/cli/devices.c:3509
-+#: ../clients/cli/devices.c:3527 ../clients/cli/devices.c:4047
-+#: ../clients/cli/devices.c:4058 ../clients/cli/devices.c:4067
-+#: ../clients/cli/devices.c:4081 ../clients/cli/devices.c:4098
-+#: ../clients/cli/devices.c:4107 ../clients/cli/devices.c:4253
-+#: ../clients/cli/devices.c:4264 ../clients/cli/devices.c:4480
-+#: ../clients/cli/devices.c:4652
- #, c-format
- msgid "Error: %s argument is missing."
- msgstr "오류: %s 인자가 없습니다."
-
--#: ../clients/cli/connections.c:2185
-+#: ../clients/cli/connections.c:2206
- #, c-format
- msgid "Error: %s - no such connection profile."
- msgstr "오류: %s - 해당 연결 프로파일이 없습니다."
-
--#: ../clients/cli/connections.c:2276 ../clients/cli/connections.c:2889
--#: ../clients/cli/connections.c:2953 ../clients/cli/connections.c:8417
--#: ../clients/cli/connections.c:8508 ../clients/cli/connections.c:8994
--#: ../clients/cli/devices.c:1726 ../clients/cli/devices.c:1993
--#: ../clients/cli/devices.c:2166 ../clients/cli/devices.c:2274
--#: ../clients/cli/devices.c:2466 ../clients/cli/devices.c:3916
--#: ../clients/cli/devices.c:4141 ../clients/cli/general.c:896
-+#: ../clients/cli/connections.c:2297 ../clients/cli/connections.c:2843
-+#: ../clients/cli/connections.c:2913 ../clients/cli/connections.c:8527
-+#: ../clients/cli/connections.c:8619 ../clients/cli/connections.c:9113
-+#: ../clients/cli/devices.c:1801 ../clients/cli/devices.c:2069
-+#: ../clients/cli/devices.c:2239 ../clients/cli/devices.c:2352
-+#: ../clients/cli/devices.c:2541 ../clients/cli/devices.c:3318
-+#: ../clients/cli/devices.c:4217 ../clients/cli/devices.c:4659
-+#: ../clients/cli/general.c:997
- #, c-format
- msgid "Error: %s."
- msgstr "오류: %s."
-
--#: ../clients/cli/connections.c:2369
-+#: ../clients/cli/connections.c:2389 ../clients/cli/devices.c:4431
- #, c-format
- msgid "no active connection on device '%s'"
- msgstr "장치 '%s'에 활성화된 연결이 없습니다"
-
--#: ../clients/cli/connections.c:2377
-+#: ../clients/cli/connections.c:2397
- msgid "no active connection or device"
- msgstr "활성화된 연결이나 장치가 없습니다"
-
--#: ../clients/cli/connections.c:2397
--#, fuzzy, c-format
-+#: ../clients/cli/connections.c:2417
-+#, c-format
- msgid "device '%s' not compatible with connection '%s': "
--msgstr "'%s' 장치는 '%s' 연결과 호환되지 않습니다"
-+msgstr "'%s' 장치는 '%s' 연결과 호환되지 않습니다 "
-
--#: ../clients/cli/connections.c:2430
-+#: ../clients/cli/connections.c:2450
- #, c-format
- msgid "device '%s' not compatible with connection '%s'"
- msgstr "'%s' 장치는 '%s' 연결과 호환되지 않습니다"
-
--#: ../clients/cli/connections.c:2433
-+#: ../clients/cli/connections.c:2453
- #, c-format
- msgid "no device found for connection '%s'"
- msgstr "연결 '%s'에 대한 장치를 찾을 수 없습니다"
-
--#: ../clients/cli/connections.c:2484
-+#: ../clients/cli/connections.c:2504
- #, c-format
- msgid "Hint: use '%s' to get more details."
--msgstr ""
-+msgstr "힌트 : ' %s 자세한 내용은 '를 참조하십시오."
-
--#: ../clients/cli/connections.c:2502
--#, fuzzy, c-format
-+#: ../clients/cli/connections.c:2522
-+#, c-format
- msgid "Connection successfully activated (%s) (D-Bus active path: %s)\n"
- msgstr "연결이 성공적으로 활성화되었습니다 (D-Bus 활성 경로: %s)\n"
-
--#: ../clients/cli/connections.c:2506 ../clients/cli/connections.c:2656
--#: ../clients/cli/connections.c:6738
-+#: ../clients/cli/connections.c:2526 ../clients/cli/connections.c:2676
-+#: ../clients/cli/connections.c:6828
- #, c-format
- msgid "Connection successfully activated (D-Bus active path: %s)\n"
- msgstr "연결이 성공적으로 활성화되었습니다 (D-Bus 활성 경로: %s)\n"
-
--#: ../clients/cli/connections.c:2513 ../clients/cli/connections.c:2635
-+#: ../clients/cli/connections.c:2533 ../clients/cli/connections.c:2655
- #, c-format
- msgid "Error: Connection activation failed: %s"
- msgstr "오류: 연결 활성화가 실패했습니다: %s"
-
--#: ../clients/cli/connections.c:2550
-+#: ../clients/cli/connections.c:2570
- #, c-format
- msgid "Error: Timeout expired (%d seconds)"
- msgstr "오류 : 시간 초과가 만료되었습니다 (%d 초)"
-
--#: ../clients/cli/connections.c:2718
--#, c-format
--msgid "failed to read passwd-file '%s': %s"
--msgstr "passwd-file '%s' 읽기 실패: %s"
--
--#: ../clients/cli/connections.c:2731
--#, c-format
--msgid "missing colon in 'password' entry '%s'"
--msgstr "'암호' 항목 '%s'에 콜론 누락"
--
--#: ../clients/cli/connections.c:2739
--#, c-format
--msgid "missing dot in 'password' entry '%s'"
--msgstr "'암호' 항목 '%s'에 점 누락"
--
--#: ../clients/cli/connections.c:2752
--#, c-format
--msgid "invalid setting name in 'password' entry '%s'"
--msgstr "'암호' 항목 '%s'의 설정 이름이 잘못됨"
--
--#: ../clients/cli/connections.c:2806
-+#: ../clients/cli/connections.c:2743
- #, c-format
- msgid "unknown device '%s'."
- msgstr "알 수 없는 장치 '%s'."
-
--#: ../clients/cli/connections.c:2811
-+#: ../clients/cli/connections.c:2748
- msgid "neither a valid connection nor device given"
- msgstr "유효한 연결 및 장치 모두 지정되어 있지 않습니다 "
-
--#: ../clients/cli/connections.c:2936 ../clients/cli/devices.c:1685
--#: ../clients/cli/devices.c:3031 ../clients/cli/devices.c:3294
--#: ../clients/cli/devices.c:3970
-+#: ../clients/cli/connections.c:2761
-+#, c-format
-+msgid "invalid passwd-file '%s' at line %zd: %s"
-+msgstr "유효하지 않은 passwd-file ' %s 라인에서 %zd : %s"
-+
-+#: ../clients/cli/connections.c:2767
-+#, c-format
-+msgid "invalid passwd-file '%s': %s"
-+msgstr "유효하지 않은 passwd-file ' %s ': %s"
-+
-+#: ../clients/cli/connections.c:2894 ../clients/cli/connections.c:9019
-+#: ../clients/cli/devices.c:1759 ../clients/cli/devices.c:1807
-+#: ../clients/cli/devices.c:2245 ../clients/cli/devices.c:3181
-+#: ../clients/cli/devices.c:3540 ../clients/cli/devices.c:4117
-+#: ../clients/cli/devices.c:4270 ../clients/cli/devices.c:4490
-+#: ../clients/cli/devices.c:4664
- #, c-format
--msgid "Unknown parameter: %s\n"
--msgstr "알려져있지 않은 매개변수입니다: %s\n"
-+msgid "Error: invalid extra argument '%s'."
-+msgstr "오류: 잘못된 추가 인수 '%s'입니다."
-
--#: ../clients/cli/connections.c:2961
-+#: ../clients/cli/connections.c:2922
- msgid "preparing"
- msgstr "준비하는 중"
-
--#: ../clients/cli/connections.c:3070
-+#: ../clients/cli/connections.c:3029
- #, c-format
- msgid "Connection '%s' (%s) successfully deleted.\n"
- msgstr "연결 '%s'(%s)이(가) 성공적으로 삭제되었습니다.\n"
-
--#: ../clients/cli/connections.c:3086
-+#: ../clients/cli/connections.c:3045
- #, c-format
- msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n"
- msgstr "연결 '%s'이(가) 성공적으로 비활성화되었습니다(D-Bus 활성 경로: %s).\n"
-
--#: ../clients/cli/connections.c:3137 ../clients/cli/connections.c:8604
--#: ../clients/cli/connections.c:8635 ../clients/cli/connections.c:8794
-+#: ../clients/cli/connections.c:3096 ../clients/cli/connections.c:8716
-+#: ../clients/cli/connections.c:8747 ../clients/cli/connections.c:8910
- #, c-format
- msgid "Error: No connection specified."
- msgstr "오류: 연결이 지정되어 있지 않습니다. "
-
--#: ../clients/cli/connections.c:3167
-+#: ../clients/cli/connections.c:3128
- #, c-format
- msgid "Error: '%s' is not an active connection.\n"
- msgstr "오류: '%s'는 활성 연결이 아닙니다.\n"
-
--#: ../clients/cli/connections.c:3168
-+#: ../clients/cli/connections.c:3129
- #, c-format
- msgid "Error: not all active connections found."
- msgstr "오류: 일부 활성 연결을 찾을 수 없습니다. "
-
--#: ../clients/cli/connections.c:3176
-+#: ../clients/cli/connections.c:3137
- #, c-format
- msgid "Error: no active connection provided."
- msgstr "오류: 활성 연결이 제공되지 않았습니다."
-
--#: ../clients/cli/connections.c:3207
--#, fuzzy, c-format
-+#: ../clients/cli/connections.c:3169
-+#, c-format
- msgid "Connection '%s' deactivation failed: %s\n"
--msgstr "오류: 연결 활성화가 실패했습니다: %s"
-+msgstr "연결 ' %s '비활성화에 실패했습니다 : %s\n"
-
--#: ../clients/cli/connections.c:3458 ../clients/cli/connections.c:3515
--#: ../clients/common/nm-client-utils.c:225
-+#: ../clients/cli/connections.c:3427 ../clients/cli/connections.c:3485
-+#: ../clients/common/nm-client-utils.c:213
- #, c-format
- msgid "'%s' not among [%s]"
- msgstr "'%s'는 [%s]에 없습니다 "
-
- #. We should not really come here
--#: ../clients/cli/connections.c:3478 ../clients/cli/connections.c:3538
--#: ../clients/common/nm-client-utils.c:293
-+#: ../clients/cli/connections.c:3447 ../clients/cli/connections.c:3506
-+#: ../clients/common/nm-client-utils.c:313
- #, c-format
- msgid "Unknown error"
- msgstr "알 수 없는 오류 "
-
--#: ../clients/cli/connections.c:3672
-+#: ../clients/cli/connections.c:3640
- #, c-format
- msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
- msgstr "경고: master='%s'이(가) 기존 프로필을 참조하지 않습니다.\n"
-
--#: ../clients/cli/connections.c:4027
-+#: ../clients/cli/connections.c:4000
- #, c-format
- msgid "Error: invalid property '%s': %s."
- msgstr "오류: 잘못된 속성 '%s': %s."
-
--#: ../clients/cli/connections.c:4041
--#, fuzzy, c-format
-+#: ../clients/cli/connections.c:4015
-+#, c-format
- msgid "Error: failed to %s %s.%s: %s."
--msgstr "오류: %s.%s 수정에 실패했습니다: %s."
-+msgstr "오류 : 실패 %s%s . %s : %s ."
-
--#: ../clients/cli/connections.c:4076
--#, fuzzy, c-format
-+#: ../clients/cli/connections.c:4057
-+#, c-format
- msgid "Error: '%s' is mandatory."
--msgstr "오류: '%s' 설정이 없습니다\n"
-+msgstr "오류 : ' %s '는 필수입니다."
-
--#: ../clients/cli/connections.c:4103
--#, fuzzy, c-format
-+#: ../clients/cli/connections.c:4084
-+#, c-format
- msgid "Error: invalid slave type; %s."
--msgstr "오류: 잘못된 연결 유형; %s."
-+msgstr "오류 : 잘못된 슬레이브 유형입니다. %s ."
-
--#: ../clients/cli/connections.c:4111
-+#: ../clients/cli/connections.c:4092
- #, c-format
- msgid "Error: invalid connection type; %s."
- msgstr "오류: 잘못된 연결 유형; %s."
-
--#: ../clients/cli/connections.c:4188
--#, fuzzy, c-format
--msgid "Error: bad connection type: %s"
--msgstr "오류: 잘못된 연결 유형; %s."
--
--#: ../clients/cli/connections.c:4234
-+#: ../clients/cli/connections.c:4169
- #, c-format
--msgid "Error: '%s': %s"
--msgstr "오류: %s: %s."
-+msgid "Error: bad connection type: %s"
-+msgstr "오류 : 잘못된 연결 유형 : %s"
-
--#: ../clients/cli/connections.c:4255
--#, fuzzy
-+#: ../clients/cli/connections.c:4244
- msgid "Error: master is required"
--msgstr "오류: 'master'가 필요합니다. "
-+msgstr "오류 : 마스터가 필요합니다"
-
--#: ../clients/cli/connections.c:4314
--#, fuzzy, c-format
-+#: ../clients/cli/connections.c:4313
-+#, c-format
- msgid "Error: error adding bond option '%s=%s'."
--msgstr "오류: 알 수 없는 연결 '%s'."
-+msgstr "오류 : 채권 옵션 추가 오류 %s = %s '."
-
--#: ../clients/cli/connections.c:4345
-+#: ../clients/cli/connections.c:4344
- #, c-format
- msgid "Error: '%s' is not a valid monitoring mode; use '%s' or '%s'.\n"
- msgstr "오류: '%s'는 올바른 모니터링 모드가 아닙니다; '%s' 또는 '%s'를 사용합니다.\n"
-
--#: ../clients/cli/connections.c:4376
-+#: ../clients/cli/connections.c:4375
- #, c-format
- msgid "Error: 'bt-type': '%s' not valid; use [%s, %s, %s (%s), %s]."
- msgstr "오류 : 'bt-type': '%s' 유효하지; 사용 [%s, %s, %s (%s), %s]."
-
--#: ../clients/cli/connections.c:4625
-+#: ../clients/cli/connections.c:4669
-+#, c-format
-+msgid "Error: setting '%s' is mandatory and cannot be removed."
-+msgstr "오류 : '설정 %s '는 필수이며 제거 할 수 없습니다."
-+
-+#: ../clients/cli/connections.c:4679
- #, c-format
- msgid "Error: value for '%s' is missing."
- msgstr "오류: '%s'의 값이 누락되었습니다."
-
--#: ../clients/cli/connections.c:4671
-+#: ../clients/cli/connections.c:4724
- msgid "Error: <setting>.<property> argument is missing."
- msgstr "오류: <setting>.<property> 인수가 누락되어 있습니다."
-
--#: ../clients/cli/connections.c:4694
-+#: ../clients/cli/connections.c:4750
-+msgid "Error: missing setting."
-+msgstr "오류 : 설정이 없습니다."
-+
-+#: ../clients/cli/connections.c:4768
-+#, c-format
-+msgid "Setting '%s' is not present in the connection."
-+msgstr "연결에 설정 '%s'이 없습니다."
-+
-+#: ../clients/cli/connections.c:4772
-+#, c-format
-+msgid "Error: invalid setting argument '%s'."
-+msgstr "오류: 잘못된 설정 인수 '%s'; 올바른 인수는 []입니다"
-+
-+#: ../clients/cli/connections.c:4796
- #, c-format
- msgid "Error: invalid or not allowed setting '%s': %s."
- msgstr "오류: 잘못된 또는 허용되지 않는 설정 '%s': %s."
-
--#: ../clients/cli/connections.c:4742 ../clients/cli/connections.c:4758
--#, fuzzy, c-format
-+#: ../clients/cli/connections.c:4845 ../clients/cli/connections.c:4861
-+#, c-format
- msgid "Error: '%s' is ambiguous (%s.%s or %s.%s)."
--msgstr "'%s'는 애매모호합니다 (%s x %s)"
-+msgstr "오류 : ' %s '는 모호합니다 ( %s . %s 또는 %s . %s )."
-
--#: ../clients/cli/connections.c:4776
-+#: ../clients/cli/connections.c:4881
- #, c-format
- msgid "Error: invalid <setting>.<property> '%s'."
- msgstr "오류: 잘못된 <setting>.<property> '%s'입니다."
-
--#: ../clients/cli/connections.c:4815 ../clients/cli/connections.c:8456
-+#: ../clients/cli/connections.c:4919 ../clients/cli/connections.c:8567
- #, c-format
- msgid "Error: Failed to add '%s' connection: %s"
- msgstr "오류: '%s' 연결 추가 실패: %s"
-
--#: ../clients/cli/connections.c:4833
--#, fuzzy, c-format
-+#: ../clients/cli/connections.c:4937
-+#, 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"
-+msgid_plural "Warning: There are %3$u other connections with the name '%1$s'. Reference the connection by its uuid '%2$s'\n"
-+msgstr[0] "경고 : 이름이 ' %1$s '. uuid '로 연결 참조 %2$s '\n"
-
--#: ../clients/cli/connections.c:4842
-+#: ../clients/cli/connections.c:4946
- #, c-format
- msgid "Connection '%s' (%s) successfully added.\n"
- msgstr "연결 '%s' (%s)이 성공적으로 추가되었습니다.\n"
-
--#: ../clients/cli/connections.c:4904 ../clients/cli/connections.c:6861
--#: ../clients/cli/connections.c:6862 ../clients/cli/devices.c:529
--#: ../clients/cli/devices.c:536 ../clients/cli/devices.c:1206
--#: ../clients/cli/general.c:137 ../clients/cli/utils.h:297
--#: ../clients/common/nm-client-utils.c:283
-+#: ../clients/cli/connections.c:5008 ../clients/cli/connections.c:6934
-+#: ../clients/cli/connections.c:6935 ../clients/cli/devices.c:525
-+#: ../clients/cli/devices.c:532 ../clients/cli/devices.c:1250
-+#: ../clients/cli/general.c:93 ../clients/cli/utils.h:294
-+#: ../clients/common/nm-client-utils.c:303
- #: ../clients/common/nm-meta-setting-desc.c:871
--#: ../clients/common/nm-meta-setting-desc.c:2669
-+#: ../clients/common/nm-meta-setting-desc.c:2675
- msgid "no"
- msgstr "아니요"
-
--#: ../clients/cli/connections.c:4905 ../clients/cli/connections.c:6861
--#: ../clients/cli/connections.c:6862 ../clients/cli/devices.c:528
--#: ../clients/cli/devices.c:535 ../clients/cli/devices.c:1206
--#: ../clients/cli/general.c:136 ../clients/cli/utils.h:297
--#: ../clients/common/nm-client-utils.c:282
-+#: ../clients/cli/connections.c:5009 ../clients/cli/connections.c:6934
-+#: ../clients/cli/connections.c:6935 ../clients/cli/devices.c:524
-+#: ../clients/cli/devices.c:531 ../clients/cli/devices.c:1250
-+#: ../clients/cli/general.c:92 ../clients/cli/utils.h:294
-+#: ../clients/common/nm-client-utils.c:302
- #: ../clients/common/nm-meta-setting-desc.c:871
--#: ../clients/common/nm-meta-setting-desc.c:2666
-+#: ../clients/common/nm-meta-setting-desc.c:2672
- msgid "yes"
- msgstr "예"
-
--#: ../clients/cli/connections.c:4991
-+#: ../clients/cli/connections.c:5095
- #, c-format
- msgid ""
--"You can specify this option more than once. Press <Enter> when you're done."
--"\n"
-+"You can specify this option more than once. Press <Enter> when you're done.\n"
- msgstr "이 옵션을 두 번 이상 지정할 수 있습니다. 프레스 <Enter> 너 끝났을 때.\n"
-
- #. Ask for optional arguments.
--#: ../clients/cli/connections.c:5093
--#, fuzzy, c-format
-+#: ../clients/cli/connections.c:5197
-+#, c-format
- msgid "There is %d optional setting for %s.\n"
- msgid_plural "There are %d optional settings for %s.\n"
--msgstr[0] "'%d' 연결 유형에는 1 개의 옵션 인수가 있습니다.\n"
-+msgstr[0] "있다 %d 에 대한 선택적 설정 %s .\n"
-
--#: ../clients/cli/connections.c:5099
-+#: ../clients/cli/connections.c:5203
- #, c-format
- msgid "Do you want to provide it? %s"
- msgid_plural "Do you want to provide them? %s"
- msgstr[0] "지정하시겠습니까? %s"
-
--#: ../clients/cli/connections.c:5231 ../clients/cli/utils.c:293
-+#: ../clients/cli/connections.c:5335 ../clients/cli/utils.c:279
- #, c-format
- msgid "Error: value for '%s' argument is required."
- msgstr "오류: '%s' 인수 값이 필요합니다. "
-
--#: ../clients/cli/connections.c:5238
-+#: ../clients/cli/connections.c:5342
- #, c-format
- msgid "Error: 'save': %s."
- msgstr "오류: 'save': %s."
-
--#: ../clients/cli/connections.c:5324 ../clients/cli/connections.c:5335
--#, fuzzy, c-format
-+#: ../clients/cli/connections.c:5427 ../clients/cli/connections.c:5438
-+#, c-format
- msgid "Error: '%s' argument is required."
--msgstr "오류: 'type' 인수가 필요합니다. "
-+msgstr "오류 : ' %s '인수가 필요합니다."
-
--#: ../clients/cli/connections.c:6294
-+#: ../clients/cli/connections.c:6384
- #, c-format
- msgid "['%s' setting values]\n"
- msgstr "['%s' 설정 값]\n"
-
- #. TRANSLATORS: do not translate command names and keywords before ::
- #. * However, you should translate terms enclosed in <>.
--#.
--#: ../clients/cli/connections.c:6403
-+#.
-+#: ../clients/cli/connections.c:6493
- #, c-format
- msgid ""
- "---[ Main menu ]---\n"
-@@ -1270,8 +1204,7 @@ msgid ""
- "help/? [<command>] :: print this help\n"
- "nmcli <conf-option> <value> :: nmcli configuration\n"
- "quit :: exit nmcli\n"
--msgstr ""
--"---[ Main menu ]---\n"
-+msgstr "---[ Main menu ]---\n"
- "goto [<setting> | <prop>] :: 설정 또는 속성으로 이동\n"
- "remove <setting>[.<prop>] | <prop> :: 설정 제거 또는 속성 값 재설정\n"
- "set [<setting>.<prop> <value>] :: 속성 값 설정\n"
-@@ -1285,7 +1218,7 @@ msgstr ""
- "nmcli <conf-option> <value> :: nmcli 구성\n"
- "quit :: nmcli 종료\n"
-
--#: ../clients/cli/connections.c:6430
-+#: ../clients/cli/connections.c:6520
- #, c-format
- msgid ""
- "goto <setting>[.<prop>] | <prop> :: enter setting/property for editing\n"
-@@ -1295,8 +1228,7 @@ msgid ""
- "Examples: nmcli> goto connection\n"
- " nmcli connection> goto secondaries\n"
- " nmcli> goto ipv4.addresses\n"
--msgstr ""
--"goto <setting>[.<prop>] | <prop> :: 설정/속성으로 가서 편집\n"
-+msgstr "goto <setting>[.<prop>] | <prop> :: 설정/속성으로 가서 편집\n"
- "\n"
- "이 명령을 사용하여 설정 또는 속성으로 들어가서 편집합니다.\n"
- "\n"
-@@ -1304,18 +1236,18 @@ msgstr ""
- " nmcli connection> goto secondaries\n"
- " nmcli> goto ipv4.addresses\n"
-
--#: ../clients/cli/connections.c:6437
-+#: ../clients/cli/connections.c:6527
- #, c-format
- msgid ""
- "remove <setting>[.<prop>] :: remove setting or reset property value\n"
- "\n"
--"This command removes an entire setting from the connection, or if a property\n"
-+"This command removes an entire setting from the connection, or if a "
-+"property\n"
- "is given, resets that property to the default value.\n"
- "\n"
- "Examples: nmcli> remove wifi-sec\n"
- " nmcli> remove eth.mtu\n"
--msgstr ""
--"remove <setting>[.<prop>] :: 설정을 제거하거나 속성 값을 재설정\n"
-+msgstr "remove <setting>[.<prop>] :: 설정을 제거하거나 속성 값을 재설정\n"
- "\n"
- "이 명령을 사용하여 연결에서 모든 설정을 제거하거나 속성이 지정되어 있는 경우 \n"
- "속성을 기본값으로 다시 설정합니다.\n"
-@@ -1323,7 +1255,7 @@ msgstr ""
- "예: nmcli> remove wifi-sec\n"
- " nmcli> remove eth.mtu\n"
-
--#: ../clients/cli/connections.c:6444
-+#: ../clients/cli/connections.c:6534
- #, c-format
- msgid ""
- "set [<setting>.<prop> <value>] :: set property value\n"
-@@ -1331,26 +1263,24 @@ msgid ""
- "This command sets property value.\n"
- "\n"
- "Example: nmcli> set con.id My connection\n"
--msgstr ""
--"set [<setting>.<prop> <value>] :: 속성 값 설정\n"
-+msgstr "set [<setting>.<prop> <value>] :: 속성 값 설정\n"
- "\n"
- "이 명령을 사용하여 속성 값을 설정합니다.\n"
- "\n"
- "예: nmcli> set con.id My connection\n"
-
--#: ../clients/cli/connections.c:6449
-+#: ../clients/cli/connections.c:6539
- #, c-format
- msgid ""
- "describe [<setting>.<prop>] :: describe property\n"
- "\n"
- "Shows property description. You can consult nm-settings(5) manual page to "
- "see all NM settings and properties.\n"
--msgstr ""
--"describe [<setting>.<prop>] :: 속성 설명\n"
-+msgstr "describe [<setting>.<prop>] :: 속성 설명\n"
- "\n"
- "속성 설명을 표시합니다. NM 설정 및 속성에 대한 자세한 설명은 nm-settings(5) man 페이지에서 참조하십시오.\n"
-
--#: ../clients/cli/connections.c:6454
-+#: ../clients/cli/connections.c:6544
- #, c-format
- msgid ""
- "print [all] :: print setting or connection values\n"
-@@ -1358,27 +1288,26 @@ msgid ""
- "Shows current property or the whole connection.\n"
- "\n"
- "Example: nmcli ipv4> print all\n"
--msgstr ""
--"print [all] :: 설정 또는 연결 값을 출력\n"
-+msgstr "print [all] :: 설정 또는 연결 값을 출력\n"
- "\n"
- "현재 속성 또는 전체 연결을 표시합니다.\n"
- "\n"
- "예: nmcli ipv4> print all\n"
-
--#: ../clients/cli/connections.c:6459
-+#: ../clients/cli/connections.c:6549
- #, c-format
- msgid ""
- "verify [all | fix] :: verify setting or connection validity\n"
- "\n"
- "Verifies whether the setting or connection is valid and can be saved later.\n"
--"It indicates invalid values on error. Some errors may be fixed automatically\n"
-+"It indicates invalid values on error. Some errors may be fixed "
-+"automatically\n"
- "by 'fix' option.\n"
- "\n"
- "Examples: nmcli> verify\n"
- " nmcli> verify fix\n"
- " nmcli bond> verify\n"
--msgstr ""
--"verify [all | fix] :: 설정 또는 연결 유효성 확인\n"
-+msgstr "verify [all | fix] :: 설정 또는 연결 유효성 확인\n"
- "\n"
- "설정 또는 연결이 유효하며 나중에 저장할 수 있는지 확인합니다.\n"
- "이는 잘못된 값을 오류로 표시합니다. 일부 오류는\n"
-@@ -1388,7 +1317,7 @@ msgstr ""
- " nmcli> verify fix\n"
- " nmcli bond> verify\n"
-
--#: ../clients/cli/connections.c:6468
-+#: ../clients/cli/connections.c:6558
- #, c-format
- msgid ""
- "save [persistent|temporary] :: save the connection\n"
-@@ -1402,8 +1331,7 @@ msgid ""
- "restart. If you want to fully remove the persistent connection, the "
- "connection\n"
- "profile must be deleted.\n"
--msgstr ""
--"verify [all | fix] :: 설정 또는 연결 유효성 확인\n"
-+msgstr "verify [all | fix] :: 설정 또는 연결 유효성 확인\n"
- "\n"
- "설정 또는 연결이 유효하며 나중에 저장할 수 있는지 확인합니다.\n"
- "이는 잘못된 값을 오류로 표시합니다. 일부 오류는\n"
-@@ -1413,7 +1341,7 @@ msgstr ""
- " nmcli> verify fix\n"
- " nmcli bond> verify\n"
-
--#: ../clients/cli/connections.c:6479
-+#: ../clients/cli/connections.c:6569
- #, c-format
- msgid ""
- "activate [<ifname>] [/<ap>|<nsp>] :: activate the connection\n"
-@@ -1424,8 +1352,7 @@ msgid ""
- "<ifname> - device the connection will be activated on\n"
- "/<ap>|<nsp> - AP (Wi-Fi) or NSP (WiMAX) (prepend with / when <ifname> is not "
- "specified)\n"
--msgstr ""
--"activate [<ifname>] [/<ap>|<nsp>] :: 연결을 활성화\n"
-+msgstr "activate [<ifname>] [/<ap>|<nsp>] :: 연결을 활성화\n"
- "\n"
- "연결을 활성화합니다.\n"
- "\n"
-@@ -1433,21 +1360,23 @@ msgstr ""
- "<ifname> - /<ap>|<nsp> - AP (Wi-Fi) 또는 NSP (WiMAX)에서 \n"
- "연결이 활성화될 장치 (prepend with / when <ifname>이 지정되어 있지 않을 경우 /를 선두에 붙임)\n"
-
--#: ../clients/cli/connections.c:6486 ../clients/cli/connections.c:6644
-+#: ../clients/cli/connections.c:6576 ../clients/cli/connections.c:6734
- #, c-format
--msgid "back :: go to upper menu level\n"
-+msgid ""
-+"back :: go to upper menu level\n"
- "\n"
- msgstr "back :: 위의 메뉴 레벨로 이동\n"
- "\n"
-
--#: ../clients/cli/connections.c:6489
-+#: ../clients/cli/connections.c:6579
- #, c-format
--msgid "help/? [<command>] :: help for the nmcli commands\n"
-+msgid ""
-+"help/? [<command>] :: help for the nmcli commands\n"
- "\n"
- msgstr "help/? [<command>] :: nmcli 명령 도움말\n"
- "\n"
-
--#: ../clients/cli/connections.c:6492
-+#: ../clients/cli/connections.c:6582
- #, c-format
- msgid ""
- "nmcli [<conf-option> <value>] :: nmcli configuration\n"
-@@ -1461,8 +1390,7 @@ msgid ""
- "Examples: nmcli> nmcli status-line yes\n"
- " nmcli> nmcli save-confirmation no\n"
- " nmcli> nmcli prompt-color 3\n"
--msgstr ""
--"nmcli [<conf-option> <value>] :: nmcli 구성\n"
-+msgstr "nmcli [<conf-option> <value>] :: nmcli 구성\n"
- "\n"
- "nmcli를 구성합니다. 다음과 같은 옵션을 사용할 수 있습니다.\n"
- "status-line yes | no [default: no]\n"
-@@ -1474,28 +1402,27 @@ msgstr ""
- " nmcli> nmcli save-confirmation no\n"
- " nmcli> nmcli prompt-color 3\n"
-
--#: ../clients/cli/connections.c:6514 ../clients/cli/connections.c:6650
-+#: ../clients/cli/connections.c:6604 ../clients/cli/connections.c:6740
- #, c-format
- msgid ""
- "quit :: exit nmcli\n"
- "\n"
- "This command exits nmcli. When the connection being edited is not saved, the "
- "user is asked to confirm the action.\n"
--msgstr ""
--"quit :: nmcli 종료\n"
-+msgstr "quit :: nmcli 종료\n"
- "\n"
- "이 명령은 nmcli를 종료합니다. 편집된 연결을 저장하지 않으면 사용자에게 확인이 요구됩니다.\n"
-
--#: ../clients/cli/connections.c:6519 ../clients/cli/connections.c:6655
--#: ../clients/cli/connections.c:7061 ../clients/cli/connections.c:8043
-+#: ../clients/cli/connections.c:6609 ../clients/cli/connections.c:6745
-+#: ../clients/cli/connections.c:7140 ../clients/cli/connections.c:8149
- #, c-format
- msgid "Unknown command: '%s'\n"
- msgstr "알 수 없는 명령: '%s'\n"
-
- #. TRANSLATORS: do not translate command names and keywords before ::
- #. * However, you should translate terms enclosed in <>.
--#.
--#: ../clients/cli/connections.c:6584
-+#.
-+#: ../clients/cli/connections.c:6674
- #, c-format
- msgid ""
- "---[ Property menu ]---\n"
-@@ -1509,8 +1436,7 @@ msgid ""
- "back :: go to upper level\n"
- "help/? [<command>] :: print this help or command description\n"
- "quit :: exit nmcli\n"
--msgstr ""
--"---[ 속성 메뉴 ]---\n"
-+msgstr "---[ 속성 메뉴 ]---\n"
- "set [<value>] :: 새로운 값을 설정\n"
- "add [<value>] :: 속성에 새 옵션 추가\n"
- "change :: 현재 값 변경\n"
-@@ -1521,7 +1447,7 @@ msgstr ""
- "help/?[<command>] :: 이 도움말 또는 명령의 상세 정보 출력\n"
- "quit :: nmcli 종료\n"
-
--#: ../clients/cli/connections.c:6609
-+#: ../clients/cli/connections.c:6699
- #, c-format
- msgid ""
- "set [<value>] :: set new value\n"
-@@ -1531,7 +1457,7 @@ msgstr "set [<value>] :: 새로운 값을 설정\n"
- "\n"
- "이 명령은 속성에 지정된 <value>를 설정합니다\n"
-
--#: ../clients/cli/connections.c:6613
-+#: ../clients/cli/connections.c:6703
- #, c-format
- msgid ""
- "add [<value>] :: append new value to the property\n"
-@@ -1539,13 +1465,11 @@ msgid ""
- "This command adds provided <value> to this property, if the property is of a "
- "container type. For single-valued properties the property value is replaced "
- "(same as 'set').\n"
--msgstr ""
--"[<값>] 추가 :: 속성에 새 값 추가\n"
-+msgstr "[<값>] 추가 :: 속성에 새 값 추가\n"
- "\n"
--"이 명령은 속성이 컨테이너 유형인 경우 제공된 <값>을 이 속성에 추가합니다.단일 값 속성에 대해 속성 값이 교체됩니다.('set'와 "
--"동일).\n"
-+"이 명령은 속성이 컨테이너 유형인 경우 제공된 <값>을 이 속성에 추가합니다.단일 값 속성에 대해 속성 값이 교체됩니다.('set'와 동일).\n"
-
--#: ../clients/cli/connections.c:6619
-+#: ../clients/cli/connections.c:6709
- #, c-format
- msgid ""
- "change :: change current value\n"
-@@ -1555,7 +1479,7 @@ msgstr "change :: 현재 값 변경\n"
- "\n"
- "현재 값을 표시하고 이를 편집할 수 있습니다.\n"
-
--#: ../clients/cli/connections.c:6623
-+#: ../clients/cli/connections.c:6713
- #, c-format
- msgid ""
- "remove [<value>|<index>|<option name>] :: delete the value\n"
-@@ -1573,8 +1497,7 @@ msgid ""
- " nmcli ipv4.dns> remove 2\n"
- " nmcli bond.options> remove downdelay\n"
- "\n"
--msgstr ""
--"remove [<값>|<인덱스>|<옵션 이름>] :: 값 삭제\n"
-+msgstr "remove [<값>|<인덱스>|<옵션 이름>] :: 값 삭제\n"
- "\n"
- "속성 값을 제거합니다. 단일 값 속성의 경우 속성을\n"
- "기본값으로 다시 설정합니다. 컨테이너 유형 속성의 경우 해당 속성의\n"
-@@ -1587,19 +1510,18 @@ msgstr ""
- " nmcli bond.options> remove downdelay\n"
- "\n"
-
--#: ../clients/cli/connections.c:6634
-+#: ../clients/cli/connections.c:6724
- #, c-format
- msgid ""
- "describe :: describe property\n"
- "\n"
- "Shows property description. You can consult nm-settings(5) manual page to "
- "see all NM settings and properties.\n"
--msgstr ""
--"describe :: 속성 설명\n"
-+msgstr "describe :: 속성 설명\n"
- "\n"
- "속성 설명을 표시합니다. NM 설정 및 속성에 대한 자세한 설명은 nm-settings(5) man 페이지에서 참조하십시오.\n"
-
--#: ../clients/cli/connections.c:6639
-+#: ../clients/cli/connections.c:6729
- #, c-format
- msgid ""
- "print [property|setting|connection] :: print property (setting, connection) "
-@@ -1607,567 +1529,559 @@ msgid ""
- "\n"
- "Shows property value. Providing an argument you can also display values for "
- "the whole setting or connection.\n"
--msgstr ""
--"print [property|setting|connection] :: 속성 (설정, 연결) 값 출력\n"
-+msgstr "print [property|setting|connection] :: 속성 (설정, 연결) 값 출력\n"
- "\n"
- "속성 값을 표시합니다. 인수를 지정하여 전체 설정 또는 연결에 대한 값을 표시할 수 있습니다.\n"
-
--#: ../clients/cli/connections.c:6647
-+#: ../clients/cli/connections.c:6737
- #, c-format
--msgid "help/? [<command>] :: help for nmcli commands\n"
-+msgid ""
-+"help/? [<command>] :: help for nmcli commands\n"
- "\n"
- msgstr "help/? [<command>] :: nmcli 명령 도움말\n"
- "\n"
-
--#: ../clients/cli/connections.c:6744
-+#: ../clients/cli/connections.c:6834
- #, c-format
- msgid "Error: Connection activation failed.\n"
- msgstr "오류: 연결 활성화에 실패했습니다.\n"
-
--#: ../clients/cli/connections.c:6841
--#, c-format
--msgid "Error: setting '%s' is mandatory and cannot be removed.\n"
--msgstr "오류: 설정 '%s'은 필수 항목이므로 삭제할 수 없습니다.\n"
--
- #. TRANSLATORS: status line in nmcli connection editor
--#: ../clients/cli/connections.c:6859
-+#: ../clients/cli/connections.c:6932
- #, c-format
- msgid "[ Type: %s | Name: %s | UUID: %s | Dirty: %s | Temp: %s ]\n"
- msgstr "[ Type: %s | Name: %s | UUID: %s | Dirty: %s | Temp: %s ]\n"
-
--#: ../clients/cli/connections.c:6895
-+#: ../clients/cli/connections.c:6968
- #, c-format
- msgid "The connection is not saved. Do you really want to quit? %s"
- msgstr "연결이 저장되지 않았습니다. 정말로 종료하시겠습니까? %s"
-
--#: ../clients/cli/connections.c:6936
-+#: ../clients/cli/connections.c:7009
- #, c-format
- msgid ""
- "The connection profile has been removed from another client. You may type "
- "'save' in the main menu to restore it.\n"
- msgstr "연결 프로파일이 다른 클라이언트에서 삭제되었습니다. 메인 메뉴에서 'save'를 입력하면 이를 복구할 수 있습니다.\n"
-
--#: ../clients/cli/connections.c:6970 ../clients/cli/connections.c:7359
--#: ../clients/cli/connections.c:7418
-+#: ../clients/cli/connections.c:7043 ../clients/cli/connections.c:7437
-+#: ../clients/cli/connections.c:7501
- #, c-format
- msgid "Allowed values for '%s' property: %s\n"
- msgstr "'%s' 속성에 대해 허용되는 값: %s\n"
-
--#: ../clients/cli/connections.c:6974 ../clients/cli/connections.c:7363
--#: ../clients/cli/connections.c:7422
-+#: ../clients/cli/connections.c:7047 ../clients/cli/connections.c:7441
-+#: ../clients/cli/connections.c:7505
- #, c-format
- msgid "Enter '%s' value: "
- msgstr "'%s' 값 입력: "
-
--#: ../clients/cli/connections.c:6988 ../clients/cli/connections.c:7001
--#: ../clients/cli/connections.c:7367 ../clients/cli/connections.c:7433
-+#: ../clients/cli/connections.c:7061 ../clients/cli/connections.c:7079
-+#: ../clients/cli/connections.c:7450 ../clients/cli/connections.c:7518
- #, c-format
- msgid "Error: failed to set '%s' property: %s\n"
- msgstr "오류: '%s' 속성을 설정하는데 실패했습니다: %s\n"
-
--#: ../clients/cli/connections.c:6997
-+#: ../clients/cli/connections.c:7070
- #, c-format
- msgid "Edit '%s' value: "
- msgstr "'%s' 값 편집: "
-
--#: ../clients/cli/connections.c:7015 ../clients/cli/settings.c:414
-+#: ../clients/cli/connections.c:7093 ../clients/cli/settings.c:400
- #, c-format
- msgid "Error: %s\n"
- msgstr "오류: %s\n"
-
--#: ../clients/cli/connections.c:7034
-+#: ../clients/cli/connections.c:7112
- #, c-format
- msgid "Unknown command argument: '%s'\n"
- msgstr "알 수 없는 명령 인수: '%s'\n"
-
--#: ../clients/cli/connections.c:7125
-+#: ../clients/cli/connections.c:7204
- #, c-format
- msgid "Available settings: %s\n"
- msgstr "사용 가능한 설정: %s\n"
-
--#: ../clients/cli/connections.c:7137
-+#: ../clients/cli/connections.c:7216
- #, c-format
- msgid "Error: invalid setting name; %s\n"
- msgstr "오류: 잘못된 설정 이름; %s\n"
-
--#: ../clients/cli/connections.c:7155
-+#: ../clients/cli/connections.c:7233
- #, c-format
- msgid "Available properties: %s\n"
- msgstr "사용 가능한 속성: %s\n"
-
--#: ../clients/cli/connections.c:7163
-+#: ../clients/cli/connections.c:7242
- #, c-format
- msgid "Error: property %s\n"
- msgstr "오류: 속성 %s\n"
-
--#: ../clients/cli/connections.c:7208
-+#: ../clients/cli/connections.c:7286
- #, c-format
- msgid ""
- "Saving the connection with 'autoconnect=yes'. That might result in an "
- "immediate activation of the connection.\n"
- "Do you still want to save? %s"
--msgstr ""
--"연결을 'autoconnect=yes'로 저장합니다.이로 인해 연결이 즉시 활성화될 수 있습니다.\n"
-+msgstr "연결을 'autoconnect=yes'로 저장합니다.이로 인해 연결이 즉시 활성화될 수 있습니다.\n"
- "그래도 저장하시겠습니까? %s"
-
--#: ../clients/cli/connections.c:7293
-+#: ../clients/cli/connections.c:7371
- #, c-format
- msgid "You may edit the following settings: %s\n"
- msgstr "다음 설정을 편집할 수 있습니다: %s\n"
-
--#: ../clients/cli/connections.c:7324
-+#: ../clients/cli/connections.c:7402
- #, c-format
- msgid ""
- "The connection profile has been removed from another client. You may type "
- "'save' to restore it.\n"
- msgstr "연결 프로파일이 다른 클라이언트에서 삭제되었습니다. 'save'를 입력하여 이를 복구할 수 있습니다.\n"
-
--#: ../clients/cli/connections.c:7371 ../clients/cli/connections.c:7625
--#: ../clients/cli/connections.c:7657
-+#: ../clients/cli/connections.c:7454 ../clients/cli/connections.c:7729
-+#: ../clients/cli/connections.c:7761
- #, c-format
- msgid "Error: no setting selected; valid are [%s]\n"
- msgstr "오류: 설정이 선택되어 있지 않습니다; 유효한 설정은 [%s]입니다\n"
-
--#: ../clients/cli/connections.c:7372
-+#: ../clients/cli/connections.c:7455
- #, c-format
- msgid "use 'goto <setting>' first, or 'set <setting>.<property>'\n"
- msgstr "'goto <setting>'를 먼저 사용하거나 'set <setting>.<property>'를 사용합니다.\n"
-
--#: ../clients/cli/connections.c:7387 ../clients/cli/connections.c:7557
--#: ../clients/cli/connections.c:7647
-+#: ../clients/cli/connections.c:7470 ../clients/cli/connections.c:7647
-+#: ../clients/cli/connections.c:7751
- #, c-format
- msgid "Error: invalid setting argument '%s'; valid are [%s]\n"
- msgstr "오류: 잘못된 설정 인수 '%s'; 올바른 인수는 [%s]입니다\n"
-
--#: ../clients/cli/connections.c:7396
-+#: ../clients/cli/connections.c:7479
- #, c-format
- msgid "Error: missing setting for '%s' property\n"
- msgstr "오류: '%s' 속성 설정이 누락되어 있음\n"
-
--#: ../clients/cli/connections.c:7403
-+#: ../clients/cli/connections.c:7486
- #, c-format
- msgid "Error: invalid property: %s\n"
- msgstr "오류: 잘못된 속성: %s\n"
-
--#: ../clients/cli/connections.c:7465
-+#: ../clients/cli/connections.c:7550
- #, c-format
- msgid "Error: unknown setting '%s'\n"
- msgstr "오류: 알 수 없는 설정 '%s'\n"
-
--#: ../clients/cli/connections.c:7490
-+#: ../clients/cli/connections.c:7575
- #, c-format
- msgid "You may edit the following properties: %s\n"
- msgstr "다음 속성을 편집할 수 있습니다: %s\n"
-
--#: ../clients/cli/connections.c:7530 ../clients/cli/connections.c:7580
-+#: ../clients/cli/connections.c:7620 ../clients/cli/connections.c:7679
- #, c-format
- msgid "Error: failed to remove value of '%s': %s\n"
- msgstr "오류: '%s' 값을 삭제하는데 실패했습니다: %s\n"
-
--#: ../clients/cli/connections.c:7535
-+#: ../clients/cli/connections.c:7625
- #, c-format
- msgid "Error: no argument given; valid are [%s]\n"
- msgstr "오류: 인수가 지정되어 있지 않습니다; 올바른 인수는 [%s]입니다\n"
-
--#: ../clients/cli/connections.c:7554
-+#: ../clients/cli/connections.c:7644
- #, c-format
- msgid "Setting '%s' is not present in the connection.\n"
- msgstr "연결에 설정 '%s'이 없습니다.\n"
-
--#: ../clients/cli/connections.c:7601
-+#: ../clients/cli/connections.c:7705
- #, c-format
- msgid "Error: %s properties, nor it is a setting name.\n"
- msgstr "오류: %s 속성, 설정 이름이 아닙니다.\n"
-
--#: ../clients/cli/connections.c:7626 ../clients/cli/connections.c:7658
-+#: ../clients/cli/connections.c:7730 ../clients/cli/connections.c:7762
- #, c-format
- msgid "use 'goto <setting>' first, or 'describe <setting>.<property>'\n"
- msgstr "'goto <setting>'를 먼저 사용하거나 'describe <setting>.<property>'를 사용합니다.\n"
-
--#: ../clients/cli/connections.c:7681
-+#: ../clients/cli/connections.c:7785
- #, c-format
- msgid "Error: invalid property: %s, neither a valid setting name.\n"
- msgstr "오류: 잘못된 속성: %s, 올바른 설정 이름이 아닙니다.\n"
-
--#: ../clients/cli/connections.c:7711
-+#: ../clients/cli/connections.c:7815
- #, c-format
- msgid "Error: unknown setting: '%s'\n"
- msgstr "오류: 알 수 없는 설정: '%s'\n"
-
--#: ../clients/cli/connections.c:7716
-+#: ../clients/cli/connections.c:7820
- #, c-format
- msgid "Error: '%s' setting not present in the connection\n"
- msgstr "오류: '%s' 설정이 연결에 없습니다.\n"
-
--#: ../clients/cli/connections.c:7747
-+#: ../clients/cli/connections.c:7851
- #, c-format
- msgid "Error: invalid property: %s%s\n"
- msgstr "오류: 잘못된 속성: %s%s\n"
-
--#: ../clients/cli/connections.c:7749
-+#: ../clients/cli/connections.c:7853
- msgid ", neither a valid setting name"
- msgstr ", 유효한 설정 이름이 아닙니다."
-
--#: ../clients/cli/connections.c:7765
-+#: ../clients/cli/connections.c:7869
- #, c-format
- msgid "Invalid verify option: %s\n"
- msgstr "잘못된 확인 옵션: %s\n"
-
--#: ../clients/cli/connections.c:7773
-+#: ../clients/cli/connections.c:7878
- #, c-format
- msgid "Verify setting '%s': %s\n"
- msgstr "'%s' 설정 확인: %s\n"
-
--#: ../clients/cli/connections.c:7788
-+#: ../clients/cli/connections.c:7894
- #, c-format
- msgid "Verify connection: %s\n"
- msgstr "연결 확인: %s\n"
-
--#: ../clients/cli/connections.c:7791
-+#: ../clients/cli/connections.c:7897
- #, c-format
- msgid "The error cannot be fixed automatically.\n"
- msgstr "오류를 자동으로 수정할 수 없습니다.\n"
-
--#: ../clients/cli/connections.c:7812
-+#: ../clients/cli/connections.c:7917
- #, c-format
- msgid "Error: invalid argument '%s'\n"
- msgstr "오류: 잘못된 인수 '%s'\n"
-
--#: ../clients/cli/connections.c:7862
-+#: ../clients/cli/connections.c:7967
- #, c-format
- msgid "Error: Failed to save '%s' (%s) connection: %s\n"
- msgstr "오류: '%s'(%s) 연결 저장 실패: %s\n"
-
--#: ../clients/cli/connections.c:7868
--#, fuzzy, c-format
-+#: ../clients/cli/connections.c:7973
-+#, c-format
- msgid "Error: Timeout saving '%s' (%s) connection\n"
--msgstr "오류: '%s'(%s) 연결 저장 실패: %s\n"
-+msgstr "오류 : 시간 초과 저장 중 %s '( %s ) 연결\n"
-
--#: ../clients/cli/connections.c:7873
-+#: ../clients/cli/connections.c:7978
- #, c-format
- msgid "Connection '%s' (%s) successfully saved.\n"
- msgstr "연결 '%s' (%s)이 성공적으로 저장되었습니다.\n"
-
--#: ../clients/cli/connections.c:7874
-+#: ../clients/cli/connections.c:7979
- #, c-format
- msgid "Connection '%s' (%s) successfully updated.\n"
- msgstr "연결 '%s'(%s)이(가) 성공적으로 업데이트되었습니다.\n"
-
--#: ../clients/cli/connections.c:7907
-+#: ../clients/cli/connections.c:8012
- #, c-format
- msgid "Error: connection verification failed: %s\n"
- msgstr "오류: 연결 확인에 실패했습니다: %s\n"
-
--#: ../clients/cli/connections.c:7908
-+#: ../clients/cli/connections.c:8013
- msgid "(unknown error)"
- msgstr "(알 수 없는 오류)"
-
--#: ../clients/cli/connections.c:7909
-+#: ../clients/cli/connections.c:8014
- #, c-format
- msgid "You may try running 'verify fix' to fix errors.\n"
- msgstr "오류를 수정하려면 'verify fix'를 실행해 볼 수 있습니다.\n"
-
--#: ../clients/cli/connections.c:7931
-+#. TRANSLATORS: do not translate 'save', leave it as it is
-+#: ../clients/cli/connections.c:8037
- #, c-format
- msgid "Error: connection is not saved. Type 'save' first.\n"
- msgstr "오류: 연결이 저장되어 있지 않습니다. 먼저 'save'를 입력합니다.\n"
-
--#: ../clients/cli/connections.c:7935
-+#: ../clients/cli/connections.c:8041
- #, c-format
- msgid "Error: connection is not valid: %s\n"
- msgstr "오류: 연결이 올바르지 않습니다: %s\n"
-
--#: ../clients/cli/connections.c:7945
-+#: ../clients/cli/connections.c:8051
- #, c-format
- msgid "Error: Cannot activate connection: %s.\n"
- msgstr "오류: 연결을 활성화할 수 없음: %s.\n"
-
--#: ../clients/cli/connections.c:7954
-+#: ../clients/cli/connections.c:8060
- #, c-format
- msgid "Error: Failed to activate '%s' (%s) connection: %s\n"
- msgstr "오류: '%s'(%s) 연결 활성화 실패: %s\n"
-
--#: ../clients/cli/connections.c:7961
-+#: ../clients/cli/connections.c:8067
- msgid "Monitoring connection activation (press any key to continue)\n"
- msgstr "모니터링 연결 활성화 (아무키나 눌러 계속 진행합니다)\n"
-
--#: ../clients/cli/connections.c:7997
-+#: ../clients/cli/connections.c:8103
- #, c-format
- msgid "Error: status-line: %s\n"
- msgstr "오류: status-line: %s\n"
-
--#: ../clients/cli/connections.c:8005
-+#: ../clients/cli/connections.c:8111
- #, c-format
- msgid "Error: save-confirmation: %s\n"
- msgstr "오류: save-confirmation: %s\n"
-
--#: ../clients/cli/connections.c:8013
-+#: ../clients/cli/connections.c:8119
- #, c-format
- msgid "Error: show-secrets: %s\n"
- msgstr "오류: show-secrets: %s\n"
-
--#: ../clients/cli/connections.c:8020
-+#: ../clients/cli/connections.c:8126
- #, c-format
- msgid "Current nmcli configuration:\n"
- msgstr "현재 nmcli 설정:\n"
-
--#: ../clients/cli/connections.c:8028
-+#: ../clients/cli/connections.c:8134
- #, c-format
- msgid "Invalid configuration option '%s'; allowed [%s]\n"
- msgstr "잘못된 설정 옵션 '%s'; [%s] 허용됨\n"
-
--#: ../clients/cli/connections.c:8249
-+#: ../clients/cli/connections.c:8356
- #, c-format
- msgid "Error: only one of 'id', 'filename', uuid, or 'path' can be provided."
- msgstr "오류 : 'id', 'filename', uuid 또는 'path'중 하나만 제공 할 수 있습니다."
-
--#: ../clients/cli/connections.c:8263 ../clients/cli/connections.c:8424
-+#: ../clients/cli/connections.c:8371 ../clients/cli/connections.c:8535
- #, c-format
- msgid "Error: Unknown connection '%s'."
- msgstr "오류: 알 수 없는 연결 '%s'."
-
--#: ../clients/cli/connections.c:8279
-+#: ../clients/cli/connections.c:8388
- #, c-format
- msgid "Warning: editing existing connection '%s'; 'type' argument is ignored\n"
- msgstr "경고: 기존 연결 '%s'을 편집하는 중입니다; 'type' 인수를 무시합니다\n"
-
--#: ../clients/cli/connections.c:8282
-+#: ../clients/cli/connections.c:8391
- #, c-format
- msgid ""
- "Warning: editing existing connection '%s'; 'con-name' argument is ignored\n"
- msgstr "경고: 기존 연결 '%s'을 편집하는 중입니다; 'con-name' 인수를 무시합니다 \n"
-
--#: ../clients/cli/connections.c:8309
-+#: ../clients/cli/connections.c:8418
- #, c-format
- msgid "Valid connection types: %s\n"
- msgstr "올바른 연결 유형: %s\n"
-
--#: ../clients/cli/connections.c:8311
-+#: ../clients/cli/connections.c:8420
- #, c-format
- msgid "Error: invalid connection type; %s\n"
- msgstr "오류: 잘못된 연결 유형; %s\n"
-
--#: ../clients/cli/connections.c:8347
-+#: ../clients/cli/connections.c:8456
- #, c-format
- msgid "===| nmcli interactive connection editor |==="
- msgstr "===| nmcli 상호 대화식 연결 편집기 |==="
-
--#: ../clients/cli/connections.c:8350
-+#: ../clients/cli/connections.c:8459
- #, c-format
- msgid "Editing existing '%s' connection: '%s'"
- msgstr "기존 '%s' 연결을 편집하는 중입니다: '%s'"
-
--#: ../clients/cli/connections.c:8352
-+#: ../clients/cli/connections.c:8461
- #, c-format
- msgid "Adding a new '%s' connection"
- msgstr "새로운 '%s' 연결을 추가하고 있습니다 "
-
--#: ../clients/cli/connections.c:8354
-+#. TRANSLATORS: do not translate 'help', leave it as it is
-+#: ../clients/cli/connections.c:8464
- #, c-format
- msgid "Type 'help' or '?' for available commands."
- msgstr "사용 가능한 명령을 보려면 'help' 또는 '?'를 입력합니다."
-
--#: ../clients/cli/connections.c:8356
-+#. TRANSLATORS: do not translate 'print', leave it as it is
-+#: ../clients/cli/connections.c:8467
- #, c-format
- msgid "Type 'print' to show all the connection properties."
- msgstr "'print'를 입력하여 모든 연결 속성을 표시하십시오."
-
--#: ../clients/cli/connections.c:8358
-+#. TRANSLATORS: do not translate 'describe', leave it as it is
-+#: ../clients/cli/connections.c:8470
- #, c-format
- msgid "Type 'describe [<setting>.<prop>]' for detailed property description."
- msgstr "상세 속성 정보를 표시하려면 'describe [<setting>.<prop>]'를 입력합니다."
-
--#: ../clients/cli/connections.c:8386
-+#: ../clients/cli/connections.c:8498
- #, c-format
- msgid "Error: Failed to modify connection '%s': %s"
- msgstr "오류: 연결 '%s' 수정 실패: %s"
-
--#: ../clients/cli/connections.c:8392
-+#: ../clients/cli/connections.c:8504
- #, c-format
- msgid "Connection '%s' (%s) successfully modified.\n"
- msgstr "연결 '%s' (%s)이 성공적으로 추가되었습니다.\n"
-
--#: ../clients/cli/connections.c:8460
-+#: ../clients/cli/connections.c:8571
- #, c-format
- msgid "%s (%s) cloned as %s (%s).\n"
- msgstr "%s(%s)(이)가 %s(%s)(으)로 복제되었습니다.\n"
-
--#: ../clients/cli/connections.c:8519
-+#: ../clients/cli/connections.c:8631
- msgid "New connection name: "
- msgstr "새 연결 이름: "
-
--#: ../clients/cli/connections.c:8521
-+#: ../clients/cli/connections.c:8633
- #, c-format
- msgid "Error: <new name> argument is missing."
- msgstr "오류: <new name> 인수가 누락되었습니다."
-
--#: ../clients/cli/connections.c:8526 ../clients/cli/connections.c:9005
-+#: ../clients/cli/connections.c:8639 ../clients/cli/connections.c:9124
- #, c-format
- msgid "Error: unknown extra argument: '%s'."
- msgstr "오류: 알 수 없는 추가 인수: '%s'."
-
--#: ../clients/cli/connections.c:8559
-+#: ../clients/cli/connections.c:8671
- #, c-format
- msgid "Error: not all connections deleted."
- msgstr "오류: 일부 연결이 삭제되지 않았습니다."
-
--#: ../clients/cli/connections.c:8560
--#, fuzzy, c-format
-+#: ../clients/cli/connections.c:8672
-+#, c-format
- msgid "Error: Connection deletion failed: %s\n"
--msgstr "오류: 연결 삭제에 실패했습니다: %s"
-+msgstr "오류 : 연결 삭제에 실패했습니다 : %s\n"
-
--#: ../clients/cli/connections.c:8616 ../clients/cli/connections.c:8737
-+#: ../clients/cli/connections.c:8728 ../clients/cli/connections.c:8848
- #, c-format
- msgid "Error: %s.\n"
- msgstr "오류: %s.\n"
-
--#: ../clients/cli/connections.c:8617 ../clients/cli/connections.c:8738
-+#: ../clients/cli/connections.c:8729 ../clients/cli/connections.c:8849
- #, c-format
- msgid "Error: not all connections found."
- msgstr "오류: 일부 연결을 찾을 수 없습니다."
-
- #. truncate trailing ", "
--#: ../clients/cli/connections.c:8668
-+#: ../clients/cli/connections.c:8780
- #, c-format
- msgid "Error: cannot delete unknown connection(s): %s."
- msgstr "오류: 알 수 없는 연결을 삭제할 수 없습니다: %s."
-
--#: ../clients/cli/connections.c:8678
-+#: ../clients/cli/connections.c:8789
- #, c-format
- msgid "%s: connection profile changed\n"
- msgstr "%s: 연결 프로파일이 변경되었습니다.\n"
-
--#: ../clients/cli/connections.c:8704
-+#: ../clients/cli/connections.c:8815
- #, c-format
- msgid "%s: connection profile created\n"
- msgstr "%s: 연결 프로파일이 생성되었습니다.\n"
-
--#: ../clients/cli/connections.c:8713
-+#: ../clients/cli/connections.c:8824
- #, c-format
- msgid "%s: connection profile removed\n"
- msgstr "%s: 연결 프로파일이 제거되었습니다.\n"
-
--#: ../clients/cli/connections.c:8776
-+#: ../clients/cli/connections.c:8894
- #, c-format
- msgid "Error: failed to reload connections: %s."
- msgstr "오류: 연결 다시 불러오기 실패: %s."
-
--#: ../clients/cli/connections.c:8809
-+#: ../clients/cli/connections.c:8924
- #, c-format
- msgid "Error: failed to load connection: %s."
- msgstr "오류: 연결 불러오기 실패: %s."
-
--#: ../clients/cli/connections.c:8817
-+#: ../clients/cli/connections.c:8932
- #, c-format
- msgid "Could not load file '%s'\n"
- msgstr "파일 '%s'을 불러올 수 없습니다\n"
-
--#: ../clients/cli/connections.c:8824
-+#: ../clients/cli/connections.c:8936
- msgid "File to import: "
- msgstr "가져올 파일: "
-
--#: ../clients/cli/connections.c:8857
-+#: ../clients/cli/connections.c:8969
- #, c-format
- msgid "Error: No arguments provided."
- msgstr "오류: 인수가 지정되어 있지 않습니다."
-
--#: ../clients/cli/connections.c:8888
-+#: ../clients/cli/connections.c:9002
- #, c-format
- msgid "Warning: 'type' already specified, ignoring extra one.\n"
- msgstr "경고: '유형'이 이미 지정되어 있어 추가 유형을 무시합니다.\n"
-
--#: ../clients/cli/connections.c:8902
-+#: ../clients/cli/connections.c:9017
- #, c-format
- msgid "Warning: 'file' already specified, ignoring extra one.\n"
- msgstr "경고: '파일'이 이미 지정되어 있어 추가 파일을 무시합니다.\n"
-
--#: ../clients/cli/connections.c:8904
--#, c-format
--msgid "Unknown parameter: %s"
--msgstr "알 수 없는 매개변수: %s"
--
--#: ../clients/cli/connections.c:8915
-+#: ../clients/cli/connections.c:9031
- #, c-format
- msgid "Error: 'type' argument is required."
- msgstr "오류: 'type' 인수가 필요합니다. "
-
--#: ../clients/cli/connections.c:8919
-+#: ../clients/cli/connections.c:9036
- #, c-format
- msgid "Error: 'file' argument is required."
- msgstr "오류: 'file' 인수가 필요합니다."
-
--#: ../clients/cli/connections.c:8928
-+#: ../clients/cli/connections.c:9046
- #, c-format
- msgid "Error: failed to find VPN plugin for %s."
- msgstr "오류: %s. 수정에 실패했습니다: ."
-
--#: ../clients/cli/connections.c:8935 ../clients/cli/connections.c:9026
-+#: ../clients/cli/connections.c:9054 ../clients/cli/connections.c:9145
- #, c-format
- msgid "Error: failed to load VPN plugin: %s."
- msgstr "오류: VPN 플러그인 불러오기 실패: %s."
-
--#: ../clients/cli/connections.c:8944
-+#: ../clients/cli/connections.c:9064
- #, c-format
- msgid "Error: failed to import '%s': %s."
- msgstr "오류: '%s' 가져오기 실패: %s."
-
--#: ../clients/cli/connections.c:9012
-+#: ../clients/cli/connections.c:9131
- msgid "Output file name: "
- msgstr "출력 파일 이름: "
-
--#: ../clients/cli/connections.c:9017
-+#: ../clients/cli/connections.c:9136
- #, c-format
- msgid "Error: the connection is not VPN."
- msgstr "오류: 연결이 VPN이 아닙니다."
-
--#: ../clients/cli/connections.c:9039
-+#: ../clients/cli/connections.c:9158
- #, c-format
- msgid "Error: failed to create temporary file %s."
- msgstr "오류: 임시 파일 %s을(를) 생성할 수 없습니다."
-
--#: ../clients/cli/connections.c:9047
-+#: ../clients/cli/connections.c:9166
- #, c-format
- msgid "Error: failed to export '%s': %s."
- msgstr "오류: '%s' 내보내기 실패: %s."
-
--#: ../clients/cli/connections.c:9059
-+#: ../clients/cli/connections.c:9178
- #, c-format
- msgid "Error: failed to read temporary file '%s': %s."
- msgstr "오류: 임시 파일 '%s' 읽기 실패: %s."
-
- #. define some prompts
--#: ../clients/cli/devices.c:37
-+#: ../clients/cli/devices.c:23
- msgid "Interface: "
- msgstr "인터페이스: "
-
--#: ../clients/cli/devices.c:38
--#, fuzzy
-+#: ../clients/cli/devices.c:24
- msgid "Interface(s): "
--msgstr "인터페이스: "
-+msgstr "인터페이스 : "
-
--#: ../clients/cli/devices.c:73 ../clients/cli/devices.c:1234
-+#: ../clients/cli/devices.c:64 ../clients/cli/devices.c:1278
- msgid "(none)"
- msgstr "(없음)"
-
--#: ../clients/cli/devices.c:178 ../clients/cli/devices.c:185
-+#: ../clients/cli/devices.c:171 ../clients/cli/devices.c:178
- msgid "(unknown)"
- msgstr "(알 수 없음)"
-
--#: ../clients/cli/devices.c:333
-+#: ../clients/cli/devices.c:329
- #, c-format
- msgid "<invisible> | %s"
- msgstr "<invisible> | %s"
-
--#: ../clients/cli/devices.c:334
-+#: ../clients/cli/devices.c:330
- msgid "<invisible>"
- msgstr "<invisible>"
-
--#: ../clients/cli/devices.c:435
-+#: ../clients/cli/devices.c:431
- #, c-format
- msgid "%u Mb/s"
- msgstr "%u Mb/s"
-
--#: ../clients/cli/devices.c:693
-+#: ../clients/cli/devices.c:732
- #, c-format
- msgid ""
- "Usage: nmcli device { COMMAND | help }\n"
-@@ -2205,21 +2119,14 @@ msgid ""
- "\n"
- " wifi rescan [ifname <ifname>] [[ssid <SSID to scan>] ...]\n"
- "\n"
-+" wifi show-password [ifname <ifname>]\n"
-+"\n"
- " lldp [list [ifname <ifname>]]\n"
- "\n"
--msgstr ""
--"사용법 : nmcli 장치 {명령 | help} 명령 : = {상태 | 쇼 | 세트 | 연결하다 | 다시 신청 | 수정 | 연결 해제 | "
--"삭제 | 모니터 | 와이파이 | lldp} 상태 표시 [<ifname>] 세트 [ifname] <ifname> [자동 연결 예 | "
--"아니오] [관리 예 | 아니오] 연결 <ifname>다시 적용하다 <ifname>수정하다 <ifname> ([+ | -]<setting>."
--"<property> <value>) + 연결 끊기 <ifname> ... 삭제 <ifname> ... 모니터 <ifname> ... "
--"wifi [list [ifname <ifname>] [bssid <BSSID>]] 와이파이 연결 <(B)SSID> [암호 "
--"<password>] [wep-key-type key | 구] [ifname <ifname>] [bssid <BSSID>] [이름 "
--"<name>] [비공개 예 아니요] [숨김 예 아니요] wifi 핫스팟 [ifname <ifname>] [이름 <name>] [ssid "
--"<SSID>] [밴드 a | bg] [채널 <channel>] [암호 <password>] wifi rescan [ifname "
--"<ifname>] [[ssid <SSID to scan>] ...] lldp [list [ifname <ifname>]]\n"
-+msgstr "사용법 : nmcli 장치 { COMMAND | help } 명령 : = { status | show | set | connect | reapply | modify | disconnect | delete | monitor | wifi | lldp } 상태 표시 [ <ifname> ] [ifname] 설정 <ifname> [자동 연결 예 | 아니오] [관리 예 | 아니오] 연결 <ifname> 다시 적용 <ifname> 수정하다 <ifname> ([+ |-] <setting> . <property><value> ) + 연결 끊기 <ifname> ... 삭제 <ifname> ... 모니터 <ifname> ... wifi [목록 [ifname <ifname> ] [bssid <BSSID> ] [-다시 스캔 예 | 아니오 | 자동]] wifi 연결 <(B)SSID> [암호 <password> ] [wep 키 유형 키 | 구문] [ifname <ifname> ] [bssid <BSSID> ] [이름 <name> ] [private yes | no] [hidden yes | no] wifi 핫스팟 [ifname <ifname> ] [이름 <name> ] [ssid <SSID> ] [band a | bg] [채널 <channel> ] [비밀번호 <password> ] wifi 재검색 [ifname <ifname> ] [[ssid <SSID to scan> ] ...] wifi show-password [ifname <ifname> ] lldp [목록 [ifname <ifname> ]]\n"
- "\n"
-
--#: ../clients/cli/devices.c:716
-+#: ../clients/cli/devices.c:756
- #, c-format
- msgid ""
- "Usage: nmcli device status { help }\n"
-@@ -2230,11 +2137,12 @@ msgid ""
- " TYPE - device type\n"
- " STATE - device state\n"
- " CONNECTION - connection activated on device (if any)\n"
--"Displayed columns can be changed using '--fields' global option. 'status' is\n"
--"the default command, which means 'nmcli device' calls 'nmcli device status'.\n"
-+"Displayed columns can be changed using '--fields' global option. 'status' "
-+"is\n"
-+"the default command, which means 'nmcli device' calls 'nmcli device "
-+"status'.\n"
- "\n"
--msgstr ""
--"사용법: nmcli device status { help }\n"
-+msgstr "사용법: nmcli device status { help }\n"
- "\n"
- "모든 장치의 상태를 표시합니다.\n"
- "기본값으로 다음과 같은 항목이 표시됩니다:\n"
-@@ -2246,7 +2154,7 @@ msgstr ""
- "기본 명령으로, 'nmcli device'를 실행하면 'nmcli device status'를 호출합니다.\n"
- "\n"
-
--#: ../clients/cli/devices.c:731
-+#: ../clients/cli/devices.c:771
- #, c-format
- msgid ""
- "Usage: nmcli device show { ARGUMENTS | help }\n"
-@@ -2256,8 +2164,7 @@ msgid ""
- "Show details of device(s).\n"
- "The command lists details for all devices, or for a given device.\n"
- "\n"
--msgstr ""
--"사용법: nmcli device show { 인수 | help }\n"
-+msgstr "사용법: nmcli device show { 인수 | help }\n"
- "\n"
- "인수 := [<ifname>]\n"
- "\n"
-@@ -2265,7 +2172,7 @@ msgstr ""
- "이 명령은 모든 장치 또는 지정된 장치의 상세 정보를 표시합니다.\n"
- "\n"
-
--#: ../clients/cli/devices.c:742
-+#: ../clients/cli/devices.c:782
- #, c-format
- msgid ""
- "Usage: nmcli device connect { ARGUMENTS | help }\n"
-@@ -2273,12 +2180,11 @@ msgid ""
- "ARGUMENTS := <ifname>\n"
- "\n"
- "Connect the device.\n"
--"NetworkManager will try to find a suitable connection that will be activated."
--"\n"
-+"NetworkManager will try to find a suitable connection that will be "
-+"activated.\n"
- "It will also consider connections that are not set to auto-connect.\n"
- "\n"
--msgstr ""
--"사용법: nmcli device connect { 인수 | help }\n"
-+msgstr "사용법: nmcli device connect { 인수 | help }\n"
- "\n"
- "인수 := <ifname>\n"
- "\n"
-@@ -2287,7 +2193,7 @@ msgstr ""
- "또한 자동 연결로 설정되지 않은 연결도 검색합니다.\n"
- "\n"
-
--#: ../clients/cli/devices.c:754
-+#: ../clients/cli/devices.c:794
- #, c-format
- msgid ""
- "Usage: nmcli device reapply { ARGUMENTS | help }\n"
-@@ -2297,8 +2203,7 @@ msgid ""
- "Attempts to update device with changes to the currently active connection\n"
- "made since it was last applied.\n"
- "\n"
--msgstr ""
--"사용법: nmcli device disconnect \n"
-+msgstr "사용법: nmcli device disconnect \n"
- "\n"
- "인수 := \n"
- "\n"
-@@ -2307,7 +2212,7 @@ msgstr ""
- "자동 활성화에 의해 연결되지 않게 합니다.\n"
- "\n"
-
--#: ../clients/cli/devices.c:765
-+#: ../clients/cli/devices.c:805
- #, c-format
- msgid ""
- "Usage: nmcli device modify { ARGUMENTS | --help }\n"
-@@ -2322,21 +2227,14 @@ msgid ""
- "The '-' sign allows removing selected items instead of the whole value.\n"
- "\n"
- "Examples:\n"
--"nmcli dev mod em1 ipv4.method manual ipv4.addr \"192.168.1.2/24, 10.10.1.5/"
--"8\"\n"
-+"nmcli dev mod em1 ipv4.method manual ipv4.addr \"192.168.1.2/24, "
-+"10.10.1.5/8\"\n"
- "nmcli dev mod em1 +ipv4.dns 8.8.4.4\n"
- "nmcli dev mod em1 -ipv4.dns 1\n"
- "nmcli dev mod em1 -ipv6.addr \"abbe::cafe/56\"\n"
--msgstr ""
--"사용법 : nmcli 장치 {ARGUMENTS | --help} 논증 : = <ifname> ([+ | -]<setting>."
--"<property> <value>) + 연결 프로필을 수정하지 않고 장치에서 현재 활성화 된 하나 이상의 속성을 수정합니다. 변경 사항은 "
--"즉시 적용됩니다. 다중 값 속성의 경우 속성 이름 앞에 선택적 '+'또는 '-'접두어를 사용할 수 있습니다. '+'기호를 사용하면 전체 "
--"값을 덮어 쓰지 않고 항목을 추가 할 수 있습니다. '-'기호를 사용하면 전체 값 대신 선택한 항목을 제거 할 수 있습니다. 예 : "
--"nmcli dev mod em1 ipv4.method 수동 ipv4.addr \"192.168.1.2/24, 10.10.1.5/"
--"8\"nmcli dev mod em1 + ipv4.dns 8.8.4.4 nmcli dev mod em1 -ipv4.dns 1 nmcli "
--"dev mod em1 -ipv6.addr \"abbe :: cafe / 56\"\n"
-+msgstr "사용법 : nmcli 장치 {ARGUMENTS | --help} 논증 : = <ifname> ([+ | -]<setting>.<property> <value>) + 연결 프로필을 수정하지 않고 장치에서 현재 활성화 된 하나 이상의 속성을 수정합니다. 변경 사항은 즉시 적용됩니다. 다중 값 속성의 경우 속성 이름 앞에 선택적 '+'또는 '-'접두어를 사용할 수 있습니다. '+'기호를 사용하면 전체 값을 덮어 쓰지 않고 항목을 추가 할 수 있습니다. '-'기호를 사용하면 전체 값 대신 선택한 항목을 제거 할 수 있습니다. 예 : nmcli dev mod em1 ipv4.method 수동 ipv4.addr \"192.168.1.2/24, 10.10.1.5/8\"nmcli dev mod em1 + ipv4.dns 8.8.4.4 nmcli dev mod em1 -ipv4.dns 1 nmcli dev mod em1 -ipv6.addr \"abbe :: cafe / 56\"\n"
-
--#: ../clients/cli/devices.c:785
-+#: ../clients/cli/devices.c:825
- #, c-format
- msgid ""
- "Usage: nmcli device disconnect { ARGUMENTS | help }\n"
-@@ -2347,8 +2245,7 @@ msgid ""
- "The command disconnects the device and prevents it from auto-activating\n"
- "further connections without user/manual intervention.\n"
- "\n"
--msgstr ""
--"사용법: nmcli device disconnect { 인수 | help }\n"
-+msgstr "사용법: nmcli device disconnect { 인수 | help }\n"
- "\n"
- "ARGUMENTS := <ifname> ...\n"
- "\n"
-@@ -2357,7 +2254,7 @@ msgstr ""
- "추가 연결이 자동 활성화되지 않도록 합니다.\n"
- "\n"
-
--#: ../clients/cli/devices.c:797
-+#: ../clients/cli/devices.c:837
- #, c-format
- msgid ""
- "Usage: nmcli device delete { ARGUMENTS | help }\n"
-@@ -2369,8 +2266,7 @@ msgid ""
- "(like bonds, bridges, etc.). Hardware devices cannot be deleted by the\n"
- "command.\n"
- "\n"
--msgstr ""
--"사용법: nmcli device delete { 인수 | help }\n"
-+msgstr "사용법: nmcli device delete { 인수 | help }\n"
- "\n"
- "인수 := <ifname> ...\n"
- "\n"
-@@ -2380,7 +2276,7 @@ msgstr ""
- "없습니다.\n"
- "\n"
-
--#: ../clients/cli/devices.c:810
-+#: ../clients/cli/devices.c:850
- #, c-format
- msgid ""
- "Usage: nmcli device set { ARGUMENTS | help }\n"
-@@ -2392,8 +2288,7 @@ msgid ""
- "\n"
- "Modify device properties.\n"
- "\n"
--msgstr ""
--"사용법: nmcli device set { 인수 | 도움말 }\n"
-+msgstr "사용법: nmcli device set { 인수 | 도움말 }\n"
- "\n"
- "인수 := 장치 { 속성 [ PROPERTY ... ] }\n"
- "장치 := [ifname] <ifname> \n"
-@@ -2403,7 +2298,7 @@ msgstr ""
- "장치 속성을 수정합니다.\n"
- "\n"
-
--#: ../clients/cli/devices.c:823
-+#: ../clients/cli/devices.c:863
- #, c-format
- msgid ""
- "Usage: nmcli device monitor { ARGUMENTS | help }\n"
-@@ -2414,8 +2309,7 @@ msgid ""
- "This command prints a line whenever the specified devices change state.\n"
- "Monitors all devices in case no interface is specified.\n"
- "\n"
--msgstr ""
--"사용법: nmcli device monitor { 인수 | help }\n"
-+msgstr "사용법: nmcli device monitor { 인수 | help }\n"
- "\n"
- "인수 := [<ifname>] ...\n"
- "\n"
-@@ -2424,21 +2318,22 @@ msgstr ""
- "인터페이스가 지정되지 않은 경우 모든 장치를 모니터링합니다.\n"
- "\n"
-
--#: ../clients/cli/devices.c:835
-+#: ../clients/cli/devices.c:875
- #, c-format
- msgid ""
- "Usage: nmcli device wifi { ARGUMENTS | help }\n"
- "\n"
- "Perform operation on Wi-Fi devices.\n"
- "\n"
--"ARGUMENTS := [list [ifname <ifname>] [bssid <BSSID>] [--rescan yes|no|auto]]\n"
-+"ARGUMENTS := [list [ifname <ifname>] [bssid <BSSID>] [--rescan yes|no|"
-+"auto]]\n"
- "\n"
- "List available Wi-Fi access points. The 'ifname' and 'bssid' options can be\n"
- "used to list APs for a particular interface, or with a specific BSSID. The\n"
- "--rescan flag tells whether a new Wi-Fi scan should be triggered.\n"
- "\n"
--"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type "
--"key|phrase] [ifname <ifname>]\n"
-+"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type key|"
-+"phrase] [ifname <ifname>]\n"
- " [bssid <BSSID>] [name <name>] [private yes|no] [hidden "
- "yes|no]\n"
- "\n"
-@@ -2465,47 +2360,31 @@ msgid ""
- "\n"
- "ARGUMENTS := rescan [ifname <ifname>] [[ssid <SSID to scan>] ...]\n"
- "\n"
--"Request that NetworkManager immediately re-scan for available access points.\n"
--"NetworkManager scans Wi-Fi networks periodically, but in some cases it might\n"
-+"Request that NetworkManager immediately re-scan for available access "
-+"points.\n"
-+"NetworkManager scans Wi-Fi networks periodically, but in some cases it "
-+"might\n"
- "be useful to start scanning manually. 'ssid' allows scanning for a specific\n"
- "SSID, which is useful for APs with hidden SSIDs. More 'ssid' parameters can "
- "be\n"
- "given. Note that this command does not show the APs,\n"
- "use 'nmcli device wifi list' for that.\n"
- "\n"
--msgstr ""
--"사용법 : nmcli 장치 wifi {ARGUMENTS | 도움말} Wi-Fi 장치에서 작업을 수행하십시오. 논쟁 : = [목록 "
--"[ifname <ifname>] [bssid <BSSID>]] 사용 가능한 Wi-Fi 액세스 지점을 나열합니다. 'ifname'및 "
--"'bssid'옵션을 사용하여 특정 인터페이스 또는 특정 BSSID에 대한 AP를 나열 할 수 있습니다. 논증 : = 연결 "
--"<(B)SSID> [암호 <password>] [wep-key-type key | 구] [ifname <ifname>] [bssid "
--"<BSSID>] [이름 <name>] [private yes | no] [hidden yes | no] SSID 또는 BSSID로 지정된 "
--"Wi-Fi 네트워크에 연결합니다. 이 명령은 새 연결을 만든 다음 장치에서이 연결을 활성화합니다. 이것은 GUI 클라이언트에서 SSID를 "
--"클릭하는 명령 줄 카운터 파트입니다. 이 명령은 항상 새로운 연결을 생성하므로 새로운 Wi-Fi 네트워크에 연결하는 데 주로 유용합니다. "
--"네트워크 연결이 이미있는 경우 다음과 같이 기존 프로필을 표시하는 것이 좋습니다. nmcli con up id <name>. 현재 "
--"열려있는 WEP 및 WPA-PSK 네트워크 만 지원됩니다. 또한 DHCP를 통해 IP 구성을 얻은 것으로 가정합니다. 논쟁 : = 핫스팟 "
--"[ifname <ifname>] [이름 <name>] [ssid <SSID>] [밴드 a | bg] [채널 <channel>] [암호 "
--"<password>] Wi-Fi 핫스팟을 만듭니다. '연결 끊기'또는 '장치 연결 끊기'를 사용하여 핫스팟을 중지하십시오. 핫스팟의 매개 "
--"변수는 선택적 매개 변수의 영향을받을 수 있습니다. ifname - 사용할 Wi-Fi 장치 con-name - 만든 핫 스폿 연결 "
--"프로파일의 이름 ssid - 핫 스폿 대역의 SSID - 채널을 사용하는 Wi-Fi 대역 - Wi-Fi 암호 사용 채널 - 핫 스폿에 "
--"사용할 암호 ARGUMENTS : = rescan [ifname <ifname>] [[ssid <SSID to scan>] ...] "
--"NetworkManager가 즉시 사용 가능한 액세스 포인트를 다시 검색하도록 요청합니다. NetworkManager는 Wi-Fi "
--"네트워크를 주기적으로 검사하지만 어떤 경우 수동으로 검사를 시작하는 것이 유용 할 수 있습니다. 'ssid'는 특정 SSID를 검색 할 "
--"수 있으며, 숨겨진 SSID가있는 AP에 유용합니다. 더 많은 'ssid'매개 변수를 지정할 수 있습니다. 이 명령은 AP를 표시하지 "
--"않으며, 'nmcli device wifi list'를 사용합니다.\n"
--"\n"
--
--#: ../clients/cli/devices.c:882
-+msgstr "사용법 : nmcli 장치 wifi {ARGUMENTS | 도움말} Wi-Fi 장치에서 작업을 수행하십시오. 논쟁 : = [목록 [ifname <ifname>] [bssid <BSSID>]] 사용 가능한 Wi-Fi 액세스 지점을 나열합니다. 'ifname'및 'bssid'옵션을 사용하여 특정 인터페이스 또는 특정 BSSID에 대한 AP를 나열 할 수 있습니다. 논증 : = 연결 <(B)SSID> [암호 <password>] [wep-key-type key | 구] [ifname <ifname>] [bssid <BSSID>] [이름 <name>] [private yes | no] [hidden yes | no] SSID 또는 BSSID로 지정된 Wi-Fi 네트워크에 연결합니다. 이 명령은 새 연결을 만든 다음 장치에서이 연결을 활성화합니다. 이것은 GUI 클라이언트에서 SSID를 클릭하는 명령 줄 카운터 파트입니다. 이 명령은 항상 새로운 연결을 생성하므로 새로운 Wi-Fi 네트워크에 연결하는 데 주로 유용합니다. 네트워크 연결이 이미있는 경우 다음과 같이 기존 프로필을 표시하는 것이 좋습니다. nmcli con up id <name>. 현재 열려있는 WEP 및 WPA-PSK 네트워크 만 지원됩니다. 또한 DHCP를 통해 IP 구성을 얻은 것으로 가정합니다. 논쟁 : = 핫스팟 [ifname <ifname>] [이름 <name>] [ssid <SSID>] [밴드 a | bg] [채널 <channel>] [암호 <password>] Wi-Fi 핫스팟을 만듭니다. '연결 끊기'또는 '장치 연결 끊기'를 사용하여 핫스팟을 중지하십시오. 핫스팟의 매개 변수는 선택적 매개 변수의 영향을받을 수 있습니다. ifname - 사용할 Wi-Fi 장치 con-name - 만든 핫 스폿 연결 프로파일의 이름 ssid - 핫 스폿 대역의 SSID - 채널을 사용하는 Wi-Fi 대역 - Wi-Fi 암호 사용 채널 - 핫 스폿에 사용할 암호 ARGUMENTS : = rescan [ifname <ifname>] [[ssid <SSID to scan>] ...] NetworkManager가 즉시 사용 가능한 액세스 포인트를 다시 검색하도록 요청합니다. NetworkManager는 Wi-Fi 네트워크를 주기적으로 검사하지만 어떤 경우 수동으로 검사를 시작하는 것이 유용 할 수 있습니다. 'ssid'는 특정 SSID를 검색 할 수 있으며, 숨겨진 SSID가있는 AP에 유용합니다. 더 많은 'ssid'매개 변수를 지정할 수 있습니다. 이 명령은 AP를 표시하지 않으며, 'nmcli device wifi list'를 사용합니다.\n"
-+"\n"
-+
-+#: ../clients/cli/devices.c:922
- #, c-format
- msgid ""
- "Usage: nmcli device lldp { ARGUMENTS | help }\n"
- "\n"
- "ARGUMENTS := [list [ifname <ifname>]]\n"
- "\n"
--"List neighboring devices discovered through LLDP. The 'ifname' option can be\n"
-+"List neighboring devices discovered through LLDP. The 'ifname' option can "
-+"be\n"
- "used to list neighbors for a particular interface.\n"
- "\n"
--msgstr ""
--"사용법: nmcli device lldp { 인수 | help }\n"
-+msgstr "사용법: nmcli device lldp { 인수 | help }\n"
- "\n"
- "인수 := [list [ifname <ifname>]]\n"
- "\n"
-@@ -2513,444 +2392,465 @@ msgstr ""
- "'ifname' 옵션은 특정 인터페이스에 대해 인접 항목을 나열하는 데 사용할 수 있습니다.\n"
- "\n"
-
--#: ../clients/cli/devices.c:980
-+#: ../clients/cli/devices.c:1021
- #, c-format
- msgid "Error: No interface specified."
- msgstr "오류: 인터페이스가 지정되어 있지 않습니다."
-
--#: ../clients/cli/devices.c:1003
-+#: ../clients/cli/devices.c:1044
- #, c-format
- msgid "Warning: argument '%s' is duplicated.\n"
- msgstr "경고: 인수 '%s'(이)가 중복되었습니다.\n"
-
--#: ../clients/cli/devices.c:1006
-+#: ../clients/cli/devices.c:1047
- #, c-format
- msgid "Error: Device '%s' not found.\n"
- msgstr "오류: 장치 '%s'을(를) 찾을 수 없습니다.\n"
-
--#: ../clients/cli/devices.c:1007
-+#: ../clients/cli/devices.c:1048
- #, c-format
- msgid "Error: not all devices found."
- msgstr "오류: 일부 장치를 찾을 수 없습니다."
-
--#: ../clients/cli/devices.c:1038
-+#: ../clients/cli/devices.c:1079
- msgid "No interface specified"
- msgstr "인터페이스가 지정되지 않았습니다."
-
--#: ../clients/cli/devices.c:1057
-+#: ../clients/cli/devices.c:1098
- #, c-format
- msgid "Device '%s' not found"
- msgstr "장치 '%s' 찾을 수 없음"
-
--#: ../clients/cli/devices.c:1153
-+#: ../clients/cli/devices.c:1194
- #, c-format
- msgid "%u MHz"
- msgstr "%u MHz"
-
--#: ../clients/cli/devices.c:1154
-+#: ../clients/cli/devices.c:1195
- #, c-format
- msgid "%u Mbit/s"
- msgstr "%u Mbit/s"
-
--#: ../clients/cli/devices.c:1193
-+#: ../clients/cli/devices.c:1237
- msgid "Ad-Hoc"
- msgstr "애드혹"
-
--#: ../clients/cli/devices.c:1194
-+#: ../clients/cli/devices.c:1238
- msgid "Infra"
- msgstr "인프라"
-
--#: ../clients/cli/devices.c:1195 ../src/devices/wifi/nm-device-olpc-mesh.c:133
-+#: ../clients/cli/devices.c:1239 ../src/devices/wifi/nm-device-olpc-mesh.c:118
- msgid "Mesh"
- msgstr "메시"
-
--#: ../clients/cli/devices.c:1196
-+#: ../clients/cli/devices.c:1240
- msgid "N/A"
- msgstr "해당 없음 "
-
--#: ../clients/cli/devices.c:1391
-+#: ../clients/cli/devices.c:1435
- msgid "Device details"
- msgstr "장치 상세정보"
-
--#: ../clients/cli/devices.c:1402
-+#: ../clients/cli/devices.c:1447
- #, c-format
- msgid "Error: 'device show': %s"
- msgstr "오류: 'device show': %s"
-
--#: ../clients/cli/devices.c:1700
-+#: ../clients/cli/devices.c:1776
- msgid "Status of devices"
- msgstr "장치 상태"
-
--#: ../clients/cli/devices.c:1704
-+#: ../clients/cli/devices.c:1780
- #, c-format
- msgid "Error: 'device status': %s"
- msgstr "오류: 'device status': %s"
-
--#: ../clients/cli/devices.c:1731 ../clients/cli/devices.c:2171
--#: ../clients/cli/devices.c:4145
--#, c-format
--msgid "Error: invalid extra argument '%s'."
--msgstr "오류: 잘못된 추가 인수 '%s'입니다."
--
--#: ../clients/cli/devices.c:1767 ../clients/cli/general.c:519
-+#: ../clients/cli/devices.c:1842 ../clients/cli/general.c:511
- #, c-format
- msgid "Error: Timeout %d sec expired."
- msgstr "오류: 제한시간 %d초를 초과했습니다."
-
--#: ../clients/cli/devices.c:1816
-+#: ../clients/cli/devices.c:1914
- #, c-format
- msgid "Device '%s' successfully activated with '%s'.\n"
- msgstr "장치 '%s'이(가) '%s'을(를) 통해 성공적으로 활성화되었습니다.\n"
-
--#: ../clients/cli/devices.c:1822
-+#: ../clients/cli/devices.c:1919
-+#, c-format
-+msgid ""
-+"Hint: \"nmcli dev wifi show-password\" shows the Wi-Fi name and password.\n"
-+msgstr "힌트 : \"nmcli dev wifi show-password\"는 Wi-Fi 이름과 암호를 보여줍니다.\n"
-+
-+#: ../clients/cli/devices.c:1923
- #, c-format
- msgid "Error: Connection activation failed: (%d) %s.\n"
- msgstr "오류: 연결 활성화 실패: (%d) %s.\n"
-
--#: ../clients/cli/devices.c:1861
-+#: ../clients/cli/devices.c:1953
- #, c-format
- msgid "Error: Failed to setup a Wi-Fi hotspot: %s"
- msgstr "오류: Wi-Fi 핫스폿 설정 실패: %s"
-
--#: ../clients/cli/devices.c:1864
-+#: ../clients/cli/devices.c:1956
- #, c-format
- msgid "Error: Failed to add/activate new connection: %s"
- msgstr "오류: 새 연결 추가/활성화 실패: %s"
-
--#: ../clients/cli/devices.c:1867
--#, fuzzy, c-format
-+#: ../clients/cli/devices.c:1959
-+#, c-format
- msgid "Error: Failed to activate connection: %s"
--msgstr "오류: 새 연결 추가/활성화 실패: %s"
-+msgstr "오류: '%s'() 연결 활성화 실패: "
-
--#: ../clients/cli/devices.c:1936
-+#: ../clients/cli/devices.c:2024
- #, c-format
- msgid "Error: Device activation failed: %s"
- msgstr "오류: 장치 활성화에 실패했습니다: %s"
-
--#: ../clients/cli/devices.c:1945
--#, c-format
--msgid "Error: Device activation failed: device was disconnected"
--msgstr "오류: 장치 활성화 실패: 장치의 연결이 해제되었습니다."
--
--#: ../clients/cli/devices.c:1998
-+#: ../clients/cli/devices.c:2075
- #, c-format
- msgid "Error: extra argument not allowed: '%s'."
- msgstr "오류: 추가 인수가 허용되지 않음: '%s'."
-
--#: ../clients/cli/devices.c:2071 ../clients/cli/devices.c:2086
--#: ../clients/cli/devices.c:2323
-+#: ../clients/cli/devices.c:2144 ../clients/cli/devices.c:2159
-+#: ../clients/cli/devices.c:2400
- #, c-format
- msgid "Device '%s' successfully disconnected.\n"
- msgstr "장치 '%s'의 연결이 성공적으로 해제되었습니다.\n"
-
--#: ../clients/cli/devices.c:2074 ../clients/cli/devices.c:2397
-+#: ../clients/cli/devices.c:2147 ../clients/cli/devices.c:2473
- #, c-format
- msgid "Device '%s' successfully removed.\n"
- msgstr "장치 '%s'이(가) 성공적으로 제거되었습니다.\n"
-
--#: ../clients/cli/devices.c:2136 ../clients/cli/devices.c:2206
--#, fuzzy, c-format
-+#: ../clients/cli/devices.c:2209 ../clients/cli/devices.c:2279
-+#, c-format
- msgid "Error: Reapplying connection to device '%s' (%s) failed: %s"
--msgstr "오류: 장치 '%s' (%s)의 연결 해제가 실패했습니다: %s"
-+msgstr "오류 : '기기에 다시 연결하는 중 %s '( %s ) 실패 : %s"
-
--#: ../clients/cli/devices.c:2146 ../clients/cli/devices.c:2215
-+#: ../clients/cli/devices.c:2219 ../clients/cli/devices.c:2288
- #, c-format
- msgid "Connection successfully reapplied to device '%s'.\n"
- msgstr "장치 '%s'에 연결이 성공적으로 재적용되었습니다.\n"
-
--#: ../clients/cli/devices.c:2240
-+#: ../clients/cli/devices.c:2315
- #, c-format
- msgid "Error: Reading applied connection from device '%s' (%s) failed: %s"
- msgstr "오류 : 장치에서 적용된 연결 읽기 '%s' (%s) 실패한: %s"
-
--#: ../clients/cli/devices.c:2307
-+#: ../clients/cli/devices.c:2384
- #, c-format
- msgid "Error: not all devices disconnected."
- msgstr "오류: 일부 장치의 연결을 해제할 수 없습니다."
-
--#: ../clients/cli/devices.c:2308
-+#: ../clients/cli/devices.c:2385
- #, c-format
- msgid "Error: Device '%s' (%s) disconnecting failed: %s\n"
- msgstr "오류: 장치 '%s'(%s)의 연결 해제 실패: %s\n"
-
--#: ../clients/cli/devices.c:2388
-+#: ../clients/cli/devices.c:2464
- #, c-format
- msgid "Error: not all devices deleted."
- msgstr "오류: 일부 장치를 삭제할 수 없습니다."
-
--#: ../clients/cli/devices.c:2389
-+#: ../clients/cli/devices.c:2465
- #, c-format
- msgid "Error: Device '%s' (%s) deletion failed: %s\n"
- msgstr "오류: 장치 '%s'(%s) 삭제 실패: %s\n"
-
--#: ../clients/cli/devices.c:2471
-+#: ../clients/cli/devices.c:2547
- #, c-format
- msgid "Error: No property specified."
- msgstr "오류: 속성이 지정되지 않았습니다."
-
--#: ../clients/cli/devices.c:2486 ../clients/cli/devices.c:2503
--#: ../clients/cli/general.c:692 ../clients/cli/general.c:704
-+#: ../clients/cli/devices.c:2563 ../clients/cli/devices.c:2582
-+#: ../clients/cli/general.c:773 ../clients/cli/general.c:786
- #, c-format
- msgid "Error: '%s' argument is missing."
- msgstr "오류: '%s' 인자가 없습니다."
-
--#: ../clients/cli/devices.c:2492
-+#: ../clients/cli/devices.c:2570
- #, c-format
- msgid "Error: 'managed': %s."
- msgstr "오류: 'managed': %s."
-
--#: ../clients/cli/devices.c:2509
-+#: ../clients/cli/devices.c:2589
- #, c-format
- msgid "Error: 'autoconnect': %s."
- msgstr "오류: 'autoconnect': %s."
-
--#: ../clients/cli/devices.c:2517 ../clients/cli/general.c:718
-+#: ../clients/cli/devices.c:2598 ../clients/cli/general.c:801
- #, c-format
- msgid "Error: property '%s' is not known."
- msgstr "오류: 속성 '%s'은(는) 알 수 없습니다."
-
--#: ../clients/cli/devices.c:2566
-+#: ../clients/cli/devices.c:2644
- #, c-format
- msgid "%s: using connection '%s'\n"
- msgstr "%s: 연결 '%s' 사용 중\n"
-
--#: ../clients/cli/devices.c:2592
-+#: ../clients/cli/devices.c:2670
- #, c-format
- msgid "%s: device created\n"
- msgstr "%s: 장치가 생성되었습니다.\n"
-
--#: ../clients/cli/devices.c:2599
-+#: ../clients/cli/devices.c:2677
- #, c-format
- msgid "%s: device removed\n"
- msgstr "%s: 장치가 제거되었습니다.\n"
-
--#: ../clients/cli/devices.c:2779
-+#: ../clients/cli/devices.c:2856
- msgid "Wi-Fi scan list"
- msgstr "Wi-Fi 스캔 목록 "
-
--#: ../clients/cli/devices.c:2866
-+#: ../clients/cli/devices.c:2974 ../clients/cli/devices.c:3251
- #, c-format
- msgid "Error: Access point with bssid '%s' not found."
- msgstr "오류: bssid '%s'인 액세스 지점을 찾을 수 없습니다."
-
--#: ../clients/cli/devices.c:3022
-+#: ../clients/cli/devices.c:3174
- #, c-format
- msgid "Error: 'device wifi': %s"
- msgstr "오류: 'device wifi': %s"
-
--#: ../clients/cli/devices.c:3040
-+#: ../clients/cli/devices.c:3193
- #, c-format
- msgid "Error: invalid rescan argument: '%s' not among [auto, no, yes]"
- msgstr "오류 : 잘못된 재검색 인자 : '%s' [자동, 아니요, 예]"
-
--#: ../clients/cli/devices.c:3047
-+#: ../clients/cli/devices.c:3232
- #, c-format
- msgid "Error: Device '%s' not found."
- msgstr "오류: '%s' 장치를 찾을 수 없습니다."
-
--#: ../clients/cli/devices.c:3058
-+#: ../clients/cli/devices.c:3237
- #, c-format
- msgid ""
- "Error: Device '%s' was not recognized as a Wi-Fi device, check "
- "NetworkManager Wi-Fi plugin."
--msgstr ""
--"오류: 장치 '%s'이(가) Wi-Fi 장치로 인식되지 않았습니다.NetworkManager Wi-Fi 플러그인을 확인하십시오."
-+msgstr "오류: 장치 '%s'이(가) Wi-Fi 장치로 인식되지 않았습니다.NetworkManager Wi-Fi 플러그인을 확인하십시오."
-
--#: ../clients/cli/devices.c:3062 ../clients/cli/devices.c:3322
--#: ../clients/cli/devices.c:3823 ../clients/cli/devices.c:3983
-+#: ../clients/cli/devices.c:3241 ../clients/cli/devices.c:3570
-+#: ../clients/cli/devices.c:4159 ../clients/cli/devices.c:4286
-+#: ../clients/cli/devices.c:4419
- #, c-format
- msgid "Error: Device '%s' is not a Wi-Fi device."
- msgstr "오류: '%s' 장치는 Wi-Fi 장치가 아닙니다."
-
--#: ../clients/cli/devices.c:3171
-+#: ../clients/cli/devices.c:3417
- msgid "SSID or BSSID: "
- msgstr "SSID 또는 BSSID: "
-
--#: ../clients/cli/devices.c:3176
-+#: ../clients/cli/devices.c:3422
- #, c-format
- msgid "Error: SSID or BSSID are missing."
- msgstr "오류: SSID 또는 BSSID가 누락되어 있습니다."
-
--#: ../clients/cli/devices.c:3213
-+#: ../clients/cli/devices.c:3459
- #, c-format
- msgid "Error: bssid argument value '%s' is not a valid BSSID."
- msgstr "오류: bssid 인수 값 '%s'은 올바른 BSSID가 아닙니다."
-
--#: ../clients/cli/devices.c:3243
-+#: ../clients/cli/devices.c:3489
- #, c-format
- msgid ""
- "Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
- msgstr "오류: wep-key-type 인수 값 '%s'은 유효하지 않습니다. 'key' 또는 'phrase'를 사용합니다."
-
--#: ../clients/cli/devices.c:3270 ../clients/cli/devices.c:3288
-+#: ../clients/cli/devices.c:3516 ../clients/cli/devices.c:3534
- #, c-format
- msgid "Error: %s: %s."
- msgstr "오류: %s: %s."
-
--#: ../clients/cli/devices.c:3305
-+#: ../clients/cli/devices.c:3553
- #, c-format
- msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
- msgstr "오류: (%s)에 연결하려는 BSSID는 bssid 인수 (%s)와 다릅니다."
-
--#: ../clients/cli/devices.c:3311
-+#: ../clients/cli/devices.c:3559
- #, c-format
- msgid "Error: Parameter '%s' is neither SSID nor BSSID."
- msgstr "오류: 매개 변수 '%s'는 SSID 또는 BSSID가 아닙니다."
-
--#: ../clients/cli/devices.c:3324 ../clients/cli/devices.c:3825
--#: ../clients/cli/devices.c:3985
-+#: ../clients/cli/devices.c:3572 ../clients/cli/devices.c:4161
-+#: ../clients/cli/devices.c:4288 ../clients/cli/devices.c:4524
- #, c-format
- msgid "Error: No Wi-Fi device found."
- msgstr "오류: Wi-Fi 장치를 찾을 수 없습니다."
-
--#: ../clients/cli/devices.c:3344
-+#: ../clients/cli/devices.c:3592
- #, c-format
- msgid "Error: Failed to scan hidden SSID: %s."
- msgstr "오류: 숨겨진 SSID 스캔 실패: %s."
-
--#: ../clients/cli/devices.c:3371
-+#: ../clients/cli/devices.c:3619
- #, c-format
- msgid "Error: No network with SSID '%s' found."
- msgstr "오류: SSID '%s'인 네트워크를 찾을 수 없습니다."
-
--#: ../clients/cli/devices.c:3373
-+#: ../clients/cli/devices.c:3621
- #, c-format
- msgid "Error: No access point with BSSID '%s' found."
- msgstr "오류: BSSID '%s'인 액세스 지점을 찾을 수 없습니다."
-
--#: ../clients/cli/devices.c:3401
-+#: ../clients/cli/devices.c:3648
- #, c-format
- msgid "Error: Connection '%s' exists but properties don't match."
--msgstr ""
-+msgstr "오류 : 연결 ' %s '가 있지만 속성이 일치하지 않습니다."
-
--#: ../clients/cli/devices.c:3444
-+#: ../clients/cli/devices.c:3691
- #, c-format
- msgid ""
- "Warning: '%s' should be SSID for hidden APs; but it looks like a BSSID.\n"
- msgstr "경고: 숨겨진 AP의 경우 '%s'(이)가 SSID여야 하지만 BSSID인 것 같습니다.\n"
-
--#: ../clients/cli/devices.c:3481
-+#: ../clients/cli/devices.c:3732
- msgid "Password: "
- msgstr "암호: "
-
--#: ../clients/cli/devices.c:3644
-+#: ../clients/cli/devices.c:3871
- #, c-format
- msgid "'%s' is not valid WPA PSK"
- msgstr "'%s'은(는) 유효한 WPA PSK가 아닙니다."
-
--#: ../clients/cli/devices.c:3661
-+#: ../clients/cli/devices.c:3888
- #, 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:3904
- #, c-format
- msgid "Hotspot password: %s\n"
- msgstr "핫스팟 암호: %s\n"
-
--#: ../clients/cli/devices.c:3748
-+#: ../clients/cli/devices.c:4072
- #, c-format
- msgid "Error: ssid is too long."
- msgstr "오류: ssid가 너무 깁니다."
-
--#: ../clients/cli/devices.c:3762
-+#: ../clients/cli/devices.c:4089
- #, c-format
- msgid "Error: band argument value '%s' is invalid; use 'a' or 'bg'."
- msgstr "오류: 밴드 인수 값 '%s'이(가) 잘못되었습니다. 'a' 또는 'bg'를 사용하십시오."
-
--#: ../clients/cli/devices.c:3787
--#, c-format
--msgid "Error: Unknown parameter %s."
--msgstr "오류: 알 수 없는 매개변수 %s."
--
--#: ../clients/cli/devices.c:3807
-+#: ../clients/cli/devices.c:4140
- #, c-format
- msgid "Error: channel requires band too."
- msgstr "오류: 채널에는 밴드도 필요합니다."
-
--#: ../clients/cli/devices.c:3812
-+#: ../clients/cli/devices.c:4146
- #, c-format
- msgid "Error: channel '%s' not valid for band '%s'."
- msgstr "오류: 채널 '%s'이(가) 밴드 '%s'에 유효하지 않습니다."
-
--#: ../clients/cli/devices.c:3836
-+#: ../clients/cli/devices.c:4173
- #, 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:4195
- #, c-format
- msgid "Error: Invalid 'password': %s."
- msgstr "오류: 잘못된 'password': %s."
-
--#: ../clients/cli/devices.c:3946
-+#: ../clients/cli/devices.c:4246 ../clients/cli/devices.c:4471
- #, c-format
- msgid "Error: '%s' cannot repeat."
- msgstr "오류: '%s'은(는) 반복할 수 없습니다."
-
-+#: ../clients/cli/devices.c:4377 ../clients/cli/devices.c:4381
-+#: ../clients/cli/devices.c:4386 ../clients/cli/devices.c:4389
-+#: ../clients/tui/nmt-page-wifi.c:250
-+msgid "Security"
-+msgstr "보안"
-+
-+#: ../clients/cli/devices.c:4377
-+msgid "None"
-+msgstr "없음"
-+
-+#: ../clients/cli/devices.c:4393 ../clients/common/nm-secret-agent-simple.c:273
-+#: ../clients/common/nm-secret-agent-simple.c:310
-+#: ../clients/common/nm-secret-agent-simple.c:333
-+#: ../clients/common/nm-secret-agent-simple.c:366
-+#: ../clients/common/nm-secret-agent-simple.c:903
-+#: ../clients/common/nm-secret-agent-simple.c:938
-+#: ../clients/common/nm-secret-agent-simple.c:961
-+#: ../clients/common/nm-vpn-helpers.c:137
-+#: ../clients/common/nm-vpn-helpers.c:143
-+#: ../clients/common/nm-vpn-helpers.c:151
-+#: ../clients/common/nm-vpn-helpers.c:160 ../clients/tui/nmt-page-dsl.c:62
-+#: ../clients/tui/nmt-page-wifi.c:266 ../clients/tui/nmt-page-wifi.c:298
-+#: ../clients/tui/nmt-page-wifi.c:331
-+msgid "Password"
-+msgstr "암호 "
-+
-+#: ../clients/cli/devices.c:4511
-+#, c-format
-+msgid "%s"
-+msgstr "%s"
-+
- #. Main header name
--#: ../clients/cli/devices.c:4051
-+#: ../clients/cli/devices.c:4565
- msgid "Device LLDP neighbors"
- msgstr "장치 LLDP 인접 라우터"
-
--#: ../clients/cli/devices.c:4161
-+#: ../clients/cli/devices.c:4682
- #, c-format
- msgid "Error: 'device lldp list': %s"
- msgstr "오류: 'device lldp list': %s"
-
--#: ../clients/cli/general.c:41
-+#: ../clients/cli/general.c:32
- msgid "asleep"
- msgstr "사용 일시 중지"
-
--#: ../clients/cli/general.c:42
-+#: ../clients/cli/general.c:33
- msgid "connecting"
- msgstr "연결"
-
--#: ../clients/cli/general.c:43
-+#: ../clients/cli/general.c:34
- msgid "connected (local only)"
- msgstr "연결됨 (로컬 전용)"
-
--#: ../clients/cli/general.c:44
-+#: ../clients/cli/general.c:35
- msgid "connected (site only)"
- msgstr "연결됨 (사이트 전용)"
-
--#: ../clients/cli/general.c:45 ../clients/common/nm-client-utils.c:274
-+#: ../clients/cli/general.c:36 ../clients/common/nm-client-utils.c:262
- msgid "connected"
- msgstr "연결됨"
-
--#: ../clients/cli/general.c:46
-+#: ../clients/cli/general.c:37
- msgid "disconnecting"
- msgstr "연결 끊는 중"
-
--#: ../clients/cli/general.c:47 ../clients/common/nm-client-utils.c:267
-+#: ../clients/cli/general.c:38 ../clients/common/nm-client-utils.c:255
- msgid "disconnected"
- msgstr "연결 끊겼음"
-
--#: ../clients/cli/general.c:138
-+#: ../clients/cli/general.c:94
- msgid "auth"
- msgstr "인증 "
-
--#: ../clients/cli/general.c:166
-+#: ../clients/cli/general.c:123
- msgid "running"
- msgstr "실행 중"
-
--#: ../clients/cli/general.c:180
-+#: ../clients/cli/general.c:137
- msgid "starting"
- msgstr "시작하는 중"
-
--#: ../clients/cli/general.c:180
-+#: ../clients/cli/general.c:137
- msgid "started"
- msgstr "시작됨"
-
--#: ../clients/cli/general.c:214
-+#: ../clients/cli/general.c:171
- msgid "enabled"
- msgstr "사용"
-
--#: ../clients/cli/general.c:214
-+#: ../clients/cli/general.c:171
- msgid "disabled"
- msgstr "사용 않음"
-
--#: ../clients/cli/general.c:332
-+#: ../clients/cli/general.c:289
- #, c-format
- msgid ""
- "Usage: nmcli general { COMMAND | help }\n"
-@@ -2965,8 +2865,7 @@ msgid ""
- "\n"
- " logging [level <log level>] [domains <log domains>]\n"
- "\n"
--msgstr ""
--"사용법: nmcli general { 명령 | help }\n"
-+msgstr "사용법: nmcli general { 명령 | help }\n"
- "\n"
- "명령 := { status | hostname | permissions | logging }\n"
- "\n"
-@@ -2979,7 +2878,7 @@ msgstr ""
- " logging [level <log level>] [domains <log domains>]\n"
- "\n"
-
--#: ../clients/cli/general.c:343
-+#: ../clients/cli/general.c:300
- #, c-format
- msgid ""
- "Usage: nmcli general status { help }\n"
-@@ -2988,14 +2887,13 @@ msgid ""
- "'status' is the default action, which means 'nmcli gen' calls 'nmcli gen "
- "status'\n"
- "\n"
--msgstr ""
--"사용법: nmcli general status { help }\n"
-+msgstr "사용법: nmcli general status { help }\n"
- "\n"
- "NetworkManager의 일반 정보를 표시합니다.\n"
- "'status'는 기본 동작으로 'nmcli gen'을 실행하면 'nmcli gen status'를 실행한 것입니다\n"
- "\n"
-
--#: ../clients/cli/general.c:352
-+#: ../clients/cli/general.c:309
- #, c-format
- msgid ""
- "Usage: nmcli general hostname { ARGUMENTS | help }\n"
-@@ -3004,11 +2902,10 @@ msgid ""
- "\n"
- "Get or change persistent system hostname.\n"
- "With no arguments, this prints currently configured hostname. When you pass\n"
--"a hostname, NetworkManager will set it as the new persistent system hostname."
-+"a hostname, NetworkManager will set it as the new persistent system "
-+"hostname.\n"
- "\n"
--"\n"
--msgstr ""
--"사용법: nmcli general hostname { 인수 | help }\n"
-+msgstr "사용법: nmcli general hostname { 인수 | help }\n"
- "\n"
- "인수 := [<hostname>]\n"
- "\n"
-@@ -3017,7 +2914,7 @@ msgstr ""
- "NetworkManager는 해당 호스트 이름을 시스템의 영구적인 호스트 이름으로 새로 설정합니다.\n"
- "\n"
-
--#: ../clients/cli/general.c:364
-+#: ../clients/cli/general.c:321
- #, c-format
- msgid ""
- "Usage: nmcli general permissions { help }\n"
-@@ -3029,7 +2926,39 @@ msgstr "사용법: nmcli general permissions { help }\n"
- "인증된 작업의 호출 권한을 표시합니다.\n"
- "\n"
-
--#: ../clients/cli/general.c:372
-+#: ../clients/cli/general.c:329
-+#, c-format
-+msgid ""
-+"Usage: nmcli general reload { ARGUMENTS | help }\n"
-+"\n"
-+"ARGUMENTS := [<flag>[,<flag>...]]\n"
-+"\n"
-+"Reload NetworkManager's configuration and perform certain updates, like\n"
-+"flushing caches or rewriting external state to disk. This is similar to\n"
-+"sending SIGHUP to NetworkManager but it allows for more fine-grained\n"
-+"control over what to reload through the flags argument. It also allows\n"
-+"non-root access via PolicyKit and contrary to signals it is synchronous.\n"
-+"\n"
-+"Available flags are:\n"
-+"\n"
-+" 'conf' Reload the NetworkManager.conf configuration from\n"
-+" disk. Note that this does not include connections, which\n"
-+" can be reloaded through 'nmcli connection reload' instead.\n"
-+"\n"
-+" 'dns-rc' Update DNS configuration, which usually involves writing\n"
-+" /etc/resolv.conf anew.\n"
-+"\n"
-+" 'dns-full' Restart the DNS plugin. This is for example useful when\n"
-+" using dnsmasq plugin, which uses additional configuration\n"
-+" in /etc/NetworkManager/dnsmasq.d. If you edit those files,\n"
-+" you can restart the DNS plugin. This action shortly\n"
-+" interrupts name resolution.\n"
-+"\n"
-+"With no flags, everything that is supported is reloaded, which is\n"
-+"identical to sending a SIGHUP.\n"
-+msgstr "사용법 : nmcli 일반 재 장전 { ARGUMENTS | help } 인수 : = [ <flag> [, <flag> ...]] NetworkManager 구성을 다시로드하고 캐시 플러시 또는 외부 상태를 디스크에 다시 쓰는 것과 같은 특정 업데이트를 수행합니다. 이는 SIGHUP을 NetworkManager로 보내는 것과 유사하지만 flags 인수를 통해 다시로드 할 항목을보다 세밀하게 제어 할 수 있습니다. 또한 PolicyKit을 통한 비 루트 액세스를 허용하며 동기 신호와 반대입니다. 사용 가능한 플래그는 다음과 같습니다. 'conf'디스크에서 NetworkManager.conf 구성을 다시로드하십시오. 여기에는 'nmcli connection reload'를 통해 다시로드 할 수있는 연결이 포함되지 않습니다. 'dns-rc'일반적으로 /etc/resolv.conf를 새로 쓰는 DNS 구성을 업데이트합니다. 'dns-full'DNS 플러그인을 다시 시작하십시오. 이것은 예를 들어 dnsmasq 플러그인을 사용할 때 유용합니다.이 플러그인은 /etc/NetworkManager/dnsmasq.d에서 추가 구성을 사용합니다. 해당 파일을 편집하면 DNS 플러그인을 다시 시작할 수 있습니다. 이 작업은 이름 확인을 잠시 중단합니다. 플래그가 없으면 지원되는 모든 항목이 다시로드되며 이는 SIGHUP 전송과 동일합니다.\n"
-+
-+#: ../clients/cli/general.c:361
- #, c-format
- msgid ""
- "Usage: nmcli general logging { ARGUMENTS | help }\n"
-@@ -3043,8 +2972,7 @@ msgid ""
- "page\n"
- "for the list of possible logging domains.\n"
- "\n"
--msgstr ""
--"사용법: nmcli general logging { 인수 | help }\n"
-+msgstr "사용법: nmcli general logging { 인수 | help }\n"
- "\n"
- "인수 := [level <log level>] [domains <log domains>]\n"
- "\n"
-@@ -3054,7 +2982,7 @@ msgstr ""
- "참조하십시오.\n"
- "\n"
-
--#: ../clients/cli/general.c:385
-+#: ../clients/cli/general.c:374
- #, c-format
- msgid ""
- "Usage: nmcli networking { COMMAND | help }\n"
-@@ -3067,8 +2995,7 @@ msgid ""
- "\n"
- " connectivity [check]\n"
- "\n"
--msgstr ""
--"사용법: nmcli networking { 명령 | help }\n"
-+msgstr "사용법: nmcli networking { 명령 | help }\n"
- "\n"
- "명령 := { [ on | off | connectivity ] }\n"
- "\n"
-@@ -3079,9 +3006,10 @@ msgstr ""
- " connectivity [check]\n"
- "\n"
-
--#: ../clients/cli/general.c:395
-+#: ../clients/cli/general.c:384
- #, c-format
--msgid "Usage: nmcli networking on { help }\n"
-+msgid ""
-+"Usage: nmcli networking on { help }\n"
- "\n"
- "Switch networking on.\n"
- "\n"
-@@ -3090,9 +3018,10 @@ msgstr "사용법: nmcli networking on { help }\n"
- "네트워크를 켭니다.\n"
- "\n"
-
--#: ../clients/cli/general.c:403
-+#: ../clients/cli/general.c:392
- #, c-format
--msgid "Usage: nmcli networking off { help }\n"
-+msgid ""
-+"Usage: nmcli networking off { help }\n"
- "\n"
- "Switch networking off.\n"
- "\n"
-@@ -3101,7 +3030,7 @@ msgstr "사용법: nmcli networking off { help }\n"
- "네트워크를 끕니다.\n"
- "\n"
-
--#: ../clients/cli/general.c:411
-+#: ../clients/cli/general.c:400
- #, c-format
- msgid ""
- "Usage: nmcli networking connectivity { ARGUMENTS | help }\n"
-@@ -3109,11 +3038,10 @@ msgid ""
- "ARGUMENTS := [check]\n"
- "\n"
- "Get network connectivity state.\n"
--"The optional 'check' argument makes NetworkManager re-check the connectivity."
-+"The optional 'check' argument makes NetworkManager re-check the "
-+"connectivity.\n"
- "\n"
--"\n"
--msgstr ""
--"사용법: nmcli networking connectivity { 인수 | help }\n"
-+msgstr "사용법: nmcli networking connectivity { 인수 | help }\n"
- "\n"
- "인수 := [check]\n"
- "\n"
-@@ -3121,7 +3049,7 @@ msgstr ""
- "옵션의 'check' 인수를 사용하면 NetworkManager가 연결을 다시 확인합니다.\n"
- "\n"
-
--#: ../clients/cli/general.c:423
-+#: ../clients/cli/general.c:412
- #, c-format
- msgid ""
- "Usage: nmcli radio { COMMAND | help }\n"
-@@ -3130,15 +3058,14 @@ msgid ""
- "\n"
- " all | wifi | wwan [ on | off ]\n"
- "\n"
--msgstr ""
--"사용법: nmcli radio { 명령 | help }\n"
-+msgstr "사용법: nmcli radio { 명령 | help }\n"
- "\n"
- "명령 := { all | wifi | wwan }\n"
- "\n"
- " all | wifi | wwan [ on | off ]\n"
- "\n"
-
--#: ../clients/cli/general.c:432
-+#: ../clients/cli/general.c:421
- #, c-format
- msgid ""
- "Usage: nmcli radio all { ARGUMENTS | help }\n"
-@@ -3147,15 +3074,14 @@ msgid ""
- "\n"
- "Get status of all radio switches, or turn them on/off.\n"
- "\n"
--msgstr ""
--"사용법: nmcli radio all { 인수 | help }\n"
-+msgstr "사용법: nmcli radio all { 인수 | help }\n"
- "\n"
- "인수 := [on | off]\n"
- "\n"
- "모든 라디오 스위치의 상태를 가져오거나 이를 활성화/비활성화합니다.\n"
- "\n"
-
--#: ../clients/cli/general.c:442
-+#: ../clients/cli/general.c:431
- #, c-format
- msgid ""
- "Usage: nmcli radio wifi { ARGUMENTS | help }\n"
-@@ -3164,15 +3090,14 @@ msgid ""
- "\n"
- "Get status of Wi-Fi radio switch, or turn it on/off.\n"
- "\n"
--msgstr ""
--"사용법: nmcli radio wifi { 인수 | help }\n"
-+msgstr "사용법: nmcli radio wifi { 인수 | help }\n"
- "\n"
- "인수 := [on | off]\n"
- "\n"
- "Wi-Fi 라디오 스위치의 상태를 가져오거나 이를 활성화/비활성화합니다.\n"
- "\n"
-
--#: ../clients/cli/general.c:452
-+#: ../clients/cli/general.c:441
- #, c-format
- msgid ""
- "Usage: nmcli radio wwan { ARGUMENTS | help }\n"
-@@ -3181,15 +3106,14 @@ msgid ""
- "\n"
- "Get status of mobile broadband radio switch, or turn it on/off.\n"
- "\n"
--msgstr ""
--"사용법: nmcli radio wwan { 인수 | help }\n"
-+msgstr "사용법: nmcli radio wwan { 인수 | help }\n"
- "\n"
- "인수 := [on | off]\n"
- "\n"
- "모바일 광대역 라디오 스위치의 상태를 가져오거나 이를 활성화/비활성화합니다\n"
- "\n"
-
--#: ../clients/cli/general.c:462
-+#: ../clients/cli/general.c:451
- #, c-format
- msgid ""
- "Usage: nmcli monitor\n"
-@@ -3197,185 +3121,239 @@ msgid ""
- "Monitor NetworkManager changes.\n"
- "Prints a line whenever a change occurs in NetworkManager\n"
- "\n"
--msgstr ""
--"사용법: nmcli monitor\n"
-+msgstr "사용법: nmcli monitor\n"
- "\n"
- "네트워크 관리자 변경 사항을 모니터링합니다.\n"
- "네트워크 관리자에 변경이 발생할 때마다 행을 출력합니다.\n"
- "\n"
-
--#: ../clients/cli/general.c:492
-+#: ../clients/cli/general.c:481
- msgid "NetworkManager status"
- msgstr "네트워크 관리 상태"
-
--#: ../clients/cli/general.c:496
-+#: ../clients/cli/general.c:485
- #, c-format
- msgid "Error: only these fields are allowed: %s"
- msgstr "오류: 다음 필드만 허용됨: %s"
-
--#: ../clients/cli/general.c:549
-+#. NetworkManager quit while we were waiting.
-+#: ../clients/cli/general.c:541 ../clients/tui/nmtui.c:246
-+#, c-format
-+msgid "NetworkManager is not running."
-+msgstr "NetworkManager가 실행되고 있지 않습니다."
-+
-+#: ../clients/cli/general.c:563
- msgid "NetworkManager permissions"
- msgstr "NetworkManager 권한"
-
--#: ../clients/cli/general.c:553
-+#: ../clients/cli/general.c:567
- #, c-format
- msgid "Error: 'general permissions': %s"
- msgstr "오류: 'general permissions': %s"
-
--#: ../clients/cli/general.c:642
-+#: ../clients/cli/general.c:644
-+#, c-format
-+msgid "Error: invalid reload flag '%s'. Allowed flags are: %s"
-+msgstr "오류 : 잘못된 재로드 플래그 ' %s '. 허용되는 플래그는 다음과 같습니다. %s"
-+
-+#: ../clients/cli/general.c:655
-+#, c-format
-+msgid "Error: extra argument '%s'"
-+msgstr "오류 : 추가 인수 ' %s '"
-+
-+#: ../clients/cli/general.c:670
-+#, c-format
-+msgid "Error: failed to reload: %s"
-+msgstr "오류 : 다시로드하지 못했습니다 : %s"
-+
-+#: ../clients/cli/general.c:708
- msgid "NetworkManager logging"
- msgstr "NetworkManager 로깅 "
-
--#: ../clients/cli/general.c:646
-+#: ../clients/cli/general.c:712
- #, c-format
- msgid "Error: 'general logging': %s"
- msgstr "오류: 'general logging': %s"
-
--#: ../clients/cli/general.c:728
-+#: ../clients/cli/general.c:744
- #, c-format
- msgid "Error: failed to set logging: %s"
- msgstr "오류: 로깅 설정 실패: %s"
-
--#: ../clients/cli/general.c:745
-+#: ../clients/cli/general.c:834
- #, c-format
- msgid "Error: failed to set hostname: %s"
- msgstr "오류: 호스트 이름 설정 실패: %s"
-
--#: ../clients/cli/general.c:814
-+#: ../clients/cli/general.c:895
- #, c-format
- msgid "Error: '--fields' value '%s' is not valid here (allowed field: %s)"
- msgstr "오류: '--fields' 값 '%s'은(는) 올바르지 않습니다 (허용되는 필드: %s)"
-
--#: ../clients/cli/general.c:839
-+#: ../clients/cli/general.c:920
- #, c-format
- msgid "Error: invalid '%s' argument: '%s' (use on/off)."
- msgstr "오류: 잘못된 '%s' 인수입니다: '%s' (on/off 사용)."
-
-+#: ../clients/cli/general.c:943
-+#, c-format
-+msgid "Error: failed to set networking: %s"
-+msgstr "오류 : 네트워킹을 설정하지 못했습니다 : %s"
-+
- #. no arguments -> get current state
--#: ../clients/cli/general.c:887 ../clients/cli/general.c:899
-+#: ../clients/cli/general.c:988 ../clients/cli/general.c:1000
- msgid "Connectivity"
- msgstr "연결 관련 "
-
--#: ../clients/cli/general.c:902
-+#: ../clients/cli/general.c:1003
- #, c-format
- msgid "Error: 'networking' command '%s' is not valid."
- msgstr "오류: 'networking' 명령 '%s'이 올바르지 않습니다."
-
--#: ../clients/cli/general.c:916
-+#: ../clients/cli/general.c:1015
- msgid "Networking"
- msgstr "네트워킹"
-
- #. no argument, show all radio switches
--#: ../clients/cli/general.c:951
-+#: ../clients/cli/general.c:1043
- msgid "Radio switches"
- msgstr "라디오 스위치 "
-
-+#: ../clients/cli/general.c:1068
-+#, c-format
-+msgid "Error: failed to set Wi-Fi radio: %s"
-+msgstr "오류 : Wi-Fi 라디오를 설정하지 못했습니다 : %s"
-+
- #. no argument, show current Wi-Fi state
--#: ../clients/cli/general.c:981
-+#: ../clients/cli/general.c:1086
- msgid "Wi-Fi radio switch"
- msgstr "Wi-Fi 라디오 스위치 "
-
- #. no argument, show current WWAN (mobile broadband) state
--#: ../clients/cli/general.c:1008
-+#: ../clients/cli/general.c:1122
- msgid "WWAN radio switch"
- msgstr "WWAN 라디오 스위치 "
-
--#: ../clients/cli/general.c:1056
-+#: ../clients/cli/general.c:1162
- msgid "NetworkManager has started"
- msgstr "NetworkManager가 시작되었습니다."
-
--#: ../clients/cli/general.c:1056
-+#: ../clients/cli/general.c:1162
- msgid "NetworkManager has stopped"
- msgstr "NetworkManager가 중지되었습니다."
-
--#: ../clients/cli/general.c:1067
-+#: ../clients/cli/general.c:1173
- #, c-format
- msgid "Hostname set to '%s'\n"
- msgstr "호스트 이름이 '%s'(으)로 설정되었습니다.\n"
-
--#: ../clients/cli/general.c:1082
-+#: ../clients/cli/general.c:1188
- #, c-format
- msgid "'%s' is now the primary connection\n"
- msgstr "'%s'이(가) 이제 1차 연결입니다.\n"
-
--#: ../clients/cli/general.c:1084
-+#: ../clients/cli/general.c:1190
- #, c-format
- msgid "There's no primary connection\n"
- msgstr "1차 연결이 없습니다.\n"
-
--#: ../clients/cli/general.c:1096
-+#: ../clients/cli/general.c:1202
- #, c-format
- msgid "Connectivity is now '%s'\n"
- msgstr "연결이 이제 '%s'입니다.\n"
-
--#: ../clients/cli/general.c:1110
-+#: ../clients/cli/general.c:1216
- #, c-format
- msgid "Networkmanager is now in the '%s' state\n"
- msgstr "Networkmanager가 이제 '%s' 상태입니다.\n"
-
--#: ../clients/cli/general.c:1130
-+#: ../clients/cli/general.c:1236
- msgid "connection available"
- msgstr "연결 가능"
-
--#: ../clients/cli/general.c:1132
-+#: ../clients/cli/general.c:1238
- msgid "connections available"
- msgstr "사용 가능한 연결"
-
--#: ../clients/cli/general.c:1150
-+#: ../clients/cli/general.c:1256
- msgid "autoconnect"
- msgstr "자동연결"
-
--#: ../clients/cli/general.c:1152
-+#: ../clients/cli/general.c:1258
- msgid "fw missing"
- msgstr "fw 누락"
-
--#: ../clients/cli/general.c:1157
-+#: ../clients/cli/general.c:1263
- msgid "plugin missing"
- msgstr "플러그인 누락"
-
--#: ../clients/cli/general.c:1162
-+#: ../clients/cli/general.c:1273 ../clients/cli/general.c:1287
-+msgid "sw disabled"
-+msgstr "sw 비활성화"
-+
-+#: ../clients/cli/general.c:1278 ../clients/cli/general.c:1292
-+msgid "hw disabled"
-+msgstr "hw 비활성화"
-+
-+#: ../clients/cli/general.c:1303
- msgid "sw"
- msgstr "남"
-
--#: ../clients/cli/general.c:1164
-+#: ../clients/cli/general.c:1305
- msgid "hw"
- msgstr "hw"
-
--#: ../clients/cli/general.c:1169
-+#: ../clients/cli/general.c:1310
- msgid "iface"
- msgstr "Iface"
-
--#: ../clients/cli/general.c:1172
-+#: ../clients/cli/general.c:1313
- msgid "port"
- msgstr "포트 "
-
--#: ../clients/cli/general.c:1175
-+#: ../clients/cli/general.c:1316
- msgid "mtu"
- msgstr "mtu"
-
--#: ../clients/cli/general.c:1192
-+#: ../clients/cli/general.c:1333
- msgid "master"
- msgstr "석사"
-
--#: ../clients/cli/general.c:1196 ../clients/tui/nm-editor-utils.c:247
--#: ../clients/tui/nmt-connect-connection-list.c:406
-+#: ../clients/cli/general.c:1337 ../clients/tui/nm-editor-utils.c:230
-+#: ../clients/tui/nmt-connect-connection-list.c:394
- msgid "VPN"
- msgstr "VPN"
-
--#: ../clients/cli/general.c:1198
-+#: ../clients/cli/general.c:1339
- msgid "ip4 default"
- msgstr "ip4 기본값"
-
--#: ../clients/cli/general.c:1200
-+#: ../clients/cli/general.c:1341
- msgid "ip6 default"
- msgstr "ip6 기본값"
-
--#: ../clients/cli/general.c:1282
-+#: ../clients/cli/general.c:1417
- #, c-format
- msgid "%s VPN connection"
- msgstr "VPN 연결 %s"
-
--#: ../clients/cli/general.c:1350
-+#. TRANSLATORS: prints header line for activated device in plain `nmcli` overview output as
-+#. * "<interface-name>: <device-state> to <connection-id>"
-+#: ../clients/cli/general.c:1436
-+#, c-format
-+msgctxt "nmcli-overview"
-+msgid "%s: %s to %s"
-+msgstr "에"
-+
-+#. TRANSLATORS: prints header line for not active device in plain `nmcli` overview output as
-+#. * "<interface-name>: <device-state>"
-+#: ../clients/cli/general.c:1443
-+#, c-format
-+msgctxt "nmcli-overview"
-+msgid "%s: %s"
-+msgstr "%s: %s"
-+
-+#: ../clients/cli/general.c:1493
- #, c-format
- msgid ""
- "Use \"nmcli device show\" to get complete information about known devices "
-@@ -3384,22 +3362,19 @@ msgid ""
- "\n"
- "Consult nmcli(1) and nmcli-examples(7) manual pages for complete usage "
- "details.\n"
--msgstr ""
--"알려진 장치에 대한 완전한 정보를 얻으려면 \"nmcli device show\"를 사용하고 활성 연결 프로필에 대한 개요를 보려면 "
--"\"nmcli connection show\"를 사용하십시오. 자세한 사용법은 nmcli (1) 및 nmcli-examples (5) "
--"매뉴얼 페이지를 참조하십시오.\n"
-+msgstr "알려진 장치에 대한 완전한 정보를 얻으려면 \"nmcli device show\"를 사용하고 활성 연결 프로필에 대한 개요를 보려면 \"nmcli connection show\"를 사용하십시오. 자세한 사용법은 nmcli (1) 및 nmcli-examples (5) 매뉴얼 페이지를 참조하십시오.\n"
-
--#: ../clients/cli/general.c:1371
-+#: ../clients/cli/general.c:1509
- #, c-format
- msgid "Error: 'monitor' command '%s' is not valid."
- msgstr "오류: 'monitor' 명령 '%s'이(가) 유효하지 않습니다."
-
--#: ../clients/cli/general.c:1383
-+#: ../clients/cli/general.c:1521
- msgid "Networkmanager is not running (waiting for it)\n"
- msgstr "Networkmanager가 실행 중이 아닙니다(대기 중).\n"
-
--#: ../clients/cli/nmcli.c:244
--#, fuzzy, c-format
-+#: ../clients/cli/nmcli.c:233
-+#, c-format
- msgid ""
- "Usage: nmcli [OPTIONS] OBJECT { COMMAND | help }\n"
- "\n"
-@@ -3429,885 +3404,900 @@ msgid ""
- " a[gent] NetworkManager secret agent or polkit agent\n"
- " m[onitor] monitor NetworkManager changes\n"
- "\n"
--msgstr ""
--"사용법 : nmcli [OPTIONS] OBJECT {COMMAND | help} 옵션 -o [verview] 개요 모드 (기본값 숨김) "
--"-t [erse] 간결한 출력 -p [retty] 예쁜 출력 -m [ode] 표 형식 | 다중 행 출력 모드 -c [olors] auto "
--"| yes | no 출력에서 색상을 사용합니다. -f [ields] <field1,field2,...>| all | common 출력 할 "
--"필드 지정 -g [et-values] <field1,field2,...>| -m tabular -t에 대한 공통적 인 단축키 -t -f -"
--"e [scape] yes | escape 열 구분 기호 값 -a [sk] 누락 된 매개 변수 요청 -s [how-secrets] 암호 "
--"표시 허용 -w [ait] <seconds> 종료 작업을 기다리는 시간 초과 설정 -"
--"v [ersion] 프로그램 버전 표시 -h [elp]이 도움말 인쇄 OBJECT g [eneral] NetworkManager의 일반 "
--"상태 및 작업 n [네트워킹] 전체 네트워킹 제어 r [adio] NetworkManager 라디오 스위치 c [onnection] "
--"NetworkManager의 연결 d [evice] NetworkManager가 관리하는 장치 a [gent] NetworkManager "
--"비밀 에이전트 또는 polkit 에이전트 m [onitor]는 NetworkManager의 변경 사항을 모니터링합니다.\n"
-+msgstr "사용법 : nmcli [OPTIONS] OBJECT { COMMAND | help } 옵션 -a, --ask 매개 변수 누락 요청 -c, --colors auto | yes | 출력에 색상을 사용할지 여부 -e, --escape yes | 값에 이스케이프 열 구분 기호 없음 -f, --fields <field,...> | all | common 출력 할 필드 지정 -g, --get-values <field,...> |-| m 표 형식 -t -f -h에 대한 모든 단축키 -m, --mode 표 형식 | 여러 줄 출력 모드 -o,-개요 개요 모드 -p,-예쁜 출력- s, --show-secrets를 사용하면 비밀번호를 표시 할 수 있습니다. -t, --terter terse output -v, --version show program version -w, --wait <seconds> 종료 작업을 기다리는 시간 초과 설정 개체 g [일반] NetworkManager의 일반 상태 및 작업 n [네트워킹] 전체 네트워킹 제어 r [adio] NetworkManager 라디오 스위치 c [onnection] NetworkManager의 연결 d [evice] NetworkManager에 의해 관리되는 장치 a [gent] NetworkManager secret 에이전트 또는 폴킷 에이전트 m [onitor] 모니터 NetworkManager 변경 사항\n"
- "\n"
-
--#: ../clients/cli/nmcli.c:324
-+#: ../clients/cli/nmcli.c:308
- #, c-format
- msgid "Error: missing argument for '%s' option."
- msgstr "오류: '%s' 옵션에 인자가 없습니다."
-
--#: ../clients/cli/nmcli.c:625
-+#: ../clients/cli/nmcli.c:621
- #, c-format
- msgid "Unexpected end of file following '%s'\n"
- msgstr "예기치 않은 파일 끝에 '%s'\n"
-
--#: ../clients/cli/nmcli.c:633
-+#: ../clients/cli/nmcli.c:629
- #, c-format
- msgid "Expected whitespace following '%s'\n"
- msgstr "예상 된 공백 다음 '%s'\n"
-
--#: ../clients/cli/nmcli.c:645
-+#: ../clients/cli/nmcli.c:641
- #, c-format
- msgid "Expected a value for '%s'\n"
- msgstr "'%s'\n"
-
--#: ../clients/cli/nmcli.c:659
-+#: ../clients/cli/nmcli.c:655
- #, c-format
- msgid "Expected a line break following '%s'\n"
- msgstr "'다음 줄 바꿈이 예상됩니다.%s'\n"
-
--#: ../clients/cli/nmcli.c:748
-+#: ../clients/cli/nmcli.c:761
- #, c-format
- msgid "Error: Option '--terse' is specified the second time."
- msgstr "오류: 옵션 '--terse'가 두번째로 설정되었습니다."
-
--#: ../clients/cli/nmcli.c:753
-+#: ../clients/cli/nmcli.c:766
- #, c-format
- msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
- msgstr "오류: 옵션 '--terse'를 '--pretty'와 함께 사용할 수 없습니다."
-
--#: ../clients/cli/nmcli.c:761
-+#: ../clients/cli/nmcli.c:774
- #, c-format
- msgid "Error: Option '--pretty' is specified the second time."
- msgstr "오류: 옵션 '--pretty'가 두번째로 설정되었습니다."
-
--#: ../clients/cli/nmcli.c:766
-+#: ../clients/cli/nmcli.c:779
- #, c-format
- msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
- msgstr "오류: 옵션 '--pretty'를 '--terse'와 함께 사용할 수 없습니다."
-
--#: ../clients/cli/nmcli.c:781
-+#: ../clients/cli/nmcli.c:794
- #, c-format
- msgid "Error: '%s' is not a valid argument for '%s' option."
- msgstr "오류: '%s'은(는) 올바른 인자가 아닙니다 ('%s' 옵션에 사용)."
-
--#: ../clients/cli/nmcli.c:795 ../clients/cli/nmcli.c:807
-+#: ../clients/cli/nmcli.c:808 ../clients/cli/nmcli.c:820
- #, c-format
- msgid "Error: '%s' is not valid argument for '%s' option."
- msgstr "오류: '%s'은(는) 올바른 인자가 아닙니다 ('%s' 옵션에 사용)."
-
--#: ../clients/cli/nmcli.c:831
-+#: ../clients/cli/nmcli.c:844
- #, c-format
- msgid "Error: '%s' is not a valid timeout."
- msgstr "오류 : '%s' 유효한 시간 초과가 아닙니다."
-
--#: ../clients/cli/nmcli.c:838
-+#: ../clients/cli/nmcli.c:851
- #, c-format
- msgid "nmcli tool, version %s\n"
- msgstr "nmcli 도구, 버전 %s\n"
-
--#: ../clients/cli/nmcli.c:846
-+#: ../clients/cli/nmcli.c:859
- #, c-format
- msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
- msgstr "오류: '%s' 옵션은 알려져 있지 않습니다. 'nmcli -help'를 해 보십시오."
-
--#: ../clients/cli/nmcli.c:902 ../clients/cli/nmcli.c:909
-+#: ../clients/cli/nmcli.c:915 ../clients/cli/nmcli.c:922
- #, c-format
- msgid "Error: nmcli terminated by signal %s (%d)"
- msgstr "오류 : 신호로 nmcli 종료 됨 %s (%d)"
-
--#: ../clients/cli/nmcli.c:975
-+#: ../clients/cli/nmcli.c:990
- msgid "Success"
- msgstr "성공"
-
--#: ../clients/cli/polkit-agent.c:68
--#, c-format
--msgid "Authentication message: %s\n"
--msgstr "인증 메시지: %s\n"
--
--#: ../clients/cli/polkit-agent.c:76
-+#: ../clients/cli/polkit-agent.c:41
- #, c-format
--msgid "Authentication error: %s\n"
--msgstr "인증 오류: %s\n"
-+msgid "Error: polkit agent failed: %s\n"
-+msgstr "오류 : 폴킷 에이전트 실패 : %s\n"
-
--#: ../clients/cli/polkit-agent.c:136
-+#: ../clients/cli/polkit-agent.c:99
- #, c-format
- msgid "Warning: polkit agent initialization failed: %s\n"
- msgstr "경고: polkit 에이전트 초기화 실패: %s\n"
-
--#: ../clients/cli/settings.c:46
-+#: ../clients/cli/settings.c:32
- #, c-format
- msgid "Do you also want to set '%s' to '%s'? [yes]: "
- msgstr "'%s'을 '%s'에 설정하시겠습니까? [예]:"
-
--#: ../clients/cli/settings.c:48
-+#: ../clients/cli/settings.c:34
- #, c-format
- msgid "Do you also want to clear '%s'? [yes]: "
- msgstr "'%s'을 삭제하시겠습니까? [예]: "
-
--#: ../clients/cli/settings.c:243
-+#: ../clients/cli/settings.c:229
- #, c-format
- msgid ""
- "Warning: %s.%s set to '%s', but it might be ignored in infrastructure mode\n"
- msgstr "경고: %s.%s(이)가 '%s'(으)로 설정되어 있지만, 인프라 모드에서는 무시될 수 있습니다.\n"
-
--#: ../clients/cli/settings.c:262
-+#: ../clients/cli/settings.c:248
- #, c-format
- msgid "Warning: setting %s.%s requires removing ipv4 and ipv6 settings\n"
- msgstr "경고: 설정 %s.%s의 경우 ipv4 및 ipv6 설정을 제거해야 합니다.\n"
-
--#: ../clients/cli/settings.c:264
-+#: ../clients/cli/settings.c:250
- msgid "Do you want to remove them? [yes] "
- msgstr "제거하시겠습니까? [예] "
-
--#: ../clients/cli/settings.c:352
-+#: ../clients/cli/settings.c:338
- #, c-format
- msgid "Warning: %s is not an UUID of any existing connection profile\n"
- msgstr "경고: %s은(는) 기존 연결 프로필의 UUID가 아닙니다.\n"
-
--#: ../clients/cli/settings.c:357 ../clients/cli/settings.c:370
-+#: ../clients/cli/settings.c:343 ../clients/cli/settings.c:356
- #, c-format
- msgid "'%s' is not a VPN connection profile"
- msgstr "'%s'은(는) VPN 연결 프로파일이 아닙니다."
-
--#: ../clients/cli/settings.c:364
-+#: ../clients/cli/settings.c:350
- #, c-format
- msgid "'%s' is not a name of any exiting profile"
- msgstr "'%s'은(는) 기존 프로파일의 이름이 아닙니다."
-
--#: ../clients/cli/settings.c:408
-+#: ../clients/cli/settings.c:394
- #, c-format
- msgid "Warning: %s\n"
- msgstr "경고: %s\n"
-
--#: ../clients/cli/settings.c:411
--#, fuzzy, c-format
-+#: ../clients/cli/settings.c:397
-+#, c-format
- msgid "Info: %s\n"
--msgstr "오류: %s\n"
-+msgstr "정보 : %s\n"
-
--#: ../clients/cli/settings.c:504
-+#: ../clients/cli/settings.c:488
- msgid "don't know how to get the property value"
- msgstr "속성 값을 가져오는 방법을 모릅니다 "
-
--#: ../clients/cli/settings.c:593
-+#: ../clients/cli/settings.c:578
- msgid "the property can't be changed"
- msgstr "속성을 변경할 수 없습니다 "
-
--#: ../clients/cli/settings.c:671
-+#: ../clients/cli/settings.c:656
- msgid "[NM property description]"
- msgstr "[NM 속성 설명]"
-
--#: ../clients/cli/settings.c:681
-+#: ../clients/cli/settings.c:666
- msgid "[nmcli specific description]"
- msgstr "[nmcli 상세 설명]"
-
--#: ../clients/cli/utils.c:318
-+#: ../clients/cli/utils.c:304
- #, c-format
- msgid "Error: Argument '%s' was expected, but '%s' provided."
- msgstr "오류: 인수 '%s'가 필요하지만 '%s'가 지정되었습니다."
-
--#: ../clients/cli/utils.c:321
-+#: ../clients/cli/utils.c:307
- #, c-format
- msgid "Error: Unexpected argument '%s'"
- msgstr "오류: 예상치 못한 인수 '%s'"
-
--#: ../clients/cli/utils.c:709
--#, fuzzy, c-format
-+#: ../clients/cli/utils.c:691
-+#, c-format
- msgid "invalid field '%s%s%s'; no such field"
--msgstr "잘못된 필드 '%s'; 허용되는 필드: %s"
-+msgstr "잘못된 입력란 ' %s%s%s '; 그런 분야는 없다"
-
--#: ../clients/cli/utils.c:713
--#, fuzzy, c-format
-+#: ../clients/cli/utils.c:695
-+#, c-format
- msgid "invalid field '%s%s%s'; allowed fields: [%s]"
--msgstr "잘못된 필드 '%s'; 허용되는 필드: %s"
-+msgstr "invalid field '%s%s%s'; allowed fields: [%s]"
-
--#: ../clients/cli/utils.c:809
--#, fuzzy, c-format
-+#: ../clients/cli/utils.c:791
-+#, c-format
- msgid "failure to select field"
--msgstr "지정한 APN 선택에 실패했습니다"
-+msgstr "필드를 선택하지 못했습니다"
-
--#: ../clients/cli/utils.c:1438
-+#: ../clients/cli/utils.c:1427
- #, c-format
- msgid "Error reading nmcli output: %s\n"
- msgstr "nmcli 출력을 읽는 중 오류가 발생했습니다 : %s\n"
-
--#: ../clients/cli/utils.c:1443
-+#: ../clients/cli/utils.c:1432
- #, c-format
- msgid "Error writing nmcli output: %s\n"
- msgstr "nmcli 출력을 쓰는 중 오류가 발생했습니다 : %s\n"
-
--#: ../clients/cli/utils.c:1469
-+#: ../clients/cli/utils.c:1458
- #, c-format
- msgid "Failed to create pager pipe: %s\n"
- msgstr "호출기 파이프를 만들지 못했습니다. %s\n"
-
--#: ../clients/cli/utils.c:1478
-+#: ../clients/cli/utils.c:1467
- #, c-format
- msgid "Failed to fork pager: %s\n"
- msgstr "호출기를 포크하는 데 실패했습니다. %s\n"
-
--#: ../clients/cli/utils.c:1525 ../clients/cli/utils.c:1529
-+#: ../clients/cli/utils.c:1514 ../clients/cli/utils.c:1518
- #, c-format
- msgid "Failed to duplicate pager pipe: %s\n"
- msgstr "호출기 파이프를 복제하지 못했습니다. %s\n"
-
--#: ../clients/cli/utils.h:303 ../clients/common/nm-meta-setting-desc.c:4123
-+#: ../clients/cli/utils.h:300 ../clients/common/nm-meta-setting-desc.c:4129
- msgid "on"
- msgstr "켜짐"
-
--#: ../clients/cli/utils.h:303 ../clients/common/nm-meta-setting-desc.c:4125
-+#: ../clients/cli/utils.h:300 ../clients/common/nm-meta-setting-desc.c:4130
- msgid "off"
- msgstr "꺼짐"
-
--#: ../clients/cli/utils.h:329
-+#: ../clients/cli/utils.h:326
- #, c-format
- msgid "%lld (%s)"
- msgstr "%lld (%s)"
-
--#: ../clients/cli/utils.h:336
-+#: ../clients/cli/utils.h:333
- #, c-format
- msgid "%lld - %s"
- msgstr "%lld - %s"
-
- #. TRANSLATORS: the first %s is the partial value entered by
- #. * the user, the second %s a list of compatible values.
--#.
--#: ../clients/common/nm-client-utils.c:121
--#: ../clients/common/nm-client-utils.c:152
-+#.
-+#: ../clients/common/nm-client-utils.c:109
-+#: ../clients/common/nm-client-utils.c:140
- #, c-format
- msgid "'%s' is ambiguous (%s)"
- msgstr "'%s'이(가) 불분명합니다(%s)."
-
--#: ../clients/common/nm-client-utils.c:131
-+#: ../clients/common/nm-client-utils.c:119
- #, c-format
- msgid "'%s' is not valid; use [%s] or [%s]"
- msgstr "'%s'는 올바르지 않습니다; [%s] 또는 [%s]를 사용합니다 "
-
--#: ../clients/common/nm-client-utils.c:164
-+#: ../clients/common/nm-client-utils.c:152
- #, c-format
- msgid "'%s' is not valid; use [%s], [%s] or [%s]"
- msgstr "'%s'이(가) 유효하지 않습니다. [%s], [%s] 또는 [%s]을(를) 사용하십시오."
-
--#: ../clients/common/nm-client-utils.c:213
-+#: ../clients/common/nm-client-utils.c:201
- #, c-format
- msgid "'%s' is ambiguous: %s"
- msgstr "'%s'이(가) 불분명합니다(%s)."
-
--#: ../clients/common/nm-client-utils.c:223
-+#: ../clients/common/nm-client-utils.c:211
- #, c-format
- msgid "missing name, try one of [%s]"
- msgstr "이름이 누락되어 있습니다, [%s] 중 하나를 시도합니다 "
-
--#: ../clients/common/nm-client-utils.c:265
-+#: ../clients/common/nm-client-utils.c:253
- msgid "unmanaged"
- msgstr "관리되지 않음"
-
--#: ../clients/common/nm-client-utils.c:266
-+#: ../clients/common/nm-client-utils.c:254
- msgid "unavailable"
- msgstr "사용할 수 없음"
-
--#: ../clients/common/nm-client-utils.c:268
-+#: ../clients/common/nm-client-utils.c:256
- msgid "connecting (prepare)"
- msgstr "연결 중 (준비)"
-
--#: ../clients/common/nm-client-utils.c:269
-+#: ../clients/common/nm-client-utils.c:257
- msgid "connecting (configuring)"
- msgstr "연결 중 (설정중)"
-
--#: ../clients/common/nm-client-utils.c:270
-+#: ../clients/common/nm-client-utils.c:258
- msgid "connecting (need authentication)"
- msgstr "연결 중 (인증 필요)"
-
--#: ../clients/common/nm-client-utils.c:271
-+#: ../clients/common/nm-client-utils.c:259
- msgid "connecting (getting IP configuration)"
- msgstr "연결 중 (IP 설정 가져오는 중)"
-
--#: ../clients/common/nm-client-utils.c:272
-+#: ../clients/common/nm-client-utils.c:260
- msgid "connecting (checking IP connectivity)"
- msgstr "연결 중 (IP 연결 확인하는 중)"
-
--#: ../clients/common/nm-client-utils.c:273
-+#: ../clients/common/nm-client-utils.c:261
- msgid "connecting (starting secondary connections)"
- msgstr "연결 중 (보조 연결 시작하는 중)"
-
--#: ../clients/common/nm-client-utils.c:276
-+#: ../clients/common/nm-client-utils.c:264
- msgid "connection failed"
- msgstr "연결 실패함"
-
--#: ../clients/common/nm-client-utils.c:284
-+#: ../clients/common/nm-client-utils.c:271
-+#: ../clients/common/nm-client-utils.c:272
-+#: ../clients/common/nm-client-utils.c:273
-+#: ../clients/common/nm-client-utils.c:274
-+#: ../clients/common/nm-client-utils.c:275
-+#: ../clients/common/nm-client-utils.c:276
-+msgid "connecting (externally)"
-+msgstr "연결 (외부)"
-+
-+#: ../clients/common/nm-client-utils.c:277
-+msgid "connected (externally)"
-+msgstr "연결됨 (외부)"
-+
-+#: ../clients/common/nm-client-utils.c:278
-+#: ../clients/common/nm-client-utils.c:279
-+msgid "deactivating (externally)"
-+msgstr "비활성화 (외부)"
-+
-+#: ../clients/common/nm-client-utils.c:304
- msgid "yes (guessed)"
- msgstr "예(추정됨)"
-
--#: ../clients/common/nm-client-utils.c:285
-+#: ../clients/common/nm-client-utils.c:305
- msgid "no (guessed)"
- msgstr "아니요(추정됨)"
-
- #. TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason)
- #. TRANSLATORS: Unknown reason for a connection state change (NMActiveConnectionStateReason)
--#: ../clients/common/nm-client-utils.c:291
--#: ../clients/common/nm-client-utils.c:364 ../libnm/nm-device.c:1438
-+#: ../clients/common/nm-client-utils.c:311
-+#: ../clients/common/nm-client-utils.c:384 ../libnm/nm-device.c:1628
- msgid "Unknown"
- msgstr "알 수 없음"
-
--#: ../clients/common/nm-client-utils.c:292
-+#: ../clients/common/nm-client-utils.c:312
- msgid "No reason given"
- msgstr "이유 없음 "
-
--#: ../clients/common/nm-client-utils.c:294
-+#: ../clients/common/nm-client-utils.c:314
- msgid "Device is now managed"
- msgstr "현재 장치가 관리되고 있습니다 "
-
--#: ../clients/common/nm-client-utils.c:295
-+#: ../clients/common/nm-client-utils.c:315
- msgid "Device is now unmanaged"
- msgstr "현재 장치가 관리되고 있지 않습니다 "
-
--#: ../clients/common/nm-client-utils.c:296
-+#: ../clients/common/nm-client-utils.c:316
- msgid "The device could not be readied for configuration"
- msgstr "설정을 위해 장치를 준비할 수 없습니다 "
-
--#: ../clients/common/nm-client-utils.c:297
-+#: ../clients/common/nm-client-utils.c:317
- msgid ""
- "IP configuration could not be reserved (no available address, timeout, etc.)"
- msgstr "IP 설정을 예약할 수 없습니다 (사용 가능한 주소 없음, 시간 제한 등)"
-
--#: ../clients/common/nm-client-utils.c:298
-+#: ../clients/common/nm-client-utils.c:318
- msgid "The IP configuration is no longer valid"
- msgstr "더이상 IP 설정이 유효하지 않습니다 "
-
--#: ../clients/common/nm-client-utils.c:299
-+#: ../clients/common/nm-client-utils.c:319
- msgid "Secrets were required, but not provided"
- msgstr "비밀 데이터가 필요하지만 전송되지 않았습니다"
-
--#: ../clients/common/nm-client-utils.c:300
-+#: ../clients/common/nm-client-utils.c:320
- msgid "802.1X supplicant disconnected"
- msgstr "802.1X 요청의 연결이 끊겼습니다"
-
--#: ../clients/common/nm-client-utils.c:301
-+#: ../clients/common/nm-client-utils.c:321
- msgid "802.1X supplicant configuration failed"
- msgstr "802.1X 요청 설정에 실패했습니다."
-
--#: ../clients/common/nm-client-utils.c:302
-+#: ../clients/common/nm-client-utils.c:322
- msgid "802.1X supplicant failed"
- msgstr "802.1X 요청에 실패했습니다"
-
--#: ../clients/common/nm-client-utils.c:303
-+#: ../clients/common/nm-client-utils.c:323
- msgid "802.1X supplicant took too long to authenticate"
- msgstr "802.1X 요청이 인증에 너무 오래 걸립니다"
-
--#: ../clients/common/nm-client-utils.c:304
-+#: ../clients/common/nm-client-utils.c:324
- msgid "PPP service failed to start"
- msgstr "PPP 서비스 시작해 실패했습니다"
-
--#: ../clients/common/nm-client-utils.c:305
-+#: ../clients/common/nm-client-utils.c:325
- msgid "PPP service disconnected"
- msgstr "PPP 서비스 연결이 끊어졌습니다"
-
--#: ../clients/common/nm-client-utils.c:306
-+#: ../clients/common/nm-client-utils.c:326
- msgid "PPP failed"
- msgstr "PPP 동작 실패"
-
--#: ../clients/common/nm-client-utils.c:307
-+#: ../clients/common/nm-client-utils.c:327
- msgid "DHCP client failed to start"
- msgstr "DHCP 클라이언트 시작에 실패했습니다"
-
--#: ../clients/common/nm-client-utils.c:308
-+#: ../clients/common/nm-client-utils.c:328
- msgid "DHCP client error"
- msgstr "DHCP 클라이언트 오류"
-
--#: ../clients/common/nm-client-utils.c:309
-+#: ../clients/common/nm-client-utils.c:329
- msgid "DHCP client failed"
- msgstr "DHCP 클라이언트 동작에 실패했습니다"
-
--#: ../clients/common/nm-client-utils.c:310
-+#: ../clients/common/nm-client-utils.c:330
- msgid "Shared connection service failed to start"
- msgstr "연결 공유 서비스 시작에 실패했습니다"
-
--#: ../clients/common/nm-client-utils.c:311
-+#: ../clients/common/nm-client-utils.c:331
- msgid "Shared connection service failed"
- msgstr "연결 공유 서비스 동작에 실패했습니다"
-
--#: ../clients/common/nm-client-utils.c:312
-+#: ../clients/common/nm-client-utils.c:332
- msgid "AutoIP service failed to start"
- msgstr "자동IP 서비스 시작에 실패했습니다"
-
--#: ../clients/common/nm-client-utils.c:313
-+#: ../clients/common/nm-client-utils.c:333
- msgid "AutoIP service error"
- msgstr "자동IP 서비스 오류"
-
--#: ../clients/common/nm-client-utils.c:314
-+#: ../clients/common/nm-client-utils.c:334
- msgid "AutoIP service failed"
- msgstr "자동IP 서비스 동작에 실패했습니다"
-
--#: ../clients/common/nm-client-utils.c:315
-+#: ../clients/common/nm-client-utils.c:335
- msgid "The line is busy"
- msgstr "회선 사용 중 "
-
--#: ../clients/common/nm-client-utils.c:316
-+#: ../clients/common/nm-client-utils.c:336
- msgid "No dial tone"
- msgstr "전화 걸기 신호음 없음"
-
--#: ../clients/common/nm-client-utils.c:317
-+#: ../clients/common/nm-client-utils.c:337
- msgid "No carrier could be established"
- msgstr "서비스에 연결할 수 없습니다"
-
--#: ../clients/common/nm-client-utils.c:318
-+#: ../clients/common/nm-client-utils.c:338
- msgid "The dialing request timed out"
- msgstr "전화 걸기 요청 시간을 초과했습니다"
-
--#: ../clients/common/nm-client-utils.c:319
-+#: ../clients/common/nm-client-utils.c:339
- msgid "The dialing attempt failed"
- msgstr "전화 걸기 시도에 실패했습니다"
-
--#: ../clients/common/nm-client-utils.c:320
-+#: ../clients/common/nm-client-utils.c:340
- msgid "Modem initialization failed"
- msgstr "모뎀 초기화 실패"
-
--#: ../clients/common/nm-client-utils.c:321
-+#: ../clients/common/nm-client-utils.c:341
- msgid "Failed to select the specified APN"
- msgstr "지정한 APN 선택에 실패했습니다"
-
--#: ../clients/common/nm-client-utils.c:322
-+#: ../clients/common/nm-client-utils.c:342
- msgid "Not searching for networks"
- msgstr "네트워크 검색 요소가 없습니다"
-
--#: ../clients/common/nm-client-utils.c:323
-+#: ../clients/common/nm-client-utils.c:343
- msgid "Network registration denied"
- msgstr "네트워크 등록이 거부되었습니다"
-
--#: ../clients/common/nm-client-utils.c:324
-+#: ../clients/common/nm-client-utils.c:344
- msgid "Network registration timed out"
- msgstr "네트워크 등록 시간을 초과했습니다"
-
--#: ../clients/common/nm-client-utils.c:325
-+#: ../clients/common/nm-client-utils.c:345
- msgid "Failed to register with the requested network"
- msgstr "요청 받은 네트워크 등록에 실패했습니다"
-
--#: ../clients/common/nm-client-utils.c:326
-+#: ../clients/common/nm-client-utils.c:346
- msgid "PIN check failed"
- msgstr "PIN 확인 실패"
-
--#: ../clients/common/nm-client-utils.c:327
-+#: ../clients/common/nm-client-utils.c:347
- msgid "Necessary firmware for the device may be missing"
- msgstr "필요한 장치 펌웨어가 누락되어 있습니다 "
-
--#: ../clients/common/nm-client-utils.c:328
-+#: ../clients/common/nm-client-utils.c:348
- msgid "The device was removed"
- msgstr "장치가 제거되었습니다 "
-
--#: ../clients/common/nm-client-utils.c:329
-+#: ../clients/common/nm-client-utils.c:349
- msgid "NetworkManager went to sleep"
- msgstr "네트워크 관리자가 슬립 상태에 있습니다 "
-
--#: ../clients/common/nm-client-utils.c:330
-+#: ../clients/common/nm-client-utils.c:350
- msgid "The device's active connection disappeared"
- msgstr "장치의 활성 연결이 사라졌습니다 "
-
--#: ../clients/common/nm-client-utils.c:331
-+#: ../clients/common/nm-client-utils.c:351
- msgid "Device disconnected by user or client"
- msgstr "사용자 또는 클라이언트에 의해 장치 연결이 끊어졌습니다"
-
--#: ../clients/common/nm-client-utils.c:332
-+#: ../clients/common/nm-client-utils.c:352
- msgid "Carrier/link changed"
- msgstr "캐리어/링크 변경됨 "
-
--#: ../clients/common/nm-client-utils.c:333
-+#: ../clients/common/nm-client-utils.c:353
- msgid "The device's existing connection was assumed"
- msgstr "장치의 기존 연결을 가정합니다"
-
--#: ../clients/common/nm-client-utils.c:334
-+#: ../clients/common/nm-client-utils.c:354
- msgid "The supplicant is now available"
- msgstr "요청자를 지금 사용할 수 있습니다 "
-
--#: ../clients/common/nm-client-utils.c:335
-+#: ../clients/common/nm-client-utils.c:355
- msgid "The modem could not be found"
- msgstr "모뎀을 찾을 수 없습니다"
-
--#: ../clients/common/nm-client-utils.c:336
-+#: ../clients/common/nm-client-utils.c:356
- msgid "The Bluetooth connection failed or timed out"
- msgstr "블루투스 연결에 실패 또는 시간 초과했습니다"
-
--#: ../clients/common/nm-client-utils.c:337
-+#: ../clients/common/nm-client-utils.c:357
- msgid "GSM Modem's SIM card not inserted"
- msgstr "GSM 모뎀의 SIM 카드를 삽입하지 않았습니다 "
-
--#: ../clients/common/nm-client-utils.c:338
-+#: ../clients/common/nm-client-utils.c:358
- msgid "GSM Modem's SIM PIN required"
- msgstr "GSM 모뎀의 SIM PIN이 필요합니다"
-
--#: ../clients/common/nm-client-utils.c:339
-+#: ../clients/common/nm-client-utils.c:359
- msgid "GSM Modem's SIM PUK required"
- msgstr "GSM 모뎀의 SIM PUK가 필요합니다"
-
--#: ../clients/common/nm-client-utils.c:340
-+#: ../clients/common/nm-client-utils.c:360
- msgid "GSM Modem's SIM wrong"
- msgstr "GSM 모뎀의 SIM이 잘못되었습니다 "
-
--#: ../clients/common/nm-client-utils.c:341
-+#: ../clients/common/nm-client-utils.c:361
- msgid "InfiniBand device does not support connected mode"
- msgstr "인피니밴드 장치에서 연결 모드를 지원하지 않습니다"
-
--#: ../clients/common/nm-client-utils.c:342
-+#: ../clients/common/nm-client-utils.c:362
- msgid "A dependency of the connection failed"
- msgstr "연결 의존성 설정을 실패했습니다 "
-
--#: ../clients/common/nm-client-utils.c:343
-+#: ../clients/common/nm-client-utils.c:363
- msgid "A problem with the RFC 2684 Ethernet over ADSL bridge"
- msgstr "ADSL 브리지를 통한 RFC 2684 이더넷에 문제가 있습니다 "
-
--#: ../clients/common/nm-client-utils.c:344
-+#: ../clients/common/nm-client-utils.c:364
- msgid "ModemManager is unavailable"
- msgstr "ModemManager를 사용할 수 없음 "
-
--#: ../clients/common/nm-client-utils.c:345
-+#: ../clients/common/nm-client-utils.c:365
- msgid "The Wi-Fi network could not be found"
- msgstr "Wi-Fi 네트워크를 찾을 수 없습니다 "
-
--#: ../clients/common/nm-client-utils.c:346
-+#: ../clients/common/nm-client-utils.c:366
- msgid "A secondary connection of the base connection failed"
- msgstr "기본 연결의 두 번째 연결을 실패했습니다 "
-
--#: ../clients/common/nm-client-utils.c:347
-+#: ../clients/common/nm-client-utils.c:367
- msgid "DCB or FCoE setup failed"
- msgstr "DCB 또는 FCoE 설정에 실패했습니다 "
-
--#: ../clients/common/nm-client-utils.c:348
-+#: ../clients/common/nm-client-utils.c:368
- msgid "teamd control failed"
- msgstr "teamd 제어에 실패했습니다 "
-
--#: ../clients/common/nm-client-utils.c:349
-+#: ../clients/common/nm-client-utils.c:369
- msgid "Modem failed or no longer available"
- msgstr "모뎀에 오류가 있거나 더 이상 사용 가능하지 않습니다."
-
--#: ../clients/common/nm-client-utils.c:350
-+#: ../clients/common/nm-client-utils.c:370
- msgid "Modem now ready and available"
- msgstr "모뎀이 이제 준비되었으며 사용 가능합니다."
-
--#: ../clients/common/nm-client-utils.c:351
-+#: ../clients/common/nm-client-utils.c:371
- msgid "SIM PIN was incorrect"
- msgstr "SIM PIN이 잘못되었습니다"
-
--#: ../clients/common/nm-client-utils.c:352
-+#: ../clients/common/nm-client-utils.c:372
- msgid "New connection activation was enqueued"
- msgstr "새 연결 활성화가 대기열에 추가되었습니다."
-
--#: ../clients/common/nm-client-utils.c:353
-+#: ../clients/common/nm-client-utils.c:373
- msgid "The device's parent changed"
- msgstr "장치의 부모 항목이 변경되었습니다."
-
--#: ../clients/common/nm-client-utils.c:354
-+#: ../clients/common/nm-client-utils.c:374
- msgid "The device parent's management changed"
- msgstr "장치 부모 항목의 관리가 변경되었습니다."
-
--#: ../clients/common/nm-client-utils.c:355
-+#: ../clients/common/nm-client-utils.c:375
- msgid "Open vSwitch database connection failed"
- msgstr "Open vSwitch 데이터베이스 연결에 실패했습니다."
-
--#: ../clients/common/nm-client-utils.c:356
-+#: ../clients/common/nm-client-utils.c:376
- msgid "A duplicate IP address was detected"
- msgstr "중복 된 IP 주소가 감지되었습니다."
-
--#: ../clients/common/nm-client-utils.c:357
-+#: ../clients/common/nm-client-utils.c:377
- msgid "The selected IP method is not supported"
- msgstr "선택한 IP 방법이 지원되지 않습니다."
-
--#: ../clients/common/nm-client-utils.c:358
-+#: ../clients/common/nm-client-utils.c:378
- msgid "Failed to configure SR-IOV parameters"
- msgstr "SR-IOV 매개 변수를 구성하지 못했습니다."
-
--#: ../clients/common/nm-client-utils.c:359
--#, fuzzy
-+#: ../clients/common/nm-client-utils.c:379
- msgid "The Wi-Fi P2P peer could not be found"
--msgstr "Wi-Fi 네트워크를 찾을 수 없습니다 "
-+msgstr "Wi-Fi P2P 피어를 찾을 수 없습니다"
-
--#: ../clients/common/nm-client-utils.c:365
--#, fuzzy
-+#: ../clients/common/nm-client-utils.c:385
- msgid "Unknown reason"
--msgstr "알 수 없는 이유"
-+msgstr "알 수없는 이유"
-
--#: ../clients/common/nm-client-utils.c:366
--#, fuzzy
-+#: ../clients/common/nm-client-utils.c:386
- msgid "The connection was disconnected"
--msgstr "연결이 본딩 연결이 아니었습니다."
-+msgstr "연결이 끊어졌습니다"
-
--#: ../clients/common/nm-client-utils.c:367
--#, fuzzy
-+#: ../clients/common/nm-client-utils.c:387
- msgid "Disconnected by user"
--msgstr "D-Bus에 의해 연결 해제됨"
-+msgstr "사용자가 연결 해제"
-
--#: ../clients/common/nm-client-utils.c:368
--#, fuzzy
-+#: ../clients/common/nm-client-utils.c:388
- msgid "The base network connection was interrupted"
--msgstr "기반 네트워크 연결이 중지되었습니다"
-+msgstr "기본 네트워크 연결이 중단되었습니다"
-
--#: ../clients/common/nm-client-utils.c:369
--#, fuzzy
-+#: ../clients/common/nm-client-utils.c:389
- msgid "The VPN service stopped unexpectedly"
--msgstr "VPN 서비스가 예기치 못하게 중단되었습니다"
-+msgstr "VPN 서비스가 예기치 않게 중지되었습니다"
-
--#: ../clients/common/nm-client-utils.c:370
--#, fuzzy
-+#: ../clients/common/nm-client-utils.c:390
- msgid "The VPN service returned invalid configuration"
--msgstr "VPN 서비스가 잘못된 설정을 반환했습니다"
-+msgstr "VPN 서비스가 잘못된 구성을 반환했습니다"
-
--#: ../clients/common/nm-client-utils.c:371
--#, fuzzy
-+#: ../clients/common/nm-client-utils.c:391
- msgid "The connection attempt timed out"
--msgstr "연결 시도가 시간을 초과했습니다"
-+msgstr "연결 시도 시간이 초과되었습니다"
-
--#: ../clients/common/nm-client-utils.c:372
--#, fuzzy
-+#: ../clients/common/nm-client-utils.c:392
- msgid "The VPN service did not start in time"
- msgstr "VPN 서비스가 제 시간에 시작되지 않았습니다"
-
--#: ../clients/common/nm-client-utils.c:373
--#, fuzzy
-+#: ../clients/common/nm-client-utils.c:393
- msgid "The VPN service failed to start"
--msgstr "VPN 서비스를 시작하는 데 실패했습니다"
-+msgstr "자동IP 서비스 시작에 실패했습니다"
-
--#: ../clients/common/nm-client-utils.c:374
--#, fuzzy
-+#: ../clients/common/nm-client-utils.c:394
- msgid "No valid secrets"
--msgstr "올바른 VPN 비밀 정보가 없습니다"
-+msgstr "유효한 비밀이 없습니다"
-
--#: ../clients/common/nm-client-utils.c:375
--#, fuzzy
-+#: ../clients/common/nm-client-utils.c:395
- msgid "Invalid secrets"
--msgstr "잘못된 VPN 비밀정보"
-+msgstr "잘못된 비밀"
-
--#: ../clients/common/nm-client-utils.c:376
--#, fuzzy
-+#: ../clients/common/nm-client-utils.c:396
- msgid "The connection was removed"
- msgstr "연결이 제거되었습니다"
-
--#: ../clients/common/nm-client-utils.c:377
--#, fuzzy
-+#: ../clients/common/nm-client-utils.c:397
- msgid "Master connection failed"
--msgstr "연결 실패함"
-+msgstr "마스터 연결 실패"
-
--#: ../clients/common/nm-client-utils.c:378
-+#: ../clients/common/nm-client-utils.c:398
- msgid "Could not create a software link"
- msgstr "임시 파일을 생성할 수 없음: "
-
--#: ../clients/common/nm-client-utils.c:379
--#, fuzzy
-+#: ../clients/common/nm-client-utils.c:399
- msgid "The device disappeared"
--msgstr "장치의 활성 연결이 사라졌습니다 "
-+msgstr "장치가 사라졌습니다"
-+
-+#: ../clients/common/nm-client-utils.c:722
-+msgid "missing colon for \"<setting>.<property>:<secret>\" format"
-+msgstr "missing colon for \"<setting>.<property>:<secret>\" format"
-
--#: ../clients/common/nm-meta-setting-access.c:510
-+#: ../clients/common/nm-client-utils.c:738
-+msgid "missing dot for \"<setting>.<property>:<secret>\" format"
-+msgstr "missing dot for \"<setting>.<property>:<secret>\" format"
-+
-+#: ../clients/common/nm-client-utils.c:743
-+msgid "missing setting for \"<setting>.<property>:<secret>\" format"
-+msgstr "missing setting for \"<setting>.<property>:<secret>\" format"
-+
-+#: ../clients/common/nm-client-utils.c:753
-+msgid "missing property for \"<setting>.<property>:<secret>\" format"
-+msgstr "의 속성이 누락되었습니다 <setting> . <property> : <secret> \"형식"
-+
-+#: ../clients/common/nm-client-utils.c:764
-+msgid "invalid setting name"
-+msgstr "잘못된 설정 이름 ''"
-+
-+#: ../clients/common/nm-client-utils.c:780
-+msgid "property name is not UTF-8"
-+msgstr "속성 이름이 UTF-8이 아닙니다"
-+
-+#: ../clients/common/nm-client-utils.c:795
-+#: ../clients/common/nm-client-utils.c:802
-+msgid "secret is not UTF-8"
-+msgstr "비밀은 UTF-8이 아닙니다"
-+
-+#: ../clients/common/nm-meta-setting-access.c:496
- #, c-format
- msgid "field '%s' has to be alone"
- msgstr "'%s' 필드는 혼자만 있어야만 합니다"
-
--#: ../clients/common/nm-meta-setting-access.c:525
--#, fuzzy, c-format
-+#: ../clients/common/nm-meta-setting-access.c:511
-+#, c-format
- msgid "invalid field '%s%s%s%s%s'; %s%s%s"
--msgstr "잘못된 필드 '%s'; 허용되는 필드: %s"
-+msgstr "invalid field '%s%s%s%s%s'; %s%s%s"
-
--#: ../clients/common/nm-meta-setting-desc.c:311
--#: ../clients/common/nm-meta-setting-desc.c:372
-+#: ../clients/common/nm-meta-setting-desc.c:276
-+#: ../clients/common/nm-meta-setting-desc.c:337
- #, c-format
- msgid "invalid prefix '%s'; <1-%d> allowed"
- msgstr "잘못된 접두사 '%s'; <1-%d> 허용됨 "
-
--#: ../clients/common/nm-meta-setting-desc.c:319
-+#: ../clients/common/nm-meta-setting-desc.c:284
- #, c-format
- msgid "invalid IP address: %s"
- msgstr "잘못된 IP 주소: %s"
-
--#: ../clients/common/nm-meta-setting-desc.c:344
-+#: ../clients/common/nm-meta-setting-desc.c:309
- msgid ""
--"The valid syntax is: 'ip[/prefix] [next-hop] [metric] [attribute=val]... "
--"[,ip[/prefix] ...]'"
--msgstr ""
--"유효한 구문은 다음과 같습니다. 'ip [/ prefix] [next-hop] [metric] [attribute = val] ... "
--"[, ip [/ prefix] ...]'"
-+"The valid syntax is: 'ip[/prefix] [next-hop] [metric] [attribute=val]... [,"
-+"ip[/prefix] ...]'"
-+msgstr "유효한 구문은 다음과 같습니다. 'ip [/ prefix] [next-hop] [metric] [attribute = val] ... [, ip [/ prefix] ...]'"
-
--#: ../clients/common/nm-meta-setting-desc.c:383
-+#: ../clients/common/nm-meta-setting-desc.c:348
- #, c-format
- msgid "the next hop ('%s') must be first"
- msgstr "다음 홉 ( '%s') 처음이어야한다."
-
--#: ../clients/common/nm-meta-setting-desc.c:389
-+#: ../clients/common/nm-meta-setting-desc.c:354
- #, c-format
- msgid "the metric ('%s') must be before attributes"
- msgstr "메트릭 ( '%s') 속성보다 앞에 있어야합니다."
-
--#: ../clients/common/nm-meta-setting-desc.c:437
-+#: ../clients/common/nm-meta-setting-desc.c:402
- #, c-format
- msgid "invalid route: %s. %s"
- msgstr "잘못된 경로 : %s. %s"
-
--#: ../clients/common/nm-meta-setting-desc.c:503
-+#: ../clients/common/nm-meta-setting-desc.c:468
- #, c-format
- msgid "cannot read pac-script from file '%s'"
- msgstr "파일에서 pac 스크립트를 읽을 수 없습니다 '%s'"
-
--#: ../clients/common/nm-meta-setting-desc.c:510
-+#: ../clients/common/nm-meta-setting-desc.c:475
- #, c-format
- msgid "file '%s' contains non-valid utf-8"
- msgstr "파일 '%s' 유효하지 않은 utf-8이 포함되어 있습니다."
-
--#: ../clients/common/nm-meta-setting-desc.c:523
-+#: ../clients/common/nm-meta-setting-desc.c:488
- #, c-format
- msgid "'%s' does not contain a valid PAC Script"
- msgstr "'%s' 유효한 PAC 스크립트가 없습니다."
-
--#: ../clients/common/nm-meta-setting-desc.c:526
-+#: ../clients/common/nm-meta-setting-desc.c:491
- #, c-format
- msgid "Not a valid PAC Script"
- msgstr "유효한 PAC 스크립트가 아닙니다."
-
--#: ../clients/common/nm-meta-setting-desc.c:579
-+#: ../clients/common/nm-meta-setting-desc.c:544
- #, c-format
- msgid "cannot read team config from file '%s'"
- msgstr "파일에서 팀 구성을 읽을 수 없습니다 '%s'"
-
--#: ../clients/common/nm-meta-setting-desc.c:586
-+#: ../clients/common/nm-meta-setting-desc.c:551
- #, c-format
- msgid "team config file '%s' contains non-valid utf-8"
- msgstr "팀 구성 파일 '%s' 유효하지 않은 utf-8이 포함되어 있습니다."
-
--#: ../clients/common/nm-meta-setting-desc.c:1034
-+#: ../clients/common/nm-meta-setting-desc.c:1036
- msgid "auto"
- msgstr "자동"
-
--#: ../clients/common/nm-meta-setting-desc.c:1186
-+#: ../clients/common/nm-meta-setting-desc.c:1188
- #, c-format
- msgid "%s (%s)"
- msgstr "%s (%s)"
-
--#: ../clients/common/nm-meta-setting-desc.c:1334
--#: ../clients/common/nm-meta-setting-desc.c:1338
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:1352
-+#: ../clients/common/nm-meta-setting-desc.c:1356
-+#: ../clients/common/nm-meta-setting-desc.c:4153
- msgid "'%s' is out of range [%"
--msgstr "값 '%s'이 범위 %u 밖에 있습니다"
-+msgstr "값 '%s'이 범위 밖에 있습니다"
-
--#: ../clients/common/nm-meta-setting-desc.c:1343
-+#: ../clients/common/nm-meta-setting-desc.c:1361
- #, c-format
- msgid "'%s' is not a valid number"
- msgstr "'%s' 유효한 번호가 아닙니다."
-
--#: ../clients/common/nm-meta-setting-desc.c:1400
-+#: ../clients/common/nm-meta-setting-desc.c:1418
- #, c-format
- msgid "'%s' is out of range [0, %u]"
- msgstr "값 '%s'이 범위 %u 밖에 있습니다"
-
--#: ../clients/common/nm-meta-setting-desc.c:1446
-+#: ../clients/common/nm-meta-setting-desc.c:1464
- #, c-format
- msgid "'%s' is not a valid Ethernet MAC"
- msgstr "'%s'은 올바른 이더넷 MAC이 아닙니다 "
-
--#: ../clients/common/nm-meta-setting-desc.c:1554
--#, fuzzy, c-format
-+#: ../clients/common/nm-meta-setting-desc.c:1590
-+#, c-format
- msgid "invalid option '%s', use a combination of [%s]"
--msgstr "잘못된 옵션 '%s', [%s] 중 하나를 사용하십시오."
-+msgstr "잘못된 옵션 ' %s ', [ %s ]"
-
--#: ../clients/common/nm-meta-setting-desc.c:1559 ../libnm-core/nm-keyfile.c:930
-+#: ../clients/common/nm-meta-setting-desc.c:1595
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1076
- #, c-format
- msgid "invalid option '%s', use one of [%s]"
- msgstr "잘못된 옵션 '%s', [%s] 중 하나를 사용하십시오."
-
--#: ../clients/common/nm-meta-setting-desc.c:1678
-+#: ../clients/common/nm-meta-setting-desc.c:1714
- #, c-format
- msgid "%d (key)"
- msgstr "%d(키)"
-
--#: ../clients/common/nm-meta-setting-desc.c:1680
-+#: ../clients/common/nm-meta-setting-desc.c:1716
- #, c-format
- msgid "%d (passphrase)"
- msgstr "%d(암호)"
-
--#: ../clients/common/nm-meta-setting-desc.c:1683
-+#: ../clients/common/nm-meta-setting-desc.c:1719
- #, c-format
- msgid "%d (unknown)"
- msgstr "%d (알 수 없음)"
-
--#: ../clients/common/nm-meta-setting-desc.c:1696
-+#: ../clients/common/nm-meta-setting-desc.c:1732
- msgid "0 (NONE)"
- msgstr "0 (없음)"
-
--#: ../clients/common/nm-meta-setting-desc.c:1702
-+#: ../clients/common/nm-meta-setting-desc.c:1738
- msgid "REORDER_HEADERS, "
- msgstr "REORDER_HEADERS, "
-
--#: ../clients/common/nm-meta-setting-desc.c:1704
-+#: ../clients/common/nm-meta-setting-desc.c:1740
- msgid "GVRP, "
- msgstr "GVRP, "
-
--#: ../clients/common/nm-meta-setting-desc.c:1706
-+#: ../clients/common/nm-meta-setting-desc.c:1742
- msgid "LOOSE_BINDING, "
- msgstr "LOOSE_BINDING, "
-
--#: ../clients/common/nm-meta-setting-desc.c:1708
-+#: ../clients/common/nm-meta-setting-desc.c:1744
- msgid "MVRP, "
- msgstr "MVRP, "
-
--#: ../clients/common/nm-meta-setting-desc.c:1729
-+#: ../clients/common/nm-meta-setting-desc.c:1765
- msgid "0 (none)"
- msgstr "0 (없음)"
-
--#: ../clients/common/nm-meta-setting-desc.c:1735
-+#: ../clients/common/nm-meta-setting-desc.c:1771
- msgid "agent-owned, "
- msgstr "에이전트 소유 "
-
--#: ../clients/common/nm-meta-setting-desc.c:1737
-+#: ../clients/common/nm-meta-setting-desc.c:1773
- msgid "not saved, "
- msgstr "저장되지 않음 "
-
--#: ../clients/common/nm-meta-setting-desc.c:1739
-+#: ../clients/common/nm-meta-setting-desc.c:1775
- msgid "not required, "
- msgstr "필요하지 않음 "
-
--#: ../clients/common/nm-meta-setting-desc.c:1957
-+#: ../clients/common/nm-meta-setting-desc.c:1975
- #, c-format
- msgid "'%s' is not valid; use <option>=<value>"
- msgstr "'%s'가 올바르지 않습니다; <option>=<value>를 사용합니다"
-
--#: ../clients/common/nm-meta-setting-desc.c:1967
--#, fuzzy, c-format
-+#: ../clients/common/nm-meta-setting-desc.c:1985
-+#, c-format
- msgid "cannot set empty \"%s\" option"
--msgstr "속성을 설정할 수 없음: %s"
-+msgstr "비워 둘 수 없습니다 \" %s \"옵션"
-
--#: ../clients/common/nm-meta-setting-desc.c:2026
-+#: ../clients/common/nm-meta-setting-desc.c:2044
- #, c-format
- msgid "'%u' flags are not valid; use combination of %s"
- msgstr "'%u' 플래그가 유효하지 않습니다. %s 결합을 사용하십시오."
-
--#: ../clients/common/nm-meta-setting-desc.c:2043
-+#: ../clients/common/nm-meta-setting-desc.c:2061
- #, c-format
- msgid "'%s' is not a valid number (or out of range)"
- msgstr "'%s'은 올바른 번호가 아닙니다 (또는 범위 밖의 번호)"
-
--#: ../clients/common/nm-meta-setting-desc.c:2064
--#: ../clients/common/nm-meta-setting-desc.c:4039
--#: ../libnm-core/nm-setting-ovs-bridge.c:197 ../src/nm-config.c:564
-+#: ../clients/common/nm-meta-setting-desc.c:2082
-+#: ../clients/common/nm-meta-setting-desc.c:4026
-+#: ../libnm-core/nm-setting-ovs-bridge.c:183 ../src/nm-config.c:549
- #, c-format
- msgid "'%s' is not valid"
- msgstr "'%s'이 올바르지 않습니다 "
-
--#: ../clients/common/nm-meta-setting-desc.c:2161
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:2177
- msgid "not a valid hex-string"
--msgstr "올바른 인터페이스 이름이 아닙니다 "
-+msgstr "유효하지 않은 16 진 문자열"
-
--#: ../clients/common/nm-meta-setting-desc.c:2177
-+#: ../clients/common/nm-meta-setting-desc.c:2193
- #, c-format
- msgid "'%s' is not a valid hex character"
- msgstr "'%s'는 올바른 16 진수 문자가 아닙니다 "
-
--#: ../clients/common/nm-meta-setting-desc.c:2256
-+#: ../clients/common/nm-meta-setting-desc.c:2272
- msgid ""
- "too many arguments. Please only specify a private key file and optionally a "
- "password"
--msgstr ""
-+msgstr "너무 많은 주장. 개인 키 파일 및 선택적으로 비밀번호 만 지정하십시오"
-
--#: ../clients/common/nm-meta-setting-desc.c:2363
--#, fuzzy, c-format
-+#: ../clients/common/nm-meta-setting-desc.c:2387
-+#, c-format
- msgid "failed to set bond option \"%s\""
--msgstr "속성 설정 실패: %s"
-+msgstr "채권 옵션을 설정하지 못했습니다 \" %s \""
-
--#: ../clients/common/nm-meta-setting-desc.c:2380
-+#: ../clients/common/nm-meta-setting-desc.c:2404
- #, c-format
- msgid ""
- "Enter a list of bonding options formatted as:\n"
-@@ -4323,8 +4313,7 @@ msgid ""
- "balance-alb = 6\n"
- "\n"
- "Example: mode=2,miimon=120\n"
--msgstr ""
--"다음과 같은 형식으로 본딩 옵션 목록을 입력하십시오:\n"
-+msgstr "다음과 같은 형식으로 본딩 옵션 목록을 입력하십시오:\n"
- " option = <value>, option = <value>,... \n"
- "올바른 옵션은 다음과 같습니다: %s\n"
- "'mode'는 이름 또는 숫자로 지정할 수 있습니다:\n"
-@@ -4345,229 +4334,211 @@ msgstr ""
- #. * hacky: we can not see if the type is already set, because
- #. * nmc_setting_set_property() is called only after the property
- #. * we're setting (type) has been removed.
--#: ../clients/common/nm-meta-setting-desc.c:2445
--#, fuzzy, c-format
-+#: ../clients/common/nm-meta-setting-desc.c:2469
-+#, c-format
- msgid "Can not change the connection type"
--msgstr "연결 유형 입력: "
--
--#: ../clients/common/nm-meta-setting-desc.c:2530
--#, fuzzy, c-format
--msgid "invalid permission \"%s\""
--msgstr "잘못된 라우팅: %s'"
-+msgstr "연결 유형을 변경할 수 없습니다"
-
--#: ../clients/common/nm-meta-setting-desc.c:2567
-+#: ../clients/common/nm-meta-setting-desc.c:2554
- #, c-format
--msgid "'%s' is not valid master; use ifname or connection UUID"
--msgstr "'%s'는 올바른 마스터가 아닙니다; ifname 또는 연결 UUID를 사용합니다 "
-+msgid "invalid permission \"%s\""
-+msgstr "잘못된 권한 \" %s \""
-
--#: ../clients/common/nm-meta-setting-desc.c:2648
-+#: ../clients/common/nm-meta-setting-desc.c:2654
- #, c-format
- msgid "the value '%s' is not a valid UUID"
- msgstr "값 '%s'은(는) 유효한 UUID가 아닙니다."
-
--#: ../clients/common/nm-meta-setting-desc.c:2719
-+#: ../clients/common/nm-meta-setting-desc.c:2725
- msgid "0 (disabled)"
- msgstr "0 (비활성화됨)"
-
--#: ../clients/common/nm-meta-setting-desc.c:2725
-+#: ../clients/common/nm-meta-setting-desc.c:2731
- msgid "enabled, "
- msgstr "활성화됨, "
-
--#: ../clients/common/nm-meta-setting-desc.c:2727
-+#: ../clients/common/nm-meta-setting-desc.c:2733
- msgid "advertise, "
- msgstr "통지,"
-
--#: ../clients/common/nm-meta-setting-desc.c:2729
-+#: ../clients/common/nm-meta-setting-desc.c:2735
- msgid "willing, "
- msgstr "준비됨,"
-
--#: ../clients/common/nm-meta-setting-desc.c:2818
-+#: ../clients/common/nm-meta-setting-desc.c:2824
- #, c-format
- msgid "'%s' is not a valid DCB flag"
- msgstr "'%s'은(는) 올바른 DCB 플래그가 아닙니다"
-
--#: ../clients/common/nm-meta-setting-desc.c:2845
-+#: ../clients/common/nm-meta-setting-desc.c:2851
- msgid "must contain 8 comma-separated numbers"
- msgstr "쉼표로 구분된 8 개의 번호가 포함되어 있어야 합니다 "
-
--#: ../clients/common/nm-meta-setting-desc.c:2859
-+#: ../clients/common/nm-meta-setting-desc.c:2865
- #, c-format
- msgid "'%s' not a number between 0 and %u (inclusive) or %u"
- msgstr "'%s'은 0에서 %u (포함) 또는 %u 사이의 숫자가 아닙니다 "
-
--#: ../clients/common/nm-meta-setting-desc.c:2862
-+#: ../clients/common/nm-meta-setting-desc.c:2868
- #, c-format
- msgid "'%s' not a number between 0 and %u (inclusive)"
- msgstr "'%s'은 0에서 %u (포함) 사이의 숫자가 아닙니다 "
-
--#: ../clients/common/nm-meta-setting-desc.c:2883
--#, fuzzy, c-format
-+#: ../clients/common/nm-meta-setting-desc.c:2889
-+#, c-format
- msgid "changes will have no effect until '%s' includes 1 (enabled)"
--msgstr "경고: 변경 사항은 '%s'에 1 (활성화)를 포함할 때 까지 효력이 없습니다\n"
--"\n"
-+msgstr "변경 사항은 ' %s '포함 (사용 가능)"
-
--#: ../clients/common/nm-meta-setting-desc.c:2913
-+#: ../clients/common/nm-meta-setting-desc.c:2919
- #, c-format
- msgid "bandwidth percentages must total 100%%"
- msgstr "대역폭 비율은 총 100%%가 되어야 합니다"
-
--#: ../clients/common/nm-meta-setting-desc.c:2984
- #: ../clients/common/nm-meta-setting-desc.c:2990
-+#: ../clients/common/nm-meta-setting-desc.c:2996
- msgid "SIM operator ID must be a 5 or 6 number MCCMNC code"
- msgstr "SIM 연산자 ID는 5 또는 6자리 MCCMNC 코드여야 합니다."
-
--#: ../clients/common/nm-meta-setting-desc.c:3014
-+#: ../clients/common/nm-meta-setting-desc.c:3020
- #, c-format
- msgid "'%s' is not a valid IBoIP P_Key"
- msgstr "'%s'는 올바른 IBoIP P_Key가 아닙니다 "
-
--#: ../clients/common/nm-meta-setting-desc.c:3037
-+#: ../clients/common/nm-meta-setting-desc.c:3043
- msgid "default"
- msgstr "기본값 "
-
--#: ../clients/common/nm-meta-setting-desc.c:3201
--#, fuzzy, c-format
-+#: ../clients/common/nm-meta-setting-desc.c:3207
-+#, c-format
- msgid "invalid IPv%c address '%s'"
--msgstr "잘못된 IPv4 주소 '%s'"
-+msgstr "유효하지 않은 IPv %c 주소 ' %s '"
-
--#: ../clients/common/nm-meta-setting-desc.c:3328
-+#: ../clients/common/nm-meta-setting-desc.c:3334
- #, c-format
- msgid "invalid gateway address '%s'"
- msgstr "잘못된 게이트웨이 주소 '%s'"
-
--#: ../clients/common/nm-meta-setting-desc.c:3478
-+#: ../clients/common/nm-meta-setting-desc.c:3461
- #, c-format
- msgid "'%s' is not a valid channel; use <1-13>"
- msgstr "'%s'은 올바른 채널이 아닙니다; 을 사용합니다"
-
--#: ../clients/common/nm-meta-setting-desc.c:3558
--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:3541
-+msgid "The valid syntax is: vf [attribute=value]... [,vf [attribute=value]...]"
-+msgstr "올바른 구문은 다음과 같습니다. vf [attribute = value] ... [, vf [attribute = value] ...]"
-
--#: ../clients/common/nm-meta-setting-desc.c:3582
--#: ../clients/common/nm-meta-setting-desc.c:3662
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:3565
-+#: ../clients/common/nm-meta-setting-desc.c:3645
- msgid ""
- "The valid syntax is: '[root | parent <handle>] [handle <handle>] <kind>'"
--msgstr "올바른 구문은 다음과 같습니다. '[[root | 부모의 <handle>] [손잡이 <handle>] <qdisc>'"
-+msgstr "유효한 구문은 다음과 같습니다. '[root | 부모의 <handle> ] [손잡이 <handle> ] <kind> '"
-
--#: ../clients/common/nm-meta-setting-desc.c:3607
-+#: ../clients/common/nm-meta-setting-desc.c:3590
- msgid "The valid syntax is: '<vid>[-<vid>] [pvid] [untagged]'"
--msgstr ""
-+msgstr "유효한 구문은 다음과 같습니다. ' <vid> [- <vid> ] [pvid] [tagged] '"
-
--#: ../clients/common/nm-meta-setting-desc.c:3803
-+#: ../clients/common/nm-meta-setting-desc.c:3786
- #, c-format
- msgid "invalid priority map '%s'"
- msgstr "잘못된 속성 맵 '%s'"
-
--#: ../clients/common/nm-meta-setting-desc.c:3891
-+#: ../clients/common/nm-meta-setting-desc.c:3878
- #, c-format
- msgid "'%s' is not valid; 2 or 3 strings should be provided"
- msgstr "'%s'이(가) 유효하지 않습니다. 2개 또는 3개 문자열을 입력해야 합니다."
-
--#: ../clients/common/nm-meta-setting-desc.c:3930
-+#: ../clients/common/nm-meta-setting-desc.c:3917
- #, c-format
- msgid ""
- "Enter a list of S/390 options formatted as:\n"
- " option = <value>, option = <value>,...\n"
- "Valid options are: %s\n"
--msgstr ""
--"다음과 같은 형식으로 S/390 옵션 목록을 입력합니다:\n"
-+msgstr "다음과 같은 형식으로 S/390 옵션 목록을 입력합니다:\n"
- " option = <value>, option = <value>,...\n"
- "올바른 옵션은 다음과 같습니다: %s\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:3965
-+#: ../clients/common/nm-meta-setting-desc.c:3952
- #, c-format
- msgid "'%s' is not a valid channel"
- msgstr "'%s'은 올바른 채널이 아닙니다 "
-
--#: ../clients/common/nm-meta-setting-desc.c:3971
-+#: ../clients/common/nm-meta-setting-desc.c:3958
- #, c-format
- msgid "'%ld' is not a valid channel"
- msgstr "'%ld'는 올바른 채널이 아닙니다 "
-
--#: ../clients/common/nm-meta-setting-desc.c:3988
--#: ../libnm-core/nm-setting-sriov.c:442 ../libnm-core/nm-setting-wired.c:772
--#: ../libnm-core/nm-setting-wired.c:785 ../libnm-core/nm-setting-wired.c:838
--#: ../libnm-core/nm-setting-wired.c:881 ../libnm-core/nm-setting-wireless.c:893
--#: ../libnm-core/nm-setting-wireless.c:909
-+#: ../clients/common/nm-meta-setting-desc.c:3975
-+#: ../libnm-core/nm-setting-sriov.c:438 ../libnm-core/nm-setting-wired.c:758
-+#: ../libnm-core/nm-setting-wired.c:771 ../libnm-core/nm-setting-wired.c:824
-+#: ../libnm-core/nm-setting-wired.c:867 ../libnm-core/nm-setting-wireless.c:881
-+#: ../libnm-core/nm-setting-wireless.c:897
- #, c-format
- msgid "'%s' is not a valid MAC address"
- msgstr "'%s'은 올바른 MAC 주소가 아닙니다 "
-
--#: ../clients/common/nm-meta-setting-desc.c:4048
-+#: ../clients/common/nm-meta-setting-desc.c:4035
- #, c-format
- msgid ""
- "'%s' not compatible with %s '%s', please change the key or set the right %s "
- "first."
- msgstr "'%s'은(는) %s '%s'(와)과 호환되지 않습니다. 키를 변경하거나 올바른 %s(을)를 먼저 설정하십시오."
-
--#: ../clients/common/nm-meta-setting-desc.c:4058
--#, fuzzy, c-format
-+#: ../clients/common/nm-meta-setting-desc.c:4045
-+#, c-format
- msgid "WEP key is guessed to be of '%s'"
--msgstr "WEP 키는 '%s'라고 가정합니다\n"
-+msgstr "WEP 키는 ' %s '"
-
--#: ../clients/common/nm-meta-setting-desc.c:4063
--#, fuzzy, c-format
-+#: ../clients/common/nm-meta-setting-desc.c:4050
-+#, c-format
- msgid "WEP key index set to '%d'"
--msgstr "WEP 키 인덱스가 '%d'으(로) 설정되었습니다.\n"
-+msgstr "WEP 키 인덱스가 ' %d '"
-
--#: ../clients/common/nm-meta-setting-desc.c:4102
--#, fuzzy, c-format
--msgid ""
--"'%s' is not compatible with '%s' type, please change or delete the key."
--msgstr "경고: '%s'은(는) '%s' 유형과 호환되지 않습니다. 키를 변경하거나 삭제하십시오.\n"
-+#: ../clients/common/nm-meta-setting-desc.c:4089
-+#, 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:4159
-+#: ../clients/common/nm-meta-setting-desc.c:4175
- #, c-format
- msgid "'%s' is not valid; use 'on', 'off', or 'ignore'"
- msgstr "'%s' 유효하지 않습니다. 'on', 'off'또는 'ignore'사용"
-
--#: ../clients/common/nm-meta-setting-desc.c:4219
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:4244
- msgid "Bonding primary interface [none]"
--msgstr "본딩 기본 인터페이스 [none]: "
-+msgstr "본딩 기본 인터페이스 [없음]"
-
- #. this is a virtual property, only needed during "ask" mode.
--#: ../clients/common/nm-meta-setting-desc.c:4226
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:4251
- msgid "Bonding monitoring mode"
--msgstr "링크 모니터링 "
-+msgstr "본딩 모니터링 모드"
-
--#: ../clients/common/nm-meta-setting-desc.c:4235
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:4260
- msgid "Bonding miimon [100]"
--msgstr "본딩 miimon [100]: "
-+msgstr "본딩 miimon [100]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4243
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:4268
- msgid "Bonding downdelay [0]"
--msgstr "본딩 downdelay [0]: "
-+msgstr "본딩 다운 딜레이 [0]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4251
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:4276
- msgid "Bonding updelay [0]"
--msgstr "본딩 updelay [0]: "
-+msgstr "본딩 업 딜레이 [0]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4259
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:4284
- msgid "Bonding arp-interval [0]"
--msgstr "본딩 arp-interval [0]: "
-+msgstr "접합 arp- 간격 [0]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4267
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:4292
- msgid "Bonding arp-ip-target [none]"
--msgstr "본딩 arp-ip-target [none]: "
-+msgstr "arp-ip-target 본딩 [없음]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4275
-+#: ../clients/common/nm-meta-setting-desc.c:4300
- msgid "LACP rate ('slow' or 'fast') [slow]"
- msgstr "LACP 속도 ( '느리게'또는 '빠름') [느리게]"
-
- #. macro that returns @func as const (guint32(*)(NMSetting*)) type, but checks
- #. * that the actual type is (guint32(*)(type *)).
--#: ../clients/common/nm-meta-setting-desc.c:4440
-+#: ../clients/common/nm-meta-setting-desc.c:4467
- 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 "
-@@ -4576,15 +4547,12 @@ msgid ""
- "Examples: set team.config { \"device\": \"team0\", \"runner\": {\"name\": "
- "\"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n"
- " set team.config /etc/my-team.conf\n"
--msgstr ""
--"nmcli는 다이렉트 JSON 설정 데이터 및 설정이 포함된 파일 이름 모두를 받을 수 있습니다. 설정이 포함된 파일의 경우 파일을 읽어 "
--"컨텐츠를 속성에 배치합니다.\n"
-+msgstr "nmcli는 다이렉트 JSON 설정 데이터 및 설정이 포함된 파일 이름 모두를 받을 수 있습니다. 설정이 포함된 파일의 경우 파일을 읽어 컨텐츠를 속성에 배치합니다.\n"
- "\n"
--"예: set team.config { \"device\": \"team0\", \"runner\": {\"name\": "
--"\"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n"
-+"예: set team.config { \"device\": \"team0\", \"runner\": {\"name\": \"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n"
- " set team.config /etc/my-team.conf\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:4448
-+#: ../clients/common/nm-meta-setting-desc.c:4475
- 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 "
-@@ -4606,47 +4574,37 @@ msgid ""
- "Properties flagged with a '*' are mandatory.\n"
- "\n"
- "Example:\n"
--" name=arp_ping source-host=172.16.1.1 target-host=172.16.1.254, name="
--"ethtool delay-up=3\n"
--msgstr ""
--"키가 teamd 속성 인 사전으로 서식이 지정된 링크 관찰자 목록을 입력하십시오. 사전 쌍은 key = value 형식이고 쌍은 ''로 "
--"구분됩니다. 사전은 ','로 구분됩니다. 사전에 허용되거나 필요한 키는 링크 감시자 유형을 기준으로 변경되지만 모든 링크 감시자에게 "
--"공통된 속성은 'name'*이며 링크 감시자를 지정할 수 있습니다. 'ethtool'링크 감시자에 사용할 수있는 속성 : '지연 대기', "
--"'지연 대기' 'nsna_ping'링크 감시자에 사용할 수있는 속성 : 'init-wait', 'interval', 'missed-"
--"max' host '*'arp_ping '에 사용할 수있는 속성은'nsna_ping '및'source-host '*,'validate-"
--"active ','validate-inactive ','send-always '에 대한 모든 속성을 포함합니다. '*'로 표시된 속성은 "
--"필수 항목입니다. 예 : name = arp_ping source-host = 172.16.1.1 target-host = 172.16."
--"1.254, name = ethtool 지연 - 상승 = 3\n"
--
--#: ../clients/common/nm-meta-setting-desc.c:4481
-+" name=arp_ping source-host=172.16.1.1 target-host=172.16.1.254, "
-+"name=ethtool delay-up=3\n"
-+msgstr "키가 teamd 속성 인 사전으로 서식이 지정된 링크 관찰자 목록을 입력하십시오. 사전 쌍은 key = value 형식이고 쌍은 ''로 구분됩니다. 사전은 ','로 구분됩니다. 사전에 허용되거나 필요한 키는 링크 감시자 유형을 기준으로 변경되지만 모든 링크 감시자에게 공통된 속성은 'name'*이며 링크 감시자를 지정할 수 있습니다. 'ethtool'링크 감시자에 사용할 수있는 속성 : '지연 대기', '지연 대기' 'nsna_ping'링크 감시자에 사용할 수있는 속성 : 'init-wait', 'interval', 'missed-max' host '*'arp_ping '에 사용할 수있는 속성은'nsna_ping '및'source-host '*,'validate-active ','validate-inactive ','send-always '에 대한 모든 속성을 포함합니다. '*'로 표시된 속성은 필수 항목입니다. 예 : name = arp_ping source-host = 172.16.1.1 target-host = 172.16.1.254, name = ethtool 지연 - 상승 = 3\n"
-+
-+#: ../clients/common/nm-meta-setting-desc.c:4524
- msgid "IEEE 802.15.4 (WPAN) parent device or connection UUID"
- msgstr "VLAN 부모 장치 또는 연결 UUID:"
-
--#: ../clients/common/nm-meta-setting-desc.c:4514
-+#: ../clients/common/nm-meta-setting-desc.c:4560
- msgid ""
- "Enter file path to CA certificate (optionally prefixed with file://).\n"
- " [file://]<file path>\n"
- "Note that nmcli does not support specifying certificates as raw blob data.\n"
- "Example: /home/cimrman/cacert.crt\n"
--msgstr ""
--"CA 인증서의 파일 경로를 입력합니다(선택적으로 접두사 file://이 추가됨).\n"
-+msgstr "CA 인증서의 파일 경로를 입력합니다(선택적으로 접두사 file://이 추가됨).\n"
- " [file://]<파일 경로>\n"
- "nmcli는 인증서를 원시 blob 데이터로 지정하도록 지원하지 않습니다.\n"
- "예: /home/cimrman/cacert.crt\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:4553
-+#: ../clients/common/nm-meta-setting-desc.c:4602
- msgid ""
- "Enter file path to client certificate (optionally prefixed with file://).\n"
- " [file://]<file path>\n"
- "Note that nmcli does not support specifying certificates as raw blob data.\n"
- "Example: /home/cimrman/jara.crt\n"
--msgstr ""
--"클라이언트 인증서의 파일 경로를 입력합니다(선택적으로 접두사 file://이 추가됨).\n"
-+msgstr "클라이언트 인증서의 파일 경로를 입력합니다(선택적으로 접두사 file://이 추가됨).\n"
- " [file://]<파일 경로>\n"
- "nmcli는 인증서를 원시 blob 데이터로 지정하도록 지원하지 않습니다.\n"
- "예: /home/cimrman/jara.crt\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:4610
-+#: ../clients/common/nm-meta-setting-desc.c:4659
- msgid ""
- "Enter file path to CA certificate for inner authentication (optionally "
- "prefixed\n"
-@@ -4654,14 +4612,13 @@ msgid ""
- " [file://]<file path>\n"
- "Note that nmcli does not support specifying certificates as raw blob data.\n"
- "Example: /home/cimrman/ca-zweite-phase.crt\n"
--msgstr ""
--"내부 인증을 위한 CA 인증서의 파일 경로를 입력합니다(선택적으로 접두사\n"
-+msgstr "내부 인증을 위한 CA 인증서의 파일 경로를 입력합니다(선택적으로 접두사\n"
- " file://이 추가됨).\n"
- " [file://]<파일 경로>\n"
- "nmcli는 인증서를 원시 blob 데이터로 지정하도록 지원하지 않습니다.\n"
- "예: /home/cimrman/ca-zweite-phase.crt\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:4650
-+#: ../clients/common/nm-meta-setting-desc.c:4702
- msgid ""
- "Enter file path to client certificate for inner authentication (optionally "
- "prefixed\n"
-@@ -4669,25 +4626,24 @@ msgid ""
- " [file://]<file path>\n"
- "Note that nmcli does not support specifying certificates as raw blob data.\n"
- "Example: /home/cimrman/jara-zweite-phase.crt\n"
--msgstr ""
--"내부 인증을 위한 클라이언트 인증서의 파일 경로를 입력합니다(선택적으로 접두사\n"
-+msgstr "내부 인증을 위한 클라이언트 인증서의 파일 경로를 입력합니다(선택적으로 접두사\n"
- " file://이 추가됨).\n"
- " [file://]<파일 경로>\n"
- "nmcli는 인증서를 원시 blob 데이터로 지정하도록 지원하지 않습니다.\n"
- "예: /home/cimrman/jara-zweite-phase.crt\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:4677
-+#: ../clients/common/nm-meta-setting-desc.c:4729
- msgid ""
- "Enter bytes as a list of hexadecimal values.\n"
- "Two formats are accepted:\n"
--"(a) a string of hexadecimal digits, where each two digits represent one byte\n"
-+"(a) a string of hexadecimal digits, where each two digits represent one "
-+"byte\n"
- "(b) space-separated list of bytes written as hexadecimal digits (with "
- "optional 0x/0X prefix, and optional leading 0).\n"
- "\n"
- "Examples: ab0455a6ea3a74C2\n"
- " ab 4 55 0xa6 ea 3a 74 C2\n"
--msgstr ""
--"16 진수 값 목록을 바이트 단위로 입력합니다.\n"
-+msgstr "16 진수 값 목록을 바이트 단위로 입력합니다.\n"
- "다음의 두 가지 형식으로 입력할 수 있습니다:\n"
- "(a) 16 진수 숫자로 구성된 문자열, 여기서 각각의 두 자리수는 하나의 바이트를 나타냄\n"
- "(b) 공백으로 구분된 16 진수 숫자의 바이트 목록 (옵션으로 0x/0X 접두사 및 선행 0을 사용).\n"
-@@ -4695,126 +4651,113 @@ msgstr ""
- " 예: ab0455a6ea3a74C2\n"
- " ab 4 55 0xa6 ea 3a 74 C2\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:4694
--#: ../clients/common/nm-meta-setting-desc.c:4712
-+#: ../clients/common/nm-meta-setting-desc.c:4746
-+#: ../clients/common/nm-meta-setting-desc.c:4764
- msgid ""
- "Enter path to a private key and the key password (if not set yet):\n"
- " [file://]<file path> [<password>]\n"
- "Note that nmcli does not support specifying private key as raw blob data.\n"
- "Example: /home/cimrman/jara-priv-key Dardanely\n"
--msgstr ""
--"개인 키 및 키 암호의 경로를 입력하십시오(아직 설정하지 않은 경우).\n"
-+msgstr "개인 키 및 키 암호의 경로를 입력하십시오(아직 설정하지 않은 경우).\n"
- " [file://]<파일 경로> [<암호>]\n"
- "nmcli는 원시 blob 데이터처럼 개인 키를 지정하는 것을 지원하지 않습니다.\n"
- "예: /home/cimrman/jara-priv-key Dardanely\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:4751
--#: ../clients/common/nm-secret-agent-simple.c:280
--#: ../clients/common/nm-secret-agent-simple.c:368
--#: ../clients/tui/nmt-page-dsl.c:65 ../clients/tui/nmt-page-wifi.c:331
-+#: ../clients/common/nm-meta-setting-desc.c:4803
-+#: ../clients/common/nm-secret-agent-simple.c:268
-+#: ../clients/common/nm-secret-agent-simple.c:356
-+#: ../clients/tui/nmt-page-dsl.c:53 ../clients/tui/nmt-page-wifi.c:322
- msgid "Username"
- msgstr "사용자 이름 "
-
--#: ../clients/common/nm-meta-setting-desc.c:4757
--#: ../clients/common/nm-meta-setting-desc.c:4972
--#: ../clients/common/nm-meta-setting-desc.c:5365
--#: ../clients/common/nm-meta-setting-desc.c:6286
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:4809
-+#: ../clients/common/nm-meta-setting-desc.c:5093
-+#: ../clients/common/nm-meta-setting-desc.c:5520
-+#: ../clients/common/nm-meta-setting-desc.c:6492
- msgid "Password [none]"
--msgstr "암호 [none]: "
-+msgstr "비밀번호 [없음]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4803
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:4855
- msgid "Bluetooth device address"
--msgstr "블루투스 장치 주소: "
--
--#: ../clients/common/nm-meta-setting-desc.c:4851
--#: ../clients/common/nm-meta-setting-desc.c:5418
--#: ../clients/common/nm-meta-setting-desc.c:6982
--#: ../clients/common/nm-meta-setting-desc.c:7020
--#: ../clients/common/nm-meta-setting-desc.c:7202
--#: ../clients/common/nm-meta-setting-desc.c:7432
--#, fuzzy
-+msgstr "블루투스 장치 주소"
-+
-+#: ../clients/common/nm-meta-setting-desc.c:4903
-+#: ../clients/common/nm-meta-setting-desc.c:5573
-+#: ../clients/common/nm-meta-setting-desc.c:7200
-+#: ../clients/common/nm-meta-setting-desc.c:7238
-+#: ../clients/common/nm-meta-setting-desc.c:7420
-+#: ../clients/common/nm-meta-setting-desc.c:7650
- msgid "MAC [none]"
--msgstr "MAC [none]: "
-+msgstr "MAC [없음]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4857
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:4909
- msgid "Enable STP [no]"
--msgstr "STP 활성화 (예/아니오) [예]:"
-+msgstr "STP 활성화 [아니오]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4863
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:4915
- msgid "STP priority [32768]"
--msgstr "STP 우선 순위 [128]: "
-+msgstr "STP 우선순위"
-
--#: ../clients/common/nm-meta-setting-desc.c:4869
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:4921
- msgid "Forward delay [15]"
--msgstr "포워드 지연 [15]: "
-+msgstr "전송 지연"
-
--#: ../clients/common/nm-meta-setting-desc.c:4875
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:4927
- msgid "Hello time [2]"
--msgstr "Hello 타임 [2]: "
-+msgstr "Hello 타임"
-
--#: ../clients/common/nm-meta-setting-desc.c:4881
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:4933
- msgid "Max age [20]"
--msgstr "최대 경과 시간 [20]: "
-+msgstr "최대 경과 시간"
-
--#: ../clients/common/nm-meta-setting-desc.c:4887
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:4939
- msgid "MAC address ageing time [300]"
--msgstr "MAC 주소 경과 시간 [300]: "
-+msgstr "MAC 주소 에이징 시간 [300]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4893
-+#: ../clients/common/nm-meta-setting-desc.c:4949
- msgid "Group forward mask [0]"
- msgstr "그룹 전달 마스크 [0]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4899
-+#: ../clients/common/nm-meta-setting-desc.c:4991
- msgid "Enable IGMP snooping [no]"
- msgstr "IGMP 스누핑 활성화"
-
--#: ../clients/common/nm-meta-setting-desc.c:4928
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:5049
- msgid "Bridge port priority [32]"
--msgstr "브리지 포트 우선 순위 [32]: "
-+msgstr "브리지 포트 우선 순위 [32]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4934
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:5055
- msgid "Bridge port STP path cost [100]"
--msgstr "브리지 포트 STP 경로 비용 [100]: "
-+msgstr "브리지 포트 STP 경로 비용 [100]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4940
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:5061
- msgid "Hairpin [no]"
--msgstr "Hairpin 모드 "
-+msgstr "머리핀 [아니오]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4966
--#: ../clients/common/nm-meta-setting-desc.c:5359
--#: ../clients/common/nm-meta-setting-desc.c:6840
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:5087
-+#: ../clients/common/nm-meta-setting-desc.c:5514
-+#: ../clients/common/nm-meta-setting-desc.c:7046
- msgid "Username [none]"
--msgstr "사용자 이름 [none]: "
-+msgstr "사용자 이름 [없음]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5069
-+#: ../clients/common/nm-meta-setting-desc.c:5189
- msgid ""
--"Enter a list of user permissions. This is a list of user names formatted as:\n"
-+"Enter a list of user permissions. This is a list of user names formatted "
-+"as:\n"
- " [user:]<user name 1>, [user:]<user name 2>,...\n"
- "The items can be separated by commas or spaces.\n"
- "\n"
- "Example: alice bob charlie\n"
--msgstr ""
--"사용자 권한 목록을 입력합니다. 다음과 같은 형식으로된 사용자 이름 목록입니다: \n"
-+msgstr "사용자 권한 목록을 입력합니다. 다음과 같은 형식으로된 사용자 이름 목록입니다: \n"
- " [user:]<user name 1>, [user:]<user name 2>,...\n"
- "여러 사용자 이름은 쉼표나 공백으로 구분할 수 있습니다.\n"
- "\n"
- "예: alice bob charlie\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5121
-+#: ../clients/common/nm-meta-setting-desc.c:5242
- msgid ""
--"Enter secondary connections that should be activated when this connection is\n"
-+"Enter secondary connections that should be activated when this connection "
-+"is\n"
- "activated. Connections can be specified either by UUID or ID (name). nmcli\n"
- "transparently translates names to UUIDs. Note that NetworkManager only "
- "supports\n"
-@@ -4822,8 +4765,7 @@ msgid ""
- "The items can be separated by commas or spaces.\n"
- "\n"
- "Example: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
--msgstr ""
--"이 연결이 활성화되었을 때 활성화해야 하는 보조 연결을\n"
-+msgstr "이 연결이 활성화되었을 때 활성화해야 하는 보조 연결을\n"
- "입력하십시오. 연결은 UUID 또는 ID(이름)로 지정할 수 있습니다. nmcli는\n"
- "투명한 방식으로 이름을 UUID로 변환합니다. 현재 네트워크 관리자는 VPN을\n"
- "보조 연결로만 지원합니다.\n"
-@@ -4831,43 +4773,38 @@ msgstr ""
- "\n"
- "예: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5144
-+#: ../clients/common/nm-meta-setting-desc.c:5265
- msgid ""
- "Enter a value which indicates whether the connection is subject to a data\n"
- "quota, usage costs or other limitations. Accepted options are:\n"
- "'true','yes','on' to set the connection as metered\n"
- "'false','no','off' to set the connection as not metered\n"
- "'unknown' to let NetworkManager choose a value using some heuristics\n"
--msgstr ""
--"연결이 데이터\n"
-+msgstr "연결이 데이터\n"
- "할당량, 사용량 비용 또는 기타 제한 사항을 요구하는지를 나타내는 값을 입력하십시오. 허용되는 옵션은 다음과 같습니다.\n"
- "연결을 데이터 통신으로 설정하는 경우: 'true', 'yes', 'on'\n"
- "연결을 데이터 통신으로 설정하지 않은 경우: 'false', 'no', 'off'\n"
- "네트워크 관리자가 일부 추론을 사용하여 값을 선택하게 하는 경우: 'unknown'\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5375
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:5530
- msgid "APN"
--msgstr "AP"
-+msgstr "APN"
-
--#: ../clients/common/nm-meta-setting-desc.c:5427
--#: ../clients/common/nm-meta-setting-desc.c:7051
--#: ../clients/common/nm-meta-setting-desc.c:7242
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:5582
-+#: ../clients/common/nm-meta-setting-desc.c:7269
-+#: ../clients/common/nm-meta-setting-desc.c:7460
- msgid "MTU [auto]"
--msgstr "MTU [auto]: "
-+msgstr "MTU [자동]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5446
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:5601
- msgid "P_KEY [none]"
--msgstr "P_KEY [none]: "
-+msgstr "P_KEY [없음]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5455
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:5610
- msgid "Parent interface [none]"
--msgstr "부모 인터페이스 [none]: "
-+msgstr "부모 인터페이스 [없음]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5482
-+#: ../clients/common/nm-meta-setting-desc.c:5637
- msgid ""
- "Enter a list of IPv4 addresses of DNS servers.\n"
- "\n"
-@@ -4876,31 +4813,28 @@ msgstr "DNS 서버의 IPv4 주소 목록을 입력하십시오.\n"
- "\n"
- "Example: 8.8.8.8, 8.8.4.4\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5530
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:5685
- msgid "IPv4 address (IP[/plen]) [none]"
--msgstr "IPv4 주소 (IP[/plen] [gateway]) [none]: "
-+msgstr "IPv4 주소 (IP [/ plen]) [없음]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5532
-+#: ../clients/common/nm-meta-setting-desc.c:5687
- msgid ""
- "Enter a list of IPv4 addresses formatted as:\n"
- " ip[/prefix], ip[/prefix],...\n"
- "Missing prefix is regarded as prefix of 32.\n"
- "\n"
- "Example: 192.168.1.5/24, 10.0.0.11/24\n"
--msgstr ""
--"다음과 같은 형식으로 IPv4 주소를 입력하십시오.\n"
-+msgstr "다음과 같은 형식으로 IPv4 주소를 입력하십시오.\n"
- " ip[/prefix], ip[/prefix],...\n"
- "누락된 접두어는 접두어 32로 간주됩니다.\n"
- "\n"
- "예: 192.168.1.5/24, 10.0.0.11/24\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5551
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:5706
- msgid "IPv4 gateway [none]"
--msgstr "IPv4 주소 (IP[/plen] [gateway]) [none]: "
-+msgstr "IPv4 게이트웨이 [없음]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5559
-+#: ../clients/common/nm-meta-setting-desc.c:5714
- msgid ""
- "Enter a list of IPv4 routes formatted as:\n"
- " ip[/prefix] [next-hop] [metric],...\n"
-@@ -4911,8 +4845,7 @@ msgid ""
- "\n"
- "Examples: 192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n"
- " 10.1.2.0/24\n"
--msgstr ""
--"다음과 같은 형식으로 IPv4 라우팅 목록을 입력하십시오.\n"
-+msgstr "다음과 같은 형식으로 IPv4 라우팅 목록을 입력하십시오.\n"
- "ip[/prefix] [next-hop] [metric],...\n"
- "\n"
- "누락된 접두어는 접두어 32로 간주됩니다.\n"
-@@ -4922,14 +4855,15 @@ msgstr ""
- "예: 192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n"
- " 10.1.2.0/24\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5599
-+#: ../clients/common/nm-meta-setting-desc.c:5754
- msgid ""
- "Enter a list of IPv4 routing rules formatted as:\n"
- " priority [prio] [from [src]] [to [dst]], ,...\n"
- "\n"
--msgstr ""
-+msgstr "다음과 같은 형식으로 된 IPv4 라우팅 규칙 목록을 입력하십시오. 우선 순위 [prio] [[src]]에서 [d [dst]],, ...\n"
-+"\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5690
-+#: ../clients/common/nm-meta-setting-desc.c:5845
- 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 "
-@@ -4939,38 +4873,32 @@ msgid ""
- "DNS servers for this connection.\n"
- "\n"
- "Example: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"
--msgstr ""
--"DNS 서버의 IPv6 주소 목록을 입력합니다. IPv6 설정 방법이 'auto'일 경우 DNS 서버는 자동 설정에 의해 반환된 주소에 "
--"추가됩니다. DNS 서버는 업스트림 네트워크가 없기 때문에 'shared', 'link-local' IPv6 설정 방식과 함께 사용할 "
--"수 없습니다. 다른 모든 IPv6 설정 방식에서 이러한 DNS 서버는 이 연결에 대한 DNS 서버로만 사용됩니다.\n"
-+msgstr "DNS 서버의 IPv6 주소 목록을 입력합니다. IPv6 설정 방법이 'auto'일 경우 DNS 서버는 자동 설정에 의해 반환된 주소에 추가됩니다. DNS 서버는 업스트림 네트워크가 없기 때문에 'shared', 'link-local' IPv6 설정 방식과 함께 사용할 수 없습니다. 다른 모든 IPv6 설정 방식에서 이러한 DNS 서버는 이 연결에 대한 DNS 서버로만 사용됩니다.\n"
- "\n"
- "예: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5744
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:5899
- msgid "IPv6 address (IP[/plen]) [none]"
--msgstr "IPv6 주소 (IP[/plen] [gateway]) [none]: "
-+msgstr "IPv6 주소 (IP [/ plen]) [없음]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5746
-+#: ../clients/common/nm-meta-setting-desc.c:5901
- msgid ""
- "Enter a list of IPv6 addresses formatted as:\n"
- " ip[/prefix], ip[/prefix],...\n"
- "Missing prefix is regarded as prefix of 128.\n"
- "\n"
- "Example: 2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"
--msgstr ""
--"다음과 같은 형식으로 IPv6 주소 목록을 입력하십시오.\n"
-+msgstr "다음과 같은 형식으로 IPv6 주소 목록을 입력하십시오.\n"
- " ip[/prefix], ip[/prefix],...\n"
- "누락된 접두어는 접두어 128로 간주됩니다.\n"
- "\n"
- "예: 2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5765
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:5920
- msgid "IPv6 gateway [none]"
--msgstr "IPv6 주소 (IP[/plen] [gateway]) [none]: "
-+msgstr "IPv6 게이트웨이 [없음]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5773
-+#: ../clients/common/nm-meta-setting-desc.c:5928
- msgid ""
- "Enter a list of IPv6 routes formatted as:\n"
- " ip[/prefix] [next-hop] [metric],...\n"
-@@ -4982,205 +4910,188 @@ msgid ""
- "Examples: 2001:db8:beef:2::/64 2001:db8:beef::2, 2001:db8:beef:3::/64 2001:"
- "db8:beef::3 2\n"
- " abbe::/64 55\n"
--msgstr ""
--"다음과 같은 형식으로 IPv6 라우팅 목록을 입력하십시오.\n"
-+msgstr "다음과 같은 형식으로 IPv6 라우팅 목록을 입력하십시오.\n"
- " ip[/prefix] [next-hop] [metric],...\n"
- "\n"
- "누락된 접두어는 접두어 128로 간주됩니다.\n"
- "누락된 다음 홉은 \"::\"(으)로 간주됩니다.\n"
- "누락된 메트릭은 기본값(NM/커널에서 기본값이 설정됨)을 의미합니다.\n"
- "\n"
--"예: 2001:db8:beef:2::/64 2001:db8:beef::2, 2001:db8:beef:3::/64 2001:db8:beef:"
--":3 2\n"
-+"예: 2001:db8:beef:2::/64 2001:db8:beef::2, 2001:db8:beef:3::/64 2001:db8:beef::3 2\n"
- " abbe::/64 55\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5813
-+#: ../clients/common/nm-meta-setting-desc.c:5968
- msgid ""
- "Enter a list of IPv6 routing rules formatted as:\n"
- " priority [prio] [from [src]] [to [dst]], ,...\n"
- "\n"
--msgstr ""
-+msgstr "다음과 같은 형식으로 된 IPv6 라우팅 규칙 목록을 입력하십시오. 우선 순위 [prio] [[src]]에서 [d [dst]],, ...\n"
-+"\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5901
--#: ../clients/common/nm-meta-setting-desc.c:6881
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:6075
-+#: ../clients/common/nm-meta-setting-desc.c:7099
- msgid "Parent device [none]"
--msgstr "부모 인터페이스 [none]: "
-+msgstr "부모 장치 [없음]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5907
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:6081
- msgid "Local endpoint [none]"
--msgstr "부모 인터페이스 [none]: "
-+msgstr "로컬 엔드 포인트 [없음]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5914
--#: ../clients/common/nm-meta-setting-desc.c:6901
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:6088
-+#: ../clients/common/nm-meta-setting-desc.c:7119
- msgid "Remote"
--msgstr "삭제"
-+msgstr "먼"
-
--#: ../clients/common/nm-meta-setting-desc.c:5959
-+#: ../clients/common/nm-meta-setting-desc.c:6133
- msgid "MACsec parent device or connection UUID"
- msgstr "VLAN 부모 장치 또는 연결 UUID:"
-
--#: ../clients/common/nm-meta-setting-desc.c:5980
-+#: ../clients/common/nm-meta-setting-desc.c:6154
- msgid "Enable encryption [yes]"
- msgstr "암호화 사용 [예]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5986
--#: ../clients/common/nm-secret-agent-simple.c:929
-+#: ../clients/common/nm-meta-setting-desc.c:6160
-+#: ../clients/common/nm-secret-agent-simple.c:917
- msgid "MKA CAK"
- msgstr "MKA CAK"
-
--#: ../clients/common/nm-meta-setting-desc.c:5996
-+#: ../clients/common/nm-meta-setting-desc.c:6170
- msgid "MKA_CKN"
- msgstr "MKA_CKN"
-
--#: ../clients/common/nm-meta-setting-desc.c:6002
-+#: ../clients/common/nm-meta-setting-desc.c:6176
- msgid "SCI port [1]"
- msgstr "SCI 포트 [1]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6028
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:6202
- msgid "MACVLAN parent device or connection UUID"
--msgstr "VLAN 부모 장치 또는 연결 UUID: "
-+msgstr "VLAN 부모 장치 또는 연결 UUID:"
-
--#: ../clients/common/nm-meta-setting-desc.c:6049
-+#: ../clients/common/nm-meta-setting-desc.c:6223
- msgid "Tap [no]"
- msgstr "[아니오]를 탭하십시오."
-
--#: ../clients/common/nm-meta-setting-desc.c:6084
--#: ../clients/common/nm-meta-setting-desc.c:7156
--#: ../clients/tui/nmt-page-wifi.c:223
-+#: ../clients/common/nm-meta-setting-desc.c:6290
-+#: ../clients/common/nm-meta-setting-desc.c:7374
-+#: ../clients/tui/nmt-page-wifi.c:213
- msgid "SSID"
- msgstr "SSID"
-
--#: ../clients/common/nm-meta-setting-desc.c:6093
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:6299
- msgid "OLPC Mesh channel [1]"
--msgstr "OLPC 메시 채널 [1]: "
-+msgstr "OLPC 메시 채널 [1]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6102
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:6308
- msgid "DHCP anycast MAC address [none]"
--msgstr "DHCP anycast MAC 주소 [none]: "
-+msgstr "DHCP 애니 캐스트 MAC 주소 [없음]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6267
-+#: ../clients/common/nm-meta-setting-desc.c:6473
- msgid "PPPoE parent device"
- msgstr "PPPoE 상위 장치"
-
--#: ../clients/common/nm-meta-setting-desc.c:6273
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:6479
- msgid "Service [none]"
--msgstr "서비스 [none]: "
-+msgstr "서비스 [없음]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6280
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:6486
- msgid "PPPoE username"
--msgstr "PPPoE 사용자 이름: "
-+msgstr "PPPoE 사용자 이름"
-
--#: ../clients/common/nm-meta-setting-desc.c:6316
-+#: ../clients/common/nm-meta-setting-desc.c:6522
- msgid "Browser only [no]"
- msgstr "브라우저 전용 [no]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6322
-+#: ../clients/common/nm-meta-setting-desc.c:6528
- msgid "PAC URL"
- msgstr "PAC URL"
-
--#: ../clients/common/nm-meta-setting-desc.c:6328
-+#: ../clients/common/nm-meta-setting-desc.c:6534
- msgid "PAC script"
- msgstr "PAC 스크립트"
-
--#: ../clients/common/nm-meta-setting-desc.c:6452
--#: ../clients/common/nm-meta-setting-desc.c:6640
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:6658
-+#: ../clients/common/nm-meta-setting-desc.c:6846
- msgid "Team JSON configuration [none]"
--msgstr "팀 JSON 설정 [none]: "
-+msgstr "팀 JSON 구성 [없음]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6743
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:6949
- msgid "User ID [none]"
--msgstr "사용자 이름 [none]: "
-+msgstr "사용자 ID [없음]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6749
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:6955
- msgid "Group ID [none]"
--msgstr "MAC [none]: "
-+msgstr "그룹 ID [없음]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6755
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:6961
- msgid "Enable PI [no]"
--msgstr "STP 활성화 (예/아니오) [예]:"
-+msgstr "PI 활성화 [아니오]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6761
-+#: ../clients/common/nm-meta-setting-desc.c:6967
- msgid "Enable VNET header [no]"
- msgstr "VNET 헤더 사용 [no]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6767
-+#: ../clients/common/nm-meta-setting-desc.c:6973
- msgid "Enable multi queue [no]"
- msgstr "다중 대기열 사용 [no]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6780
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:6986
- msgid "VLAN parent device or connection UUID"
--msgstr "VLAN 부모 장치 또는 연결 UUID: "
-+msgstr "VLAN 부모 장치 또는 연결 UUID:"
-
--#: ../clients/common/nm-meta-setting-desc.c:6787
-+#: ../clients/common/nm-meta-setting-desc.c:6993
- msgid "VLAN ID (<0-4094>)"
- msgstr "VLAN ID"
-
--#: ../clients/common/nm-meta-setting-desc.c:6793
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:6999
- msgid "VLAN flags (<0-7>) [none]"
--msgstr "VLAN 플래그 (<0-7>) [none]: "
-+msgstr "VLAN 플래그 ( <0-7> ) [없음]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6802
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:7008
- msgid "Ingress priority maps [none]"
--msgstr "Ingress 우선 순위 맵 [none]: "
-+msgstr "수신 우선 순위 맵 [없음]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6812
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:7018
- msgid "Egress priority maps [none]"
--msgstr "Egress 우선 순위 맵 [none]: "
-+msgstr "송신 우선 순위 맵 [없음]"
-+
-+#: ../clients/common/nm-meta-setting-desc.c:7086
-+msgid "Table [0]"
-+msgstr "표 [0]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6888
-+#: ../clients/common/nm-meta-setting-desc.c:7106
- msgid "VXLAN ID"
- msgstr "VLAN ID : "
-
--#: ../clients/common/nm-meta-setting-desc.c:6894
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:7112
- msgid "Local address [none]"
--msgstr "DHCP anycast MAC 주소 [none]: "
-+msgstr "현지 주소 [없음]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6907
-+#: ../clients/common/nm-meta-setting-desc.c:7125
- msgid "Minimum source port [0]"
- msgstr "최소 소스 포트 [0]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6913
-+#: ../clients/common/nm-meta-setting-desc.c:7131
- msgid "Maximum source port [0]"
- msgstr "최대 소스 포트 [0]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6919
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:7137
- msgid "Destination port [8472]"
--msgstr "대상 "
-+msgstr "대상 포트 [8472]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6959
-+#: ../clients/common/nm-meta-setting-desc.c:7177
- msgid "Peer"
--msgstr ""
-+msgstr "동료"
-
--#: ../clients/common/nm-meta-setting-desc.c:6989
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:7207
- msgid "WiMAX NSP name"
--msgstr "WiMAX NSP 이름: "
-+msgstr "WiMAX NSP 이름"
-
--#: ../clients/common/nm-meta-setting-desc.c:7026
--#: ../clients/common/nm-meta-setting-desc.c:7207
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:7244
-+#: ../clients/common/nm-meta-setting-desc.c:7425
- msgid "Cloned MAC [none]"
--msgstr "복제된 MAC [none]: "
-+msgstr "복제 된 MAC [없음]"
-
--#: ../clients/common/nm-meta-setting-desc.c:7059
-+#: ../clients/common/nm-meta-setting-desc.c:7277
- msgid ""
- "Enter a list of subchannels (comma or space separated).\n"
- "\n"
-@@ -5189,447 +5100,428 @@ msgstr "하위 채널 목록을 입력하십시오(쉼표 또는 공백으로
- "\n"
- "예: 0.0.0e20 0.0.0e21 0.0.0e22\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:7381
-+#: ../clients/common/nm-meta-setting-desc.c:7599
- msgid ""
- "Enter the type of WEP keys. The accepted values are: 0 or unknown, 1 or key, "
- "and 2 or passphrase.\n"
--msgstr ""
--"WEP 키 유형을 입력합니다. 사용할 수 있는 값은 다음과 같습니다: 0 또는 알 수 없음, 1 또는 키, 2 또는 암호입니다.\n"
-+msgstr "WEP 키 유형을 입력합니다. 사용할 수 있는 값은 다음과 같습니다: 0 또는 알 수 없음, 1 또는 키, 2 또는 암호입니다.\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:7440
-+#: ../clients/common/nm-meta-setting-desc.c:7658
- msgid "Short address (<0x0000-0xffff>)"
- msgstr "짧은 주소 (<0x0000-0xffff>)"
-
--#: ../clients/common/nm-meta-setting-desc.c:7456
-+#: ../clients/common/nm-meta-setting-desc.c:7674
- msgid "PAN Identifier (<0x0000-0xffff>)"
- msgstr "PAN 식별자 (<0x0000-0xffff>)"
-
--#: ../clients/common/nm-meta-setting-desc.c:7471
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:7689
- msgid "Page (<default|0-31>)"
--msgstr "(기본값)"
-+msgstr "페이지 ( <default|0-31> )"
-
--#: ../clients/common/nm-meta-setting-desc.c:7485
-+#: ../clients/common/nm-meta-setting-desc.c:7703
- msgid "Channel (<default|0-26>)"
--msgstr ""
-+msgstr "채널"
-
- #. ***************************************************************************
--#: ../clients/common/nm-meta-setting-desc.c:7620
-+#: ../clients/common/nm-meta-setting-desc.c:7838
- msgid "6LOWPAN settings"
- msgstr "6LOWPAN 설정"
-
--#: ../clients/common/nm-meta-setting-desc.c:7621
-+#: ../clients/common/nm-meta-setting-desc.c:7839
- msgid "802-1x settings"
- msgstr "802-1x 설정"
-
--#: ../clients/common/nm-meta-setting-desc.c:7622
--#: ../src/devices/adsl/nm-device-adsl.c:131
-+#: ../clients/common/nm-meta-setting-desc.c:7840
-+#: ../src/devices/adsl/nm-device-adsl.c:117
- msgid "ADSL connection"
- msgstr "ADSL 연결"
-
--#: ../clients/common/nm-meta-setting-desc.c:7623
-+#: ../clients/common/nm-meta-setting-desc.c:7841
- msgid "bluetooth connection"
- msgstr "Bond 연결 "
-
--#: ../clients/common/nm-meta-setting-desc.c:7624
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:7842
- msgid "Bond device"
--msgstr "이더넷"
-+msgstr "본드 장치"
-
--#: ../clients/common/nm-meta-setting-desc.c:7625
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:7843
- msgid "Bridge device"
--msgstr "이더넷"
-+msgstr "브리지 장치"
-
--#: ../clients/common/nm-meta-setting-desc.c:7626
-+#: ../clients/common/nm-meta-setting-desc.c:7844
- msgid "Bridge port"
- msgstr "브릿지 포트"
-
--#: ../clients/common/nm-meta-setting-desc.c:7627
-+#: ../clients/common/nm-meta-setting-desc.c:7845
- msgid "CDMA mobile broadband connection"
- msgstr "모바일 광대역 연결 "
-
--#: ../clients/common/nm-meta-setting-desc.c:7628
-+#: ../clients/common/nm-meta-setting-desc.c:7846
- msgid "General settings"
- msgstr "일반 설정"
-
--#: ../clients/common/nm-meta-setting-desc.c:7629
-+#: ../clients/common/nm-meta-setting-desc.c:7847
- msgid "DCB settings"
- msgstr "DCB 설정"
-
--#: ../clients/common/nm-meta-setting-desc.c:7630
-+#: ../clients/common/nm-meta-setting-desc.c:7848
- msgid "Dummy settings"
- msgstr "더미 설정"
-
--#: ../clients/common/nm-meta-setting-desc.c:7631
-+#: ../clients/common/nm-meta-setting-desc.c:7849
- msgid "Ethtool settings"
- msgstr "Ethtool 설정"
-
--#: ../clients/common/nm-meta-setting-desc.c:7632
-+#: ../clients/common/nm-meta-setting-desc.c:7850
- msgid "Generic settings"
- msgstr "일반 설정"
-
--#: ../clients/common/nm-meta-setting-desc.c:7633
-+#: ../clients/common/nm-meta-setting-desc.c:7851
- msgid "GSM mobile broadband connection"
- msgstr "모바일 광대역 연결 "
-
--#: ../clients/common/nm-meta-setting-desc.c:7634
--#: ../src/devices/nm-device-infiniband.c:175
-+#: ../clients/common/nm-meta-setting-desc.c:7852
-+#: ../src/devices/nm-device-infiniband.c:158
- msgid "InfiniBand connection"
- msgstr "InfiniBand 연결"
-
--#: ../clients/common/nm-meta-setting-desc.c:7635
-+#: ../clients/common/nm-meta-setting-desc.c:7853
- msgid "IPv4 protocol"
- msgstr "IPv4 프로토콜"
-
--#: ../clients/common/nm-meta-setting-desc.c:7636
-+#: ../clients/common/nm-meta-setting-desc.c:7854
- msgid "IPv6 protocol"
- msgstr "IPv6 프로토콜"
-
--#: ../clients/common/nm-meta-setting-desc.c:7637
-+#: ../clients/common/nm-meta-setting-desc.c:7855
- msgid "IP-tunnel settings"
- msgstr "IP 터널 설정"
-
--#: ../clients/common/nm-meta-setting-desc.c:7638
-+#: ../clients/common/nm-meta-setting-desc.c:7856
- msgid "MACsec connection"
- msgstr "MACsec 연결"
-
--#: ../clients/common/nm-meta-setting-desc.c:7639
-+#: ../clients/common/nm-meta-setting-desc.c:7857
- msgid "macvlan connection"
- msgstr "Bond 연결 "
-
--#: ../clients/common/nm-meta-setting-desc.c:7640
-+#: ../clients/common/nm-meta-setting-desc.c:7858
- msgid "Match"
- msgstr "일치 "
-
--#: ../clients/common/nm-meta-setting-desc.c:7641
-+#: ../clients/common/nm-meta-setting-desc.c:7859
- msgid "OLPC Mesh connection"
- msgstr "CDMA 연결 "
-
--#: ../clients/common/nm-meta-setting-desc.c:7642
-+#: ../clients/common/nm-meta-setting-desc.c:7860
- msgid "Open vSwitch bridge settings"
- msgstr "Open vSwitch 브리지 설정"
-
--#: ../clients/common/nm-meta-setting-desc.c:7643
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:7861
- msgid "Open vSwitch DPDK interface settings"
--msgstr "Open vSwitch 인터페이스 설정"
-+msgstr "vSwitch DPDK 인터페이스 설정 열기"
-
--#: ../clients/common/nm-meta-setting-desc.c:7644
-+#: ../clients/common/nm-meta-setting-desc.c:7862
- msgid "Open vSwitch interface settings"
- msgstr "Open vSwitch 인터페이스 설정"
-
--#: ../clients/common/nm-meta-setting-desc.c:7645
-+#: ../clients/common/nm-meta-setting-desc.c:7863
- msgid "Open vSwitch patch interface settings"
- msgstr "Open vSwitch 패치 인터페이스 설정"
-
--#: ../clients/common/nm-meta-setting-desc.c:7646
-+#: ../clients/common/nm-meta-setting-desc.c:7864
- msgid "Open vSwitch port settings"
- msgstr "Open vSwitch 포트 설정"
-
--#: ../clients/common/nm-meta-setting-desc.c:7647
-+#: ../clients/common/nm-meta-setting-desc.c:7865
- msgid "PPP settings"
- msgstr "PPP 설정"
-
--#: ../clients/common/nm-meta-setting-desc.c:7648
-+#: ../clients/common/nm-meta-setting-desc.c:7866
- msgid "PPPoE"
- msgstr "PPPoE"
-
--#: ../clients/common/nm-meta-setting-desc.c:7649
-+#: ../clients/common/nm-meta-setting-desc.c:7867
- msgid "Proxy"
- msgstr "프록시"
-
--#: ../clients/common/nm-meta-setting-desc.c:7650
-+#: ../clients/common/nm-meta-setting-desc.c:7868
- msgid "Serial settings"
- msgstr "시리얼 설정"
-
--#: ../clients/common/nm-meta-setting-desc.c:7651
-+#: ../clients/common/nm-meta-setting-desc.c:7869
- msgid "SR-IOV settings"
- msgstr "SR-IOV 설정"
-
--#: ../clients/common/nm-meta-setting-desc.c:7652
-+#: ../clients/common/nm-meta-setting-desc.c:7870
- msgid "Traffic controls"
- msgstr "교통 통제"
-
--#: ../clients/common/nm-meta-setting-desc.c:7653
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:7871
- msgid "Team device"
--msgstr "장치가 제거되었습니다 "
-+msgstr "팀 장치"
-
--#: ../clients/common/nm-meta-setting-desc.c:7654
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:7872
- msgid "Team port"
--msgstr "팀 "
-+msgstr "팀 포트"
-
--#: ../clients/common/nm-meta-setting-desc.c:7655
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:7873
- msgid "Tun device"
--msgstr "장치가 제거되었습니다 "
-+msgstr "튜닝 장치"
-
--#: ../clients/common/nm-meta-setting-desc.c:7656
-+#: ../clients/common/nm-meta-setting-desc.c:7874
- msgid "User settings"
- msgstr "사용자 설정"
-
--#: ../clients/common/nm-meta-setting-desc.c:7657
--#: ../src/devices/nm-device-vlan.c:399
-+#: ../clients/common/nm-meta-setting-desc.c:7875
-+#: ../src/devices/nm-device-vlan.c:385
- msgid "VLAN connection"
- msgstr "VLAN 연결"
-
--#: ../clients/common/nm-meta-setting-desc.c:7658 ../src/nm-manager.c:5568
-+#: ../clients/common/nm-meta-setting-desc.c:7876 ../src/nm-manager.c:5697
- msgid "VPN connection"
- msgstr "VPN 연결"
-
--#: ../clients/common/nm-meta-setting-desc.c:7659
--#: ../src/devices/nm-device-vxlan.c:368
-+#: ../clients/common/nm-meta-setting-desc.c:7877
-+#: ../src/devices/nm-device-vrf.c:175
-+msgid "VRF connection"
-+msgstr "VRF 연결"
-+
-+#: ../clients/common/nm-meta-setting-desc.c:7878
-+#: ../src/devices/nm-device-vxlan.c:354
- msgid "VXLAN connection"
- msgstr "VXLAN 연결"
-
--#: ../clients/common/nm-meta-setting-desc.c:7660
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:7879
- msgid "Wi-Fi P2P connection"
--msgstr "Wi-Fi 연결 "
-+msgstr "Wi-Fi P2P 연결"
-
--#: ../clients/common/nm-meta-setting-desc.c:7661
-+#: ../clients/common/nm-meta-setting-desc.c:7880
- msgid "WiMAX connection"
- msgstr "CDMA 연결 "
-
--#: ../clients/common/nm-meta-setting-desc.c:7662
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:7881
- msgid "Wired Ethernet"
--msgstr "이더넷"
-+msgstr "유선 이더넷"
-
--#: ../clients/common/nm-meta-setting-desc.c:7663
--#, fuzzy
-+#: ../clients/common/nm-meta-setting-desc.c:7882
- msgid "WireGuard VPN settings"
--msgstr "WPAN 설정"
-+msgstr "WireGuard VPN 설정"
-
--#: ../clients/common/nm-meta-setting-desc.c:7664
-+#: ../clients/common/nm-meta-setting-desc.c:7883
- msgid "Wi-Fi connection"
- msgstr "Wi-Fi 연결 "
-
--#: ../clients/common/nm-meta-setting-desc.c:7665
-+#: ../clients/common/nm-meta-setting-desc.c:7884
- msgid "Wi-Fi security settings"
- msgstr "Wi-Fi 보안 설정"
-
--#: ../clients/common/nm-meta-setting-desc.c:7666
-+#: ../clients/common/nm-meta-setting-desc.c:7885
- msgid "WPAN settings"
- msgstr "WPAN 설정"
-
- # auto translated by TM merge from translation memory: eap-configuration-guide, unique id: eap-config-guide:7.0.0:master:b068931cc450442b63f5b3d276ea4297
--#: ../clients/common/nm-meta-setting-desc.c:8031
-+#: ../clients/common/nm-meta-setting-desc.c:8262
- msgid "name"
- msgstr "name"
-
--#: ../clients/common/nm-polkit-listener.c:237
--msgid "An authentication session is already underway."
--msgstr "인증 세션이 이미 진행 중입니다."
-+#: ../clients/common/nm-polkit-listener.c:368
-+#, c-format
-+msgid "Could not find any session id for uid %d"
-+msgstr "uid에 대한 세션 ID를 찾을 수 없습니다 %d"
-
--#: ../clients/common/nm-secret-agent-simple.c:229
-+#: ../clients/common/nm-polkit-listener.c:370
- #, c-format
--msgid "Preshared-key for %s"
--msgstr ""
-+msgid "Could not retrieve session id: %s"
-+msgstr "세션 ID를 검색 할 수 없습니다 : %s"
-
--#: ../clients/common/nm-secret-agent-simple.c:285
--#: ../clients/common/nm-secret-agent-simple.c:322
--#: ../clients/common/nm-secret-agent-simple.c:345
--#: ../clients/common/nm-secret-agent-simple.c:378
--#: ../clients/common/nm-secret-agent-simple.c:915
--#: ../clients/common/nm-secret-agent-simple.c:950
--#: ../clients/common/nm-secret-agent-simple.c:973
--#: ../clients/common/nm-vpn-helpers.c:122
--#: ../clients/common/nm-vpn-helpers.c:126
--#: ../clients/common/nm-vpn-helpers.c:132
--#: ../clients/common/nm-vpn-helpers.c:137 ../clients/tui/nmt-page-dsl.c:74
--#: ../clients/tui/nmt-page-wifi.c:276 ../clients/tui/nmt-page-wifi.c:307
--#: ../clients/tui/nmt-page-wifi.c:340
--msgid "Password"
--msgstr "암호 "
-+#: ../clients/common/nm-secret-agent-simple.c:217
-+#, c-format
-+msgid "Preshared-key for %s"
-+msgstr "사전 공유 키 %s"
-
--#: ../clients/common/nm-secret-agent-simple.c:294
-+#: ../clients/common/nm-secret-agent-simple.c:282
- msgid "Identity"
- msgstr "ID"
-
--#: ../clients/common/nm-secret-agent-simple.c:299
-+#: ../clients/common/nm-secret-agent-simple.c:287
- msgid "Private key password"
- msgstr "개인 키 암호"
-
--#: ../clients/common/nm-secret-agent-simple.c:335
--#: ../clients/tui/nmt-page-wifi.c:288
-+#: ../clients/common/nm-secret-agent-simple.c:323
-+#: ../clients/tui/nmt-page-wifi.c:279
- msgid "Key"
- msgstr "키 "
-
--#: ../clients/common/nm-secret-agent-simple.c:373
--#: ../clients/tui/nmt-page-dsl.c:77
-+#: ../clients/common/nm-secret-agent-simple.c:361
-+#: ../clients/tui/nmt-page-dsl.c:65
- msgid "Service"
- msgstr "서비스 "
-
--#: ../clients/common/nm-secret-agent-simple.c:485
--#, fuzzy
-+#: ../clients/common/nm-secret-agent-simple.c:473
- msgid "WireGuard private-key"
--msgstr "잘못된 개인 키"
-+msgstr "WireGuard 개인 키"
-
--#: ../clients/common/nm-secret-agent-simple.c:526
--#, fuzzy, c-format
-+#: ../clients/common/nm-secret-agent-simple.c:514
-+#, c-format
- msgid "Secrets are required to connect WireGuard VPN '%s'"
--msgstr "비밀은 유선 네트워크에 액세스해야합니다.%s'"
-+msgstr "WireGuard VPN을 연결하려면 비밀이 필요합니다. %s '"
-
--#: ../clients/common/nm-secret-agent-simple.c:627
--#: ../clients/common/nm-secret-agent-simple.c:911
--#: ../clients/common/nm-secret-agent-simple.c:946
--#: ../clients/common/nm-secret-agent-simple.c:969
--#: ../clients/common/nm-secret-agent-simple.c:988
-+#: ../clients/common/nm-secret-agent-simple.c:615
-+#: ../clients/common/nm-secret-agent-simple.c:899
-+#: ../clients/common/nm-secret-agent-simple.c:934
-+#: ../clients/common/nm-secret-agent-simple.c:957
-+#: ../clients/common/nm-secret-agent-simple.c:976
- #, c-format
- msgid "A password is required to connect to '%s'."
- msgstr "'%s'에 연결하려면 암호가 필요합니다."
-
--#: ../clients/common/nm-secret-agent-simple.c:878
-+#: ../clients/common/nm-secret-agent-simple.c:866
- msgid "Authentication required by wireless network"
- msgstr "무선 네트워크에서 인증이 필요합니다"
-
--#: ../clients/common/nm-secret-agent-simple.c:879
-+#: ../clients/common/nm-secret-agent-simple.c:867
- #, c-format
- msgid ""
- "Passwords or encryption keys are required to access the wireless network "
- "'%s'."
- msgstr "'%s' 무선 네트워크에 연결하려면 암호 또는 암호화 키가 필요합니다."
-
--#: ../clients/common/nm-secret-agent-simple.c:884
-+#: ../clients/common/nm-secret-agent-simple.c:872
- msgid "Wired 802.1X authentication"
- msgstr "유선 802.1X 인증"
-
--#: ../clients/common/nm-secret-agent-simple.c:885
-+#: ../clients/common/nm-secret-agent-simple.c:873
- #, c-format
- msgid "Secrets are required to access the wired network '%s'"
- msgstr "비밀은 유선 네트워크에 액세스해야합니다.%s'"
-
--#: ../clients/common/nm-secret-agent-simple.c:891
-+#: ../clients/common/nm-secret-agent-simple.c:879
- msgid "DSL authentication"
- msgstr "DSL 인증 "
-
--#: ../clients/common/nm-secret-agent-simple.c:892
-+#: ../clients/common/nm-secret-agent-simple.c:880
- #, c-format
- msgid "Secrets are required for the DSL connection '%s'"
- msgstr "비밀은 DSL 연결에 필요합니다. '%s'"
-
--#: ../clients/common/nm-secret-agent-simple.c:901
-+#: ../clients/common/nm-secret-agent-simple.c:889
- msgid "PIN code required"
- msgstr "PIN 코드가 필요합니다"
-
--#: ../clients/common/nm-secret-agent-simple.c:902
-+#: ../clients/common/nm-secret-agent-simple.c:890
- msgid "PIN code is needed for the mobile broadband device"
- msgstr "모바일 광대역 장치를 사용하려면 PIN 코드가 필요합니다"
-
--#: ../clients/common/nm-secret-agent-simple.c:905
-+#: ../clients/common/nm-secret-agent-simple.c:893
- msgid "PIN"
- msgstr "PIN"
-
--#: ../clients/common/nm-secret-agent-simple.c:910
--#: ../clients/common/nm-secret-agent-simple.c:945
--#: ../clients/common/nm-secret-agent-simple.c:968
-+#: ../clients/common/nm-secret-agent-simple.c:898
-+#: ../clients/common/nm-secret-agent-simple.c:933
-+#: ../clients/common/nm-secret-agent-simple.c:956
- msgid "Mobile broadband network password"
- msgstr "모바일 광대역 네트워크 암호"
-
--#: ../clients/common/nm-secret-agent-simple.c:923
-+#: ../clients/common/nm-secret-agent-simple.c:911
- #, c-format
- msgid "Secrets are required to access the MACsec network '%s'"
- msgstr "비밀은 MACsec 네트워크에 액세스해야합니다.%s'"
-
--#: ../clients/common/nm-secret-agent-simple.c:927
-+#: ../clients/common/nm-secret-agent-simple.c:915
- msgid "MACsec PSK authentication"
- msgstr "MACsec PSK 인증"
-
--#: ../clients/common/nm-secret-agent-simple.c:934
-+#: ../clients/common/nm-secret-agent-simple.c:922
- msgid "MACsec EAP authentication"
- msgstr "MACsec EAP 인증"
-
--#: ../clients/common/nm-secret-agent-simple.c:939
--#, fuzzy
-+#: ../clients/common/nm-secret-agent-simple.c:927
- msgid "WireGuard VPN secret"
--msgstr "WireGuard"
-+msgstr "WireGuard VPN 비밀"
-
--#: ../clients/common/nm-secret-agent-simple.c:978
-+#: ../clients/common/nm-secret-agent-simple.c:966
- msgid "VPN password required"
- msgstr "VPN 암호가 필요합니다."
-
--#: ../clients/common/nm-vpn-helpers.c:51
--#, fuzzy, c-format
-+#: ../clients/common/nm-vpn-helpers.c:39
-+#, c-format
- msgid "unknown VPN plugin \"%s\""
--msgstr "알려지지 않은 로그 영역 '%s'"
-+msgstr "알 수없는 VPN 플러그인 \" %s \""
-
--#: ../clients/common/nm-vpn-helpers.c:62
-+#: ../clients/common/nm-vpn-helpers.c:50
- #, c-format
- msgid "cannot load legacy-only VPN plugin \"%s\" for \"%s\""
- msgstr "레거시 전용 VPN 플러그인을로드 할 수 없습니다 \"%s\" \"%s\""
-
--#: ../clients/common/nm-vpn-helpers.c:67
-+#: ../clients/common/nm-vpn-helpers.c:55
- #, c-format
- msgid ""
- "cannot load VPN plugin \"%s\" due to missing \"%s\". Missing client plugin?"
- msgstr "VPN 플러그인을로드 할 수 없습니다 \"%s\" 누락으로 인해 \"%s\". 누락 된 클라이언트 플러그인?"
-
--#: ../clients/common/nm-vpn-helpers.c:72
-+#: ../clients/common/nm-vpn-helpers.c:60
- #, c-format
- msgid "failed to load VPN plugin \"%s\": %s"
- msgstr "오류: %s.%s 수정에 실패했습니다: ."
-
--#: ../clients/common/nm-vpn-helpers.c:127
--#, fuzzy
-+#: ../clients/common/nm-vpn-helpers.c:144
- msgid "Certificate password"
--msgstr "개인 키 암호"
-+msgstr "인증서 비밀번호"
-
- # ctx::sourcefile::/rhn/admin/config/GeneralConfig.do
--#: ../clients/common/nm-vpn-helpers.c:128
-+#: ../clients/common/nm-vpn-helpers.c:145
- msgid "HTTP proxy password"
- msgstr "HTTP 프록시 암호"
-
--#: ../clients/common/nm-vpn-helpers.c:133
--#: ../clients/common/nm-vpn-helpers.c:138
-+#: ../clients/common/nm-vpn-helpers.c:152
-+#: ../clients/common/nm-vpn-helpers.c:161
- msgid "Group password"
- msgstr "그룹 암호"
-
--#: ../clients/common/nm-vpn-helpers.c:142 ../clients/tui/nmt-page-ip4.c:142
--#: ../clients/tui/nmt-page-ip6.c:143
-+#: ../clients/common/nm-vpn-helpers.c:167 ../clients/tui/nmt-page-ip4.c:130
-+#: ../clients/tui/nmt-page-ip6.c:131
- msgid "Gateway"
- msgstr "게이트웨이"
-
--#: ../clients/common/nm-vpn-helpers.c:143
-+#: ../clients/common/nm-vpn-helpers.c:168
- msgid "Cookie"
- msgstr "쿠키"
-
--#: ../clients/common/nm-vpn-helpers.c:144
-+#: ../clients/common/nm-vpn-helpers.c:169
- msgid "Gateway certificate hash"
- msgstr "게이트웨이 인증서 해시"
-
--#: ../clients/common/nm-vpn-helpers.c:269
--#, fuzzy, c-format
-+#: ../clients/common/nm-vpn-helpers.c:267
-+#, c-format
- msgid "Invalid peer starting at %s:%zu: %s"
--msgstr "잘못된 설정 이름 '%s'"
-+msgstr "에서 시작하는 잘못된 피어 %s : %zu : %s"
-
--#: ../clients/common/nm-vpn-helpers.c:389
-+#: ../clients/common/nm-vpn-helpers.c:388
- msgid ""
--"The WireGuard config file must be a valid interface name followed by \"."
--"conf\""
--msgstr ""
-+"The name of the WireGuard config must be a valid interface name followed by "
-+"\".conf\""
-+msgstr "WireGuard 구성의 이름은 유효한 인터페이스 이름 뒤에 \".conf\"가 와야합니다."
-
--#: ../clients/common/nm-vpn-helpers.c:677
-+#: ../clients/common/nm-vpn-helpers.c:680
- #, c-format
- msgid "unrecognized line at %s:%zu"
--msgstr ""
-+msgstr "인식 할 수없는 라인 %s :%zu"
-
--#: ../clients/common/nm-vpn-helpers.c:682
--#, fuzzy, c-format
-+#: ../clients/common/nm-vpn-helpers.c:685
-+#, c-format
- msgid "invalid value for '%s' at %s:%zu"
- msgstr "잘못된 값 \"%s\": %s"
-
--#: ../clients/common/nm-vpn-helpers.c:687
--#, fuzzy, c-format
-+#: ../clients/common/nm-vpn-helpers.c:690
-+#, c-format
- msgid "invalid secret '%s' at %s:%zu"
--msgstr "잘못된 경로 : %s. %s"
-+msgstr "잘못된 비밀 ' %s '에서 %s :%zu"
-
--#: ../clients/common/nm-vpn-helpers.c:800
--#, fuzzy, c-format
-+#: ../clients/common/nm-vpn-helpers.c:823
-+#, 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
-@@ -5647,9 +5539,7 @@ msgid ""
- "Anycast DHCP MAC address used when requesting an IP address via DHCP. The "
- "specific anycast address used determines which DHCP server class answers the "
- "request."
--msgstr ""
--"애니 캐스트 DHCP DHCP를 통해 IP 주소를 요청할 때 사용되는 MAC 주소입니다. 사용 된 특정 애니 캐스트 주소는 요청에 "
--"응답하는 DHCP 서버 클래스를 결정합니다."
-+msgstr "애니 캐스트 DHCP DHCP를 통해 IP 주소를 요청할 때 사용되는 MAC 주소입니다. 사용 된 특정 애니 캐스트 주소는 요청에 응답하는 DHCP 서버 클래스를 결정합니다."
-
- #: ../clients/common/settings-docs.h.in:6
- msgid "SSID of the mesh network to join."
-@@ -5657,17 +5547,13 @@ msgstr "가입 할 메시 네트워크의 SSID."
-
- #: ../clients/common/settings-docs.h.in:7
- msgid ""
--"802.11 frequency band of the network. One of \"a\" for 5GHz 802.11a or "
--"\"bg\" for 2.4GHz 802.11. This will lock associations to the Wi-Fi network "
--"to the specific band, i.e. if \"a\" is specified, the device will not "
--"associate with the same network in the 2.4GHz band even if the network's "
--"settings are compatible. This setting depends on specific driver capability "
--"and may not work with all drivers."
--msgstr ""
--"네트워크의 802.11 주파수 대역. 5GHz 802.11a의 경우 \"a\"또는 2.4GHz 802.11의 경우 \"bg\"중 "
--"하나입니다. 이렇게하면 특정 대역에 대한 Wi-Fi 네트워크 연결이 잠길 것입니다. 즉, \"a\"를 지정하면 네트워크 설정이 호환 "
--"가능하더라도 2.4GHz 대역의 동일한 네트워크와 연결되지 않습니다. 이 설정은 특정 드라이버 기능에 따라 다르며 모든 드라이버에서 "
--"작동하지 않을 수도 있습니다."
-+"802.11 frequency band of the network. One of \"a\" for 5GHz 802.11a or \"bg"
-+"\" for 2.4GHz 802.11. This will lock associations to the Wi-Fi network to "
-+"the specific band, i.e. if \"a\" is specified, the device will not associate "
-+"with the same network in the 2.4GHz band even if the network's settings are "
-+"compatible. This setting depends on specific driver capability and may not "
-+"work with all drivers."
-+msgstr "네트워크의 802.11 주파수 대역. 5GHz 802.11a의 경우 \"a\"또는 2.4GHz 802.11의 경우 \"bg\"중 하나입니다. 이렇게하면 특정 대역에 대한 Wi-Fi 네트워크 연결이 잠길 것입니다. 즉, \"a\"를 지정하면 네트워크 설정이 호환 가능하더라도 2.4GHz 대역의 동일한 네트워크와 연결되지 않습니다. 이 설정은 특정 드라이버 기능에 따라 다르며 모든 드라이버에서 작동하지 않을 수도 있습니다."
-
- #: ../clients/common/settings-docs.h.in:8
- msgid ""
-@@ -5675,9 +5561,7 @@ msgid ""
- "point. This capability is highly driver dependent and not supported by all "
- "devices. Note: this property does not control the BSSID used when creating "
- "an Ad-Hoc network and is unlikely to in the future."
--msgstr ""
--"지정된 경우 지정된 액세스 지점과 만 연결되도록 장치에 지시합니다. 이 기능은 드라이버에 따라 다르며 모든 장치에서 지원되지는 않습니다. "
--"참고 :이 속성은 Ad-Hoc 네트워크를 만들 때 사용되는 BSSID를 제어하지 않으며 장래에는 불가능합니다."
-+msgstr "지정된 경우 지정된 액세스 지점과 만 연결되도록 장치에 지시합니다. 이 기능은 드라이버에 따라 다르며 모든 장치에서 지원되지는 않습니다. 참고 :이 속성은 Ad-Hoc 네트워크를 만들 때 사용되는 BSSID를 제어하지 않으며 장래에는 불가능합니다."
-
- #: ../clients/common/settings-docs.h.in:9
- msgid ""
-@@ -5685,9 +5569,7 @@ msgid ""
- "(or create for Ad-Hoc networks) a Wi-Fi network on the specified channel. "
- "Because channel numbers overlap between bands, this property also requires "
- "the \"band\" property to be set."
--msgstr ""
--"Wi-Fi 연결에 사용할 무선 채널입니다. 장치는 지정된 채널에서 Wi-Fi 네트워크를 조인 (또는 Ad-Hoc 네트워크 용으로 만 "
--"생성)합니다. 채널 번호는 밴드 사이에서 겹치기 때문에이 속성에는 \"band\"속성을 설정해야합니다."
-+msgstr "Wi-Fi 연결에 사용할 무선 채널입니다. 장치는 지정된 채널에서 Wi-Fi 네트워크를 조인 (또는 Ad-Hoc 네트워크 용으로 만 생성)합니다. 채널 번호는 밴드 사이에서 겹치기 때문에이 속성에는 \"band\"속성을 설정해야합니다."
-
- #: ../clients/common/settings-docs.h.in:10
- msgid ""
-@@ -5703,18 +5585,10 @@ msgid ""
- "defaults to \"preserve\" (older versions of NetworkManager may use a "
- "different default value). On D-Bus, this field is expressed as \"assigned-"
- "mac-address\" or the deprecated \"cloned-mac-address\"."
--msgstr ""
--"지정된 경우 장치가이 MAC 주소를 대신 사용하도록 요청하십시오. 이를 MAC 복제 또는 스푸핑이라고합니다. 명시 적으로 MAC 주소를 "
--"지정하는 것 외에도 \"보존\", \"영구\", \"임의\"및 \"안정\"특수 값이 지원됩니다. \"보존\"은 활성화시 MAC 주소를 "
--"건드리지 않는 것을 의미합니다. \"영구\"은 장치의 영구 하드웨어 주소를 사용함을 의미합니다. \"임의\"는 각 연결에 임의의 MAC "
--"주소를 만듭니다. \"stable\"은 connection.stable-id 및 컴퓨터 종속 키를 기반으로 해시 된 MAC 주소를 "
--"만듭니다. 지정하지 않으면 전역 기본값을 통해 값을 덮어 쓸 수 있습니다 (NetworkManager.conf의 설명서 참조). 여전히 "
--"지정되지 않은 경우 기본값은 \"preserve\"입니다 (NetworkManager의 이전 버전은 다른 기본값을 사용할 수 있음). D-"
--"Bus에서이 필드는 \"assigned-mac-address\"또는 더 이상 사용되지 않는 \"cloned-mac-address\"로 "
--"표시됩니다."
-+msgstr "지정된 경우 장치가이 MAC 주소를 대신 사용하도록 요청하십시오. 이를 MAC 복제 또는 스푸핑이라고합니다. 명시 적으로 MAC 주소를 지정하는 것 외에도 \"보존\", \"영구\", \"임의\"및 \"안정\"특수 값이 지원됩니다. \"보존\"은 활성화시 MAC 주소를 건드리지 않는 것을 의미합니다. \"영구\"은 장치의 영구 하드웨어 주소를 사용함을 의미합니다. \"임의\"는 각 연결에 임의의 MAC 주소를 만듭니다. \"stable\"은 connection.stable-id 및 컴퓨터 종속 키를 기반으로 해시 된 MAC 주소를 만듭니다. 지정하지 않으면 전역 기본값을 통해 값을 덮어 쓸 수 있습니다 (NetworkManager.conf의 설명서 참조). 여전히 지정되지 않은 경우 기본값은 \"preserve\"입니다 (NetworkManager의 이전 버전은 다른 기본값을 사용할 수 있음). D-Bus에서이 필드는 \"assigned-mac-address\"또는 더 이상 사용되지 않는 \"cloned-mac-address\"로 표시됩니다."
-
- #: ../clients/common/settings-docs.h.in:11
--#: ../clients/common/settings-docs.h.in:91
-+#: ../clients/common/settings-docs.h.in:94
- msgid ""
- "With \"cloned-mac-address\" setting \"random\" or \"stable\", by default all "
- "bits of the MAC address are scrambled and a locally-administered, unicast "
-@@ -5732,26 +5606,14 @@ msgid ""
- "address after the mask, this address is used instead of the current MAC "
- "address to fill the bits that shall not be randomized. For example, a value "
- "of \"FE:FF:FF:00:00:00 68:F7:28:00:00:00\" will set the OUI of the MAC "
--"address to 68:F7:28, while the lower bits are randomized. A value of \"02:00:"
--"00:00:00:00 00:00:00:00:00:00\" will create a fully scrambled globally-"
--"administered, burned-in MAC address. If the value contains more than one "
--"additional MAC addresses, one of them is chosen randomly. For example, \"02:"
--"00:00:00:00:00 00:00:00:00:00:00 02:00:00:00:00:00\" will create a fully "
--"scrambled MAC address, randomly locally or globally administered."
--msgstr ""
--"\"복제 MAC 주소\"가 \"임의\"또는 \"안정\"으로 설정되면 기본적으로 MAC 주소의 모든 비트가 스크램블되고 로컬에서 관리되는 "
--"유니 캐스트 MAC 주소가 만들어집니다. 이 속성은 특정 비트가 고정되도록 지정할 수 있습니다. 첫 번째 MAC 주소의 최하위 비트는 "
--"유니 캐스트 MAC 주소를 생성하기 위해 항상 설정 해제됩니다. 속성이 NULL이면 기본 연결 설정으로 덮어 쓸 수 있습니다. 값이 "
--"여전히 NULL 또는 빈 문자열이면 기본값은 로컬에서 관리되는 유니 캐스트 MAC 주소를 만드는 것입니다. 값에 하나의 MAC 주소가 "
--"포함되어 있으면이 주소가 마스크로 사용됩니다. 마스크의 설정 비트는 장치의 현재 MAC 주소로 채워지는 반면, 설정되지 않은 비트는 "
--"무작위 화됩니다. \"FE : FF : FF : 00 : 00 : 00\"설정은 현재 MAC 주소의 OUI를 보존하고 \"임의\"또는 "
--"\"안정\"알고리즘을 사용하여 하위 3 바이트를 랜덤 화하는 것을 의미합니다. 마스크 뒤에 하나의 추가 MAC 주소가 값에 포함 된 "
--"경우이 주소는 현재 MAC 주소 대신 사용되어 임의 화되지 않는 비트를 채 웁니다. 예를 들어 \"FE : FF : FF : 00 : "
--"00 : 00 68 : F7 : 28 : 00 : 00 : 00\"값은 MAC 주소의 OUI를 68 : F7 : 28로 설정하고 하위 "
--"비트는 무작위. \"02 : 00 : 00 : 00 : 00 : 00 00 : 00 : 00 : 00 : 00 : 00\"으로 설정하면 "
--"전체적으로 관리되고 번인 된 MAC 주소가 완전히 스크램블됩니다. 값에 둘 이상의 추가 MAC 주소가 포함되어 있으면 그 중 하나가 "
--"임의로 선택됩니다. 예를 들어 \"02 : 00 : 00 : 00 : 00 00 : 00 : 00 : 00 : 00 02 : 00 : "
--"00 : 00 : 00 : 00\"은 임의로 로컬 또는 전역으로 스크램블 된 MAC 주소를 생성합니다 관리."
-+"address to 68:F7:28, while the lower bits are randomized. A value of "
-+"\"02:00:00:00:00:00 00:00:00:00:00:00\" will create a fully scrambled "
-+"globally-administered, burned-in MAC address. If the value contains more "
-+"than one additional MAC addresses, one of them is chosen randomly. For "
-+"example, \"02:00:00:00:00:00 00:00:00:00:00:00 02:00:00:00:00:00\" will "
-+"create a fully scrambled MAC address, randomly locally or globally "
-+"administered."
-+msgstr "\"복제 MAC 주소\"가 \"임의\"또는 \"안정\"으로 설정되면 기본적으로 MAC 주소의 모든 비트가 스크램블되고 로컬에서 관리되는 유니 캐스트 MAC 주소가 만들어집니다. 이 속성은 특정 비트가 고정되도록 지정할 수 있습니다. 첫 번째 MAC 주소의 최하위 비트는 유니 캐스트 MAC 주소를 생성하기 위해 항상 설정 해제됩니다. 속성이 NULL이면 기본 연결 설정으로 덮어 쓸 수 있습니다. 값이 여전히 NULL 또는 빈 문자열이면 기본값은 로컬에서 관리되는 유니 캐스트 MAC 주소를 만드는 것입니다. 값에 하나의 MAC 주소가 포함되어 있으면이 주소가 마스크로 사용됩니다. 마스크의 설정 비트는 장치의 현재 MAC 주소로 채워지는 반면, 설정되지 않은 비트는 무작위 화됩니다. \"FE : FF : FF : 00 : 00 : 00\"설정은 현재 MAC 주소의 OUI를 보존하고 \"임의\"또는 \"안정\"알고리즘을 사용하여 하위 3 바이트를 랜덤 화하는 것을 의미합니다. 마스크 뒤에 하나의 추가 MAC 주소가 값에 포함 된 경우이 주소는 현재 MAC 주소 대신 사용되어 임의 화되지 않는 비트를 채 웁니다. 예를 들어 \"FE : FF : FF : 00 : 00 : 00 68 : F7 : 28 : 00 : 00 : 00\"값은 MAC 주소의 OUI를 68 : F7 : 28로 설정하고 하위 비트는 무작위. \"02 : 00 : 00 : 00 : 00 : 00 00 : 00 : 00 : 00 : 00 : 00\"으로 설정하면 전체적으로 관리되고 번인 된 MAC 주소가 완전히 스크램블됩니다. 값에 둘 이상의 추가 MAC 주소가 포함되어 있으면 그 중 하나가 임의로 선택됩니다. 예를 들어 \"02 : 00 : 00 : 00 : 00 00 : 00 : 00 : 00 : 00 02 : 00 : 00 : 00 : 00 : 00\"은 임의로 로컬 또는 전역으로 스크램블 된 MAC 주소를 생성합니다 관리."
-
- #: ../clients/common/settings-docs.h.in:12
- msgid ""
-@@ -5764,25 +5626,21 @@ msgid ""
- "not broadcast its SSID. Note that marking the network as hidden may be a "
- "privacy issue for you (in infrastructure mode) or client stations (in AP "
- "mode), as the explicit probe-scans are distinctly recognizable on the air."
--msgstr ""
-+msgstr "TRUE 인 경우 네트워크가 SSID를 숨기는 비 브로드 캐스트 네트워크임을 나타냅니다. 인프라 및 AP 모드에서 모두 작동합니다. 인프라 모드에서는 SSID 프로브 스캔과 같이 숨겨진 네트워크를보다 안정적으로 검색하기 위해 다양한 해결 방법이 사용됩니다. 그러나 이러한 해결 방법은 숨겨진 SSID 네트워크에 내재 된 불안감을 노출 시키므로 숨겨진 SSID 네트워크는주의해서 사용해야합니다. AP 모드에서 생성 된 네트워크는 SSID를 브로드 캐스트하지 않습니다. 명시 적 프로브 스캔은 무선으로 명확하게 인식 가능하기 때문에 네트워크를 숨김으로 표시하는 것은 인프라 스트럭처 모드 또는 클라이언트 스테이션 (AP 모드)의 개인 정보 보호 문제 일 수 있습니다."
-
- #: ../clients/common/settings-docs.h.in:13
- msgid ""
- "If specified, this connection will only apply to the Wi-Fi device whose "
- "permanent MAC address matches. This property does not change the MAC address "
- "of the device (i.e. MAC spoofing)."
--msgstr ""
--"이 연결을 지정하면이 연결은 영구 MAC 주소가 일치하는 Wi-Fi 장치에만 적용됩니다. 이 속성은 장치의 MAC 주소 (예 : MAC "
--"스푸핑)를 변경하지 않습니다."
-+msgstr "이 연결을 지정하면이 연결은 영구 MAC 주소가 일치하는 Wi-Fi 장치에만 적용됩니다. 이 속성은 장치의 MAC 주소 (예 : MAC 스푸핑)를 변경하지 않습니다."
-
- #: ../clients/common/settings-docs.h.in:14
- msgid ""
- "A list of permanent MAC addresses of Wi-Fi devices to which this connection "
- "should never apply. Each MAC address should be given in the standard hex-"
- "digits-and-colons notation (eg \"00:11:22:33:44:55\")."
--msgstr ""
--"이 연결이 절대로 적용되지 않아야하는 Wi-Fi 장치의 영구 MAC 주소 목록입니다. 각 MAC 주소는 표준 16 진수 및 콜론 표기법 "
--"(예 : \"00 : 11 : 22 : 33 : 44 : 55\")으로 지정해야합니다."
-+msgstr "이 연결이 절대로 적용되지 않아야하는 Wi-Fi 장치의 영구 MAC 주소 목록입니다. 각 MAC 주소는 표준 16 진수 및 콜론 표기법 (예 : \"00 : 11 : 22 : 33 : 44 : 55\")으로 지정해야합니다."
-
- #: ../clients/common/settings-docs.h.in:15
- msgid ""
-@@ -5792,21 +5650,16 @@ msgid ""
- "MAC address), or NM_SETTING_MAC_RANDOMIZATION_ALWAYS (2) (always randomize "
- "the MAC address). This property is deprecated for 'cloned-mac-address'. "
- "Deprecated: 1"
--msgstr ""
--"NM_SETTING_MAC_RANDOMIZATION_NEVER (1) (MAC 주소를 임의로 지정하지 않음) 또는 "
--"NM_SETTING_MAC_RANDOMIZATION_ALWAYS (2) (항상 MAC 주소를 무작위로 지정), "
--"NM_SETTING_MAC_RANDOMIZATION_DEFAULT (0) 중 하나 (사용자가 전역 기본값을 임의로 설정하고 임의성을 "
--"지원하지 않는 한 임의로 지정하지 않음) . 이 속성은 'cloned-mac-address'에 대해 사용되지 않습니다. 지원 중단 : 1"
-+msgstr "NM_SETTING_MAC_RANDOMIZATION_NEVER (1) (MAC 주소를 임의로 지정하지 않음) 또는 NM_SETTING_MAC_RANDOMIZATION_ALWAYS (2) (항상 MAC 주소를 무작위로 지정), NM_SETTING_MAC_RANDOMIZATION_DEFAULT (0) 중 하나 (사용자가 전역 기본값을 임의로 설정하고 임의성을 지원하지 않는 한 임의로 지정하지 않음) . 이 속성은 'cloned-mac-address'에 대해 사용되지 않습니다. 지원 중단 : 1"
-
- #: ../clients/common/settings-docs.h.in:16
--#, fuzzy
- msgid ""
--"Wi-Fi network mode; one of \"infrastructure\", \"mesh\", \"adhoc\" or \"ap\"."
--" If blank, infrastructure is assumed."
--msgstr "Wi-Fi 네트워크 모드; \"인프라\", \"adhoc\"또는 \"ap\"중 하나입니다. 비어 있으면 인프라가 있다고 가정합니다."
-+"Wi-Fi network mode; one of \"infrastructure\", \"mesh\", \"adhoc\" or \"ap"
-+"\". If blank, infrastructure is assumed."
-+msgstr "Wi-Fi 네트워크 모드; \"인프라\", \"메쉬\", \"애드혹\"또는 \"ap\"중 하나입니다. 비어 있으면 인프라가 가정됩니다."
-
- #: ../clients/common/settings-docs.h.in:17
--#: ../clients/common/settings-docs.h.in:94
-+#: ../clients/common/settings-docs.h.in:97
- msgid ""
- "If non-zero, only transmit packets of the specified size or smaller, "
- "breaking larger packets up into multiple Ethernet frames."
-@@ -5819,11 +5672,7 @@ msgid ""
- "saving), NM_SETTING_WIRELESS_POWERSAVE_IGNORE (1) (don't touch currently "
- "configure setting) or NM_SETTING_WIRELESS_POWERSAVE_DEFAULT (0) (use the "
- "globally configured value). All other values are reserved."
--msgstr ""
--"NM_SETTING_WIRELESS_POWERSAVE_DISABLE (2) (Wi-Fi 절전 사용 안 함), "
--"NM_SETTING_WIRELESS_POWERSAVE_ENABLE (3) (Wi-Fi 절전 사용), "
--"NM_SETTING_WIRELESS_POWERSAVE_IGNORE (1) (현재 구성 설정을 터치하지 않음) 또는 "
--"NM_SETTING_WIRELESS_POWERSAVE_DEFAULT 구성된 값). 다른 모든 값은 예약되어 있습니다."
-+msgstr "NM_SETTING_WIRELESS_POWERSAVE_DISABLE (2) (Wi-Fi 절전 사용 안 함), NM_SETTING_WIRELESS_POWERSAVE_ENABLE (3) (Wi-Fi 절전 사용), NM_SETTING_WIRELESS_POWERSAVE_IGNORE (1) (현재 구성 설정을 터치하지 않음) 또는 NM_SETTING_WIRELESS_POWERSAVE_DEFAULT 구성된 값). 다른 모든 값은 예약되어 있습니다."
-
- #: ../clients/common/settings-docs.h.in:19
- msgid ""
-@@ -5831,21 +5680,16 @@ msgid ""
- "communication with the access point. Units are in Kb/s, ie 5500 = 5.5 Mbit/"
- "s. This property is highly driver dependent and not all devices support "
- "setting a static bitrate."
--msgstr ""
--"0이 아닌 경우 지정된 비트 전송률을 액세스 지점과의 통신에만 사용하도록 장치에 지시합니다. 단위는 Kb / s, 즉 5500 = 5.5 "
--"Mbit / s입니다. 이 속성은 드라이버에 따라 다르며 모든 장치가 고정 비트 전송률을 설정할 수있는 것은 아닙니다."
-+msgstr "0이 아닌 경우 지정된 비트 전송률을 액세스 지점과의 통신에만 사용하도록 장치에 지시합니다. 단위는 Kb / s, 즉 5500 = 5.5 Mbit / s입니다. 이 속성은 드라이버에 따라 다르며 모든 장치가 고정 비트 전송률을 설정할 수있는 것은 아닙니다."
-
- #: ../clients/common/settings-docs.h.in:20
- msgid ""
--"A list of BSSIDs (each BSSID formatted as a MAC address like \"00:11:22:33:"
--"44:55\") that have been detected as part of the Wi-Fi network. "
--"NetworkManager internally tracks previously seen BSSIDs. The property is "
--"only meant for reading and reflects the BSSID list of NetworkManager. The "
--"changes you make to this property will not be preserved."
--msgstr ""
--"Wi-Fi 네트워크의 일부로 감지 된 BSSID (각 BSSID는 \"00 : 11 : 22 : 33 : 44 : 55\"와 같은 MAC "
--"주소로 포맷 됨) 목록입니다. NetworkManager는 이전에 본 BSSID를 내부적으로 추적합니다. 이 속성은 읽기 전용이며 "
--"NetworkManager의 BSSID 목록을 반영합니다. 이 속성에 대한 변경 사항은 유지되지 않습니다."
-+"A list of BSSIDs (each BSSID formatted as a MAC address like "
-+"\"00:11:22:33:44:55\") that have been detected as part of the Wi-Fi "
-+"network. NetworkManager internally tracks previously seen BSSIDs. The "
-+"property is only meant for reading and reflects the BSSID list of "
-+"NetworkManager. The changes you make to this property will not be preserved."
-+msgstr "Wi-Fi 네트워크의 일부로 감지 된 BSSID (각 BSSID는 \"00 : 11 : 22 : 33 : 44 : 55\"와 같은 MAC 주소로 포맷 됨) 목록입니다. NetworkManager는 이전에 본 BSSID를 내부적으로 추적합니다. 이 속성은 읽기 전용이며 NetworkManager의 BSSID 목록을 반영합니다. 이 속성에 대한 변경 사항은 유지되지 않습니다."
-
- #: ../clients/common/settings-docs.h.in:21
- msgid "SSID of the Wi-Fi network. Must be specified."
-@@ -5856,9 +5700,7 @@ msgid ""
- "If non-zero, directs the device to use the specified transmit power. Units "
- "are dBm. This property is highly driver dependent and not all devices "
- "support setting a static transmit power."
--msgstr ""
--"0이 아니면 지정된 전송 전원을 사용하도록 장치에 지시합니다. 단위는 dBm입니다. 이 속성은 드라이버에 따라 크게 달라지며 모든 장치가 "
--"정적 송신 전력 설정을 지원하는 것은 아닙니다."
-+msgstr "0이 아니면 지정된 전송 전원을 사용하도록 장치에 지시합니다. 단위는 dBm입니다. 이 속성은 드라이버에 따라 크게 달라지며 모든 장치가 정적 송신 전력 설정을 지원하는 것은 아닙니다."
-
- #: ../clients/common/settings-docs.h.in:23
- msgid ""
-@@ -5874,32 +5716,16 @@ msgid ""
- "NM_SETTING_WIRELESS_WAKE_ON_WLAN_DEFAULT (0x1) (to use global settings) and "
- "NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE (0x8000) (to disable management of "
- "Wake-on-LAN in NetworkManager)."
--msgstr ""
--"활성화 할 NMSettingWirelessWakeOnWLan 옵션. 모든 장치가 모든 옵션을 지원하는 것은 아닙니다. "
--"(NM_SETTING_WIRELESS_WAKE_ON_WLAN_ANY (0x2로), "
--"NM_SETTING_WIRELESS_WAKE_ON_WLAN_DISCONNECT (0x4로), "
--"NM_SETTING_WIRELESS_WAKE_ON_WLAN_MAGIC (0x8이), "
--"NM_SETTING_WIRELESS_WAKE_ON_WLAN_GTK_REKEY_FAILURE (0x10을), "
--"NM_SETTING_WIRELESS_WAKE_ON_WLAN_EAP_IDENTITY_REQUEST (가 0x20), "
--"NM_SETTING_WIRELESS_WAKE_ON_WLAN_4WAY_HANDSHAKE (× 40), "
--"NM_SETTING_WIRELESS_WAKE_ON_WLAN_RFKILL_RELEASE (0x80으로), "
--"NM_SETTING_WIRELESS_WAKE_ON_WLAN_TCP (로 0x100) 또는 특수 값 "
--"NM_SETTING_WIRELESS_WAKE_ON_WLAN_DEFAULT의 조합이 될 수 있습니다 0x1) (전역 설정 사용) 및 "
--"NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE (0x8000) (NetworkManager에서 WOL (Wake-"
--"on-LAN) 관리를 비활성화)."
-+msgstr "활성화 할 NMSettingWirelessWakeOnWLan 옵션. 모든 장치가 모든 옵션을 지원하는 것은 아닙니다. (NM_SETTING_WIRELESS_WAKE_ON_WLAN_ANY (0x2로), NM_SETTING_WIRELESS_WAKE_ON_WLAN_DISCONNECT (0x4로), NM_SETTING_WIRELESS_WAKE_ON_WLAN_MAGIC (0x8이), NM_SETTING_WIRELESS_WAKE_ON_WLAN_GTK_REKEY_FAILURE (0x10을), NM_SETTING_WIRELESS_WAKE_ON_WLAN_EAP_IDENTITY_REQUEST (가 0x20), NM_SETTING_WIRELESS_WAKE_ON_WLAN_4WAY_HANDSHAKE (× 40), NM_SETTING_WIRELESS_WAKE_ON_WLAN_RFKILL_RELEASE (0x80으로), NM_SETTING_WIRELESS_WAKE_ON_WLAN_TCP (로 0x100) 또는 특수 값 NM_SETTING_WIRELESS_WAKE_ON_WLAN_DEFAULT의 조합이 될 수 있습니다 0x1) (전역 설정 사용) 및 NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE (0x8000) (NetworkManager에서 WOL (Wake-on-LAN) 관리를 비활성화)."
-
- #: ../clients/common/settings-docs.h.in:24
- msgid ""
--"When WEP is used (ie, key-mgmt = \"none\" or \"ieee8021x\") indicate the 802."
--"11 authentication algorithm required by the AP here. One of \"open\" for "
--"Open System, \"shared\" for Shared Key, or \"leap\" for Cisco LEAP. When "
--"using Cisco LEAP (ie, key-mgmt = \"ieee8021x\" and auth-alg = \"leap\") the "
--"\"leap-username\" and \"leap-password\" properties must be specified."
--msgstr ""
--"WEP를 사용할 때 (예 : key-mgmt = \"none\"또는 \"ieee8021x\") AP에서 요구하는 802.11 인증 "
--"알고리즘을 나타냅니다. 개방형 시스템의 경우 \"열림\", 공유 키의 경우 \"공유\", Cisco LEAP의 경우 \"뛰기\"중 "
--"하나입니다. Cisco LEAP (즉, key-mgmt = \"ieee8021x\"및 auth-alg = \"leap\")을 사용하는 "
--"경우 \"leap-username\"및 \"leap-password\"등록 정보를 지정해야합니다."
-+"When WEP is used (ie, key-mgmt = \"none\" or \"ieee8021x\") indicate the "
-+"802.11 authentication algorithm required by the AP here. One of \"open\" "
-+"for Open System, \"shared\" for Shared Key, or \"leap\" for Cisco LEAP. "
-+"When using Cisco LEAP (ie, key-mgmt = \"ieee8021x\" and auth-alg = \"leap\") "
-+"the \"leap-username\" and \"leap-password\" properties must be specified."
-+msgstr "WEP를 사용할 때 (예 : key-mgmt = \"none\"또는 \"ieee8021x\") AP에서 요구하는 802.11 인증 알고리즘을 나타냅니다. 개방형 시스템의 경우 \"열림\", 공유 키의 경우 \"공유\", Cisco LEAP의 경우 \"뛰기\"중 하나입니다. Cisco LEAP (즉, key-mgmt = \"ieee8021x\"및 auth-alg = \"leap\")을 사용하는 경우 \"leap-username\"및 \"leap-password\"등록 정보를 지정해야합니다."
-
- #: ../clients/common/settings-docs.h.in:25
- msgid ""
-@@ -5911,14 +5737,7 @@ msgid ""
- "NM_SETTING_WIRELESS_SECURITY_FILS_REQUIRED (3) (enable FILS and fail if not "
- "supported). When set to NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (0) and "
- "no global default is set, FILS will be optionally enabled."
--msgstr ""
--"연결에 Fast Initial Link Setup (802.11a)이 활성화되어 있어야하는지 여부를 나타냅니다. "
--"NM_SETTING_WIRELESS_SECURITY_FILS_OPTIONAL (2) (요청자와 액세스 포인트가 지원하는 경우 FILS를 "
--"활성화) 또는 NM_SETTING_WIRELESS_SECURITY_FILS_REQUIRED (3) (FILS를 활성화하고 다음 중 하나가 "
--"실패하면 NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (0) (글로벌 기본값 사용), "
--"F_SSING_WIRELESS_SECURITY_FILS_DISABLE 지원되지 않음). "
--"NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (0)로 설정되고 글로벌 기본값이 설정되지 않은 경우 "
--"FILS가 선택적으로 활성화됩니다."
-+msgstr "연결에 Fast Initial Link Setup (802.11a)이 활성화되어 있어야하는지 여부를 나타냅니다. NM_SETTING_WIRELESS_SECURITY_FILS_OPTIONAL (2) (요청자와 액세스 포인트가 지원하는 경우 FILS를 활성화) 또는 NM_SETTING_WIRELESS_SECURITY_FILS_REQUIRED (3) (FILS를 활성화하고 다음 중 하나가 실패하면 NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (0) (글로벌 기본값 사용), F_SSING_WIRELESS_SECURITY_FILS_DISABLE 지원되지 않음). NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (0)로 설정되고 글로벌 기본값이 설정되지 않은 경우 FILS가 선택적으로 활성화됩니다."
-
- #: ../clients/common/settings-docs.h.in:26
- msgid ""
-@@ -5926,22 +5745,15 @@ msgid ""
- "to Wi-Fi networks that do not utilize one of the algorithms in the list. "
- "For maximum compatibility leave this property empty. Each list element may "
- "be one of \"wep40\", \"wep104\", \"tkip\", or \"ccmp\"."
--msgstr ""
--"목록에있는 알고리즘 중 하나를 사용하지 않는 Wi-Fi 네트워크에 대한 연결을 차단하는 그룹 / 브로드 캐스트 암호화 알고리즘 목록입니다."
--" 최대한의 호환성을 위해이 속성은 비워 둡니다. 각 목록 요소는 \"wep40\", \"wep104\", \"tkip\"또는 "
--"\"ccmp\"중 하나 일 수 있습니다."
-+msgstr "목록에있는 알고리즘 중 하나를 사용하지 않는 Wi-Fi 네트워크에 대한 연결을 차단하는 그룹 / 브로드 캐스트 암호화 알고리즘 목록입니다. 최대한의 호환성을 위해이 속성은 비워 둡니다. 각 목록 요소는 \"wep40\", \"wep104\", \"tkip\"또는 \"ccmp\"중 하나 일 수 있습니다."
-
- #: ../clients/common/settings-docs.h.in:27
--#, 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), \"sae\" (SAE) or \"wpa-eap\" (WPA-Enterprise). "
-+"Key management used for the connection. One of \"none\" (WEP), \"ieee8021x"
-+"\" (Dynamic WEP), \"wpa-psk\" (infrastructure WPA-PSK), \"sae\" (SAE), \"owe"
-+"\" (Opportunistic Wireless Encryption) or \"wpa-eap\" (WPA-Enterprise). "
- "This property must be set for any Wi-Fi connection that uses security."
--msgstr ""
--"연결에 사용되는 키 관리. WPA-PSK (인프라 WPA-PSK) 또는 \"WPA-PSK\"(WPA-PSK) 또는 WPA-PSK (WPA-"
--"PSK) 중 하나 인 \"none\"(WEP), \"ieee8021x\"(동적 WEP) WPA- 엔터프라이즈). 보안을 사용하는 Wi-"
--"Fi 연결에 대해이 속성을 설정해야합니다."
-+msgstr "연결에 사용되는 키 관리 \"없음\"(WEP), \"ieee8021x\"(동적 WEP), \"wpa-psk\"(인프라 WPA-PSK), \"sae\"(SAE), \"owe\"(Opportunistic Wireless Encryption) 또는 \"wpa-eap\"중 하나 (WPA- 기업). 보안을 사용하는 모든 Wi-Fi 연결에이 속성을 설정해야합니다."
-
- #: ../clients/common/settings-docs.h.in:28
- msgid ""
-@@ -5957,8 +5769,7 @@ msgstr "\"leap-password\"속성을 처리하는 방법을 나타내는 플래그
- msgid ""
- "The login username for legacy LEAP connections (ie, key-mgmt = \"ieee8021x\" "
- "and auth-alg = \"leap\")."
--msgstr ""
--"레거시 LEAP 연결의 로그인 사용자 이름 (예 : key-mgmt = \"ieee8021x\"및 auth-alg = \"도약\")."
-+msgstr "레거시 LEAP 연결의 로그인 사용자 이름 (예 : key-mgmt = \"ieee8021x\"및 auth-alg = \"도약\")."
-
- #: ../clients/common/settings-docs.h.in:31
- msgid ""
-@@ -5966,9 +5777,7 @@ msgid ""
- "networks that do not utilize one of the algorithms in the list. For maximum "
- "compatibility leave this property empty. Each list element may be one of "
- "\"tkip\" or \"ccmp\"."
--msgstr ""
--"목록의 알고리즘 중 하나를 사용하지 않는 Wi-Fi 네트워크에 대한 연결을 방지하는 쌍 단위 암호화 알고리즘 목록입니다. 최대한의 "
--"호환성을 위해이 속성은 비워 둡니다. 각 목록 요소는 \"tkip\"또는 \"ccmp\"중 하나 일 수 있습니다."
-+msgstr "목록의 알고리즘 중 하나를 사용하지 않는 Wi-Fi 네트워크에 대한 연결을 방지하는 쌍 단위 암호화 알고리즘 목록입니다. 최대한의 호환성을 위해이 속성은 비워 둡니다. 각 목록 요소는 \"tkip\"또는 \"ccmp\"중 하나 일 수 있습니다."
-
- #: ../clients/common/settings-docs.h.in:32
- msgid ""
-@@ -5980,23 +5789,14 @@ msgid ""
- "NM_SETTING_WIRELESS_SECURITY_PMF_REQUIRED (3) (enable PMF and fail if not "
- "supported). When set to NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT (0) and no "
- "global default is set, PMF will be optionally enabled."
--msgstr ""
--"연결에 보호 된 관리 프레임 (802.11w)을 사용해야하는지 여부를 나타냅니다. "
--"NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT (0) (글로벌 기본값 사용), "
--"NM_SETTING_WIRELESS_SECURITY_PMF_DISABLE (1) (PMF 비활성화), "
--"NM_SETTING_WIRELESS_SECURITY_PMF_OPTIONAL (2) (요청자와 액세스 지점이 지원하는 경우 PMF 사용) "
--"또는 NM_SETTING_WIRELESS_SECURITY_PMF_REQUIRED (3) 지원되지 않음). "
--"NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT (0)로 설정되고 전역 기본값이 설정되지 않은 경우 PMF가 "
--"선택적으로 활성화됩니다."
-+msgstr "연결에 보호 된 관리 프레임 (802.11w)을 사용해야하는지 여부를 나타냅니다. NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT (0) (글로벌 기본값 사용), NM_SETTING_WIRELESS_SECURITY_PMF_DISABLE (1) (PMF 비활성화), NM_SETTING_WIRELESS_SECURITY_PMF_OPTIONAL (2) (요청자와 액세스 지점이 지원하는 경우 PMF 사용) 또는 NM_SETTING_WIRELESS_SECURITY_PMF_REQUIRED (3) 지원되지 않음). NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT (0)로 설정되고 전역 기본값이 설정되지 않은 경우 PMF가 선택적으로 활성화됩니다."
-
- #: ../clients/common/settings-docs.h.in:33
- msgid ""
- "List of strings specifying the allowed WPA protocol versions to use. Each "
- "element may be one \"wpa\" (allow WPA) or \"rsn\" (allow WPA2/RSN). If not "
- "specified, both WPA and RSN connections are allowed."
--msgstr ""
--"사용할 수있는 WPA 프로토콜 버전을 지정하는 문자열 목록입니다. 각 요소는 하나의 \"wpa\"(WPA 허용) 또는 "
--"\"rsn\"(WPA2 / RSN 허용) 일 수 있습니다. 지정하지 않으면 WPA 및 RSN 연결이 허용됩니다."
-+msgstr "사용할 수있는 WPA 프로토콜 버전을 지정하는 문자열 목록입니다. 각 요소는 하나의 \"wpa\"(WPA 허용) 또는 \"rsn\"(WPA2 / RSN 허용) 일 수 있습니다. 지정하지 않으면 WPA 및 RSN 연결이 허용됩니다."
-
- #: ../clients/common/settings-docs.h.in:34
- msgid ""
-@@ -6005,7 +5805,7 @@ msgid ""
- "standard) hashed to derive the actual key, or the key in form of 64 "
- "hexadecimal character. The WPA3-Personal networks use a passphrase of any "
- "length for SAE authentication."
--msgstr ""
-+msgstr "WPA 네트워크를위한 사전 공유 키. WPA-PSK의 경우 실제 키를 도출하기 위해 해시되는 8에서 63 자의 ASCII 암호 (802.11i 표준에 지정된대로) 또는 64 개의 16 진수 문자 형식의 키입니다. WPA3- 개인 네트워크는 SAE 인증을 위해 모든 길이의 암호를 사용합니다."
-
- #: ../clients/common/settings-docs.h.in:35
- msgid "Flags indicating how to handle the \"psk\" property."
-@@ -6015,9 +5815,7 @@ msgstr "\"psk\"속성을 처리하는 방법을 나타내는 플래그입니다.
- msgid ""
- "Flags indicating how to handle the \"wep-key0\", \"wep-key1\", \"wep-key2\", "
- "and \"wep-key3\" properties."
--msgstr ""
--"\"wep-key0\", \"wep-key1\", \"wep-key2\"및 \"wep-key3\"등록 정보를 처리하는 방법을 나타내는 "
--"플래그입니다."
-+msgstr "\"wep-key0\", \"wep-key1\", \"wep-key2\"및 \"wep-key3\"등록 정보를 처리하는 방법을 나타내는 플래그입니다."
-
- #: ../clients/common/settings-docs.h.in:37
- msgid ""
-@@ -6027,42 +5825,31 @@ msgid ""
- "NM_WEP_KEY_TYPE_PASSPHRASE (2), in which case the passphrase is provided as "
- "a string and will be hashed using the de-facto MD5 method to derive the "
- "actual WEP key."
--msgstr ""
--"WEP 키의 해석을 제어합니다. 허용되는 값은 NM_WEP_KEY_TYPE_KEY (1)입니다.이 경우 키는 10 자 또는 26 자의 "
--"16 진수 문자열 또는 5 자 또는 13 자의 ASCII 암호입니다. 또는 NM_WEP_KEY_TYPE_PASSPHRASE (2)를 "
--"사용합니다.이 경우 암호는 문자열로 제공되며 실제 MD5 방법을 사용하여 실제 WEP 키를 파생시킵니다."
-+msgstr "WEP 키의 해석을 제어합니다. 허용되는 값은 NM_WEP_KEY_TYPE_KEY (1)입니다.이 경우 키는 10 자 또는 26 자의 16 진수 문자열 또는 5 자 또는 13 자의 ASCII 암호입니다. 또는 NM_WEP_KEY_TYPE_PASSPHRASE (2)를 사용합니다.이 경우 암호는 문자열로 제공되며 실제 MD5 방법을 사용하여 실제 WEP 키를 파생시킵니다."
-
- #: ../clients/common/settings-docs.h.in:38
- msgid ""
- "Index 0 WEP key. This is the WEP key used in most networks. See the \"wep-"
- "key-type\" property for a description of how this key is interpreted."
--msgstr ""
--"색인 0 WEP 키. 이것은 대부분의 네트워크에서 사용되는 WEP 키입니다. 이 키가 해석되는 방법에 대한 설명은 \"wep-key-"
--"type\"속성을 참조하십시오."
-+msgstr "색인 0 WEP 키. 이것은 대부분의 네트워크에서 사용되는 WEP 키입니다. 이 키가 해석되는 방법에 대한 설명은 \"wep-key-type\"속성을 참조하십시오."
-
- #: ../clients/common/settings-docs.h.in:39
- msgid ""
- "Index 1 WEP key. This WEP index is not used by most networks. See the "
- "\"wep-key-type\" property for a description of how this key is interpreted."
--msgstr ""
--"색인 1 WEP 키. 이 WEP 색인은 대부분의 네트워크에서 사용되지 않습니다. 이 키가 해석되는 방법에 대한 설명은 \"wep-key-"
--"type\"속성을 참조하십시오."
-+msgstr "색인 1 WEP 키. 이 WEP 색인은 대부분의 네트워크에서 사용되지 않습니다. 이 키가 해석되는 방법에 대한 설명은 \"wep-key-type\"속성을 참조하십시오."
-
- #: ../clients/common/settings-docs.h.in:40
- msgid ""
- "Index 2 WEP key. This WEP index is not used by most networks. See the "
- "\"wep-key-type\" property for a description of how this key is interpreted."
--msgstr ""
--"색인 2 WEP 키. 이 WEP 색인은 대부분의 네트워크에서 사용되지 않습니다. 이 키가 해석되는 방법에 대한 설명은 \"wep-key-"
--"type\"속성을 참조하십시오."
-+msgstr "색인 2 WEP 키. 이 WEP 색인은 대부분의 네트워크에서 사용되지 않습니다. 이 키가 해석되는 방법에 대한 설명은 \"wep-key-type\"속성을 참조하십시오."
-
- #: ../clients/common/settings-docs.h.in:41
- msgid ""
- "Index 3 WEP key. This WEP index is not used by most networks. See the "
- "\"wep-key-type\" property for a description of how this key is interpreted."
--msgstr ""
--"색인 3 WEP 키. 이 WEP 색인은 대부분의 네트워크에서 사용되지 않습니다. 이 키가 해석되는 방법에 대한 설명은 \"wep-key-"
--"type\"속성을 참조하십시오."
-+msgstr "색인 3 WEP 키. 이 WEP 색인은 대부분의 네트워크에서 사용되지 않습니다. 이 키가 해석되는 방법에 대한 설명은 \"wep-key-type\"속성을 참조하십시오."
-
- #: ../clients/common/settings-docs.h.in:42
- msgid ""
-@@ -6070,10 +5857,7 @@ msgid ""
- "index is used by the AP, put that WEP key index here. Valid values are 0 "
- "(default key) through 3. Note that some consumer access points (like the "
- "Linksys WRT54G) number the keys 1 - 4."
--msgstr ""
--"정적 WEP (예 : key-mgmt = \"none\")를 사용하고 기본값이 아닌 WEP 키 색인이 AP에서 사용되면 WEP 키 색인을 "
--"여기에 입력하십시오. 유효한 값은 0 (기본 키)부터 3까지입니다. 일부 소비자 액세스 포인트 (예 : Linksys WRT54G)는 키 "
--"1 - 4에 번호를 매 깁니다."
-+msgstr "정적 WEP (예 : key-mgmt = \"none\")를 사용하고 기본값이 아닌 WEP 키 색인이 AP에서 사용되면 WEP 키 색인을 여기에 입력하십시오. 유효한 값은 0 (기본 키)부터 3까지입니다. 일부 소비자 액세스 포인트 (예 : Linksys WRT54G)는 키 1 - 4에 번호를 매 깁니다."
-
- #: ../clients/common/settings-docs.h.in:43
- msgid ""
-@@ -6082,62 +5866,49 @@ msgid ""
- "determine whether it's feasible to start WPS enrollment from the Access "
- "Point capabilities. WPS can be disabled by setting this property to a value "
- "of 1."
--msgstr ""
--"어떤 WPS 모드가 사용되는지를 나타내는 플래그. NetworkManager가 액세스 포인트 기능에서 WPS 등록을 시작하는 것이 "
--"가능한지 여부를 자동 결정하기 때문에 기본 설정을 변경하는 것이 중요하지 않습니다. 이 속성을 1로 설정하면 WPS를 비활성화 할 수 "
--"있습니다."
-+msgstr "어떤 WPS 모드가 사용되는지를 나타내는 플래그. NetworkManager가 액세스 포인트 기능에서 WPS 등록을 시작하는 것이 가능한지 여부를 자동 결정하기 때문에 기본 설정을 변경하는 것이 중요하지 않습니다. 이 속성을 1로 설정하면 WPS를 비활성화 할 수 있습니다."
-
- #: ../clients/common/settings-docs.h.in:44
- msgid ""
- "List of strings to be matched against the altSubjectName of the certificate "
- "presented by the authentication server. If the list is empty, no "
- "verification of the server certificate's altSubjectName is performed."
--msgstr ""
--"인증 서버가 제공 한 인증서의 altSubjectName과 일치시킬 문자열 목록입니다. 목록이 비어 있으면 서버 인증서의 "
--"altSubjectName 확인이 수행되지 않습니다."
-+msgstr "인증 서버가 제공 한 인증서의 altSubjectName과 일치시킬 문자열 목록입니다. 목록이 비어 있으면 서버 인증서의 altSubjectName 확인이 수행되지 않습니다."
-
- #: ../clients/common/settings-docs.h.in:45
- msgid ""
- "Anonymous identity string for EAP authentication methods. Used as the "
- "unencrypted identity with EAP types that support different tunneled identity "
- "like EAP-TTLS."
--msgstr ""
--"EAP 인증 방법에 대한 익명 ID 문자열입니다. EAP-TTLS와 같은 다른 터널링 된 ID를 지원하는 EAP 유형의 암호화되지 않은 "
--"ID로 사용됩니다."
-+msgstr "EAP 인증 방법에 대한 익명 ID 문자열입니다. EAP-TTLS와 같은 다른 터널링 된 ID를 지원하는 EAP 유형의 암호화되지 않은 ID로 사용됩니다."
-
- #: ../clients/common/settings-docs.h.in:46
- msgid ""
- "A timeout for the authentication. Zero means the global default; if the "
- "global default is not set, the authentication timeout is 25 seconds."
--msgstr ""
--"인증에 대한 시간 초과입니다. 0은 전역 기본값을 의미합니다. 글로벌 기본값이 설정되지 않은 경우 인증 시간 초과는 25 초입니다."
-+msgstr "인증에 대한 시간 초과입니다. 0은 전역 기본값을 의미합니다. 글로벌 기본값이 설정되지 않은 경우 인증 시간 초과는 25 초입니다."
-
- #: ../clients/common/settings-docs.h.in:47
- msgid ""
--"Contains the CA certificate if used by the EAP method specified in the "
--"\"eap\" property. Certificate data is specified using a \"scheme\"; two are "
--"currently supported: blob and path. When using the blob scheme (which is "
--"backwards compatible with NM 0.7.x) this property should be set to the "
--"certificate's DER encoded data. When using the path scheme, this property "
--"should be set to the full UTF-8 encoded path of the certificate, prefixed "
--"with the string \"file://\" and ending with a terminating NUL byte. This "
--"property can be unset even if the EAP method supports CA certificates, but "
--"this allows man-in-the-middle attacks and is NOT recommended."
--msgstr ""
--"\"eap\"속성에 지정된 EAP 메서드에서 CA 인증서를 사용하는 경우이 인증서를 포함합니다. 인증서 데이터는 \"체계\"를 사용하여 "
--"지정됩니다. 두 가지가 현재 지원됩니다 : blob과 path. blob 체계 (NM 0.7.x와 역 호환)를 사용할 때이 속성은 "
--"인증서의 DER로 인코딩 된 데이터로 설정되어야합니다. 경로 체계를 사용하는 경우이 속성은 인증서의 전체 UTF-8 인코딩 경로 ( "
--"\"file : //\"문자열 접두어)로 끝나야하며 종료 NUL 바이트로 끝나야합니다. 이 속성은 EAP 메서드가 CA 인증서를 "
--"지원하더라도 설정을 해제 할 수 있지만 man-in-the-middle 공격을 허용하므로 권장되지 않습니다."
-+"Contains the CA certificate if used by the EAP method specified in the \"eap"
-+"\" property. Certificate data is specified using a \"scheme\"; three are "
-+"currently supported: blob, path and pkcs#11 URL. When using the blob scheme "
-+"this property should be set to the certificate's DER encoded data. When "
-+"using the path scheme, this property should be set to the full UTF-8 encoded "
-+"path of the certificate, prefixed with the string \"file://\" and ending "
-+"with a terminating NUL byte. This property can be unset even if the EAP "
-+"method supports CA certificates, but this allows man-in-the-middle attacks "
-+"and is NOT recommended. Note that enabling NMSetting8021x:system-ca-certs "
-+"will override this setting to use the built-in path, if the built-in path is "
-+"not a directory."
-+msgstr "\"eap\"특성에 지정된 EAP 메소드에서 사용되는 경우 CA 인증서를 포함합니다. 인증서 데이터는 \"체계\"를 사용하여 지정됩니다. blob, path 및 pkcs # 11 URL의 세 가지가 현재 지원됩니다. BLOB 구성표를 사용하는 경우이 속성은 인증서의 DER 인코딩 데이터로 설정되어야합니다. 경로 체계를 사용하는 경우이 특성은 문자열 \"file : //\"로 시작하고 종료 NUL 바이트로 끝나는 인증서의 전체 UTF-8 인코딩 경로로 설정되어야합니다. EAP 방법이 CA 인증서를 지원하더라도이 속성을 설정 해제 할 수 있지만 중간자 공격이 가능하므로 권장하지 않습니다. 내장 경로가 디렉토리가 아닌 경우 NMSetting8021x : system-ca-certs를 활성화하면 내장 경로를 사용하도록이 설정을 무시합니다."
-
- #: ../clients/common/settings-docs.h.in:48
- msgid ""
- "The password used to access the CA certificate stored in \"ca-cert\" "
- "property. Only makes sense if the certificate is stored on a PKCS#11 token "
- "that requires a login."
--msgstr ""
--"\"ca-cert\"등록 정보에 저장된 CA 인증서에 액세스하는 데 사용되는 암호입니다. 인증서가 로그인이 필요한 PKCS # 11 "
--"토큰에 저장된 경우에만 의미가 있습니다."
-+msgstr "\"ca-cert\"등록 정보에 저장된 CA 인증서에 액세스하는 데 사용되는 암호입니다. 인증서가 로그인이 필요한 PKCS # 11 토큰에 저장된 경우에만 의미가 있습니다."
-
- #: ../clients/common/settings-docs.h.in:49
- msgid "Flags indicating how to handle the \"ca-cert-password\" property."
-@@ -6147,10 +5918,10 @@ msgstr "\"ca-cert-password\"속성을 처리하는 방법을 나타내는 플래
- msgid ""
- "UTF-8 encoded path to a directory containing PEM or DER formatted "
- "certificates to be added to the verification chain in addition to the "
--"certificate specified in the \"ca-cert\" property."
--msgstr ""
--"\"ca-cert\"등록 정보에 지정된 인증서 외에도 인증 체인에 추가 할 PEM 또는 DER 형식의 인증서를 포함하는 디렉토리에 대한 "
--"UTF-8 인코딩 경로."
-+"certificate specified in the \"ca-cert\" property. If NMSetting8021x:system-"
-+"ca-certs is enabled and the built-in CA path is an existing directory, then "
-+"this setting is ignored."
-+msgstr "\"ca-cert\"특성에 지정된 인증서 외에 검증 체인에 추가 할 PEM 또는 DER 형식의 인증서를 포함하는 디렉토리에 대한 UTF-8 인코딩 경로. NMSetting8021x : system-ca-certs가 사용 가능하고 내장 CA 경로가 기존 디렉토리 인 경우이 설정은 무시됩니다."
-
- #: ../clients/common/settings-docs.h.in:51
- msgid ""
-@@ -6161,20 +5932,14 @@ msgid ""
- "certificate's DER encoded data. When using the path scheme, this property "
- "should be set to the full UTF-8 encoded path of the certificate, prefixed "
- "with the string \"file://\" and ending with a terminating NUL byte."
--msgstr ""
--"\"eap\"등록 정보에 지정된 EAP 메소드가 클라이언트 인증서를 사용할 경우이를 포함합니다. 인증서 데이터는 \"체계\"를 사용하여 "
--"지정됩니다. 두 가지가 현재 지원됩니다 : blob과 path. blob 체계 (NM 0.7.x와 역 호환)를 사용할 때이 속성은 "
--"인증서의 DER로 인코딩 된 데이터로 설정되어야합니다. 경로 체계를 사용하는 경우이 속성은 인증서의 전체 UTF-8 인코딩 경로 ( "
--"\"file : //\"문자열 접두어)로 끝나야하며 종료 NUL 바이트로 끝나야합니다."
-+msgstr "\"eap\"등록 정보에 지정된 EAP 메소드가 클라이언트 인증서를 사용할 경우이를 포함합니다. 인증서 데이터는 \"체계\"를 사용하여 지정됩니다. 두 가지가 현재 지원됩니다 : blob과 path. blob 체계 (NM 0.7.x와 역 호환)를 사용할 때이 속성은 인증서의 DER로 인코딩 된 데이터로 설정되어야합니다. 경로 체계를 사용하는 경우이 속성은 인증서의 전체 UTF-8 인코딩 경로 ( \"file : //\"문자열 접두어)로 끝나야하며 종료 NUL 바이트로 끝나야합니다."
-
- #: ../clients/common/settings-docs.h.in:52
- msgid ""
- "The password used to access the client certificate stored in \"client-cert\" "
- "property. Only makes sense if the certificate is stored on a PKCS#11 token "
- "that requires a login."
--msgstr ""
--"\"client-cert\"등록 정보에 저장된 클라이언트 인증서에 액세스하는 데 사용되는 암호입니다. 인증서가 로그인이 필요한 PKCS "
--"# 11 토큰에 저장된 경우에만 의미가 있습니다."
-+msgstr "\"client-cert\"등록 정보에 저장된 클라이언트 인증서에 액세스하는 데 사용되는 암호입니다. 인증서가 로그인이 필요한 PKCS # 11 토큰에 저장된 경우에만 의미가 있습니다."
-
- #: ../clients/common/settings-docs.h.in:53
- msgid "Flags indicating how to handle the \"client-cert-password\" property."
-@@ -6182,70 +5947,79 @@ msgstr "\"client-cert-password\"속성을 처리하는 방법을 나타내는
-
- #: ../clients/common/settings-docs.h.in:54
- msgid ""
--"Constraint for server domain name. If set, this FQDN is used as a suffix "
-+"Constraint for server domain name. If set, this list of FQDNs is used as a "
- "match requirement for dNSName element(s) of the certificate presented by the "
- "authentication server. If a matching dNSName is found, this constraint is "
- "met. If no dNSName values are present, this constraint is matched against "
--"SubjectName CN using same suffix match comparison."
--msgstr ""
--"서버 도메인 이름에 대한 제한 조건. 설정된 경우이 FQDN은 인증 서버에서 제공하는 인증서의 dNSName 요소에 대한 접미사 일치 "
--"요구 사항으로 사용됩니다. 일치하는 dNSName이 있으면이 제한 조건이 충족됩니다. dNSName 값이 없으면 동일한 접미사 일치 "
--"비교를 사용하여 SubjectName CN에 대해이 제약 조건이 일치됩니다."
-+"SubjectName CN using the same comparison. Multiple valid FQDNs can be passed "
-+"as a \";\" delimited list."
-+msgstr "서버 도메인 이름에 대한 제약 조건. 설정된 경우이 FQDN 목록은 인증 서버가 제공 한 인증서의 dNSName 요소에 대한 일치 요구 사항으로 사용됩니다. 일치하는 dNSName을 찾으면이 제한 조건이 충족됩니다. dNSName 값이 없으면이 비교는 동일한 비교를 사용하여 SubjectName CN과 일치합니다. 여러 개의 유효한 FQDN을 \";\"으로 전달할 수 있습니다. 구분 된 목록."
-
- #: ../clients/common/settings-docs.h.in:55
- msgid ""
-+"Constraint for server domain name. If set, this FQDN is used as a suffix "
-+"match requirement for dNSName element(s) of the certificate presented by the "
-+"authentication server. If a matching dNSName is found, this constraint is "
-+"met. If no dNSName values are present, this constraint is matched against "
-+"SubjectName CN using same suffix match comparison. Since version 1.24, "
-+"multiple valid FQDNs can be passed as a \";\" delimited list."
-+msgstr "서버 도메인 이름에 대한 제약 조건. 설정된 경우이 FQDN은 인증 서버가 제공 한 인증서의 dNSName 요소에 대한 접미사 일치 요구 사항으로 사용됩니다. 일치하는 dNSName을 찾으면이 제한 조건이 충족됩니다. dNSName 값이 없으면이 접미어는 동일한 접미사 일치 비교를 사용하여 SubjectName CN과 일치합니다. 버전 1.24부터 여러 유효한 FQDN을 \";\"으로 전달할 수 있습니다. 구분 된 목록."
-+
-+#: ../clients/common/settings-docs.h.in:56
-+msgid ""
- "The allowed EAP method to be used when authenticating to the network with "
- "802.1x. Valid methods are: \"leap\", \"md5\", \"tls\", \"peap\", \"ttls\", "
- "\"pwd\", and \"fast\". Each method requires different configuration using "
- "the properties of this setting; refer to wpa_supplicant documentation for "
- "the allowed combinations."
--msgstr ""
--"802.1x를 사용하여 네트워크에 인증 할 때 허용되는 EAP 방법입니다. 유효한 메소드는 \"leap\", \"md5\", "
--"\"tls\", \"peap\", \"ttls\", \"pwd\"및 \"fast\"입니다. 각 방법마다이 설정의 속성을 사용하여 다른 "
--"구성이 필요합니다. 허용되는 조합에 대해서는 wpa_supplicant 문서를 참조하십시오."
-+msgstr "802.1x를 사용하여 네트워크에 인증 할 때 허용되는 EAP 방법입니다. 유효한 메소드는 \"leap\", \"md5\", \"tls\", \"peap\", \"ttls\", \"pwd\"및 \"fast\"입니다. 각 방법마다이 설정의 속성을 사용하여 다른 구성이 필요합니다. 허용되는 조합에 대해서는 wpa_supplicant 문서를 참조하십시오."
-
--#: ../clients/common/settings-docs.h.in:56
-+#: ../clients/common/settings-docs.h.in:57
- msgid ""
- "Identity string for EAP authentication methods. Often the user's user or "
- "login name."
- msgstr "EAP 인증 방법의 ID 문자열입니다. 종종 사용자의 사용자 또는 로그인 이름."
-
--#: ../clients/common/settings-docs.h.in:57
-+#: ../clients/common/settings-docs.h.in:58
-+msgid ""
-+"Whether the 802.1X authentication is optional. If TRUE, the activation will "
-+"continue even after a timeout or an authentication failure. Setting the "
-+"property to TRUE is currently allowed only for Ethernet connections. If set "
-+"to FALSE, the activation can continue only after a successful authentication."
-+msgstr "802.1X 인증이 선택적인지 여부 TRUE이면 시간 초과 또는 인증 실패 후에도 활성화가 계속됩니다. 등록 정보를 TRUE로 설정하는 것은 현재 이더넷 연결에만 허용됩니다. FALSE로 설정하면 인증에 성공한 후에 만 활성화를 계속할 수 있습니다."
-+
-+#: ../clients/common/settings-docs.h.in:59
- msgid "UTF-8 encoded file path containing PAC for EAP-FAST."
- msgstr "EAP-FAST 용 PAC가 포함 된 UTF-8 인코딩 파일 경로"
-
--#: ../clients/common/settings-docs.h.in:58
-+#: ../clients/common/settings-docs.h.in:60
- msgid ""
- "UTF-8 encoded password used for EAP authentication methods. If both the "
- "\"password\" property and the \"password-raw\" property are specified, "
- "\"password\" is preferred."
--msgstr ""
--"EAP 인증 방법에 사용되는 UTF-8로 인코딩 된 암호 \"password\"속성과 \"password-raw\"속성이 모두 지정되면 "
--"\"password\"가 사용됩니다."
-+msgstr "EAP 인증 방법에 사용되는 UTF-8로 인코딩 된 암호 \"password\"속성과 \"password-raw\"속성이 모두 지정되면 \"password\"가 사용됩니다."
-
--#: ../clients/common/settings-docs.h.in:59
--#: ../clients/common/settings-docs.h.in:104
--#: ../clients/common/settings-docs.h.in:131
--#: ../clients/common/settings-docs.h.in:179
--#: ../clients/common/settings-docs.h.in:293
-+#: ../clients/common/settings-docs.h.in:61
-+#: ../clients/common/settings-docs.h.in:107
-+#: ../clients/common/settings-docs.h.in:149
-+#: ../clients/common/settings-docs.h.in:199
-+#: ../clients/common/settings-docs.h.in:321
- msgid "Flags indicating how to handle the \"password\" property."
- msgstr "\"password\"property의 처리 방법을 나타내는 플래그입니다."
-
--#: ../clients/common/settings-docs.h.in:60
-+#: ../clients/common/settings-docs.h.in:62
- msgid ""
- "Password used for EAP authentication methods, given as a byte array to allow "
- "passwords in other encodings than UTF-8 to be used. If both the \"password\" "
- "property and the \"password-raw\" property are specified, \"password\" is "
- "preferred."
--msgstr ""
--"EAP 인증 방법에 사용되는 암호로 UTF-8 이외의 다른 인코딩에서 암호를 사용할 수 있도록 바이트 배열로 제공됩니다. "
--"\"password\"속성과 \"password-raw\"속성이 모두 지정되면 \"password\"가 사용됩니다."
-+msgstr "EAP 인증 방법에 사용되는 암호로 UTF-8 이외의 다른 인코딩에서 암호를 사용할 수 있도록 바이트 배열로 제공됩니다. \"password\"속성과 \"password-raw\"속성이 모두 지정되면 \"password\"가 사용됩니다."
-
--#: ../clients/common/settings-docs.h.in:61
-+#: ../clients/common/settings-docs.h.in:63
- msgid "Flags indicating how to handle the \"password-raw\" property."
- msgstr "\"password-raw\"속성을 처리하는 방법을 나타내는 플래그입니다."
-
--#: ../clients/common/settings-docs.h.in:62
-+#: ../clients/common/settings-docs.h.in:64
- msgid ""
- "Specifies authentication flags to use in \"phase 1\" outer authentication "
- "using NMSetting8021xAuthFlags options. The individual TLS versions can be "
-@@ -6253,130 +6027,100 @@ msgid ""
- "the supplicant to allow or forbid it. The TLS options map to "
- "tls_disable_tlsv1_x settings. See the wpa_supplicant documentation for more "
- "details."
--msgstr ""
--"NMSetting8021xAuthFlags 옵션을 사용하여 \"1 단계\"외부 인증에 사용할 인증 플래그를 지정합니다. 개별 TLS "
--"버전은 명시 적으로 비활성화 할 수 있습니다. 특정 TLS 비활성화 플래그가 설정되지 않은 경우 허용 또는 금지하는 것은 요청자의 "
--"몫입니다. TLS 옵션은 tls_disable_tlsv1_x 설정에 매핑됩니다. 자세한 내용은 wpa_supplicant 문서를 "
--"참조하십시오."
-+msgstr "NMSetting8021xAuthFlags 옵션을 사용하여 \"1 단계\"외부 인증에 사용할 인증 플래그를 지정합니다. 개별 TLS 버전은 명시 적으로 비활성화 할 수 있습니다. 특정 TLS 비활성화 플래그가 설정되지 않은 경우 허용 또는 금지하는 것은 요청자의 몫입니다. TLS 옵션은 tls_disable_tlsv1_x 설정에 매핑됩니다. 자세한 내용은 wpa_supplicant 문서를 참조하십시오."
-
--#: ../clients/common/settings-docs.h.in:63
-+#: ../clients/common/settings-docs.h.in:65
- msgid ""
- "Enables or disables in-line provisioning of EAP-FAST credentials when FAST "
- "is specified as the EAP method in the \"eap\" property. Recognized values "
--"are \"0\" (disabled), \"1\" (allow unauthenticated provisioning), \"2\" "
--"(allow authenticated provisioning), and \"3\" (allow both authenticated and "
--"unauthenticated provisioning). See the wpa_supplicant documentation for "
--"more details."
--msgstr ""
--"\"eap\"속성에서 FAST가 EAP 메서드로 지정된 경우 EAP-FAST 자격 증명의 인라인 공급을 사용하거나 사용하지 않도록 "
--"설정합니다. 인증 된 값은 \"0\"(비활성화 됨), \"1\"(인증되지 않은 프로비저닝 허용), \"2\"(인증 된 프로비저닝 허용) "
--"및 \"3\"(인증 된 프로비저닝과 인증되지 않은 프로비저닝 모두 허용)입니다. 자세한 내용은 wpa_supplicant 문서를 "
--"참조하십시오."
-+"are \"0\" (disabled), \"1\" (allow unauthenticated provisioning), "
-+"\"2\" (allow authenticated provisioning), and \"3\" (allow both "
-+"authenticated and unauthenticated provisioning). See the wpa_supplicant "
-+"documentation for more details."
-+msgstr "\"eap\"속성에서 FAST가 EAP 메서드로 지정된 경우 EAP-FAST 자격 증명의 인라인 공급을 사용하거나 사용하지 않도록 설정합니다. 인증 된 값은 \"0\"(비활성화 됨), \"1\"(인증되지 않은 프로비저닝 허용), \"2\"(인증 된 프로비저닝 허용) 및 \"3\"(인증 된 프로비저닝과 인증되지 않은 프로비저닝 모두 허용)입니다. 자세한 내용은 wpa_supplicant 문서를 참조하십시오."
-
--#: ../clients/common/settings-docs.h.in:64
-+#: ../clients/common/settings-docs.h.in:66
- msgid ""
- "Forces use of the new PEAP label during key derivation. Some RADIUS servers "
- "may require forcing the new PEAP label to interoperate with PEAPv1. Set to "
- "\"1\" to force use of the new PEAP label. See the wpa_supplicant "
- "documentation for more details."
--msgstr ""
--"키 파생 중에 새로운 PEAP 레이블을 사용합니다. 일부 RADIUS 서버는 새로운 PEAP 레이블을 PEAPv1과 상호 운용하도록 "
--"요구할 수 있습니다. 새 PEAP 레이블을 강제로 사용하려면 \"1\"로 설정하십시오. 자세한 내용은 wpa_supplicant 문서를 "
--"참조하십시오."
-+msgstr "키 파생 중에 새로운 PEAP 레이블을 사용합니다. 일부 RADIUS 서버는 새로운 PEAP 레이블을 PEAPv1과 상호 운용하도록 요구할 수 있습니다. 새 PEAP 레이블을 강제로 사용하려면 \"1\"로 설정하십시오. 자세한 내용은 wpa_supplicant 문서를 참조하십시오."
-
--#: ../clients/common/settings-docs.h.in:65
-+#: ../clients/common/settings-docs.h.in:67
- msgid ""
- "Forces which PEAP version is used when PEAP is set as the EAP method in the "
- "\"eap\" property. When unset, the version reported by the server will be "
- "used. Sometimes when using older RADIUS servers, it is necessary to force "
- "the client to use a particular PEAP version. To do so, this property may be "
- "set to \"0\" or \"1\" to force that specific PEAP version."
--msgstr ""
--"\"eap\"속성에서 PEAP가 EAP 메서드로 설정된 경우 PEAP 버전이 사용됩니다. 설정을 해제하면 서버가보고 한 버전이 사용됩니다."
--" 때로는 이전 RADIUS 서버를 사용할 때 클라이언트가 특정 PEAP 버전을 사용해야하는 경우가 있습니다. 이렇게하려면이 속성을 "
--"\"0\"또는 \"1\"로 설정하여 특정 PEAP 버전을 강제 적용 할 수 있습니다."
-+msgstr "\"eap\"속성에서 PEAP가 EAP 메서드로 설정된 경우 PEAP 버전이 사용됩니다. 설정을 해제하면 서버가보고 한 버전이 사용됩니다. 때로는 이전 RADIUS 서버를 사용할 때 클라이언트가 특정 PEAP 버전을 사용해야하는 경우가 있습니다. 이렇게하려면이 속성을 \"0\"또는 \"1\"로 설정하여 특정 PEAP 버전을 강제 적용 할 수 있습니다."
-
--#: ../clients/common/settings-docs.h.in:66
-+#: ../clients/common/settings-docs.h.in:68
- msgid ""
- "List of strings to be matched against the altSubjectName of the certificate "
- "presented by the authentication server during the inner \"phase 2\" "
- "authentication. If the list is empty, no verification of the server "
- "certificate's altSubjectName is performed."
--msgstr ""
--"내부 \"단계 2\"인증 중에 인증 서버가 제공 한 인증서의 altSubjectName과 일치시킬 문자열 목록입니다. 목록이 비어 있으면 "
--"서버 인증서의 altSubjectName 확인이 수행되지 않습니다."
-+msgstr "내부 \"단계 2\"인증 중에 인증 서버가 제공 한 인증서의 altSubjectName과 일치시킬 문자열 목록입니다. 목록이 비어 있으면 서버 인증서의 altSubjectName 확인이 수행되지 않습니다."
-
--#: ../clients/common/settings-docs.h.in:67
-+#: ../clients/common/settings-docs.h.in:69
- msgid ""
--"Specifies the allowed \"phase 2\" inner non-EAP authentication methods when "
-+"Specifies the allowed \"phase 2\" inner non-EAP authentication method when "
- "an EAP method that uses an inner TLS tunnel is specified in the \"eap\" "
- "property. Recognized non-EAP \"phase 2\" methods are \"pap\", \"chap\", "
- "\"mschap\", \"mschapv2\", \"gtc\", \"otp\", \"md5\", and \"tls\". Each "
- "\"phase 2\" inner method requires specific parameters for successful "
- "authentication; see the wpa_supplicant documentation for more details."
--msgstr ""
--"내부 TLS 터널을 사용하는 EAP 메서드가 \"eap\"속성에 지정된 경우 허용되는 \"2 단계\"내부 비 EAP 인증 방법을 "
--"지정합니다. 인식 가능한 비 EAP \"2 단계\"방법은 \"pap\", \"chap\", \"mschap\", \"mschapv2\", "
--"\"gtc\", \"otp\", \"md5\"및 \"tls\"입니다. 각 \"2 단계\"내부 메소드는 성공적인 인증을위한 특정 매개 "
--"변수를 필요로합니다. 자세한 내용은 wpa_supplicant 문서를 참조하십시오."
-+msgstr "내부 TLS 터널을 사용하는 EAP 방법이 \"eap\"속성에 지정된 경우 허용 된 \"단계 2\"내부 비 EAP 인증 방법을 지정합니다. 인식 된 비 EAP \"단계 2\"방법은 \"pap\", \"chap\", \"mschap\", \"mschapv2\", \"gtc\", \"otp\", \"md5\"및 \"tls\"입니다. 각 \"단계 2\"내부 방법에는 성공적인 인증을위한 특정 매개 변수가 필요합니다. 자세한 내용은 wpa_supplicant 설명서를 참조하십시오."
-
--#: ../clients/common/settings-docs.h.in:68
-+#: ../clients/common/settings-docs.h.in:70
- msgid ""
--"Specifies the allowed \"phase 2\" inner EAP-based authentication methods "
--"when an EAP method that uses an inner TLS tunnel is specified in the \"eap\" "
-+"Specifies the allowed \"phase 2\" inner EAP-based authentication method when "
-+"an EAP method that uses an inner TLS tunnel is specified in the \"eap\" "
- "property. Recognized EAP-based \"phase 2\" methods are \"md5\", "
- "\"mschapv2\", \"otp\", \"gtc\", and \"tls\". Each \"phase 2\" inner method "
- "requires specific parameters for successful authentication; see the "
- "wpa_supplicant documentation for more details."
--msgstr ""
--"내부 TLS 터널을 사용하는 EAP 메서드가 \"eap\"속성에 지정된 경우 허용되는 \"2 단계\"내부 EAP 기반 인증 방법을 "
--"지정합니다. 인식 된 EAP 기반 \"2 단계\"방법은 \"md5\", \"mschapv2\", \"otp\", \"gtc\"및 "
--"\"tls\"입니다. 각 \"2 단계\"내부 메소드는 성공적인 인증을위한 특정 매개 변수를 필요로합니다. 자세한 내용은 "
--"wpa_supplicant 문서를 참조하십시오."
-+msgstr "내부 TLS 터널을 사용하는 EAP 방법이 \"eap\"속성에 지정된 경우 허용 된 \"단계 2\"내부 EAP 기반 인증 방법을 지정합니다. 인식 된 EAP 기반 \"단계 2\"방법은 \"md5\", \"mschapv2\", \"otp\", \"gtc\"및 \"tls\"입니다. 각 \"단계 2\"내부 방법에는 성공적인 인증을위한 특정 매개 변수가 필요합니다. 자세한 내용은 wpa_supplicant 설명서를 참조하십시오."
-
--#: ../clients/common/settings-docs.h.in:69
-+#: ../clients/common/settings-docs.h.in:71
- msgid ""
- "Contains the \"phase 2\" CA certificate if used by the EAP method specified "
- "in the \"phase2-auth\" or \"phase2-autheap\" properties. Certificate data is "
--"specified using a \"scheme\"; two are currently supported: blob and path. "
--"When using the blob scheme (which is backwards compatible with NM 0.7.x) "
--"this property should be set to the certificate's DER encoded data. When "
--"using the path scheme, this property should be set to the full UTF-8 encoded "
--"path of the certificate, prefixed with the string \"file://\" and ending "
--"with a terminating NUL byte. This property can be unset even if the EAP "
--"method supports CA certificates, but this allows man-in-the-middle attacks "
--"and is NOT recommended."
--msgstr ""
--"\"phase2-auth\"또는 \"phase2-autheap\"등록 정보에 지정된 EAP 메소드에서 사용하는 경우 \"2 단계\"CA "
--"인증서가 들어 있습니다. 인증서 데이터는 \"체계\"를 사용하여 지정됩니다. 두 가지가 현재 지원됩니다 : blob과 path. blob "
--"체계 (NM 0.7.x와 역 호환)를 사용할 때이 속성은 인증서의 DER로 인코딩 된 데이터로 설정되어야합니다. 경로 체계를 사용하는 "
--"경우이 속성은 인증서의 전체 UTF-8 인코딩 경로 ( \"file : //\"문자열 접두어)로 끝나야하며 종료 NUL 바이트로 "
--"끝나야합니다. 이 속성은 EAP 메서드가 CA 인증서를 지원하더라도 설정을 해제 할 수 있지만 man-in-the-middle 공격을 "
--"허용하므로 권장되지 않습니다."
-+"specified using a \"scheme\"; three are currently supported: blob, path and "
-+"pkcs#11 URL. When using the blob scheme this property should be set to the "
-+"certificate's DER encoded data. When using the path scheme, this property "
-+"should be set to the full UTF-8 encoded path of the certificate, prefixed "
-+"with the string \"file://\" and ending with a terminating NUL byte. This "
-+"property can be unset even if the EAP method supports CA certificates, but "
-+"this allows man-in-the-middle attacks and is NOT recommended. Note that "
-+"enabling NMSetting8021x:system-ca-certs will override this setting to use "
-+"the built-in path, if the built-in path is not a directory."
-+msgstr "\"phase2-auth\"또는 \"phase2-autheap\"등록 정보에 지정된 EAP 메소드에 의해 사용되는 경우 \"2 단계\"클라이언트 인증서가 들어 있습니다. 인증서 데이터는 \"체계\"를 사용하여 지정됩니다. 두 가지가 현재 지원됩니다 : blob과 path. blob 체계 (NM 0.7.x와 역 호환)를 사용할 때이 속성은 인증서의 DER로 인코딩 된 데이터로 설정되어야합니다. 경로 체계를 사용하는 경우이 속성은 인증서의 전체 UTF-8 인코딩 경로 ( \"file : //\"문자열 접두어)로 끝나야하며 종료 NUL 바이트로 끝나야합니다. 이 속성은 EAP 메서드가 CA 인증서를 지원하더라도 설정을 해제 할 수 있지만 man-in-the-middle 공격을 허용하므로 권장되지 않습니다."
-
--#: ../clients/common/settings-docs.h.in:70
-+#: ../clients/common/settings-docs.h.in:72
- msgid ""
- "The password used to access the \"phase2\" CA certificate stored in \"phase2-"
- "ca-cert\" property. Only makes sense if the certificate is stored on a "
- "PKCS#11 token that requires a login."
--msgstr ""
--"\"phase2-ca-cert\"등록 정보에 저장된 \"phase2\"CA 인증서에 액세스하는 데 사용되는 암호입니다. 인증서가 로그인이 "
--"필요한 PKCS # 11 토큰에 저장된 경우에만 의미가 있습니다."
-+msgstr "\"phase2-ca-cert\"등록 정보에 저장된 \"phase2\"CA 인증서에 액세스하는 데 사용되는 암호입니다. 인증서가 로그인이 필요한 PKCS # 11 토큰에 저장된 경우에만 의미가 있습니다."
-
--#: ../clients/common/settings-docs.h.in:71
--msgid "Flags indicating how to handle the \"phase2-ca-cert-password\" property."
-+#: ../clients/common/settings-docs.h.in:73
-+msgid ""
-+"Flags indicating how to handle the \"phase2-ca-cert-password\" property."
- msgstr "\"phase2-ca-cert-password\"속성 처리 방법을 나타내는 플래그입니다."
-
--#: ../clients/common/settings-docs.h.in:72
-+#: ../clients/common/settings-docs.h.in:74
- msgid ""
- "UTF-8 encoded path to a directory containing PEM or DER formatted "
- "certificates to be added to the verification chain in addition to the "
--"certificate specified in the \"phase2-ca-cert\" property."
--msgstr ""
--"\"phase2-ca-cert\"등록 정보에 지정된 인증서 외에 검증 체인에 추가 할 PEM 또는 DER 형식의 인증서가 포함 된 "
--"디렉토리에 대한 UTF-8 인코딩 경로."
-+"certificate specified in the \"phase2-ca-cert\" property. If NMSetting8021x:"
-+"system-ca-certs is enabled and the built-in CA path is an existing "
-+"directory, then this setting is ignored."
-+msgstr "\"phase2-ca-cert\"특성에 지정된 인증서 외에 검증 체인에 추가 할 PEM 또는 DER 형식의 인증서를 포함하는 디렉토리에 대한 UTF-8 인코딩 경로. NMSetting8021x : system-ca-certs가 사용 가능하고 내장 CA 경로가 기존 디렉토리 인 경우이 설정은 무시됩니다."
-
--#: ../clients/common/settings-docs.h.in:73
-+#: ../clients/common/settings-docs.h.in:75
- msgid ""
- "Contains the \"phase 2\" client certificate if used by the EAP method "
- "specified in the \"phase2-auth\" or \"phase2-autheap\" properties. "
-@@ -6388,42 +6132,42 @@ msgid ""
- "\"file://\" and ending with a terminating NUL byte. This property can be "
- "unset even if the EAP method supports CA certificates, but this allows man-"
- "in-the-middle attacks and is NOT recommended."
--msgstr ""
--"\"phase2-auth\"또는 \"phase2-autheap\"등록 정보에 지정된 EAP 메소드에 의해 사용되는 경우 \"2 "
--"단계\"클라이언트 인증서가 들어 있습니다. 인증서 데이터는 \"체계\"를 사용하여 지정됩니다. 두 가지가 현재 지원됩니다 : blob과 "
--"path. blob 체계 (NM 0.7.x와 역 호환)를 사용할 때이 속성은 인증서의 DER로 인코딩 된 데이터로 설정되어야합니다. 경로 "
--"체계를 사용하는 경우이 속성은 인증서의 전체 UTF-8 인코딩 경로 ( \"file : //\"문자열 접두어)로 끝나야하며 종료 NUL "
--"바이트로 끝나야합니다. 이 속성은 EAP 메서드가 CA 인증서를 지원하더라도 설정을 해제 할 수 있지만 man-in-the-middle "
--"공격을 허용하므로 권장되지 않습니다."
-+msgstr "\"phase2-auth\"또는 \"phase2-autheap\"등록 정보에 지정된 EAP 메소드에 의해 사용되는 경우 \"2 단계\"클라이언트 인증서가 들어 있습니다. 인증서 데이터는 \"체계\"를 사용하여 지정됩니다. 두 가지가 현재 지원됩니다 : blob과 path. blob 체계 (NM 0.7.x와 역 호환)를 사용할 때이 속성은 인증서의 DER로 인코딩 된 데이터로 설정되어야합니다. 경로 체계를 사용하는 경우이 속성은 인증서의 전체 UTF-8 인코딩 경로 ( \"file : //\"문자열 접두어)로 끝나야하며 종료 NUL 바이트로 끝나야합니다. 이 속성은 EAP 메서드가 CA 인증서를 지원하더라도 설정을 해제 할 수 있지만 man-in-the-middle 공격을 허용하므로 권장되지 않습니다."
-
--#: ../clients/common/settings-docs.h.in:74
-+#: ../clients/common/settings-docs.h.in:76
- msgid ""
- "The password used to access the \"phase2\" client certificate stored in "
- "\"phase2-client-cert\" property. Only makes sense if the certificate is "
- "stored on a PKCS#11 token that requires a login."
--msgstr ""
--"\"phase2-client-cert\"등록 정보에 저장된 \"phase2\"클라이언트 인증서에 액세스하는 데 사용되는 암호입니다. "
--"인증서가 로그인이 필요한 PKCS # 11 토큰에 저장된 경우에만 의미가 있습니다."
-+msgstr "\"phase2-client-cert\"등록 정보에 저장된 \"phase2\"클라이언트 인증서에 액세스하는 데 사용되는 암호입니다. 인증서가 로그인이 필요한 PKCS # 11 토큰에 저장된 경우에만 의미가 있습니다."
-
--#: ../clients/common/settings-docs.h.in:75
-+#: ../clients/common/settings-docs.h.in:77
- msgid ""
- "Flags indicating how to handle the \"phase2-client-cert-password\" property."
- msgstr "\"phase2-client-cert-password\"속성을 처리하는 방법을 나타내는 플래그."
-
--#: ../clients/common/settings-docs.h.in:76
-+#: ../clients/common/settings-docs.h.in:78
-+msgid ""
-+"Constraint for server domain name. If set, this list of FQDNs is used as a "
-+"match requirement for dNSName element(s) of the certificate presented by the "
-+"authentication server during the inner \"phase 2\" authentication. If a "
-+"matching dNSName is found, this constraint is met. If no dNSName values are "
-+"present, this constraint is matched against SubjectName CN using the same "
-+"comparison. Multiple valid FQDNs can be passed as a \";\" delimited list."
-+msgstr "서버 도메인 이름에 대한 제약 조건. 설정된 경우이 FQDN 목록은 내부 \"단계 2\"인증 중에 인증 서버가 제공 한 인증서의 dNSName 요소에 대한 일치 요구 사항으로 사용됩니다. 일치하는 dNSName을 찾으면이 제한 조건이 충족됩니다. dNSName 값이 없으면이 비교는 동일한 비교를 사용하여 SubjectName CN과 일치합니다. 여러 개의 유효한 FQDN을 \";\"으로 전달할 수 있습니다. 구분 된 목록."
-+
-+#: ../clients/common/settings-docs.h.in:79
- msgid ""
- "Constraint for server domain name. If set, this FQDN is used as a suffix "
- "match requirement for dNSName element(s) of the certificate presented by the "
- "authentication server during the inner \"phase 2\" authentication. If a "
- "matching dNSName is found, this constraint is met. If no dNSName values are "
- "present, this constraint is matched against SubjectName CN using same suffix "
--"match comparison."
--msgstr ""
--"서버 도메인 이름에 대한 제한 조건. 설정된 경우이 FQDN은 내부 \"2 단계\"인증 중에 인증 서버가 제공 한 인증서의 dNSName "
--"요소에 대한 접미사 일치 요구 사항으로 사용됩니다. 일치하는 dNSName이 있으면이 제한 조건이 충족됩니다. dNSName 값이 없으면 "
--"동일한 접미사 일치 비교를 사용하여 SubjectName CN에 대해이 제약 조건이 일치됩니다."
-+"match comparison. Since version 1.24, multiple valid FQDNs can be passed as "
-+"a \";\" delimited list."
-+msgstr "서버 도메인 이름에 대한 제약 조건. 설정된 경우이 FQDN은 내부 \"단계 2\"인증 중에 인증 서버가 제공 한 인증서의 dNSName 요소에 대한 접미사 일치 요구 사항으로 사용됩니다. 일치하는 dNSName을 찾으면이 제한 조건이 충족됩니다. dNSName 값이 없으면이 접미어는 동일한 접미사 일치 비교를 사용하여 SubjectName CN과 일치합니다. 버전 1.24부터 여러 유효한 FQDN을 \";\"으로 전달할 수 있습니다. 구분 된 목록."
-
--#: ../clients/common/settings-docs.h.in:77
-+#: ../clients/common/settings-docs.h.in:80
- msgid ""
- "Contains the \"phase 2\" inner private key when the \"phase2-auth\" or "
- "\"phase2-autheap\" property is set to \"tls\". Key data is specified using a "
-@@ -6440,53 +6184,39 @@ msgid ""
- "and ending with a terminating NUL byte, and as with the blob scheme the "
- "\"phase2-private-key-password\" property must be set to the password used to "
- "decode the PKCS#12 private key and certificate."
--msgstr ""
--"\"phase2-auth\"또는 \"phase2-autheap\"등록 정보가 \"tls\"로 설정된 경우 \"2 단계\"내부 개인 키가 "
--"들어 있습니다. 키 데이터는 \"체계\"를 사용하여 지정됩니다. 두 가지가 현재 지원됩니다 : blob과 path. blob 체계와 개인 "
--"키를 사용할 때이 속성은 키의 암호화 된 PEM 인코딩 된 데이터로 설정해야합니다. 경로 체계에서 개인 키를 사용하는 경우이 속성은 키의 "
--"전체 UTF-8 인코딩 경로로 설정해야하며 \"file : //\"문자열이 앞에 붙어 있고 종료 NUL 바이트로 끝납니다. PKCS # "
--"12 형식 개인 키와 blob 체계를 사용하는 경우이 속성은 PKCS # 12 데이터로 설정해야하며 \"phase2-private-key-"
--"password\"속성은 PKCS # 12 인증서를 해독하는 데 사용되는 암호로 설정해야하며 키. PKCS # 12 파일 및 경로 체계를 "
--"사용하는 경우이 속성은 키의 전체 UTF-8 인코딩 경로로 설정해야하며 문자열 앞에 \"file : //\"이라는 접두사가 있고 끝나는 "
--"NUL 바이트로 끝나야합니다. blob 스키마에서 \"phase2-private-key-password\"속성은 PKCS # 12 개인 "
--"키와 인증서를 디코딩하는 데 사용되는 암호로 설정해야합니다."
-+msgstr "\"phase2-auth\"또는 \"phase2-autheap\"등록 정보가 \"tls\"로 설정된 경우 \"2 단계\"내부 개인 키가 들어 있습니다. 키 데이터는 \"체계\"를 사용하여 지정됩니다. 두 가지가 현재 지원됩니다 : blob과 path. blob 체계와 개인 키를 사용할 때이 속성은 키의 암호화 된 PEM 인코딩 된 데이터로 설정해야합니다. 경로 체계에서 개인 키를 사용하는 경우이 속성은 키의 전체 UTF-8 인코딩 경로로 설정해야하며 \"file : //\"문자열이 앞에 붙어 있고 종료 NUL 바이트로 끝납니다. PKCS # 12 형식 개인 키와 blob 체계를 사용하는 경우이 속성은 PKCS # 12 데이터로 설정해야하며 \"phase2-private-key-password\"속성은 PKCS # 12 인증서를 해독하는 데 사용되는 암호로 설정해야하며 키. PKCS # 12 파일 및 경로 체계를 사용하는 경우이 속성은 키의 전체 UTF-8 인코딩 경로로 설정해야하며 문자열 앞에 \"file : //\"이라는 접두사가 있고 끝나는 NUL 바이트로 끝나야합니다. blob 스키마에서 \"phase2-private-key-password\"속성은 PKCS # 12 개인 키와 인증서를 디코딩하는 데 사용되는 암호로 설정해야합니다."
-
--#: ../clients/common/settings-docs.h.in:78
-+#: ../clients/common/settings-docs.h.in:81
- msgid ""
- "The password used to decrypt the \"phase 2\" private key specified in the "
- "\"phase2-private-key\" property when the private key either uses the path "
- "scheme, or is a PKCS#12 format key."
--msgstr ""
--"개인 키가 경로 체계를 사용하거나 PKCS # 12 형식 키일 때 \"phase2-private-key\"속성에 지정된 \"단계 "
--"2\"개인 키를 해독하는 데 사용되는 암호입니다."
-+msgstr "개인 키가 경로 체계를 사용하거나 PKCS # 12 형식 키일 때 \"phase2-private-key\"속성에 지정된 \"단계 2\"개인 키를 해독하는 데 사용되는 암호입니다."
-
--#: ../clients/common/settings-docs.h.in:79
-+#: ../clients/common/settings-docs.h.in:82
- msgid ""
- "Flags indicating how to handle the \"phase2-private-key-password\" property."
- msgstr "\"phase2-private-key-password\"속성을 처리하는 방법을 나타내는 플래그입니다."
-
--#: ../clients/common/settings-docs.h.in:80
-+#: ../clients/common/settings-docs.h.in:83
- msgid ""
- "Substring to be matched against the subject of the certificate presented by "
- "the authentication server during the inner \"phase 2\" authentication. When "
- "unset, no verification of the authentication server certificate's subject is "
- "performed. This property provides little security, if any, and its use is "
- "deprecated in favor of NMSetting8021x:phase2-domain-suffix-match."
--msgstr ""
--"내부 \"단계 2\"인증 중에 인증 서버가 제시 한 인증서 제목과 일치시킬 하위 문자열. 설정을 해제하면 인증 서버 인증서의 제목에 대한 "
--"확인이 수행되지 않습니다. 이 속성은 보안을 제공하며 NMSetting8021x : phase2-domain-suffix-match를 "
--"사용하도록 권장하지 않습니다."
-+msgstr "내부 \"단계 2\"인증 중에 인증 서버가 제시 한 인증서 제목과 일치시킬 하위 문자열. 설정을 해제하면 인증 서버 인증서의 제목에 대한 확인이 수행되지 않습니다. 이 속성은 보안을 제공하며 NMSetting8021x : phase2-domain-suffix-match를 사용하도록 권장하지 않습니다."
-
--#: ../clients/common/settings-docs.h.in:81
-+#: ../clients/common/settings-docs.h.in:84
- msgid "PIN used for EAP authentication methods."
- msgstr "EAP 인증 방법에 사용되는 PIN입니다."
-
--#: ../clients/common/settings-docs.h.in:82
--#: ../clients/common/settings-docs.h.in:181
-+#: ../clients/common/settings-docs.h.in:85
-+#: ../clients/common/settings-docs.h.in:201
- msgid "Flags indicating how to handle the \"pin\" property."
- msgstr "\"pin\"property의 처리 방법을 나타내는 플래그입니다."
-
--#: ../clients/common/settings-docs.h.in:83
-+#: ../clients/common/settings-docs.h.in:86
- msgid ""
- "Contains the private key when the \"eap\" property is set to \"tls\". Key "
- "data is specified using a \"scheme\"; two are currently supported: blob and "
-@@ -6501,81 +6231,57 @@ msgid ""
- "property should be set to the full UTF-8 encoded path of the key, prefixed "
- "with the string \"file://\" and ending with a terminating NUL byte, and as "
- "with the blob scheme the \"private-key-password\" property must be set to "
--"the password used to decode the PKCS#12 private key and certificate. WARNING:"
--" \"private-key\" is not a \"secret\" property, and thus unencrypted private "
--"key data using the BLOB scheme may be readable by unprivileged users. "
--"Private keys should always be encrypted with a private key password to "
--"prevent unauthorized access to unencrypted private key data."
--msgstr ""
--"\"eap\"속성이 \"tls\"로 설정된 경우 개인 키가 들어 있습니다. 키 데이터는 \"체계\"를 사용하여 지정됩니다. 두 가지가 "
--"현재 지원됩니다 : blob과 path. blob 체계와 개인 키를 사용할 때이 속성은 키의 암호화 된 PEM 인코딩 된 데이터로 "
--"설정해야합니다. 경로 체계에서 개인 키를 사용하는 경우이 속성은 키의 전체 UTF-8 인코딩 경로로 설정해야하며 \"file : //"
--"\"문자열이 앞에 붙어 있고 종료 NUL 바이트로 끝납니다. PKCS # 12 형식 개인 키 및 blob 체계를 사용하는 경우이 속성을 "
--"PKCS # 12 데이터로 설정하고 \"private-key-password\"속성을 PKCS # 12 인증서 및 키의 암호를 해독하는 "
--"데 사용되는 암호로 설정해야합니다. PKCS # 12 파일 및 경로 체계를 사용하는 경우이 속성은 키의 전체 UTF-8 인코딩 경로로 "
--"설정해야하며 문자열 앞에 \"file : //\"이라는 접두사가 있고 끝나는 NUL 바이트로 끝나야합니다. blob 스킴에서 "
--"\"private-key-password\"속성은 PKCS # 12 개인 키와 인증서를 디코딩하는 데 사용되는 암호로 설정되어야합니다. "
--"경고 : \"개인 키\"는 \"비밀\"속성이 아니므로 BLOB 체계를 사용하는 암호화되지 않은 개인 키 데이터는 권한이없는 사용자가 읽을 "
--"수 있습니다. 개인 키는 암호화되지 않은 개인 키 데이터에 대한 무단 액세스를 방지하기 위해 개인 키 암호로 항상 암호화되어야합니다."
-+"the password used to decode the PKCS#12 private key and certificate. "
-+"WARNING: \"private-key\" is not a \"secret\" property, and thus unencrypted "
-+"private key data using the BLOB scheme may be readable by unprivileged "
-+"users. Private keys should always be encrypted with a private key password "
-+"to prevent unauthorized access to unencrypted private key data."
-+msgstr "\"eap\"속성이 \"tls\"로 설정된 경우 개인 키가 들어 있습니다. 키 데이터는 \"체계\"를 사용하여 지정됩니다. 두 가지가 현재 지원됩니다 : blob과 path. blob 체계와 개인 키를 사용할 때이 속성은 키의 암호화 된 PEM 인코딩 된 데이터로 설정해야합니다. 경로 체계에서 개인 키를 사용하는 경우이 속성은 키의 전체 UTF-8 인코딩 경로로 설정해야하며 \"file : //\"문자열이 앞에 붙어 있고 종료 NUL 바이트로 끝납니다. PKCS # 12 형식 개인 키 및 blob 체계를 사용하는 경우이 속성을 PKCS # 12 데이터로 설정하고 \"private-key-password\"속성을 PKCS # 12 인증서 및 키의 암호를 해독하는 데 사용되는 암호로 설정해야합니다. PKCS # 12 파일 및 경로 체계를 사용하는 경우이 속성은 키의 전체 UTF-8 인코딩 경로로 설정해야하며 문자열 앞에 \"file : //\"이라는 접두사가 있고 끝나는 NUL 바이트로 끝나야합니다. blob 스킴에서 \"private-key-password\"속성은 PKCS # 12 개인 키와 인증서를 디코딩하는 데 사용되는 암호로 설정되어야합니다. 경고 : \"개인 키\"는 \"비밀\"속성이 아니므로 BLOB 체계를 사용하는 암호화되지 않은 개인 키 데이터는 권한이없는 사용자가 읽을 수 있습니다. 개인 키는 암호화되지 않은 개인 키 데이터에 대한 무단 액세스를 방지하기 위해 개인 키 암호로 항상 암호화되어야합니다."
-
--#: ../clients/common/settings-docs.h.in:84
-+#: ../clients/common/settings-docs.h.in:87
- msgid ""
--"The password used to decrypt the private key specified in the \"private-"
--"key\" property when the private key either uses the path scheme, or if the "
-+"The password used to decrypt the private key specified in the \"private-key"
-+"\" property when the private key either uses the path scheme, or if the "
- "private key is a PKCS#12 format key."
--msgstr ""
--"개인 키가 경로 체계를 사용하거나 개인 키가 PKCS # 12 형식 키인 경우 \"개인 키\"속성에 지정된 개인 키의 암호를 해독하는 데 "
--"사용되는 암호입니다."
-+msgstr "개인 키가 경로 체계를 사용하거나 개인 키가 PKCS # 12 형식 키인 경우 \"개인 키\"속성에 지정된 개인 키의 암호를 해독하는 데 사용되는 암호입니다."
-
--#: ../clients/common/settings-docs.h.in:85
-+#: ../clients/common/settings-docs.h.in:88
- msgid "Flags indicating how to handle the \"private-key-password\" property."
- msgstr "\"private-key-password\"속성을 처리하는 방법을 나타내는 플래그입니다."
-
--#: ../clients/common/settings-docs.h.in:86
-+#: ../clients/common/settings-docs.h.in:89
- msgid ""
- "Substring to be matched against the subject of the certificate presented by "
- "the authentication server. When unset, no verification of the authentication "
- "server certificate's subject is performed. This property provides little "
- "security, if any, and its use is deprecated in favor of NMSetting8021x:"
- "domain-suffix-match."
--msgstr ""
--"인증 서버가 제시 한 인증서 제목과 일치시킬 하위 문자열입니다. 설정을 해제하면 인증 서버 인증서의 제목에 대한 확인이 수행되지 않습니다."
--" 이 속성은 거의 보안을 제공하지 않으며 NMSetting8021x : domain-suffix-match를 사용하여 해당 기능의 사용이 "
--"권장되지 않습니다."
-+msgstr "인증 서버가 제시 한 인증서 제목과 일치시킬 하위 문자열입니다. 설정을 해제하면 인증 서버 인증서의 제목에 대한 확인이 수행되지 않습니다. 이 속성은 거의 보안을 제공하지 않으며 NMSetting8021x : domain-suffix-match를 사용하여 해당 기능의 사용이 권장되지 않습니다."
-
--#: ../clients/common/settings-docs.h.in:87
-+#: ../clients/common/settings-docs.h.in:90
- msgid ""
- "When TRUE, overrides the \"ca-path\" and \"phase2-ca-path\" properties using "
- "the system CA directory specified at configure time with the --system-ca-"
- "path switch. The certificates in this directory are added to the "
--"verification chain in addition to any certificates specified by the \"ca-"
--"cert\" and \"phase2-ca-cert\" properties. If the path provided with --system-"
--"ca-path is rather a file name (bundle of trusted CA certificates), it "
--"overrides \"ca-cert\" and \"phase2-ca-cert\" properties instead (sets "
--"ca_cert/ca_cert2 options for wpa_supplicant)."
--msgstr ""
--"TRUE 일 경우 configure시에 지정된 --system-ca-path 스위치로 시스템 CA 디렉토리를 사용하여 \"ca-"
--"path\"및 \"phase2-ca-path\"등록 정보를 무시합니다. 이 디렉토리의 인증서는 \"ca-cert\"및 \"phase2-"
--"ca-cert\"속성에 지정된 인증서 이외에 인증 체인에 추가됩니다. --system-ca-path와 함께 제공되는 경로가 파일 이름 "
--"(신뢰할 수있는 CA 인증서의 번들) 인 경우 대신 \"ca-cert\"및 \"phase2-ca-cert\"속성을 무시합니다 "
--"(wpa_supplicant에 대한 ca_cert / ca_cert2 옵션 설정). )."
-+"verification chain in addition to any certificates specified by the \"ca-cert"
-+"\" and \"phase2-ca-cert\" properties. If the path provided with --system-ca-"
-+"path is rather a file name (bundle of trusted CA certificates), it overrides "
-+"\"ca-cert\" and \"phase2-ca-cert\" properties instead (sets ca_cert/ca_cert2 "
-+"options for wpa_supplicant)."
-+msgstr "TRUE 일 경우 configure시에 지정된 --system-ca-path 스위치로 시스템 CA 디렉토리를 사용하여 \"ca-path\"및 \"phase2-ca-path\"등록 정보를 무시합니다. 이 디렉토리의 인증서는 \"ca-cert\"및 \"phase2-ca-cert\"속성에 지정된 인증서 이외에 인증 체인에 추가됩니다. --system-ca-path와 함께 제공되는 경로가 파일 이름 (신뢰할 수있는 CA 인증서의 번들) 인 경우 대신 \"ca-cert\"및 \"phase2-ca-cert\"속성을 무시합니다 (wpa_supplicant에 대한 ca_cert / ca_cert2 옵션 설정). )."
-
--#: ../clients/common/settings-docs.h.in:88
-+#: ../clients/common/settings-docs.h.in:91
- msgid ""
- "When TRUE, enforce auto-negotiation of speed and duplex mode. If \"speed\" "
- "and \"duplex\" properties are both specified, only that single mode will be "
- "advertised and accepted during the link auto-negotiation process: this works "
- "only for BASE-T 802.3 specifications and is useful for enforcing gigabits "
--"modes, as in these cases link negotiation is mandatory. When FALSE, "
--"\"speed\" and \"duplex\" properties should be both set or link configuration "
--"will be skipped."
--msgstr ""
--"TRUE이면 속도 및 이중 모드의 자동 협상을 적용합니다. \"speed\"및 \"duplex\"속성이 모두 지정되면 링크 자동 협상 "
--"과정에서 해당 단일 모드 만 보급되고 승인됩니다.이 모드는 BASE-T 802.3 사양에서만 작동하며이 모드 에서처럼 기가비트 모드를 "
--"적용하는 데 유용합니다 사례 링크 협상이 필수적입니다. FALSE 일 때, \"speed\"와 \"duplex\"속성이 모두 설정되어 "
--"있거나 링크 구성을 건너 뛰어야합니다."
-+"modes, as in these cases link negotiation is mandatory. When FALSE, \"speed"
-+"\" and \"duplex\" properties should be both set or link configuration will "
-+"be skipped."
-+msgstr "TRUE이면 속도 및 이중 모드의 자동 협상을 적용합니다. \"speed\"및 \"duplex\"속성이 모두 지정되면 링크 자동 협상 과정에서 해당 단일 모드 만 보급되고 승인됩니다.이 모드는 BASE-T 802.3 사양에서만 작동하며이 모드 에서처럼 기가비트 모드를 적용하는 데 유용합니다 사례 링크 협상이 필수적입니다. FALSE 일 때, \"speed\"와 \"duplex\"속성이 모두 설정되어 있거나 링크 구성을 건너 뛰어야합니다."
-
--#: ../clients/common/settings-docs.h.in:89
-+#: ../clients/common/settings-docs.h.in:92
- msgid ""
- "If specified, request that the device use this MAC address instead. This is "
- "known as MAC cloning or spoofing. Beside explicitly specifying a MAC "
-@@ -6586,21 +6292,13 @@ msgid ""
- "creates a random MAC address on each connect. \"stable\" creates a hashed "
- "MAC address based on connection.stable-id and a machine dependent key. If "
- "unspecified, the value can be overwritten via global defaults, see manual of "
--"NetworkManager.conf. If still unspecified, it defaults to \"preserve\" "
--"(older versions of NetworkManager may use a different default value). On D-"
--"Bus, this field is expressed as \"assigned-mac-address\" or the deprecated "
-+"NetworkManager.conf. If still unspecified, it defaults to \"preserve"
-+"\" (older versions of NetworkManager may use a different default value). On "
-+"D-Bus, this field is expressed as \"assigned-mac-address\" or the deprecated "
- "\"cloned-mac-address\"."
--msgstr ""
--"지정된 경우 장치가이 MAC 주소를 대신 사용하도록 요청하십시오. 이를 MAC 복제 또는 스푸핑이라고합니다. 명시 적으로 MAC 주소를 "
--"지정하는 것 외에도 \"보존\", \"영구\", \"임의\"및 \"안정\"특수 값이 지원됩니다. \"보존\"은 활성화시 MAC 주소를 "
--"건드리지 않는 것을 의미합니다. \"영구적 인\"은 장치에 영구적 인 하드웨어 주소가있는 경우 영구적 인 하드웨어 주소를 사용함을 "
--"의미합니다 (그렇지 않으면 \"보존\"으로 간주됩니다). \"임의\"는 각 연결에 임의의 MAC 주소를 만듭니다. \"stable\"은 "
--"connection.stable-id 및 컴퓨터 종속 키를 기반으로 해시 된 MAC 주소를 만듭니다. 지정하지 않으면 전역 기본값을 통해 "
--"값을 덮어 쓸 수 있습니다 (NetworkManager.conf의 설명서 참조). 여전히 지정되지 않은 경우 기본값은 "
--"\"preserve\"입니다 (NetworkManager의 이전 버전은 다른 기본값을 사용할 수 있음). D-Bus에서이 필드는 "
--"\"assigned-mac-address\"또는 더 이상 사용되지 않는 \"cloned-mac-address\"로 표시됩니다."
-+msgstr "지정된 경우 장치가이 MAC 주소를 대신 사용하도록 요청하십시오. 이를 MAC 복제 또는 스푸핑이라고합니다. 명시 적으로 MAC 주소를 지정하는 것 외에도 \"보존\", \"영구\", \"임의\"및 \"안정\"특수 값이 지원됩니다. \"보존\"은 활성화시 MAC 주소를 건드리지 않는 것을 의미합니다. \"영구적 인\"은 장치에 영구적 인 하드웨어 주소가있는 경우 영구적 인 하드웨어 주소를 사용함을 의미합니다 (그렇지 않으면 \"보존\"으로 간주됩니다). \"임의\"는 각 연결에 임의의 MAC 주소를 만듭니다. \"stable\"은 connection.stable-id 및 컴퓨터 종속 키를 기반으로 해시 된 MAC 주소를 만듭니다. 지정하지 않으면 전역 기본값을 통해 값을 덮어 쓸 수 있습니다 (NetworkManager.conf의 설명서 참조). 여전히 지정되지 않은 경우 기본값은 \"preserve\"입니다 (NetworkManager의 이전 버전은 다른 기본값을 사용할 수 있음). D-Bus에서이 필드는 \"assigned-mac-address\"또는 더 이상 사용되지 않는 \"cloned-mac-address\"로 표시됩니다."
-
--#: ../clients/common/settings-docs.h.in:90
-+#: ../clients/common/settings-docs.h.in:93
- msgid ""
- "When a value is set, either \"half\" or \"full\", configures the device to "
- "use the specified duplex mode. If \"auto-negotiate\" is \"yes\" the "
-@@ -6613,62 +6311,45 @@ msgid ""
- "advertise all the supported duplex modes. Must be set together with the "
- "\"speed\" property if specified. Before specifying a duplex mode be sure "
- "your device supports it."
--msgstr ""
--"값이 \"half\"또는 \"full\"로 설정되면 지정된 이중 모드를 사용하도록 장치를 구성합니다. \"자동 협상\"이 \"예\"인 "
--"경우 지정된 이중 모드가 링크 협상 중에 광고되는 유일한 모드가됩니다. 이는 BASE-T 802.3 사양에서만 작동하며 링크 협상이 필수 "
--"인 것처럼 기가비트 모드를 적용하는 데 유용합니다. 값이 설정되지 않은 경우 (기본값) 링크 구성은 건너 뛰거나 ( \"자동 협상\"이 "
--"\"아니오\", 기본값) 또는 자동 협상됩니다 ( \"자동 협상\"이 \"예\"인 경우) 로컬 장치는 지원되는 모든 이중 모드를 "
--"광고합니다. 지정된 경우 \"속도\"속성과 함께 설정해야합니다. 양면 모드를 지정하기 전에 장치가 지원하는지 확인하십시오."
-+msgstr "값이 \"half\"또는 \"full\"로 설정되면 지정된 이중 모드를 사용하도록 장치를 구성합니다. \"자동 협상\"이 \"예\"인 경우 지정된 이중 모드가 링크 협상 중에 광고되는 유일한 모드가됩니다. 이는 BASE-T 802.3 사양에서만 작동하며 링크 협상이 필수 인 것처럼 기가비트 모드를 적용하는 데 유용합니다. 값이 설정되지 않은 경우 (기본값) 링크 구성은 건너 뛰거나 ( \"자동 협상\"이 \"아니오\", 기본값) 또는 자동 협상됩니다 ( \"자동 협상\"이 \"예\"인 경우) 로컬 장치는 지원되는 모든 이중 모드를 광고합니다. 지정된 경우 \"속도\"속성과 함께 설정해야합니다. 양면 모드를 지정하기 전에 장치가 지원하는지 확인하십시오."
-
--#: ../clients/common/settings-docs.h.in:92
-+#: ../clients/common/settings-docs.h.in:95
- msgid ""
- "If specified, this connection will only apply to the Ethernet device whose "
- "permanent MAC address matches. This property does not change the MAC address "
- "of the device (i.e. MAC spoofing)."
--msgstr ""
--"이 연결을 지정하면이 연결은 영구 MAC 주소가 일치하는 이더넷 장치에만 적용됩니다. 이 속성은 장치의 MAC 주소 (예 : MAC "
--"스푸핑)를 변경하지 않습니다."
-+msgstr "이 연결을 지정하면이 연결은 영구 MAC 주소가 일치하는 이더넷 장치에만 적용됩니다. 이 속성은 장치의 MAC 주소 (예 : MAC 스푸핑)를 변경하지 않습니다."
-
--#: ../clients/common/settings-docs.h.in:93
-+#: ../clients/common/settings-docs.h.in:96
- msgid ""
- "If specified, this connection will never apply to the Ethernet device whose "
- "permanent MAC address matches an address in the list. Each MAC address is "
- "in the standard hex-digits-and-colons notation (00:11:22:33:44:55)."
--msgstr ""
--"이 연결을 지정하면 영구 MAC 주소가 목록의 주소와 일치하는 이더넷 장치에는이 연결이 적용되지 않습니다. 각 MAC 주소는 표준 16 "
--"진수 및 콜론 표기법 (00 : 11 : 22 : 33 : 44 : 55)으로되어 있습니다."
-+msgstr "이 연결을 지정하면 영구 MAC 주소가 목록의 주소와 일치하는 이더넷 장치에는이 연결이 적용되지 않습니다. 각 MAC 주소는 표준 16 진수 및 콜론 표기법 (00 : 11 : 22 : 33 : 44 : 55)으로되어 있습니다."
-
--#: ../clients/common/settings-docs.h.in:95
-+#: ../clients/common/settings-docs.h.in:98
- msgid ""
--"Specific port type to use if the device supports multiple attachment methods."
--" One of \"tp\" (Twisted Pair), \"aui\" (Attachment Unit Interface), \"bnc\" "
--"(Thin Ethernet) or \"mii\" (Media Independent Interface). If the device "
--"supports only one port type, this setting is ignored."
--msgstr ""
--"장치가 여러 연결 방법을 지원할 경우 사용할 특정 포트 유형입니다. \"tp\"(Twisted Pair), "
--"\"aui\"(Attachment Unit Interface), \"bnc\"(Thin Ethernet) 또는 \"mii\"(Media "
--"Independent Interface) 중 하나입니다. 장치가 하나의 포트 유형 만 지원하는 경우이 설정은 무시됩니다."
-+"Specific port type to use if the device supports multiple attachment "
-+"methods. One of \"tp\" (Twisted Pair), \"aui\" (Attachment Unit Interface), "
-+"\"bnc\" (Thin Ethernet) or \"mii\" (Media Independent Interface). If the "
-+"device supports only one port type, this setting is ignored."
-+msgstr "장치가 여러 연결 방법을 지원할 경우 사용할 특정 포트 유형입니다. \"tp\"(Twisted Pair), \"aui\"(Attachment Unit Interface), \"bnc\"(Thin Ethernet) 또는 \"mii\"(Media Independent Interface) 중 하나입니다. 장치가 하나의 포트 유형 만 지원하는 경우이 설정은 무시됩니다."
-
--#: ../clients/common/settings-docs.h.in:96
-+#: ../clients/common/settings-docs.h.in:99
- msgid ""
- "s390 network device type; one of \"qeth\", \"lcs\", or \"ctc\", representing "
- "the different types of virtual network devices available on s390 systems."
--msgstr ""
--"s390 네트워크 장치 유형; s390 시스템에서 사용할 수있는 여러 종류의 가상 네트워크 장치를 나타내는 \"qeth\", "
--"\"lcs\"또는 \"ctc\"중 하나입니다."
-+msgstr "s390 네트워크 장치 유형; s390 시스템에서 사용할 수있는 여러 종류의 가상 네트워크 장치를 나타내는 \"qeth\", \"lcs\"또는 \"ctc\"중 하나입니다."
-
--#: ../clients/common/settings-docs.h.in:97
-+#: ../clients/common/settings-docs.h.in:100
- msgid ""
- "Dictionary of key/value pairs of s390-specific device options. Both keys "
- "and values must be strings. Allowed keys include \"portno\", \"layer2\", "
- "\"portname\", \"protocol\", among others. Key names must contain only "
- "alphanumeric characters (ie, [a-zA-Z0-9])."
--msgstr ""
--"s390 관련 장치 옵션의 키 / 값 쌍 사전입니다. 키와 값은 모두 문자열이어야합니다. 허용 된 키에는 \"portno\", "
--"\"layer2\", \"portname\", \"protocol\"등이 있습니다. 키 이름은 영숫자 문자 (예 : [a-zA-Z0-"
--"9]) 만 포함해야합니다."
-+msgstr "s390 관련 장치 옵션의 키 / 값 쌍 사전입니다. 키와 값은 모두 문자열이어야합니다. 허용 된 키에는 \"portno\", \"layer2\", \"portname\", \"protocol\"등이 있습니다. 키 이름은 영숫자 문자 (예 : [a-zA-Z0-9]) 만 포함해야합니다."
-
--#: ../clients/common/settings-docs.h.in:98
-+#: ../clients/common/settings-docs.h.in:101
- msgid ""
- "Identifies specific subchannels that this network device uses for "
- "communication with z/VM or s390 host. Like the \"mac-address\" property for "
-@@ -6676,34 +6357,24 @@ msgid ""
- "applies to the network device that uses these subchannels. The list should "
- "contain exactly 3 strings, and each string may only be composed of "
- "hexadecimal characters and the period (.) character."
--msgstr ""
--"이 네트워크 장치가 z / VM 또는 s390 호스트와의 통신에 사용하는 특정 서브 채널을 식별합니다. z / VM이 아닌 장치의 "
--"\"mac-address\"등록 정보와 마찬가지로이 등록 정보를 사용하여이 연결이이 서브 채널을 사용하는 네트워크 장치에만 적용되는지 "
--"확인할 수 있습니다. 목록에는 정확히 3 개의 문자열이 포함되어야하며 각 문자열은 16 진수 문자와 마침표 (.) 문자로만 구성 될 수 "
--"있습니다."
-+msgstr "이 네트워크 장치가 z / VM 또는 s390 호스트와의 통신에 사용하는 특정 서브 채널을 식별합니다. z / VM이 아닌 장치의 \"mac-address\"등록 정보와 마찬가지로이 등록 정보를 사용하여이 연결이이 서브 채널을 사용하는 네트워크 장치에만 적용되는지 확인할 수 있습니다. 목록에는 정확히 3 개의 문자열이 포함되어야하며 각 문자열은 16 진수 문자와 마침표 (.) 문자로만 구성 될 수 있습니다."
-
--#: ../clients/common/settings-docs.h.in:99
-+#: ../clients/common/settings-docs.h.in:102
- msgid ""
- "When a value greater than 0 is set, configures the device to use the "
- "specified speed. If \"auto-negotiate\" is \"yes\" the specified speed will "
- "be the only one advertised during link negotiation: this works only for BASE-"
- "T 802.3 specifications and is useful for enforcing gigabit speeds, as in "
- "this case link negotiation is mandatory. If the value is unset (0, the "
--"default), the link configuration will be either skipped (if \"auto-"
--"negotiate\" is \"no\", the default) or will be auto-negotiated (if \"auto-"
--"negotiate\" is \"yes\") and the local device will advertise all the "
--"supported speeds. In Mbit/s, ie 100 == 100Mbit/s. Must be set together with "
--"the \"duplex\" property when non-zero. Before specifying a speed value be "
--"sure your device supports it."
--msgstr ""
--"0보다 큰 값이 설정되면 지정된 속도를 사용하도록 장치를 구성합니다. \"자동 협상\"이 \"예\"인 경우 지정한 속도가 링크 협상 중에 "
--"광고되는 유일한 속도가됩니다. 이것은 BASE-T 802.3 사양에서만 작동하며 기가비트 속도를 강화하는 데 유용합니다.이 경우 링크 "
--"협상이 필수적입니다. 값이 설정되지 않은 경우 (기본값 0) 링크 구성이 건너 뜁니다 ( \"자동 협상\"이 \"아니요\"인 경우 "
--"기본값) 또는 자동 협상됩니다 ( \"자동 협상\"이 \"예\"인 경우). \") 로컬 장치가 지원되는 모든 속도를 광고합니다. Mbit "
--"/ s, 즉 100 == 100Mbit / s. 0이 아닌 경우 \"duplex\"속성과 함께 설정해야합니다. 속도 값을 지정하기 전에 "
--"장치가이를 지원하는지 확인하십시오."
-+"default), the link configuration will be either skipped (if \"auto-negotiate"
-+"\" is \"no\", the default) or will be auto-negotiated (if \"auto-negotiate\" "
-+"is \"yes\") and the local device will advertise all the supported speeds. In "
-+"Mbit/s, ie 100 == 100Mbit/s. Must be set together with the \"duplex\" "
-+"property when non-zero. Before specifying a speed value be sure your device "
-+"supports it."
-+msgstr "0보다 큰 값이 설정되면 지정된 속도를 사용하도록 장치를 구성합니다. \"자동 협상\"이 \"예\"인 경우 지정한 속도가 링크 협상 중에 광고되는 유일한 속도가됩니다. 이것은 BASE-T 802.3 사양에서만 작동하며 기가비트 속도를 강화하는 데 유용합니다.이 경우 링크 협상이 필수적입니다. 값이 설정되지 않은 경우 (기본값 0) 링크 구성이 건너 뜁니다 ( \"자동 협상\"이 \"아니요\"인 경우 기본값) 또는 자동 협상됩니다 ( \"자동 협상\"이 \"예\"인 경우). \") 로컬 장치가 지원되는 모든 속도를 광고합니다. Mbit / s, 즉 100 == 100Mbit / s. 0이 아닌 경우 \"duplex\"속성과 함께 설정해야합니다. 속도 값을 지정하기 전에 장치가이를 지원하는지 확인하십시오."
-
--#: ../clients/common/settings-docs.h.in:100
-+#: ../clients/common/settings-docs.h.in:103
- msgid ""
- "The NMSettingWiredWakeOnLan options to enable. Not all devices support all "
- "options. May be any combination of NM_SETTING_WIRED_WAKE_ON_LAN_PHY (0x2), "
-@@ -6714,147 +6385,208 @@ msgid ""
- "(0x40) or the special values NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT (0x1) (to "
- "use global settings) and NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE (0x8000) (to "
- "disable management of Wake-on-LAN in NetworkManager)."
--msgstr ""
--"활성화 할 NMSettingWiredWakeOnLan 옵션. 모든 장치가 모든 옵션을 지원하는 것은 아닙니다. "
--"NM_SETTING_WIRED_WAKE_ON_LAN_PHY (0x2로), "
--"NM_SETTING_WIRED_WAKE_ON_LAN_UNICAST (0x4로), "
--"NM_SETTING_WIRED_WAKE_ON_LAN_MULTICAST (0x8이), "
--"NM_SETTING_WIRED_WAKE_ON_LAN_BROADCAST (0x10을), "
--"NM_SETTING_WIRED_WAKE_ON_LAN_ARP (가 0x20), "
--"NM_SETTING_WIRED_WAKE_ON_LAN_MAGIC (× 40) 또는 특수 값 "
--"NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT (0x1로) (전역 설정을 사용하는) 및 "
--"NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE의 조합이 될 수 있습니다 (0x8000) (NetworkManager의 "
--"WOL (Wake-on-LAN) 관리를 비활성화)."
-+msgstr "활성화 할 NMSettingWiredWakeOnLan 옵션. 모든 장치가 모든 옵션을 지원하는 것은 아닙니다. NM_SETTING_WIRED_WAKE_ON_LAN_PHY (0x2로), NM_SETTING_WIRED_WAKE_ON_LAN_UNICAST (0x4로), NM_SETTING_WIRED_WAKE_ON_LAN_MULTICAST (0x8이), NM_SETTING_WIRED_WAKE_ON_LAN_BROADCAST (0x10을), NM_SETTING_WIRED_WAKE_ON_LAN_ARP (가 0x20), NM_SETTING_WIRED_WAKE_ON_LAN_MAGIC (× 40) 또는 특수 값 NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT (0x1로) (전역 설정을 사용하는) 및 NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE의 조합이 될 수 있습니다 (0x8000) (NetworkManager의 WOL (Wake-on-LAN) 관리를 비활성화)."
-
--#: ../clients/common/settings-docs.h.in:101
-+#: ../clients/common/settings-docs.h.in:104
- msgid ""
- "If specified, the password used with magic-packet-based Wake-on-LAN, "
- "represented as an Ethernet MAC address. If NULL, no password will be "
- "required."
--msgstr ""
--"지정된 경우 마술 - 패킷 기반 Wake-on-LAN에 사용되는 암호로, 이더넷 MAC 주소로 표시됩니다. NULL이면 암호가 필요하지 "
--"않습니다."
-+msgstr "지정된 경우 마술 - 패킷 기반 Wake-on-LAN에 사용되는 암호로, 이더넷 MAC 주소로 표시됩니다. NULL이면 암호가 필요하지 않습니다."
-
--#: ../clients/common/settings-docs.h.in:102
-+#: ../clients/common/settings-docs.h.in:105
- msgid "Encapsulation of ADSL connection. Can be \"vcmux\" or \"llc\"."
- msgstr "ADSL 연결 캡슐화. \"vcmux\"또는 \"llc\"일 수 있습니다."
-
--#: ../clients/common/settings-docs.h.in:103
-+#: ../clients/common/settings-docs.h.in:106
- msgid "Password used to authenticate with the ADSL service."
- msgstr "ADSL 서비스 인증에 사용되는 비밀번호."
-
--#: ../clients/common/settings-docs.h.in:105
-+#: ../clients/common/settings-docs.h.in:108
- msgid "ADSL connection protocol. Can be \"pppoa\", \"pppoe\" or \"ipoatm\"."
- msgstr "ADSL 연결 프로토콜. \"pppoa\", \"pppoe\"또는 \"ipoatm\"일 수 있습니다."
-
--#: ../clients/common/settings-docs.h.in:106
-+#: ../clients/common/settings-docs.h.in:109
- msgid "Username used to authenticate with the ADSL service."
- msgstr "ADSL 서비스 인증에 사용되는 사용자 이름."
-
--#: ../clients/common/settings-docs.h.in:107
-+#: ../clients/common/settings-docs.h.in:110
- msgid "VCI of ADSL connection"
- msgstr "ADSL 연결의 VCI"
-
--#: ../clients/common/settings-docs.h.in:108
-+#: ../clients/common/settings-docs.h.in:111
- msgid "VPI of ADSL connection"
- msgstr "ADSL 연결의 VPI"
-
--#: ../clients/common/settings-docs.h.in:109
-+#: ../clients/common/settings-docs.h.in:112
- msgid "The Bluetooth address of the device."
- msgstr "장치의 블루투스 주소입니다."
-
--#: ../clients/common/settings-docs.h.in:110
-+#: ../clients/common/settings-docs.h.in:113
- msgid ""
- "Either \"dun\" for Dial-Up Networking connections or \"panu\" for Personal "
- "Area Networking connections to devices supporting the NAP profile."
- msgstr "전화 접속 네트워킹 연결의 경우 \"dun\"또는 NAP 프로필을 지원하는 장치의 개인 영역 네트워킹 연결의 경우 \"panu\"."
-
--#: ../clients/common/settings-docs.h.in:111
-+#: ../clients/common/settings-docs.h.in:114
- msgid ""
- "Dictionary of key/value pairs of bonding options. Both keys and values must "
- "be strings. Option names must contain only alphanumeric characters (ie, [a-"
- "zA-Z0-9])."
--msgstr ""
--"본딩 옵션의 키 / 값 쌍 사전입니다. 키와 값은 모두 문자열이어야합니다. 옵션 이름은 영숫자 문자 (예 : [a-zA-Z0-9]) 만 "
--"포함해야합니다."
-+msgstr "본딩 옵션의 키 / 값 쌍 사전입니다. 키와 값은 모두 문자열이어야합니다. 옵션 이름은 영숫자 문자 (예 : [a-zA-Z0-9]) 만 포함해야합니다."
-
--#: ../clients/common/settings-docs.h.in:112
-+#: ../clients/common/settings-docs.h.in:115
- msgid "The Ethernet MAC address aging time, in seconds."
- msgstr "이더넷 MAC 주소 에이징 시간 (초)."
-
--#: ../clients/common/settings-docs.h.in:113
-+#: ../clients/common/settings-docs.h.in:116
- msgid "The Spanning Tree Protocol (STP) forwarding delay, in seconds."
- msgstr "STP (Spanning Tree Protocol) 전달 지연 (초)입니다."
-
--#: ../clients/common/settings-docs.h.in:114
-+#: ../clients/common/settings-docs.h.in:117
-+msgid ""
-+"If specified, The MAC address of the multicast group this bridge uses for "
-+"STP. The address must be a link-local address in standard Ethernet MAC "
-+"address format, ie an address of the form 01:80:C2:00:00:0X, with X in [0, "
-+"4..F]. If not specified the default value is 01:80:C2:00:00:00."
-+msgstr "지정된 경우이 브리지가 STP에 사용하는 멀티 캐스트 그룹의 MAC 주소입니다. 주소는 표준 이더넷 MAC 주소 형식의 링크 로컬 주소 여야합니다 (예 : 01 : 80 : C2 : 00 : 00 : 0X 형식의 주소, X는 [0, 4..F]). 지정하지 않으면 기본값은 01 : 80 : C2 : 00 : 00 : 00입니다."
-+
-+#: ../clients/common/settings-docs.h.in:118
- msgid ""
- "A mask of group addresses to forward. Usually, group addresses in the range "
- "from 01:80:C2:00:00:00 to 01:80:C2:00:00:0F are not forwarded according to "
- "standards. This property is a mask of 16 bits, each corresponding to a group "
- "address in that range that must be forwarded. The mask can't have bits 0, 1 "
- "or 2 set because they are used for STP, MAC pause frames and LACP."
--msgstr ""
--"전달할 그룹 주소의 마스크. 일반적으로 01 : 80 : C2 : 00 : 00 : 00에서 01 : 80 : C2 : 00 : 00 : "
--"0F 사이의 그룹 주소는 표준에 따라 전달되지 않습니다. 이 속성은 16 비트 마스크로 전달되어야하는 해당 범위의 그룹 주소에 각각 "
--"해당합니다. 마스크는 STP, MAC 중지 프레임 및 LACP에 사용되므로 비트 0, 1 또는 2를 설정할 수 없습니다."
-+msgstr "전달할 그룹 주소의 마스크. 일반적으로 01 : 80 : C2 : 00 : 00 : 00에서 01 : 80 : C2 : 00 : 00 : 0F 사이의 그룹 주소는 표준에 따라 전달되지 않습니다. 이 속성은 16 비트 마스크로 전달되어야하는 해당 범위의 그룹 주소에 각각 해당합니다. 마스크는 STP, MAC 중지 프레임 및 LACP에 사용되므로 비트 0, 1 또는 2를 설정할 수 없습니다."
-
--#: ../clients/common/settings-docs.h.in:115
-+#: ../clients/common/settings-docs.h.in:119
- msgid "The Spanning Tree Protocol (STP) hello time, in seconds."
- msgstr "스패닝 트리 프로토콜 (STP) hello 시간 (초)."
-
--#: ../clients/common/settings-docs.h.in:116
-+#: ../clients/common/settings-docs.h.in:120
- msgid ""
- "If specified, the MAC address of bridge. When creating a new bridge, this "
- "MAC address will be set. If this field is left unspecified, the \"ethernet."
--"cloned-mac-address\" is referred instead to generate the initial MAC address."
--" Note that setting \"ethernet.cloned-mac-address\" anyway overwrites the MAC "
--"address of the bridge later while activating the bridge. Hence, this "
-+"cloned-mac-address\" is referred instead to generate the initial MAC "
-+"address. Note that setting \"ethernet.cloned-mac-address\" anyway overwrites "
-+"the MAC address of the bridge later while activating the bridge. Hence, this "
- "property is deprecated. Deprecated: 1"
--msgstr ""
--"지정된 경우 브리지의 MAC 주소입니다. 새 브리지를 만들 때이 MAC 주소가 설정됩니다. 이 필드를 지정하지 않으면 \"ethernet."
--"cloned-mac-address\"가 대신 참조되어 초기 MAC 주소가 생성됩니다. 어쨌든 \"ethernet.cloned-mac-"
--"address\"를 설정하면 나중에 브리지를 활성화하는 동안 브리지의 MAC 주소를 덮어 씁니다. 따라서이 속성은 더 이상 사용되지 "
--"않습니다. 지원 중단 : 1"
-+msgstr "지정된 경우 브리지의 MAC 주소입니다. 새 브리지를 만들 때이 MAC 주소가 설정됩니다. 이 필드를 지정하지 않으면 \"ethernet.cloned-mac-address\"가 대신 참조되어 초기 MAC 주소가 생성됩니다. 어쨌든 \"ethernet.cloned-mac-address\"를 설정하면 나중에 브리지를 활성화하는 동안 브리지의 MAC 주소를 덮어 씁니다. 따라서이 속성은 더 이상 사용되지 않습니다. 지원 중단 : 1"
-
--#: ../clients/common/settings-docs.h.in:117
-+#: ../clients/common/settings-docs.h.in:121
- msgid "The Spanning Tree Protocol (STP) maximum message age, in seconds."
- msgstr "STP (Spanning Tree Protocol) 최대 메시지 수명 (초)."
-
--#: ../clients/common/settings-docs.h.in:118
-+#: ../clients/common/settings-docs.h.in:122
-+msgid "Set maximum size of multicast hash table (value must be a power of 2)."
-+msgstr "멀티 캐스트 해시 테이블의 최대 크기를 설정하십시오 (값은 2의 거듭 제곱이어야합니다)."
-+
-+#: ../clients/common/settings-docs.h.in:123
-+msgid ""
-+"Set the number of queries the bridge will send before stopping forwarding a "
-+"multicast group after a \"leave\" message has been received."
-+msgstr "\"leave\"메시지가 수신 된 후 멀티 캐스트 그룹의 전달을 중지하기 전에 브릿지가 전송할 쿼리 수를 설정하십시오."
-+
-+#: ../clients/common/settings-docs.h.in:124
-+msgid ""
-+"Set interval (in deciseconds) between queries to find remaining members of a "
-+"group, after a \"leave\" message is received."
-+msgstr "\"탈퇴\"메시지가 수신 된 후 그룹의 나머지 구성원을 찾기 위해 쿼리 사이의 간격 (초)을 설정하십시오."
-+
-+#: ../clients/common/settings-docs.h.in:125
-+msgid ""
-+"Set delay (in deciseconds) after which the bridge will leave a group, if no "
-+"membership reports for this group are received."
-+msgstr "이 그룹에 대한 회원 보고서가 수신되지 않으면 브리지가 그룹을 떠나는 지연 시간 (초)을 설정하십시오."
-+
-+#: ../clients/common/settings-docs.h.in:126
-+msgid ""
-+"Enable or disable sending of multicast queries by the bridge. If not "
-+"specified the option is disabled."
-+msgstr "브리지에 의한 멀티 캐스트 쿼리 전송을 활성화 또는 비활성화합니다. 지정하지 않으면 옵션이 비활성화됩니다."
-+
-+#: ../clients/common/settings-docs.h.in:127
-+msgid ""
-+"If no queries are seen after this delay (in deciseconds) has passed, the "
-+"bridge will start to send its own queries."
-+msgstr "이 지연 시간 (초)이 지난 후에 쿼리가 표시되지 않으면 브리지가 자체 쿼리를 보내기 시작합니다."
-+
-+#: ../clients/common/settings-docs.h.in:128
-+msgid ""
-+"Interval (in deciseconds) between queries sent by the bridge after the end "
-+"of the startup phase."
-+msgstr "시작 단계가 끝난 후 브리지가 보낸 쿼리 사이의 간격 (초)입니다."
-+
-+#: ../clients/common/settings-docs.h.in:129
-+msgid ""
-+"Set the Max Response Time/Max Response Delay (in deciseconds) for IGMP/MLD "
-+"queries sent by the bridge."
-+msgstr "브리지에서 보낸 IGMP / MLD 쿼리에 대한 최대 응답 시간 / 최대 응답 지연 (초)을 설정하십시오."
-+
-+#: ../clients/common/settings-docs.h.in:130
-+msgid ""
-+"If enabled the bridge's own IP address is used as the source address for "
-+"IGMP queries otherwise the default of 0.0.0.0 is used."
-+msgstr "활성화 된 경우 브리지 자체 IP 주소가 IGMP 쿼리의 소스 주소로 사용되며 그렇지 않은 경우 기본값 0.0.0.0이 사용됩니다."
-+
-+#: ../clients/common/settings-docs.h.in:131
-+msgid ""
-+"Sets bridge's multicast router. Multicast-snooping must be enabled for this "
-+"option to work. Supported values are: 'auto', 'disabled', 'enabled'. If not "
-+"specified the default value is 'auto'."
-+msgstr "브리지의 멀티 캐스트 라우터를 설정합니다. 이 옵션이 작동하려면 멀티 캐스트 스누핑을 활성화해야합니다. 지원되는 값은 'auto', 'disabled', 'enabled'입니다. 지정하지 않으면 기본값은 'auto'입니다."
-+
-+#: ../clients/common/settings-docs.h.in:132
- msgid ""
- "Controls whether IGMP snooping is enabled for this bridge. Note that if "
- "snooping was automatically disabled due to hash collisions, the system may "
- "refuse to enable the feature until the collisions are resolved."
--msgstr ""
--"이 브리지에 대해 IGMP 스누핑을 활성화할지 여부를 제어합니다. 해시 충돌로 인해 스누핑이 자동으로 비활성화 된 경우 시스템은 충돌이 "
--"해결 될 때까지 기능을 사용하지 못하게 할 수 있습니다."
-+msgstr "이 브리지에 대해 IGMP 스누핑을 활성화할지 여부를 제어합니다. 해시 충돌로 인해 스누핑이 자동으로 비활성화 된 경우 시스템은 충돌이 해결 될 때까지 기능을 사용하지 못하게 할 수 있습니다."
-
--#: ../clients/common/settings-docs.h.in:119
-+#: ../clients/common/settings-docs.h.in:133
-+msgid "Set the number of IGMP queries to send during startup phase."
-+msgstr "시작 단계에서 전송할 IGMP 쿼리 수를 설정하십시오."
-+
-+#: ../clients/common/settings-docs.h.in:134
-+msgid ""
-+"Sets the time (in deciseconds) between queries sent out at startup to "
-+"determine membership information."
-+msgstr "시작시 전송 된 쿼리 사이의 시간 (초)을 설정하여 멤버십 정보를 결정합니다."
-+
-+#: ../clients/common/settings-docs.h.in:135
- msgid ""
- "Sets the Spanning Tree Protocol (STP) priority for this bridge. Lower "
- "values are \"better\"; the lowest priority bridge will be elected the root "
- "bridge."
--msgstr ""
--"이 브리지에 대한 STP (Spanning Tree Protocol) 우선 순위를 설정합니다. 낮은 값은 \"더 좋음\"입니다. 가장 "
--"낮은 우선 순위 브리지가 루트 브리지로 선출됩니다."
-+msgstr "이 브리지에 대한 STP (Spanning Tree Protocol) 우선 순위를 설정합니다. 낮은 값은 \"더 좋음\"입니다. 가장 낮은 우선 순위 브리지가 루트 브리지로 선출됩니다."
-
--#: ../clients/common/settings-docs.h.in:120
-+#: ../clients/common/settings-docs.h.in:136
- msgid ""
- "Controls whether Spanning Tree Protocol (STP) is enabled for this bridge."
- msgstr "이 브리지에 대해 STP (Spanning Tree Protocol)를 사용할지 여부를 제어합니다."
-
--#: ../clients/common/settings-docs.h.in:121
-+#: ../clients/common/settings-docs.h.in:137
- msgid ""
- "The default PVID for the ports of the bridge, that is the VLAN id assigned "
- "to incoming untagged frames."
--msgstr ""
-+msgstr "브리지 포트의 기본 PVID, 즉 태그가없는 수신 프레임에 할당 된 VLAN ID입니다."
-
--#: ../clients/common/settings-docs.h.in:122
--#, fuzzy
-+#: ../clients/common/settings-docs.h.in:138
- msgid "Control whether VLAN filtering is enabled on the bridge."
--msgstr "이 브리지에 대해 STP (Spanning Tree Protocol)를 사용할지 여부를 제어합니다."
-+msgstr "브리지에서 VLAN 필터링을 사용할지 여부를 제어합니다."
-
--#: ../clients/common/settings-docs.h.in:123
-+#: ../clients/common/settings-docs.h.in:139
-+msgid ""
-+"If specified, the protocol used for VLAN filtering. Supported values are: "
-+"'802.1Q', '802.1ad'. If not specified the default value is '802.1Q'."
-+msgstr "지정된 경우, 프로토콜은 VLAN 필터링에 사용됩니다. 지원되는 값은 '802.1Q', '802.1ad'입니다. 지정하지 않으면 기본값은 '802.1Q'입니다."
-+
-+#: ../clients/common/settings-docs.h.in:140
-+msgid "Controls whether per-VLAN stats accounting is enabled."
-+msgstr "VLAN 별 통계 계정 사용 여부를 제어합니다."
-+
-+#: ../clients/common/settings-docs.h.in:141
- 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-"
-@@ -6862,81 +6594,73 @@ msgid ""
- "following syntax: $vid [pvid] [untagged] [, $vid [pvid] [untagged]]... where "
- "$vid is either a single id between 1 and 4094 or a range, represented as a "
- "couple of ids separated by a dash."
--msgstr ""
-+msgstr "브리지 VLAN 객체의 배열. 여기에 지정된 VLAN 외에도 브리지에는 bridge.vlan-default-pvid 속성으로 구성된 default-pvid VLAN이 있습니다. nmcli에서 VLAN 목록은 다음 구문으로 지정할 수 있습니다. $vid [pvid] [태그 없음] [, $vid [pvid] [tagged]] ... 어디서 $vid 는 1에서 4094 사이의 단일 ID이거나 대시로 구분 된 두 개의 ID로 표시되는 범위입니다."
-
--#: ../clients/common/settings-docs.h.in:124
-+#: ../clients/common/settings-docs.h.in:142
- 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 "포트에 대해 \"머리핀 모드\"를 활성화하거나 비활성화하여 프레임을 수신 한 포트를 통해 프레임을 다시 보낼 수 있습니다."
-
--#: ../clients/common/settings-docs.h.in:125
-+#: ../clients/common/settings-docs.h.in:143
- msgid ""
- "The Spanning Tree Protocol (STP) port cost for destinations via this port."
- msgstr "이 포트를 통한 대상에 대한 STP (Spanning Tree Protocol) 포트 비용."
-
--#: ../clients/common/settings-docs.h.in:126
-+#: ../clients/common/settings-docs.h.in:144
- msgid "The Spanning Tree Protocol (STP) priority of this bridge port."
- msgstr "이 브리지 포트의 스패닝 트리 프로토콜 (STP) 우선 순위."
-
--#: ../clients/common/settings-docs.h.in:127
-+#: ../clients/common/settings-docs.h.in:145
- 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 ""
-+"with the following syntax: $vid [pvid] [untagged] [, $vid [pvid] "
-+"[untagged]]... where $vid is either a single id between 1 and 4094 or a "
-+"range, represented as a couple of ids separated by a dash."
-+msgstr "브리지 VLAN 객체의 배열. 여기에 지정된 VLAN 외에도 포트에는 bridge.vlan-default-pvid 속성으로 브리지에 기본 pvid VLAN이 구성됩니다. nmcli에서 VLAN 목록은 다음 구문으로 지정할 수 있습니다. $vid [pvid] [태그 없음] [, $vid [pvid] [tagged]] ... 어디서 $vid 는 1에서 4094 사이의 단일 ID이거나 대시로 구분 된 두 개의 ID로 표시되는 범위입니다."
-
--#: ../clients/common/settings-docs.h.in:128
--#: ../clients/common/settings-docs.h.in:175
--#: ../clients/common/settings-docs.h.in:186
-+#: ../clients/common/settings-docs.h.in:146
-+#: ../clients/common/settings-docs.h.in:195
-+#: ../clients/common/settings-docs.h.in:206
- msgid ""
- "If non-zero, only transmit packets of the specified size or smaller, "
- "breaking larger packets up into multiple frames."
- msgstr "0이 아니면 지정된 크기 이하의 패킷 만 전송하여 큰 패킷을 여러 프레임으로 분할합니다."
-
--#: ../clients/common/settings-docs.h.in:129
-+#: ../clients/common/settings-docs.h.in:147
- msgid ""
- "The number to dial to establish the connection to the CDMA-based mobile "
- "broadband network, if any. If not specified, the default number (#777) is "
- "used when required."
--msgstr ""
--"CDMA 기반 모바일 광대역 네트워크에 연결하기 위해 전화를 걸 번호입니다 (있는 경우). 지정하지 않으면 기본 번호 (# 777)가 "
--"필요할 때 사용됩니다."
-+msgstr "CDMA 기반 모바일 광대역 네트워크에 연결하기 위해 전화를 걸 번호입니다 (있는 경우). 지정하지 않으면 기본 번호 (# 777)가 필요할 때 사용됩니다."
-
--#: ../clients/common/settings-docs.h.in:130
--#: ../clients/common/settings-docs.h.in:178
-+#: ../clients/common/settings-docs.h.in:148
-+#: ../clients/common/settings-docs.h.in:198
- msgid ""
- "The password used to authenticate with the network, if required. Many "
- "providers do not require a password, or accept any password. But if a "
- "password is required, it is specified here."
--msgstr ""
--"필요한 경우 네트워크 인증에 사용되는 암호입니다. 많은 제공 업체는 암호가 필요 없으며 암호를 수락합니다. 그러나 암호가 필요한 경우 "
--"여기에 지정됩니다."
-+msgstr "필요한 경우 네트워크 인증에 사용되는 암호입니다. 많은 제공 업체는 암호가 필요 없으며 암호를 수락합니다. 그러나 암호가 필요한 경우 여기에 지정됩니다."
-
--#: ../clients/common/settings-docs.h.in:132
--#: ../clients/common/settings-docs.h.in:184
-+#: ../clients/common/settings-docs.h.in:150
-+#: ../clients/common/settings-docs.h.in:204
- msgid ""
- "The username used to authenticate with the network, if required. Many "
- "providers do not require a username, or accept any username. But if a "
- "username is required, it is specified here."
--msgstr ""
--"필요한 경우 네트워크 인증에 사용되는 사용자 이름입니다. 많은 제공 업체는 사용자 이름을 요구하거나 사용자 이름을 수락하지 않습니다. "
--"그러나 사용자 이름이 필요한 경우 여기에 지정됩니다."
-+msgstr "필요한 경우 네트워크 인증에 사용되는 사용자 이름입니다. 많은 제공 업체는 사용자 이름을 요구하거나 사용자 이름을 수락하지 않습니다. 그러나 사용자 이름이 필요한 경우 여기에 지정됩니다."
-
--#: ../clients/common/settings-docs.h.in:133
-+#: ../clients/common/settings-docs.h.in:151
- msgid ""
- "The number of retries for the authentication. Zero means to try "
- "indefinitely; -1 means to use a global default. If the global default is not "
- "set, the authentication retries for 3 times before failing the connection. "
- "Currently this only applies to 802-1x authentication."
--msgstr ""
--"인증 재시도 = 수. 0은 무기한 시도를 의미합니다. -1은 글로벌 기본값을 사용함을 의미합니다. 글로 z 기본값이 설정되지 않은 경우, "
--"인증은 연결 실패 전에 3 회 재 시도합니다. 현재 이것은 802-1x 인증에만 적용됩니다."
-+msgstr "인증 재시도 = 수. 0은 무기한 시도를 의미합니다. -1은 글로벌 기본값을 사용함을 의미합니다. 글로 z 기본값이 설정되지 않은 경우, 인증은 연결 실패 전에 3 회 재 시도합니다. 현재 이것은 802-1x 인증에만 적용됩니다."
-
--#: ../clients/common/settings-docs.h.in:134
-+#: ../clients/common/settings-docs.h.in:152
- msgid ""
- "Whether or not the connection should be automatically connected by "
- "NetworkManager when the resources for the connection are available. TRUE to "
-@@ -6944,32 +6668,25 @@ msgid ""
- "to activate the connection. Note that autoconnect is not implemented for VPN "
- "profiles. See \"secondaries\" as an alternative to automatically connect VPN "
- "profiles."
--msgstr ""
--"연결 자원이 사용 가능할 때 NetworkManager에 의해 연결이 자동으로 연결되어야하는지 여부. 자동으로 연결을 활성화하려면 "
--"TRUE, 연결을 활성화하려면 수동 개입이 필요하면 FALSE VPN 연결에는 자동 연결이 구현되어 있지 않습니다. VPN 프로필을 "
--"자동으로 연결하는 대신 \"보조\"를 참조하십시오."
-+msgstr "연결 자원이 사용 가능할 때 NetworkManager에 의해 연결이 자동으로 연결되어야하는지 여부. 자동으로 연결을 활성화하려면 TRUE, 연결을 활성화하려면 수동 개입이 필요하면 FALSE VPN 연결에는 자동 연결이 구현되어 있지 않습니다. VPN 프로필을 자동으로 연결하는 대신 \"보조\"를 참조하십시오."
-
--#: ../clients/common/settings-docs.h.in:135
-+#: ../clients/common/settings-docs.h.in:153
- msgid ""
- "The autoconnect priority. If the connection is set to autoconnect, "
- "connections with higher priority will be preferred. Defaults to 0. The "
- "higher number means higher priority."
--msgstr ""
--"자동 연결 우선 순위. 연결이 자동 연결로 설정된 경우 우선 순위가 높은 연결이 선호됩니다. 높은 숫자는 높은 우선 순위를 의미합니다."
-+msgstr "자동 연결 우선 순위. 연결이 자동 연결로 설정된 경우 우선 순위가 높은 연결이 선호됩니다. 높은 숫자는 높은 우선 순위를 의미합니다."
-
--#: ../clients/common/settings-docs.h.in:136
-+#: ../clients/common/settings-docs.h.in:154
- msgid ""
- "The number of times a connection should be tried when autoactivating before "
- "giving up. Zero means forever, -1 means the global default (4 times if not "
- "overridden). Setting this to 1 means to try activation only once before "
- "blocking autoconnect. Note that after a timeout, NetworkManager will try to "
- "autoconnect again."
--msgstr ""
--"포기하기 전에 자동 활성화 할 때 연결을 시도해야하는 횟수입니다. 0은 영원을 의미하고 -1은 글로벌 기본값을 의미합니다 (재정의되지 "
--"않으면 4 번). 이 값을 1로 설정하면 자동 연결을 차단하기 전에 한 번만 활성화를 시도합니다. 시간 초과 후 "
--"NetworkManager는 자동으로 다시 연결을 시도합니다."
-+msgstr "포기하기 전에 자동 활성화 할 때 연결을 시도해야하는 횟수입니다. 0은 영원을 의미하고 -1은 글로벌 기본값을 의미합니다 (재정의되지 않으면 4 번). 이 값을 1로 설정하면 자동 연결을 차단하기 전에 한 번만 활성화를 시도합니다. 시간 초과 후 NetworkManager는 자동으로 다시 연결을 시도합니다."
-
--#: ../clients/common/settings-docs.h.in:137
-+#: ../clients/common/settings-docs.h.in:155
- msgid ""
- "Whether or not slaves of this connection should be automatically brought up "
- "when NetworkManager activates this connection. This only has a real effect "
-@@ -6979,26 +6696,21 @@ msgid ""
- "the slave connections with this connection, -1: default. If -1 (default) is "
- "set, global connection.autoconnect-slaves is read to determine the real "
- "value. If it is default as well, this fallbacks to 0."
--msgstr ""
--"NetworkManager가이 연결을 활성화 할 때이 연결의 슬레이브를 자동으로 가져와야하는지 여부. 이는 마스터 연결에만 실제 효과가 "
--"있습니다. \"autoconnect\", \"autoconnect-priority\"및 \"autoconnect-retries\"속성은이 "
--"설정과 관련이 없습니다. 허용되는 값은 다음과 같습니다. 0 : 슬레이브 연결을 그대로 둡니다. 1 :이 연결로 모든 슬레이브 연결을 "
--"활성화합니다. -1은 기본값입니다. -1 (기본값)이 설정되면 전역 연결. 자동 연결 - 슬레이브가 읽혀 실제 값을 결정합니다. 기본값 "
--"인 경우에도이 대체 값은 0입니다."
-+msgstr "NetworkManager가이 연결을 활성화 할 때이 연결의 슬레이브를 자동으로 가져와야하는지 여부. 이는 마스터 연결에만 실제 효과가 있습니다. \"autoconnect\", \"autoconnect-priority\"및 \"autoconnect-retries\"속성은이 설정과 관련이 없습니다. 허용되는 값은 다음과 같습니다. 0 : 슬레이브 연결을 그대로 둡니다. 1 :이 연결로 모든 슬레이브 연결을 활성화합니다. -1은 기본값입니다. -1 (기본값)이 설정되면 전역 연결. 자동 연결 - 슬레이브가 읽혀 실제 값을 결정합니다. 기본값 인 경우에도이 대체 값은 0입니다."
-
--#: ../clients/common/settings-docs.h.in:138
-+#: ../clients/common/settings-docs.h.in:156
- 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 "0보다 크면 시간 제한에 도달하거나 IP 게이트웨이가 핑에 응답 할 때까지 IP 주소 지정의 성공을 지연시킵니다."
-
--#: ../clients/common/settings-docs.h.in:139
-+#: ../clients/common/settings-docs.h.in:157
- msgid ""
- "A human readable unique identifier for the connection, like \"Work Wi-Fi\" "
- "or \"T-Mobile 3G\"."
- msgstr "\"Work Wi-Fi\"또는 \"T-Mobile 3G\"와 같이 사람이 읽을 수있는 고유 한 연결 식별자입니다."
-
--#: ../clients/common/settings-docs.h.in:140
-+#: ../clients/common/settings-docs.h.in:158
- 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 "
-@@ -7009,109 +6721,100 @@ msgid ""
- "restricts the interfaces a connection can be used with, and if interface "
- "names change or are reordered the connection may be applied to the wrong "
- "interface."
--msgstr ""
--"이 연결이 바인드 된 네트워크 인터페이스의 이름. 설정되지 않은 경우 연결을 적절한 유형의 인터페이스에 연결할 수 있습니다 (다른 설정에 "
--"의해 제한되는 경우). 소프트웨어 장치의 경우 생성 된 장치의 이름을 지정합니다. 인터페이스 이름을 쉽게 영구적으로 만들 수없는 연결 "
--"유형 (예 : 모바일 광대역 또는 USB 이더넷)의 경우이 속성을 사용하지 않아야합니다. 이 속성을 설정하면 연결을 사용할 수있는 "
--"인터페이스가 제한되며 인터페이스 이름이 변경되거나 재정렬 될 경우 연결이 잘못된 인터페이스에 적용될 수 있습니다."
-+msgstr "이 연결이 바인드 된 네트워크 인터페이스의 이름. 설정되지 않은 경우 연결을 적절한 유형의 인터페이스에 연결할 수 있습니다 (다른 설정에 의해 제한되는 경우). 소프트웨어 장치의 경우 생성 된 장치의 이름을 지정합니다. 인터페이스 이름을 쉽게 영구적으로 만들 수없는 연결 유형 (예 : 모바일 광대역 또는 USB 이더넷)의 경우이 속성을 사용하지 않아야합니다. 이 속성을 설정하면 연결을 사용할 수있는 인터페이스가 제한되며 인터페이스 이름이 변경되거나 재정렬 될 경우 연결이 잘못된 인터페이스에 적용될 수 있습니다."
-
--#: ../clients/common/settings-docs.h.in:141
-+#: ../clients/common/settings-docs.h.in:159
- msgid "Whether LLDP is enabled for the connection."
- msgstr "LLDP가 연결에 사용되도록 설정되어 있는지 여부."
-
--#: ../clients/common/settings-docs.h.in:142
-+#: ../clients/common/settings-docs.h.in:160
- 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 "
- "format that allows both IPv4 and IPv6 hosts to perform name resolution for "
--"hosts on the same local link. The permitted values are: yes: register "
--"hostname and resolving for the connection, no: disable LLMNR for the "
--"interface, resolve: do not register hostname but allow resolving of LLMNR "
--"host names. This feature requires a plugin which supports LLMNR. One such "
--"plugin is dns-systemd-resolved."
--msgstr ""
--"연결에 LLMNR (Link-Local Multicast Name Resolution)이 사용되는지 여부. LLMNR은 IPv4 및 "
--"IPv6 호스트가 동일한 로컬 링크에있는 호스트의 이름 확인을 수행 할 수있게 해주는 DNS (Domain Name System) 패킷 "
--"형식을 기반으로 한 프로토콜입니다. 허용되는 값은 다음과 같습니다. yes : 호스트 이름 등록 및 연결 확인, no : 인터페이스에 "
--"대한 LLMNR 사용 안함, 해결 : 호스트 이름은 등록하지 않지만 LLMNR 호스트 이름은 확인할 수 있습니다. 이 기능을 사용하려면 "
--"LLMNR을 지원하는 플러그인이 필요합니다. 그러한 플러그인 중 하나는 dns-systemd-resolved입니다."
-+"hosts on the same local link. The permitted values are: \"yes\" (2) register "
-+"hostname and resolving for the connection, \"no\" (0) disable LLMNR for the "
-+"interface, \"resolve\" (1) do not register hostname but allow resolving of "
-+"LLMNR host names If unspecified, \"default\" ultimately depends on the DNS "
-+"plugin (which for systemd-resolved currently means \"yes\"). This feature "
-+"requires a plugin which supports LLMNR. Otherwise the setting has no effect. "
-+"One such plugin is dns-systemd-resolved."
-+msgstr "연결에 LLMNR (Link-Local Multicast Name Resolution)을 사용할지 여부 LLMNR은 IPv4 및 IPv6 호스트가 동일한 로컬 링크에서 호스트의 이름 확인을 수행 할 수 있도록하는 DNS (Domain Name System) 패킷 형식을 기반으로하는 프로토콜입니다. 허용되는 값은 다음과 같습니다. \"yes\"(2) 호스트 이름 등록 및 연결 해결, \"no\"(0) 인터페이스에 대해 LLMNR 비활성화, \"resolve\"(1) 호스트 이름을 등록하지 않고 LLMNR 호스트 이름 확인 허용 \"default\"는 궁극적으로 DNS 플러그인에 의존합니다 (systemd-resolved의 경우 현재 \"yes\"를 의미 함). 이 기능에는 LLMNR을 지원하는 플러그인이 필요합니다. 그렇지 않으면 설정이 적용되지 않습니다. 그러한 플러그인 중 하나는 dns-systemd-resolved입니다."
-
--#: ../clients/common/settings-docs.h.in:143
-+#: ../clients/common/settings-docs.h.in:161
- msgid "Interface name of the master device or UUID of the master connection."
- msgstr "마스터 디바이스의 인터페이스 이름 또는 마스터 연결의 UUID."
-
--#: ../clients/common/settings-docs.h.in:144
-+#: ../clients/common/settings-docs.h.in:162
- msgid ""
--"Whether mDNS is enabled for the connection. The permitted values are: yes: "
--"register hostname and resolving for the connection, no: disable mDNS for the "
--"interface, resolve: do not register hostname but allow resolving of mDNS "
--"host names. This feature requires a plugin which supports mDNS. One such "
--"plugin is dns-systemd-resolved."
--msgstr ""
--"mDNS가 연결에 사용되도록 설정되어 있는지 여부입니다. 허용되는 값은 다음과 같습니다. yes : 호스트 이름을 등록하고 연결을 "
--"확인합니다. no : 인터페이스에 대해 mDNS를 사용하지 않습니다. 해결 : 호스트 이름은 등록하지 않지만 mDNS 호스트 이름은 "
--"확인할 수 있습니다. 이 기능을 사용하려면 mDNS를 지원하는 플러그인이 필요합니다. 그러한 플러그인 중 하나는 dns-systemd-"
--"resolved입니다."
-+"Whether mDNS is enabled for the connection. The permitted values are: \"yes"
-+"\" (2) register hostname and resolving for the connection, \"no\" (0) "
-+"disable mDNS for the interface, \"resolve\" (1) do not register hostname but "
-+"allow resolving of mDNS host names and \"default\" (-1) to allow lookup of a "
-+"global default in NetworkManager.conf. If unspecified, \"default\" "
-+"ultimately depends on the DNS plugin (which for systemd-resolved currently "
-+"means \"no\"). This feature requires a plugin which supports mDNS. Otherwise "
-+"the setting has no effect. One such plugin is dns-systemd-resolved."
-+msgstr "연결에 mDNS가 활성화되어 있는지 여부 허용되는 값은 다음과 같습니다. \"yes\"(2) 호스트 이름 등록 및 연결 해결, \"no\"(0) 인터페이스에 대해 mDNS 비활성화, \"resolve\"(1) 호스트 이름을 등록하지 않고 mDNS 호스트 이름 확인 및 \" NetworkManager.conf에서 전역 기본값을 조회 할 수 있습니다. 지정되지 않은 경우 \"default\"는 궁극적으로 DNS 플러그인에 의존합니다 (systemd-resolved의 경우 현재 \"no\"를 의미 함). 이 기능에는 mDNS를 지원하는 플러그인이 필요합니다. 그렇지 않으면 설정이 적용되지 않습니다. 그러한 플러그인 중 하나는 dns-systemd-resolved입니다."
-
--#: ../clients/common/settings-docs.h.in:145
-+#: ../clients/common/settings-docs.h.in:163
- msgid ""
- "Whether the connection is metered. When updating this property on a "
- "currently activated connection, the change takes effect immediately."
- msgstr "연결이 측정되는지 여부입니다. 현재 활성화 된 연결에서이 속성을 업데이트하면 변경 내용이 즉시 적용됩니다."
-
--#: ../clients/common/settings-docs.h.in:146
-+#: ../clients/common/settings-docs.h.in:164
-+msgid ""
-+"If configured, set to a Manufacturer Usage Description (MUD) URL that points "
-+"to manufacturer-recommended network policies for IoT devices. It is "
-+"transmitted as a DHCPv4 or DHCPv6 option. The value must be a valid URL "
-+"starting with \"https://\". The special value \"none\" is allowed to "
-+"indicate that no MUD URL is used. If the per-profile value is unspecified "
-+"(the default), a global connection default gets consulted. If still "
-+"unspecified, the ultimate default is \"none\"."
-+msgstr "구성된 경우 IoT 장치에 대한 제조업체 권장 네트워크 정책을 가리키는 MUD (제조업체 사용 설명) URL로 설정하십시오. DHCPv4 또는 DHCPv6 옵션으로 전송됩니다. 값은 \"https : //\"로 시작하는 유효한 URL이어야합니다. 특수 값 \"없음\"은 MUD URL이 사용되지 않음을 나타낼 수 있습니다. 프로파일 별 값을 지정하지 않으면 (기본값) 전역 연결 기본값이 참조됩니다. 여전히 지정되지 않은 경우 궁극적 인 기본값은 \"없음\"입니다."
-+
-+#: ../clients/common/settings-docs.h.in:165
- msgid ""
- "Specifies whether the profile can be active multiple times at a particular "
- "moment. The value is of type NMConnectionMultiConnect."
--msgstr ""
--"특정 순간에 프로필이 여러 번 활성화 될 수 있는지 여부를 지정합니다. 값은 NMConnectionMultiConnect 유형입니다."
-+msgstr "특정 순간에 프로필이 여러 번 활성화 될 수 있는지 여부를 지정합니다. 값은 NMConnectionMultiConnect 유형입니다."
-
--#: ../clients/common/settings-docs.h.in:147
-+#: ../clients/common/settings-docs.h.in:166
- msgid ""
--"An array of strings defining what access a given user has to this connection."
--" If this is NULL or empty, all users are allowed to access this connection; "
--"otherwise users are allowed if and only if they are in this list. When this "
--"is not empty, the connection can be active only when one of the specified "
--"users is logged into an active session. Each entry is of the form \"[type]:"
--"[id]:[reserved]\"; for example, \"user:dcbw:blah\". At this time only the "
--"\"user\" [type] is allowed. Any other values are ignored and reserved for "
--"future use. [id] is the username that this permission refers to, which may "
--"not contain the \":\" character. Any [reserved] information present must be "
--"ignored and is reserved for future use. All of [type], [id], and [reserved] "
--"must be valid UTF-8."
--msgstr ""
--"지정된 사용자가이 연결에 대해 갖는 액세스를 정의하는 문자열의 배열입니다. 이 값이 NULL 또는 비어 있으면 모든 사용자가이 연결에 "
--"액세스 할 수 있습니다. 그렇지 않으면이 목록에있는 경우에만 사용자가 허용됩니다. 이 값이 비어 있지 않으면 지정된 사용자 중 하나가 "
--"활성 세션에 로그인 한 경우에만 연결이 활성화 될 수 있습니다. 각 항목의 형식은 \"[type] : [id] : "
--"[reserved]\"입니다. 예 : \"user : dcbw : blah\". 현재 \"사용자\"[유형] 만 허용됩니다. 다른 값은 "
--"무시되고 나중에 사용하기 위해 예약됩니다. [id]는이 권한이 참조하는 사용자 이름이며 \":\"문자를 포함 할 수 없습니다. 제시된 "
--"모든 [예약 된] 정보는 무시되어야하며 추후 사용을 위해 예약되어 있습니다. [type], [id] 및 [reserved]는 모두 유효한 "
--"UTF-8이어야합니다."
-+"An array of strings defining what access a given user has to this "
-+"connection. If this is NULL or empty, all users are allowed to access this "
-+"connection; otherwise users are allowed if and only if they are in this "
-+"list. When this is not empty, the connection can be active only when one of "
-+"the specified users is logged into an active session. Each entry is of the "
-+"form \"[type]:[id]:[reserved]\"; for example, \"user:dcbw:blah\". At this "
-+"time only the \"user\" [type] is allowed. Any other values are ignored and "
-+"reserved for future use. [id] is the username that this permission refers "
-+"to, which may not contain the \":\" character. Any [reserved] information "
-+"present must be ignored and is reserved for future use. All of [type], "
-+"[id], and [reserved] must be valid UTF-8."
-+msgstr "지정된 사용자가이 연결에 대해 갖는 액세스를 정의하는 문자열의 배열입니다. 이 값이 NULL 또는 비어 있으면 모든 사용자가이 연결에 액세스 할 수 있습니다. 그렇지 않으면이 목록에있는 경우에만 사용자가 허용됩니다. 이 값이 비어 있지 않으면 지정된 사용자 중 하나가 활성 세션에 로그인 한 경우에만 연결이 활성화 될 수 있습니다. 각 항목의 형식은 \"[type] : [id] : [reserved]\"입니다. 예 : \"user : dcbw : blah\". 현재 \"사용자\"[유형] 만 허용됩니다. 다른 값은 무시되고 나중에 사용하기 위해 예약됩니다. [id]는이 권한이 참조하는 사용자 이름이며 \":\"문자를 포함 할 수 없습니다. 제시된 모든 [예약 된] 정보는 무시되어야하며 추후 사용을 위해 예약되어 있습니다. [type], [id] 및 [reserved]는 모두 유효한 UTF-8이어야합니다."
-
--#: ../clients/common/settings-docs.h.in:148
-+#: ../clients/common/settings-docs.h.in:167
- msgid ""
- "FALSE if the connection can be modified using the provided settings "
- "service's D-Bus interface with the right privileges, or TRUE if the "
- "connection is read-only and cannot be modified."
--msgstr ""
--"적절한 권한을 가진 제공된 설정 서비스의 D-Bus 인터페이스를 사용하여 연결을 수정할 수 있으면 FALSE이거나 연결이 읽기 전용이고 "
--"수정할 수없는 경우 TRUE입니다."
-+msgstr "적절한 권한을 가진 제공된 설정 서비스의 D-Bus 인터페이스를 사용하여 연결을 수정할 수 있으면 FALSE이거나 연결이 읽기 전용이고 수정할 수없는 경우 TRUE입니다."
-
--#: ../clients/common/settings-docs.h.in:149
-+#: ../clients/common/settings-docs.h.in:168
- msgid ""
- "List of connection UUIDs that should be activated when the base connection "
- "itself is activated. Currently only VPN connections are supported."
- msgstr "기본 연결 자체가 활성화 될 때 활성화해야하는 연결 UUID 목록입니다. 현재는 VPN 연결 만 지원됩니다."
-
--#: ../clients/common/settings-docs.h.in:150
-+#: ../clients/common/settings-docs.h.in:169
- msgid ""
--"Setting name of the device type of this slave's master connection (eg, "
--"\"bond\"), or NULL if this connection is not a slave."
--msgstr ""
--"이 슬레이브의 마스터 연결 (예 : \"bond\")의 장치 유형 이름을 설정합니다.이 연결이 슬레이브가 아닌 경우 NULL입니다."
-+"Setting name of the device type of this slave's master connection (eg, \"bond"
-+"\"), or NULL if this connection is not a slave."
-+msgstr "이 슬레이브의 마스터 연결 (예 : \"bond\")의 장치 유형 이름을 설정합니다.이 연결이 슬레이브가 아닌 경우 NULL입니다."
-
--#: ../clients/common/settings-docs.h.in:151
--#, fuzzy
-+#: ../clients/common/settings-docs.h.in:170
- msgid ""
- "This represents the identity of the connection used for various purposes. It "
- "allows to configure multiple profiles to share the identity. Also, the "
-@@ -7140,48 +6843,27 @@ msgid ""
- "activates. If the value is unset, a global connection default is consulted. "
- "If the value is still unset, the default is similar to \"${CONNECTION}\" and "
- "uses a unique, fixed ID for the connection."
--msgstr ""
--"이것은 다양한 용도로 사용되는 연결의 ID를 나타냅니다. 다중 프로파일을 구성하여 ID를 공유 할 수 있습니다. 또한 stable-"
--"id에는 컨텍스트에 따라 동적으로 대체되고 결정적으로 대체되는 자리 표시자를 포함 할 수 있습니다. stable-id는 ipv6.addr-"
--"gen-mode = stable-privacy를 사용하여 IPv6 안정 개인 주소를 생성하는 데 사용됩니다. 또한 생성 된 복제 된 "
--"MAC 주소를 ethernet.cloned-mac-address = stable 및 wifi.cloned-mac-address = "
--"stable에 시드하는 데 사용됩니다. 또한 ipv4.dhcp-client-id = stable에서 DHCP 클라이언트 식별자로 사용되며 "
--"ipv6.dhcp-duid = stable- [llt, ll, uuid]로 DHCP DUID를 유도합니다. 그것이 사용되는 문맥에 "
--"의존하여, 다른 매개 변수들이 또한 생성 알고리즘에 뿌려진다. 예를 들어, 호스트 별 키가 일반적으로 포함되므로 서로 다른 시스템이 서로 "
--"다른 ID를 생성하게됩니다. 또는 ipv6.addr-gen-mode = stable-privacy로 장치의 이름도 포함되므로 다른 "
--"인터페이스에서 다른 주소가 생성됩니다. '$'문자는 런타임시 동적 대체를 수행하기 위해 특수하게 처리됩니다. 현재 지원되는 것은 \"$ "
--"{연결}\", \"$ {장치}\", \"$ {부팅}\", \"$ {임의}\"입니다. 이것들은 연결마다, 장치별로, 부팅 당 또는 매번 "
--"고유 한 ID를 효과적으로 만듭니다. \"$ {DEVICE}\"은 (는) 기기의 인터페이스 이름에 해당합니다. '$'다음에 인식 할 "
--"수없는 패턴은 그대로 취급되지만 나중에 사용하기 위해 예약되어 있습니다. 그러므로 '$'를 피하거나 '$$'로 탈출하는 것이 좋습니다. "
--"예를 들어, \"$ {CONNECTION} - $ {BOOT} - $ {DEVICE}\"으로 설정하면 재부팅 할 때마다 변경되며 프로필이 "
--"활성화되는 인터페이스에 따라 달라지는이 연결에 대한 고유 ID를 만듭니다. 값이 설정되어 있지 않으면 전역 연결 기본값이 참조됩니다. "
--"값이 아직 설정되지 않은 경우 기본값은 \"$ {CONNECTION}\"과 유사하며 연결에 고유 한 고정 ID를 사용합니다."
-+msgstr "이것은 다양한 목적으로 사용되는 연결의 ID를 나타냅니다. ID를 공유하도록 여러 프로파일을 구성 할 수 있습니다. 또한 안정 ID는 상황에 따라 동적으로 결정적으로 대체되는 자리 표시자를 포함 할 수 있습니다. 안정 ID는 ipv6.addr-gen-mode = stable-privacy를 사용하여 IPv6 안정 개인 주소를 생성하는 데 사용됩니다. 또한 ethernet.cloned-mac-address = stable 및 wifi.cloned-mac-address = stable에 대해 생성 된 복제 된 MAC 주소를 시드하는 데 사용됩니다. 또한 ipv4.dhcp-client-id = stable을 사용하여 DHCP 클라이언트 식별자로 사용하고 ipv6.dhcp-duid = stable- [llt, ll, uuid]를 사용하여 DHCP DUID를 파생시킵니다. 사용되는 컨텍스트에 따라 다른 매개 변수도 생성 알고리즘에 시드됩니다. 예를 들어, 호스트 별 키도 일반적으로 포함되므로 다른 시스템에서 다른 ID를 생성하게됩니다. 또는 ipv6.addr-gen-mode = stable-privacy를 사용하면 장치 이름도 포함되므로 인터페이스마다 다른 주소가 생성됩니다. '$'문자는 런타임시 동적 대체를 수행하기 위해 특수하게 처리됩니다. 현재 지원되는 것은 \" ${CONNECTION} \",\" ${DEVICE} \",\" ${MAC} \",\" ${BOOT} \",\" ${RANDOM} \". 연결, 장치, 부팅 또는 매번 고유 한 ID를 효과적으로 생성합니다.\" ${DEVICE} \"는 장치의 인터페이스 이름에 해당하며\" ${MAC} \"는 기기의 영구 MAC 주소입니다. '$'다음에 인식 할 수없는 패턴은 그대로 취급되지만 나중에 사용하기 위해 예약되어 있으므로 '$'를 피하거나\"$$ \"로 이스케이프하는 것이 좋습니다. \" ${CONNECTION} - ${BOOT} - ${DEVICE} \"는 재부팅 할 때마다 변경되고 프로파일이 활성화되는 인터페이스에 따라 달라지는이 연결의 고유 ID를 작성합니다. 값이 설정되지 않으면 글로벌 연결 기본값이 참조됩니다. 값이 아직 설정되지 않은 경우 기본값은 \" ${CONNECTION} 연결에 고유 한 고정 ID를 사용합니다."
-
--#: ../clients/common/settings-docs.h.in:152
-+#: ../clients/common/settings-docs.h.in:171
- msgid ""
- "The time, in seconds since the Unix Epoch, that the connection was last "
- "_successfully_ fully activated. NetworkManager updates the connection "
- "timestamp periodically when the connection is active to ensure that an "
- "active connection has the latest timestamp. The property is only meant for "
- "reading (changes to this property will not be preserved)."
--msgstr ""
--"Unix Epoch 이후 초 단위로, 연결이 마지막으로 성공적으로 _ 성공적으로 _ 활성화되었습니다. NetworkManager는 연결이 "
--"활성 상태 일 때 주기적으로 연결 시간 소인을 업데이트하여 활성 연결에 최신 시간 소인이 있는지 확인합니다. 이 속성은 읽기 전용입니다 "
--"(이 속성의 변경 사항은 유지되지 않습니다)."
-+msgstr "Unix Epoch 이후 초 단위로, 연결이 마지막으로 성공적으로 _ 성공적으로 _ 활성화되었습니다. NetworkManager는 연결이 활성 상태 일 때 주기적으로 연결 시간 소인을 업데이트하여 활성 연결에 최신 시간 소인이 있는지 확인합니다. 이 속성은 읽기 전용입니다 (이 속성의 변경 사항은 유지되지 않습니다)."
-
--#: ../clients/common/settings-docs.h.in:153
-+#: ../clients/common/settings-docs.h.in:172
- msgid ""
- "Base type of the connection. For hardware-dependent connections, should "
- "contain the setting name of the hardware-type specific setting (ie, \"802-3-"
- "ethernet\" or \"802-11-wireless\" or \"bluetooth\", etc), and for non-"
- "hardware dependent connections like VPN or otherwise, should contain the "
- "setting name of that setting type (ie, \"vpn\" or \"bridge\", etc)."
--msgstr ""
--"연결의 기본 유형. 하드웨어 종속 연결의 경우 하드웨어 유형별 설정 (예 : \"802-3-ethernet\"또는 \"802-11-"
--"wireless\"또는 \"bluetooth\"등)의 설정 이름을 포함하고 하드웨어가 아닌 경우 VPN 또는 기타와 같은 연결에는 해당 "
--"설정 유형 (예 : \"VPN\"또는 \"브리지\"등)의 설정 이름이 있어야합니다."
-+msgstr "연결의 기본 유형. 하드웨어 종속 연결의 경우 하드웨어 유형별 설정 (예 : \"802-3-ethernet\"또는 \"802-11-wireless\"또는 \"bluetooth\"등)의 설정 이름을 포함하고 하드웨어가 아닌 경우 VPN 또는 기타와 같은 연결에는 해당 설정 유형 (예 : \"VPN\"또는 \"브리지\"등)의 설정 이름이 있어야합니다."
-
--#: ../clients/common/settings-docs.h.in:154
-+#: ../clients/common/settings-docs.h.in:173
- msgid ""
- "A universally unique identifier for the connection, for example generated "
- "with libuuid. It should be assigned when the connection is created, and "
-@@ -7191,13 +6873,9 @@ msgid ""
- "SSID, mobile broadband network provider, or \"type\" property changes. The "
- "UUID must be in the format \"2815492f-7e56-435e-b2e9-246bd7cdc664\" (ie, "
- "contains only hexadecimal characters and \"-\")."
--msgstr ""
--"연결에 대한 보편적 인 고유 식별자 (예 : libuuid로 생성됨). 연결이 생성 될 때 할당되어야하며 연결이 동일한 네트워크에 계속 "
--"적용되는 한 변경되지 않아야합니다. 예를 들어, \"id\"속성이나 NMSettingIP4Config가 변경되면 변경해서는 안되지만 Wi-"
--"Fi SSID, 모바일 광대역 네트워크 공급자 또는 \"유형\"속성이 변경 될 때 다시 만들어야 할 수 있습니다. UUID는 "
--"\"2815492f-7e56-435e-b2e9-246bd7cdc664\"형식이어야합니다 (즉, 16 진수 문자와 \"-\"만 포함)."
-+msgstr "연결에 대한 보편적 인 고유 식별자 (예 : libuuid로 생성됨). 연결이 생성 될 때 할당되어야하며 연결이 동일한 네트워크에 계속 적용되는 한 변경되지 않아야합니다. 예를 들어, \"id\"속성이나 NMSettingIP4Config가 변경되면 변경해서는 안되지만 Wi-Fi SSID, 모바일 광대역 네트워크 공급자 또는 \"유형\"속성이 변경 될 때 다시 만들어야 할 수 있습니다. UUID는 \"2815492f-7e56-435e-b2e9-246bd7cdc664\"형식이어야합니다 (즉, 16 진수 문자와 \"-\"만 포함)."
-
--#: ../clients/common/settings-docs.h.in:155
-+#: ../clients/common/settings-docs.h.in:174
- msgid ""
- "Timeout in milliseconds to wait for device at startup. During boot, devices "
- "may take a while to be detected by the driver. This property will cause to "
-@@ -7206,159 +6884,123 @@ msgid ""
- "NMSettingConnection:interface-name to identify the device that will be "
- "waited for. The value 0 means no wait time. The default value is -1, which "
- "currently has the same meaning as no wait time."
--msgstr ""
-+msgstr "시작시 장치를 기다리는 시간 (밀리 초)입니다. 부팅 중에 드라이버가 장치를 감지하는 데 시간이 걸릴 수 있습니다. 이 속성은 장치가 나타날 기회를 제공하기 위해 NetworkManager-wait-online.service 및 nm-online을 지연시킵니다. 이 속성은 NMSettingConnection : interface-name과 함께 작동하여 대기 할 장치를 식별합니다. 값 0은 대기 시간이 없음을 의미합니다. 기본값은 -1이며 현재 대기 시간이없는 것과 동일한 의미를 갖습니다."
-
--#: ../clients/common/settings-docs.h.in:156
-+#: ../clients/common/settings-docs.h.in:175
- msgid ""
- "The trust level of a the connection. Free form case-insensitive string (for "
- "example \"Home\", \"Work\", \"Public\"). NULL or unspecified zone means the "
- "connection will be placed in the default zone as defined by the firewall. "
- "When updating this property on a currently activated connection, the change "
- "takes effect immediately."
--msgstr ""
--"연결의 신뢰 수준입니다. 자유 양식 대소 문자를 구분하지 않는 문자열 (예 : \"집\", \"직장\", \"공용\"). NULL 또는 "
--"지정되지 않은 영역은 연결이 방화벽에서 정의한 기본 영역에 배치됨을 의미합니다. 현재 활성화 된 연결에서이 속성을 업데이트하면 변경 "
--"내용이 즉시 적용됩니다."
-+msgstr "연결의 신뢰 수준입니다. 자유 양식 대소 문자를 구분하지 않는 문자열 (예 : \"집\", \"직장\", \"공용\"). NULL 또는 지정되지 않은 영역은 연결이 방화벽에서 정의한 기본 영역에 배치됨을 의미합니다. 현재 활성화 된 연결에서이 속성을 업데이트하면 변경 내용이 즉시 적용됩니다."
-
--#: ../clients/common/settings-docs.h.in:157
-+#: ../clients/common/settings-docs.h.in:176
- msgid ""
- "Specifies the NMSettingDcbFlags for the DCB FCoE application. Flags may be "
- "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
- "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
--msgstr ""
--"DCB FCoE 응용 프로그램에 대한 NMSettingDcbFlags를 지정합니다. 플래그는 "
--"NM_SETTING_DCB_FLAG_ENABLE (0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2) 및 "
--"NM_SETTING_DCB_FLAG_WILLING (0x4)의 조합 일 수 있습니다."
-+msgstr "DCB FCoE 응용 프로그램에 대한 NMSettingDcbFlags를 지정합니다. 플래그는 NM_SETTING_DCB_FLAG_ENABLE (0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2) 및 NM_SETTING_DCB_FLAG_WILLING (0x4)의 조합 일 수 있습니다."
-
--#: ../clients/common/settings-docs.h.in:158
-+#: ../clients/common/settings-docs.h.in:177
- msgid "The FCoE controller mode; either \"fabric\" (default) or \"vn2vn\"."
- msgstr "FCoE 컨트롤러 모드. \"fabric\"(기본값) 또는 \"vn2vn\"."
-
--#: ../clients/common/settings-docs.h.in:159
-+#: ../clients/common/settings-docs.h.in:178
- msgid ""
- "The highest User Priority (0 - 7) which FCoE frames should use, or -1 for "
- "default priority. Only used when the \"app-fcoe-flags\" property includes "
- "the NM_SETTING_DCB_FLAG_ENABLE (0x1) flag."
--msgstr ""
--"FCoE 프레임에서 사용해야하는 가장 높은 사용자 우선 순위 (0 - 7) 또는 기본 우선 순위에 대해 -1. \"app-fcoe-"
--"flags\"속성에 NM_SETTING_DCB_FLAG_ENABLE (0x1) 플래그가 포함 된 경우에만 사용됩니다."
-+msgstr "FCoE 프레임에서 사용해야하는 가장 높은 사용자 우선 순위 (0 - 7) 또는 기본 우선 순위에 대해 -1. \"app-fcoe-flags\"속성에 NM_SETTING_DCB_FLAG_ENABLE (0x1) 플래그가 포함 된 경우에만 사용됩니다."
-
--#: ../clients/common/settings-docs.h.in:160
-+#: ../clients/common/settings-docs.h.in:179
- msgid ""
- "Specifies the NMSettingDcbFlags for the DCB FIP application. Flags may be "
- "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
- "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
--msgstr ""
--"DCB FIP 응용 프로그램에 대한 NMSettingDcbFlags를 지정합니다. 플래그는 "
--"NM_SETTING_DCB_FLAG_ENABLE (0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2) 및 "
--"NM_SETTING_DCB_FLAG_WILLING (0x4)의 조합 일 수 있습니다."
-+msgstr "DCB FIP 응용 프로그램에 대한 NMSettingDcbFlags를 지정합니다. 플래그는 NM_SETTING_DCB_FLAG_ENABLE (0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2) 및 NM_SETTING_DCB_FLAG_WILLING (0x4)의 조합 일 수 있습니다."
-
--#: ../clients/common/settings-docs.h.in:161
-+#: ../clients/common/settings-docs.h.in:180
- msgid ""
- "The highest User Priority (0 - 7) which FIP frames should use, or -1 for "
- "default priority. Only used when the \"app-fip-flags\" property includes "
- "the NM_SETTING_DCB_FLAG_ENABLE (0x1) flag."
--msgstr ""
--"FIP 프레임이 사용해야하는 가장 높은 사용자 우선 순위 (0 - 7) 또는 기본 우선 순위가 -1입니다. \"app-fip-"
--"flags\"속성에 NM_SETTING_DCB_FLAG_ENABLE (0x1) 플래그가 포함 된 경우에만 사용됩니다."
-+msgstr "FIP 프레임이 사용해야하는 가장 높은 사용자 우선 순위 (0 - 7) 또는 기본 우선 순위가 -1입니다. \"app-fip-flags\"속성에 NM_SETTING_DCB_FLAG_ENABLE (0x1) 플래그가 포함 된 경우에만 사용됩니다."
-
--#: ../clients/common/settings-docs.h.in:162
-+#: ../clients/common/settings-docs.h.in:181
- msgid ""
- "Specifies the NMSettingDcbFlags for the DCB iSCSI application. Flags may be "
- "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
- "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
--msgstr ""
--"DCB iSCSI 응용 프로그램에 대한 NMSettingDcbFlags를 지정합니다. 플래그는 "
--"NM_SETTING_DCB_FLAG_ENABLE (0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2) 및 "
--"NM_SETTING_DCB_FLAG_WILLING (0x4)의 조합 일 수 있습니다."
-+msgstr "DCB iSCSI 응용 프로그램에 대한 NMSettingDcbFlags를 지정합니다. 플래그는 NM_SETTING_DCB_FLAG_ENABLE (0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2) 및 NM_SETTING_DCB_FLAG_WILLING (0x4)의 조합 일 수 있습니다."
-
--#: ../clients/common/settings-docs.h.in:163
-+#: ../clients/common/settings-docs.h.in:182
- msgid ""
- "The highest User Priority (0 - 7) which iSCSI frames should use, or -1 for "
- "default priority. Only used when the \"app-iscsi-flags\" property includes "
- "the NM_SETTING_DCB_FLAG_ENABLE (0x1) flag."
--msgstr ""
--"iSCSI 프레임이 사용해야하는 가장 높은 사용자 우선 순위 (0 - 7) 또는 기본 우선 순위에 대해 -1. \"app-iscsi-"
--"flags\"속성에 NM_SETTING_DCB_FLAG_ENABLE (0x1) 플래그가 포함 된 경우에만 사용됩니다."
-+msgstr "iSCSI 프레임이 사용해야하는 가장 높은 사용자 우선 순위 (0 - 7) 또는 기본 우선 순위에 대해 -1. \"app-iscsi-flags\"속성에 NM_SETTING_DCB_FLAG_ENABLE (0x1) 플래그가 포함 된 경우에만 사용됩니다."
-
--#: ../clients/common/settings-docs.h.in:164
-+#: ../clients/common/settings-docs.h.in:183
- msgid ""
- "An array of 8 uint values, where the array index corresponds to the User "
- "Priority (0 - 7) and the value indicates the percentage of bandwidth of the "
- "priority's assigned group that the priority may use. The sum of all "
- "percentages for priorities which belong to the same group must total 100 "
- "percents."
--msgstr ""
--"배열 색인이 사용자 우선 순위 (0 - 7)에 해당하고 값이 우선 순위에서 사용할 수있는 우선 순위의 할당 된 그룹의 대역폭 비율을 "
--"나타내는 8 개의 단위 값 배열입니다. 동일한 그룹에 속하는 우선 순위의 모든 백분율의 합계는 총 백분율이어야합니다."
-+msgstr "배열 색인이 사용자 우선 순위 (0 - 7)에 해당하고 값이 우선 순위에서 사용할 수있는 우선 순위의 할당 된 그룹의 대역폭 비율을 나타내는 8 개의 단위 값 배열입니다. 동일한 그룹에 속하는 우선 순위의 모든 백분율의 합계는 총 백분율이어야합니다."
-
--#: ../clients/common/settings-docs.h.in:165
-+#: ../clients/common/settings-docs.h.in:184
- msgid ""
- "An array of 8 boolean values, where the array index corresponds to the User "
- "Priority (0 - 7) and the value indicates whether or not the corresponding "
- "priority should transmit priority pause."
--msgstr ""
--"배열 인덱스가 사용자 우선 순위 (0 - 7)에 해당하며 값은 해당 우선 순위가 우선 순위 일시 중지를 전송해야하는지 여부를 나타내는 8 "
--"개의 부울 값 배열입니다."
-+msgstr "배열 인덱스가 사용자 우선 순위 (0 - 7)에 해당하며 값은 해당 우선 순위가 우선 순위 일시 중지를 전송해야하는지 여부를 나타내는 8 개의 부울 값 배열입니다."
-
--#: ../clients/common/settings-docs.h.in:166
-+#: ../clients/common/settings-docs.h.in:185
- msgid ""
- "Specifies the NMSettingDcbFlags for DCB Priority Flow Control (PFC). Flags "
- "may be any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
- "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
--msgstr ""
--"DCB 우선 순위 흐름 제어 (PFC)에 대한 NMSettingDcbFlags를 지정합니다. 플래그는 "
--"NM_SETTING_DCB_FLAG_ENABLE (0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2) 및 "
--"NM_SETTING_DCB_FLAG_WILLING (0x4)의 조합 일 수 있습니다."
-+msgstr "DCB 우선 순위 흐름 제어 (PFC)에 대한 NMSettingDcbFlags를 지정합니다. 플래그는 NM_SETTING_DCB_FLAG_ENABLE (0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2) 및 NM_SETTING_DCB_FLAG_WILLING (0x4)의 조합 일 수 있습니다."
-
--#: ../clients/common/settings-docs.h.in:167
-+#: ../clients/common/settings-docs.h.in:186
- msgid ""
- "An array of 8 uint values, where the array index corresponds to the Priority "
- "Group ID (0 - 7) and the value indicates the percentage of link bandwidth "
- "allocated to that group. Allowed values are 0 - 100, and the sum of all "
- "values must total 100 percents."
--msgstr ""
--"배열 인덱스가 우선 순위 그룹 ID (0 - 7)에 해당하며 값은 해당 그룹에 할당 된 링크 대역폭의 백분율을 나타내는 8 개의 단위 "
--"값의 배열입니다. 허용되는 값은 0 - 100이며 모든 값의 합계는 총 100 퍼센트입니다."
-+msgstr "배열 인덱스가 우선 순위 그룹 ID (0 - 7)에 해당하며 값은 해당 그룹에 할당 된 링크 대역폭의 백분율을 나타내는 8 개의 단위 값의 배열입니다. 허용되는 값은 0 - 100이며 모든 값의 합계는 총 100 퍼센트입니다."
-
--#: ../clients/common/settings-docs.h.in:168
-+#: ../clients/common/settings-docs.h.in:187
- msgid ""
- "Specifies the NMSettingDcbFlags for DCB Priority Groups. Flags may be any "
- "combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
- "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
--msgstr ""
--"DCB 우선 순위 그룹에 대한 NMSettingDcbFlags를 지정합니다. 플래그는 NM_SETTING_DCB_FLAG_ENABLE "
--"(0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2) 및 NM_SETTING_DCB_FLAG_WILLING "
--"(0x4)의 조합 일 수 있습니다."
-+msgstr "DCB 우선 순위 그룹에 대한 NMSettingDcbFlags를 지정합니다. 플래그는 NM_SETTING_DCB_FLAG_ENABLE (0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2) 및 NM_SETTING_DCB_FLAG_WILLING (0x4)의 조합 일 수 있습니다."
-
--#: ../clients/common/settings-docs.h.in:169
-+#: ../clients/common/settings-docs.h.in:188
- msgid ""
- "An array of 8 uint values, where the array index corresponds to the User "
- "Priority (0 - 7) and the value indicates the Priority Group ID. Allowed "
- "Priority Group ID values are 0 - 7 or 15 for the unrestricted group."
--msgstr ""
--"배열 지수가 사용자 우선 순위 (0 - 7)에 해당하고 값이 우선 순위 그룹 ID를 나타내는 8 개의 단위 값의 배열입니다. 허용 된 "
--"우선 순위 그룹 ID 값은 제한되지 않은 그룹에 대해 0 - 7 또는 15입니다."
-+msgstr "배열 지수가 사용자 우선 순위 (0 - 7)에 해당하고 값이 우선 순위 그룹 ID를 나타내는 8 개의 단위 값의 배열입니다. 허용 된 우선 순위 그룹 ID 값은 제한되지 않은 그룹에 대해 0 - 7 또는 15입니다."
-
--#: ../clients/common/settings-docs.h.in:170
-+#: ../clients/common/settings-docs.h.in:189
- msgid ""
- "An array of 8 boolean values, where the array index corresponds to the User "
- "Priority (0 - 7) and the value indicates whether or not the priority may use "
- "all of the bandwidth allocated to its assigned group."
--msgstr ""
--"배열 인덱스가 사용자 우선 순위 (0 - 7)에 해당하며 값이 우선 순위가 할당 된 그룹에 할당 된 모든 대역폭을 사용할 수 있는지 "
--"여부를 나타내는 8 개의 부울 값 배열입니다."
-+msgstr "배열 인덱스가 사용자 우선 순위 (0 - 7)에 해당하며 값이 우선 순위가 할당 된 그룹에 할당 된 모든 대역폭을 사용할 수 있는지 여부를 나타내는 8 개의 부울 값 배열입니다."
-
--#: ../clients/common/settings-docs.h.in:171
-+#: ../clients/common/settings-docs.h.in:190
- msgid ""
- "An array of 8 uint values, where the array index corresponds to the User "
- "Priority (0 - 7) and the value indicates the traffic class (0 - 7) to which "
- "the priority is mapped."
--msgstr ""
--"배열 색인이 사용자 우선 순위 (0 - 7)에 해당하고 값이 우선 순위가 매핑되는 트래픽 클래스 (0 - 7)를 나타내는 8 개의 단위 "
--"값 배열입니다."
-+msgstr "배열 색인이 사용자 우선 순위 (0 - 7)에 해당하고 값이 우선 순위가 매핑되는 트래픽 클래스 (0 - 7)를 나타내는 8 개의 단위 값 배열입니다."
-
--#: ../clients/common/settings-docs.h.in:172
-+#: ../clients/common/settings-docs.h.in:191
- 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 "
-@@ -7367,114 +7009,99 @@ msgid ""
- "to use the correct APN for the user's mobile broadband plan. The APN may "
- "only be composed of the characters a-z, 0-9, ., and - per GSM 03.60 Section "
- "14.9."
--msgstr ""
--"GSM 기반 네트워크와 데이터 세션을 설정할 때 사용되는 APN을 지정하는 GPRS 액세스 포인트 이름입니다. APN은 종종 사용자에게 "
--"네트워크 사용 요금 및 사용자가 인터넷에 액세스하는지 아니면 특정 서비스 제공 업체 전용 담으로 요금을 청구 할지를 결정하므로 사용자의 "
--"모바일 광대역 계획에 올바른 APN을 사용하는 것이 중요합니다. APN은 GSM 03.60 섹션 14.9에 따라 문자 az, 0-9,. "
--"및 -로만 구성 될 수 있습니다."
-+msgstr "GSM 기반 네트워크와 데이터 세션을 설정할 때 사용되는 APN을 지정하는 GPRS 액세스 포인트 이름입니다. APN은 종종 사용자에게 네트워크 사용 요금 및 사용자가 인터넷에 액세스하는지 아니면 특정 서비스 제공 업체 전용 담으로 요금을 청구 할지를 결정하므로 사용자의 모바일 광대역 계획에 올바른 APN을 사용하는 것이 중요합니다. APN은 GSM 03.60 섹션 14.9에 따라 문자 az, 0-9,. 및 -로만 구성 될 수 있습니다."
-
--#: ../clients/common/settings-docs.h.in:173
-+#: ../clients/common/settings-docs.h.in:192
-+msgid ""
-+"When TRUE, the settings such as APN, username, or password will default to "
-+"values that match the network the modem will register to in the Mobile "
-+"Broadband Provider database."
-+msgstr "참인 경우 APN, 사용자 이름 또는 암호와 같은 설정은 기본적으로 모뎀이 이동 광대역 공급자 데이터베이스에 등록 할 네트워크와 일치하는 값으로 설정됩니다."
-+
-+#: ../clients/common/settings-docs.h.in:193
- msgid ""
- "The device unique identifier (as given by the WWAN management service) which "
- "this connection applies to. If given, the connection will only apply to the "
- "specified device."
- msgstr "이 연결이 적용되는 장치 고유 식별자 (WWAN 관리 서비스에서 제공). 지정된 경우 연결은 지정된 장치에만 적용됩니다."
-
--#: ../clients/common/settings-docs.h.in:174
-+#: ../clients/common/settings-docs.h.in:194
- msgid ""
- "When TRUE, only connections to the home network will be allowed. Connections "
- "to roaming networks will not be made."
- msgstr "TRUE로 설정하면 홈 네트워크에 대한 연결 만 허용됩니다. 로밍 네트워크에 연결되지 않습니다."
-
--#: ../clients/common/settings-docs.h.in:176
-+#: ../clients/common/settings-docs.h.in:196
- msgid ""
- "The Network ID (GSM LAI format, ie MCC-MNC) to force specific network "
- "registration. If the Network ID is specified, NetworkManager will attempt "
- "to force the device to register only on the specified network. This can be "
- "used to ensure that the device does not roam when direct roaming control of "
- "the device is not otherwise possible."
--msgstr ""
--"네트워크 ID (GSM LAI 형식, 즉 MCC-MNC)는 특정 네트워크 등록을 강제합니다. 네트워크 ID가 지정되면 "
--"NetworkManager는 장치가 지정된 네트워크에만 등록되도록합니다. 이는 장치의 직접 로밍 제어가 가능하지 않은 경우 장치가 "
--"로밍하지 않도록 보장하는 데 사용할 수 있습니다."
-+msgstr "네트워크 ID (GSM LAI 형식, 즉 MCC-MNC)는 특정 네트워크 등록을 강제합니다. 네트워크 ID가 지정되면 NetworkManager는 장치가 지정된 네트워크에만 등록되도록합니다. 이는 장치의 직접 로밍 제어가 가능하지 않은 경우 장치가 로밍하지 않도록 보장하는 데 사용할 수 있습니다."
-
--#: ../clients/common/settings-docs.h.in:177
-+#: ../clients/common/settings-docs.h.in:197
- msgid ""
- "Legacy setting that used to help establishing PPP data sessions for GSM-"
- "based modems. Deprecated: 1"
--msgstr ""
--"GSM 기반 모바일 광대역 네트워크와 PPP 데이터 세션을 설정할 때 전화 할 번호입니다. 많은 모뎀이 모바일 네트워크에 연결하기 위해 "
--"PPP를 필요로하지 않으므로이 등록 정보는 비워 두어야 NetworkManager가 적절한 설정을 자동으로 선택할 수 있습니다."
-+msgstr "GSM 기반 모바일 광대역 네트워크와 PPP 데이터 세션을 설정할 때 전화 할 번호입니다. 많은 모뎀이 모바일 네트워크에 연결하기 위해 PPP를 필요로하지 않으므로이 등록 정보는 비워 두어야 NetworkManager가 적절한 설정을 자동으로 선택할 수 있습니다."
-
--#: ../clients/common/settings-docs.h.in:180
-+#: ../clients/common/settings-docs.h.in:200
- msgid ""
- "If the SIM is locked with a PIN it must be unlocked before any other "
- "operations are requested. Specify the PIN here to allow operation of the "
- "device."
--msgstr ""
--"SIM을 PIN으로 잠근 경우 다른 작업을 요청하기 전에 잠금을 해제해야합니다. 장치의 작동을 허용하려면 여기에 PIN을 지정하십시오."
-+msgstr "SIM을 PIN으로 잠근 경우 다른 작업을 요청하기 전에 잠금을 해제해야합니다. 장치의 작동을 허용하려면 여기에 PIN을 지정하십시오."
-
--#: ../clients/common/settings-docs.h.in:182
-+#: ../clients/common/settings-docs.h.in:202
- msgid ""
- "The SIM card unique identifier (as given by the WWAN management service) "
- "which this connection applies to. If given, the connection will apply to "
- "any device also allowed by \"device-id\" which contains a SIM card matching "
- "the given identifier."
--msgstr ""
--"이 연결이 적용되는 SIM 카드 고유 식별자 (WWAN 관리 서비스에서 제공). 주어진 경우 해당 연결은 주어진 식별자와 일치하는 SIM "
--"카드가있는 \"device-id\"가 허용하는 모든 장치에도 적용됩니다."
-+msgstr "이 연결이 적용되는 SIM 카드 고유 식별자 (WWAN 관리 서비스에서 제공). 주어진 경우 해당 연결은 주어진 식별자와 일치하는 SIM 카드가있는 \"device-id\"가 허용하는 모든 장치에도 적용됩니다."
-
--#: ../clients/common/settings-docs.h.in:183
-+#: ../clients/common/settings-docs.h.in:203
- msgid ""
- "A MCC/MNC string like \"310260\" or \"21601\" identifying the specific "
- "mobile network operator which this connection applies to. If given, the "
- "connection will apply to any device also allowed by \"device-id\" and \"sim-"
- "id\" which contains a SIM card provisioned by the given operator."
--msgstr ""
--"이 연결이 적용되는 특정 모바일 네트워크 운영자를 나타내는 \"310260\"또는 \"21601\"과 같은 MCC / MNC 문자열 "
--"주어진 경우 연결은 주어진 운영자가 제공 한 SIM 카드가 들어있는 \"device-id\"및 \"sim-id\"가 허용하는 모든 "
--"장치에도 적용됩니다."
-+msgstr "이 연결이 적용되는 특정 모바일 네트워크 운영자를 나타내는 \"310260\"또는 \"21601\"과 같은 MCC / MNC 문자열 주어진 경우 연결은 주어진 운영자가 제공 한 SIM 카드가 들어있는 \"device-id\"및 \"sim-id\"가 허용하는 모든 장치에도 적용됩니다."
-
--#: ../clients/common/settings-docs.h.in:185
-+#: ../clients/common/settings-docs.h.in:205
- msgid ""
- "If specified, this connection will only apply to the IPoIB device whose "
- "permanent MAC address matches. This property does not change the MAC address "
- "of the device (i.e. MAC spoofing)."
--msgstr ""
--"이 연결을 지정하면이 연결은 영구 MAC 주소가 일치하는 IPoIB 장치에만 적용됩니다. 이 속성은 장치의 MAC 주소 (예 : MAC "
--"스푸핑)를 변경하지 않습니다."
-+msgstr "이 연결을 지정하면이 연결은 영구 MAC 주소가 일치하는 IPoIB 장치에만 적용됩니다. 이 속성은 장치의 MAC 주소 (예 : MAC 스푸핑)를 변경하지 않습니다."
-
--#: ../clients/common/settings-docs.h.in:187
-+#: ../clients/common/settings-docs.h.in:207
- msgid ""
- "The InfiniBand P_Key to use for this device. A value of -1 means to use the "
- "default P_Key (aka \"the P_Key at index 0\"). Otherwise it is a 16-bit "
- "unsigned integer, whose high bit is set if it is a \"full membership\" P_Key."
--""
--msgstr ""
--"이 장치에 사용할 InfiniBand P_Key입니다. 값 -1은 기본 P_Key (일명 \"인덱스 0에서 P_Key\")를 사용함을 "
--"의미합니다. 그렇지 않으면 16 비트 부호없는 정수로, \"전체 구성원\"P_Key 인 경우 상위 비트가 설정됩니다."
-+msgstr "이 장치에 사용할 InfiniBand P_Key입니다. 값 -1은 기본 P_Key (일명 \"인덱스 0에서 P_Key\")를 사용함을 의미합니다. 그렇지 않으면 16 비트 부호없는 정수로, \"전체 구성원\"P_Key 인 경우 상위 비트가 설정됩니다."
-
--#: ../clients/common/settings-docs.h.in:188
-+#: ../clients/common/settings-docs.h.in:208
- msgid ""
- "The interface name of the parent device of this device. Normally NULL, but "
- "if the \"p_key\" property is set, then you must specify the base device by "
- "setting either this property or \"mac-address\"."
--msgstr ""
--"이 장치의 상위 장치의 인터페이스 이름입니다. 일반적으로 NULL이지만 \"p_key\"속성이 설정된 경우이 속성 또는 \"mac-"
--"address\"를 설정하여 기본 장치를 지정해야합니다."
-+msgstr "이 장치의 상위 장치의 인터페이스 이름입니다. 일반적으로 NULL이지만 \"p_key\"속성이 설정된 경우이 속성 또는 \"mac-address\"를 설정하여 기본 장치를 지정해야합니다."
-
--#: ../clients/common/settings-docs.h.in:189
-+#: ../clients/common/settings-docs.h.in:209
- msgid ""
- "The IP-over-InfiniBand transport mode. Either \"datagram\" or \"connected\"."
- msgstr "IP-over-InfiniBand 전송 모드. \"데이터 그램\"또는 \"연결됨\"."
-
--#: ../clients/common/settings-docs.h.in:190
-+#: ../clients/common/settings-docs.h.in:210
- msgid ""
- "How many additional levels of encapsulation are permitted to be prepended to "
- "packets. This property applies only to IPv6 tunnels."
- msgstr "캡슐화의 추가 레벨은 패킷에 추가 될 수 있습니다. 이 등록 정보는 IPv6 터널에만 적용됩니다."
-
--#: ../clients/common/settings-docs.h.in:191
-+#: ../clients/common/settings-docs.h.in:211
- msgid ""
- "Tunnel flags. Currently the following values are supported: "
- "NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT (0x1), "
-@@ -7483,89 +7110,80 @@ msgid ""
- "NM_IP_TUNNEL_FLAG_IP6_MIP6_DEV (0x8), NM_IP_TUNNEL_FLAG_IP6_RCV_DSCP_COPY "
- "(0x10), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK (0x20). They are valid only "
- "for IPv6 tunnels."
--msgstr ""
--"터널 플래그. 현재 다음 값이 지원된다 NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT (0x1로) "
--"NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_TCLASS (0x2로) "
--"NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FLOWLABEL (0x4로) "
--"NM_IP_TUNNEL_FLAG_IP6_MIP6_DEV (0x8이) NM_IP_TUNNEL_FLAG_IP6_RCV_DSCP_COPY "
--"(0x10으로) NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK (가 0x20). IPv6 터널에만 유효합니다."
-+msgstr "터널 플래그. 현재 다음 값이 지원된다 NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT (0x1로) NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_TCLASS (0x2로) NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FLOWLABEL (0x4로) NM_IP_TUNNEL_FLAG_IP6_MIP6_DEV (0x8이) NM_IP_TUNNEL_FLAG_IP6_RCV_DSCP_COPY (0x10으로) NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK (가 0x20). IPv6 터널에만 유효합니다."
-
--#: ../clients/common/settings-docs.h.in:192
-+#: ../clients/common/settings-docs.h.in:212
- msgid ""
- "The flow label to assign to tunnel packets. This property applies only to "
- "IPv6 tunnels."
- msgstr "터널 패킷에 할당 할 플로우 레이블. 이 등록 정보는 IPv6 터널에만 적용됩니다."
-
--#: ../clients/common/settings-docs.h.in:193
-+#: ../clients/common/settings-docs.h.in:213
- msgid ""
- "The key used for tunnel input packets; the property is valid only for "
- "certain tunnel modes (GRE, IP6GRE). If empty, no key is used."
--msgstr ""
--"터널 입력 패킷에 사용되는 키. 속성은 특정 터널 모드 (GRE, IP6GRE)에서만 유효합니다. 비어있는 경우 키가 사용되지 않습니다."
-+msgstr "터널 입력 패킷에 사용되는 키. 속성은 특정 터널 모드 (GRE, IP6GRE)에서만 유효합니다. 비어있는 경우 키가 사용되지 않습니다."
-
--#: ../clients/common/settings-docs.h.in:194
-+#: ../clients/common/settings-docs.h.in:214
- msgid ""
- "The local endpoint of the tunnel; the value can be empty, otherwise it must "
- "contain an IPv4 or IPv6 address."
- msgstr "터널의 로컬 종점. 값은 비어있을 수 있으며, 그렇지 않으면 IPv4 또는 IPv6 주소를 포함해야합니다."
-
--#: ../clients/common/settings-docs.h.in:195
-+#: ../clients/common/settings-docs.h.in:215
- msgid ""
- "The tunneling mode, for example NM_IP_TUNNEL_MODE_IPIP (1) or "
- "NM_IP_TUNNEL_MODE_GRE (2)."
- msgstr "터널링 모드. 예 : NM_IP_TUNNEL_MODE_IPIP (1) 또는 NM_IP_TUNNEL_MODE_GRE (2)."
-
--#: ../clients/common/settings-docs.h.in:196
-+#: ../clients/common/settings-docs.h.in:216
- msgid ""
- "If non-zero, only transmit packets of the specified size or smaller, "
- "breaking larger packets up into multiple fragments."
- msgstr "0이 아닌 경우 지정된 크기 이하의 패킷 만 전송하여 더 큰 패킷을 여러 조각으로 나눕니다."
-
--#: ../clients/common/settings-docs.h.in:197
-+#: ../clients/common/settings-docs.h.in:217
- msgid ""
- "The key used for tunnel output packets; the property is valid only for "
- "certain tunnel modes (GRE, IP6GRE). If empty, no key is used."
--msgstr ""
--"터널 출력 패킷에 사용되는 키. 속성은 특정 터널 모드 (GRE, IP6GRE)에서만 유효합니다. 비어있는 경우 키가 사용되지 않습니다."
-+msgstr "터널 출력 패킷에 사용되는 키. 속성은 특정 터널 모드 (GRE, IP6GRE)에서만 유효합니다. 비어있는 경우 키가 사용되지 않습니다."
-
--#: ../clients/common/settings-docs.h.in:198
-+#: ../clients/common/settings-docs.h.in:218
- msgid ""
- "If given, specifies the parent interface name or parent connection UUID the "
- "new device will be bound to so that tunneled packets will only be routed via "
- "that interface."
--msgstr ""
--"주어진 경우 새 장치가 바인딩 될 부모 인터페이스 이름 또는 부모 연결 UUID를 지정하여 터널링 된 패킷이 해당 인터페이스를 통해서만 "
--"라우팅되도록합니다."
-+msgstr "주어진 경우 새 장치가 바인딩 될 부모 인터페이스 이름 또는 부모 연결 UUID를 지정하여 터널링 된 패킷이 해당 인터페이스를 통해서만 라우팅되도록합니다."
-
--#: ../clients/common/settings-docs.h.in:199
-+#: ../clients/common/settings-docs.h.in:219
- msgid "Whether to enable Path MTU Discovery on this tunnel."
- msgstr "이 터널에서 Path MTU Discovery를 사용할지 여부."
-
--#: ../clients/common/settings-docs.h.in:200
-+#: ../clients/common/settings-docs.h.in:220
- msgid ""
- "The remote endpoint of the tunnel; the value must contain an IPv4 or IPv6 "
- "address."
- msgstr "터널의 원격 종점. 값에는 IPv4 또는 IPv6 주소가 포함되어야합니다."
-
--#: ../clients/common/settings-docs.h.in:201
-+#: ../clients/common/settings-docs.h.in:221
- msgid ""
- "The type of service (IPv4) or traffic class (IPv6) field to be set on "
- "tunneled packets."
- msgstr "터널링 된 패킷에 설정할 서비스 유형 (IPv4) 또는 트래픽 클래스 (IPv6) 필드입니다."
-
--#: ../clients/common/settings-docs.h.in:202
-+#: ../clients/common/settings-docs.h.in:222
- msgid ""
- "The TTL to assign to tunneled packets. 0 is a special value meaning that "
- "packets inherit the TTL value."
- msgstr "터널링 된 패킷에 할당 할 TTL입니다. 0은 패킷이 TTL 값을 상속하는 특수한 값입니다."
-
--#: ../clients/common/settings-docs.h.in:203
--#: ../clients/common/settings-docs.h.in:224
-+#: ../clients/common/settings-docs.h.in:223
-+#: ../clients/common/settings-docs.h.in:246
- msgid "Array of IP addresses."
- msgstr "IP 주소의 배열."
-
--#: ../clients/common/settings-docs.h.in:204
--#: ../clients/common/settings-docs.h.in:225
-+#: ../clients/common/settings-docs.h.in:224
-+#: ../clients/common/settings-docs.h.in:247
- msgid ""
- "Timeout in milliseconds used to check for the presence of duplicate IP "
- "addresses on the network. If an address conflict is detected, the "
-@@ -7573,12 +7191,9 @@ msgid ""
- "detection is performed, -1 means the default value (either configuration "
- "ipvx.dad-timeout override or zero). A value greater than zero is a timeout "
- "in milliseconds. The property is currently implemented only for IPv4."
--msgstr ""
--"네트워크에서 중복 된 IP 주소가 있는지 확인하는 데 사용되는 시간 제한 (밀리 초)입니다. 주소 충돌이 감지되면 활성화가 실패합니다. "
--"0 값은 중복 된 주소 검색이 수행되지 않음을 의미합니다. -1은 기본값 (ipvx.dad-timeout 무시 또는 0 구성)을 "
--"의미합니다. 0보다 큰 값은 밀리 초 단위의 시간 초과입니다. 이 속성은 현재 IPv4 용으로 만 구현됩니다."
-+msgstr "네트워크에서 중복 된 IP 주소가 있는지 확인하는 데 사용되는 시간 제한 (밀리 초)입니다. 주소 충돌이 감지되면 활성화가 실패합니다. 0 값은 중복 된 주소 검색이 수행되지 않음을 의미합니다. -1은 기본값 (ipvx.dad-timeout 무시 또는 0 구성)을 의미합니다. 0보다 큰 값은 밀리 초 단위의 시간 초과입니다. 이 속성은 현재 IPv4 용으로 만 구현됩니다."
-
--#: ../clients/common/settings-docs.h.in:205
-+#: ../clients/common/settings-docs.h.in:225
- 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 "
-@@ -7592,159 +7207,173 @@ msgid ""
- "permanent MAC address of the device to generate a client identifier with "
- "type ethernet (01). Currently, these options only work for ethernet type of "
- "links. The special value \"duid\" generates a RFC4361-compliant client "
--"identifier based on a hash of the interface name as IAID and /etc/machine-id."
--" The special value \"stable\" is supported to generate a type 0 client "
-+"identifier based on a hash of the interface name as IAID and /etc/machine-"
-+"id. The special value \"stable\" is supported to generate a type 0 client "
- "identifier based on the stable-id (see connection.stable-id) and a per-host "
- "key. If you set the stable-id, you may want to include the \"${DEVICE}\" or "
- "\"${MAC}\" specifier to get a per-device key. If unset, a globally "
- "configured default is used. If still unset, the default depends on the DHCP "
- "plugin."
--msgstr ""
--"DHCP 서버가 DHCP 임대 및 옵션을 사용자 정의하는 데 사용할 수있는 로컬 시스템을 식별하기 위해 DHCP 서버로 전송되는 문자열. "
--"속성이 16 진수 문자열 ( 'aa : bb : cc') 인 경우 이진 클라이언트 ID로 해석됩니다.이 경우 첫 번째 바이트는 RFC "
--"2132 섹션 9.14에 따라 'type'필드로 간주되며 나머지 바이트 하드웨어 주소 일 수 있습니다 (예 : '01 : xx : xx :"
--" xx : xx : xx : xx '여기서 1은 이더넷 ARP 유형이고 나머지는 MAC 주소). 속성이 16 진수 문자열이 아닌 경우 "
--"하드웨어 주소가 아닌 클라이언트 ID로 간주되며 '유형'필드는 0으로 설정됩니다. 특수 값인 \"mac\"및 \"perm-mac\"가 "
--"지원되며 현재 \" 또는 장치의 영구 MAC 주소를 사용하여 유형이 ethernet (01) 인 클라이언트 식별자를 생성합니다. 현재이 "
--"옵션은 이더넷 유형의 링크에서만 작동합니다. \"stable\"특수 값은 stable-id (connection.stable-id 참조) "
--"및 호스트 별 키를 기반으로 유형 0 클라이언트 식별자를 생성하도록 지원됩니다. 설정을 해제하면 전역 적으로 구성된 기본값이 사용됩니다. "
--"여전히 설정되지 않은 경우 마지막리스의 client-id가 다시 사용됩니다."
-+msgstr "DHCP 서버가 DHCP 임대 및 옵션을 사용자 정의하는 데 사용할 수있는 로컬 시스템을 식별하기 위해 DHCP 서버로 전송되는 문자열. 속성이 16 진수 문자열 ( 'aa : bb : cc') 인 경우 이진 클라이언트 ID로 해석됩니다.이 경우 첫 번째 바이트는 RFC 2132 섹션 9.14에 따라 'type'필드로 간주되며 나머지 바이트 하드웨어 주소 일 수 있습니다 (예 : '01 : xx : xx : xx : xx : xx : xx '여기서 1은 이더넷 ARP 유형이고 나머지는 MAC 주소). 속성이 16 진수 문자열이 아닌 경우 하드웨어 주소가 아닌 클라이언트 ID로 간주되며 '유형'필드는 0으로 설정됩니다. 특수 값인 \"mac\"및 \"perm-mac\"가 지원되며 현재 \" 또는 장치의 영구 MAC 주소를 사용하여 유형이 ethernet (01) 인 클라이언트 식별자를 생성합니다. 현재이 옵션은 이더넷 유형의 링크에서만 작동합니다. \"stable\"특수 값은 stable-id (connection.stable-id 참조) 및 호스트 별 키를 기반으로 유형 0 클라이언트 식별자를 생성하도록 지원됩니다. 설정을 해제하면 전역 적으로 구성된 기본값이 사용됩니다. 여전히 설정되지 않은 경우 마지막리스의 client-id가 다시 사용됩니다."
-
--#: ../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 FQDN will "
- "be sent to the DHCP server when acquiring a lease. This property and \"dhcp-"
- "hostname\" are mutually exclusive and cannot be set at the same time."
--msgstr ""
--"\"dhcp-send-hostname\"등록 정보가 TRUE이면 임대를 획득 할 때 지정된 FQDN이 DHCP 서버로 전송됩니다. 이 "
--"등록 정보와 \"dhcp-hostname\"은 동시에 사용할 수 없으므로 동시에 설정할 수 없습니다."
-+msgstr "\"dhcp-send-hostname\"등록 정보가 TRUE이면 임대를 획득 할 때 지정된 FQDN이 DHCP 서버로 전송됩니다. 이 등록 정보와 \"dhcp-hostname\"은 동시에 사용할 수 없으므로 동시에 설정할 수 없습니다."
-
--#: ../clients/common/settings-docs.h.in:207
- #: ../clients/common/settings-docs.h.in:227
-+#: ../clients/common/settings-docs.h.in:249
- msgid ""
- "If the \"dhcp-send-hostname\" property is TRUE, then the specified name will "
- "be sent to the DHCP server when acquiring a lease. This property and \"dhcp-"
- "fqdn\" are mutually exclusive and cannot be set at the same time."
--msgstr ""
--"\"dhcp-send-hostname\"등록 정보가 TRUE이면 임대를 얻을 때 지정된 이름이 DHCP 서버로 전송됩니다. 이 등록 "
--"정보와 \"dhcp-fqdn\"은 동시에 사용할 수 없으며 동시에 설정할 수 없습니다."
-+msgstr "\"dhcp-send-hostname\"등록 정보가 TRUE이면 임대를 얻을 때 지정된 이름이 DHCP 서버로 전송됩니다. 이 등록 정보와 \"dhcp-fqdn\"은 동시에 사용할 수 없으며 동시에 설정할 수 없습니다."
-
--#: ../clients/common/settings-docs.h.in:208
- #: ../clients/common/settings-docs.h.in:228
-+#: ../clients/common/settings-docs.h.in:250
-+msgid ""
-+"Flags for the DHCP hostname and FQDN. Currently this property only includes "
-+"flags to control the FQDN flags set in the DHCP FQDN option. Supported FQDN "
-+"flags are NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), "
-+"NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) and "
-+"NM_DHCP_HOSTNAME_FLAG_FQDN_NO_UPDATE (0x4). When no FQDN flag is set and "
-+"NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is set, the DHCP FQDN option "
-+"will contain no flag. Otherwise, if no FQDN flag is set and "
-+"NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is not set, the standard FQDN "
-+"flags are set in the request: NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), "
-+"NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) for IPv4 and "
-+"NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1) for IPv6. When this property is "
-+"set to the default value NM_DHCP_HOSTNAME_FLAG_NONE (0x0), a global default "
-+"is looked up in NetworkManager configuration. If that value is unset or also "
-+"NM_DHCP_HOSTNAME_FLAG_NONE (0x0), then the standard FQDN flags described "
-+"above are sent in the DHCP requests."
-+msgstr "DHCP 호스트 이름 및 FQDN에 대한 플래그입니다. 현재이 속성에는 DHCP FQDN 옵션에 설정된 FQDN 플래그를 제어하는 플래그 만 포함되어 있습니다. 지원되는 FQDN 플래그는 NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) 및 NM_DHCP_HOSTNAME_FLAG_FQDN_NO_UPDATE (0x4)입니다. FQDN 플래그가 설정되지 않고 NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8)가 설정되면 DHCP FQDN 옵션에 플래그가 포함되지 않습니다. 그렇지 않으면 FQDN 플래그가 설정되지 않고 NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8)가 설정되지 않은 경우 표준 FQDN 플래그가 요청에 설정됩니다. 이 특성이 기본값 NM_DHCP_HOSTNAME_FLAG_NONE (0x0)으로 설정되면 NetworkManager 구성에서 전역 기본값이 조회됩니다. 해당 값이 설정되어 있지 않거나 NM_DHCP_HOSTNAME_FLAG_NONE (0x0) 인 경우 위에서 설명한 표준 FQDN 플래그가 DHCP 요청으로 전송됩니다."
-+
-+#: ../clients/common/settings-docs.h.in:229
-+#: ../clients/common/settings-docs.h.in:251
-+msgid ""
-+"A string containing the \"Identity Association Identifier\" (IAID) used by "
-+"the DHCP client. The property is a 32-bit decimal value or a special value "
-+"among \"mac\", \"perm-mac\", \"ifname\" and \"stable\". When set to \"mac"
-+"\" (or \"perm-mac\"), the last 4 bytes of the current (or permanent) MAC "
-+"address are used as IAID. When set to \"ifname\", the IAID is computed by "
-+"hashing the interface name. The special value \"stable\" can be used to "
-+"generate an IAID based on the stable-id (see connection.stable-id), a per-"
-+"host key and the interface name. When the property is unset, the value from "
-+"global configuration is used; if no global default is set then the IAID is "
-+"assumed to be \"ifname\". Note that at the moment this property is ignored "
-+"for IPv6 by dhclient, which always derives the IAID from the MAC address."
-+msgstr "DHCP 클라이언트가 사용하는 \"IDID (Identity Association Identifier)\"가 포함 된 문자열입니다. 이 속성은 32 비트 10 진수 값이거나 \"mac\", \"perm-mac\", \"ifname\"및 \"stable\"중 특수 값입니다. \"mac\"(또는 \"perm-mac\")으로 설정하면 현재 (또는 영구) MAC 주소의 마지막 4 바이트가 IAID로 사용됩니다. \"ifname\"으로 설정하면 IAID는 인터페이스 이름을 해싱하여 계산됩니다. 특수 값 \"stable\"은 안정 ID (connection.stable-id 참조), 호스트 별 키 및 인터페이스 이름을 기반으로 IAID를 생성하는 데 사용할 수 있습니다. 속성이 설정되어 있지 않으면 전역 구성의 값이 사용됩니다. 전역 기본값이 설정되어 있지 않으면 IAID는 \"ifname\"으로 간주됩니다. 현재이 속성은 dhclient에 의해 IPv6에 대해 무시되며, 항상 MAC 주소에서 IAID를 가져옵니다."
-+
-+#: ../clients/common/settings-docs.h.in:230
-+#: ../clients/common/settings-docs.h.in:252
- msgid ""
- "If TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some "
- "DHCP servers use this hostname to update DNS databases, essentially "
- "providing a static hostname for the computer. If the \"dhcp-hostname\" "
- "property is NULL and this property is TRUE, the current persistent hostname "
- "of the computer is sent."
--msgstr ""
--"참인 경우 임대를 얻을 때 호스트 이름이 DHCP 서버로 전송됩니다. 일부 DHCP 서버는이 호스트 이름을 사용하여 DNS 데이터베이스를 "
--"업데이트합니다. 기본적으로 컴퓨터의 고정 호스트 이름을 제공합니다. \"dhcp-hostname\"속성이 NULL이고이 속성이 "
--"TRUE이면 컴퓨터의 현재 영구 호스트 이름이 전송됩니다."
-+msgstr "참인 경우 임대를 얻을 때 호스트 이름이 DHCP 서버로 전송됩니다. 일부 DHCP 서버는이 호스트 이름을 사용하여 DNS 데이터베이스를 업데이트합니다. 기본적으로 컴퓨터의 고정 호스트 이름을 제공합니다. \"dhcp-hostname\"속성이 NULL이고이 속성이 TRUE이면 컴퓨터의 현재 영구 호스트 이름이 전송됩니다."
-
--#: ../clients/common/settings-docs.h.in:209
--#: ../clients/common/settings-docs.h.in:229
--msgid "A timeout for a DHCP transaction in seconds."
--msgstr "DHCP 트랜잭션의 시간 초과 (초)."
-+#: ../clients/common/settings-docs.h.in:231
-+#: ../clients/common/settings-docs.h.in:253
-+msgid ""
-+"A timeout for a DHCP transaction in seconds. If zero (the default), a "
-+"globally configured default is used. If still unspecified, a device specific "
-+"timeout is used (usually 45 seconds). Set to 2147483647 (MAXINT32) for "
-+"infinity."
-+msgstr "DHCP 트랜잭션의 시간 초과 (초)입니다. 0 (기본값)이면 전역 적으로 구성된 기본값이 사용됩니다. 여전히 지정되지 않은 경우 장치 별 시간 초과가 사용됩니다 (보통 45 초). 무한대는 2147483647 (MAXINT32)로 설정하십시오."
-
--#: ../clients/common/settings-docs.h.in:210
--#: ../clients/common/settings-docs.h.in:230
-+#: ../clients/common/settings-docs.h.in:232
-+#: ../clients/common/settings-docs.h.in:254
- msgid "Array of IP addresses of DNS servers."
- msgstr "DNS 서버의 IP 주소 배열입니다."
-
--#: ../clients/common/settings-docs.h.in:211
--#: ../clients/common/settings-docs.h.in:231
-+#: ../clients/common/settings-docs.h.in:233
-+#: ../clients/common/settings-docs.h.in:255
- msgid ""
- "Array of DNS options as described in man 5 resolv.conf. NULL means that the "
- "options are unset and left at the default. In this case NetworkManager will "
--"use default options. This is distinct from an empty list of properties."
--msgstr ""
--"man 5 resolv.conf에 설명 된대로 DNS 옵션 배열. NULL은 옵션이 설정되지 않았으며 기본값으로 남아 있음을 의미합니다. "
--"이 경우 NetworkManager는 기본 옵션을 사용합니다. 이것은 속성의 빈 목록과는 다릅니다."
-+"use default options. This is distinct from an empty list of properties. The "
-+"currently supported options are \"attempts\", \"debug\", \"edns0\", "
-+"\"inet6\", \"ip6-bytestring\", \"ip6-dotint\", \"ndots\", \"no-check-names"
-+"\", \"no-ip6-dotint\", \"no-reload\", \"no-tld-query\", \"rotate\", \"single-"
-+"request\", \"single-request-reopen\", \"timeout\", \"trust-ad\", \"use-vc\". "
-+"The \"trust-ad\" setting is only honored if the profile contributes name "
-+"servers to resolv.conf, and if all contributing profiles have \"trust-ad\" "
-+"enabled."
-+msgstr "man 5 resolv.conf에 설명 된 DNS 옵션 배열. NULL은 옵션이 설정되지 않고 기본값으로 유지됨을 의미합니다. 이 경우 NetworkManager는 기본 옵션을 사용합니다. 이것은 빈 속성 목록과 다릅니다. 현재 지원되는 옵션은 \"시도\", \"디버그\", \"edns0\", \"inet6\", \"ip6-bytestring\", \"ip6-dotint\", \"ndots\", \"no-check-names\", \"no-ip6- dotint \",\"no-reload \",\"no-tld-query \",\"rotate \",\"single-request \",\"single-request-reopen \",\"timeout \",\"trust-ad \",\"use-vc \" . \"trust-ad\"설정은 프로파일이 이름 서버를 resolv.conf에 제공하고 모든 기여 프로파일에 \"trust-ad\"가 활성화 된 경우에만 적용됩니다."
-
--#: ../clients/common/settings-docs.h.in:212
--#: ../clients/common/settings-docs.h.in:232
--#, fuzzy
-+#: ../clients/common/settings-docs.h.in:234
-+#: ../clients/common/settings-docs.h.in:256
- msgid ""
- "DNS servers priority. The relative priority for DNS servers specified by "
- "this setting. A lower value is better (higher priority). Zero selects a "
- "globally configured default value. If the latter is missing or zero too, it "
--"defaults to 50 for VPNs and 100 for other connections. Note that the "
--"priority is to order DNS settings for multiple active connections. It does "
--"not disambiguate multiple DNS servers within the same connection profile. "
--"When using dns=default, servers with higher priority will be on top of "
--"resolv.conf. To prioritize a given server over another one within the same "
--"connection, just specify them in the desired order. When multiple devices "
--"have configurations with the same priority, the one with an active default "
--"route will be preferred. Negative values have the special effect of "
--"excluding other configurations with a greater priority value; so in presence "
--"of at least a negative priority, only DNS servers from connections with the "
--"lowest priority value will be used. When using a DNS resolver that supports "
--"Conditional Forwarding as dns=dnsmasq or dns=systemd-resolved, each "
--"connection is used to query domains in its search list. Queries for domains "
--"not present in any search list are routed through connections having the '~."
--"' special wildcard domain, which is added automatically to connections with "
--"the default route (or can be added manually). When multiple connections "
--"specify the same domain, the one with the highest priority (lowest numerical "
--"value) wins. If a connection specifies a domain which is subdomain of "
--"another domain with a negative DNS priority value, the subdomain is ignored."
--msgstr ""
--"DNS 서버 우선 순위. 이 설정으로 지정된 DNS 서버의 상대적 우선 순위입니다. 낮은 값이 더 좋습니다 (우선 순위가 더 높음). "
--"기본값은 0이며 VPN의 경우 50이고 다른 연결의 경우 100입니다. 우선 순위는 여러 활성 연결에 대한 DNS 설정을 주문하는 "
--"것입니다. 동일한 연결 프로필 내에서 여러 DNS 서버를 모호하지 않습니다. dns = default를 사용할 때 우선 순위가 높은 "
--"서버는 resolv.conf 위에 있습니다. 동일한 연결 내에서 다른 서버보다 우선 순위가 높은 서버를 원하는 순서대로 지정하십시오. "
--"여러 장치의 우선 순위가 같은 구성이있는 경우 활성 기본 경로가있는 장치가 우선적으로 사용됩니다. 음수 값은 우선 순위 값이 큰 다른 "
--"구성을 제외시키는 특별한 효과가 있습니다. 최소한의 우선 순위가 아닌 우선 순위 값이있는 연결의 DNS 서버 만 사용됩니다. 분할 "
--"DNS를 dns = dnsmasq 또는 dns = systemd-resolved로 지원하는 DNS 확인자를 사용할 경우 각 연결은 검색 "
--"목록에서 도메인을 쿼리하는 데 사용됩니다. 어떤 검색 목록에도없는 도메인에 대한 쿼리는 '~.' special wildcard "
--"domain, which is added automatically to connections with the default route "
--"(or can be added manually). When multiple connections specify the same "
--"domain, the one with the highest priority (lowest numerical value) wins. If "
--"a connection specifies a domain which is subdomain of another domain with a "
--"negative DNS priority value, the subdomain is ignored."
-+"defaults to 50 for VPNs (including WireGuard) and 100 for other connections. "
-+"Note that the priority is to order DNS settings for multiple active "
-+"connections. It does not disambiguate multiple DNS servers within the same "
-+"connection profile. When using dns=default, servers with higher priority "
-+"will be on top of resolv.conf. To prioritize a given server over another "
-+"one within the same connection, just specify them in the desired order. "
-+"When multiple devices have configurations with the same priority, VPNs will "
-+"be considered first, then devices with the best (lowest metric) default "
-+"route and then all other devices. Negative values have the special effect "
-+"of excluding other configurations with a greater priority value; so in "
-+"presence of at least one negative priority, only DNS servers from "
-+"connections with the lowest priority value will be used. When using a DNS "
-+"resolver that supports Conditional Forwarding as dns=dnsmasq or dns=systemd-"
-+"resolved, each connection is used to query domains in its search list. "
-+"Queries for domains not present in any search list are routed through "
-+"connections having the '~.' special wildcard domain, which is added "
-+"automatically to connections with the default route (or can be added "
-+"manually). When multiple connections specify the same domain, the one with "
-+"the highest priority (lowest numerical value) wins. If a connection "
-+"specifies a domain which is subdomain of another domain with a negative DNS "
-+"priority value, the subdomain is ignored."
-+msgstr "DNS 서버 우선 순위. 이 설정으로 지정된 DNS 서버의 상대적 우선 순위 값이 낮을수록 좋습니다 (높은 우선 순위). 0은 전체적으로 구성된 기본값을 선택합니다. 후자가 없거나 0이면 VPN (WireGuard 포함)의 경우 기본값은 50이고 다른 연결의 경우 100입니다. 우선 순위는 여러 활성 연결에 대한 DNS 설정을 주문하는 것입니다. 동일한 연결 프로필 내에서 여러 DNS 서버를 명확하게하지 않습니다. dns = default를 사용하면 우선 순위가 높은 서버가 resolv.conf 위에 있습니다. 동일한 연결 내에서 다른 서버보다 지정된 서버의 우선 순위를 지정하려면 원하는 순서대로 지정하십시오. 여러 장치의 우선 순위가 동일한 구성을 사용하는 경우 VPN을 먼저 고려한 다음 기본 (가장 낮은 메트릭) 기본 경로를 가진 장치와 다른 모든 장치를 고려합니다. 음수 값은 우선 순위 값이 큰 다른 구성을 제외하는 특수 효과가 있습니다. 따라서 하나 이상의 음의 우선 순위가 존재하면 우선 순위 값이 가장 낮은 연결의 DNS 서버 만 사용됩니다. dns = dnsmasq 또는 dns = systemd-resolved로 조건부 전달을 지원하는 DNS 확인자를 사용할 때 각 연결은 검색 목록에서 도메인을 쿼리하는 데 사용됩니다. 검색 목록에없는 도메인에 대한 쿼리는 '~'가있는 연결을 통해 라우팅됩니다. 기본 경로를 사용하여 연결에 자동으로 추가되거나 수동으로 추가 될 수있는 특수 와일드 카드 도메인. 여러 연결이 동일한 도메인을 지정하면 우선 순위가 가장 높은 (가장 낮은 숫자 값) 도메인이 우선합니다. 연결에서 DNS 우선 순위 값이 음수 인 다른 도메인의 하위 도메인 인 도메인을 지정하면 하위 도메인이 무시됩니다."
-
--#: ../clients/common/settings-docs.h.in:213
--#: ../clients/common/settings-docs.h.in:233
-+#: ../clients/common/settings-docs.h.in:235
-+#: ../clients/common/settings-docs.h.in:257
- msgid ""
- "Array of DNS search domains. Domains starting with a tilde ('~') are "
- "considered 'routing' domains and are used only to decide the interface over "
- "which a query must be forwarded; they are not used to complete unqualified "
- "host names."
--msgstr ""
--"DNS 검색 도메인의 배열입니다. 물결 표시로 시작하는 도메인 ( '~') are considered 'routing' domains "
--"and are used only to decide the interface over which a query must be "
--"forwarded; they are not used to complete unqualified host names."
-+msgstr "DNS 검색 도메인의 배열입니다. 물결 표시로 시작하는 도메인 ( '~') are considered 'routing' domains and are used only to decide the interface over which a query must be forwarded; they are not used to complete unqualified host names."
-
--#: ../clients/common/settings-docs.h.in:214
--#: ../clients/common/settings-docs.h.in:234
-+#: ../clients/common/settings-docs.h.in:236
-+#: ../clients/common/settings-docs.h.in:258
- msgid ""
- "The gateway associated with this configuration. This is only meaningful if "
--"\"addresses\" is also set."
--msgstr "이 구성과 관련된 게이트웨이입니다. \"주소\"도 설정되어있는 경우에만 의미가 있습니다."
-+"\"addresses\" is also set. The gateway's main purpose is to control the next "
-+"hop of the standard default route on the device. Hence, the gateway property "
-+"conflicts with \"never-default\" and will be automatically dropped if the IP "
-+"configuration is set to never-default. As an alternative to set the gateway, "
-+"configure a static default route with /0 as prefix length."
-+msgstr "이 구성과 연관된 게이트웨이. \"주소\"도 설정 한 경우에만 의미가 있습니다. 게이트웨이의 주요 목적은 장치에서 표준 기본 경로의 다음 홉을 제어하는 것입니다. 따라서 게이트웨이 속성은 \"never-default\"와 충돌하며 IP 구성이 기본값이 none으로 설정되면 자동으로 삭제됩니다. 게이트웨이를 설정하는 대안으로 접두사 길이로 / 0을 사용하여 정적 기본 경로를 구성하십시오."
-
--#: ../clients/common/settings-docs.h.in:215
--#: ../clients/common/settings-docs.h.in:235
-+#: ../clients/common/settings-docs.h.in:237
-+#: ../clients/common/settings-docs.h.in:259
- msgid ""
- "When \"method\" is set to \"auto\" and this property to TRUE, automatically "
- "configured nameservers and search domains are ignored and only nameservers "
- "and search domains specified in the \"dns\" and \"dns-search\" properties, "
- "if any, are used."
--msgstr ""
--"\"method\"가 \"auto\"로 설정되고이 속성이 TRUE로 설정되면 자동으로 구성된 nameservers 및 검색 도메인은 "
--"무시되며 \"dns\"및 \"dns-search\"속성에 지정된 이름 서버 및 검색 도메인 만 사용됩니다."
-+msgstr "\"method\"가 \"auto\"로 설정되고이 속성이 TRUE로 설정되면 자동으로 구성된 nameservers 및 검색 도메인은 무시되며 \"dns\"및 \"dns-search\"속성에 지정된 이름 서버 및 검색 도메인 만 사용됩니다."
-
--#: ../clients/common/settings-docs.h.in:216
--#: ../clients/common/settings-docs.h.in:236
-+#: ../clients/common/settings-docs.h.in:238
-+#: ../clients/common/settings-docs.h.in:260
- msgid ""
- "When \"method\" is set to \"auto\" and this property to TRUE, automatically "
- "configured routes are ignored and only routes specified in the \"routes\" "
- "property, if any, are used."
--msgstr ""
--"\"method\"가 \"auto\"로 설정되고이 속성이 TRUE로 설정되면 자동으로 구성된 경로는 무시되고 \"routes\"속성에 "
--"지정된 경로 만 사용됩니다."
-+msgstr "\"method\"가 \"auto\"로 설정되고이 속성이 TRUE로 설정되면 자동으로 구성된 경로는 무시되고 \"routes\"속성에 지정된 경로 만 사용됩니다."
-
--#: ../clients/common/settings-docs.h.in:217
--#: ../clients/common/settings-docs.h.in:238
-+#: ../clients/common/settings-docs.h.in:239
-+#: ../clients/common/settings-docs.h.in:262
- msgid ""
- "If TRUE, allow overall network configuration to proceed even if the "
- "configuration specified by this property times out. Note that at least one "
-@@ -7752,47 +7381,34 @@ msgid ""
- "fail. For example, in IPv6-only networks, setting this property to TRUE on "
- "the NMSettingIP4Config allows the overall network configuration to succeed "
- "if IPv4 configuration fails but IPv6 configuration completes successfully."
--msgstr ""
--"TRUE 일 경우,이 등록 정보로 지정된 구성이 시간 초과 되더라도 전체 네트워크 구성을 계속할 수 있습니다. 하나 이상의 IP 구성이 "
--"성공해야하거나 전체 네트워크 구성이 계속 실패합니다. 예를 들어, IPv6 전용 네트워크에서 NMSettingIP4Config에서이 "
--"속성을 TRUE로 설정하면 IPv4 구성이 실패했지만 IPv6 구성이 성공적으로 완료되면 전체 네트워크 구성이 성공할 수 있습니다."
-+msgstr "TRUE 일 경우,이 등록 정보로 지정된 구성이 시간 초과 되더라도 전체 네트워크 구성을 계속할 수 있습니다. 하나 이상의 IP 구성이 성공해야하거나 전체 네트워크 구성이 계속 실패합니다. 예를 들어, IPv6 전용 네트워크에서 NMSettingIP4Config에서이 속성을 TRUE로 설정하면 IPv4 구성이 실패했지만 IPv6 구성이 성공적으로 완료되면 전체 네트워크 구성이 성공할 수 있습니다."
-
--#: ../clients/common/settings-docs.h.in:218
--#: ../clients/common/settings-docs.h.in:239
--#, fuzzy
-+#: ../clients/common/settings-docs.h.in:240
-+#: ../clients/common/settings-docs.h.in:263
- msgid ""
- "IP configuration method. NMSettingIP4Config and NMSettingIP6Config both "
- "support \"disabled\", \"auto\", \"manual\", and \"link-local\". See the "
--"subclass-specific documentation for other values. In general, for the "
--"\"auto\" method, properties such as \"dns\" and \"routes\" specify "
--"information that is added on to the information returned from automatic "
--"configuration. The \"ignore-auto-routes\" and \"ignore-auto-dns\" "
--"properties modify this behavior. For methods that imply no upstream network, "
--"such as \"shared\" or \"link-local\", these properties must be empty. For "
--"IPv4 method \"shared\", the IP subnet can be configured by adding one manual "
--"IPv4 address or otherwise 10.42.x.0/24 is chosen. Note that the shared "
--"method must be configured on the interface which shares the internet to a "
--"subnet, not on the uplink which is shared."
--msgstr ""
--"IP 구성 방법. NMSettingIP4Config 및 NMSettingIP6Config는 \"auto\", \"manual\"및 "
--"\"link-local\"을 모두 지원합니다. 다른 값에 대해서는 하위 클래스 별 설명서를 참조하십시오. 일반적으로 \"자동\"방법의 "
--"경우 \"dns\"및 \"routes\"와 같은 등록 정보는 자동 구성에서 반환 된 정보에 추가되는 정보를 지정합니다. \"ignore-"
--"auto-routes\"및 \"ignore-auto-dns\"속성은이 동작을 수정합니다. '공유'또는 '링크 로컬'과 같이 업스트림 "
--"네트워크를 의미하지 않는 메소드의 경우 이러한 속성은 비어 있어야합니다. IPv4 방식 \"공유\"의 경우 수동 IPv4 주소 하나를 "
--"추가하여 IP 서브넷을 구성하거나 10.42.x.0 / 24가 선택됩니다. 공유 방법은 공유하는 업 링크가 아니라 인터넷을 서브넷에 "
--"공유하는 인터페이스에 구성되어야합니다."
-+"subclass-specific documentation for other values. In general, for the \"auto"
-+"\" method, properties such as \"dns\" and \"routes\" specify information "
-+"that is added on to the information returned from automatic configuration. "
-+"The \"ignore-auto-routes\" and \"ignore-auto-dns\" properties modify this "
-+"behavior. For methods that imply no upstream network, such as \"shared\" or "
-+"\"link-local\", these properties must be empty. For IPv4 method \"shared\", "
-+"the IP subnet can be configured by adding one manual IPv4 address or "
-+"otherwise 10.42.x.0/24 is chosen. Note that the shared method must be "
-+"configured on the interface which shares the internet to a subnet, not on "
-+"the uplink which is shared."
-+msgstr "IP 구성 방법. NMSettingIP4Config 및 NMSettingIP6Config는 모두 \"disabled\", \"auto\", \"manual\"및 \"link-local\"을 지원합니다. 다른 값에 대해서는 서브 클래스 특정 문서를 참조하십시오. 일반적으로 \"auto\"방법의 경우 \"dns\"및 \"routes\"와 같은 속성은 자동 구성에서 반환 된 정보에 추가되는 정보를 지정합니다. \"ignore-auto-routes\"및 \"ignore-auto-dns\"속성은이 동작을 수정합니다. \"공유\"또는 \"링크 로컬\"과 같은 업스트림 네트워크를 암시하지 않는 메소드의 경우이 특성은 비어 있어야합니다. IPv4 방법 \"공유\"의 경우 하나의 수동 IPv4 주소를 추가하여 IP 서브넷을 구성하거나 10.42.x.0 / 24를 선택할 수 있습니다. 공유 방법은 공유 된 업 링크가 아닌 서브넷과 인터넷을 공유하는 인터페이스에서 구성해야합니다."
-
--#: ../clients/common/settings-docs.h.in:219
--#: ../clients/common/settings-docs.h.in:240
-+#: ../clients/common/settings-docs.h.in:241
-+#: ../clients/common/settings-docs.h.in:264
- msgid ""
- "If TRUE, this connection will never be the default connection for this IP "
- "type, meaning it will never be assigned the default route by NetworkManager."
--msgstr ""
--"TRUE이면이 연결은이 IP 유형에 대한 기본 연결이되지 않습니다. 즉, NetworkManager에 의해 기본 경로가 할당되지 않습니다."
--""
-+msgstr "TRUE이면이 연결은이 IP 유형에 대한 기본 연결이되지 않습니다. 즉, NetworkManager에 의해 기본 경로가 할당되지 않습니다."
-
--#: ../clients/common/settings-docs.h.in:220
--#: ../clients/common/settings-docs.h.in:241
-+#: ../clients/common/settings-docs.h.in:242
-+#: ../clients/common/settings-docs.h.in:266
- 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 "
-@@ -7801,14 +7417,10 @@ msgid ""
- "default route. Note that for IPv6, the kernel accepts zero (0) but coerces "
- "it to 1024 (user default). Hence, setting this property to zero effectively "
- "mean setting it to 1024. For IPv4, zero is a regular value for the metric."
--msgstr ""
--"메트릭을 명시 적으로 지정하지 않은 경로의 기본 메트릭입니다. 기본값 -1은 메트릭이 장치 유형에 따라 자동으로 선택됨을 의미합니다. 이 "
--"메트릭은 동적 경로, 명시 적 메트릭 설정, 주소 접두사 경로 및 기본 경로가없는 수동 (정적) 경로에 적용됩니다. IPv6의 경우 "
--"커널이 0을 허용하지만 1024로 강제 변환합니다 (사용자 기본값). 따라서이 등록 정보를 0으로 설정한다는 것은 효과적으로이를 "
--"1024로 설정 함을 의미합니다. IPv4의 경우 0은 메트릭의 일반 값입니다."
-+msgstr "메트릭을 명시 적으로 지정하지 않은 경로의 기본 메트릭입니다. 기본값 -1은 메트릭이 장치 유형에 따라 자동으로 선택됨을 의미합니다. 이 메트릭은 동적 경로, 명시 적 메트릭 설정, 주소 접두사 경로 및 기본 경로가없는 수동 (정적) 경로에 적용됩니다. IPv6의 경우 커널이 0을 허용하지만 1024로 강제 변환합니다 (사용자 기본값). 따라서이 등록 정보를 0으로 설정한다는 것은 효과적으로이를 1024로 설정 함을 의미합니다. IPv4의 경우 0은 메트릭의 일반 값입니다."
-
--#: ../clients/common/settings-docs.h.in:221
--#: ../clients/common/settings-docs.h.in:242
-+#: ../clients/common/settings-docs.h.in:243
-+#: ../clients/common/settings-docs.h.in:267
- msgid ""
- "Enable policy routing (source routing) and set the routing table used when "
- "adding routes. This affects all routes, including device-routes, IPv4LL, "
-@@ -7823,21 +7435,14 @@ msgid ""
- "will not delete any extraneous routes from tables except the main table. "
- "This is to preserve backward compatibility for users who manage routing "
- "tables outside of NetworkManager."
--msgstr ""
--"정책 라우팅 (소스 라우팅)을 사용하고 경로를 추가 할 때 사용되는 라우팅 테이블을 설정하십시오. 이는 장치 경로, IPv4LL, "
--"DHCP, SLAAC, 기본 경로 및 고정 경로를 비롯한 모든 경로에 영향을줍니다. 그러나 고정 경로는 0이 아닌 라우팅 테이블을 명시 "
--"적으로 지정하여 설정을 개별적으로 덮어 쓸 수 있습니다. 테이블 설정이 0으로 유지되면 전역 구성을 통해 덮어 쓸 수 있습니다. 글로벌 "
--"구성 값을 적용한 후에도 속성이 0이면이 연결의 주소 패밀리에 대한 정책 라우팅이 비활성화됩니다. 정책 라우팅을 비활성화하면 "
--"NetworkManager가 모든 경로를 주 테이블에 추가합니다 (다른 테이블을 명시 적으로 구성하는 고정 경로 제외). 또한 "
--"NetworkManager는 주 테이블을 제외한 테이블에서 불필요한 경로를 삭제하지 않습니다. 이는 NetworkManager 외부의 "
--"라우팅 테이블을 관리하는 사용자의 이전 버전과의 호환성을 유지하기위한 것입니다."
-+msgstr "정책 라우팅 (소스 라우팅)을 사용하고 경로를 추가 할 때 사용되는 라우팅 테이블을 설정하십시오. 이는 장치 경로, IPv4LL, DHCP, SLAAC, 기본 경로 및 고정 경로를 비롯한 모든 경로에 영향을줍니다. 그러나 고정 경로는 0이 아닌 라우팅 테이블을 명시 적으로 지정하여 설정을 개별적으로 덮어 쓸 수 있습니다. 테이블 설정이 0으로 유지되면 전역 구성을 통해 덮어 쓸 수 있습니다. 글로벌 구성 값을 적용한 후에도 속성이 0이면이 연결의 주소 패밀리에 대한 정책 라우팅이 비활성화됩니다. 정책 라우팅을 비활성화하면 NetworkManager가 모든 경로를 주 테이블에 추가합니다 (다른 테이블을 명시 적으로 구성하는 고정 경로 제외). 또한 NetworkManager는 주 테이블을 제외한 테이블에서 불필요한 경로를 삭제하지 않습니다. 이는 NetworkManager 외부의 라우팅 테이블을 관리하는 사용자의 이전 버전과의 호환성을 유지하기위한 것입니다."
-
--#: ../clients/common/settings-docs.h.in:222
--#: ../clients/common/settings-docs.h.in:243
-+#: ../clients/common/settings-docs.h.in:244
-+#: ../clients/common/settings-docs.h.in:268
- msgid "Array of IP routes."
- msgstr "IP 라우트의 배열."
-
--#: ../clients/common/settings-docs.h.in:223
-+#: ../clients/common/settings-docs.h.in:245
- msgid ""
- "Configure method for creating the address for use with RFC4862 IPv6 "
- "Stateless Address Autoconfiguration. The permitted values are: "
-@@ -7857,19 +7462,9 @@ msgid ""
- "upgrade from older versions. Note that this setting is distinct from the "
- "Privacy Extensions as configured by \"ip6-privacy\" property and it does not "
- "affect the temporary addresses configured with this option."
--msgstr ""
--"RFC4862 IPv6 Stateless Address Autoconfiguration과 함께 사용할 주소를 생성하는 방법을 구성합니다. "
--"허용되는 값은 NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_EUI64 (0) 또는 "
--"NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_STABLE_PRIVACY (1)입니다. 속성이 EUI64로 설정된 경우 "
--"주소는 하드웨어 주소에서 파생 된 인터페이스 토큰을 사용하여 생성됩니다. 이렇게하면 주소의 호스트 부분이 일정하게 유지되어 네트워크 "
--"변경시 호스트의 존재를 추적 할 수 있습니다. 인터페이스 하드웨어가 교체되면 주소가 변경됩니다. 안정적 프라이버시의 가치는 RFC "
--"7217에 명시된 바와 같이 연결의 stable-id 및 네트워크 주소와 함께 비밀 호스트 별 키의 암호 학적으로 안전한 해시를 사용할 "
--"수있게합니다. 이렇게하면 주소 트랙 호스트의 존재를 사용할 수 없으며 네트워크 인터페이스 하드웨어를 교체 할 때 주소가 안정됩니다. D-"
--"Bus에서 addr-gen-mode 설정이 없으면 안정적인 개인 정보 보호가 가능합니다. keyfile 플러그인의 경우 디스크에 설정이 "
--"없다는 것은 EUI64를 의미하므로 이전 버전에서 업그레이드 할 때 속성이 변경되지 않습니다. 이 설정은 \"ip6-"
--"privacy\"속성으로 구성된 Privacy Extensions와 별개이며이 옵션으로 구성된 임시 주소에는 영향을 미치지 않습니다."
-+msgstr "RFC4862 IPv6 Stateless Address Autoconfiguration과 함께 사용할 주소를 생성하는 방법을 구성합니다. 허용되는 값은 NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_EUI64 (0) 또는 NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_STABLE_PRIVACY (1)입니다. 속성이 EUI64로 설정된 경우 주소는 하드웨어 주소에서 파생 된 인터페이스 토큰을 사용하여 생성됩니다. 이렇게하면 주소의 호스트 부분이 일정하게 유지되어 네트워크 변경시 호스트의 존재를 추적 할 수 있습니다. 인터페이스 하드웨어가 교체되면 주소가 변경됩니다. 안정적 프라이버시의 가치는 RFC 7217에 명시된 바와 같이 연결의 stable-id 및 네트워크 주소와 함께 비밀 호스트 별 키의 암호 학적으로 안전한 해시를 사용할 수있게합니다. 이렇게하면 주소 트랙 호스트의 존재를 사용할 수 없으며 네트워크 인터페이스 하드웨어를 교체 할 때 주소가 안정됩니다. D-Bus에서 addr-gen-mode 설정이 없으면 안정적인 개인 정보 보호가 가능합니다. keyfile 플러그인의 경우 디스크에 설정이 없다는 것은 EUI64를 의미하므로 이전 버전에서 업그레이드 할 때 속성이 변경되지 않습니다. 이 설정은 \"ip6-privacy\"속성으로 구성된 Privacy Extensions와 별개이며이 옵션으로 구성된 임시 주소에는 영향을 미치지 않습니다."
-
--#: ../clients/common/settings-docs.h.in:226
-+#: ../clients/common/settings-docs.h.in:248
- 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 "
-@@ -7896,22 +7491,9 @@ msgid ""
- "When the property is unset, the global value provided for \"ipv6.dhcp-duid\" "
- "is used. If no global value is provided, the default \"lease\" value is "
- "assumed."
--msgstr ""
--"dhcp 클라이언트가 DHCPv6 서버 (RFC 3315)를 식별하는 데 사용하는 DHCPv6 고유 식별자 (DUID)가 포함 된 "
--"문자열입니다. DUID는 클라이언트 식별자 옵션에서 전달됩니다. 속성이 16 진수 문자열 ( 'aa : bb : cc')이면 이진 "
--"DUID로 해석되고 클라이언트 식별자 옵션에서 불투명 한 값으로 채워집니다. 특수 값 \"lease\"는 연결에 속한 임대 파일에서 "
--"이전에 사용 된 DUID를 검색합니다. DUID가없고 \"dhclient\"가 구성된 dhcp 클라이언트 인 경우, 시스템 전체 "
--"dhclient 임대 파일에서 DUID가 검색됩니다. DUID가 없거나 다른 DHCP 클라이언트가 사용되면 컴퓨터 ID를 기반으로 전역 "
--"및 영구 DUID-UUID (RFC 6355)가 생성됩니다. 특수 값 \"llt\"및 \"ll\"은 장치의 현재 MAC 주소를 기반으로 "
--"유형 LLT 또는 LL (RFC 3315 참조)의 DUID를 생성합니다. 안정적인 DUID-LLT를 제공하기 위해 시간 필드에는 전역 "
--"적으로 (모든 프로파일에 대해) 사용되고 디스크에 지속되는 일정한 시간 소인이 포함됩니다. 특수한 값 \"stable-llt\", "
--"\"stable-ll\"및 \"stable-uuid\"는 연결의 stable-id 및 호스트 별 고유 키에서 파생 된 해당 유형의 "
--"DUID를 생성합니다. 따라서 \"stable-ll\"및 \"stable-llt\"의 링크 계층 주소는 stable id에서 파생 된 "
--"생성 된 주소가됩니다. \"stable-llt\"옵션의 DUID-LLT 시간 값은 3 년의 정적 시간 간격 중에서 선택됩니다 (간격의 "
--"상한은 \"llt\"에서 사용 된 것과 동일한 상수 시간 소인입니다). 속성이 설정되지 않은 경우 \"ipv6.dhcp-duid\"에 "
--"제공된 전역 값이 사용됩니다. 전역 값이 제공되지 않으면 기본 \"임대\"값으로 간주됩니다."
-+msgstr "dhcp 클라이언트가 DHCPv6 서버 (RFC 3315)를 식별하는 데 사용하는 DHCPv6 고유 식별자 (DUID)가 포함 된 문자열입니다. DUID는 클라이언트 식별자 옵션에서 전달됩니다. 속성이 16 진수 문자열 ( 'aa : bb : cc')이면 이진 DUID로 해석되고 클라이언트 식별자 옵션에서 불투명 한 값으로 채워집니다. 특수 값 \"lease\"는 연결에 속한 임대 파일에서 이전에 사용 된 DUID를 검색합니다. DUID가없고 \"dhclient\"가 구성된 dhcp 클라이언트 인 경우, 시스템 전체 dhclient 임대 파일에서 DUID가 검색됩니다. DUID가 없거나 다른 DHCP 클라이언트가 사용되면 컴퓨터 ID를 기반으로 전역 및 영구 DUID-UUID (RFC 6355)가 생성됩니다. 특수 값 \"llt\"및 \"ll\"은 장치의 현재 MAC 주소를 기반으로 유형 LLT 또는 LL (RFC 3315 참조)의 DUID를 생성합니다. 안정적인 DUID-LLT를 제공하기 위해 시간 필드에는 전역 적으로 (모든 프로파일에 대해) 사용되고 디스크에 지속되는 일정한 시간 소인이 포함됩니다. 특수한 값 \"stable-llt\", \"stable-ll\"및 \"stable-uuid\"는 연결의 stable-id 및 호스트 별 고유 키에서 파생 된 해당 유형의 DUID를 생성합니다. 따라서 \"stable-ll\"및 \"stable-llt\"의 링크 계층 주소는 stable id에서 파생 된 생성 된 주소가됩니다. \"stable-llt\"옵션의 DUID-LLT 시간 값은 3 년의 정적 시간 간격 중에서 선택됩니다 (간격의 상한은 \"llt\"에서 사용 된 것과 동일한 상수 시간 소인입니다). 속성이 설정되지 않은 경우 \"ipv6.dhcp-duid\"에 제공된 전역 값이 사용됩니다. 전역 값이 제공되지 않으면 기본 \"임대\"값으로 간주됩니다."
-
--#: ../clients/common/settings-docs.h.in:237
-+#: ../clients/common/settings-docs.h.in:261
- msgid ""
- "Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941. If "
- "enabled, it makes the kernel generate a temporary IPv6 address in addition "
-@@ -7926,369 +7508,377 @@ msgid ""
- "Privacy addresses that can be enabled with the \"addr-gen-mode\" property's "
- "\"stable-privacy\" setting as another way of avoiding host tracking with "
- "IPv6 addresses."
--msgstr ""
--"RFC4941에 설명 된 SLAAC에 대한 IPv6 개인 정보 보호 확장을 구성합니다. 활성화 된 경우 커널은 수정 된 EUI-64를 "
--"통해 MAC 주소에서 생성 된 공개 IPv6 주소와 임시 IPv6 주소를 생성합니다. 이는 프라이버시를 향상 시키지만 다른 한편으로는 "
--"일부 응용 프로그램에서 문제를 일으킬 수 있습니다. 허용되는 값은 -1 : 알 수 없음, 0 : 비활성화, 1 : 활성화 (공개 주소 "
--"선호), 2 : 활성화 (임시 주소 선호)입니다. 연결 당 설정을 \"-1\"(알 수 없음)로 설정하면 전역 구성 \"ipv6.ip6-"
--"privacy\"로 폴백됩니다. 글로벌 구성이 지정되지 않았거나 \"-1\"로 설정되어 있으면 \"/ proc / sys / net / "
--"ipv6 / conf / default / use_tempaddr\"을 읽습니다. 이 설정은 IPv6 주소로 호스트 추적을 피하는 또 "
--"다른 방법으로 \"addr-gen-mode\"속성의 \"stable-privacy\"설정을 사용하여 활성화 할 수있는 안정적인 개인 정보 "
--"보호 주소와는 다릅니다."
-+msgstr "RFC4941에 설명 된 SLAAC에 대한 IPv6 개인 정보 보호 확장을 구성합니다. 활성화 된 경우 커널은 수정 된 EUI-64를 통해 MAC 주소에서 생성 된 공개 IPv6 주소와 임시 IPv6 주소를 생성합니다. 이는 프라이버시를 향상 시키지만 다른 한편으로는 일부 응용 프로그램에서 문제를 일으킬 수 있습니다. 허용되는 값은 -1 : 알 수 없음, 0 : 비활성화, 1 : 활성화 (공개 주소 선호), 2 : 활성화 (임시 주소 선호)입니다. 연결 당 설정을 \"-1\"(알 수 없음)로 설정하면 전역 구성 \"ipv6.ip6-privacy\"로 폴백됩니다. 글로벌 구성이 지정되지 않았거나 \"-1\"로 설정되어 있으면 \"/ proc / sys / net / ipv6 / conf / default / use_tempaddr\"을 읽습니다. 이 설정은 IPv6 주소로 호스트 추적을 피하는 또 다른 방법으로 \"addr-gen-mode\"속성의 \"stable-privacy\"설정을 사용하여 활성화 할 수있는 안정적인 개인 정보 보호 주소와는 다릅니다."
-
--#: ../clients/common/settings-docs.h.in:244
-+#: ../clients/common/settings-docs.h.in:265
-+msgid ""
-+"A timeout for waiting Router Advertisements in seconds. If zero (the "
-+"default), a globally configured default is used. If still unspecified, the "
-+"timeout depends on the sysctl settings of the device. Set to 2147483647 "
-+"(MAXINT32) for infinity."
-+msgstr "라우터 알림 대기 시간 (초)입니다. 0 (기본값)이면 전역 적으로 구성된 기본값이 사용됩니다. 여전히 지정되지 않은 경우 시간 초과는 장치의 sysctl 설정에 따라 다릅니다. 무한대는 2147483647 (MAXINT32)로 설정하십시오."
-+
-+#: ../clients/common/settings-docs.h.in:269
- msgid ""
- "Configure the token for draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 "
- "tokenized interface identifiers. Useful with eui64 addr-gen-mode."
--msgstr ""
--"draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 토큰 화 된 인터페이스 식별자에 대한 토큰을 "
--"구성합니다. eui64 addr-gen-mode에 유용합니다."
-+msgstr "draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 토큰 화 된 인터페이스 식별자에 대한 토큰을 구성합니다. eui64 addr-gen-mode에 유용합니다."
-
--#: ../clients/common/settings-docs.h.in:245
-+#: ../clients/common/settings-docs.h.in:270
- msgid "Whether the transmitted traffic must be encrypted."
- msgstr "전송 된 트래픽을 암호화해야하는지 여부."
-
--#: ../clients/common/settings-docs.h.in:246
-+#: ../clients/common/settings-docs.h.in:271
- msgid ""
- "The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement."
- msgstr "MACsec Key Agreement에 대한 사전 공유 CAK (Connectivity Association Key)입니다."
-
--#: ../clients/common/settings-docs.h.in:247
-+#: ../clients/common/settings-docs.h.in:272
- msgid "Flags indicating how to handle the \"mka-cak\" property."
- msgstr "「mka-cak」프롭퍼티의 처리 방법을 나타내는 플래그."
-
--#: ../clients/common/settings-docs.h.in:248
-+#: ../clients/common/settings-docs.h.in:273
- msgid ""
- "The pre-shared CKN (Connectivity-association Key Name) for MACsec Key "
- "Agreement."
--msgstr ""
--"MACsec Key Agreement에 대한 사전 공유 CKN (Connectivity-association Key Name)입니다."
-+msgstr "MACsec Key Agreement에 대한 사전 공유 CKN (Connectivity-association Key Name)입니다."
-
--#: ../clients/common/settings-docs.h.in:249
-+#: ../clients/common/settings-docs.h.in:274
- msgid ""
- "Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
- "Agreement) is obtained."
--msgstr ""
--"MKA (MACsec Key Agreement)에 대한 CAK (Connectivity Association Key)를 얻는 방법을 "
--"지정합니다."
-+msgstr "MKA (MACsec Key Agreement)에 대한 CAK (Connectivity Association Key)를 얻는 방법을 지정합니다."
-
--#: ../clients/common/settings-docs.h.in:250
-+#: ../clients/common/settings-docs.h.in:275
- msgid ""
- "If given, specifies the parent interface name or parent connection UUID from "
- "which this MACSEC interface should be created. If this property is not "
- "specified, the connection must contain an \"802-3-ethernet\" setting with a "
- "\"mac-address\" property."
--msgstr ""
--"주어진 경우이 MACSEC 인터페이스를 생성해야하는 상위 인터페이스 이름 또는 상위 연결 UUID를 지정합니다. 이 등록 정보가 지정되지 "
--"않은 경우, 연결에는 \"mac-address\"등록 정보가있는 \"802-3-ethernet\"설정이 있어야합니다."
-+msgstr "주어진 경우이 MACSEC 인터페이스를 생성해야하는 상위 인터페이스 이름 또는 상위 연결 UUID를 지정합니다. 이 등록 정보가 지정되지 않은 경우, 연결에는 \"mac-address\"등록 정보가있는 \"802-3-ethernet\"설정이 있어야합니다."
-
--#: ../clients/common/settings-docs.h.in:251
-+#: ../clients/common/settings-docs.h.in:276
- msgid ""
- "The port component of the SCI (Secure Channel Identifier), between 1 and "
- "65534."
- msgstr "SCI (보안 채널 식별자)의 포트 구성 요소이며 1에서 65534 사이입니다."
-
--#: ../clients/common/settings-docs.h.in:252
-+#: ../clients/common/settings-docs.h.in:277
- msgid ""
- "Specifies whether the SCI (Secure Channel Identifier) is included in every "
- "packet."
- msgstr "SCI (Secure Channel Identifier)가 모든 패킷에 포함되는지 여부를 지정합니다."
-
--#: ../clients/common/settings-docs.h.in:253
-+#: ../clients/common/settings-docs.h.in:278
- msgid "Specifies the validation mode for incoming frames."
- msgstr "수신 프레임에 대한 유효성 검사 모드를 지정합니다."
-
--#: ../clients/common/settings-docs.h.in:254
-+#: ../clients/common/settings-docs.h.in:279
- msgid ""
- "The macvlan mode, which specifies the communication mechanism between "
- "multiple macvlans on the same lower device."
- msgstr "macvlan 모드는 동일한 하위 장치에있는 여러 macvlans 간의 통신 메커니즘을 지정합니다."
-
--#: ../clients/common/settings-docs.h.in:255
-+#: ../clients/common/settings-docs.h.in:280
- msgid ""
- "If given, specifies the parent interface name or parent connection UUID from "
- "which this MAC-VLAN interface should be created. If this property is not "
- "specified, the connection must contain an \"802-3-ethernet\" setting with a "
- "\"mac-address\" property."
--msgstr ""
--"주어진 경우이 MAC-VLAN 인터페이스를 생성해야하는 상위 인터페이스 이름 또는 상위 연결 UUID를 지정합니다. 이 등록 정보가 "
--"지정되지 않은 경우, 연결에는 \"mac-address\"등록 정보가있는 \"802-3-ethernet\"설정이 있어야합니다."
-+msgstr "주어진 경우이 MAC-VLAN 인터페이스를 생성해야하는 상위 인터페이스 이름 또는 상위 연결 UUID를 지정합니다. 이 등록 정보가 지정되지 않은 경우, 연결에는 \"mac-address\"등록 정보가있는 \"802-3-ethernet\"설정이 있어야합니다."
-
--#: ../clients/common/settings-docs.h.in:256
-+#: ../clients/common/settings-docs.h.in:281
- msgid "Whether the interface should be put in promiscuous mode."
- msgstr "인터페이스가 무차별 모드로 설정되어야하는지 여부."
-
--#: ../clients/common/settings-docs.h.in:257
-+#: ../clients/common/settings-docs.h.in:282
- msgid "Whether the interface should be a MACVTAP."
- msgstr "인터페이스가 MACVTAP 여야하는지 여부."
-
--#: ../clients/common/settings-docs.h.in:258
-+#: ../clients/common/settings-docs.h.in:283
- msgid ""
--"A list of interface names to match. Each element is a shell wildcard pattern."
--" When an element is prefixed with exclamation mark (!) the condition is "
--"inverted. A candidate interface name is considered matching when both these "
--"conditions are satisfied: (a) any of the elements not prefixed with '!' "
--"matches or there aren't such elements; (b) none of the elements prefixed "
--"with '!' match."
--msgstr ""
--"일치시킬 인터페이스 이름 목록. 각 요소는 쉘 와일드 카드 패턴입니다. 요소에 느낌표 (!) 접두사가 있으면 조건이 반대로됩니다. 후보 "
--"인터페이스 명은 다음 두 조건이 모두 충족 될 때 일치하는 것으로 간주됩니다. (a) '!'접두어가없는 요소 일치하거나 그런 요소가 "
--"없습니다. (b) 접두어가 '!'인 요소가 없습니다. 시합."
-+"A list of driver names to match. Each element is a shell wildcard pattern. "
-+"See NMSettingMatch:interface-name for how special characters '|', '&', '!' "
-+"and '\\' are used for optional and mandatory matches and inverting the "
-+"pattern."
-+msgstr "일치하는 드라이버 이름 목록입니다. 각 요소는 쉘 와일드 카드 패턴입니다. 특수 문자 '|', '&', '!'에 대해서는 NMSettingMatch : interface-name을 참조하십시오. 및 '\\'는 선택 및 필수 일치 및 패턴 반전에 사용됩니다."
-
--#: ../clients/common/settings-docs.h.in:259
--#, fuzzy
-+#: ../clients/common/settings-docs.h.in:284
-+msgid ""
-+"A list of interface names to match. Each element is a shell wildcard "
-+"pattern. An element can be prefixed with a pipe symbol (|) or an ampersand "
-+"(&). The former means that the element is optional and the latter means that "
-+"it is mandatory. If there are any optional elements, than the match "
-+"evaluates to true if at least one of the optional element matches (logical "
-+"OR). If there are any mandatory elements, then they all must match (logical "
-+"AND). By default, an element is optional. This means that an element \"foo\" "
-+"behaves the same as \"|foo\". An element can also be inverted with "
-+"exclamation mark (!) between the pipe symbol (or the ampersand) and before "
-+"the pattern. Note that \"!foo\" is a shortcut for the mandatory match \"&!foo"
-+"\". Finally, a backslash can be used at the beginning of the element (after "
-+"the optional special characters) to escape the start of the pattern. For "
-+"example, \"&\\!a\" is an mandatory match for literally \"!a\"."
-+msgstr "일치하는 인터페이스 이름 목록입니다. 각 요소는 쉘 와일드 카드 패턴입니다. 요소 앞에 파이프 기호 (|) 또는 앰퍼샌드 (&)를 붙일 수 있습니다. 전자는 요소가 선택 사항이고 후자는 요소가 필수임을 의미합니다. 선택적 요소가있는 경우 선택적 요소 중 하나 이상이 일치하면 일치가 true로 평가됩니다 (논리적 OR). 필수 요소가 있으면 모두 일치해야합니다 (논리적 AND). 기본적으로 요소는 선택 사항입니다. 이는 \"foo\"요소가 \"| foo\"와 동일하게 작동 함을 의미합니다. 파이프 기호 (또는 앰퍼샌드) 사이와 패턴 앞에 느낌표 (!)가있는 요소를 반전시킬 수도 있습니다. \"! foo\"는 필수 일치 \"&! foo\"에 대한 바로 가기입니다. 마지막으로, 요소의 시작 부분 (선택적 특수 문자 뒤)에 백 슬래시를 사용하여 패턴의 시작 부분을 벗어날 수 있습니다. 예를 들어, \"& \\! a\"는 문자 그대로 \"! a\"와 반드시 일치합니다."
-+
-+#: ../clients/common/settings-docs.h.in:285
-+msgid ""
-+"A list of kernel command line arguments to match. This may be used to check "
-+"whether a specific kernel command line option is set (or if prefixed with "
-+"the exclamation mark unset). The argument must either be a single word, or "
-+"an assignment (i.e. two words, separated \"=\"). In the former case the "
-+"kernel command line is searched for the word appearing as is, or as left "
-+"hand side of an assignment. In the latter case, the exact assignment is "
-+"looked for with right and left hand side matching. See NMSettingMatch:"
-+"interface-name for how special characters '|', '&', '!' and '\\' are used "
-+"for optional and mandatory matches and inverting the pattern."
-+msgstr "일치시킬 커널 명령 행 인수 목록. 이것은 특정 커널 명령 행 옵션이 설정되어 있는지 (또는 느낌표가 설정되지 않은 접두사로 설정되어 있는지) 확인하는 데 사용될 수 있습니다. 인수는 단일 단어이거나 할당 (예 : \"=\"으로 구분 된 두 단어)이어야합니다. 전자의 경우, 커널 명령 줄은있는 그대로 또는 할당의 왼쪽에 나타나는 단어를 검색합니다. 후자의 경우 정확한 할당이 오른쪽과 왼쪽의 일치로 찾습니다. 특수 문자 '|', '&', '!'에 대해서는 NMSettingMatch : interface-name을 참조하십시오. 및 '\\'는 선택 및 필수 일치 및 패턴 반전에 사용됩니다."
-+
-+#: ../clients/common/settings-docs.h.in:286
-+msgid ""
-+"A list of paths to match against the ID_PATH udev property of devices. "
-+"ID_PATH represents the topological persistent path of a device. It typically "
-+"contains a subsystem string (pci, usb, platform, etc.) and a subsystem-"
-+"specific identifier. For PCI devices the path has the form \"pci-$domain:"
-+"$bus:$device.$function\", where each variable is an hexadecimal value; for "
-+"example \"pci-0000:0a:00.0\". The path of a device can be obtained with "
-+"\"udevadm info /sys/class/net/$dev | grep ID_PATH=\" or by looking at the "
-+"\"path\" property exported by NetworkManager (\"nmcli -f general.path device "
-+"show $dev\"). Each element of the list is a shell wildcard pattern. See "
-+"NMSettingMatch:interface-name for how special characters '|', '&', '!' and "
-+"'\\' are used for optional and mandatory matches and inverting the pattern."
-+msgstr "장치의 ID_PATH udev 속성과 비교할 경로 목록입니다. ID_PATH는 장치의 토폴로지 영구 경로를 나타냅니다. 일반적으로 서브 시스템 문자열 (pci, usb, 플랫폼 등)과 서브 시스템 특정 식별자를 포함합니다. PCI 장치의 경우 경로는 \"pci- $domain : $bus : $device . $function \"(여기서 각 변수는 16 진수 값입니다 (예 :\"pci-0000 : 0a : 00.0 \"). 장치 경로는\"udevadm info / sys / class / net / $dev | grep ID_PATH = \"또는 NetworkManager (\"nmcli -f general.path device show)에서 내 보낸 \"path\"속성을 보면 $dev \"). 목록의 각 요소는 쉘 와일드 카드 패턴입니다. 특수 문자 '|', '&', '!'에 대해서는 NMSettingMatch : interface-name을 참조하십시오. 및 '\\'는 선택 및 필수 일치 및 패턴 반전에 사용됩니다."
-+
-+#: ../clients/common/settings-docs.h.in:287
- msgid "The data path type. One of \"system\", \"netdev\" or empty."
--msgstr "브리지 장애 모드입니다. \"안전\", \"독립형\"또는 비어 있음 중 하나입니다."
-+msgstr "데이터 경로 유형 \"시스템\", \"netdev\"중 하나이거나 비어 있습니다."
-
--#: ../clients/common/settings-docs.h.in:260
-+#: ../clients/common/settings-docs.h.in:288
- msgid "The bridge failure mode. One of \"secure\", \"standalone\" or empty."
- msgstr "브리지 장애 모드입니다. \"안전\", \"독립형\"또는 비어 있음 중 하나입니다."
-
--#: ../clients/common/settings-docs.h.in:261
-+#: ../clients/common/settings-docs.h.in:289
- msgid "Enable or disable multicast snooping."
- msgstr "멀티 캐스트 스누핑을 활성화 또는 비활성화합니다."
-
--#: ../clients/common/settings-docs.h.in:262
-+#: ../clients/common/settings-docs.h.in:290
- msgid "Enable or disable RSTP."
- msgstr "RSTP를 활성화 또는 비활성화합니다."
-
--#: ../clients/common/settings-docs.h.in:263
-+#: ../clients/common/settings-docs.h.in:291
- msgid "Enable or disable STP."
- msgstr "STP를 활성화 또는 비활성화합니다."
-
--#: ../clients/common/settings-docs.h.in:264
--#, fuzzy
-+#: ../clients/common/settings-docs.h.in:292
- msgid "Open vSwitch DPDK device arguments."
--msgstr "vSwitch 포트 열기"
-+msgstr "vSwitch DPDK 장치 인수를 엽니 다."
-
--#: ../clients/common/settings-docs.h.in:265
--#, fuzzy
-+#: ../clients/common/settings-docs.h.in:293
- msgid ""
- "The interface type. Either \"internal\", \"system\", \"patch\", \"dpdk\", or "
- "empty."
--msgstr "인터페이스 유형. \"내부\"또는 비어 있습니다."
-+msgstr "인터페이스 유형 \"내부\", \"시스템\", \"패치\", \"dpdk\"또는 비어 있습니다."
-
--#: ../clients/common/settings-docs.h.in:266
-+#: ../clients/common/settings-docs.h.in:294
- msgid ""
--"Specifies the unicast destination IP address of a remote Open vSwitch bridge "
--"port to connect to."
--msgstr "연결할 Open vSwitch 원격 브리지 포트의 유니 캐스트 대상 IP 주소를 지정합니다."
-+"Specifies the name of the interface for the other side of the patch. The "
-+"patch on the other side must also set this interface as peer."
-+msgstr "패치의 다른쪽에 대한 인터페이스 이름을 지정합니다. 다른 쪽의 패치도이 인터페이스를 피어로 설정해야합니다."
-
--#: ../clients/common/settings-docs.h.in:267
-+#: ../clients/common/settings-docs.h.in:295
- msgid "The time port must be inactive in order to be considered down."
- msgstr "시간 포트는 비활성 상태 여야합니다."
-
--#: ../clients/common/settings-docs.h.in:268
--msgid "Bonding mode. One of \"active-backup\", \"balance-slb\", or \"balance-tcp\"."
-+#: ../clients/common/settings-docs.h.in:296
-+msgid ""
-+"Bonding mode. One of \"active-backup\", \"balance-slb\", or \"balance-tcp\"."
- msgstr "본딩 모드. \"active-backup\", \"balance-slb\"또는 \"balance-tcp\"중 하나입니다."
-
--#: ../clients/common/settings-docs.h.in:269
-+#: ../clients/common/settings-docs.h.in:297
- msgid "The time port must be active before it starts forwarding traffic."
- msgstr "트래픽 포워딩을 시작하기 전에 시간 포트가 활성 상태 여야합니다."
-
--#: ../clients/common/settings-docs.h.in:270
-+#: ../clients/common/settings-docs.h.in:298
- msgid "LACP mode. One of \"active\", \"off\", or \"passive\"."
- msgstr "LACP 모드. \"활성\", \"해제\"또는 \"수동\"중 하나입니다."
-
--#: ../clients/common/settings-docs.h.in:271
-+#: ../clients/common/settings-docs.h.in:299
- msgid "The VLAN tag in the range 0-4095."
- msgstr "VLAN 태그는 0-4095 범위입니다."
-
--#: ../clients/common/settings-docs.h.in:272
-+#: ../clients/common/settings-docs.h.in:300
- msgid ""
- "The VLAN mode. One of \"access\", \"native-tagged\", \"native-untagged\", "
- "\"trunk\" or unset."
- msgstr "VLAN 모드. '액세스', '기본 태그', '기본 태그 없음', '트렁크'또는 설정 해제 중 하나입니다."
-
--#: ../clients/common/settings-docs.h.in:273
-+#: ../clients/common/settings-docs.h.in:301
- msgid ""
--"If non-zero, instruct pppd to set the serial port to the specified baudrate. "
--" This value should normally be left as 0 to automatically choose the speed."
--msgstr ""
--"0이 아니라면, pppd에게 시리얼 포트를 지정된 baudrate로 설정하라. 자동으로 속도를 선택하려면이 값을 0으로 두어야합니다."
-+"If non-zero, instruct pppd to set the serial port to the specified "
-+"baudrate. This value should normally be left as 0 to automatically choose "
-+"the speed."
-+msgstr "0이 아니라면, pppd에게 시리얼 포트를 지정된 baudrate로 설정하라. 자동으로 속도를 선택하려면이 값을 0으로 두어야합니다."
-
--#: ../clients/common/settings-docs.h.in:274
-+#: ../clients/common/settings-docs.h.in:302
- msgid ""
- "If TRUE, specify that pppd should set the serial port to use hardware flow "
- "control with RTS and CTS signals. This value should normally be set to "
- "FALSE."
--msgstr ""
--"TRUE면, pppd가 RTS와 CTS 신호로 하드웨어 흐름 제어를 사용하기 위해 직렬 포트를 설정하도록 지정하십시오. 이 값은 "
--"일반적으로 FALSE로 설정해야합니다."
-+msgstr "TRUE면, pppd가 RTS와 CTS 신호로 하드웨어 흐름 제어를 사용하기 위해 직렬 포트를 설정하도록 지정하십시오. 이 값은 일반적으로 FALSE로 설정해야합니다."
-
--#: ../clients/common/settings-docs.h.in:275
-+#: ../clients/common/settings-docs.h.in:303
- msgid ""
- "If non-zero, instruct pppd to presume the connection to the peer has failed "
- "if the specified number of LCP echo-requests go unanswered by the peer. The "
- "\"lcp-echo-interval\" property must also be set to a non-zero value if this "
- "property is used."
--msgstr ""
--"0이 아닌 경우 지정된 수의 LCP 반향 요청이 피어에 의해 응답되지 않으면 피어와의 연결을 추정하기 위해 pppd에 지시하십시오. "
--"\"lcp-echo-interval\"속성은이 속성이 사용되는 경우 0이 아닌 값으로 설정되어야합니다."
-+msgstr "0이 아닌 경우 지정된 수의 LCP 반향 요청이 피어에 의해 응답되지 않으면 피어와의 연결을 추정하기 위해 pppd에 지시하십시오. \"lcp-echo-interval\"속성은이 속성이 사용되는 경우 0이 아닌 값으로 설정되어야합니다."
-
--#: ../clients/common/settings-docs.h.in:276
-+#: ../clients/common/settings-docs.h.in:304
- msgid ""
- "If non-zero, instruct pppd to send an LCP echo-request frame to the peer "
- "every n seconds (where n is the specified value). Note that some PPP peers "
- "will respond to echo requests and some will not, and it is not possible to "
- "autodetect this."
--msgstr ""
--"0이 아닌 경우 pppd에게 n 초마다 LCP 반향 요청 프레임을 피어에게 전송하도록 지시합니다 (n은 지정된 값 임). 일부 PPP "
--"피어는 에코 요청에 응답하고 일부는 응답하지 않으므로 자동 검색을 수행 할 수 없습니다."
-+msgstr "0이 아닌 경우 pppd에게 n 초마다 LCP 반향 요청 프레임을 피어에게 전송하도록 지시합니다 (n은 지정된 값 임). 일부 PPP 피어는 에코 요청에 응답하고 일부는 응답하지 않으므로 자동 검색을 수행 할 수 없습니다."
-
--#: ../clients/common/settings-docs.h.in:277
-+#: ../clients/common/settings-docs.h.in:305
- msgid ""
- "If TRUE, stateful MPPE is used. See pppd documentation for more information "
- "on stateful MPPE."
- msgstr "참이면 상태 저장 MPPE가 사용됩니다. 상태 저장 MPPE에 대한 자세한 내용은 pppd 설명서를 참조하십시오."
-
--#: ../clients/common/settings-docs.h.in:278
-+#: ../clients/common/settings-docs.h.in:306
- msgid ""
- "If non-zero, instruct pppd to request that the peer send packets no larger "
- "than the specified size. If non-zero, the MRU should be between 128 and "
- "16384."
--msgstr ""
--"0이 아니면 pppd에게 피어가 지정된 크기보다 크지 않은 패킷을 보내도록 요청합니다. 0이 아니면 MRU는 128에서 16384 사이 "
--"여야합니다."
-+msgstr "0이 아니면 pppd에게 피어가 지정된 크기보다 크지 않은 패킷을 보내도록 요청합니다. 0이 아니면 MRU는 128에서 16384 사이 여야합니다."
-
--#: ../clients/common/settings-docs.h.in:279
-+#: ../clients/common/settings-docs.h.in:307
- msgid ""
- "If non-zero, instruct pppd to send packets no larger than the specified size."
--""
- msgstr "0이 아니면 pppd에게 지정된 크기보다 크지 않은 패킷을 보내도록 지시하십시오."
-
--#: ../clients/common/settings-docs.h.in:280
-+#: ../clients/common/settings-docs.h.in:308
- msgid "If TRUE, Van Jacobsen TCP header compression will not be requested."
- msgstr "TRUE이면 Van Jacobsen TCP 헤더 압축은 요청되지 않습니다."
-
--#: ../clients/common/settings-docs.h.in:281
-+#: ../clients/common/settings-docs.h.in:309
- msgid ""
- "If TRUE, do not require the other side (usually the PPP server) to "
- "authenticate itself to the client. If FALSE, require authentication from "
- "the remote side. In almost all cases, this should be TRUE."
--msgstr ""
--"TRUE면 다른 쪽 (일반적으로 PPP 서버)이 클라이언트에 자신을 인증하도록 요구하지 않습니다. 거짓이면 원격 측의 인증이 필요합니다. "
--"거의 모든 경우에 이것이 TRUE 여야합니다."
-+msgstr "TRUE면 다른 쪽 (일반적으로 PPP 서버)이 클라이언트에 자신을 인증하도록 요구하지 않습니다. 거짓이면 원격 측의 인증이 필요합니다. 거의 모든 경우에 이것이 TRUE 여야합니다."
-
--#: ../clients/common/settings-docs.h.in:282
-+#: ../clients/common/settings-docs.h.in:310
- msgid "If TRUE, BSD compression will not be requested."
- msgstr "TRUE면, BSD 압축은 요구되지 않습니다."
-
--#: ../clients/common/settings-docs.h.in:283
-+#: ../clients/common/settings-docs.h.in:311
- msgid "If TRUE, \"deflate\" compression will not be requested."
- msgstr "TRUE면 \"deflate\"압축은 요구되지 않습니다."
-
--#: ../clients/common/settings-docs.h.in:284
-+#: ../clients/common/settings-docs.h.in:312
- msgid "If TRUE, the CHAP authentication method will not be used."
- msgstr "참인 경우 CHAP 인증 방법이 사용되지 않습니다."
-
--#: ../clients/common/settings-docs.h.in:285
-+#: ../clients/common/settings-docs.h.in:313
- msgid "If TRUE, the EAP authentication method will not be used."
- msgstr "TRUE이면 EAP 인증 방법이 사용되지 않습니다."
-
--#: ../clients/common/settings-docs.h.in:286
-+#: ../clients/common/settings-docs.h.in:314
- msgid "If TRUE, the MSCHAP authentication method will not be used."
- msgstr "TRUE이면 MSCHAP 인증 방법이 사용되지 않습니다."
-
--#: ../clients/common/settings-docs.h.in:287
-+#: ../clients/common/settings-docs.h.in:315
- msgid "If TRUE, the MSCHAPv2 authentication method will not be used."
- msgstr "TRUE 일 경우 MSCHAPv2 인증 방법은 사용되지 않습니다."
-
--#: ../clients/common/settings-docs.h.in:288
-+#: ../clients/common/settings-docs.h.in:316
- msgid "If TRUE, the PAP authentication method will not be used."
- msgstr "참인 경우 PAP 인증 방법이 사용되지 않습니다."
-
--#: ../clients/common/settings-docs.h.in:289
-+#: ../clients/common/settings-docs.h.in:317
- msgid ""
- "If TRUE, MPPE (Microsoft Point-to-Point Encryption) will be required for the "
- "PPP session. If either 64-bit or 128-bit MPPE is not available the session "
- "will fail. Note that MPPE is not used on mobile broadband connections."
--msgstr ""
--"참이면 MPPE (Microsoft 지점 간 암호화)가 PPP 세션에 필요합니다. 64 비트 또는 128 비트 MPPE를 사용할 수 "
--"없으면 세션이 실패합니다. 모바일 광대역 연결에는 MPPE가 사용되지 않습니다."
-+msgstr "참이면 MPPE (Microsoft 지점 간 암호화)가 PPP 세션에 필요합니다. 64 비트 또는 128 비트 MPPE를 사용할 수 없으면 세션이 실패합니다. 모바일 광대역 연결에는 MPPE가 사용되지 않습니다."
-
--#: ../clients/common/settings-docs.h.in:290
-+#: ../clients/common/settings-docs.h.in:318
- msgid ""
- "If TRUE, 128-bit MPPE (Microsoft Point-to-Point Encryption) will be required "
- "for the PPP session, and the \"require-mppe\" property must also be set to "
- "TRUE. If 128-bit MPPE is not available the session will fail."
--msgstr ""
--"TRUE이면 128 비트 MPPE (Microsoft 지점 간 암호화)가 PPP 세션에 필요하며 \"require-mppe\"속성도 "
--"TRUE로 설정되어야합니다. 128 비트 MPPE를 사용할 수 없으면 세션이 실패합니다."
-+msgstr "TRUE이면 128 비트 MPPE (Microsoft 지점 간 암호화)가 PPP 세션에 필요하며 \"require-mppe\"속성도 TRUE로 설정되어야합니다. 128 비트 MPPE를 사용할 수 없으면 세션이 실패합니다."
-
--#: ../clients/common/settings-docs.h.in:291
-+#: ../clients/common/settings-docs.h.in:319
- msgid ""
- "If given, specifies the parent interface name on which this PPPoE connection "
- "should be created. If this property is not specified, the connection is "
- "activated on the interface specified in \"interface-name\" of "
- "NMSettingConnection."
--msgstr ""
--"주어진 경우이 PPPoE 연결을 생성 할 상위 인터페이스 이름을 지정합니다. 이 속성을 지정하지 않으면 "
--"NMSettingConnection의 \"interface-name\"에 지정된 인터페이스에서 연결이 활성화됩니다."
-+msgstr "주어진 경우이 PPPoE 연결을 생성 할 상위 인터페이스 이름을 지정합니다. 이 속성을 지정하지 않으면 NMSettingConnection의 \"interface-name\"에 지정된 인터페이스에서 연결이 활성화됩니다."
-
--#: ../clients/common/settings-docs.h.in:292
-+#: ../clients/common/settings-docs.h.in:320
- msgid "Password used to authenticate with the PPPoE service."
- msgstr "PPPoE 서비스 인증에 사용되는 암호입니다."
-
--#: ../clients/common/settings-docs.h.in:294
-+#: ../clients/common/settings-docs.h.in:322
- msgid ""
- "If specified, instruct PPPoE to only initiate sessions with access "
- "concentrators that provide the specified service. For most providers, this "
- "should be left blank. It is only required if there are multiple access "
- "concentrators or a specific service is known to be required."
--msgstr ""
--"지정된 경우 지정된 서비스를 제공하는 액세스 집중기로 세션을 시작하도록 PPPoE에 지시하십시오. 대부분의 제공 업체는 공란으로 남겨 "
--"두어야합니다. 다중 액세스 집중 기가 있거나 특정 서비스가 필요할 것으로 알려진 경우에만 필요합니다."
-+msgstr "지정된 경우 지정된 서비스를 제공하는 액세스 집중기로 세션을 시작하도록 PPPoE에 지시하십시오. 대부분의 제공 업체는 공란으로 남겨 두어야합니다. 다중 액세스 집중 기가 있거나 특정 서비스가 필요할 것으로 알려진 경우에만 필요합니다."
-
--#: ../clients/common/settings-docs.h.in:295
-+#: ../clients/common/settings-docs.h.in:323
- msgid "Username used to authenticate with the PPPoE service."
- msgstr "PPPoE 서비스로 인증하는 데 사용되는 사용자 이름"
-
--#: ../clients/common/settings-docs.h.in:296
-+#: ../clients/common/settings-docs.h.in:324
- msgid "Whether the proxy configuration is for browser only."
- msgstr "프록시 구성이 브라우저 전용인지 여부."
-
--#: ../clients/common/settings-docs.h.in:297
-+#: ../clients/common/settings-docs.h.in:325
- msgid ""
- "Method for proxy configuration, Default is NM_SETTING_PROXY_METHOD_NONE (0)"
- msgstr "프록시 구성 방법, 기본값은 NM_SETTING_PROXY_METHOD_NONE (0)입니다."
-
--#: ../clients/common/settings-docs.h.in:298
-+#: ../clients/common/settings-docs.h.in:326
- msgid "PAC script for the connection."
- msgstr "연결을위한 PAC 스크립트."
-
--#: ../clients/common/settings-docs.h.in:299
-+#: ../clients/common/settings-docs.h.in:327
- msgid "PAC URL for obtaining PAC file."
- msgstr "PAC 파일을 얻기위한 PAC URL입니다."
-
--#: ../clients/common/settings-docs.h.in:300
-+#: ../clients/common/settings-docs.h.in:328
- msgid ""
- "Speed to use for communication over the serial port. Note that this value "
- "usually has no effect for mobile broadband modems as they generally ignore "
- "speed settings and use the highest available speed."
--msgstr ""
--"직렬 포트를 통한 통신 속도. 이 값은 대개 속도 설정을 무시하고 사용 가능한 최고 속도를 사용하므로 모바일 광대역 모뎀에 영향을 미치지 "
--"않습니다."
-+msgstr "직렬 포트를 통한 통신 속도. 이 값은 대개 속도 설정을 무시하고 사용 가능한 최고 속도를 사용하므로 모바일 광대역 모뎀에 영향을 미치지 않습니다."
-
--#: ../clients/common/settings-docs.h.in:301
-+#: ../clients/common/settings-docs.h.in:329
- msgid "Byte-width of the serial communication. The 8 in \"8n1\" for example."
- msgstr "직렬 통신의 바이트 너비. 예를 들어 \"8n1\"의 8."
-
--#: ../clients/common/settings-docs.h.in:302
-+#: ../clients/common/settings-docs.h.in:330
- msgid "Parity setting of the serial port."
- msgstr "직렬 포트의 패리티 설정."
-
--#: ../clients/common/settings-docs.h.in:303
-+#: ../clients/common/settings-docs.h.in:331
- msgid "Time to delay between each byte sent to the modem, in microseconds."
- msgstr "모뎀에 전송 된 각 바이트 간 지연 시간 (마이크로 초)."
-
--#: ../clients/common/settings-docs.h.in:304
-+#: ../clients/common/settings-docs.h.in:332
- msgid ""
- "Number of stop bits for communication on the serial port. Either 1 or 2. "
- "The 1 in \"8n1\" for example."
- msgstr "직렬 포트에서 통신하기위한 정지 비트의 수. 1 또는 2입니다. 예를 들어 \"8n1\"의 1입니다."
-
--#: ../clients/common/settings-docs.h.in:305
-+#: ../clients/common/settings-docs.h.in:333
- 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 "
-@@ -8297,61 +7887,49 @@ msgid ""
- "interfaces will be created for them. When set to NM_TERNARY_DEFAULT (-1), "
- "the global default is used; in case the global default is unspecified it is "
- "assumed to be NM_TERNARY_TRUE (1)."
--msgstr ""
--"호환 가능한 드라이버로 가상 기능을 자동 탐색할지 여부. NM_TERNARY_TRUE (1)로 설정하면, 커널은 VF를 호환 가능한 "
--"드라이버에 바인드하려고 시도하고 이것이 성공하면 새로운 네트워크 인터페이스가 각 VF에 대해 인스턴스화됩니다. "
--"NM_TERNARY_FALSE (0)로 설정하면 VF가 요구되지 않고 네트워크 인터페이스가 생성되지 않습니다. "
--"NM_TERNARY_DEFAULT (-1)로 설정하면 전역 기본값이 사용됩니다. 글로벌 기본값이 지정되지 않은 경우 "
--"NM_TERNARY_TRUE (1)로 간주됩니다."
-+msgstr "호환 가능한 드라이버로 가상 기능을 자동 탐색할지 여부. NM_TERNARY_TRUE (1)로 설정하면, 커널은 VF를 호환 가능한 드라이버에 바인드하려고 시도하고 이것이 성공하면 새로운 네트워크 인터페이스가 각 VF에 대해 인스턴스화됩니다. NM_TERNARY_FALSE (0)로 설정하면 VF가 요구되지 않고 네트워크 인터페이스가 생성되지 않습니다. NM_TERNARY_DEFAULT (-1)로 설정하면 전역 기본값이 사용됩니다. 글로벌 기본값이 지정되지 않은 경우 NM_TERNARY_TRUE (1)로 간주됩니다."
-
--#: ../clients/common/settings-docs.h.in:306
-+#: ../clients/common/settings-docs.h.in:334
- msgid ""
- "The total number of virtual functions to create. Note that when the sriov "
- "setting is present NetworkManager enforces the number of virtual functions "
--"on the interface also when it is zero. To prevent any changes to SR-IOV "
--"parameters don't add a sriov setting to the connection."
--msgstr ""
-+"on the interface (also when it is zero) during activation and resets it upon "
-+"deactivation. 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:307
-+#: ../clients/common/settings-docs.h.in:335
- msgid ""
- "Array of virtual function descriptors. Each VF descriptor is a dictionary "
- "mapping attribute names to GVariant values. The 'index' entry is mandatory "
--"for each VF. When represented as string a VF is in the form: \"INDEX [ATTR="
--"VALUE[ ATTR=VALUE]...]\". for example: \"2 mac=00:11:22:33:44:55 spoof-check="
--"true\". Multiple VFs can be specified using a comma as separator. Currently "
--"the following attributes are supported: mac, spoof-check, trust, min-tx-"
--"rate, max-tx-rate, vlans. The \"vlans\" attribute is represented as a "
-+"for each VF. When represented as string a VF is in the form: \"INDEX "
-+"[ATTR=VALUE[ ATTR=VALUE]...]\". for example: \"2 mac=00:11:22:33:44:55 spoof-"
-+"check=true\". Multiple VFs can be specified using a comma as separator. "
-+"Currently the following attributes are supported: mac, spoof-check, trust, "
-+"min-tx-rate, max-tx-rate, vlans. The \"vlans\" attribute is represented as a "
- "semicolon-separated list of VLAN descriptors, where each descriptor has the "
- "form \"ID[.PRIORITY[.PROTO]]\". PROTO can be either 'q' for 802.1Q (the "
- "default) or 'ad' for 802.1ad."
--msgstr ""
--"가상 함수 기술자의 배열. 각 VF 디스크립터는 속성 이름을 GVariant 값에 매핑하는 사전입니다. 'index'항목은 각 VF에 "
--"대해 필수 항목입니다. 문자열로 표현하면 VF는 \"INDEX [ATTR = VALUE [ATTR = VALUE] ...]\"형식입니다. "
--"예 : \"2 mac = 00 : 11 : 22 : 33 : 44 : 55 spoof-check = true\" \"vlans\"속성은 "
--"각 ID가 \"ID [.PRIORITY [.PROTO]\"형식 인 VLAN 설명 자의 세미콜론으로 구분 된 목록으로 표시됩니다. "
--"PROTO는 802.1Q (기본값)의 경우 'q'또는 802.1ad의 경우 'ad'중 하나 일 수 있습니다."
-+msgstr "가상 함수 기술자의 배열. 각 VF 디스크립터는 속성 이름을 GVariant 값에 매핑하는 사전입니다. 'index'항목은 각 VF에 대해 필수 항목입니다. 문자열로 표현하면 VF는 \"INDEX [ATTR = VALUE [ATTR = VALUE] ...]\"형식입니다. 예 : \"2 mac = 00 : 11 : 22 : 33 : 44 : 55 spoof-check = true\" \"vlans\"속성은 각 ID가 \"ID [.PRIORITY [.PROTO]\"형식 인 VLAN 설명 자의 세미콜론으로 구분 된 목록으로 표시됩니다. PROTO는 802.1Q (기본값)의 경우 'q'또는 802.1ad의 경우 'ad'중 하나 일 수 있습니다."
-
--#: ../clients/common/settings-docs.h.in:308
-+#: ../clients/common/settings-docs.h.in:336
- msgid "Array of TC queueing disciplines."
- msgstr "TC 대기열 분야의 배열."
-
--#: ../clients/common/settings-docs.h.in:309
-+#: ../clients/common/settings-docs.h.in:337
- msgid "Array of TC traffic filters."
- msgstr "TC 트래픽 필터의 배열입니다."
-
--#: ../clients/common/settings-docs.h.in:310
-+#: ../clients/common/settings-docs.h.in:338
- msgid ""
- "The JSON configuration for the team network interface. The property should "
- "contain raw JSON configuration data suitable for teamd, because the value is "
- "passed directly to teamd. If not specified, the default configuration is "
- "used. See man teamd.conf for the format details."
--msgstr ""
--"팀 네트워크 인터페이스 용 JSON 구성입니다. 이 값은 teamd에 직접 전달되기 때문에이 속성에는 teamd에 적합한 원시 JSON "
--"구성 데이터가 포함되어야합니다. 지정하지 않으면 기본 구성이 사용됩니다. 형식에 대한 자세한 내용은 teamd.conf 파일을 "
--"참조하십시오."
-+msgstr "팀 네트워크 인터페이스 용 JSON 구성입니다. 이 값은 teamd에 직접 전달되기 때문에이 속성에는 teamd에 적합한 원시 JSON 구성 데이터가 포함되어야합니다. 지정하지 않으면 기본 구성이 사용됩니다. 형식에 대한 자세한 내용은 teamd.conf 파일을 참조하십시오."
-
--#: ../clients/common/settings-docs.h.in:311
--#: ../clients/common/settings-docs.h.in:329
-+#: ../clients/common/settings-docs.h.in:339
-+#: ../clients/common/settings-docs.h.in:357
- msgid ""
- "Link watchers configuration for the connection: each link watcher is defined "
- "by a dictionary, whose keys depend upon the selected link watcher. Available "
-@@ -8361,168 +7939,150 @@ msgid ""
- "max', 'target-host'; arp_ping: all the ones in nsna_ping and 'source-host', "
- "'validate-active', 'validate-inactive', 'send-always'. See teamd.conf man "
- "for more details."
--msgstr ""
--"연결에 대한 연결 관찰자 구성 : 각 링크 감시자는 사전에 의해 정의되며, 키는 선택된 링크 감시자에 종속됩니다. 사용 가능한 링크 "
--"관찰자는 'ethtool', 'nsna_ping'및 'arp_ping'이며 'name'키를 사용하여 사전에 지정됩니다. 사용 가능한 키는 "
--"다음과 같습니다. ethtool : '지연 - 지연', '지연 - 지연', '초기화 대기'; nsna_ping : 'init-wait', "
--"'interval', 'missed-max', 'target-host'; arp_ping : nsna_ping 및 'source-"
--"host', 'validate-active', 'validate-incative', 'send-always'의 모든 항목입니다. 자세한 "
--"내용은 teamd.conf man을 참조하십시오."
-+msgstr "연결에 대한 연결 관찰자 구성 : 각 링크 감시자는 사전에 의해 정의되며, 키는 선택된 링크 감시자에 종속됩니다. 사용 가능한 링크 관찰자는 'ethtool', 'nsna_ping'및 'arp_ping'이며 'name'키를 사용하여 사전에 지정됩니다. 사용 가능한 키는 다음과 같습니다. ethtool : '지연 - 지연', '지연 - 지연', '초기화 대기'; nsna_ping : 'init-wait', 'interval', 'missed-max', 'target-host'; arp_ping : nsna_ping 및 'source-host', 'validate-active', 'validate-incative', 'send-always'의 모든 항목입니다. 자세한 내용은 teamd.conf man을 참조하십시오."
-
--#: ../clients/common/settings-docs.h.in:312
-+#: ../clients/common/settings-docs.h.in:340
- msgid "Corresponds to the teamd mcast_rejoin.count."
- msgstr "teamd mcast_rejoin.count에 해당합니다."
-
--#: ../clients/common/settings-docs.h.in:313
-+#: ../clients/common/settings-docs.h.in:341
- msgid "Corresponds to the teamd mcast_rejoin.interval."
- msgstr "teamd mcast_rejoin.interval에 해당합니다."
-
--#: ../clients/common/settings-docs.h.in:314
-+#: ../clients/common/settings-docs.h.in:342
- msgid "Corresponds to the teamd notify_peers.count."
- msgstr "teamd notify_peers.count에 해당합니다."
-
--#: ../clients/common/settings-docs.h.in:315
-+#: ../clients/common/settings-docs.h.in:343
- msgid "Corresponds to the teamd notify_peers.interval."
- msgstr "teamd notify_peers.interval에 해당합니다."
-
--#: ../clients/common/settings-docs.h.in:316
-+#: ../clients/common/settings-docs.h.in:344
- msgid ""
- "Corresponds to the teamd runner.name. Permitted values are: \"roundrobin\", "
- "\"broadcast\", \"activebackup\", \"loadbalance\", \"lacp\", \"random\"."
--msgstr ""
-+msgstr "팀 구성 runner.name에 해당합니다. 허용되는 값은 \"roundrobin\", \"브로드 캐스트\", \"activebackup\", \"loadbalance\", \"lacp\", \"random\"입니다."
-
--#: ../clients/common/settings-docs.h.in:317
-+#: ../clients/common/settings-docs.h.in:345
- msgid "Corresponds to the teamd runner.active."
- msgstr "teamd runner.active에 해당합니다."
-
--#: ../clients/common/settings-docs.h.in:318
-+#: ../clients/common/settings-docs.h.in:346
- msgid "Corresponds to the teamd runner.agg_select_policy."
- msgstr "teamd runner.agg_select_policy에 해당합니다."
-
--#: ../clients/common/settings-docs.h.in:319
-+#: ../clients/common/settings-docs.h.in:347
- msgid "Corresponds to the teamd runner.fast_rate."
- msgstr "teamd runner.fast_rate에 해당합니다."
-
--#: ../clients/common/settings-docs.h.in:320
-+#: ../clients/common/settings-docs.h.in:348
- msgid "Corresponds to the teamd runner.hwaddr_policy."
- msgstr "teamd runner.hwaddr_policy에 해당합니다."
-
--#: ../clients/common/settings-docs.h.in:321
-+#: ../clients/common/settings-docs.h.in:349
- msgid "Corresponds to the teamd runner.min_ports."
- msgstr "teamd runner.min_ports에 해당합니다."
-
--#: ../clients/common/settings-docs.h.in:322
-+#: ../clients/common/settings-docs.h.in:350
- msgid "Corresponds to the teamd runner.sys_prio."
- msgstr "teamd runner.sys_prio에 해당합니다."
-
--#: ../clients/common/settings-docs.h.in:323
-+#: ../clients/common/settings-docs.h.in:351
- msgid "Corresponds to the teamd runner.tx_balancer.name."
- msgstr "teamd runner.tx_balancer.name에 해당합니다."
-
--#: ../clients/common/settings-docs.h.in:324
-+#: ../clients/common/settings-docs.h.in:352
- msgid "Corresponds to the teamd runner.tx_balancer.interval."
- msgstr "teamd runner.tx_balancer.interval에 해당합니다."
-
--#: ../clients/common/settings-docs.h.in:325
-+#: ../clients/common/settings-docs.h.in:353
- msgid "Corresponds to the teamd runner.tx_hash."
- msgstr "teamd runner.tx_hash에 해당합니다."
-
--#: ../clients/common/settings-docs.h.in:326
-+#: ../clients/common/settings-docs.h.in:354
- msgid ""
- "The JSON configuration for the team port. The property should contain raw "
- "JSON configuration data suitable for teamd, because the value is passed "
- "directly to teamd. If not specified, the default configuration is used. See "
- "man teamd.conf for the format details."
--msgstr ""
--"팀 포트에 대한 JSON 구성입니다. 이 값은 teamd에 직접 전달되기 때문에이 속성에는 teamd에 적합한 원시 JSON 구성 "
--"데이터가 포함되어야합니다. 지정하지 않으면 기본 구성이 사용됩니다. 형식에 대한 자세한 내용은 teamd.conf 파일을 참조하십시오."
-+msgstr "팀 포트에 대한 JSON 구성입니다. 이 값은 teamd에 직접 전달되기 때문에이 속성에는 teamd에 적합한 원시 JSON 구성 데이터가 포함되어야합니다. 지정하지 않으면 기본 구성이 사용됩니다. 형식에 대한 자세한 내용은 teamd.conf 파일을 참조하십시오."
-
--#: ../clients/common/settings-docs.h.in:327
-+#: ../clients/common/settings-docs.h.in:355
- msgid "Corresponds to the teamd ports.PORTIFNAME.lacp_key."
- msgstr "teamd ports.PORTIFNAME.lacp_key에 해당합니다."
-
--#: ../clients/common/settings-docs.h.in:328
-+#: ../clients/common/settings-docs.h.in:356
- msgid "Corresponds to the teamd ports.PORTIFNAME.lacp_prio."
- msgstr "teamd ports.PORTIFNAME.lacp_prio에 해당합니다."
-
--#: ../clients/common/settings-docs.h.in:330
-+#: ../clients/common/settings-docs.h.in:358
- msgid "Corresponds to the teamd ports.PORTIFNAME.prio."
- msgstr "teamd ports.PORTIFNAME.prio에 해당합니다."
-
--#: ../clients/common/settings-docs.h.in:331
-+#: ../clients/common/settings-docs.h.in:359
- msgid ""
- "Corresponds to the teamd ports.PORTIFNAME.queue_id. When set to -1 means the "
- "parameter is skipped from the json config."
--msgstr ""
--"teamd ports.PORTIFNAME.queue_id에 해당합니다. -1로 설정하면 매개 변수가 json 구성에서 건너 뛴다는 것을 "
--"의미합니다."
-+msgstr "teamd ports.PORTIFNAME.queue_id에 해당합니다. -1로 설정하면 매개 변수가 json 구성에서 건너 뛴다는 것을 의미합니다."
-
--#: ../clients/common/settings-docs.h.in:332
-+#: ../clients/common/settings-docs.h.in:360
- msgid "Corresponds to the teamd ports.PORTIFNAME.sticky."
- msgstr "teamd ports.PORTIFNAME.sticky에 해당합니다."
-
--#: ../clients/common/settings-docs.h.in:333
-+#: ../clients/common/settings-docs.h.in:361
- msgid ""
- "The group ID which will own the device. If set to NULL everyone will be able "
- "to use the device."
- msgstr "장치를 소유 할 그룹 ID입니다. NULL로 설정하면 모든 사용자가 장치를 사용할 수 있습니다."
-
--#: ../clients/common/settings-docs.h.in:334
-+#: ../clients/common/settings-docs.h.in:362
- msgid ""
- "The operating mode of the virtual device. Allowed values are "
- "NM_SETTING_TUN_MODE_TUN (1) to create a layer 3 device and "
- "NM_SETTING_TUN_MODE_TAP (2) to create an Ethernet-like layer 2 one."
--msgstr ""
--"가상 장치의 작동 모드. 허용되는 값은 레이어 3 장치를 생성하는 NM_SETTING_TUN_MODE_TUN (1)과 이더넷과 유사한 "
--"레이어 2를 생성하는 NM_SETTING_TUN_MODE_TAP (2)입니다."
-+msgstr "가상 장치의 작동 모드. 허용되는 값은 레이어 3 장치를 생성하는 NM_SETTING_TUN_MODE_TUN (1)과 이더넷과 유사한 레이어 2를 생성하는 NM_SETTING_TUN_MODE_TAP (2)입니다."
-
--#: ../clients/common/settings-docs.h.in:335
-+#: ../clients/common/settings-docs.h.in:363
- msgid ""
- "If the property is set to TRUE, the interface will support multiple file "
- "descriptors (queues) to parallelize packet sending or receiving. Otherwise, "
- "the interface will only support a single queue."
--msgstr ""
--"이 속성이 TRUE로 설정되면 인터페이스는 패킷 보내기 또는 수신을 병렬화하기 위해 여러 파일 설명자 (대기열)를 지원합니다. 그렇지 "
--"않으면 인터페이스가 단일 대기열 만 지원합니다."
-+msgstr "이 속성이 TRUE로 설정되면 인터페이스는 패킷 보내기 또는 수신을 병렬화하기 위해 여러 파일 설명자 (대기열)를 지원합니다. 그렇지 않으면 인터페이스가 단일 대기열 만 지원합니다."
-
--#: ../clients/common/settings-docs.h.in:336
-+#: ../clients/common/settings-docs.h.in:364
- msgid ""
- "The user ID which will own the device. If set to NULL everyone will be able "
- "to use the device."
- msgstr "디바이스를 소유 할 사용자 ID. NULL로 설정하면 모든 사용자가 장치를 사용할 수 있습니다."
-
--#: ../clients/common/settings-docs.h.in:337
-+#: ../clients/common/settings-docs.h.in:365
- msgid ""
- "If TRUE the interface will prepend a 4 byte header describing the physical "
- "interface to the packets."
- msgstr "TRUE이면 인터페이스는 패킷에 대한 물리적 인터페이스를 설명하는 4 바이트 헤더 앞에 붙습니다."
-
--#: ../clients/common/settings-docs.h.in:338
-+#: ../clients/common/settings-docs.h.in:366
- msgid ""
- "If TRUE the IFF_VNET_HDR the tunnel packets will include a virtio network "
- "header."
- msgstr "TRUE이면 IFF_VNET_HDR 터널 패킷에 virtio 네트워크 헤더가 포함됩니다."
-
--#: ../clients/common/settings-docs.h.in:339
-+#: ../clients/common/settings-docs.h.in:367
- msgid ""
- "A dictionary of key/value pairs with user data. This data is ignored by "
- "NetworkManager and can be used at the users discretion. The keys only "
- "support a strict ascii format, but the values can be arbitrary UTF8 strings "
- "up to a certain length."
--msgstr ""
--"사용자 데이터가있는 키 / 값 쌍의 사전입니다. 이 데이터는 NetworkManager에서 무시되며 사용자의 재량에 따라 사용할 수 "
--"있습니다. 키는 엄격한 ASCII 형식 만 지원하지만 값은 임의의 길이까지 임의의 UTF8 문자열 일 수 있습니다."
-+msgstr "사용자 데이터가있는 키 / 값 쌍의 사전입니다. 이 데이터는 NetworkManager에서 무시되며 사용자의 재량에 따라 사용할 수 있습니다. 키는 엄격한 ASCII 형식 만 지원하지만 값은 임의의 길이까지 임의의 UTF8 문자열 일 수 있습니다."
-
--#: ../clients/common/settings-docs.h.in:340
-+#: ../clients/common/settings-docs.h.in:368
- msgid ""
- "For outgoing packets, a list of mappings from Linux SKB priorities to 802.1p "
--"priorities. The mapping is given in the format \"from:to\" where both "
--"\"from\" and \"to\" are unsigned integers, ie \"7:3\"."
--msgstr ""
--"나가는 패킷의 경우 Linux SKB 우선 순위에서 802.1p 우선 순위로의 매핑 목록입니다. 매핑은 \"from : to\"형식으로 "
--"주어지며 \"from\"과 \"to\"는 모두 부호없는 정수, 즉 \"7 : 3\"입니다."
-+"priorities. The mapping is given in the format \"from:to\" where both \"from"
-+"\" and \"to\" are unsigned integers, ie \"7:3\"."
-+msgstr "나가는 패킷의 경우 Linux SKB 우선 순위에서 802.1p 우선 순위로의 매핑 목록입니다. 매핑은 \"from : to\"형식으로 주어지며 \"from\"과 \"to\"는 모두 부호없는 정수, 즉 \"7 : 3\"입니다."
-
--#: ../clients/common/settings-docs.h.in:341
-+#: ../clients/common/settings-docs.h.in:369
- 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 "
-@@ -8533,81 +8093,63 @@ msgid ""
- "NM_VLAN_FLAG_REORDER_HEADERS, but it used to be 0. To preserve backward "
- "compatibility, the default-value in the D-Bus API continues to be 0 and a "
- "missing property on D-Bus is still considered as 0."
--msgstr ""
--"VLAN 인터페이스의 동작 및 기능을 제어하는 하나 이상의 플래그. 플래그에는 NM_VLAN_FLAG_GVRP (0x2) (GVRP "
--"프로토콜 사용) 및 NM_VLAN_FLAG_LOOSE_BINDING (0x4) (마스터 장치의 작동 상태에 대한 인터페이스의 느슨한 "
--"바인딩) NM_VLAN_FLAG_REORDER_HEADERS (0x1) (출력 패킷 헤더 순서 변경)가 포함됩니다. "
--"NM_VLAN_FLAG_MVRP (0x8) (MVRP 프로토콜 사용). 이 속성의 기본값은 "
--"NM_VLAN_FLAG_REORDER_HEADERS이지만 이전에는 0이었습니다. 이전 버전과의 호환성을 유지하기 위해 D-Bus API의 "
--"기본값은 0이고 D-Bus의 누락 된 속성은 여전히 0으로 간주됩니다."
-+msgstr "VLAN 인터페이스의 동작 및 기능을 제어하는 하나 이상의 플래그. 플래그에는 NM_VLAN_FLAG_GVRP (0x2) (GVRP 프로토콜 사용) 및 NM_VLAN_FLAG_LOOSE_BINDING (0x4) (마스터 장치의 작동 상태에 대한 인터페이스의 느슨한 바인딩) NM_VLAN_FLAG_REORDER_HEADERS (0x1) (출력 패킷 헤더 순서 변경)가 포함됩니다. NM_VLAN_FLAG_MVRP (0x8) (MVRP 프로토콜 사용). 이 속성의 기본값은 NM_VLAN_FLAG_REORDER_HEADERS이지만 이전에는 0이었습니다. 이전 버전과의 호환성을 유지하기 위해 D-Bus API의 기본값은 0이고 D-Bus의 누락 된 속성은 여전히 0으로 간주됩니다."
-
--#: ../clients/common/settings-docs.h.in:342
-+#: ../clients/common/settings-docs.h.in:370
- msgid ""
- "The VLAN identifier that the interface created by this connection should be "
- "assigned. The valid range is from 0 to 4094, without the reserved id 4095."
--msgstr ""
--"이 연결에 의해 생성 된 인터페이스를 할당해야하는 VLAN 식별자입니다. 유효 범위는 0에서 4094이며 예약 ID는 4095입니다."
-+msgstr "이 연결에 의해 생성 된 인터페이스를 할당해야하는 VLAN 식별자입니다. 유효 범위는 0에서 4094이며 예약 ID는 4095입니다."
-
--#: ../clients/common/settings-docs.h.in:343
-+#: ../clients/common/settings-docs.h.in:371
- msgid ""
- "For incoming packets, a list of mappings from 802.1p priorities to Linux SKB "
--"priorities. The mapping is given in the format \"from:to\" where both "
--"\"from\" and \"to\" are unsigned integers, ie \"7:3\"."
--msgstr ""
--"들어오는 패킷의 경우 802.1p 우선 순위에서 Linux SKB 우선 순위까지의 매핑 목록입니다. 매핑은 \"from : "
--"to\"형식으로 주어지며 \"from\"과 \"to\"는 모두 부호없는 정수, 즉 \"7 : 3\"입니다."
-+"priorities. The mapping is given in the format \"from:to\" where both \"from"
-+"\" and \"to\" are unsigned integers, ie \"7:3\"."
-+msgstr "들어오는 패킷의 경우 802.1p 우선 순위에서 Linux SKB 우선 순위까지의 매핑 목록입니다. 매핑은 \"from : to\"형식으로 주어지며 \"from\"과 \"to\"는 모두 부호없는 정수, 즉 \"7 : 3\"입니다."
-
--#: ../clients/common/settings-docs.h.in:344
-+#: ../clients/common/settings-docs.h.in:372
- msgid ""
- "If given, specifies the parent interface name or parent connection UUID from "
- "which this VLAN interface should be created. If this property is not "
- "specified, the connection must contain an \"802-3-ethernet\" setting with a "
- "\"mac-address\" property."
--msgstr ""
--"주어진 경우,이 VLAN 인터페이스를 생성해야하는 상위 인터페이스 이름 또는 상위 연결 UUID를 지정합니다. 이 등록 정보가 지정되지 "
--"않은 경우, 연결에는 \"mac-address\"등록 정보가있는 \"802-3-ethernet\"설정이 있어야합니다."
-+msgstr "주어진 경우,이 VLAN 인터페이스를 생성해야하는 상위 인터페이스 이름 또는 상위 연결 UUID를 지정합니다. 이 등록 정보가 지정되지 않은 경우, 연결에는 \"mac-address\"등록 정보가있는 \"802-3-ethernet\"설정이 있어야합니다."
-
--#: ../clients/common/settings-docs.h.in:345
-+#: ../clients/common/settings-docs.h.in:373
- msgid ""
- "Dictionary of key/value pairs of VPN plugin specific data. Both keys and "
- "values must be strings."
- msgstr "VPN Plugin 특정 데이터의 키 / 값 쌍 사전. 키와 값은 모두 문자열이어야합니다."
-
--#: ../clients/common/settings-docs.h.in:346
-+#: ../clients/common/settings-docs.h.in:374
- msgid ""
- "If the VPN service supports persistence, and this property is TRUE, the VPN "
- "will attempt to stay connected across link changes and outages, until "
- "explicitly disconnected."
--msgstr ""
--"VPN 서비스가 지속성을 지원하고이 등록 정보가 TRUE이면 VPN은 명시 적으로 연결이 끊어 질 때까지 링크 변경 및 중단시에도 연결을 "
--"유지하려고 시도합니다."
-+msgstr "VPN 서비스가 지속성을 지원하고이 등록 정보가 TRUE이면 VPN은 명시 적으로 연결이 끊어 질 때까지 링크 변경 및 중단시에도 연결을 유지하려고 시도합니다."
-
--#: ../clients/common/settings-docs.h.in:347
-+#: ../clients/common/settings-docs.h.in:375
- 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 플러그 인 특정 비밀의 키 / 값 쌍 사전입니다. 키와 값은 모두 문자열이어야합니다."
-
--#: ../clients/common/settings-docs.h.in:348
-+#: ../clients/common/settings-docs.h.in:376
- msgid ""
- "D-Bus service name of the VPN plugin that this setting uses to connect to "
- "its network. i.e. org.freedesktop.NetworkManager.vpnc for the vpnc plugin."
--msgstr ""
--"이 설정이 해당 네트워크에 연결하는 데 사용하는 VPN 플러그 인의 D-Bus 서비스 이름입니다. 즉 vpnc 플러그인의 org."
--"freedesktop.NetworkManager.vpnc."
-+msgstr "이 설정이 해당 네트워크에 연결하는 데 사용하는 VPN 플러그 인의 D-Bus 서비스 이름입니다. 즉 vpnc 플러그인의 org.freedesktop.NetworkManager.vpnc."
-
--#: ../clients/common/settings-docs.h.in:349
-+#: ../clients/common/settings-docs.h.in:377
- msgid ""
- "Timeout for the VPN service to establish the connection. Some services may "
- "take quite a long time to connect. Value of 0 means a default timeout, which "
- "is 60 seconds (unless overridden by vpn.timeout in configuration file). "
- "Values greater than zero mean timeout in seconds."
--msgstr ""
--"VPN 서비스가 연결을 설정하기위한 시간 초과. 일부 서비스는 연결하는 데 꽤 오랜 시간이 걸릴 수 있습니다. 0 값은 구성 파일의 "
--"vpn.timeout에 의해 무시되지 않는 한 60 초인 기본 시간 초과를 의미합니다. 0보다 큰 값은 초 단위의 시간 초과를 의미합니다."
--""
-+msgstr "VPN 서비스가 연결을 설정하기위한 시간 초과. 일부 서비스는 연결하는 데 꽤 오랜 시간이 걸릴 수 있습니다. 0 값은 구성 파일의 vpn.timeout에 의해 무시되지 않는 한 60 초인 기본 시간 초과를 의미합니다. 0보다 큰 값은 초 단위의 시간 초과를 의미합니다."
-
--#: ../clients/common/settings-docs.h.in:350
-+#: ../clients/common/settings-docs.h.in:378
- 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 "
-@@ -8615,2127 +8157,2218 @@ msgid ""
- "this property empty. If this property is empty, NetworkManager will "
- "automatically supply the username of the user which requested the VPN "
- "connection."
--msgstr ""
--"VPN 연결에 인증을위한 사용자 이름이 필요한 경우이 이름을 여기에 제공해야합니다. 둘 이상의 사용자가 연결을 사용할 수 있고 VPN에서 "
--"각 사용자에게 다른 이름을 제공해야하는 경우이 속성을 비워 두십시오. 이 속성이 비어 있으면 NetworkManager는 VPN 연결을 "
--"요청한 사용자의 사용자 이름을 자동으로 제공합니다."
-+msgstr "VPN 연결에 인증을위한 사용자 이름이 필요한 경우이 이름을 여기에 제공해야합니다. 둘 이상의 사용자가 연결을 사용할 수 있고 VPN에서 각 사용자에게 다른 이름을 제공해야하는 경우이 속성을 비워 두십시오. 이 속성이 비어 있으면 NetworkManager는 VPN 연결을 요청한 사용자의 사용자 이름을 자동으로 제공합니다."
-
--#: ../clients/common/settings-docs.h.in:351
-+#: ../clients/common/settings-docs.h.in:379
-+msgid "The routing table for this VRF."
-+msgstr "이 VRF의 라우팅 테이블입니다."
-+
-+#: ../clients/common/settings-docs.h.in:380
- msgid "Specifies the lifetime in seconds of FDB entries learnt by the kernel."
- msgstr "커널에서 학습 한 FDB 항목의 수명 (초)을 지정합니다."
-
--#: ../clients/common/settings-docs.h.in:352
-+#: ../clients/common/settings-docs.h.in:381
- msgid ""
- "Specifies the UDP destination port to communicate to the remote VXLAN tunnel "
- "endpoint."
- msgstr "원격 VXLAN 터널 끝점과 통신 할 UDP 대상 포트를 지정합니다."
-
--#: ../clients/common/settings-docs.h.in:353
-+#: ../clients/common/settings-docs.h.in:382
- msgid ""
- "Specifies the VXLAN Network Identifier (or VXLAN Segment Identifier) to use."
- msgstr "사용할 VXLAN 네트워크 식별자 (또는 VXLAN 세그먼트 식별자)를 지정합니다."
-
--#: ../clients/common/settings-docs.h.in:354
-+#: ../clients/common/settings-docs.h.in:383
- msgid "Specifies whether netlink LL ADDR miss notifications are generated."
- msgstr "netlink LL ADDR 누락 알림을 생성할지 여부를 지정합니다."
-
--#: ../clients/common/settings-docs.h.in:355
-+#: ../clients/common/settings-docs.h.in:384
- msgid "Specifies whether netlink IP ADDR miss notifications are generated."
- msgstr "netlink IP ADDR 누락 알림을 생성할지 여부를 지정합니다."
-
--#: ../clients/common/settings-docs.h.in:356
-+#: ../clients/common/settings-docs.h.in:385
- msgid ""
- "Specifies whether unknown source link layer addresses and IP addresses are "
- "entered into the VXLAN device forwarding database."
- msgstr "알 수없는 소스 링크 계층 주소 및 IP 주소를 VXLAN 장치 전달 데이터베이스에 입력할지 여부를 지정합니다."
-
--#: ../clients/common/settings-docs.h.in:357
-+#: ../clients/common/settings-docs.h.in:386
- msgid ""
- "Specifies the maximum number of FDB entries. A value of zero means that the "
- "kernel will store unlimited entries."
- msgstr "FDB 항목의 최대 수를 지정합니다. 0 값은 커널이 무제한 항목을 저장함을 의미합니다."
-
--#: ../clients/common/settings-docs.h.in:358
-+#: ../clients/common/settings-docs.h.in:387
- msgid "If given, specifies the source IP address to use in outgoing packets."
- msgstr "주어진 경우 보내는 패킷에 사용할 원본 IP 주소를 지정합니다."
-
--#: ../clients/common/settings-docs.h.in:359
-+#: ../clients/common/settings-docs.h.in:388
- msgid ""
- "If given, specifies the parent interface name or parent connection UUID."
- msgstr "주어진 경우, 상위 인터페이스 이름 또는 상위 연결 UUID를 지정합니다."
-
--#: ../clients/common/settings-docs.h.in:360
-+#: ../clients/common/settings-docs.h.in:389
- msgid "Specifies whether ARP proxy is turned on."
- msgstr "ARP 프록시가 켜져 있는지 여부를 지정합니다."
-
--#: ../clients/common/settings-docs.h.in:361
-+#: ../clients/common/settings-docs.h.in:390
- msgid ""
- "Specifies the unicast destination IP address to use in outgoing packets when "
- "the destination link layer address is not known in the VXLAN device "
- "forwarding database, or the multicast IP address to join."
--msgstr ""
--"대상 링크 계층 주소를 VXLAN 장치 전달 데이터베이스에 알 수 없거나 멀티 캐스트 IP 주소를 조인 할 때 나가는 패킷에 사용할 유니 "
--"캐스트 대상 IP 주소를 지정합니다."
-+msgstr "대상 링크 계층 주소를 VXLAN 장치 전달 데이터베이스에 알 수 없거나 멀티 캐스트 IP 주소를 조인 할 때 나가는 패킷에 사용할 유니 캐스트 대상 IP 주소를 지정합니다."
-
--#: ../clients/common/settings-docs.h.in:362
-+#: ../clients/common/settings-docs.h.in:391
- msgid "Specifies whether route short circuit is turned on."
- msgstr "경로 단락이 켜져 있는지 여부를 지정합니다."
-
--#: ../clients/common/settings-docs.h.in:363
-+#: ../clients/common/settings-docs.h.in:392
- msgid ""
- "Specifies the maximum UDP source port to communicate to the remote VXLAN "
- "tunnel endpoint."
- msgstr "원격 VXLAN 터널 엔드 포인트와 통신 할 최대 UDP 소스 포트를 지정합니다."
-
--#: ../clients/common/settings-docs.h.in:364
-+#: ../clients/common/settings-docs.h.in:393
- msgid ""
- "Specifies the minimum UDP source port to communicate to the remote VXLAN "
- "tunnel endpoint."
- msgstr "원격 VXLAN 터널 엔드 포인트와 통신 할 최소 UDP 소스 포트를 지정합니다."
-
--#: ../clients/common/settings-docs.h.in:365
-+#: ../clients/common/settings-docs.h.in:394
- msgid "Specifies the TOS value to use in outgoing packets."
- msgstr "송신 패킷에 사용할 TOS 값을 지정합니다."
-
--#: ../clients/common/settings-docs.h.in:366
-+#: ../clients/common/settings-docs.h.in:395
- msgid "Specifies the time-to-live value to use in outgoing packets."
- msgstr "송신 패킷에 사용할 TTL (Time-To-Live) 값을 지정합니다."
-
--#: ../clients/common/settings-docs.h.in:367
-+#: ../clients/common/settings-docs.h.in:396
- 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:368
-+#: ../clients/common/settings-docs.h.in:397
- 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 ""
-+msgstr "설정할 Wi-Fi 디스플레이 (WFD) 정보 요소 (IE). Wi-Fi 디스플레이에는 특정 Wi-Fi 프레임에서 프로토콜 특정 정보 요소를 설정해야합니다. 연결 설정을 위해 여기에서 지정할 수 있습니다. 이 설정은 Wi-Fi 디스플레이 클라이언트를 구현할 때만 유용합니다."
-
--#: ../clients/common/settings-docs.h.in:369
--#, fuzzy
-+#: ../clients/common/settings-docs.h.in:398
- 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를 비활성화 할 수 "
--"있습니다."
-+msgstr "사용할 WPS 모드를 나타내는 플래그. NetworkManager가 사용하기에 가장 적합한 방법을 자동으로 결정하므로 기본 설정을 변경할 필요는 없습니다."
-
--#: ../clients/common/settings-docs.h.in:370
-+#: ../clients/common/settings-docs.h.in:399
- msgid ""
- "If specified, this connection will only apply to the WiMAX device whose MAC "
- "address matches. This property does not change the MAC address of the device "
- "(known as MAC spoofing). Deprecated: 1"
--msgstr ""
--"지정되면이 연결은 MAC 주소가 일치하는 WiMAX 장치에만 적용됩니다. 이 속성은 장치의 MAC 주소 (MAC 스푸핑)를 변경하지 "
--"않습니다. 지원 중단 : 1"
-+msgstr "지정되면이 연결은 MAC 주소가 일치하는 WiMAX 장치에만 적용됩니다. 이 속성은 장치의 MAC 주소 (MAC 스푸핑)를 변경하지 않습니다. 지원 중단 : 1"
-
--#: ../clients/common/settings-docs.h.in:371
-+#: ../clients/common/settings-docs.h.in:400
- msgid ""
- "Network Service Provider (NSP) name of the WiMAX network this connection "
- "should use. Deprecated: 1"
--msgstr ""
--"이 연결에서 사용해야하는 WiMAX 네트워크의 NSP (Network Service Provider) 이름입니다. 지원 중단 : 1"
-+msgstr "이 연결에서 사용해야하는 WiMAX 네트워크의 NSP (Network Service Provider) 이름입니다. 지원 중단 : 1"
-
--#: ../clients/common/settings-docs.h.in:372
-+#: ../clients/common/settings-docs.h.in:401
- msgid ""
- "The use of fwmark is optional and is by default off. Setting it to 0 "
- "disables it. Otherwise it is a 32-bit fwmark for outgoing packets. Note that "
- "\"ip4-auto-default-route\" or \"ip6-auto-default-route\" enabled, implies to "
- "automatically choose a fwmark."
--msgstr ""
-+msgstr "fwmark 사용은 선택 사항이며 기본적으로 해제되어 있습니다. 0으로 설정하면 비활성화됩니다. 그렇지 않으면 나가는 패킷에 대한 32 비트 fwmark입니다. \"ip4-auto-default-route\"또는 \"ip6-auto-default-route\"가 활성화되어 있으면 자동으로 fwmark를 선택해야합니다."
-
--#: ../clients/common/settings-docs.h.in:373
-+#: ../clients/common/settings-docs.h.in:402
- msgid ""
- "Whether to enable special handling of the IPv4 default route. If enabled, "
--"the IPv4 default route will be placed to a dedicated routing-table and two "
--"policy routing rules will be added. The fwmark number is also used as "
--"routing-table for the default-route, and if fwmark is zero, a unused fwmark/"
--"table is chosen automatically. This corresponds to what wg-quick does with "
--"Table=auto. Leaving this at the default will enable this option "
--"automatically if ipv4.never-default is not set and there are any peers that "
--"use a default-route as allowed-ips."
--msgstr ""
--
--#: ../clients/common/settings-docs.h.in:374
-+"the IPv4 default route from wireguard.peer-routes will be placed to a "
-+"dedicated routing-table and two policy routing rules will be added. The "
-+"fwmark number is also used as routing-table for the default-route, and if "
-+"fwmark is zero, an unused fwmark/table is chosen automatically. This "
-+"corresponds to what wg-quick does with Table=auto and what WireGuard calls "
-+"\"Improved Rule-based Routing\". Note that for this automatism to work, you "
-+"usually don't want to set ipv4.gateway, because that will result in a "
-+"conflicting default route. Leaving this at the default will enable this "
-+"option automatically if ipv4.never-default is not set and there are any "
-+"peers that use a default-route as allowed-ips."
-+msgstr "IPv4 기본 경로를 특수하게 처리 할 수 있는지 여부 활성화하면 wireguard.peer-routes의 IPv4 기본 경로가 전용 라우팅 테이블에 배치되고 두 가지 정책 라우팅 규칙이 추가됩니다. fwmark 번호는 기본 경로의 라우팅 테이블로도 사용되며 fwmark가 0이면 사용되지 않는 fwmark / 테이블이 자동으로 선택됩니다. 이는 wg-quick이 Table = auto를 사용하여 수행하는 작업과 WireGuard가 \"향상된 규칙 기반 라우팅\"이라고하는 작업에 해당합니다. 이 자동 기능이 작동하려면 일반적으로 ipv4.gateway를 설정하지 않는 것이 좋습니다. 기본 경로가 충돌하기 때문입니다. ipv4.never-default가 설정되어 있지 않고 허용 경로로 기본 경로를 사용하는 피어가있는 경우이 옵션을 기본값으로두면이 옵션이 자동으로 활성화됩니다."
-+
-+#: ../clients/common/settings-docs.h.in:403
- msgid "Like ip4-auto-default-route, but for the IPv6 default route."
--msgstr ""
-+msgstr "ip4-auto-default-route와 같지만 IPv6 기본 경로입니다."
-
--#: ../clients/common/settings-docs.h.in:375
-+#: ../clients/common/settings-docs.h.in:404
- msgid ""
- "The listen-port. If listen-port is not specified, the port will be chosen "
- "randomly when the interface comes up."
--msgstr ""
-+msgstr "청취 포트. 수신 포트를 지정하지 않으면 인터페이스가 표시 될 때 포트가 임의로 선택됩니다."
-
--#: ../clients/common/settings-docs.h.in:376
--#, fuzzy
-+#: ../clients/common/settings-docs.h.in:405
- 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이 아닌 경우 지정된 크기 이하의 패킷 만 전송하여 큰 패킷을 여러 이더넷 프레임으로 분할합니다."
-+msgstr "0이 아닌 경우 지정된 크기 이하의 패킷 만 전송하여 더 큰 패킷을 여러 조각으로 나눕니다. 0이면 기본 MTU가 사용됩니다. wg-quick의 MTU 설정과는 달리 활성화시 현재 경로를 고려하지 않습니다."
-
--#: ../clients/common/settings-docs.h.in:377
-+#: ../clients/common/settings-docs.h.in:406
- 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:378
-+"routing tables according to ipv4.route-table and ipv6.route-table. Usually "
-+"you want this automatism enabled. 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. Note that if the peer's "
-+"AllowedIPs is \"0.0.0.0/0\" or \"::/0\" and the profile's ipv4.never-default "
-+"or ipv6.never-default setting is enabled, the peer route for this peer won't "
-+"be added automatically."
-+msgstr "피어의 AllowedIPs 범위에 대한 경로를 자동으로 추가할지 여부 TRUE (기본값) 인 경우 NetworkManager는 ipv4.route-table 및 ipv6.route-table에 따라 라우팅 테이블에 경로를 자동으로 추가합니다. 일반적으로이 자동 기능을 사용하려고합니다. FALSE이면 해당 경로가 자동으로 추가되지 않습니다. 이 경우 사용자는 각각 ipv4.routes 및 ipv6.routes에서 고정 경로를 구성 할 수 있습니다. 피어의 AllowedIPs가 \"0.0.0.0/0\"또는 \":: / 0\"이고 프로필의 ipv4.never-default 또는 ipv6.never-default 설정이 활성화되어 있으면이 피어의 피어 경로가 추가되지 않습니다. 자동으로."
-+
-+#: ../clients/common/settings-docs.h.in:407
- msgid "The 256 bit private-key in base64 encoding."
--msgstr ""
-+msgstr "base64 인코딩의 256 비트 개인 키입니다."
-
--#: ../clients/common/settings-docs.h.in:379
--#, fuzzy
-+#: ../clients/common/settings-docs.h.in:408
- msgid "Flags indicating how to handle the \"private-key\" property."
- msgstr "\"private-key-password\"속성을 처리하는 방법을 나타내는 플래그입니다."
-
--#: ../clients/common/settings-docs.h.in:380
-+#: ../clients/common/settings-docs.h.in:409
- 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:381
-+#: ../clients/common/settings-docs.h.in:410
- msgid ""
- "If specified, this connection will only apply to the IEEE 802.15.4 (WPAN) "
- "MAC layer device whose permanent MAC address matches."
--msgstr ""
--"이 연결을 지정하면이 연결은 영구 MAC 주소가 일치하는 IEEE 802.15.4 (WPAN) MAC 계층 장치에만 적용됩니다."
-+msgstr "이 연결을 지정하면이 연결은 영구 MAC 주소가 일치하는 IEEE 802.15.4 (WPAN) MAC 계층 장치에만 적용됩니다."
-
--#: ../clients/common/settings-docs.h.in:382
-+#: ../clients/common/settings-docs.h.in:411
- 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 ""
-+msgstr "IEEE 802.15.4 채널 페이지. 양의 정수 또는 -1은 \"설정되지 않음, 장치가 이미 설정 한 것을 사용하십시오\"를 의미합니다."
-
--#: ../clients/common/settings-docs.h.in:383
-+#: ../clients/common/settings-docs.h.in:412
- msgid "IEEE 802.15.4 Personal Area Network (PAN) identifier."
- msgstr "IEEE 802.15.4 PAN (Personal Area Network) 식별자."
-
--#: ../clients/common/settings-docs.h.in:384
--msgid ""
--"Short IEEE 802.15.4 address to be used within a restricted environment."
-+#: ../clients/common/settings-docs.h.in:413
-+msgid "Short IEEE 802.15.4 address to be used within a restricted environment."
- msgstr "제한된 환경에서 사용되는 짧은 IEEE 802.15.4 주소."
-
--#: ../clients/nm-online.c:89
-+#: ../clients/nm-online.c:77
- msgid "Connecting"
- msgstr "연결하는 중 "
-
--#: ../clients/nm-online.c:205
-+#: ../clients/nm-online.c:193
- #, c-format
- msgid "Error: timeout creating NMClient object\n"
- msgstr "오류: NMClient 개체를 생성할 수 없음: .\n"
-
--#: ../clients/nm-online.c:225
--#, fuzzy, c-format
-+#: ../clients/nm-online.c:216
-+#, c-format
- msgid "Error: Could not create NMClient object: %s\n"
- msgstr "오류: NMClient 개체를 생성할 수 없음: %s.\n"
-
--#: ../clients/nm-online.c:251
-+#: ../clients/nm-online.c:240
- msgid "Don't print anything"
- msgstr "아무것도 출력하지 않음 "
-
--#: ../clients/nm-online.c:252
-+#: ../clients/nm-online.c:241
- msgid "Wait for NetworkManager startup instead of a connection"
- msgstr "연결 대신 NetworkManager 시작을 대기합니다."
-
--#: ../clients/nm-online.c:253
-+#: ../clients/nm-online.c:242
- msgid ""
- "Time to wait for a connection, in seconds (without the option, default value "
- "is 30)"
- msgstr "연결 대기 시간, 초 단위 (옵션 없음, 기본값은 30임) "
-
--#: ../clients/nm-online.c:254
-+#: ../clients/nm-online.c:243
- msgid "Exit immediately if NetworkManager is not running or connecting"
- msgstr "NetworkManager가 실행 중이지 않거나 연결되지 않는 경우 즉시 종료 "
-
--#: ../clients/nm-online.c:274
-+#: ../clients/nm-online.c:265
- msgid ""
- "Waits for NetworkManager to finish activating startup network connections."
- msgstr "NetworkManager가 시작 네트워크 연결을 활성화 완료할 때 까지 대기합니다."
-
--#: ../clients/nm-online.c:281 ../clients/nm-online.c:287
-+#: ../clients/nm-online.c:272 ../clients/nm-online.c:278
- msgid "Invalid option. Please use --help to see a list of valid options."
- msgstr "잘못된 옵션입니다. --help를 사용하여 유효한 옵션 목록을 확인하십시오."
-
--#: ../clients/tui/newt/nmt-newt-utils.c:175 ../clients/tui/nmt-editor.c:432
--#: ../clients/tui/nmt-password-dialog.c:173
--#: ../clients/tui/nmt-route-editor.c:121 ../clients/tui/nmtui-hostname.c:68
--#: ../clients/tui/nmtui.c:133
-+#: ../clients/tui/newt/nmt-newt-utils.c:163 ../clients/tui/nmt-editor.c:420
-+#: ../clients/tui/nmt-password-dialog.c:161
-+#: ../clients/tui/nmt-route-editor.c:109 ../clients/tui/nmtui-hostname.c:56
-+#: ../clients/tui/nmtui.c:123
- msgid "OK"
- msgstr "OK"
-
--#: ../clients/tui/newt/nmt-newt-utils.c:323
--#: ../clients/tui/newt/nmt-newt-utils.c:355
-+#: ../clients/tui/newt/nmt-newt-utils.c:311
-+#: ../clients/tui/newt/nmt-newt-utils.c:343
- #, c-format
- msgid "Could not create temporary file: %s"
- msgstr "임시 파일을 생성할 수 없음: %s"
-
--#: ../clients/tui/newt/nmt-newt-utils.c:361
-+#: ../clients/tui/newt/nmt-newt-utils.c:349
- #, c-format
- msgid "Editor failed: %s"
- msgstr "편집기 실패: %s"
-
--#: ../clients/tui/newt/nmt-newt-utils.c:367
-+#: ../clients/tui/newt/nmt-newt-utils.c:355
- #, c-format
- msgid "Could not re-read file: %s"
- msgstr "파일을 다시 읽어올 수 없음: %s"
-
--#: ../clients/tui/nm-editor-utils.c:152 ../libnm/nm-device.c:1379
-+#: ../clients/tui/nm-editor-utils.c:135 ../libnm/nm-device.c:1567
- msgid "Ethernet"
- msgstr "이더넷"
-
--#: ../clients/tui/nm-editor-utils.c:156
-+#: ../clients/tui/nm-editor-utils.c:139
- #, c-format
- msgid "Ethernet connection %d"
- msgstr "이더넷 연결 %d"
-
--#: ../clients/tui/nm-editor-utils.c:160 ../libnm/nm-device.c:1381
-+#: ../clients/tui/nm-editor-utils.c:143 ../libnm/nm-device.c:1569
- msgid "Wi-Fi"
- msgstr "Wi-Fi"
-
--#: ../clients/tui/nm-editor-utils.c:164
-+#: ../clients/tui/nm-editor-utils.c:147
- #, c-format
- msgid "Wi-Fi connection %d"
- msgstr "Wi-Fi 연결 %d"
-
--#: ../clients/tui/nm-editor-utils.c:169 ../libnm-core/nm-connection.c:2742
--#: ../libnm/nm-device.c:1397
-+#: ../clients/tui/nm-editor-utils.c:152 ../libnm-core/nm-connection.c:2713
-+#: ../libnm/nm-device.c:1585
- msgid "InfiniBand"
- msgstr "InfiniBand"
-
--#: ../clients/tui/nm-editor-utils.c:173
-+#: ../clients/tui/nm-editor-utils.c:156
- #, c-format
- msgid "InfiniBand connection %d"
- msgstr "InfiniBand 연결 %d"
-
--#: ../clients/tui/nm-editor-utils.c:178 ../libnm/nm-device.c:1395
-+#: ../clients/tui/nm-editor-utils.c:161 ../libnm/nm-device.c:1583
- msgid "Mobile Broadband"
- msgstr "모바일 광대역"
-
--#: ../clients/tui/nm-editor-utils.c:181
-+#: ../clients/tui/nm-editor-utils.c:164
- #, c-format
- msgid "Mobile broadband connection %d"
- msgstr "모바일 광대역 연결 %d"
-
--#: ../clients/tui/nm-editor-utils.c:187 ../clients/tui/nmt-page-dsl.c:61
-+#: ../clients/tui/nm-editor-utils.c:170 ../clients/tui/nmt-page-dsl.c:49
- msgid "DSL"
- msgstr "DSL"
-
--#: ../clients/tui/nm-editor-utils.c:191
-+#: ../clients/tui/nm-editor-utils.c:174
- #, c-format
- msgid "DSL connection %d"
- msgstr "DSL 연결 %d"
-
--#: ../clients/tui/nm-editor-utils.c:196 ../libnm-core/nm-connection.c:2734
--#: ../libnm/nm-device.c:1399
--#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4935
-+#: ../clients/tui/nm-editor-utils.c:179 ../libnm-core/nm-connection.c:2705
-+#: ../libnm/nm-device.c:1587
-+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5216
- msgid "Bond"
- msgstr "본딩 "
-
--#: ../clients/tui/nm-editor-utils.c:200
-+#: ../clients/tui/nm-editor-utils.c:183
- #, c-format
- msgid "Bond connection %d"
- msgstr "Bond 연결 %d"
-
--#: ../clients/tui/nm-editor-utils.c:205 ../libnm-core/nm-connection.c:2738
--#: ../libnm/nm-device.c:1403
--#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5290
-+#: ../clients/tui/nm-editor-utils.c:188 ../libnm-core/nm-connection.c:2709
-+#: ../libnm/nm-device.c:1591
-+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5599
- msgid "Bridge"
- msgstr "브리지 "
-
--#: ../clients/tui/nm-editor-utils.c:210
-+#: ../clients/tui/nm-editor-utils.c:193
- #, c-format
- msgid "Bridge connection %d"
- msgstr "브리지 연결 %d"
-
--#: ../clients/tui/nm-editor-utils.c:214 ../libnm-core/nm-connection.c:2736
--#: ../libnm/nm-device.c:1401
--#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5008
-+#: ../clients/tui/nm-editor-utils.c:197 ../libnm-core/nm-connection.c:2707
-+#: ../libnm/nm-device.c:1589
-+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5289
- msgid "Team"
- msgstr "팀 "
-
--#: ../clients/tui/nm-editor-utils.c:219
-+#: ../clients/tui/nm-editor-utils.c:202
- #, c-format
- msgid "Team connection %d"
- msgstr "팀 연결 %d"
-
--#: ../clients/tui/nm-editor-utils.c:223 ../clients/tui/nmt-page-vlan.c:81
--#: ../libnm-core/nm-connection.c:2740 ../libnm/nm-device.c:1405
-+#: ../clients/tui/nm-editor-utils.c:206 ../clients/tui/nmt-page-vlan.c:69
-+#: ../libnm-core/nm-connection.c:2711 ../libnm/nm-device.c:1593
- msgid "VLAN"
- msgstr "VLAN"
-
--#: ../clients/tui/nm-editor-utils.c:227
-+#: ../clients/tui/nm-editor-utils.c:210
- #, c-format
- msgid "VLAN connection %d"
- msgstr "VLAN 연결 %d"
-
--#: ../clients/tui/nm-editor-utils.c:231 ../clients/tui/nmt-page-ip-tunnel.c:135
-+#: ../clients/tui/nm-editor-utils.c:214 ../clients/tui/nmt-page-ip-tunnel.c:123
- msgid "IP tunnel"
- msgstr "IP 터널"
-
--#: ../clients/tui/nm-editor-utils.c:235
--#, fuzzy, c-format
-+#: ../clients/tui/nm-editor-utils.c:218
-+#, c-format
- msgid "IP tunnel connection %d"
- msgstr "IP 터널 연결"
-
--#: ../clients/tui/nm-editor-utils.c:250
-+#: ../clients/tui/nm-editor-utils.c:233
- #, c-format
- msgid "VPN connection %d"
- msgstr "VPN 연결 %d"
-
--#: ../clients/tui/nmt-device-entry.c:367
-+#: ../clients/tui/nmt-device-entry.c:355
- msgid "Select..."
- msgstr "선택..."
-
--#: ../clients/tui/nmt-edit-connection-list.c:109
-+#: ../clients/tui/nmt-edit-connection-list.c:97
- msgid "Add"
- msgstr "추가 "
-
--#: ../clients/tui/nmt-edit-connection-list.c:112
--#: ../clients/tui/nmt-page-ip4.c:168 ../clients/tui/nmt-page-ip6.c:167
--#: ../clients/tui/nmt-page-team-port.c:108 ../clients/tui/nmt-page-team.c:172
-+#: ../clients/tui/nmt-edit-connection-list.c:100
-+#: ../clients/tui/nmt-page-ip4.c:156 ../clients/tui/nmt-page-ip6.c:155
-+#: ../clients/tui/nmt-page-team-port.c:96 ../clients/tui/nmt-page-team.c:160
- msgid "Edit..."
- msgstr "편집..."
-
--#: ../clients/tui/nmt-edit-connection-list.c:115
--#: ../clients/tui/nmtui-edit.c:528
-+#: ../clients/tui/nmt-edit-connection-list.c:103
-+#: ../clients/tui/nmtui-edit.c:516
- msgid "Delete"
- msgstr "삭제 "
-
--#: ../clients/tui/nmt-editor-section.c:102
-+#: ../clients/tui/nmt-editor-section.c:90
- msgid "Hide"
- msgstr "숨기기"
-
--#: ../clients/tui/nmt-editor-section.c:102
-+#: ../clients/tui/nmt-editor-section.c:90
- msgid "Show"
- msgstr "보기 "
-
--#: ../clients/tui/nmt-editor.c:99
-+#: ../clients/tui/nmt-editor.c:87
- #, c-format
- msgid "Could not create editor for connection '%s' of type '%s'."
- msgstr "유형 '%s'의 연결 '%s'에 대한 편집기를 생성할 수 없습니다."
-
--#: ../clients/tui/nmt-editor.c:103
-+#: ../clients/tui/nmt-editor.c:91
- #, c-format
- msgid "Could not create editor for invalid connection '%s'."
- msgstr "잘못된 연결 '%s'에 대한 편집기를 생성할 수 없습니다."
-
--#: ../clients/tui/nmt-editor.c:113
--#, fuzzy
-+#: ../clients/tui/nmt-editor.c:101
- msgid "Edit Connection"
--msgstr "연결 편집 "
-+msgstr "연결 편집"
-
--#: ../clients/tui/nmt-editor.c:174
-+#: ../clients/tui/nmt-editor.c:162
- #, c-format
- msgid "Unable to save connection: %s"
- msgstr "연결을 저장할 수 없음: %s"
-
--#: ../clients/tui/nmt-editor.c:188
-+#: ../clients/tui/nmt-editor.c:176
- #, c-format
- msgid "Unable to add new connection: %s"
- msgstr "새 연결을 추가할 수 없음: %s"
-
--#: ../clients/tui/nmt-editor.c:335
-+#: ../clients/tui/nmt-editor.c:323
- msgid "Profile name"
- msgstr "프로파일 이름"
-
--#: ../clients/tui/nmt-editor.c:346
-+#: ../clients/tui/nmt-editor.c:334
- msgid "Ethernet device"
- msgstr "이더넷 장치"
-
--#: ../clients/tui/nmt-editor.c:348
-+#: ../clients/tui/nmt-editor.c:336
- msgid "Device"
- msgstr "장치"
-
- #. And finally the bottom widgets
--#: ../clients/tui/nmt-editor.c:408
-+#: ../clients/tui/nmt-editor.c:396
- msgid "Automatically connect"
- msgstr "자동으로 연결 "
-
--#: ../clients/tui/nmt-editor.c:414
-+#: ../clients/tui/nmt-editor.c:402
- msgid "Available to all users"
- msgstr "모든 사용자에게 사용 가능 "
-
--#: ../clients/tui/nmt-editor.c:429 ../clients/tui/nmt-password-dialog.c:170
--#: ../clients/tui/nmt-route-editor.c:114 ../clients/tui/nmtui-edit.c:219
--#: ../clients/tui/nmtui-edit.c:527 ../clients/tui/nmtui-hostname.c:66
-+#: ../clients/tui/nmt-editor.c:417 ../clients/tui/nmt-password-dialog.c:158
-+#: ../clients/tui/nmt-route-editor.c:102 ../clients/tui/nmtui-edit.c:207
-+#: ../clients/tui/nmtui-edit.c:515 ../clients/tui/nmtui-hostname.c:54
- msgid "Cancel"
- msgstr "취소 "
-
--#: ../clients/tui/nmt-mtu-entry.c:83
-+#: ../clients/tui/nmt-mtu-entry.c:71
- msgid "(default)"
- msgstr "(기본값)"
-
--#: ../clients/tui/nmt-mtu-entry.c:85 ../clients/tui/nmt-mtu-entry.c:116
-+#: ../clients/tui/nmt-mtu-entry.c:73 ../clients/tui/nmt-mtu-entry.c:104
- msgid "bytes"
- msgstr "바이트"
-
--#: ../clients/tui/nmt-page-bond.c:87
-+#: ../clients/tui/nmt-page-bond.c:75
- msgid "Round-robin"
- msgstr "라운드-로빈 "
-
--#: ../clients/tui/nmt-page-bond.c:88
-+#: ../clients/tui/nmt-page-bond.c:76
- msgid "Active Backup"
- msgstr "활성 백업 "
-
--#: ../clients/tui/nmt-page-bond.c:89
-+#: ../clients/tui/nmt-page-bond.c:77
- msgid "XOR"
- msgstr "XOR"
-
--#: ../clients/tui/nmt-page-bond.c:90
-+#: ../clients/tui/nmt-page-bond.c:78
- msgid "Broadcast"
- msgstr "브로드캐스트 "
-
--#: ../clients/tui/nmt-page-bond.c:91
-+#: ../clients/tui/nmt-page-bond.c:79
- msgid "802.3ad"
- msgstr "802.3ad"
-
--#: ../clients/tui/nmt-page-bond.c:92
-+#: ../clients/tui/nmt-page-bond.c:80
- msgid "Adaptive Transmit Load Balancing (tlb)"
- msgstr "적응형 전송 부하 분산 (tlb)"
-
--#: ../clients/tui/nmt-page-bond.c:93
-+#: ../clients/tui/nmt-page-bond.c:81
- msgid "Adaptive Load Balancing (alb)"
- msgstr "적응형 부하 분산 (alb)"
-
--#: ../clients/tui/nmt-page-bond.c:99
-+#: ../clients/tui/nmt-page-bond.c:87
- msgid "MII (recommended)"
- msgstr "MII (권장사항)"
-
--#: ../clients/tui/nmt-page-bond.c:100
-+#: ../clients/tui/nmt-page-bond.c:88
- msgid "ARP"
- msgstr "ARP"
-
--#: ../clients/tui/nmt-page-bond.c:361
-+#: ../clients/tui/nmt-page-bond.c:349
- msgid "BOND"
- msgstr "본딩 "
-
--#: ../clients/tui/nmt-page-bond.c:365 ../clients/tui/nmt-page-bridge.c:84
--#: ../clients/tui/nmt-page-team.c:151
-+#: ../clients/tui/nmt-page-bond.c:353 ../clients/tui/nmt-page-bridge.c:72
-+#: ../clients/tui/nmt-page-team.c:139
- msgid "Slaves"
- msgstr "슬레이브 "
-
--#: ../clients/tui/nmt-page-bond.c:377 ../clients/tui/nmt-page-ip-tunnel.c:147
--#: ../clients/tui/nmt-page-wifi.c:229
-+#: ../clients/tui/nmt-page-bond.c:365 ../clients/tui/nmt-page-ip-tunnel.c:135
-+#: ../clients/tui/nmt-page-wifi.c:219
- msgid "Mode"
- msgstr "모드"
-
--#: ../clients/tui/nmt-page-bond.c:383
-+#: ../clients/tui/nmt-page-bond.c:371
- msgid "Primary"
- msgstr "주 "
-
--#: ../clients/tui/nmt-page-bond.c:389
-+#: ../clients/tui/nmt-page-bond.c:377
- msgid "Link monitoring"
- msgstr "링크 모니터링 "
-
--#: ../clients/tui/nmt-page-bond.c:395 ../clients/tui/nmt-page-bond.c:402
--#: ../clients/tui/nmt-page-bond.c:409 ../clients/tui/nmt-page-bond.c:416
-+#: ../clients/tui/nmt-page-bond.c:383 ../clients/tui/nmt-page-bond.c:390
-+#: ../clients/tui/nmt-page-bond.c:397 ../clients/tui/nmt-page-bond.c:404
- msgctxt "milliseconds"
- msgid "ms"
- msgstr "ms"
-
--#: ../clients/tui/nmt-page-bond.c:396 ../clients/tui/nmt-page-bond.c:417
-+#: ../clients/tui/nmt-page-bond.c:384 ../clients/tui/nmt-page-bond.c:405
- msgid "Monitoring frequency"
- msgstr "모니터링 빈도 "
-
--#: ../clients/tui/nmt-page-bond.c:403
-+#: ../clients/tui/nmt-page-bond.c:391
- msgid "Link up delay"
- msgstr "링크 업 지연 "
-
--#: ../clients/tui/nmt-page-bond.c:410
-+#: ../clients/tui/nmt-page-bond.c:398
- msgid "Link down delay"
- msgstr "링크 다운 지연 "
-
--#: ../clients/tui/nmt-page-bond.c:423
-+#: ../clients/tui/nmt-page-bond.c:411
- msgid "ARP targets"
- msgstr "ARP 대상 "
-
--#: ../clients/tui/nmt-page-bond.c:430 ../clients/tui/nmt-page-ethernet.c:76
--#: ../clients/tui/nmt-page-vlan.c:109 ../clients/tui/nmt-page-wifi.c:363
-+#: ../clients/tui/nmt-page-bond.c:418 ../clients/tui/nmt-page-ethernet.c:64
-+#: ../clients/tui/nmt-page-vlan.c:97 ../clients/tui/nmt-page-wifi.c:354
- msgid "Cloned MAC address"
- msgstr "복제된 MAC 주소"
-
--#: ../clients/tui/nmt-page-bridge-port.c:59
-+#: ../clients/tui/nmt-page-bridge-port.c:47
- msgid "BRIDGE PORT"
- msgstr "브리지 포트"
-
--#: ../clients/tui/nmt-page-bridge-port.c:66
--#: ../clients/tui/nmt-page-bridge.c:117
-+#: ../clients/tui/nmt-page-bridge-port.c:54
-+#: ../clients/tui/nmt-page-bridge.c:105
- msgid "Priority"
- msgstr "우선 순위 "
-
--#: ../clients/tui/nmt-page-bridge-port.c:72
-+#: ../clients/tui/nmt-page-bridge-port.c:60
- msgid "Path cost"
- msgstr "경로 비용 "
-
--#: ../clients/tui/nmt-page-bridge-port.c:74
-+#: ../clients/tui/nmt-page-bridge-port.c:62
- msgid "Hairpin mode"
- msgstr "Hairpin 모드 "
-
--#: ../clients/tui/nmt-page-bridge.c:80
-+#: ../clients/tui/nmt-page-bridge.c:68
- msgid "BRIDGE"
- msgstr "브릿지"
-
--#: ../clients/tui/nmt-page-bridge.c:95 ../clients/tui/nmt-page-bridge.c:126
--#: ../clients/tui/nmt-page-bridge.c:136 ../clients/tui/nmt-page-bridge.c:146
-+#: ../clients/tui/nmt-page-bridge.c:83 ../clients/tui/nmt-page-bridge.c:114
-+#: ../clients/tui/nmt-page-bridge.c:124 ../clients/tui/nmt-page-bridge.c:134
- msgid "seconds"
- msgstr "초"
-
--#: ../clients/tui/nmt-page-bridge.c:96
-+#: ../clients/tui/nmt-page-bridge.c:84
- msgid "Aging time"
- msgstr "유효 기간 "
-
--#: ../clients/tui/nmt-page-bridge.c:98
-+#: ../clients/tui/nmt-page-bridge.c:86
- msgid "Enable IGMP snooping"
- msgstr "IGMP 스누핑 활성화"
-
--#: ../clients/tui/nmt-page-bridge.c:104
-+#: ../clients/tui/nmt-page-bridge.c:92
- msgid "Enable STP (Spanning Tree Protocol)"
- msgstr "STP (Spanning Tree Protocol) 활성화 "
-
--#: ../clients/tui/nmt-page-bridge.c:127
-+#: ../clients/tui/nmt-page-bridge.c:115
- msgid "Forward delay"
- msgstr "전송 지연"
-
--#: ../clients/tui/nmt-page-bridge.c:137
-+#: ../clients/tui/nmt-page-bridge.c:125
- msgid "Hello time"
- msgstr "Hello 타임"
-
--#: ../clients/tui/nmt-page-bridge.c:147
-+#: ../clients/tui/nmt-page-bridge.c:135
- msgid "Max age"
- msgstr "최대 경과 시간"
-
--#: ../clients/tui/nmt-page-bridge.c:153
-+#: ../clients/tui/nmt-page-bridge.c:141
- msgid "Group forward mask"
- msgstr "그룹 앞으로 마스크"
-
--#: ../clients/tui/nmt-page-ethernet.c:69
-+#: ../clients/tui/nmt-page-ethernet.c:57
- msgid "ETHERNET"
- msgstr "이더넷"
-
--#: ../clients/tui/nmt-page-ethernet.c:82
--#: ../clients/tui/nmt-page-infiniband.c:93
--#: ../clients/tui/nmt-page-ip-tunnel.c:185 ../clients/tui/nmt-page-vlan.c:115
--#: ../clients/tui/nmt-page-wifi.c:369
-+#: ../clients/tui/nmt-page-ethernet.c:70
-+#: ../clients/tui/nmt-page-infiniband.c:81
-+#: ../clients/tui/nmt-page-ip-tunnel.c:173 ../clients/tui/nmt-page-vlan.c:103
-+#: ../clients/tui/nmt-page-wifi.c:360
- msgid "MTU"
- msgstr "MTU"
-
--#: ../clients/tui/nmt-page-infiniband.c:46
-+#: ../clients/tui/nmt-page-infiniband.c:34
- msgid "Datagram"
- msgstr "데이터그램 "
-
--#: ../clients/tui/nmt-page-infiniband.c:47
-+#: ../clients/tui/nmt-page-infiniband.c:35
- msgid "Connected"
- msgstr "연결됨"
-
--#: ../clients/tui/nmt-page-infiniband.c:80
-+#: ../clients/tui/nmt-page-infiniband.c:68
- msgid "INFINIBAND"
- msgstr "인피니밴드 "
-
--#: ../clients/tui/nmt-page-infiniband.c:87
-+#: ../clients/tui/nmt-page-infiniband.c:75
- msgid "Transport mode"
- msgstr "전송 모드 "
-
--#: ../clients/tui/nmt-page-ip4.c:37 ../clients/tui/nmt-page-ip6.c:42
-+#: ../clients/tui/nmt-page-ip4.c:25 ../clients/tui/nmt-page-ip6.c:30
- msgid "Disabled"
- msgstr "비활성화됨 "
-
--#: ../clients/tui/nmt-page-ip4.c:38 ../clients/tui/nmt-page-ip6.c:38
-+#: ../clients/tui/nmt-page-ip4.c:26 ../clients/tui/nmt-page-ip6.c:26
- msgid "Automatic"
- msgstr "자동 "
-
--#: ../clients/tui/nmt-page-ip4.c:39 ../clients/tui/nmt-page-ip6.c:40
-+#: ../clients/tui/nmt-page-ip4.c:27 ../clients/tui/nmt-page-ip6.c:28
- msgid "Link-Local"
- msgstr "링크-로컬 "
-
--#: ../clients/tui/nmt-page-ip4.c:40 ../clients/tui/nmt-page-ip6.c:41
-+#: ../clients/tui/nmt-page-ip4.c:28 ../clients/tui/nmt-page-ip6.c:29
- msgid "Manual"
- msgstr "수동"
-
--#: ../clients/tui/nmt-page-ip4.c:41
-+#: ../clients/tui/nmt-page-ip4.c:29
- msgid "Shared"
- msgstr "공유"
-
--#: ../clients/tui/nmt-page-ip4.c:81 ../clients/tui/nmt-page-ip6.c:82
-+#: ../clients/tui/nmt-page-ip4.c:69 ../clients/tui/nmt-page-ip6.c:70
- msgid "(No custom routes)"
- msgstr "(사용자 설정 라우트가 없음)"
-
--#: ../clients/tui/nmt-page-ip4.c:84 ../clients/tui/nmt-page-ip6.c:85
--#, fuzzy, c-format
-+#: ../clients/tui/nmt-page-ip4.c:72 ../clients/tui/nmt-page-ip6.c:73
-+#, c-format
- msgid "One custom route"
- msgid_plural "%d custom routes"
--msgstr[0] " 개의 사용자 지정 경로 "
-+msgstr[0] "하나의 맞춤 경로"
-
--#: ../clients/tui/nmt-page-ip4.c:127
-+#: ../clients/tui/nmt-page-ip4.c:115
- msgid "IPv4 CONFIGURATION"
- msgstr "IPv4 설정 "
-
--#: ../clients/tui/nmt-page-ip4.c:135 ../clients/tui/nmt-page-ip6.c:136
-+#: ../clients/tui/nmt-page-ip4.c:123 ../clients/tui/nmt-page-ip6.c:124
- msgid "Addresses"
- msgstr "주소"
-
--#: ../clients/tui/nmt-page-ip4.c:149 ../clients/tui/nmt-page-ip6.c:150
-+#: ../clients/tui/nmt-page-ip4.c:137 ../clients/tui/nmt-page-ip6.c:138
- msgid "DNS servers"
- msgstr "DNS 서버"
-
--#: ../clients/tui/nmt-page-ip4.c:155 ../clients/tui/nmt-page-ip6.c:156
-+#: ../clients/tui/nmt-page-ip4.c:143 ../clients/tui/nmt-page-ip6.c:144
- msgid "Search domains"
- msgstr "검색 도메인 "
-
--#: ../clients/tui/nmt-page-ip4.c:170 ../clients/tui/nmt-page-ip6.c:169
-+#: ../clients/tui/nmt-page-ip4.c:158 ../clients/tui/nmt-page-ip6.c:157
- msgid "Routing"
- msgstr "라우팅 "
-
--#: ../clients/tui/nmt-page-ip4.c:172 ../clients/tui/nmt-page-ip6.c:171
-+#: ../clients/tui/nmt-page-ip4.c:160 ../clients/tui/nmt-page-ip6.c:159
- msgid "Never use this network for default route"
- msgstr "기본 라우팅으로 이 네트워크를 사용하지 않습니다 "
-
--#: ../clients/tui/nmt-page-ip4.c:178 ../clients/tui/nmt-page-ip6.c:177
-+#: ../clients/tui/nmt-page-ip4.c:166 ../clients/tui/nmt-page-ip6.c:165
- msgid "Ignore automatically obtained routes"
- msgstr "자동으로 가져온 라우팅을 무시합니다"
-
--#: ../clients/tui/nmt-page-ip4.c:184 ../clients/tui/nmt-page-ip6.c:183
-+#: ../clients/tui/nmt-page-ip4.c:172 ../clients/tui/nmt-page-ip6.c:171
- msgid "Ignore automatically obtained DNS parameters"
- msgstr "자동으로 얻은 DNS 매개 변수 무시"
-
--#: ../clients/tui/nmt-page-ip4.c:192
-+#: ../clients/tui/nmt-page-ip4.c:180
- msgid "Require IPv4 addressing for this connection"
- msgstr "이 연결에는 IPv4 주소 설정이 필요합니다 "
-
--#: ../clients/tui/nmt-page-ip6.c:37
-+#: ../clients/tui/nmt-page-ip6.c:25
- msgid "Ignore"
- msgstr "무시"
-
--#: ../clients/tui/nmt-page-ip6.c:39
-+#: ../clients/tui/nmt-page-ip6.c:27
- msgid "Automatic (DHCP-only)"
- msgstr "자동 (DHCP 전용)"
-
--#: ../clients/tui/nmt-page-ip6.c:128
-+#: ../clients/tui/nmt-page-ip6.c:116
- msgid "IPv6 CONFIGURATION"
- msgstr "IPv6 설정 "
-
--#: ../clients/tui/nmt-page-ip6.c:191
-+#: ../clients/tui/nmt-page-ip6.c:179
- msgid "Require IPv6 addressing for this connection"
- msgstr "이 연결에는 IPv6 주소 설정이 필요합니다 "
-
- #. The order must match the NM_IP_TUNNEL_MODE_* enum
--#: ../clients/tui/nmt-page-ip-tunnel.c:77
-+#: ../clients/tui/nmt-page-ip-tunnel.c:65
- msgid "IPIP"
- msgstr "IPIP"
-
--#: ../clients/tui/nmt-page-ip-tunnel.c:78
-+#: ../clients/tui/nmt-page-ip-tunnel.c:66
- msgid "GRE"
- msgstr "GRE"
-
--#: ../clients/tui/nmt-page-ip-tunnel.c:79
-+#: ../clients/tui/nmt-page-ip-tunnel.c:67
- msgid "SIT"
- msgstr "앉다"
-
--#: ../clients/tui/nmt-page-ip-tunnel.c:80
-+#: ../clients/tui/nmt-page-ip-tunnel.c:68
- msgid "ISATAP"
- msgstr "ISATAP"
-
--#: ../clients/tui/nmt-page-ip-tunnel.c:81
-+#: ../clients/tui/nmt-page-ip-tunnel.c:69
- msgid "VTI"
- msgstr "VTI"
-
--#: ../clients/tui/nmt-page-ip-tunnel.c:82
-+#: ../clients/tui/nmt-page-ip-tunnel.c:70
- msgid "IP6IP6"
- msgstr "IP6IP6"
-
--#: ../clients/tui/nmt-page-ip-tunnel.c:83
-+#: ../clients/tui/nmt-page-ip-tunnel.c:71
- msgid "IPIP6"
- msgstr "IPIP6"
-
--#: ../clients/tui/nmt-page-ip-tunnel.c:84
-+#: ../clients/tui/nmt-page-ip-tunnel.c:72
- msgid "IP6GRE"
- msgstr "IP6GRE"
-
--#: ../clients/tui/nmt-page-ip-tunnel.c:85
-+#: ../clients/tui/nmt-page-ip-tunnel.c:73
- msgid "VTI6"
- msgstr "VTI6"
-
--#: ../clients/tui/nmt-page-ip-tunnel.c:149 ../clients/tui/nmt-page-vlan.c:86
-+#: ../clients/tui/nmt-page-ip-tunnel.c:137 ../clients/tui/nmt-page-vlan.c:74
- msgid "Parent"
- msgstr "부모 "
-
--#: ../clients/tui/nmt-page-ip-tunnel.c:156
-+#: ../clients/tui/nmt-page-ip-tunnel.c:144
- msgid "Local IP"
- msgstr "로컬 IP"
-
--#: ../clients/tui/nmt-page-ip-tunnel.c:162
-+#: ../clients/tui/nmt-page-ip-tunnel.c:150
- msgid "Remote IP"
- msgstr "원격 ID(_R):"
-
--#: ../clients/tui/nmt-page-ip-tunnel.c:168
-+#: ../clients/tui/nmt-page-ip-tunnel.c:156
- msgid "Input key"
- msgstr "입력 키"
-
--#: ../clients/tui/nmt-page-ip-tunnel.c:175
-+#: ../clients/tui/nmt-page-ip-tunnel.c:163
- msgid "Output key"
- msgstr "출력 키"
-
--#: ../clients/tui/nmt-page-ppp.c:130
-+#: ../clients/tui/nmt-page-ppp.c:118
- msgid "PPP CONFIGURATION"
- msgstr "PPP 구성"
-
--#: ../clients/tui/nmt-page-ppp.c:139
-+#: ../clients/tui/nmt-page-ppp.c:127
- msgid "Allowed authentication methods:"
- msgstr "허용된 인증 방법:"
-
--#: ../clients/tui/nmt-page-ppp.c:146
-+#: ../clients/tui/nmt-page-ppp.c:134
- msgid "EAP"
- msgstr "EAP"
-
--#: ../clients/tui/nmt-page-ppp.c:154
-+#: ../clients/tui/nmt-page-ppp.c:142
- msgid "PAP"
- msgstr "PAP"
-
--#: ../clients/tui/nmt-page-ppp.c:162
-+#: ../clients/tui/nmt-page-ppp.c:150
- msgid "CHAP"
- msgstr "CHAP"
-
--#: ../clients/tui/nmt-page-ppp.c:170
-+#: ../clients/tui/nmt-page-ppp.c:158
- msgid "MSCHAPv2"
- msgstr "MSCHAPv2"
-
--#: ../clients/tui/nmt-page-ppp.c:178
-+#: ../clients/tui/nmt-page-ppp.c:166
- msgid "MSCHAP"
- msgstr "MSCHAP"
-
--#: ../clients/tui/nmt-page-ppp.c:194
-+#: ../clients/tui/nmt-page-ppp.c:182
- msgid "Use point-to-point encryption (MPPE)"
- msgstr "PTP(Point-to-Point) 암호화(MPPE) 사용"
-
--#: ../clients/tui/nmt-page-ppp.c:206
-+#: ../clients/tui/nmt-page-ppp.c:194
- msgid "Require 128-bit encryption"
- msgstr "128비트 암호화 요구"
-
--#: ../clients/tui/nmt-page-ppp.c:216
-+#: ../clients/tui/nmt-page-ppp.c:204
- msgid "Use stateful MPPE"
- msgstr "상태 저장 MPPE 사용"
-
--#: ../clients/tui/nmt-page-ppp.c:228
-+#: ../clients/tui/nmt-page-ppp.c:216
- msgid "Allow BSD data compression"
- msgstr "BSD 데이터 압축 허용"
-
--#: ../clients/tui/nmt-page-ppp.c:236
-+#: ../clients/tui/nmt-page-ppp.c:224
- msgid "Allow Deflate data compression"
- msgstr "Deflate 데이터 압축 허용"
-
--#: ../clients/tui/nmt-page-ppp.c:244
-+#: ../clients/tui/nmt-page-ppp.c:232
- msgid "Use TCP header compression"
- msgstr "TCP 헤더 압축 사용"
-
--#: ../clients/tui/nmt-page-ppp.c:254
-+#: ../clients/tui/nmt-page-ppp.c:242
- msgid "Send PPP echo packets"
- msgstr "PPP 에코 패킷 전송"
-
--#: ../clients/tui/nmt-page-team-port.c:91
-+#: ../clients/tui/nmt-page-team-port.c:79
- msgid "TEAM PORT"
- msgstr "팀 포트 "
-
--#: ../clients/tui/nmt-page-team-port.c:98 ../clients/tui/nmt-page-team.c:162
-+#: ../clients/tui/nmt-page-team-port.c:86 ../clients/tui/nmt-page-team.c:150
- msgid "JSON configuration"
- msgstr "JSON 설정 "
-
--#: ../clients/tui/nmt-page-team.c:144
-+#: ../clients/tui/nmt-page-team.c:132
- msgid "TEAM"
- msgstr "팀 "
-
--#: ../clients/tui/nmt-page-vlan.c:101
-+#: ../clients/tui/nmt-page-vlan.c:89
- msgid "VLAN id"
- msgstr "VLAN id"
-
--#: ../clients/tui/nmt-page-wifi.c:63
-+#: ../clients/tui/nmt-page-wifi.c:51
- msgctxt "Wi-Fi"
- msgid "Client"
- msgstr "클라이언트"
-
--#: ../clients/tui/nmt-page-wifi.c:64
-+#: ../clients/tui/nmt-page-wifi.c:52
- msgid "Access Point"
- msgstr "액세스 지점 "
-
--#: ../clients/tui/nmt-page-wifi.c:65
-+#: ../clients/tui/nmt-page-wifi.c:53
- msgid "Ad-Hoc Network"
- msgstr "애드혹 네트워크 "
-
--#: ../clients/tui/nmt-page-wifi.c:70
-+#: ../clients/tui/nmt-page-wifi.c:58
- msgctxt "Wi-Fi"
- msgid "Automatic"
- msgstr "자동 "
-
- #. 802.11a Wi-Fi network
--#: ../clients/tui/nmt-page-wifi.c:72
-+#: ../clients/tui/nmt-page-wifi.c:60
- msgid "A (5 GHz)"
- msgstr "A (5 GHz)"
-
- #. 802.11b / 802.11g Wi-Fi network
--#: ../clients/tui/nmt-page-wifi.c:74
-+#: ../clients/tui/nmt-page-wifi.c:62
- msgid "B/G (2.4 GHz)"
- msgstr "B/G (2.4 GHz)"
-
--#: ../clients/tui/nmt-page-wifi.c:79
-+#: ../clients/tui/nmt-page-wifi.c:67
- msgctxt "Wi-Fi security"
- msgid "None"
- msgstr "없음"
-
--#: ../clients/tui/nmt-page-wifi.c:80
-+#: ../clients/tui/nmt-page-wifi.c:68
- msgid "WPA & WPA2 Personal"
- msgstr "WPA 및 WPA2 개인용"
-
--#: ../clients/tui/nmt-page-wifi.c:81
-+#: ../clients/tui/nmt-page-wifi.c:69
-+msgid "WPA3 Personal"
-+msgstr "WPA3 개인"
-+
-+#: ../clients/tui/nmt-page-wifi.c:70
- msgid "WPA & WPA2 Enterprise"
- msgstr "WPA 및 WPA2 기업용"
-
--#: ../clients/tui/nmt-page-wifi.c:82
-+#: ../clients/tui/nmt-page-wifi.c:71
- msgid "WEP 40/128-bit Key (Hex or ASCII)"
- msgstr "WEP 40/128비트 키(16진수 또는 ASCII)"
-
--#: ../clients/tui/nmt-page-wifi.c:83
-+#: ../clients/tui/nmt-page-wifi.c:72
- msgid "WEP 128-bit Passphrase"
- msgstr "WEP 128비트 암호글"
-
--#: ../clients/tui/nmt-page-wifi.c:84
-+#: ../clients/tui/nmt-page-wifi.c:73
- msgid "Dynamic WEP (802.1x)"
- msgstr "동적 WEP (802.1x)"
-
--#: ../clients/tui/nmt-page-wifi.c:85
-+#: ../clients/tui/nmt-page-wifi.c:74
- msgid "LEAP"
- msgstr "LEAP"
-
--#: ../clients/tui/nmt-page-wifi.c:90
-+#: ../clients/tui/nmt-page-wifi.c:75
-+msgid "Enhanced Open (OWE)"
-+msgstr "강화 된 개방 (OWE)"
-+
-+#: ../clients/tui/nmt-page-wifi.c:80
- msgctxt "WEP key index"
- msgid "1 (Default)"
- msgstr "1 (기본값)"
-
--#: ../clients/tui/nmt-page-wifi.c:91
-+#: ../clients/tui/nmt-page-wifi.c:81
- msgctxt "WEP key index"
- msgid "2"
- msgstr "2"
-
--#: ../clients/tui/nmt-page-wifi.c:92
-+#: ../clients/tui/nmt-page-wifi.c:82
- msgctxt "WEP key index"
- msgid "3"
- msgstr "3"
-
--#: ../clients/tui/nmt-page-wifi.c:93
-+#: ../clients/tui/nmt-page-wifi.c:83
- msgctxt "WEP key index"
- msgid "4"
- msgstr "4"
-
--#: ../clients/tui/nmt-page-wifi.c:98
-+#: ../clients/tui/nmt-page-wifi.c:88
- msgid "Open System"
- msgstr "공개 시스템"
-
--#: ../clients/tui/nmt-page-wifi.c:99
-+#: ../clients/tui/nmt-page-wifi.c:89
- msgid "Shared Key"
- msgstr "공유 키"
-
--#: ../clients/tui/nmt-page-wifi.c:213
-+#: ../clients/tui/nmt-page-wifi.c:203
- msgid "WI-FI"
- msgstr "WI-FI"
-
--#: ../clients/tui/nmt-page-wifi.c:255
-+#: ../clients/tui/nmt-page-wifi.c:245
- msgid "Channel"
- msgstr "채널"
-
--#: ../clients/tui/nmt-page-wifi.c:260
--msgid "Security"
--msgstr "보안"
--
- #. "wpa-enterprise"
- #. FIXME
--#: ../clients/tui/nmt-page-wifi.c:281
-+#: ../clients/tui/nmt-page-wifi.c:272
- msgid "(No support for wpa-enterprise yet...)"
- msgstr "(WPA 기업용은 아직 지원하지 않습니다...)"
-
--#: ../clients/tui/nmt-page-wifi.c:291 ../clients/tui/nmt-page-wifi.c:310
-+#: ../clients/tui/nmt-page-wifi.c:282 ../clients/tui/nmt-page-wifi.c:301
- msgid "WEP index"
- msgstr "WEP 인덱스"
-
--#: ../clients/tui/nmt-page-wifi.c:299 ../clients/tui/nmt-page-wifi.c:318
-+#: ../clients/tui/nmt-page-wifi.c:290 ../clients/tui/nmt-page-wifi.c:309
- msgid "Authentication"
- msgstr "인증"
-
- #. "dynamic-wep"
- #. FIXME
--#: ../clients/tui/nmt-page-wifi.c:324
-+#: ../clients/tui/nmt-page-wifi.c:315
- msgid "(No support for dynamic-wep yet...)"
- msgstr "(동적 WEP는 아직 지원하지 않습니다...) "
-
--#: ../clients/tui/nmt-page-wifi.c:357
-+#: ../clients/tui/nmt-page-wifi.c:348
- msgid "BSSID"
- msgstr "BSSID"
-
--#: ../clients/tui/nmt-password-fields.c:127
-+#: ../clients/tui/nmt-password-fields.c:115
- msgid "Ask for this password every time"
- msgstr "매번 이 암호 물어보기"
-
--#: ../clients/tui/nmt-password-fields.c:128
-+#: ../clients/tui/nmt-password-fields.c:116
- msgid "Show password"
- msgstr "암호 표시 "
-
--#: ../clients/tui/nmt-route-table.c:186
-+#: ../clients/tui/nmt-route-table.c:174
- msgid "Destination"
- msgstr "대상 "
-
--#: ../clients/tui/nmt-route-table.c:186
-+#: ../clients/tui/nmt-route-table.c:174
- msgid "Prefix"
- msgstr "접두부"
-
--#: ../clients/tui/nmt-route-table.c:195
-+#: ../clients/tui/nmt-route-table.c:183
- msgid "Next Hop"
- msgstr "다음 홉 "
-
--#: ../clients/tui/nmt-route-table.c:203
-+#: ../clients/tui/nmt-route-table.c:191
- msgid "Metric"
- msgstr "메트릭"
-
--#: ../clients/tui/nmt-route-table.c:223
-+#: ../clients/tui/nmt-route-table.c:211
- msgid "No custom routes are defined."
- msgstr "사용자 지정 경로가 정의되어 있지 않습니다."
-
--#: ../clients/tui/nmt-slave-list.c:133
-+#: ../clients/tui/nmt-slave-list.c:121
- msgid "Select the type of slave connection you wish to add."
- msgstr "추가하고자 하는 슬레이브 연결 유형을 선택합니다."
-
--#: ../clients/tui/nmt-widget-list.c:138
-+#: ../clients/tui/nmt-widget-list.c:126
- msgid "Add..."
- msgstr "추가..."
-
--#: ../clients/tui/nmt-widget-list.c:201
-+#: ../clients/tui/nmt-widget-list.c:189
- msgid "Remove"
- msgstr "삭제"
-
--#: ../clients/tui/nmtui-connect.c:54
-+#: ../clients/tui/nmtui-connect.c:42
- msgid ""
- "openconnect will be run to authenticate.\n"
- "It will return to nmtui when completed."
- msgstr "인증을 위해 openconnect를 실행합니다.\n"
- "완료 시 nmtui로 돌아갑니다."
-
--#: ../clients/tui/nmtui-connect.c:68
-+#: ../clients/tui/nmtui-connect.c:56
- #, c-format
- msgid "Error: openconnect failed: %s"
- msgstr "오류: openconnect 실패: %s"
-
--#: ../clients/tui/nmtui-connect.c:75
-+#: ../clients/tui/nmtui-connect.c:63
- #, c-format
- msgid "openconnect failed with status %d"
- msgstr "openconnect에 실패했습니다(상태 %d)."
-
--#: ../clients/tui/nmtui-connect.c:79
-+#: ../clients/tui/nmtui-connect.c:67
- #, c-format
- msgid "openconnect failed with signal %d"
- msgstr "openconnect에 실패했습니다(신호 %d)."
-
--#: ../clients/tui/nmtui-connect.c:182
--#, fuzzy, c-format
-+#: ../clients/tui/nmtui-connect.c:170
-+#, c-format
- msgid "Activation failed: %s"
--msgstr "활성화 실패"
-+msgstr "활성화 실패 : %s"
-+
-+#: ../clients/tui/nmtui-connect.c:230
-+#, c-format
-+msgid "Could not deactivate connection: %s"
-+msgstr "연결을 비활성화 할 수 없습니다 : %s"
-
--#: ../clients/tui/nmtui-connect.c:253
-+#: ../clients/tui/nmtui-connect.c:252
- msgid "Connecting..."
- msgstr "연결 중..."
-
--#: ../clients/tui/nmtui-connect.c:291 ../clients/tui/nmtui-connect.c:328
-+#: ../clients/tui/nmtui-connect.c:290 ../clients/tui/nmtui-connect.c:327
- #, c-format
- msgid "Could not activate connection: %s"
- msgstr "연결을 활성화할 수 없음: %s"
-
--#: ../clients/tui/nmtui-connect.c:390 ../clients/tui/nmtui-connect.c:439
-+#: ../clients/tui/nmtui-connect.c:389 ../clients/tui/nmtui-connect.c:438
- msgid "Activate"
- msgstr "활성화"
-
--#: ../clients/tui/nmtui-connect.c:392
-+#: ../clients/tui/nmtui-connect.c:391
- msgid "Deactivate"
- msgstr "비활성화 "
-
--#: ../clients/tui/nmtui-connect.c:444 ../clients/tui/nmtui-edit.c:117
--#: ../clients/tui/nmtui.c:127
-+#: ../clients/tui/nmtui-connect.c:443 ../clients/tui/nmtui-edit.c:105
-+#: ../clients/tui/nmtui.c:117
- msgid "Quit"
- msgstr "종료 "
-
--#: ../clients/tui/nmtui-connect.c:444 ../clients/tui/nmtui-edit.c:117
-+#: ../clients/tui/nmtui-connect.c:443 ../clients/tui/nmtui-edit.c:105
- msgid "Back"
- msgstr "뒤로"
-
--#: ../clients/tui/nmtui-connect.c:467
-+#: ../clients/tui/nmtui-connect.c:466
- #, c-format
- msgid "No such connection '%s'"
- msgstr "해당 연결 '%s'이 없습니다 "
-
--#: ../clients/tui/nmtui-connect.c:469
-+#: ../clients/tui/nmtui-connect.c:468
- msgid "Connection is already active"
- msgstr "연결이 이미 활성화되어 있습니다 "
-
--#: ../clients/tui/nmtui-edit.c:227
-+#: ../clients/tui/nmtui-edit.c:215
- msgid "Create"
- msgstr "생성 "
-
--#: ../clients/tui/nmtui-edit.c:369
-+#: ../clients/tui/nmtui-edit.c:357
- msgid "Select the type of connection you wish to create."
- msgstr "생성하고자 하는 연결 유형을 선택합니다."
-
--#: ../clients/tui/nmtui-edit.c:377
-+#: ../clients/tui/nmtui-edit.c:365
- msgid ""
- "If you are creating a VPN, and the VPN connection you wish to create does "
- "not appear in the list, you may not have the correct VPN plugin installed."
- msgstr "VPN을 생성할 경우 생성하고자 하는 VPN 연결은 목록에 표시되지 않으므로 올바른 VPN 플러그인을 설치할 수 없습니다."
-
--#: ../clients/tui/nmtui-edit.c:413 ../clients/tui/nmtui-edit.c:429
-+#: ../clients/tui/nmtui-edit.c:401 ../clients/tui/nmtui-edit.c:417
- msgid "New Connection"
- msgstr "새 연결 "
-
--#: ../clients/tui/nmtui-edit.c:468
-+#: ../clients/tui/nmtui-edit.c:456
- #, c-format
- msgid "Unable to delete connection: %s"
- msgstr "연결을 삭제할 수 없음: %s"
-
--#: ../clients/tui/nmtui-edit.c:507
-+#: ../clients/tui/nmtui-edit.c:495
- #, c-format
- msgid "Could not delete connection '%s': %s"
- msgstr "연결 '%s'을(를) 삭제할 수 없음: %s"
-
--#: ../clients/tui/nmtui-edit.c:529
-+#: ../clients/tui/nmtui-edit.c:517
- #, c-format
- msgid "Are you sure you want to delete the connection '%s'?"
- msgstr "정말로 연결 '%s'을 삭제하시겠습니까?"
-
--#: ../clients/tui/nmtui-hostname.c:44
-+#: ../clients/tui/nmtui-hostname.c:32
- msgid "Set Hostname"
- msgstr "호스트 이름 설정 "
-
--#: ../clients/tui/nmtui-hostname.c:52
-+#: ../clients/tui/nmtui-hostname.c:40
- msgid "Hostname"
- msgstr "호스트 이름 "
-
- #. TRANSLATORS: this indicates the result. ie, "I have set the hostname to ..."
--#: ../clients/tui/nmtui-hostname.c:115
-+#: ../clients/tui/nmtui-hostname.c:103
- #, c-format
- msgid "Set hostname to '%s'"
- msgstr "호스트 이름을 '%s'로 설정 "
-
--#: ../clients/tui/nmtui-hostname.c:117
-+#: ../clients/tui/nmtui-hostname.c:105
- #, c-format
- msgid "Unable to set hostname: %s"
- msgstr "호스트 이름을 설정할 수 없음: %s"
-
--#: ../clients/tui/nmtui.c:50 ../clients/tui/nmtui.c:53
-+#: ../clients/tui/nmtui.c:40 ../clients/tui/nmtui.c:43
- msgid "connection"
- msgstr "연결 "
-
--#: ../clients/tui/nmtui.c:51
-+#: ../clients/tui/nmtui.c:41
- msgid "Edit a connection"
- msgstr "연결 편집 "
-
--#: ../clients/tui/nmtui.c:54
-+#: ../clients/tui/nmtui.c:44
- msgid "Activate a connection"
- msgstr "연결 활성화 "
-
--#: ../clients/tui/nmtui.c:56
-+#: ../clients/tui/nmtui.c:46
- msgid "new hostname"
- msgstr "새 호스트 이름 "
-
--#: ../clients/tui/nmtui.c:57
-+#: ../clients/tui/nmtui.c:47
- msgid "Set system hostname"
- msgstr "시스템의 호스트 이름 설정 "
-
--#: ../clients/tui/nmtui.c:101
-+#: ../clients/tui/nmtui.c:91
- msgid "NetworkManager TUI"
- msgstr "NetworkManager TUI"
-
--#: ../clients/tui/nmtui.c:109
-+#: ../clients/tui/nmtui.c:99
- msgid "Please select an option"
- msgstr "옵션을 선택하십시오 "
-
--#: ../clients/tui/nmtui.c:157
-+#: ../clients/tui/nmtui.c:147
- msgid "Usage"
- msgstr "사용법 "
-
--#: ../clients/tui/nmtui.c:238
-+#: ../clients/tui/nmtui.c:228
- msgid "Could not parse arguments"
- msgstr "인자를 해석할 수 없습니다"
-
--#: ../clients/tui/nmtui.c:248
-+#: ../clients/tui/nmtui.c:241
- #, c-format
- msgid "Could not contact NetworkManager: %s.\n"
- msgstr "NetworkManager에 접속할 수 없음: %s.\n"
-
--#: ../clients/tui/nmtui.c:253
--msgid "NetworkManager is not running."
--msgstr "NetworkManager가 실행되고 있지 않습니다."
--
--#: ../libnm-core/nm-crypto.c:219
-+#: ../libnm-core/nm-crypto.c:204
- #, c-format
- msgid "PEM key file had no start tag"
- msgstr "PEM 키 파일에 끝 태그 ''이(가) 없습니다."
-
--#: ../libnm-core/nm-crypto.c:227
-+#: ../libnm-core/nm-crypto.c:212
- #, c-format
- msgid "PEM key file had no end tag '%s'."
- msgstr "PEM 키 파일에 끝 태그 '%s'이(가) 없습니다."
-
--#: ../libnm-core/nm-crypto.c:254
-+#: ../libnm-core/nm-crypto.c:239
- #, c-format
- msgid "Malformed PEM file: Proc-Type was not first tag."
- msgstr "잘못된 형태의 PEM 파일: Proc-Type이 첫번째 태그가 아닙니다."
-
--#: ../libnm-core/nm-crypto.c:262
-+#: ../libnm-core/nm-crypto.c:247
- #, c-format
- msgid "Malformed PEM file: unknown Proc-Type tag '%s'."
- msgstr "잘못된 형태의 PEM 파일: 알려져 있지 않은 Proc-Type 태그 '%s'."
-
--#: ../libnm-core/nm-crypto.c:274
-+#: ../libnm-core/nm-crypto.c:259
- #, c-format
- msgid "Malformed PEM file: DEK-Info was not the second tag."
- msgstr "잘못된 형태의 PEM 파일: DEK-Info가 두번째 태그가 아님."
-
--#: ../libnm-core/nm-crypto.c:285
-+#: ../libnm-core/nm-crypto.c:270
- #, c-format
- msgid "Malformed PEM file: no IV found in DEK-Info tag."
- msgstr "잘못된 형태의 PEM 파일: IV를 DEK-Info 태그에서 찾을 수 없음."
-
--#: ../libnm-core/nm-crypto.c:293
-+#: ../libnm-core/nm-crypto.c:278
- #, c-format
- msgid "Malformed PEM file: invalid format of IV in DEK-Info tag."
- msgstr "잘못된 형태의 PEM 파일: DEK-Info 태그안에 잘못된 형태의 IV가 있음."
-
--#: ../libnm-core/nm-crypto.c:304
-+#: ../libnm-core/nm-crypto.c:289
- #, c-format
- msgid "Malformed PEM file: unknown private key cipher '%s'."
- msgstr "잘못된 형태의 PEM 파일: 알려져 있지 않은 비밀 키 암호화 방법 '%s'."
-
--#: ../libnm-core/nm-crypto.c:325
-+#: ../libnm-core/nm-crypto.c:310
- #, c-format
- msgid "Could not decode private key."
- msgstr "비밀 키를 해독할 수 없습니다."
-
--#: ../libnm-core/nm-crypto.c:366
-+#: ../libnm-core/nm-crypto.c:351
- msgid "Failed to find expected PKCS#8 start tag."
- msgstr "예상된 PKCS#8 시작 태그를 찾는데 실패하였습니다."
-
--#: ../libnm-core/nm-crypto.c:374
-+#: ../libnm-core/nm-crypto.c:359
- #, c-format
- msgid "Failed to find expected PKCS#8 end tag '%s'."
- msgstr "예상된 PKCS#8 종료 태그 '%s' 를 찾는데 실패하였습니다."
-
--#: ../libnm-core/nm-crypto.c:386
-+#: ../libnm-core/nm-crypto.c:371
- msgid "Failed to decode PKCS#8 private key."
- msgstr "PKCS#8 개 키를 해독하는 데 실패했습니다."
-
--#: ../libnm-core/nm-crypto.c:415
--#, fuzzy
-+#: ../libnm-core/nm-crypto.c:400
- msgid "Failed to find expected TSS start tag."
--msgstr "예상된 PKCS#8 시작 태그를 찾는데 실패하였습니다."
-+msgstr "예상되는 TSS 시작 태그를 찾지 못했습니다."
-
--#: ../libnm-core/nm-crypto.c:423
--#, fuzzy, c-format
-+#: ../libnm-core/nm-crypto.c:408
-+#, c-format
- msgid "Failed to find expected TSS end tag '%s'."
--msgstr "예상된 PKCS#8 종료 태그 '%s' 를 찾는데 실패하였습니다."
-+msgstr "예상 TSS 종료 태그 '를 찾지 못했습니다. %s '."
-
--#: ../libnm-core/nm-crypto.c:482
-+#: ../libnm-core/nm-crypto.c:468
- #, c-format
- msgid "IV must be an even number of bytes in length."
- msgstr "IV의 길이는 짝수여야만 합니다."
-
--#: ../libnm-core/nm-crypto.c:498
-+#: ../libnm-core/nm-crypto.c:484
- #, c-format
- msgid "IV contains non-hexadecimal digits."
- msgstr "IV에 16진수 숫자가 아닌 문자가 있습니다."
-
--#: ../libnm-core/nm-crypto.c:574
--#, fuzzy, c-format
-+#: ../libnm-core/nm-crypto.c:560
-+#, c-format
- msgid "IV must contain at least 8 characters"
--msgstr "IV에 16진수 숫자가 아닌 문자가 있습니다."
-+msgstr "IV는 8 자 이상이어야합니다"
-
--#: ../libnm-core/nm-crypto.c:622
-+#: ../libnm-core/nm-crypto.c:608
- #, c-format
- msgid "Unable to determine private key type."
- msgstr "비밀 키 유형을 결정할 수 없습니다."
-
--#: ../libnm-core/nm-crypto.c:634
-+#: ../libnm-core/nm-crypto.c:620
- #, c-format
- msgid "Password provided, but key was not encrypted."
- msgstr "암호가 제공되었지만 키가 암호화되지 않았습니다."
-
--#: ../libnm-core/nm-crypto.c:695
-+#: ../libnm-core/nm-crypto.c:681
- #, c-format
- msgid "PEM certificate had no start tag '%s'."
- msgstr "PEM 인증서에 시작 태그 '%s'이(가) 없습니다."
-
--#: ../libnm-core/nm-crypto.c:704
-+#: ../libnm-core/nm-crypto.c:690
- #, c-format
- msgid "PEM certificate had no end tag '%s'."
- msgstr "PEM 인증서에 끝 태그 '%s'이(가) 없습니다."
-
--#: ../libnm-core/nm-crypto.c:716
-+#: ../libnm-core/nm-crypto.c:702
- #, c-format
- msgid "Failed to decode certificate."
- msgstr "인증서 해독에 실패했습니다."
-
--#: ../libnm-core/nm-crypto.c:745 ../libnm-core/nm-crypto.c:798
-+#: ../libnm-core/nm-crypto.c:731 ../libnm-core/nm-crypto.c:784
- #, c-format
- msgid "Certificate file is empty"
- msgstr "인증서 파일이 비어 있습니다."
-
--#: ../libnm-core/nm-crypto.c:778
--#, fuzzy, c-format
-+#: ../libnm-core/nm-crypto.c:764
-+#, c-format
- msgid "Failed to recognize certificate"
--msgstr "인증서 해독에 실패했습니다."
-+msgstr "인증서를 인식하지 못했습니다"
-
--#: ../libnm-core/nm-crypto.c:890
--#, fuzzy, c-format
-+#: ../libnm-core/nm-crypto.c:876
-+#, c-format
- msgid "not a valid private key"
--msgstr "잘못된 개인 키"
-+msgstr "유효한 개인 키가 없습니다"
-
--#: ../libnm-core/nm-crypto-gnutls.c:74
-+#: ../libnm-core/nm-crypto-gnutls.c:58
- msgid "Failed to initialize the crypto engine."
- msgstr "암호화 엔진을 초기화하는 데 실패했습니다."
-
--#: ../libnm-core/nm-crypto-gnutls.c:106 ../libnm-core/nm-crypto-nss.c:127
-+#: ../libnm-core/nm-crypto-gnutls.c:90 ../libnm-core/nm-crypto-nss.c:114
- #, c-format
- msgid "Unsupported key cipher for decryption"
- msgstr "해독을 위해 지원되지 않는 키 암호"
-
--#: ../libnm-core/nm-crypto-gnutls.c:116 ../libnm-core/nm-crypto-nss.c:134
-+#: ../libnm-core/nm-crypto-gnutls.c:100 ../libnm-core/nm-crypto-nss.c:121
- #, c-format
- msgid "Invalid IV length (must be at least %u)."
- msgstr "잘못된 IV 길이입니다(최소한 %u 이상이어야 함)."
-
--#: ../libnm-core/nm-crypto-gnutls.c:133
-+#: ../libnm-core/nm-crypto-gnutls.c:117
- #, c-format
- msgid "Failed to initialize the decryption cipher context: %s (%s)"
- msgstr "해독 암호 컨텍스트 초기화 실패: %s (%s)"
-
--#: ../libnm-core/nm-crypto-gnutls.c:145
-+#: ../libnm-core/nm-crypto-gnutls.c:129
- #, c-format
- msgid "Failed to decrypt the private key: %s (%s)"
- msgstr "개인 키 해독 실패: %s (%s)"
-
--#: ../libnm-core/nm-crypto-gnutls.c:159 ../libnm-core/nm-crypto-nss.c:221
-+#: ../libnm-core/nm-crypto-gnutls.c:143 ../libnm-core/nm-crypto-nss.c:208
- #, c-format
- msgid "Failed to decrypt the private key: unexpected padding length."
- msgstr "비밀 키를 해독하는 데 실패했습니다: 예기치 못한 패딩 길이."
-
--#: ../libnm-core/nm-crypto-gnutls.c:170 ../libnm-core/nm-crypto-nss.c:232
-+#: ../libnm-core/nm-crypto-gnutls.c:154 ../libnm-core/nm-crypto-nss.c:219
- #, c-format
- msgid "Failed to decrypt the private key."
- msgstr "비밀 키를 해독하는 데 실패했습니다."
-
--#: ../libnm-core/nm-crypto-gnutls.c:204 ../libnm-core/nm-crypto-nss.c:287
-+#: ../libnm-core/nm-crypto-gnutls.c:188 ../libnm-core/nm-crypto-nss.c:274
- #, c-format
- msgid "Unsupported key cipher for encryption"
- msgstr "암호화를 위해 지원되지 않는 키 암호"
-
--#: ../libnm-core/nm-crypto-gnutls.c:220
-+#: ../libnm-core/nm-crypto-gnutls.c:204
- #, c-format
- msgid "Failed to initialize the encryption cipher context: %s (%s)"
- msgstr "암호화 암호 컨텍스트 초기화 실패: %s (%s)"
-
--#: ../libnm-core/nm-crypto-gnutls.c:246
-+#: ../libnm-core/nm-crypto-gnutls.c:230
- #, c-format
- msgid "Failed to encrypt the data: %s (%s)"
- msgstr "데이터 암호화 실패: %s (%s)"
-
--#: ../libnm-core/nm-crypto-gnutls.c:271
-+#: ../libnm-core/nm-crypto-gnutls.c:255
- #, c-format
- msgid "Error initializing certificate data: %s"
- msgstr "인증서 정보를 초기화하는 중 오류가 발생했습니다: %s"
-
--#: ../libnm-core/nm-crypto-gnutls.c:293
-+#: ../libnm-core/nm-crypto-gnutls.c:277
- #, c-format
- msgid "Couldn't decode certificate: %s"
- msgstr "인증서를 해독할 수 없습니다: %s"
-
--#: ../libnm-core/nm-crypto-gnutls.c:320
-+#: ../libnm-core/nm-crypto-gnutls.c:304
- #, c-format
- msgid "Couldn't initialize PKCS#12 decoder: %s"
- msgstr "PKCS#12 복호기를 초기화할 수 없습니다: %s"
-
--#: ../libnm-core/nm-crypto-gnutls.c:333
-+#: ../libnm-core/nm-crypto-gnutls.c:317
- #, c-format
- msgid "Couldn't decode PKCS#12 file: %s"
- msgstr "PKCS#12 파일을 복호화할 수 없습니다: %s"
-
--#: ../libnm-core/nm-crypto-gnutls.c:347
-+#: ../libnm-core/nm-crypto-gnutls.c:331
- #, c-format
- msgid "Couldn't verify PKCS#12 file: %s"
- msgstr "PKCS#12 파일을 검증할 수 없습니다: %s"
-
--#: ../libnm-core/nm-crypto-gnutls.c:375
-+#: ../libnm-core/nm-crypto-gnutls.c:359
- #, c-format
- msgid "Couldn't initialize PKCS#8 decoder: %s"
- msgstr "PKCS#12 복호기를 초기화할 수 없습니다: %s"
-
--#: ../libnm-core/nm-crypto-gnutls.c:402
-+#: ../libnm-core/nm-crypto-gnutls.c:386
- #, c-format
- msgid "Couldn't decode PKCS#8 file: %s"
- msgstr "PKCS#12 파일을 해독할 수 없습니다: %s"
-
--#: ../libnm-core/nm-crypto-nss.c:80
-+#: ../libnm-core/nm-crypto-nss.c:67
- #, c-format
- msgid "Failed to initialize the crypto engine: %d."
- msgstr "암호화 엔진을 초기화하는 데 실패했습니다: %d."
-
--#: ../libnm-core/nm-crypto-nss.c:146
-+#: ../libnm-core/nm-crypto-nss.c:133
- #, c-format
- msgid "Failed to initialize the decryption cipher slot."
- msgstr "해독용 암호 슬롯을 할당하는 데 실패했습니다."
-
--#: ../libnm-core/nm-crypto-nss.c:156
-+#: ../libnm-core/nm-crypto-nss.c:143
- #, c-format
- msgid "Failed to set symmetric key for decryption."
- msgstr "해독을 위한 대칭키를 설정하는 데 실패했습니다."
-
--#: ../libnm-core/nm-crypto-nss.c:166
-+#: ../libnm-core/nm-crypto-nss.c:153
- #, c-format
- msgid "Failed to set IV for decryption."
- msgstr "해독을 위한 IV를 설정하는 데 실패했습니다."
-
--#: ../libnm-core/nm-crypto-nss.c:174
-+#: ../libnm-core/nm-crypto-nss.c:161
- #, c-format
- msgid "Failed to initialize the decryption context."
- msgstr "해독 문맥을 초기화하는 데 실패했습니다."
-
--#: ../libnm-core/nm-crypto-nss.c:190
-+#: ../libnm-core/nm-crypto-nss.c:177
- #, c-format
- msgid "Failed to decrypt the private key: %d."
- msgstr "비밀 키를 해독하는 데 실패했습니다: %d."
-
--#: ../libnm-core/nm-crypto-nss.c:198
-+#: ../libnm-core/nm-crypto-nss.c:185
- #, c-format
- msgid "Failed to decrypt the private key: decrypted data too large."
- msgstr "비밀 키를 해독하는 데 실패했습니다: 해독 데이터가 너무 큽니다."
-
--#: ../libnm-core/nm-crypto-nss.c:209
-+#: ../libnm-core/nm-crypto-nss.c:196
- #, c-format
- msgid "Failed to finalize decryption of the private key: %d."
- msgstr "비밀 키의 해독을 마무리하는 데 실패했습니다: %d."
-
--#: ../libnm-core/nm-crypto-nss.c:298
-+#: ../libnm-core/nm-crypto-nss.c:285
- #, c-format
- msgid "Failed to initialize the encryption cipher slot."
- msgstr "암호화 암호 슬롯을 초기화하는 데 실패했습니다."
-
--#: ../libnm-core/nm-crypto-nss.c:306
-+#: ../libnm-core/nm-crypto-nss.c:293
- #, c-format
- msgid "Failed to set symmetric key for encryption."
- msgstr "암호화를 위한 대칭키를 설정하는 데 실패했습니다."
-
--#: ../libnm-core/nm-crypto-nss.c:314
-+#: ../libnm-core/nm-crypto-nss.c:301
- #, c-format
- msgid "Failed to set IV for encryption."
- msgstr "암호화를 위한 IV를 설정하는 데 실패했습니다."
-
--#: ../libnm-core/nm-crypto-nss.c:322
-+#: ../libnm-core/nm-crypto-nss.c:309
- #, c-format
- msgid "Failed to initialize the encryption context."
- msgstr "암호화 문맥을 초기화하는 데 실패했습니다."
-
--#: ../libnm-core/nm-crypto-nss.c:345
-+#: ../libnm-core/nm-crypto-nss.c:332
- #, c-format
- msgid "Failed to encrypt: %d."
- msgstr "암호화에 실패했습니다: %d."
-
--#: ../libnm-core/nm-crypto-nss.c:353
-+#: ../libnm-core/nm-crypto-nss.c:340
- #, c-format
- msgid "Unexpected amount of data after encrypting."
- msgstr "암호화 후 데이터 크기가 예상과 다릅니다."
-
--#: ../libnm-core/nm-crypto-nss.c:391
-+#: ../libnm-core/nm-crypto-nss.c:378
- #, c-format
- msgid "Couldn't decode certificate: %d"
- msgstr "인증서를 복호화할 수 없습니다: %d."
-
--#: ../libnm-core/nm-crypto-nss.c:437
-+#: ../libnm-core/nm-crypto-nss.c:424
- #, c-format
- msgid "Password must be UTF-8"
- msgstr "암호는 UTF-8이어야 합니다"
-
--#: ../libnm-core/nm-crypto-nss.c:460
-+#: ../libnm-core/nm-crypto-nss.c:447
- #, c-format
- msgid "Couldn't initialize slot"
- msgstr "PKCS#12 복호기를 초기화할 수 없습니다: "
-
--#: ../libnm-core/nm-crypto-nss.c:468
-+#: ../libnm-core/nm-crypto-nss.c:455
- #, c-format
- msgid "Couldn't initialize PKCS#12 decoder: %d"
- msgstr "PKCS#12 복호기를 초기화할 수 없습니다: %d"
-
--#: ../libnm-core/nm-crypto-nss.c:477
-+#: ../libnm-core/nm-crypto-nss.c:464
- #, c-format
- msgid "Couldn't decode PKCS#12 file: %d"
- msgstr "PKCS#12 파일을 복호화할 수 없습니다: %d"
-
--#: ../libnm-core/nm-crypto-nss.c:486
-+#: ../libnm-core/nm-crypto-nss.c:473
- #, c-format
- msgid "Couldn't verify PKCS#12 file: %d"
- msgstr "PKCS#12 파일을 검증할 수 없습니다: %d"
-
--#: ../libnm-core/nm-crypto-nss.c:536
-+#: ../libnm-core/nm-crypto-nss.c:523
- msgid "Could not generate random data."
- msgstr "랜덤 데이터를 생성할 수 없습니다."
-
--#: ../libnm-core/nm-connection.c:320
-+#: ../libnm-core/nm-connection.c:306
- msgid "wrong type; should be a list of strings."
- msgstr "잘못된 유형입니다. 문자열 목록이어야 합니다."
-
--#: ../libnm-core/nm-connection.c:390
-+#: ../libnm-core/nm-connection.c:376
- msgid "unknown setting name"
- msgstr "알 수 없는 설정 이름"
-
--#: ../libnm-core/nm-connection.c:402
-+#: ../libnm-core/nm-connection.c:388
- msgid "duplicate setting name"
- msgstr "중복 설정 이름"
-
--#: ../libnm-core/nm-connection.c:1414
-+#: ../libnm-core/nm-connection.c:1424
- msgid "setting not found"
- msgstr "설정을 찾을 수 없습니다"
-
--#: ../libnm-core/nm-connection.c:1480 ../libnm-core/nm-connection.c:1505
--#: ../libnm-core/nm-connection.c:1530
-+#: ../libnm-core/nm-connection.c:1476 ../libnm-core/nm-connection.c:1501
-+#: ../libnm-core/nm-connection.c:1526
- msgid "setting is required for non-slave connections"
- msgstr "비 슬레이브 연결에 설정이 필요합니다"
-
--#: ../libnm-core/nm-connection.c:1493 ../libnm-core/nm-connection.c:1518
--#: ../libnm-core/nm-connection.c:1543
-+#: ../libnm-core/nm-connection.c:1489 ../libnm-core/nm-connection.c:1514
-+#: ../libnm-core/nm-connection.c:1539
- msgid "setting not allowed in slave connection"
- msgstr "슬레이브 연결에서는 설정이 허용되지 않습니다."
-
--#: ../libnm-core/nm-connection.c:1647
-+#: ../libnm-core/nm-connection.c:1644
- msgid "Unexpected failure to normalize the connection"
- msgstr "연결을 정규화하는 데 예상치 못한 오류가 발생했습니다."
-
--#: ../libnm-core/nm-connection.c:1710
-+#: ../libnm-core/nm-connection.c:1707
- msgid "Unexpected failure to verify the connection"
- msgstr "연결을 확인하는 데 예상치 못한 오류가 발생했습니다."
-
--#: ../libnm-core/nm-connection.c:1746
-+#: ../libnm-core/nm-connection.c:1743
- #, c-format
- msgid "unexpected uuid %s instead of %s"
--msgstr ""
--
--#: ../libnm-core/nm-connection.c:2599 ../libnm-core/nm-setting-8021x.c:2567
--#: ../libnm-core/nm-setting-8021x.c:2584 ../libnm-core/nm-setting-8021x.c:2615
--#: ../libnm-core/nm-setting-8021x.c:2632 ../libnm-core/nm-setting-8021x.c:2674
--#: ../libnm-core/nm-setting-8021x.c:2686 ../libnm-core/nm-setting-8021x.c:2704
--#: ../libnm-core/nm-setting-8021x.c:2716 ../libnm-core/nm-setting-8021x.c:2740
--#: ../libnm-core/nm-setting-8021x.c:2822 ../libnm-core/nm-setting-adsl.c:172
--#: ../libnm-core/nm-setting-bluetooth.c:123
--#: ../libnm-core/nm-setting-bluetooth.c:181
--#: ../libnm-core/nm-setting-bluetooth.c:195 ../libnm-core/nm-setting-cdma.c:142
--#: ../libnm-core/nm-setting-connection.c:968
--#: ../libnm-core/nm-setting-connection.c:1011
--#: ../libnm-core/nm-setting-connection.c:1191
--#: ../libnm-core/nm-setting-ip-config.c:4905
--#: ../libnm-core/nm-setting-ip-tunnel.c:373
--#: ../libnm-core/nm-setting-olpc-mesh.c:98
--#: ../libnm-core/nm-setting-ovs-patch.c:91 ../libnm-core/nm-setting-pppoe.c:144
--#: ../libnm-core/nm-setting-vpn.c:530 ../libnm-core/nm-setting-vxlan.c:337
--#: ../libnm-core/nm-setting-wifi-p2p.c:136 ../libnm-core/nm-setting-wimax.c:108
--#: ../libnm-core/nm-setting-wireless-security.c:917
--#: ../libnm-core/nm-setting-wireless.c:776
-+msgstr "예기치 않은 UUID %s 대신에 %s"
-+
-+#: ../libnm-core/nm-connection.c:2569 ../libnm-core/nm-setting-8021x.c:2610
-+#: ../libnm-core/nm-setting-8021x.c:2627 ../libnm-core/nm-setting-8021x.c:2658
-+#: ../libnm-core/nm-setting-8021x.c:2675 ../libnm-core/nm-setting-8021x.c:2717
-+#: ../libnm-core/nm-setting-8021x.c:2729 ../libnm-core/nm-setting-8021x.c:2747
-+#: ../libnm-core/nm-setting-8021x.c:2759 ../libnm-core/nm-setting-8021x.c:2783
-+#: ../libnm-core/nm-setting-8021x.c:2876 ../libnm-core/nm-setting-adsl.c:158
-+#: ../libnm-core/nm-setting-bluetooth.c:109
-+#: ../libnm-core/nm-setting-bluetooth.c:167
-+#: ../libnm-core/nm-setting-bluetooth.c:181 ../libnm-core/nm-setting-cdma.c:128
-+#: ../libnm-core/nm-setting-connection.c:975
-+#: ../libnm-core/nm-setting-connection.c:1004
-+#: ../libnm-core/nm-setting-connection.c:1266
-+#: ../libnm-core/nm-setting-ip-config.c:4974
-+#: ../libnm-core/nm-setting-ip-tunnel.c:367
-+#: ../libnm-core/nm-setting-olpc-mesh.c:84
-+#: ../libnm-core/nm-setting-ovs-patch.c:77 ../libnm-core/nm-setting-pppoe.c:130
-+#: ../libnm-core/nm-setting-vpn.c:551 ../libnm-core/nm-setting-vxlan.c:323
-+#: ../libnm-core/nm-setting-wifi-p2p.c:122 ../libnm-core/nm-setting-wimax.c:94
-+#: ../libnm-core/nm-setting-wireless-security.c:894
-+#: ../libnm-core/nm-setting-wireless.c:764
- msgid "property is missing"
- msgstr "속성이 누락되어 있습니다 "
-
--#: ../libnm-core/nm-connection.c:2745
-+#: ../libnm-core/nm-connection.c:2716
- msgid "IP Tunnel"
- msgstr "IP 터널"
-
--#: ../libnm-core/nm-dbus-utils.c:199
-+#: ../libnm-core/nm-dbus-utils.c:185
- #, c-format
- msgid "Method returned type '%s', but expected '%s'"
- msgstr "메소드가 유형 '%s'(을)를 반환했지만 '%s'(이)가 예상됩니다"
-
--#: ../libnm-core/nm-keyfile-utils.c:246
-+#: ../libnm-core/nm-keyfile/nm-keyfile-utils.c:171
-+#, c-format
-+msgid "Value cannot be interpreted as a list of numbers."
-+msgstr "값을 숫자 목록으로 해석 할 수 없습니다."
-+
-+#: ../libnm-core/nm-keyfile/nm-keyfile-utils.c:307
- #, c-format
- msgid "value is not an integer in range [%lld, %lld]"
--msgstr ""
-+msgstr "값이 [| 범위의 정수가 아님 %lld , %lld ]"
-
--#: ../libnm-core/nm-keyfile.c:210
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:271
- msgid "ignoring missing number"
- msgstr "누락된 숫자 무시"
-
--#: ../libnm-core/nm-keyfile.c:218
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:283
- #, c-format
- msgid "ignoring invalid number '%s'"
- msgstr "잘못된 숫자 '%s' 무시"
-
--#: ../libnm-core/nm-keyfile.c:239
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:312
- #, c-format
- msgid "ignoring invalid %s address: %s"
- msgstr "잘못된 %s 주소 무시: %s"
-
--#: ../libnm-core/nm-keyfile.c:281
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:359
- #, c-format
- msgid "ignoring invalid gateway '%s' for %s route"
- msgstr "%s 라우팅에 대한 잘못된 게이트웨이 '%s' 무시"
-
--#: ../libnm-core/nm-keyfile.c:302
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:391
- #, c-format
- msgid "ignoring invalid %s route: %s"
- msgstr "잘못된 %s 라우팅 무시: %s"
-
--#: ../libnm-core/nm-keyfile.c:474
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:566
- #, c-format
- msgid "unexpected character '%c' for address %s: '%s' (position %td)"
- msgstr "예기치 못한 문자 '%c'(이)가 주소 %s에 사용됨: '%s'(위치 %td)"
-
--#: ../libnm-core/nm-keyfile.c:484
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:582
- #, c-format
- msgid "unexpected character '%c' for %s: '%s' (position %td)"
- msgstr "예기치 못한 문자 '%c'(이)가 %s에 사용됨: '%s'(위치 %td)"
-
--#: ../libnm-core/nm-keyfile.c:493
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:597
- #, c-format
- msgid "unexpected character '%c' in prefix length for %s: '%s' (position %td)"
- msgstr "예기치 못한 문자 '%c'(이)가 %s의 접두사 길이에 사용됨: '%s'(위치 %td)"
-
--#: ../libnm-core/nm-keyfile.c:504
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:614
- #, c-format
- msgid "garbage at the end of value %s: '%s'"
- msgstr "값 %s 끝에 가비지: '%s'"
-
--#: ../libnm-core/nm-keyfile.c:510
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:624
- #, c-format
- msgid "deprecated semicolon at the end of value %s: '%s'"
- msgstr "값 %s 끝에 세미콜론 사용하지 않음: '%s'"
-
--#: ../libnm-core/nm-keyfile.c:525
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:647
- #, c-format
- msgid "invalid prefix length for %s '%s', defaulting to %d"
- msgstr "%s '%s'의 접두사 길이가 잘못되었습니다. %d(을)를 기본값으로 설정합니다"
-
--#: ../libnm-core/nm-keyfile.c:532
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:659
- #, c-format
- msgid "missing prefix length for %s '%s', defaulting to %d"
- msgstr "%s '%s'의 접두사 길이가 누락되었습니다. %d(을)를 기본값으로 설정합니다"
-
--#: ../libnm-core/nm-keyfile.c:860 ../libnm-core/nm-setting-user.c:372
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1001
-+#: ../libnm-core/nm-setting-user.c:358
- #, c-format
- msgid "invalid value for \"%s\": %s"
- msgstr "잘못된 값 \"%s\": %s"
-
--#: ../libnm-core/nm-keyfile.c:898
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1041
- #, c-format
- msgid "ignoring invalid DNS server IPv%c address '%s'"
- msgstr "유효하지 않은 DNS 서버를 무시함%c 주소 '%s'"
-
--#: ../libnm-core/nm-keyfile.c:994 ../libnm-core/nm-keyfile.c:3122
--#, c-format
--msgid "ignoring invalid byte element '%d' (not between 0 and 255 inclusive)"
--msgstr "잘못된 바이트 요소 '%d' 무시(0~255 포함되지 않음)."
--
--#: ../libnm-core/nm-keyfile.c:1005
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1132
- msgid "ignoring invalid MAC address"
- msgstr "잘못된 MAC 주소 무시"
-
--#: ../libnm-core/nm-keyfile.c:1264
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1391
- msgid "ignoring invalid SSID"
- msgstr "잘못된 SSID 무시"
-
--#: ../libnm-core/nm-keyfile.c:1280
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1409
- msgid "ignoring invalid raw password"
- msgstr "잘못된 원시 암호 무시"
-
--#: ../libnm-core/nm-keyfile.c:1417
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1554
- msgid "invalid key/cert value"
- msgstr "잘못된 키/인증 값"
-
--#: ../libnm-core/nm-keyfile.c:1428
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1568
- #, c-format
- msgid "invalid key/cert value path \"%s\""
- msgstr "잘못된 키/인증 값 경로 \"%s\""
-
--#: ../libnm-core/nm-keyfile.c:1444 ../libnm-core/nm-keyfile.c:1527
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1592
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1688
- #, c-format
- msgid "certificate or key file '%s' does not exist"
- msgstr "인증서 또는 키 파일 '%s'(이)가 존재하지 않습니다"
-
--#: ../libnm-core/nm-keyfile.c:1453
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1604
- #, c-format
- msgid "invalid PKCS#11 URI \"%s\""
- msgstr "잘못된 PKCS # 11 URI \"%s\""
-
--#: ../libnm-core/nm-keyfile.c:1497
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1652
- msgid "invalid key/cert value data:;base64, is not base64"
- msgstr "잘못된 키/인증서 값 data:;base64,가 base64가 아닙니다"
-
--#: ../libnm-core/nm-keyfile.c:1506
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1664
- msgid "invalid key/cert value data:;base64,file://"
- msgstr "잘못된 키/인증서 data:;base64,file://"
-
--#: ../libnm-core/nm-keyfile.c:1539
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1703
- msgid "invalid key/cert value is not a valid blob"
- msgstr "잘못된 키/인증서 값이 유효한 blob가 아닙니다"
-
--#: ../libnm-core/nm-keyfile.c:1641
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1808
- #, c-format
- msgid "invalid parity value '%s'"
- msgstr "잘못된 패리티 값 '%s'"
-
--#: ../libnm-core/nm-keyfile.c:1658 ../libnm-core/nm-keyfile.c:3177
--#, fuzzy, c-format
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1826
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3391
-+#, c-format
- msgid "invalid setting: %s"
- msgstr "잘못된 설정 이름 '%s'"
-
--#: ../libnm-core/nm-keyfile.c:1675
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1847
- #, c-format
- msgid "ignoring invalid team configuration: %s"
- msgstr "잘못된 팀 구성 무시 : %s"
-
--#: ../libnm-core/nm-keyfile.c:1753
--#, fuzzy, c-format
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1932
-+#, c-format
- msgid "invalid qdisc: %s"
--msgstr "잘못된 IP 주소: %s"
-+msgstr "유효하지 않은 qdisc : %s"
-
--#: ../libnm-core/nm-keyfile.c:1799
--#, fuzzy, c-format
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1981
-+#, c-format
- msgid "invalid tfilter: %s"
--msgstr "잘못된 라우팅: %s'"
-+msgstr "잘못된 tfilter : %s"
-
--#: ../libnm-core/nm-keyfile.c:3021
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3234
- #, c-format
- msgid "error loading setting value: %s"
- msgstr "설정 값 불러오기 오류: %s"
-
--#: ../libnm-core/nm-keyfile.c:3049 ../libnm-core/nm-keyfile.c:3060
--#: ../libnm-core/nm-keyfile.c:3078 ../libnm-core/nm-keyfile.c:3089
--#: ../libnm-core/nm-keyfile.c:3100 ../libnm-core/nm-keyfile.c:3152
--#: ../libnm-core/nm-keyfile.c:3163
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3262
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3273
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3291
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3302
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3313
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3365
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3376
- msgid "value cannot be interpreted as integer"
--msgstr ""
-+msgstr "값은 정수로 해석 될 수 없습니다"
-
--#: ../libnm-core/nm-keyfile.c:3198
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3338
-+#, c-format
-+msgid "ignoring invalid byte element '%u' (not between 0 and 255 inclusive)"
-+msgstr "잘못된 바이트 요소 '무시 %u '(0에서 255 사이 제외)"
-+
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3416
- #, c-format
- msgid "invalid setting name '%s'"
- msgstr "잘못된 설정 이름 '%s'"
-
--#: ../libnm-core/nm-keyfile.c:3243
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3465
- #, c-format
- msgid "invalid key '%s.%s'"
- msgstr "유효하지 않은 키 '%s.%s'"
-
--#: ../libnm-core/nm-keyfile.c:3258
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3484
- #, c-format
- msgid "key '%s.%s' is not boolean"
- msgstr "키 '%s.%s' 부울이 아님"
-
--#: ../libnm-core/nm-keyfile.c:3315
--#, fuzzy, c-format
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3504
-+#, c-format
-+msgid "key '%s.%s' is not a uint32"
-+msgstr "키 ' %s . %s '는 uint32가 아닙니다"
-+
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3565
-+#, c-format
- msgid "invalid peer public key in section '%s'"
--msgstr "잘못된 옵션 '%s'"
-+msgstr "'섹션의 잘못된 피어 공개 키 %s '"
-
--#: ../libnm-core/nm-keyfile.c:3327
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3580
- #, 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:3340
--#, fuzzy, c-format
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3597
-+#, c-format
- msgid "key '%s.%s' is not a valid secret flag"
--msgstr "'%s'은(는) 올바른 DCB 플래그가 아닙니다"
-+msgstr "키 ' %s . %s '은 유효한 비밀 플래그가 아닙니다."
-
--#: ../libnm-core/nm-keyfile.c:3352
--#, fuzzy, c-format
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3613
-+#, c-format
- msgid "key '%s.%s' is not a integer in range 0 to 2^32"
--msgstr "키 '%s.%s' 부울이 아님"
-+msgstr "키 ' %s . %s '는 0에서 2 ^ 32 사이의 정수가 아닙니다."
-
--#: ../libnm-core/nm-keyfile.c:3364
--#, fuzzy, c-format
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3629
-+#, c-format
- msgid "key '%s.%s' is not a valid endpoint"
--msgstr "'%s'는 올바른 밴드가 아닙니다 "
-+msgstr "키 ' %s . %s '는 유효한 엔드 포인트가 아닙니다."
-
--#: ../libnm-core/nm-keyfile.c:3386
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3655
- #, c-format
- msgid "key '%s.%s' has invalid allowed-ips"
--msgstr ""
-+msgstr "키 ' %s . %s '에 허용 된 IP가 잘못되었습니다"
-
--#: ../libnm-core/nm-keyfile.c:3398
--#, fuzzy, c-format
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3670
-+#, c-format
- msgid "peer '%s' is invalid: %s"
--msgstr "'%s'이 올바르지 않습니다 "
-+msgstr "동료 ' %s ' 유효하지 않다: %s"
-+
-+#: ../libnm-core/nm-libnm-core-aux/nm-libnm-core-aux.c:221
-+#, c-format
-+msgid "'%s' is not valid: properties should be specified as 'key=value'"
-+msgstr "' %s '이 유효하지 않습니다. 속성은'key = value '로 지정해야합니다."
-+
-+#: ../libnm-core/nm-libnm-core-aux/nm-libnm-core-aux.c:236
-+#, c-format
-+msgid "'%s' is not a valid key"
-+msgstr "'%s'는 올바른 밴드가 아닙니다"
-+
-+#: ../libnm-core/nm-libnm-core-aux/nm-libnm-core-aux.c:242
-+#, c-format
-+msgid "duplicate key '%s'"
-+msgstr "중복 키 ' %s '"
-+
-+#: ../libnm-core/nm-libnm-core-aux/nm-libnm-core-aux.c:256
-+#, c-format
-+msgid "number for '%s' is out of range"
-+msgstr "'의 번호 %s '이 범위를 벗어났습니다"
-+
-+#: ../libnm-core/nm-libnm-core-aux/nm-libnm-core-aux.c:259
-+#, c-format
-+msgid "value for '%s' must be a number"
-+msgstr "'의 가치 %s '는 숫자 여야합니다"
-+
-+#: ../libnm-core/nm-libnm-core-aux/nm-libnm-core-aux.c:270
-+#, c-format
-+msgid "value for '%s' must be a boolean"
-+msgstr "'의 가치 %s '부울이어야합니다"
-+
-+#: ../libnm-core/nm-libnm-core-aux/nm-libnm-core-aux.c:279
-+msgid "missing 'name' attribute"
-+msgstr "'name'속성이 없습니다."
-+
-+#: ../libnm-core/nm-libnm-core-aux/nm-libnm-core-aux.c:286
-+#, c-format
-+msgid "invalid 'name' \"%s\""
-+msgstr "invalid 'name' \"%s\""
-+
-+#: ../libnm-core/nm-libnm-core-aux/nm-libnm-core-aux.c:298
-+#, c-format
-+msgid "attribute '%s' is invalid for \"%s\""
-+msgstr "attribute '%s' is invalid for \"%s\""
-
--#: ../libnm-core/nm-setting-6lowpan.c:93
-+#: ../libnm-core/nm-setting-6lowpan.c:79
- #, c-format
- msgid "property is not specified"
- msgstr "속성이 지정되지 않았습니다."
-
--#: ../libnm-core/nm-setting-6lowpan.c:115 ../libnm-core/nm-setting-macsec.c:301
--#: ../libnm-core/nm-setting-vlan.c:613
-+#: ../libnm-core/nm-setting-6lowpan.c:101 ../libnm-core/nm-setting-macsec.c:287
-+#: ../libnm-core/nm-setting-vlan.c:600
- #, c-format
- msgid "'%s' value doesn't match '%s=%s'"
- msgstr "'%s' 값은 '%s=%s'와 일치하지 않습니다 "
-
--#: ../libnm-core/nm-setting-6lowpan.c:126
--#: ../libnm-core/nm-setting-ip-tunnel.c:351
--#: ../libnm-core/nm-setting-macsec.c:312 ../libnm-core/nm-setting-macvlan.c:141
--#: ../libnm-core/nm-setting-vlan.c:624 ../libnm-core/nm-setting-vxlan.c:380
-+#: ../libnm-core/nm-setting-6lowpan.c:112
-+#: ../libnm-core/nm-setting-ip-tunnel.c:345
-+#: ../libnm-core/nm-setting-macsec.c:298 ../libnm-core/nm-setting-macvlan.c:127
-+#: ../libnm-core/nm-setting-vlan.c:611 ../libnm-core/nm-setting-vxlan.c:366
- #, c-format
- msgid "'%s' is neither an UUID nor an interface name"
- msgstr "'%s'은 UUID 또는 인터페이스 이름이 아닙니다 "
-
--#: ../libnm-core/nm-setting-8021x.c:225
-+#: ../libnm-core/nm-setting-8021x.c:217
- msgid "binary data missing"
- msgstr "바이너리 데이터 누락"
-
--#: ../libnm-core/nm-setting-8021x.c:253
-+#: ../libnm-core/nm-setting-8021x.c:245
- msgid "URI not NUL terminated"
- msgstr "NUL 종료되지 않은 URI"
-
--#: ../libnm-core/nm-setting-8021x.c:262
-+#: ../libnm-core/nm-setting-8021x.c:254
- msgid "URI is empty"
- msgstr "URI가 비어 있습니다."
-
--#: ../libnm-core/nm-setting-8021x.c:270
-+#: ../libnm-core/nm-setting-8021x.c:262
- msgid "URI is not valid UTF-8"
- msgstr "URI가 유효한 UTF-8이 아닙니다."
-
--#: ../libnm-core/nm-setting-8021x.c:288
-+#: ../libnm-core/nm-setting-8021x.c:280
- msgid "data missing"
- msgstr "데이터 누락"
-
--#: ../libnm-core/nm-setting-8021x.c:311 ../libnm-core/nm-setting-8021x.c:678
-+#: ../libnm-core/nm-setting-8021x.c:303 ../libnm-core/nm-setting-8021x.c:670
- #, c-format
- msgid "certificate is invalid: %s"
- msgstr "인증서가 잘못됨: %s"
-
--#: ../libnm-core/nm-setting-8021x.c:319
-+#: ../libnm-core/nm-setting-8021x.c:311
- #, c-format
- msgid "certificate detected as invalid scheme"
- msgstr "인증서가 잘못됨: "
-
--#: ../libnm-core/nm-setting-8021x.c:533
-+#: ../libnm-core/nm-setting-8021x.c:525
- msgid "CA certificate must be in X.509 format"
- msgstr "CA 인증서는 X.509 형식이어야 합니다"
-
--#: ../libnm-core/nm-setting-8021x.c:549
-+#: ../libnm-core/nm-setting-8021x.c:541
- msgid "invalid certificate format"
- msgstr "잘못된 인증서 형식"
-
--#: ../libnm-core/nm-setting-8021x.c:688
-+#: ../libnm-core/nm-setting-8021x.c:680
- #, c-format
- msgid "password is not supported when certificate is not on a PKCS#11 token"
- msgstr "인증서가 PKCS # 11 토큰에없는 경우 암호가 지원되지 않습니다."
-
--#: ../libnm-core/nm-setting-8021x.c:2574 ../libnm-core/nm-setting-8021x.c:2591
--#: ../libnm-core/nm-setting-8021x.c:2622 ../libnm-core/nm-setting-8021x.c:2639
--#: ../libnm-core/nm-setting-8021x.c:2680 ../libnm-core/nm-setting-8021x.c:2692
--#: ../libnm-core/nm-setting-8021x.c:2710 ../libnm-core/nm-setting-8021x.c:2722
--#: ../libnm-core/nm-setting-8021x.c:2747 ../libnm-core/nm-setting-adsl.c:179
--#: ../libnm-core/nm-setting-cdma.c:149 ../libnm-core/nm-setting-cdma.c:158
--#: ../libnm-core/nm-setting-connection.c:975
--#: ../libnm-core/nm-setting-connection.c:1023
--#: ../libnm-core/nm-setting-gsm.c:284 ../libnm-core/nm-setting-gsm.c:341
-+#: ../libnm-core/nm-setting-8021x.c:2617 ../libnm-core/nm-setting-8021x.c:2634
-+#: ../libnm-core/nm-setting-8021x.c:2665 ../libnm-core/nm-setting-8021x.c:2682
-+#: ../libnm-core/nm-setting-8021x.c:2723 ../libnm-core/nm-setting-8021x.c:2735
-+#: ../libnm-core/nm-setting-8021x.c:2753 ../libnm-core/nm-setting-8021x.c:2765
-+#: ../libnm-core/nm-setting-8021x.c:2790 ../libnm-core/nm-setting-adsl.c:166
-+#: ../libnm-core/nm-setting-cdma.c:135 ../libnm-core/nm-setting-cdma.c:144
-+#: ../libnm-core/nm-setting-connection.c:982
-+#: ../libnm-core/nm-setting-connection.c:1016
-+#: ../libnm-core/nm-setting-connection.c:1238
-+#: ../libnm-core/nm-setting-gsm.c:283 ../libnm-core/nm-setting-gsm.c:341
- #: ../libnm-core/nm-setting-gsm.c:378 ../libnm-core/nm-setting-gsm.c:387
--#: ../libnm-core/nm-setting-ip-config.c:4912
--#: ../libnm-core/nm-setting-ip4-config.c:181
--#: ../libnm-core/nm-setting-ip4-config.c:188
--#: ../libnm-core/nm-setting-pppoe.c:151 ../libnm-core/nm-setting-pppoe.c:160
--#: ../libnm-core/nm-setting-vpn.c:539 ../libnm-core/nm-setting-vpn.c:549
--#: ../libnm-core/nm-setting-wimax.c:117
--#: ../libnm-core/nm-setting-wireless-security.c:960
--#: ../libnm-core/nm-setting-wireless-security.c:984
--#: ../libnm-core/nm-setting.c:1355
-+#: ../libnm-core/nm-setting-ip-config.c:4981
-+#: ../libnm-core/nm-setting-ip4-config.c:167
-+#: ../libnm-core/nm-setting-ip4-config.c:174
-+#: ../libnm-core/nm-setting-pppoe.c:137 ../libnm-core/nm-setting-pppoe.c:146
-+#: ../libnm-core/nm-setting-vpn.c:559 ../libnm-core/nm-setting-vpn.c:570
-+#: ../libnm-core/nm-setting-wimax.c:103
-+#: ../libnm-core/nm-setting-wireless-security.c:937
-+#: ../libnm-core/nm-setting-wireless-security.c:961
-+#: ../libnm-core/nm-setting.c:1257
- msgid "property is empty"
- msgstr "속성이 비어 있습니다 "
-
--#: ../libnm-core/nm-setting-8021x.c:2604 ../libnm-core/nm-setting-8021x.c:2652
-+#: ../libnm-core/nm-setting-8021x.c:2647 ../libnm-core/nm-setting-8021x.c:2695
- #, c-format
- msgid "has to match '%s' property for PKCS#12"
- msgstr "PKCS#12의 '%s' 속성과 일치해야 합니다 "
-
--#: ../libnm-core/nm-setting-8021x.c:2831
--#: ../libnm-core/nm-setting-bluetooth.c:108
--#: ../libnm-core/nm-setting-infiniband.c:176
--#: ../libnm-core/nm-setting-infiniband.c:186
--#: ../libnm-core/nm-setting-ip4-config.c:172
--#: ../libnm-core/nm-setting-ip6-config.c:221
--#: ../libnm-core/nm-setting-ip6-config.c:232
--#: ../libnm-core/nm-setting-olpc-mesh.c:127
--#: ../libnm-core/nm-setting-wifi-p2p.c:145 ../libnm-core/nm-setting-wimax.c:126
--#: ../libnm-core/nm-setting-wired.c:799 ../libnm-core/nm-setting-wired.c:809
--#: ../libnm-core/nm-setting-wireless-security.c:1003
--#: ../libnm-core/nm-setting-wireless-security.c:1012
--#: ../libnm-core/nm-setting-wireless-security.c:1021
--#: ../libnm-core/nm-setting-wireless-security.c:1057
--#: ../libnm-core/nm-setting-wireless-security.c:1067
--#: ../libnm-core/nm-setting-wireless-security.c:1090
--#: ../libnm-core/nm-setting-wireless-security.c:1128
--#: ../libnm-core/nm-setting-wireless-security.c:1169
--#: ../libnm-core/nm-setting-wireless.c:847
--#: ../libnm-core/nm-setting-wireless.c:856
--#: ../libnm-core/nm-setting-wireless.c:867 ../libnm-core/nm-setting-wpan.c:176
--#: ../libnm-core/nm-utils.c:4543
-+#: ../libnm-core/nm-setting-8021x.c:2867
-+msgid "can be enabled only on Ethernet connections"
-+msgstr "이더넷 연결에서만 사용 가능"
-+
-+#: ../libnm-core/nm-setting-8021x.c:2885
-+#: ../libnm-core/nm-setting-bluetooth.c:94
-+#: ../libnm-core/nm-setting-infiniband.c:163
-+#: ../libnm-core/nm-setting-infiniband.c:173
-+#: ../libnm-core/nm-setting-ip4-config.c:158
-+#: ../libnm-core/nm-setting-ip6-config.c:226
-+#: ../libnm-core/nm-setting-ip6-config.c:237
-+#: ../libnm-core/nm-setting-olpc-mesh.c:113
-+#: ../libnm-core/nm-setting-wifi-p2p.c:131 ../libnm-core/nm-setting-wimax.c:112
-+#: ../libnm-core/nm-setting-wired.c:785 ../libnm-core/nm-setting-wired.c:795
-+#: ../libnm-core/nm-setting-wireless-security.c:980
-+#: ../libnm-core/nm-setting-wireless-security.c:989
-+#: ../libnm-core/nm-setting-wireless-security.c:998
-+#: ../libnm-core/nm-setting-wireless-security.c:1008
-+#: ../libnm-core/nm-setting-wireless-security.c:1018
-+#: ../libnm-core/nm-setting-wireless-security.c:1041
-+#: ../libnm-core/nm-setting-wireless-security.c:1079
-+#: ../libnm-core/nm-setting-wireless-security.c:1120
-+#: ../libnm-core/nm-setting-wireless.c:835
-+#: ../libnm-core/nm-setting-wireless.c:844
-+#: ../libnm-core/nm-setting-wireless.c:855 ../libnm-core/nm-setting-wpan.c:162
-+#: ../libnm-core/nm-utils.c:4596
- msgid "property is invalid"
- msgstr "속성이 잘못되어 있습니다 "
-
--#: ../libnm-core/nm-setting-8021x.c:2858 ../libnm-core/nm-setting-8021x.c:2870
--#: ../libnm-core/nm-setting-8021x.c:2884 ../libnm-core/nm-setting-8021x.c:2911
--#: ../libnm-core/nm-setting-8021x.c:2926 ../libnm-core/nm-setting-adsl.c:191
--#: ../libnm-core/nm-setting-adsl.c:203 ../libnm-core/nm-setting-bluetooth.c:136
--#: ../libnm-core/nm-setting-wireless-security.c:938
-+#: ../libnm-core/nm-setting-8021x.c:2912 ../libnm-core/nm-setting-8021x.c:2924
-+#: ../libnm-core/nm-setting-8021x.c:2938 ../libnm-core/nm-setting-8021x.c:2965
-+#: ../libnm-core/nm-setting-8021x.c:2980 ../libnm-core/nm-setting-adsl.c:177
-+#: ../libnm-core/nm-setting-adsl.c:189 ../libnm-core/nm-setting-bluetooth.c:122
-+#: ../libnm-core/nm-setting-wireless-security.c:915
- #, c-format
- msgid "'%s' is not a valid value for the property"
- msgstr "'%s'는 올바른 속성 값이 아닙니다 "
-
--#: ../libnm-core/nm-setting-8021x.c:2894
-+#: ../libnm-core/nm-setting-8021x.c:2948
- msgid "invalid auth flags"
- msgstr "잘못된 라우팅: '"
-
--#: ../libnm-core/nm-setting-bluetooth.c:158
-+#: ../libnm-core/nm-setting-bluetooth.c:144
- #, c-format
- msgid "'%s' connection requires '%s' or '%s' setting"
- msgstr "'%s' 연결에는 '%s' 또는 '%s' 설정이 필요합니다."
-
--#: ../libnm-core/nm-setting-bluetooth.c:204
-+#: ../libnm-core/nm-setting-bluetooth.c:190
- #, c-format
- msgid "'%s' connection requires '%s' setting"
- msgstr "'%s' 연결에 '%s' 환경"
-
--#: ../libnm-core/nm-setting-bond.c:555
-+#: ../libnm-core/nm-setting-bond.c:757
- #, c-format
- msgid "invalid option '%s' or its value '%s'"
- msgstr "잘못된 옵션 '%s' 또는 옵션 값 '%s'"
-
--#: ../libnm-core/nm-setting-bond.c:580
--#, c-format
--msgid "only one of '%s' and '%s' can be set"
--msgstr "'%s' 및 '%s' 중 하나만 설정할 수 있습니다 "
--
--#: ../libnm-core/nm-setting-bond.c:593
-+#: ../libnm-core/nm-setting-bond.c:789
- #, c-format
- msgid "mandatory option '%s' is missing"
- msgstr "필수 옵션 '%s'이 누락되어 있습니다 "
-
--#: ../libnm-core/nm-setting-bond.c:603
-+#: ../libnm-core/nm-setting-bond.c:799
- #, c-format
- msgid "'%s' is not a valid value for '%s'"
- msgstr "'%s'은 '%s'의 올바른 값이 아닙니다 "
-
--#: ../libnm-core/nm-setting-bond.c:617
-+#: ../libnm-core/nm-setting-bond.c:816
- #, c-format
- msgid "'%s=%s' is incompatible with '%s > 0'"
- msgstr "'%s=%s'은 '%s > 0'와 호환하지 않습니다 "
-
--#: ../libnm-core/nm-setting-bond.c:632
-+#: ../libnm-core/nm-setting-bond.c:836
- #, c-format
- msgid "'%s' is not valid for the '%s' option: %s"
- msgstr "'%s' '%s' 선택권: %s"
-
--#: ../libnm-core/nm-setting-bond.c:643
-+#: ../libnm-core/nm-setting-bond.c:849
- #, c-format
- msgid "'%s' option is only valid for '%s=%s'"
- msgstr "'%s' 옵션은 '%s=%s'에만 유효합니다 "
-
--#: ../libnm-core/nm-setting-bond.c:656
-+#: ../libnm-core/nm-setting-bond.c:862
- #, c-format
- msgid "'%s=%s' is not a valid configuration for '%s'"
- msgstr "'%s=%s'은 '%s'의 올바른 설정이 아닙니다 "
-
--#: ../libnm-core/nm-setting-bond.c:669 ../libnm-core/nm-setting-bond.c:678
--#: ../libnm-core/nm-setting-bond.c:698 ../libnm-core/nm-setting-bond.c:734
-+#: ../libnm-core/nm-setting-bond.c:877 ../libnm-core/nm-setting-bond.c:890
-+#, c-format
-+msgid "'%s' option requires '%s' option to be enabled"
-+msgstr "'%s' 옵션을 사용하는 경우 '%s' 옵션을 설정해야 합니다"
-+
-+#: ../libnm-core/nm-setting-bond.c:912 ../libnm-core/nm-setting-bond.c:958
- #, c-format
- msgid "'%s' option requires '%s' option to be set"
- msgstr "'%s' 옵션을 사용하는 경우 '%s' 옵션을 설정해야 합니다 "
-
--#: ../libnm-core/nm-setting-bond.c:709
-+#: ../libnm-core/nm-setting-bond.c:927
- #, c-format
- msgid "'%s' option is empty"
- msgstr "'%s' 옵션이 비어있습니다 "
-
--#: ../libnm-core/nm-setting-bond.c:721
-+#: ../libnm-core/nm-setting-bond.c:941
- #, c-format
- msgid "'%s' is not a valid IPv4 address for '%s' option"
- msgstr "'%s'는 '%s' 옵션의 올바른 IPv4 주소가 아닙니다 "
-
--#: ../libnm-core/nm-setting-bond.c:749
-+#: ../libnm-core/nm-setting-bond.c:975
- #, c-format
- msgid "'%s' option is only valid with mode '%s'"
- msgstr "'%s' 옵션은 모드 '%s'에서만 유효합니다."
-
--#: ../libnm-core/nm-setting-bond.c:760
-+#: ../libnm-core/nm-setting-bond.c:987
- #, c-format
- msgid "'%s' and '%s' cannot have different values"
- msgstr "'%s' 및 '%s'에는 다른 값이 포함될 수 없습니다"
-
--#: ../libnm-core/nm-setting-bond.c:776
-+#: ../libnm-core/nm-setting-bond.c:1010
- #, c-format
- msgid "'%s' option should be string"
- msgstr "'%s' 옵션은 문자열이어야 합니다."
-
--#: ../libnm-core/nm-setting-bond.c:792
-+#: ../libnm-core/nm-setting-bond.c:1023
- #, c-format
- msgid "'%s' option is not valid with mode '%s'"
- msgstr "'%s' 옵션이 모드 '%s'"
-
--#: ../libnm-core/nm-setting-bridge-port.c:315
--#: ../libnm-core/nm-setting-ovs-bridge.c:167
--#: ../libnm-core/nm-setting-ovs-interface.c:273
--#: ../libnm-core/nm-setting-ovs-port.c:186
--#: ../libnm-core/nm-setting-team-port.c:313
-+#: ../libnm-core/nm-setting-bridge-port.c:303
-+#: ../libnm-core/nm-setting-ovs-bridge.c:153
-+#: ../libnm-core/nm-setting-ovs-interface.c:269
-+#: ../libnm-core/nm-setting-ovs-port.c:172
-+#: ../libnm-core/nm-setting-team-port.c:299
- #, c-format
- msgid "missing setting"
- msgstr "누락된 설정"
-
--#: ../libnm-core/nm-setting-bridge-port.c:326
--#: ../libnm-core/nm-setting-ovs-interface.c:294
--#: ../libnm-core/nm-setting-ovs-port.c:207
--#: ../libnm-core/nm-setting-team-port.c:324
-+#: ../libnm-core/nm-setting-bridge-port.c:314
-+#: ../libnm-core/nm-setting-ovs-interface.c:290
-+#: ../libnm-core/nm-setting-ovs-port.c:193
-+#: ../libnm-core/nm-setting-team-port.c:310
- #, c-format
- msgid ""
- "A connection with a '%s' setting must have the slave-type set to '%s'. "
- "Instead it is '%s'"
- msgstr "'%s' 설정이 있는 연결에는 슬레이브 유형을 '%s'(으)로 설정해야 합니다. 현재 '%s'입니다"
-
--#: ../libnm-core/nm-setting-bridge.c:910
--#, fuzzy, c-format
-+#: ../libnm-core/nm-setting-bridge.c:1180
-+#, c-format
- msgid "value '%d' is out of range <%d-%d>"
--msgstr "'%d' 값은 %d 범위 밖에 있습니다"
-+msgstr "'%d' 값은 범위 밖에 있습니다"
-
--#: ../libnm-core/nm-setting-bridge.c:927
-+#: ../libnm-core/nm-setting-bridge.c:1197
- msgid "is not a valid MAC address"
- msgstr "올바른 MAC 주소가 아닙니다 "
-
--#: ../libnm-core/nm-setting-bridge.c:968
-+#: ../libnm-core/nm-setting-bridge.c:1238
- msgid "the mask can't contain bits 0 (STP), 1 (MAC) or 2 (LACP)"
- msgstr "마스크는 비트 0 (STP), 1 (MAC) 또는 2 (LACP)를 포함 할 수 없습니다."
-
--#: ../libnm-core/nm-setting-connection.c:945
-+#: ../libnm-core/nm-setting-bridge.c:1258
-+msgid "is not a valid link local MAC address"
-+msgstr "유효한 링크 로컬 MAC 주소가 아닙니다."
-+
-+#: ../libnm-core/nm-setting-bridge.c:1270
-+msgid "is not a valid VLAN filtering protocol"
-+msgstr "유효한 VLAN 필터링 프로토콜이 아닙니다."
-+
-+#: ../libnm-core/nm-setting-bridge.c:1283
-+msgid "is not a valid option"
-+msgstr "유효한 옵션이 아닙니다"
-+
-+#: ../libnm-core/nm-setting-bridge.c:1292
-+#, c-format
-+msgid "'%s' option must be a power of 2"
-+msgstr "' %s '옵션은 2의 거듭 제곱이어야합니다."
-+
-+#: ../libnm-core/nm-setting-connection.c:952
- #, c-format
- msgid "setting required for connection of type '%s'"
- msgstr "설정에는 유형 '%s'의 연결이 필요합니다."
-
--#: ../libnm-core/nm-setting-connection.c:984
-+#: ../libnm-core/nm-setting-connection.c:991
- #, c-format
- msgid "'%s' is not a valid UUID"
- msgstr "'%s'은 올바른 UUID가 아닙니다 "
-
--#: ../libnm-core/nm-setting-connection.c:1034
-+#: ../libnm-core/nm-setting-connection.c:1027
- #, c-format
- msgid "connection type '%s' is not valid"
- msgstr "연결 유형 '%s'이(가) 유효하지 않습니다."
-
--#: ../libnm-core/nm-setting-connection.c:1070
-+#: ../libnm-core/nm-setting-connection.c:1120
- #, c-format
- msgid "Unknown slave type '%s'"
- msgstr "알 수 없는 슬레이브 유형 '%s'"
-
--#: ../libnm-core/nm-setting-connection.c:1081
-+#: ../libnm-core/nm-setting-connection.c:1131
- #, c-format
- msgid "Slave connections need a valid '%s' property"
- msgstr "슬레이브 연결에는 유효한 '%s' 속성이 필요합니다."
-
--#: ../libnm-core/nm-setting-connection.c:1102
-+#: ../libnm-core/nm-setting-connection.c:1152
- #, c-format
- msgid "Cannot set '%s' without '%s'"
- msgstr "'%s' 없이는 '%s'을(를) 설정할 수 없습니다"
-
--#: ../libnm-core/nm-setting-connection.c:1116
-+#: ../libnm-core/nm-setting-connection.c:1166
- #, c-format
- msgid "'%s' connections must be enslaved to '%s', not '%s'"
- msgstr "'%s' 연결은 '%s', '%s'"
-
--#: ../libnm-core/nm-setting-connection.c:1130
-+#: ../libnm-core/nm-setting-connection.c:1180
- #, c-format
- msgid "metered value %d is not valid"
- msgstr "측정된 값 %d이(가) 유효하지 않습니다."
-
--#: ../libnm-core/nm-setting-connection.c:1141
--#: ../libnm-core/nm-setting-connection.c:1152
--#: ../libnm-core/nm-setting-connection.c:1165
-+#: ../libnm-core/nm-setting-connection.c:1191
-+#: ../libnm-core/nm-setting-connection.c:1202
-+#: ../libnm-core/nm-setting-connection.c:1215
- #, c-format
- msgid "value %d is not valid"
- msgstr "값 %d 유효하지 않습니다."
-
--#: ../libnm-core/nm-setting-connection.c:1178
-+#: ../libnm-core/nm-setting-connection.c:1228
- #, c-format
- msgid "wait-device-timeout requires %s"
--msgstr ""
-+msgstr "대기 장치 시간 초과가 필요합니다 %s"
-+
-+#: ../libnm-core/nm-setting-connection.c:1247
-+msgid "DHCP option cannot be longer than 255 characters"
-+msgstr "DHCP 옵션은 255자를 초과 할 수 없습니다"
-
--#: ../libnm-core/nm-setting-connection.c:1200
-+#: ../libnm-core/nm-setting-connection.c:1253
-+msgid "MUD URL is not a valid URL"
-+msgstr "MUD URL이 유효한 URL이 아닙니다"
-+
-+#: ../libnm-core/nm-setting-connection.c:1275
- #, c-format
- msgid "property type should be set to '%s'"
- msgstr "속성 유형을 '%s'(으)로 설정해야 합니다"
-
--#: ../libnm-core/nm-setting-connection.c:1215
-+#: ../libnm-core/nm-setting-connection.c:1290
- #, c-format
- msgid "slave-type '%s' requires a '%s' setting in the connection"
- msgstr "연결에서 slave-type '%s'에는 '%s' 설정이 필요합니다."
-
--#: ../libnm-core/nm-setting-connection.c:1225
-+#: ../libnm-core/nm-setting-connection.c:1300
- #, c-format
- msgid ""
- "Detect a slave connection with '%s' set and a port type '%s'. '%s' should be "
- "set to '%s'"
- msgstr "'%s'(으)로 설정되고 포트 유형이 '%s'인 슬레이브 연결을 감지합니다. '%s'은(는) '%s'(으)로 설정해야 합니다"
-
--#: ../libnm-core/nm-setting-connection.c:1242
-+#: ../libnm-core/nm-setting-connection.c:1317
- #, c-format
- msgid "A slave connection with '%s' set to '%s' cannot have a '%s' setting"
- msgstr "'%s'(으)로 설정되고 포트 유형이 '%s'인 슬레이브 연결을 감지합니다. '%s'은(는) ''(으)로 설정해야 합니다"
-
--#: ../libnm-core/nm-setting-dcb.c:506
-+#: ../libnm-core/nm-setting-dcb.c:486
- msgid "flags invalid"
- msgstr "플래그가 잘못되어 있습니다 "
-
--#: ../libnm-core/nm-setting-dcb.c:515
-+#: ../libnm-core/nm-setting-dcb.c:495
- msgid "flags invalid - disabled"
- msgstr "플래그가 잘못되어 있음 - 비활성화함 "
-
--#: ../libnm-core/nm-setting-dcb.c:541 ../libnm-core/nm-setting-dcb.c:590
-+#: ../libnm-core/nm-setting-dcb.c:521 ../libnm-core/nm-setting-dcb.c:570
- msgid "property invalid (not enabled)"
- msgstr "속성이 잘못되어 있습니다 (활성화되지 않음) "
-
--#: ../libnm-core/nm-setting-dcb.c:550
-+#: ../libnm-core/nm-setting-dcb.c:530
- msgid "element invalid"
- msgstr "요소가 잘못되어 있습니다 "
-
--#: ../libnm-core/nm-setting-dcb.c:565
-+#: ../libnm-core/nm-setting-dcb.c:545
- msgid "sum not 100%"
- msgstr "총 100%가 아닙니다 "
-
--#: ../libnm-core/nm-setting-dcb.c:599 ../libnm-core/nm-setting-dcb.c:631
-+#: ../libnm-core/nm-setting-dcb.c:579 ../libnm-core/nm-setting-dcb.c:611
- msgid "property invalid"
- msgstr "속성이 잘못되어 있습니다 "
-
--#: ../libnm-core/nm-setting-dcb.c:621
-+#: ../libnm-core/nm-setting-dcb.c:601
- msgid "property missing"
- msgstr "속성이 누락되어 있습니다 "
-
--#: ../libnm-core/nm-setting-ethtool.c:305
--msgid "unsupported offload feature"
--msgstr "지원되지 않는 오프로드 기능"
-+#: ../libnm-core/nm-setting-ethtool.c:302
-+msgid "unsupported ethtool setting"
-+msgstr "지원되지 않는 ethtool 설정"
-
--#: ../libnm-core/nm-setting-ethtool.c:313
--msgid "offload feature has invalid variant type"
--msgstr "오프로드 기능에 잘못된 변형 유형이 있습니다."
-+#: ../libnm-core/nm-setting-ethtool.c:311
-+msgid "setting has invalid variant type"
-+msgstr "설정에 잘못된 변형 유형이 있습니다"
-
--#: ../libnm-core/nm-setting-ethtool.c:336
-+#: ../libnm-core/nm-setting-ethtool.c:323
-+msgid "coalesce option must be either 0 or 1"
-+msgstr "통합 옵션은 0 또는 1이어야합니다."
-+
-+#: ../libnm-core/nm-setting-ethtool.c:348
- #, c-format
- msgid "unknown ethtool option '%s'"
- msgstr "알 수없는 ethtool 옵션 '%s'"
-
--#: ../libnm-core/nm-setting-gsm.c:297
-+#: ../libnm-core/nm-setting-gsm.c:296
- #, c-format
- msgid "property value '%s' is empty or too long (>64)"
- msgstr "속성 값 '%s'이 비어 있거나 너무 깁니다 (>64)"
-
--#: ../libnm-core/nm-setting-gsm.c:329
-+#: ../libnm-core/nm-setting-gsm.c:328
- #, c-format
- msgid "'%s' contains invalid char(s) (use [A-Za-z._-])"
- msgstr "'%s'에는 잘못된 문자가 포함되어 있습니다 ([A-Za-z._-] 사용) "
-@@ -10758,776 +10391,770 @@ msgstr "속성이 비어 있거나 크기가 잘못되었습니다."
- msgid "property must contain only digits"
- msgstr "속성에는 숫자만 포함되야 합니다"
-
--#: ../libnm-core/nm-setting-infiniband.c:207
-+#: ../libnm-core/nm-setting-gsm.c:422
-+msgid "can't be enabled when manual configuration is present"
-+msgstr "수동 구성이있는 경우 활성화 할 수 없습니다"
-+
-+#: ../libnm-core/nm-setting-infiniband.c:194
- msgid "Must specify a P_Key if specifying parent"
- msgstr "부모를 지정하는 경우 P_Key를 지정해야 합니다 "
-
--#: ../libnm-core/nm-setting-infiniband.c:217
-+#: ../libnm-core/nm-setting-infiniband.c:204
- msgid "InfiniBand P_Key connection did not specify parent interface name"
- msgstr "InfiniBand P_Key 연결에서 부모 인터페이스 이름이 지정되어 있지 않습니다 "
-
--#: ../libnm-core/nm-setting-infiniband.c:255
-+#: ../libnm-core/nm-setting-infiniband.c:227
- #, c-format
- msgid ""
- "interface name of software infiniband device must be '%s' or unset (instead "
- "it is '%s')"
- msgstr "소프트웨어 InfiniBand 장치의 인터페이스 이름은 '%s'이거나 설정 해제해야 합니다(현재 '%s'임)"
-
--#: ../libnm-core/nm-setting-infiniband.c:279
--#, fuzzy, c-format
-+#: ../libnm-core/nm-setting-infiniband.c:250
-+#, 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:134
-+#: ../libnm-core/nm-setting-ip-config.c:109
- #, c-format
- msgid "Missing IPv4 address"
- msgstr "누락된 IPv4 주소"
-
--#: ../libnm-core/nm-setting-ip-config.c:134
-+#: ../libnm-core/nm-setting-ip-config.c:109
- #, c-format
- msgid "Missing IPv6 address"
- msgstr "누락된 IPv6 주소"
-
--#: ../libnm-core/nm-setting-ip-config.c:139
--#, fuzzy, c-format
-+#: ../libnm-core/nm-setting-ip-config.c:114
-+#, c-format
- msgid "Invalid IPv4 address '%s'"
--msgstr "잘못된 IPv4 주소 '%s'"
-+msgstr "잘못된 IPv4 주소"
-
--#: ../libnm-core/nm-setting-ip-config.c:139
--#, fuzzy, c-format
-+#: ../libnm-core/nm-setting-ip-config.c:114
-+#, c-format
- msgid "Invalid IPv6 address '%s'"
--msgstr "잘못된 IPv6 주소 '%s'"
-+msgstr "잘못된 IPv6 주소"
-
--#: ../libnm-core/nm-setting-ip-config.c:154
-+#: ../libnm-core/nm-setting-ip-config.c:129
- #, c-format
- msgid "Invalid IPv4 address prefix '%u'"
- msgstr "잘못된 IPv4 주소 접두어 '%u'"
-
--#: ../libnm-core/nm-setting-ip-config.c:154
-+#: ../libnm-core/nm-setting-ip-config.c:129
- #, c-format
- msgid "Invalid IPv6 address prefix '%u'"
- msgstr "잘못된 IPv6 주소 접두어 '%u'"
-
--#: ../libnm-core/nm-setting-ip-config.c:169
-+#: ../libnm-core/nm-setting-ip-config.c:144
- #, c-format
- msgid "Invalid routing metric '%s'"
- msgstr "잘못된 라우팅 메트릭 '%s'"
-
--#: ../libnm-core/nm-setting-ip-config.c:1287
--#: ../libnm-core/nm-setting-sriov.c:417
--#, fuzzy
-+#: ../libnm-core/nm-setting-ip-config.c:1272
-+#: ../libnm-core/nm-setting-sriov.c:413
- msgid "unknown attribute"
--msgstr "알 수 없는 설정 이름"
-+msgstr "알 수없는 속성"
-
--#: ../libnm-core/nm-setting-ip-config.c:1297
--#: ../libnm-core/nm-setting-sriov.c:427
--#, fuzzy, c-format
-+#: ../libnm-core/nm-setting-ip-config.c:1282
-+#: ../libnm-core/nm-setting-sriov.c:423
-+#, c-format
- msgid "invalid attribute type '%s'"
--msgstr "잘못된 패리티 값 '%s'"
-+msgstr "올바르지 않은 속성"
-
--#: ../libnm-core/nm-setting-ip-config.c:1308
-+#: ../libnm-core/nm-setting-ip-config.c:1293
- #, 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:1294
- #, 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
--#, fuzzy, c-format
-+#: ../libnm-core/nm-setting-ip-config.c:1308
-+#: ../libnm-core/nm-setting-ip-config.c:1336
-+#, c-format
- msgid "'%s' is not a valid IPv4 address"
--msgstr "'%s'은(는) 유효한 IP 주소가 아닙니다."
-+msgstr "'%s'은(는) 유효한 IPv 주소가 아닙니다."
-
--#: ../libnm-core/nm-setting-ip-config.c:1326
--#: ../libnm-core/nm-setting-ip-config.c:1350
--#, fuzzy, c-format
-+#: ../libnm-core/nm-setting-ip-config.c:1309
-+#: ../libnm-core/nm-setting-ip-config.c:1337
-+#, c-format
- msgid "'%s' is not a valid IPv6 address"
--msgstr "'%s'은(는) 유효한 IP 주소가 아닙니다."
-+msgstr "'%s'은(는) 유효한 IPv 주소가 아닙니다."
-
--#: ../libnm-core/nm-setting-ip-config.c:1340
--#, fuzzy, c-format
-+#: ../libnm-core/nm-setting-ip-config.c:1327
-+#, c-format
- msgid "invalid prefix %s"
--msgstr "잘못된 라우팅: %s'"
-+msgstr "잘못된 접두어 %s"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:1350
-+#, c-format
-+msgid "%s is not a valid route type"
-+msgstr "%s 유효한 경로 유형이 아닙니다"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:1400
-+#, c-format
-+msgid "route scope is invalid"
-+msgstr "경로 범위가 유효하지 않습니다"
-
--#: ../libnm-core/nm-setting-ip-config.c:2515
--#, fuzzy
-+#: ../libnm-core/nm-setting-ip-config.c:2541
- msgid "invalid priority"
--msgstr "잘못된 속성 맵 '%s'"
-+msgstr "잘못된 속성 맵 ''"
-
--#: ../libnm-core/nm-setting-ip-config.c:2526
--#, fuzzy
-+#: ../libnm-core/nm-setting-ip-config.c:2552
- msgid "missing table"
--msgstr "누락된 설정"
-+msgstr "누락 된 테이블"
-
--#: ../libnm-core/nm-setting-ip-config.c:2532
--#, fuzzy
-+#: ../libnm-core/nm-setting-ip-config.c:2558
- msgid "invalid action"
- msgstr "잘못된 옵션 ''"
-
--#: ../libnm-core/nm-setting-ip-config.c:2539
-+#: ../libnm-core/nm-setting-ip-config.c:2565
- msgid "has from/src but the prefix-length is zero"
--msgstr ""
-+msgstr "from / src가 있지만 접두사 길이는 0입니다."
-
--#: ../libnm-core/nm-setting-ip-config.c:2546
-+#: ../libnm-core/nm-setting-ip-config.c:2572
- msgid "missing from/src for a non zero prefix-length"
--msgstr ""
-+msgstr "접두사 길이가 0이 아닌 경우 / src에서 누락"
-
--#: ../libnm-core/nm-setting-ip-config.c:2551
--#, fuzzy
-+#: ../libnm-core/nm-setting-ip-config.c:2577
- msgid "invalid from/src"
--msgstr "잘못된 포트 %d"
-+msgstr "/ src에서 유효하지 않습니다"
-
--#: ../libnm-core/nm-setting-ip-config.c:2556
--#, fuzzy
-+#: ../libnm-core/nm-setting-ip-config.c:2582
- msgid "invalid prefix length for from/src"
--msgstr "%s '%s'의 접두사 길이가 잘못되었습니다. %d(을)를 기본값으로 설정합니다"
-+msgstr "from / src에 유효하지 않은 접두사 길이"
-
--#: ../libnm-core/nm-setting-ip-config.c:2563
-+#: ../libnm-core/nm-setting-ip-config.c:2589
- msgid "has to/dst but the prefix-length is zero"
--msgstr ""
-+msgstr "to / dst가 있지만 접두사 길이는 0입니다."
-
--#: ../libnm-core/nm-setting-ip-config.c:2570
-+#: ../libnm-core/nm-setting-ip-config.c:2596
- msgid "missing to/dst for a non zero prefix-length"
--msgstr ""
-+msgstr "접두사 길이가 0이 아닌 경우 누락 / dst"
-
--#: ../libnm-core/nm-setting-ip-config.c:2575
--#, fuzzy
-+#: ../libnm-core/nm-setting-ip-config.c:2601
- msgid "invalid to/dst"
--msgstr "잘못된 포트 %d"
-+msgstr "유효하지 않은 / dst"
-
--#: ../libnm-core/nm-setting-ip-config.c:2580
--#, fuzzy
-+#: ../libnm-core/nm-setting-ip-config.c:2606
- msgid "invalid prefix length for to/dst"
--msgstr "%s '%s'의 접두사 길이가 잘못되었습니다. %d(을)를 기본값으로 설정합니다"
-+msgstr "to / dst에 유효하지 않은 접두사 길이"
-
--#: ../libnm-core/nm-setting-ip-config.c:2588
--#, fuzzy
-+#: ../libnm-core/nm-setting-ip-config.c:2614
- msgid "invalid iifname"
--msgstr "잘못된 값"
-+msgstr "잘못된 iifname"
-
--#: ../libnm-core/nm-setting-ip-config.c:2596
--#, fuzzy
-+#: ../libnm-core/nm-setting-ip-config.c:2622
- msgid "invalid oifname"
--msgstr "잘못된 값"
-+msgstr "잘못된 oifname"
-
--#: ../libnm-core/nm-setting-ip-config.c:2602
--#, fuzzy
-+#: ../libnm-core/nm-setting-ip-config.c:2628
- msgid "invalid source port range"
--msgstr "최소 소스 포트 [0]"
-+msgstr "잘못된 소스 포트 범위"
-
--#: ../libnm-core/nm-setting-ip-config.c:2608
--#, fuzzy
-+#: ../libnm-core/nm-setting-ip-config.c:2634
- msgid "invalid destination port range"
--msgstr "잘못된 옵션 ''"
-+msgstr "잘못된 대상 포트 범위"
-
--#: ../libnm-core/nm-setting-ip-config.c:2616
-+#: ../libnm-core/nm-setting-ip-config.c:2642
- msgid "suppress_prefixlength out of range"
--msgstr ""
-+msgstr "suppress_prefixlength out of range"
-
--#: ../libnm-core/nm-setting-ip-config.c:2621
-+#: ../libnm-core/nm-setting-ip-config.c:2647
- msgid "suppress_prefixlength is only allowed with the to-table action"
--msgstr ""
-+msgstr "suppress_prefixlength는 테이블 작업에서만 허용됩니다."
-
--#: ../libnm-core/nm-setting-ip-config.c:2728
--#, fuzzy, c-format
-+#: ../libnm-core/nm-setting-ip-config.c:2754
-+#, c-format
- msgid "duplicate key %s"
--msgstr "중복 속성"
-+msgstr "중복 키 %s"
-
--#: ../libnm-core/nm-setting-ip-config.c:2742
--#, fuzzy, c-format
-+#: ../libnm-core/nm-setting-ip-config.c:2768
-+#, c-format
- msgid "invalid key \"%s\""
--msgstr "유효하지 않은 키 \"%s\": %s"
-+msgstr "유효하지 않은 키 \"%s\": "
-
--#: ../libnm-core/nm-setting-ip-config.c:2755
--#, fuzzy, c-format
-+#: ../libnm-core/nm-setting-ip-config.c:2781
-+#, c-format
- msgid "invalid variant type '%s' for \"%s\""
--msgstr "잘못된 패리티 값 '%s'"
-+msgstr "잘못된 변형 유형 ' %s '에 대한' %s \""
-
--#: ../libnm-core/nm-setting-ip-config.c:2764
--#, fuzzy
-+#: ../libnm-core/nm-setting-ip-config.c:2790
- msgid "missing \""
--msgstr "누락된 설정"
-+msgstr "잃어버린 \""
-
--#: ../libnm-core/nm-setting-ip-config.c:2770
--#, fuzzy
-+#: ../libnm-core/nm-setting-ip-config.c:2796
- msgid "invalid \""
--msgstr "유효하지 않은 DUID"
-+msgstr "유효하지 않음"
-
--#: ../libnm-core/nm-setting-ip-config.c:2967
--#, fuzzy
-+#: ../libnm-core/nm-setting-ip-config.c:2993
- msgid "Unsupported to-string-flags argument"
--msgstr "지원되지 않는 오프로드 기능"
-+msgstr "지원되지 않는 to-string-flags 인수"
-
--#: ../libnm-core/nm-setting-ip-config.c:2974
-+#: ../libnm-core/nm-setting-ip-config.c:3000
- msgid "Unsupported extra-argument"
--msgstr ""
-+msgstr "지원되지 않는 추가 인수"
-
--#: ../libnm-core/nm-setting-ip-config.c:3240
--#, fuzzy, c-format
-+#: ../libnm-core/nm-setting-ip-config.c:3267
-+#, c-format
- msgid "unsupported key \"%s\""
--msgstr "지원되지 않는 tfilter 옵션 : '%s'."
-+msgstr "지원되지 않는 키 \" %s \""
-
--#: ../libnm-core/nm-setting-ip-config.c:3245
--#, fuzzy, c-format
-+#: ../libnm-core/nm-setting-ip-config.c:3272
-+#, c-format
- msgid "duplicate key \"%s\""
--msgstr "중복 VF 지수 %u"
-+msgstr "duplicate key \"%s\""
-
--#: ../libnm-core/nm-setting-ip-config.c:3250
--#, fuzzy, c-format
-+#: ../libnm-core/nm-setting-ip-config.c:3277
-+#, c-format
- msgid "invalid value for \"%s\""
--msgstr "잘못된 값 \"%s\": %s"
-+msgstr "잘못된 값 \"%s\": "
-
--#: ../libnm-core/nm-setting-ip-config.c:3260
-+#: ../libnm-core/nm-setting-ip-config.c:3287
- msgid "empty text does not describe a rule"
--msgstr ""
-+msgstr "빈 텍스트는 규칙을 설명하지 않습니다"
-
--#: ../libnm-core/nm-setting-ip-config.c:3266
--#, fuzzy, c-format
-+#: ../libnm-core/nm-setting-ip-config.c:3293
-+#, c-format
- msgid "missing argument for \"%s\""
--msgstr "누락된 설정"
-+msgstr "\"에 대한 인수 누락 %s \""
-
--#: ../libnm-core/nm-setting-ip-config.c:3278
--#, fuzzy
-+#: ../libnm-core/nm-setting-ip-config.c:3305
- msgid "invalid \"from\" part"
--msgstr "잘못된 포트 %d"
-+msgstr "잘못된 \"보낸 사람\"부분"
-
--#: ../libnm-core/nm-setting-ip-config.c:3292
--#, fuzzy
-+#: ../libnm-core/nm-setting-ip-config.c:3319
- msgid "invalid \"to\" part"
--msgstr "잘못된 포트 %d"
-+msgstr "잘못된 \"to\"부분"
-
--#: ../libnm-core/nm-setting-ip-config.c:3301
-+#: ../libnm-core/nm-setting-ip-config.c:3328
- #, c-format
- msgid "cannot detect address family for rule"
--msgstr ""
-+msgstr "규칙의 주소 패밀리를 감지 할 수 없습니다"
-
--#: ../libnm-core/nm-setting-ip-config.c:3361
--#: ../libnm-core/nm-setting-ip-config.c:3455
--#, fuzzy, c-format
-+#: ../libnm-core/nm-setting-ip-config.c:3388
-+#: ../libnm-core/nm-setting-ip-config.c:3482
-+#, c-format
- msgid "rule is invalid: %s"
--msgstr "인증서가 잘못됨: %s"
-+msgstr "이름 '%s' 유효하지 않다."
-
--#: ../libnm-core/nm-setting-ip-config.c:3438
--#, fuzzy
-+#: ../libnm-core/nm-setting-ip-config.c:3465
- msgid "invalid address family"
--msgstr "잘못된 IP 주소: %s"
-+msgstr "잘못된 주소 패밀리"
-
--#: ../libnm-core/nm-setting-ip-config.c:4707
--#, fuzzy, c-format
-+#: ../libnm-core/nm-setting-ip-config.c:4738
-+#, c-format
- msgid "rule #%u is invalid: %s"
--msgstr "인증서가 잘못됨: %s"
-+msgstr "이름 '%u' 유효하지 않다."
-
--#: ../libnm-core/nm-setting-ip-config.c:4925
-+#: ../libnm-core/nm-setting-ip-config.c:4994
- #, c-format
- msgid "%d. DNS server address is invalid"
- msgstr "%d. DNS 서버는 잘못되어 있습니다 "
-
--#: ../libnm-core/nm-setting-ip-config.c:4941
-+#: ../libnm-core/nm-setting-ip-config.c:5010
- #, c-format
- msgid "%d. IP address is invalid"
- msgstr "%d. IP 주소가 유효하지 않습니다."
-
--#: ../libnm-core/nm-setting-ip-config.c:4953
-+#: ../libnm-core/nm-setting-ip-config.c:5022
- #, c-format
- msgid "%d. IP address has 'label' property with invalid type"
- msgstr "%d. IP 주소에 잘못된 유형의 'label' 속성이 있습니다."
-
--#: ../libnm-core/nm-setting-ip-config.c:4962
-+#: ../libnm-core/nm-setting-ip-config.c:5031
- #, c-format
- msgid "%d. IP address has invalid label '%s'"
- msgstr "%d. IP 주소에 잘못된 레이블 '%s'이(가) 있습니다."
-
--#: ../libnm-core/nm-setting-ip-config.c:4976
-+#: ../libnm-core/nm-setting-ip-config.c:5045
- msgid "gateway cannot be set if there are no addresses configured"
- msgstr "주소를 구성하지 않으면 게이트웨이를 설정할 수 없습니다"
-
--#: ../libnm-core/nm-setting-ip-config.c:4985
-+#: ../libnm-core/nm-setting-ip-config.c:5054
- msgid "gateway is invalid"
- msgstr "게이트웨이가 잘못되었습니다."
-
--#: ../libnm-core/nm-setting-ip-config.c:4999
-+#: ../libnm-core/nm-setting-ip-config.c:5069
- #, c-format
- msgid "%d. route is invalid"
- msgstr "%d. 라우팅이 잘못되어 있습니다 "
-
--#: ../libnm-core/nm-setting-ip-config.c:5008
-+#: ../libnm-core/nm-setting-ip-config.c:5079
- #, c-format
--msgid "%d. route cannot be a default route"
--msgstr "%d. 라우팅은 기본 라우팅을 사용할 수 없습니다"
-+msgid "invalid attribute: %s"
-+msgstr "잘못된 속성 : %s"
-
--#: ../libnm-core/nm-setting-ip-config.c:5024
-+#: ../libnm-core/nm-setting-ip-config.c:5098
- #, c-format
- msgid "%u. rule has wrong address-family"
--msgstr ""
-+msgstr "%u. 규칙에 잘못된 주소 계열이 있습니다."
-
--#: ../libnm-core/nm-setting-ip-config.c:5033
--#, fuzzy, c-format
-+#: ../libnm-core/nm-setting-ip-config.c:5107
-+#, c-format
- msgid "%u. rule is invalid: %s"
--msgstr "%d. 라우팅이 잘못되어 있습니다 "
-+msgstr "이름 '%u' 유효하지 않다."
-+
-+#: ../libnm-core/nm-setting-ip-config.c:5121
-+#, c-format
-+msgid "'%s' is not a valid IAID"
-+msgstr "'%s'는 올바른 밴드가 아닙니다"
-
--#: ../libnm-core/nm-setting-ip-config.c:5046
-+#: ../libnm-core/nm-setting-ip-config.c:5135
-+#, c-format
-+msgid "the property cannot be set when '%s' is disabled"
-+msgstr "'인 경우 속성을 설정할 수 없습니다 %s '비활성화"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:5157
- #, c-format
- msgid "a gateway is incompatible with '%s'"
- msgstr "'%s='은 ' > 0'와 호환하지 않습니다 "
-
--#: ../libnm-core/nm-setting-ip-tunnel.c:339
-+#: ../libnm-core/nm-setting-ip-tunnel.c:333
- #, c-format
- msgid "'%d' is not a valid tunnel mode"
- msgstr "'%d'은(는) 유효한 터널 모드가 아닙니다."
-
--#: ../libnm-core/nm-setting-ip-tunnel.c:362
--#: ../libnm-core/nm-setting-ip-tunnel.c:382
-+#: ../libnm-core/nm-setting-ip-tunnel.c:356
-+#: ../libnm-core/nm-setting-ip-tunnel.c:376
- #, c-format
- msgid "'%s' is not a valid IPv%c address"
- msgstr "'%s'은(는) 유효한 IPv%c 주소가 아닙니다."
-
--#: ../libnm-core/nm-setting-ip-tunnel.c:399
-+#: ../libnm-core/nm-setting-ip-tunnel.c:393
- msgid "tunnel keys can only be specified for GRE tunnels"
- msgstr "터널 키는 GRE 터널에 대해서만 지정할 수 있습니다"
-
--#: ../libnm-core/nm-setting-ip-tunnel.c:412
--#: ../libnm-core/nm-setting-ip-tunnel.c:428
-+#: ../libnm-core/nm-setting-ip-tunnel.c:406
-+#: ../libnm-core/nm-setting-ip-tunnel.c:422
- #, c-format
- msgid "'%s' is not a valid tunnel key"
- msgstr "'%s'는 유효한 키가 아닙니다."
-
--#: ../libnm-core/nm-setting-ip-tunnel.c:440
-+#: ../libnm-core/nm-setting-ip-tunnel.c:434
- msgid "a fixed TTL is allowed only when path MTU discovery is enabled"
- msgstr "고정 TTL은 경로 MTU 검색이 활성화된 경우에만 허용됩니다"
-
--#: ../libnm-core/nm-setting-ip-tunnel.c:453
-+#: ../libnm-core/nm-setting-ip-tunnel.c:447
- #, c-format
- msgid "some flags are invalid for the select mode: %s"
- msgstr "일부 플래그는 선택 모드에 유효하지 않습니다. %s"
-
--#: ../libnm-core/nm-setting-ip-tunnel.c:467
-+#: ../libnm-core/nm-setting-ip-tunnel.c:459
- #, c-format
- msgid "wired setting not allowed for mode %s"
- msgstr "유선 설정이 모드에 허용되지 않음 %s"
-
--#: ../libnm-core/nm-setting-ip4-config.c:126
--#: ../libnm-core/nm-setting-ip6-config.c:173
-+#: ../libnm-core/nm-setting-ip4-config.c:112
-+#: ../libnm-core/nm-setting-ip6-config.c:178
- #, c-format
- msgid "this property cannot be empty for '%s=%s'"
- msgstr "이 속성은 '%s=%s'에 대해 비어 있을 수 없습니다."
-
--#: ../libnm-core/nm-setting-ip4-config.c:138
--#: ../libnm-core/nm-setting-ip4-config.c:148
--#: ../libnm-core/nm-setting-ip4-config.c:160
--#: ../libnm-core/nm-setting-ip6-config.c:188
--#: ../libnm-core/nm-setting-ip6-config.c:198
--#: ../libnm-core/nm-setting-ip6-config.c:208
-+#: ../libnm-core/nm-setting-ip4-config.c:124
-+#: ../libnm-core/nm-setting-ip4-config.c:134
-+#: ../libnm-core/nm-setting-ip4-config.c:146
-+#: ../libnm-core/nm-setting-ip6-config.c:193
-+#: ../libnm-core/nm-setting-ip6-config.c:203
-+#: ../libnm-core/nm-setting-ip6-config.c:213
- #, c-format
- msgid "this property is not allowed for '%s=%s'"
- msgstr "이 속성은 '%s=%s'에 대해 허용되지 않습니다 "
-
--#: ../libnm-core/nm-setting-ip4-config.c:197
-+#: ../libnm-core/nm-setting-ip4-config.c:183
- #, c-format
- msgid "'%s' is not a valid FQDN"
- msgstr "'%s'은(는) 유효한 FQDN이 아닙니다."
-
--#: ../libnm-core/nm-setting-ip4-config.c:206
-+#: ../libnm-core/nm-setting-ip4-config.c:192
- msgid "property cannot be set when dhcp-hostname is also set"
- msgstr "dhcp-hostname도 설정된 경우 속성을 설정할 수 없습니다"
-
--#: ../libnm-core/nm-setting-ip4-config.c:218
-+#: ../libnm-core/nm-setting-ip4-config.c:204
-+msgid "FQDN flags requires a FQDN set"
-+msgstr "FQDN 플래그에는 FQDN 세트가 필요합니다"
-+
-+#: ../libnm-core/nm-setting-ip4-config.c:216
- #, c-format
- msgid "multiple addresses are not allowed for '%s=%s'"
- msgstr "여러 개의 주소가 '%s=%s'"
-
--#: ../libnm-core/nm-setting-ip4-config.c:232
-+#: ../libnm-core/nm-setting-ip4-config.c:230
- msgid "property should be TRUE when method is set to disabled"
- msgstr "메소드가 disabled로 설정된 경우 TRUE 여야합니다."
-
--#: ../libnm-core/nm-setting-ip6-config.c:247
-+#: ../libnm-core/nm-setting-ip6-config.c:252
- msgid "value is not a valid token"
- msgstr "''은 올바른 UUID가 아닙니다 "
-
--#: ../libnm-core/nm-setting-ip6-config.c:258
-+#: ../libnm-core/nm-setting-ip6-config.c:263
- msgid "only makes sense with EUI64 address generation mode"
- msgstr "EUI64 주소 생성 모드에서만 의미가 있습니다."
-
--#: ../libnm-core/nm-setting-ip6-config.c:269
-+#: ../libnm-core/nm-setting-ip6-config.c:274
- msgid "invalid DUID"
- msgstr "유효하지 않은 DUID"
-
--#: ../libnm-core/nm-setting-ip6-config.c:281
-+#: ../libnm-core/nm-setting-ip6-config.c:286
- msgid "token is not in canonical form"
- msgstr "토큰이 표준 형식이 아닙니다."
-
--#: ../libnm-core/nm-setting-ip6-config.c:294
--#, fuzzy
-+#: ../libnm-core/nm-setting-ip6-config.c:299
- msgid "property should be TRUE when method is set to ignore or disabled"
- msgstr "메소드가 disabled로 설정된 경우 TRUE 여야합니다."
-
--#: ../libnm-core/nm-setting-macsec.c:245
-+#: ../libnm-core/nm-setting-macsec.c:231
- msgid "the key is empty"
- msgstr "열쇠가 비어있다."
-
--#: ../libnm-core/nm-setting-macsec.c:256
-+#: ../libnm-core/nm-setting-macsec.c:242
- #, c-format
- msgid "the key must be %d characters"
- msgstr "열쇠가 있어야합니다. %d 문자들"
-
--#: ../libnm-core/nm-setting-macsec.c:264
--#, fuzzy
-+#: ../libnm-core/nm-setting-macsec.c:250
- msgid "the key contains non-hexadecimal characters"
--msgstr "IV에 16진수 숫자가 아닌 문자가 있습니다."
-+msgstr "키는 16 진수가 아닌 문자를 포함합니다"
-
--#: ../libnm-core/nm-setting-macsec.c:326 ../libnm-core/nm-setting-macvlan.c:155
--#: ../libnm-core/nm-setting-vlan.c:638
-+#: ../libnm-core/nm-setting-macsec.c:312 ../libnm-core/nm-setting-macvlan.c:141
-+#: ../libnm-core/nm-setting-vlan.c:625
- #, c-format
- msgid "property is not specified and neither is '%s:%s'"
- msgstr "속성이 지정되어 있지 않고 '%s:%s'도 아닙니다 "
-
--#: ../libnm-core/nm-setting-macsec.c:347
-+#: ../libnm-core/nm-setting-macsec.c:333
- #, c-format
- msgid "EAP key management requires '%s' setting presence"
- msgstr "EAP 키 관리에는 '%s' 설정 존재"
-
--#: ../libnm-core/nm-setting-macsec.c:356
-+#: ../libnm-core/nm-setting-macsec.c:342
- msgid "must be either psk (0) or eap (1)"
--msgstr ""
-+msgstr "psk (0) 또는 eap (1)이어야합니다."
-
--#: ../libnm-core/nm-setting-macsec.c:365
-+#: ../libnm-core/nm-setting-macsec.c:351
- #, c-format
- msgid "invalid port %d"
- msgstr "잘못된 포트 %d"
-
--#: ../libnm-core/nm-setting-macsec.c:376
-+#: ../libnm-core/nm-setting-macsec.c:362
- msgid "only valid for psk mode"
--msgstr ""
-+msgstr "psk 모드에만 유효"
-
--#: ../libnm-core/nm-setting-macvlan.c:166
-+#: ../libnm-core/nm-setting-macvlan.c:152
- msgid "non promiscuous operation is allowed only in passthru mode"
- msgstr "비 무차별 작업은 passthru 모드에서만 허용됩니다"
-
--#: ../libnm-core/nm-setting-olpc-mesh.c:108
--#: ../libnm-core/nm-setting-wireless.c:786
-+#: ../libnm-core/nm-setting-match.c:738 ../libnm-core/nm-setting-match.c:752
-+#: ../libnm-core/nm-setting-match.c:766 ../libnm-core/nm-setting-match.c:780
-+#, c-format
-+msgid "is empty"
-+msgstr "비었다"
-+
-+#: ../libnm-core/nm-setting-olpc-mesh.c:94
-+#: ../libnm-core/nm-setting-wireless.c:774
- msgid "SSID length is out of range <1-32> bytes"
- msgstr "SSID 길이가 <1-32> 바이트 범위 밖에 있습니다 "
-
--#: ../libnm-core/nm-setting-olpc-mesh.c:117
--#: ../libnm-core/nm-setting-wireless.c:826
-+#: ../libnm-core/nm-setting-olpc-mesh.c:103
-+#: ../libnm-core/nm-setting-wireless.c:814
- #, c-format
- msgid "'%d' is not a valid channel"
- msgstr "'%d'은 올바른 채널이 아닙니다 "
-
--#: ../libnm-core/nm-setting-ovs-bridge.c:176
-+#: ../libnm-core/nm-setting-ovs-bridge.c:162
- #, c-format
- msgid "A connection with a '%s' setting must not have a master."
- msgstr "'%s' 설정에 마스터가 없어야합니다."
-
--#: ../libnm-core/nm-setting-ovs-bridge.c:187
-+#: ../libnm-core/nm-setting-ovs-bridge.c:173
- #, c-format
- msgid "'%s' is not allowed in fail_mode"
- msgstr "'%s' fail_mode에 허용되지 않습니다."
-
--#: ../libnm-core/nm-setting-ovs-interface.c:108
-+#: ../libnm-core/nm-setting-ovs-interface.c:96
- #, c-format
- msgid "'%s' is not a valid interface type"
- msgstr "'%s'은(는) 올바른 인터페이스 이름이 아닙니다"
-
--#: ../libnm-core/nm-setting-ovs-interface.c:130
-+#: ../libnm-core/nm-setting-ovs-interface.c:120
- #, c-format
- msgid "A connection with a '%s' setting needs connection.type explicitly set"
- msgstr "'%s' 설정에는 connection.type이 명시 적으로 설정해야합니다."
-
--#: ../libnm-core/nm-setting-ovs-interface.c:142
-+#: ../libnm-core/nm-setting-ovs-interface.c:132
- #, c-format
- msgid "A connection of type '%s' cannot have ovs-interface.type \"system\""
- msgstr "유형 '%s' ovs-interface.type \"system\"을 가질 수 없습니다."
-
--#: ../libnm-core/nm-setting-ovs-interface.c:154
-+#: ../libnm-core/nm-setting-ovs-interface.c:144
- #, c-format
- msgid "A connection of type '%s' cannot have an ovs-interface.type \"%s\""
- msgstr "유형 '%s' ovs-interface.type을 가질 수 없습니다 \"%s\""
-
--#: ../libnm-core/nm-setting-ovs-interface.c:173
--#, fuzzy, c-format
-+#: ../libnm-core/nm-setting-ovs-interface.c:163
-+#, c-format
- msgid "A connection can not have both '%s' and '%s' settings at the same time"
--msgstr "'%s' 설정에는 마스터가 있어야합니다."
-+msgstr "연결에는 ' %s '와' %s '설정 동시에"
-
--#: ../libnm-core/nm-setting-ovs-interface.c:187
-+#: ../libnm-core/nm-setting-ovs-interface.c:177
- #, c-format
- msgid ""
- "A connection with '%s' setting must be of connection.type \"ovs-interface\" "
- "but is \"%s\""
- msgstr "'%s' 설정은 connection.type \"ovs-interface\"여야하지만 \"%s\""
-
--#: ../libnm-core/nm-setting-ovs-interface.c:199
--#, fuzzy, c-format
-+#: ../libnm-core/nm-setting-ovs-interface.c:189
-+#, c-format
- msgid ""
- "A connection with '%s' setting needs to be of '%s' interface type, not '%s'"
--msgstr "'%s' 설정은 '패치'인터페이스 유형이어야하며 '%s'"
-+msgstr "'와의 연결 %s '설정은' %s '가 아닌 인터페이스 유형 %s '"
-
--#: ../libnm-core/nm-setting-ovs-interface.c:215
-+#: ../libnm-core/nm-setting-ovs-interface.c:206
- #, c-format
--msgid ""
--"A connection with ovs-interface.type '%s' setting a 'ovs-patch' setting"
-+msgid "A connection with ovs-interface.type '%s' setting a 'ovs-patch' setting"
- msgstr "ovs-interface.type과의 연결 '%s' 'ovs-patch'설정하기"
-
--#: ../libnm-core/nm-setting-ovs-interface.c:235
-+#: ../libnm-core/nm-setting-ovs-interface.c:231
- #, c-format
- msgid "Missing ovs interface setting"
- msgstr "누락 된 ovs 인터페이스 설정"
-
--#: ../libnm-core/nm-setting-ovs-interface.c:241
-+#: ../libnm-core/nm-setting-ovs-interface.c:237
- #, c-format
- msgid "Missing ovs interface type"
- msgstr "누락 된 ovs 인터페이스 유형"
-
--#: ../libnm-core/nm-setting-ovs-interface.c:282
--#: ../libnm-core/nm-setting-ovs-port.c:195
-+#: ../libnm-core/nm-setting-ovs-interface.c:278
-+#: ../libnm-core/nm-setting-ovs-port.c:181
- #, c-format
- msgid "A connection with a '%s' setting must have a master."
- msgstr "'%s' 설정에는 마스터가 있어야합니다."
-
--#: ../libnm-core/nm-setting-ovs-patch.c:103
--#: ../libnm-core/nm-setting-vxlan.c:352
--#, c-format
--msgid "'%s' is not a valid IP address"
--msgstr "'%s'은(는) 유효한 IP 주소가 아닙니다."
--
--#: ../libnm-core/nm-setting-ovs-port.c:220
-+#: ../libnm-core/nm-setting-ovs-port.c:206
- #, c-format
- msgid "'%s' is not allowed in vlan_mode"
- msgstr "'%s' vlan_mode에서 허용되지 않습니다."
-
--#: ../libnm-core/nm-setting-ovs-port.c:230
-+#: ../libnm-core/nm-setting-ovs-port.c:216
- #, c-format
- msgid "the tag id must be in range 0-4094 but is %u"
- msgstr "태그 ID는 0-4094 범위 내에 있어야하지만 %u"
-
--#: ../libnm-core/nm-setting-ovs-port.c:240
-+#: ../libnm-core/nm-setting-ovs-port.c:226
- #, c-format
- msgid "'%s' is not allowed in lacp"
- msgstr "'%s' lacp에서는 허용되지 않습니다."
-
--#: ../libnm-core/nm-setting-ovs-port.c:250
-+#: ../libnm-core/nm-setting-ovs-port.c:236
- #, c-format
- msgid "'%s' is not allowed in bond_mode"
- msgstr "'%s' bond_mode에 허용되지 않습니다."
-
--#: ../libnm-core/nm-setting-ppp.c:350
-+#: ../libnm-core/nm-setting-ppp.c:336
- #, c-format
- msgid "'%d' is out of valid range <128-16384>"
- msgstr "'%d'는 유효한 범위 밖에 있습니다"
-
--#: ../libnm-core/nm-setting-ppp.c:363
-+#: ../libnm-core/nm-setting-ppp.c:349
- #, c-format
- msgid "setting this property requires non-zero '%s' property"
- msgstr "이 속성을 설정하려면 0이 아닌 '%s' 속성이 필요합니다 "
-
--#: ../libnm-core/nm-setting-proxy.c:146
-+#: ../libnm-core/nm-setting-proxy.c:129
- #, c-format
- msgid "invalid proxy method"
- msgstr "유효하지 않은 프록시 메소드"
-
--#: ../libnm-core/nm-setting-proxy.c:156 ../libnm-core/nm-setting-proxy.c:165
-+#: ../libnm-core/nm-setting-proxy.c:139 ../libnm-core/nm-setting-proxy.c:148
- #, c-format
- msgid "this property is not allowed for method none"
- msgstr "이 속성은 메서드 none에 허용되지 않습니다."
-
--#: ../libnm-core/nm-setting-proxy.c:176
-+#: ../libnm-core/nm-setting-proxy.c:159
- #, c-format
- msgid "the script is too large"
- msgstr "스크립트가 너무 큽니다."
-
--#: ../libnm-core/nm-setting-proxy.c:184
-+#: ../libnm-core/nm-setting-proxy.c:167
- #, c-format
- msgid "the script is not valid utf8"
- msgstr "스크립트가 유효하지 않습니다 utf8"
-
--#: ../libnm-core/nm-setting-proxy.c:192
-+#: ../libnm-core/nm-setting-proxy.c:175
- #, c-format
- msgid "the script lacks FindProxyForURL function"
- msgstr "스크립트에 FindProxyForURL 함수가 없습니다."
-
--#: ../libnm-core/nm-setting-sriov.c:1074
-+#: ../libnm-core/nm-setting-sriov.c:1070
- #, c-format
- msgid "VF with index %u, but the total number of VFs is %u"
- msgstr "색인이있는 VF %u, 그러나 총 VF 수는 %u"
-
--#: ../libnm-core/nm-setting-sriov.c:1085
-+#: ../libnm-core/nm-setting-sriov.c:1081
- #, c-format
- msgid "invalid VF %u: %s"
- msgstr "잘못된 VF %u: %s"
-
--#: ../libnm-core/nm-setting-sriov.c:1097
-+#: ../libnm-core/nm-setting-sriov.c:1093
- #, c-format
- msgid "duplicate VF index %u"
- msgstr "중복 VF 지수 %u"
-
--#: ../libnm-core/nm-setting-sriov.c:1118
-+#: ../libnm-core/nm-setting-sriov.c:1114
- #, c-format
- msgid "VFs %d and %d are not sorted by ascending index"
- msgstr "VF %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
-+#: ../libnm-core/nm-setting-tc-config.c:56
-+#: ../libnm-core/nm-setting-tc-config.c:422
-+#: ../libnm-core/nm-setting-tc-config.c:692
-+#, c-format
- msgid "kind is missing"
--msgstr "속성이 누락되어 있습니다 "
-+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
--#, fuzzy, c-format
-+#: ../libnm-core/nm-setting-tc-config.c:64
-+#: ../libnm-core/nm-setting-tc-config.c:430
-+#: ../libnm-core/nm-setting-tc-config.c:700
-+#, c-format
- msgid "'%s' is not a valid kind"
--msgstr "'%s'는 올바른 밴드가 아닙니다 "
-+msgstr "'%s'는 올바른 밴드가 아닙니다"
-
--#: ../libnm-core/nm-setting-tc-config.c:86
--#: ../libnm-core/nm-setting-tc-config.c:722
--#, fuzzy
-+#: ../libnm-core/nm-setting-tc-config.c:72
-+#: ../libnm-core/nm-setting-tc-config.c:708
- msgid "parent handle missing"
--msgstr "데이터 누락"
-+msgstr "부모 핸들이 없습니다."
-
--#: ../libnm-core/nm-setting-tc-config.c:1292
-+#: ../libnm-core/nm-setting-tc-config.c:1278
- msgid "there are duplicate TC qdiscs"
- msgstr "중복 된 TC qdisc가 있습니다."
-
--#: ../libnm-core/nm-setting-tc-config.c:1312
-+#: ../libnm-core/nm-setting-tc-config.c:1298
- msgid "there are duplicate TC filters"
- msgstr "중복되는 TC 필터가 있습니다."
-
--#: ../libnm-core/nm-setting-team.c:129 ../libnm-core/nm-setting-team.c:190
--#: ../libnm-core/nm-setting-team.c:312
-+#: ../libnm-core/nm-setting-team.c:115 ../libnm-core/nm-setting-team.c:176
-+#: ../libnm-core/nm-setting-team.c:298
- #, c-format
- msgid "%s is out of range [0, %d]"
- msgstr "값 '%s'이 범위 %d 밖에 있습니다 "
-
--#: ../libnm-core/nm-setting-team.c:172
-+#: ../libnm-core/nm-setting-team.c:158
- #, c-format
- msgid "Missing target-host in nsna_ping link watcher"
- msgstr "nsna_ping 링크 감시자에서 target-host가 누락되었습니다."
-
--#: ../libnm-core/nm-setting-team.c:178 ../libnm-core/nm-setting-team.c:294
--#, fuzzy, c-format
-+#: ../libnm-core/nm-setting-team.c:164 ../libnm-core/nm-setting-team.c:280
-+#, c-format
- msgid "target-host '%s' contains invalid characters"
--msgstr "IV에 16진수 숫자가 아닌 문자가 있습니다."
-+msgstr "대상 호스트 ' %s '에 유효하지 않은 문자가 포함되어 있습니다"
-
--#: ../libnm-core/nm-setting-team.c:287
-+#: ../libnm-core/nm-setting-team.c:273
- #, c-format
- msgid "Missing %s in arp_ping link watcher"
- msgstr "있어야 할 곳에 없는 %s arp_ping 링크 감시자에서"
-
--#: ../libnm-core/nm-setting-team.c:300
--#, fuzzy, c-format
-+#: ../libnm-core/nm-setting-team.c:286
-+#, c-format
- msgid "source-host '%s' contains invalid characters"
--msgstr "IV에 16진수 숫자가 아닌 문자가 있습니다."
-+msgstr "소스 호스트 ' %s '에 유효하지 않은 문자가 포함되어 있습니다"
-
--#: ../libnm-core/nm-setting-team.c:318
--#, fuzzy
-+#: ../libnm-core/nm-setting-team.c:304
- msgid "vlanid is out of range [-1, 4094]"
--msgstr "값 '%d'이 범위 <%d-%d> 밖에 있습니다 "
-+msgstr "블라 니드가 범위를 벗어남 [-1, 4094]"
-
--#: ../libnm-core/nm-setting-tun.c:165
-+#: ../libnm-core/nm-setting-tun.c:151
- #, c-format
- msgid "'%u': invalid mode"
- msgstr "'%u': 잘못된 모드"
-
--#: ../libnm-core/nm-setting-tun.c:175
-+#: ../libnm-core/nm-setting-tun.c:161
- #, c-format
- msgid "'%s': invalid user ID"
- msgstr "'%s': 잘못된 사용자 ID"
-
--#: ../libnm-core/nm-setting-tun.c:186
-+#: ../libnm-core/nm-setting-tun.c:172
- #, c-format
- msgid "'%s': invalid group ID"
- msgstr "'%s': 잘못된 그룹 ID"
-
--#: ../libnm-core/nm-setting-user.c:107
--#, fuzzy
-+#: ../libnm-core/nm-setting-user.c:93
- msgid "missing key"
--msgstr "누락된 설정"
-+msgstr "누락 된 키"
-
--#: ../libnm-core/nm-setting-user.c:113
--#, fuzzy
-+#: ../libnm-core/nm-setting-user.c:99
- msgid "key is too long"
--msgstr "오류: ssid가 너무 깁니다."
-+msgstr "키가 너무 깁니다"
-
--#: ../libnm-core/nm-setting-user.c:118
--#, fuzzy
-+#: ../libnm-core/nm-setting-user.c:104
- msgid "key must be UTF8"
--msgstr "암호는 UTF-8이어야 합니다"
-+msgstr "키는 UTF8이어야합니다"
-
--#: ../libnm-core/nm-setting-user.c:141
-+#: ../libnm-core/nm-setting-user.c:127
- msgid "key requires a '.' for a namespace"
- msgstr "키에는 '.'이 필요합니다. 네임 스페이스에 대한"
-
--#: ../libnm-core/nm-setting-user.c:154
-+#: ../libnm-core/nm-setting-user.c:140
- msgid "key cannot contain \"..\""
- msgstr "키에는 \"..\"이 포함될 수 없습니다."
-
--#: ../libnm-core/nm-setting-user.c:159
--#, fuzzy
-+#: ../libnm-core/nm-setting-user.c:145
- msgid "key contains invalid characters"
--msgstr "IV에 16진수 숫자가 아닌 문자가 있습니다."
-+msgstr "키에 잘못된 문자가 포함되어 있습니다"
-
--#: ../libnm-core/nm-setting-user.c:184
--#, fuzzy
-+#: ../libnm-core/nm-setting-user.c:170
- msgid "value is missing"
--msgstr "속성이 누락되어 있습니다 "
-+msgstr "가치가 없다"
-
--#: ../libnm-core/nm-setting-user.c:191
-+#: ../libnm-core/nm-setting-user.c:177
- msgid "value is too large"
- msgstr "'' 값은 범위 밖에 있습니다 "
-
--#: ../libnm-core/nm-setting-user.c:197
-+#: ../libnm-core/nm-setting-user.c:183
- msgid "value is not valid UTF8"
- msgstr "''은 올바른 UUID가 아닙니다 "
-
--#: ../libnm-core/nm-setting-user.c:327
-+#: ../libnm-core/nm-setting-user.c:313
- msgid "maximum number of user data entries reached"
- msgstr "최대 사용자 데이터 항목 수에 도달했습니다."
-
--#: ../libnm-core/nm-setting-user.c:368
-+#: ../libnm-core/nm-setting-user.c:354
- #, c-format
- msgid "invalid key \"%s\": %s"
- msgstr "유효하지 않은 키 \"%s\": %s"
-
--#: ../libnm-core/nm-setting-user.c:387
-+#: ../libnm-core/nm-setting-user.c:373
- #, c-format
- msgid "maximum number of user data entries reached (%u instead of %u)"
- msgstr "도달 한 최대 사용자 데이터 항목 수 (%u 대신에 %u)"
-
--#: ../libnm-core/nm-setting-vlan.c:649
-+#: ../libnm-core/nm-setting-vlan.c:636
- #, c-format
- msgid "the vlan id must be in range 0-4094 but is %u"
- msgstr "vlan ID가 0~4094 범위에 속해야 하지만 현재 %u입니다"
-
--#: ../libnm-core/nm-setting-vlan.c:659
-+#: ../libnm-core/nm-setting-vlan.c:646
- msgid "flags are invalid"
- msgstr "플래그가 잘못되어 있습니다 "
-
--#: ../libnm-core/nm-setting-vlan.c:671
-+#: ../libnm-core/nm-setting-vlan.c:658
- msgid "vlan setting should have a ethernet setting as well"
- msgstr "VLAN 설정은 이더넷 설정을 가져야합니다."
-
--#: ../libnm-core/nm-setting-vpn.c:560
-+#: ../libnm-core/nm-setting-vrf.c:75
-+msgid "table cannot be zero"
-+msgstr "크기가 0이될 수 없습니다"
-+
-+#: ../libnm-core/nm-setting-vpn.c:581
- msgid "cannot set connection.multi-connect for VPN setting"
- msgstr "VPN 설정을 위해 connection.multi-connect를 설정할 수 없습니다."
-
--#: ../libnm-core/nm-setting-vpn.c:581
--#, c-format
--msgid "secret was empty"
--msgstr "secret이 비어 있었습니다."
--
--#: ../libnm-core/nm-setting-vpn.c:611
-+#: ../libnm-core/nm-setting-vpn.c:626
- msgid "setting contained a secret with an empty name"
- msgstr "설정에 이름이 빈 Secret이 포합되어 있습니다"
-
--#: ../libnm-core/nm-setting-vpn.c:619
--#, c-format
--msgid "secret value was empty"
--msgstr "Secret 값이 비어 있었습니다"
--
--#: ../libnm-core/nm-setting-vpn.c:666 ../libnm-core/nm-setting.c:2224
-+#: ../libnm-core/nm-setting-vpn.c:666 ../libnm-core/nm-setting.c:2138
- msgid "not a secret property"
- msgstr "Secret 속성이 아님"
-
-@@ -11535,898 +11162,911 @@ msgstr "Secret 속성이 아님"
- msgid "secret is not of correct type"
- msgstr "Secret은 올바른 유형이 아닙니다"
-
--#: ../libnm-core/nm-setting-vpn.c:756
--#, fuzzy
-+#: ../libnm-core/nm-setting-vpn.c:749 ../libnm-core/nm-setting-vpn.c:798
-+#, c-format
-+msgid "secret name cannot be empty"
-+msgstr "사용자 이름을 입력하셔야 합니다"
-+
-+#: ../libnm-core/nm-setting-vpn.c:765
- msgid "secret flags property not found"
--msgstr "secret 플래그 속성 '%s'(을)를 찾을 수 없음"
-+msgstr "비밀 플래그 속성을 찾을 수 없음"
-
--#: ../libnm-core/nm-setting-vxlan.c:365
-+#: ../libnm-core/nm-setting-vxlan.c:338
-+#, c-format
-+msgid "'%s' is not a valid IP address"
-+msgstr "'%s'은(는) 유효한 IP 주소가 아닙니다."
-+
-+#: ../libnm-core/nm-setting-vxlan.c:351
- #, c-format
- msgid "'%s' is not a valid IP%c address"
- msgstr "'%s'은(는) 유효한 IP%c 주소가 아닙니다."
-
--#: ../libnm-core/nm-setting-vxlan.c:392
-+#: ../libnm-core/nm-setting-vxlan.c:378
- #, c-format
- msgid "%d is greater than local port max %d"
- msgstr "%d이(가) 로컬 포트 최대 %d보다 큽니다"
-
--#: ../libnm-core/nm-setting-wired.c:752
-+#: ../libnm-core/nm-setting-wired.c:738
- #, c-format
- msgid "'%s' is not a valid Ethernet port value"
- msgstr "'%s'은(는) 유효한 이더넷 포트 값이 아닙니다."
-
--#: ../libnm-core/nm-setting-wired.c:762
-+#: ../libnm-core/nm-setting-wired.c:748
- #, c-format
- msgid "'%s' is not a valid duplex value"
- msgstr "'%s'은 올바른 이중 값이 아닙니다 "
-
--#: ../libnm-core/nm-setting-wired.c:825
-+#: ../libnm-core/nm-setting-wired.c:811
- #, c-format
- msgid "invalid '%s' or its value '%s'"
- msgstr "잘못된 '%s' 또는 값 '%s'"
-
--#: ../libnm-core/nm-setting-wired.c:863
-+#: ../libnm-core/nm-setting-wired.c:849
- msgid "Wake-on-LAN mode 'default' and 'ignore' are exclusive flags"
- msgstr "Wake-on-LAN 모드 'default' 및 'ignore'는 독점 플래그입니다"
-
--#: ../libnm-core/nm-setting-wired.c:872
-+#: ../libnm-core/nm-setting-wired.c:858
- msgid "Wake-on-LAN password can only be used with magic packet mode"
- msgstr "Wake-on-LAN 암호는 매직 패킷 모드에서만 사용할 수 있습니다"
-
--#: ../libnm-core/nm-setting-wired.c:898
--msgid ""
--"both speed and duplex should have a valid value or both should be unset"
-+#: ../libnm-core/nm-setting-wired.c:884
-+msgid "both speed and duplex should have a valid value or both should be unset"
- msgstr "속도와 이중 모드 모두 유효한 값을 가져야하거나 둘 다 설정 해제되어야합니다."
-
--#: ../libnm-core/nm-setting-wired.c:899
-+#: ../libnm-core/nm-setting-wired.c:885
- msgid "both speed and duplex are required for static link configuration"
- msgstr "정적 링크 구성에는 속도와 이중 모드가 모두 필요합니다."
-
--#: ../libnm-core/nm-setting-wireguard.c:778
-+#: ../libnm-core/nm-setting-wireguard.c:764
- msgid "missing public-key for peer"
--msgstr ""
-+msgstr "피어의 공개 키가 없습니다."
-
--#: ../libnm-core/nm-setting-wireguard.c:782
-+#: ../libnm-core/nm-setting-wireguard.c:768
- msgid "invalid public-key for peer"
--msgstr ""
-+msgstr "피어의 잘못된 공개 키"
-
--#: ../libnm-core/nm-setting-wireguard.c:791
--#, fuzzy
-+#: ../libnm-core/nm-setting-wireguard.c:777
- msgid "invalid preshared-key for peer"
--msgstr "잘못된 개인 키"
-+msgstr "피어에 대한 잘못된 사전 공유 키"
-
--#: ../libnm-core/nm-setting-wireguard.c:809
--#, fuzzy
-+#: ../libnm-core/nm-setting-wireguard.c:795
- msgid "invalid endpoint for peer"
--msgstr "부모 인터페이스 [none]: "
-+msgstr "피어에 대한 유효하지 않은 엔드 포인트"
-
--#: ../libnm-core/nm-setting-wireguard.c:819
--#, fuzzy, c-format
-+#: ../libnm-core/nm-setting-wireguard.c:805
-+#, c-format
- msgid "invalid IP address \"%s\" for allowed-ip of peer"
--msgstr "잘못된 IP 주소: %s"
-+msgstr "잘못된 IP 주소 \" %s \"피어의 허용 된 IP의 경우"
-
--#: ../libnm-core/nm-setting-wireguard.c:828
-+#: ../libnm-core/nm-setting-wireguard.c:814
- msgid "invalid preshared-key-flags for peer"
--msgstr ""
-+msgstr "피어에 대한 잘못된 사전 공유 키 플래그"
-
--#: ../libnm-core/nm-setting-wireguard.c:1604
-+#: ../libnm-core/nm-setting-wireguard.c:1590
- #, c-format
- msgid "peer #%u has no public-key"
--msgstr ""
-+msgstr "동료 # %u 공개 키가 없다"
-
--#: ../libnm-core/nm-setting-wireguard.c:1615
-+#: ../libnm-core/nm-setting-wireguard.c:1601
- #, c-format
- msgid "peer #%u has invalid public-key"
--msgstr ""
-+msgstr "동료 # %u 공개 키가 유효하지 않습니다"
-
--#: ../libnm-core/nm-setting-wireguard.c:1629
-+#: ../libnm-core/nm-setting-wireguard.c:1615
- #, c-format
- msgid "peer #%u has invalid endpoint"
--msgstr ""
-+msgstr "동료 # %u 엔드 포인트가 유효하지 않습니다"
-
--#: ../libnm-core/nm-setting-wireguard.c:1659
-+#: ../libnm-core/nm-setting-wireguard.c:1645
- #, c-format
- msgid "peer #%u has invalid allowed-ips setting"
--msgstr ""
-+msgstr "동료 # %u 잘못된 허용 IP 설정이 있습니다"
-
--#: ../libnm-core/nm-setting-wireguard.c:1671
--#, fuzzy, c-format
-+#: ../libnm-core/nm-setting-wireguard.c:1657
-+#, c-format
- msgid "peer #%u is invalid: %s"
--msgstr "인증서가 잘못됨: %s"
-+msgstr "동료 # %u 유효하지 않다: %s"
-
--#: ../libnm-core/nm-setting-wireguard.c:1742
--#: ../libnm-core/nm-setting-wireguard.c:1757
-+#: ../libnm-core/nm-setting-wireguard.c:1728
-+#: ../libnm-core/nm-setting-wireguard.c:1743
- #, c-format
- msgid "method \"%s\" is not supported for WireGuard"
--msgstr ""
-+msgstr "방법 \" %s \"는 WireGuard에서 지원되지 않습니다"
-
--#: ../libnm-core/nm-setting-wireguard.c:1777
-+#: ../libnm-core/nm-setting-wireguard.c:1763
- msgid "key must be 32 bytes base64 encoded"
--msgstr ""
-+msgstr "키는 32 바이트 여야합니다. base64로 인코딩 됨"
-
--#: ../libnm-core/nm-setting-wireguard.c:1913
--#, fuzzy
-+#: ../libnm-core/nm-setting-wireguard.c:1899
- msgid "invalid peer secrets"
--msgstr "잘못된 VPN 비밀정보"
-+msgstr "잘못된 동료 비밀"
-
--#: ../libnm-core/nm-setting-wireguard.c:1936
-+#: ../libnm-core/nm-setting-wireguard.c:1922
- #, c-format
- msgid "peer #%u lacks public-key"
--msgstr ""
-+msgstr "동료 # %u 공개 키가 없다"
-
--#: ../libnm-core/nm-setting-wireguard.c:1950
-+#: ../libnm-core/nm-setting-wireguard.c:1936
- #, c-format
- msgid "non-existing peer '%s'"
--msgstr ""
-+msgstr "존재하지 않는 피어 ' %s '"
-
--#: ../libnm-core/nm-setting-wireless-security.c:928
--#, fuzzy, c-format
-+#: ../libnm-core/nm-setting-wireless-security.c:905
-+#, c-format
- msgid "'%s' is not a valid value for '%s' mode connections"
--msgstr "'%s'은 '%s'의 올바른 값이 아닙니다 "
-+msgstr "' %s '은 (는) 유효한 값이 아닙니다. %s '모드 연결"
-
--#: ../libnm-core/nm-setting-wireless-security.c:951
-+#: ../libnm-core/nm-setting-wireless-security.c:928
- #, c-format
- msgid "'%s' security requires '%s=%s'"
- msgstr "'%s' 보안에는 '%s=%s'가 필요합니다 "
-
--#: ../libnm-core/nm-setting-wireless-security.c:972
-+#: ../libnm-core/nm-setting-wireless-security.c:949
- #, c-format
- msgid "'%s' security requires '%s' setting presence"
- msgstr "'%s' 보안에는 '%s' 설정이 필요합니다 "
-
--#: ../libnm-core/nm-setting-wireless-security.c:993
-+#: ../libnm-core/nm-setting-wireless-security.c:970
- #, c-format
- msgid "'%d' value is out of range <0-3>"
- msgstr "'%d' 값은 범위 밖에 있습니다"
-
--#: ../libnm-core/nm-setting-wireless-security.c:1048
--#, c-format
--msgid "'%s' connections require '%s' in this property"
--msgstr "'%s' 연결에는 속성에 '%s'이 필요합니다 "
--
--#: ../libnm-core/nm-setting-wireless-security.c:1078
-+#: ../libnm-core/nm-setting-wireless-security.c:1029
- #, c-format
- msgid "'%s' can only be used with '%s=%s' (WEP)"
- msgstr "'%s'은 '%s=%s'와 함께만 사용할 수 있습니다 (WEP)"
-
--#: ../libnm-core/nm-setting-wireless-security.c:1102
--#, fuzzy, c-format
-+#: ../libnm-core/nm-setting-wireless-security.c:1053
-+#, c-format
- msgid ""
- "'%s' can only be used with 'wpa-eap', 'wpa-psk' or 'sae' key management "
--msgstr "'%s'은 '%s=%s'와 함께만 사용할 수 있습니다 (WEP)"
-+msgstr "' %s '는'wpa-eap ','wpa-psk '또는'sae '키 관리에만 사용할 수 있습니다 "
-
--#: ../libnm-core/nm-setting-wireless.c:795
-+#: ../libnm-core/nm-setting-wireless.c:783
- #, c-format
- msgid "'%s' is not a valid Wi-Fi mode"
- msgstr "'%s'은 올바른 Wi-Fi 모드가 아닙니다 "
-
--#: ../libnm-core/nm-setting-wireless.c:805
-+#: ../libnm-core/nm-setting-wireless.c:793
- #, c-format
- msgid "'%s' is not a valid band"
- msgstr "'%s'는 올바른 밴드가 아닙니다 "
-
--#: ../libnm-core/nm-setting-wireless.c:815
-+#: ../libnm-core/nm-setting-wireless.c:803
- #, c-format
- msgid "'%s' requires setting '%s' property"
- msgstr "'%s'에는 설정 '%s' 속성이 필요합니다."
-
--#: ../libnm-core/nm-setting-wireless.c:837
--#, fuzzy, c-format
-+#: ../libnm-core/nm-setting-wireless.c:825
-+#, c-format
- msgid "'%s' requires '%s' and '%s' property"
--msgstr "'%s'에는 설정 '%s' 속성이 필요합니다."
-+msgstr "' %s '필요' %s '와' %s ' 특성"
-
--#: ../libnm-core/nm-setting-wireless.c:924 ../libnm-core/nm-team-utils.c:2004
-+#: ../libnm-core/nm-setting-wireless.c:912 ../libnm-core/nm-team-utils.c:1990
- #, c-format
- msgid "invalid value"
- msgstr "잘못된 값"
-
--#: ../libnm-core/nm-setting-wireless.c:934
-+#: ../libnm-core/nm-setting-wireless.c:922
- msgid "Wake-on-WLAN mode 'default' and 'ignore' are exclusive flags"
- msgstr "Wake-on-LAN 모드 'default' 및 'ignore'는 독점 플래그입니다"
-
--#: ../libnm-core/nm-setting-wireless.c:943
-+#: ../libnm-core/nm-setting-wireless.c:931
- msgid "Wake-on-WLAN trying to set unknown flag"
- msgstr "알 수없는 플래그를 설정하려는 WOL (Wake-on-WLAN)"
-
--#: ../libnm-core/nm-setting-wireless.c:965
-+#: ../libnm-core/nm-setting-wireless.c:953
- #, c-format
- msgid "conflicting value of mac-address-randomization and cloned-mac-address"
- msgstr "mac-address-randomization과 복제 된 mac 주소의 충돌하는 가치"
-
--#: ../libnm-core/nm-setting-wpan.c:185
-+#: ../libnm-core/nm-setting-wpan.c:171
- msgid "page must be defined along with a channel"
--msgstr ""
-+msgstr "채널과 함께 페이지를 정의해야합니다"
-
--#: ../libnm-core/nm-setting-wpan.c:194
-+#: ../libnm-core/nm-setting-wpan.c:180
- #, c-format
- msgid "page must be between %d and %d"
--msgstr ""
-+msgstr "크기는 %d과 %d 사이이어야 합니다"
-
--#: ../libnm-core/nm-setting-wpan.c:205
-+#: ../libnm-core/nm-setting-wpan.c:191
- #, c-format
- msgid "channel must not be between %d and %d"
--msgstr ""
-+msgstr "채널 사이에 있지 않아야합니다 %d 과 %d"
-
--#: ../libnm-core/nm-setting.c:919
-+#: ../libnm-core/nm-setting.c:809
- #, c-format
- msgid "duplicate property"
- msgstr "중복 속성"
-
--#: ../libnm-core/nm-setting.c:942
-+#: ../libnm-core/nm-setting.c:832
- #, c-format
- msgid "unknown property"
- msgstr "알 수 없는 속성"
-
--#: ../libnm-core/nm-setting.c:1013 ../libnm-core/nm-setting.c:1062
-+#: ../libnm-core/nm-setting.c:914 ../libnm-core/nm-setting.c:963
- #, c-format
- msgid "can't set property of type '%s' from value of type '%s'"
- msgstr "유형 '%s'의 속성을 유형 '%s'의 값에서 설정할 수 없습니다"
-
--#: ../libnm-core/nm-setting.c:1032 ../libnm-core/nm-setting.c:1047
-+#: ../libnm-core/nm-setting.c:933 ../libnm-core/nm-setting.c:948
- #, c-format
- msgid "failed to set property: %s"
- msgstr "속성 설정 실패: %s"
-
--#: ../libnm-core/nm-setting.c:1077
-+#: ../libnm-core/nm-setting.c:978
- #, c-format
- msgid "can not set property: %s"
- msgstr "속성을 설정할 수 없음: %s"
-
--#: ../libnm-core/nm-setting.c:2115
-+#: ../libnm-core/nm-setting.c:2029
- msgid "secret not found"
- msgstr "Secret을 찾을 수 없음"
-
--#: ../libnm-core/nm-team-utils.c:1338 ../libnm-core/nm-team-utils.c:1353
--#, fuzzy, c-format
-+#: ../libnm-core/nm-team-utils.c:1324 ../libnm-core/nm-team-utils.c:1339
-+#, c-format
- msgid "invalid D-Bus property \"%s\""
--msgstr "잘못된 라우팅: %s'"
-+msgstr "잘못된 D- 버스 속성 \" %s \""
-
--#: ../libnm-core/nm-team-utils.c:1363
--#, fuzzy, c-format
-+#: ../libnm-core/nm-team-utils.c:1349
-+#, c-format
- msgid "duplicate D-Bus property \"%s\""
--msgstr "중복 속성"
-+msgstr "중복 D- 버스 속성 \" %s \""
-
--#: ../libnm-core/nm-team-utils.c:1384
--#, fuzzy, c-format
-+#: ../libnm-core/nm-team-utils.c:1370
-+#, c-format
- msgid "invalid D-Bus property \"%s\" for \"%s\""
--msgstr "잘못된 필드 '%d'; 허용되는 필드: %s"
-+msgstr "잘못된 D- 버스 속성 \" %s \"\" %s \""
-
--#: ../libnm-core/nm-team-utils.c:1442
--#, fuzzy, c-format
-+#: ../libnm-core/nm-team-utils.c:1428
-+#, c-format
- msgid "unknown link-watcher name \"%s\""
--msgstr "알려지지 않은 로그 영역 '%s'"
-+msgstr "알 수없는 링크 감시자 이름 \" %s \""
-
--#: ../libnm-core/nm-team-utils.c:1993
--#, fuzzy, c-format
-+#: ../libnm-core/nm-team-utils.c:1979
-+#, c-format
- msgid "value out or range"
--msgstr "최소 소스 포트 [0]"
-+msgstr "가치 또는 범위"
-
--#: ../libnm-core/nm-team-utils.c:2023
--#, fuzzy, c-format
-+#: ../libnm-core/nm-team-utils.c:2009
-+#, c-format
- msgid "invalid runner-tx-hash"
--msgstr "잘못된 라우팅: %s'"
-+msgstr "잘못된 러너 -TX- 해시"
-
--#: ../libnm-core/nm-team-utils.c:2050
--#, fuzzy, c-format
-+#: ../libnm-core/nm-team-utils.c:2036
-+#, c-format
- msgid "%s is only allowed for runner %s"
--msgstr "'%s' lacp에서는 허용되지 않습니다."
-+msgstr "%s 러너에게만 허용 %s"
-
--#: ../libnm-core/nm-team-utils.c:2058
--#, fuzzy, c-format
-+#: ../libnm-core/nm-team-utils.c:2044
-+#, c-format
- msgid "%s is only allowed for runners %s"
--msgstr "'%s' 옵션은 '%s=%s'에만 유효합니다 "
-+msgstr "%s 주자 만 허용 %s"
-
--#: ../libnm-core/nm-team-utils.c:2075
-+#: ../libnm-core/nm-team-utils.c:2061
- #, c-format
- msgid "cannot set parameters for lacp and activebackup runners together"
--msgstr ""
-+msgstr "lacp 및 activebackup 러너에 대한 매개 변수를 함께 설정할 수 없습니다"
-
--#: ../libnm-core/nm-team-utils.c:2084
--#, fuzzy, c-format
-+#: ../libnm-core/nm-team-utils.c:2070
-+#, c-format
- msgid "missing link watcher"
--msgstr "누락된 파일 이름"
-+msgstr "누락 된 링크 감시자"
-
--#: ../libnm-core/nm-team-utils.c:2106
-+#: ../libnm-core/nm-team-utils.c:2092
- #, c-format
- msgid "team config exceeds size limit"
- msgstr "팀 구성이 크기 제한을 초과합니다."
-
--#: ../libnm-core/nm-team-utils.c:2112
--#, fuzzy, c-format
-+#: ../libnm-core/nm-team-utils.c:2098
-+#, c-format
- msgid "team config is not valid UTF-8"
--msgstr "URI가 유효한 UTF-8이 아닙니다."
-+msgstr "팀 구성이 UTF-8이 아닙니다."
-
--#: ../libnm-core/nm-team-utils.c:2118
--#: ../src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c:9014
--#, fuzzy, c-format
-+#: ../libnm-core/nm-team-utils.c:2104
-+#: ../src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c:9088
-+#, c-format
- msgid "invalid json"
--msgstr "잘못된 옵션 ''"
-+msgstr "잘못된 JSON"
-
--#: ../libnm-core/nm-team-utils.c:2272
--#, fuzzy, c-format
-+#: ../libnm-core/nm-team-utils.c:2258
-+#, c-format
- msgid "invalid D-Bus type \"%s\""
--msgstr "잘못된 라우팅: %s'"
-+msgstr "유효하지 않은 D- 버스 유형 \" %s \""
-
--#: ../libnm-core/nm-team-utils.c:2311
--#, fuzzy, c-format
-+#: ../libnm-core/nm-team-utils.c:2297
-+#, c-format
- msgid "invalid link-watchers: %s"
--msgstr "잘못된 라우팅: %s'"
-+msgstr "잘못된 링크 감시자 : %s"
-
--#: ../libnm-core/nm-utils.c:2327
--#, fuzzy, c-format
-+#: ../libnm-core/nm-utils.c:2298
-+#, c-format
- msgid "'%s' is not a valid handle."
--msgstr "'%s'는 올바른 밴드가 아닙니다 "
-+msgstr "' %s '는 유효한 핸들이 아닙니다."
-
--#: ../libnm-core/nm-utils.c:2455
-+#: ../libnm-core/nm-utils.c:2446
- #, c-format
- msgid "'%s' unexpected: parent already specified."
- msgstr "'%s' unexpected : 부모가 이미 지정되었습니다."
-
--#: ../libnm-core/nm-utils.c:2471
--#, fuzzy, c-format
-+#: ../libnm-core/nm-utils.c:2462
-+#, c-format
- msgid "invalid handle: '%s'"
--msgstr "잘못된 옵션 '%s'"
-+msgstr "잘못된 핸들 : ' %s '"
-
--#: ../libnm-core/nm-utils.c:2493
--#, fuzzy
-+#: ../libnm-core/nm-utils.c:2484
- msgid "parent not specified."
--msgstr "서비스 이름이 지정되지 않았습니다."
-+msgstr "부모가 지정되지 않았습니다."
-
--#: ../libnm-core/nm-utils.c:2555
-+#: ../libnm-core/nm-utils.c:2546
- #, c-format
- msgid "unsupported qdisc option: '%s'."
- msgstr "지원되지 않는 qdisc 옵션 : '%s'."
-
--#: ../libnm-core/nm-utils.c:2677
--#, fuzzy
-+#: ../libnm-core/nm-utils.c:2668
- msgid "action name missing."
--msgstr "데이터 누락"
-+msgstr "작업 이름이 없습니다."
-
--#: ../libnm-core/nm-utils.c:2703
-+#: ../libnm-core/nm-utils.c:2694
- #, c-format
- msgid "unsupported action option: '%s'."
- msgstr "지원되지 않는 작업 옵션 : '%s'."
-
--#: ../libnm-core/nm-utils.c:2841
-+#: ../libnm-core/nm-utils.c:2832
- msgid "invalid action: "
- msgstr "잘못된 옵션 ''"
-
--#: ../libnm-core/nm-utils.c:2845
-+#: ../libnm-core/nm-utils.c:2836
- #, c-format
- msgid "unsupported tfilter option: '%s'."
- msgstr "지원되지 않는 tfilter 옵션 : '%s'."
-
--#: ../libnm-core/nm-utils.c:3446
-+#: ../libnm-core/nm-utils.c:3437
- #, c-format
- msgid "failed stat file %s: %s"
- msgstr "실패한 통계 파일 %s: %s"
-
--#: ../libnm-core/nm-utils.c:3455
-+#: ../libnm-core/nm-utils.c:3446
- #, c-format
- msgid "not a file (%s)"
- msgstr "파일이 아닙니다(%s)."
-
--#: ../libnm-core/nm-utils.c:3466
-+#: ../libnm-core/nm-utils.c:3457
- #, c-format
- msgid "invalid file owner %d for %s"
- msgstr "잘못된 필드 '%d'; 허용되는 필드: %s"
-
--#: ../libnm-core/nm-utils.c:3477
-+#: ../libnm-core/nm-utils.c:3468
- #, c-format
- msgid "file permissions for %s"
- msgstr "%s의 파일 권한"
-
--#: ../libnm-core/nm-utils.c:3487
-+#: ../libnm-core/nm-utils.c:3478
- #, c-format
- msgid "reject %s"
- msgstr "%s 거부"
-
--#: ../libnm-core/nm-utils.c:3506
-+#: ../libnm-core/nm-utils.c:3497
- #, c-format
- msgid "path is not absolute (%s)"
- msgstr "절대 경로가 아닙니다(%s)"
-
--#: ../libnm-core/nm-utils.c:3520
-+#: ../libnm-core/nm-utils.c:3511
- #, c-format
- msgid "Plugin file does not exist (%s)"
- msgstr "플러그인 파일이 존재하지 않습니다(%s)"
-
--#: ../libnm-core/nm-utils.c:3528
-+#: ../libnm-core/nm-utils.c:3519
- #, c-format
- msgid "Plugin is not a valid file (%s)"
- msgstr "플러그인이 유효한 파일이 아닙니다(%s)"
-
--#: ../libnm-core/nm-utils.c:3538
-+#: ../libnm-core/nm-utils.c:3529
- #, c-format
- msgid "libtool archives are not supported (%s)"
- msgstr "립툴 아카이브가 지원되지 않습니다(%s)"
-
--#: ../libnm-core/nm-utils.c:3620
-+#: ../libnm-core/nm-utils.c:3611
- #, c-format
- msgid "Could not find \"%s\" binary"
- msgstr "'%s' 바이너리를 찾을 수 없습니다"
-
--#: ../libnm-core/nm-utils.c:4494
--#, fuzzy
-+#: ../libnm-core/nm-utils.c:4547
- msgid "unknown secret flags"
--msgstr "알 수 없는 설정 이름"
-+msgstr "알 수없는 비밀 플래그"
-
--#: ../libnm-core/nm-utils.c:4504
-+#: ../libnm-core/nm-utils.c:4557
- msgid "conflicting secret flags"
--msgstr ""
-+msgstr "충돌하는 비밀 플래그"
-
--#: ../libnm-core/nm-utils.c:4515
--#, fuzzy
-+#: ../libnm-core/nm-utils.c:4568
- msgid "secret flags must not be \"not-required\""
--msgstr "secret 플래그 속성 '%s'(을)를 찾을 수 없음"
-+msgstr "비밀 플래그는 \"필수\"가 아니어야합니다"
-
--#: ../libnm-core/nm-utils.c:4523
--#, fuzzy
-+#: ../libnm-core/nm-utils.c:4576
- msgid "unsupported secret flags"
--msgstr "지원되지 않는 qdisc 옵션 : '%s'."
-+msgstr "지원되지 않는 비밀 플래그"
-
--#: ../libnm-core/nm-utils.c:4553
-+#: ../libnm-core/nm-utils.c:4606
- msgid "can't be simultaneously disabled and enabled"
- msgstr "동시에 비활성화 및 활성화 할 수 없습니다."
-
--#: ../libnm-core/nm-utils.c:4561
--#, fuzzy
-+#: ../libnm-core/nm-utils.c:4614
- msgid "WPS is required"
--msgstr "PIN 코드가 필요합니다"
-+msgstr "WPS가 필요합니다"
-
--#: ../libnm-core/nm-utils.c:4627
-+#: ../libnm-core/nm-utils.c:4680
- #, c-format
- msgid "not a valid ethernet MAC address for mask at position %lld"
- msgstr "위치의 마스크에 유효한 이더넷 MAC 주소가 아닙니다. %lld"
-
--#: ../libnm-core/nm-utils.c:4642
-+#: ../libnm-core/nm-utils.c:4695
- #, c-format
- msgid "not a valid ethernet MAC address #%u at position %lld"
- msgstr "유효한 이더넷 MAC 주소가 아닙니다. #%u 위치에 %lld"
-
--#: ../libnm-core/nm-utils.c:4702
--#, fuzzy
--msgid "interface name is missing"
--msgstr "인터페이스 이름은 예약되어 있습니다."
--
--#: ../libnm-core/nm-utils.c:4708
--msgid "interface name is too short"
--msgstr "인터페이스 이름이 너무 짧습니다."
--
--#: ../libnm-core/nm-utils.c:4717
--msgid "interface name is reserved"
--msgstr "인터페이스 이름은 예약되어 있습니다."
--
--#: ../libnm-core/nm-utils.c:4729
--msgid "interface name contains an invalid character"
--msgstr "인터페이스 이름에 잘못된 문자가 있습니다."
--
--#: ../libnm-core/nm-utils.c:4735
--msgid "interface name is longer than 15 characters"
--msgstr "인터페이스 이름이 15자를 초과합니다."
--
--#: ../libnm-core/nm-utils.c:5402
-+#: ../libnm-core/nm-utils.c:5390
- msgid "not valid utf-8"
- msgstr "유효하지 않은 utf-8"
-
--#: ../libnm-core/nm-utils.c:5423 ../libnm-core/nm-utils.c:5476
-+#: ../libnm-core/nm-utils.c:5411 ../libnm-core/nm-utils.c:5464
- msgid "is not a JSON object"
- msgstr "JSON 개체가 아닙니다."
-
--#: ../libnm-core/nm-utils.c:5452 ../libnm-core/nm-utils.c:5489
-+#: ../libnm-core/nm-utils.c:5440 ../libnm-core/nm-utils.c:5477
- msgid "value is NULL"
- msgstr "값이 NULL 임"
-
--#: ../libnm-core/nm-utils.c:5452 ../libnm-core/nm-utils.c:5489
-+#: ../libnm-core/nm-utils.c:5440 ../libnm-core/nm-utils.c:5477
- msgid "value is empty"
- msgstr "값이 비어있다."
-
--#: ../libnm-core/nm-utils.c:5464
-+#: ../libnm-core/nm-utils.c:5452
- #, c-format
- msgid "invalid JSON at position %d (%s)"
- msgstr "위치에 잘못된 JSON %d (%s)"
-
--#: ../libnm-core/nm-utils.c:5584 ../libnm-core/nm-utils.c:5604
-+#: ../libnm-core/nm-utils.c:5597 ../libnm-core/nm-utils.c:5617
- msgid "unterminated escape sequence"
- msgstr "종료되지 않은 이스케이프 시퀀스"
-
--#: ../libnm-core/nm-utils.c:5629
--#, fuzzy, c-format
-+#: ../libnm-core/nm-utils.c:5642
-+#, c-format
- msgid "unknown attribute '%s'"
--msgstr "알 수 없는 장치 '%s'."
-+msgstr "알 수없는 속성 ' %s '"
-
--#: ../libnm-core/nm-utils.c:5644
-+#: ../libnm-core/nm-utils.c:5657
- #, c-format
- msgid "missing key-value separator '%c' after '%s'"
- msgstr "누락 된 키 - 값 구분 기호 '%c' 이후 '%s'"
-
--#: ../libnm-core/nm-utils.c:5660
--#, fuzzy, c-format
-+#: ../libnm-core/nm-utils.c:5673
-+#, c-format
- msgid "invalid uint32 value '%s' for attribute '%s'"
--msgstr "잘못된 옵션 '%s' 또는 옵션 값 '%s'"
-+msgstr "잘못된 uint32 값 ' %s '속성에' %s '"
-+
-+#: ../libnm-core/nm-utils.c:5682
-+#, c-format
-+msgid "invalid int32 value '%s' for attribute '%s'"
-+msgstr "잘못된 int32 값 ' %s '속성에' %s '"
-
--#: ../libnm-core/nm-utils.c:5669
--#, fuzzy, c-format
-+#: ../libnm-core/nm-utils.c:5691
-+#, c-format
-+msgid "invalid uint64 value '%s' for attribute '%s'"
-+msgstr "잘못된 uint64 값 ' %s '속성에' %s '"
-+
-+#: ../libnm-core/nm-utils.c:5700
-+#, c-format
- msgid "invalid uint8 value '%s' for attribute '%s'"
--msgstr "잘못된 옵션 '%s' 또는 옵션 값 '%s'"
-+msgstr "잘못된 uint8 값 ' %s '속성에' %s '"
-
--#: ../libnm-core/nm-utils.c:5679
--#, fuzzy, c-format
-+#: ../libnm-core/nm-utils.c:5710
-+#, c-format
- msgid "invalid boolean value '%s' for attribute '%s'"
--msgstr "잘못된 옵션 '%s' 또는 옵션 값 '%s'"
-+msgstr "잘못된 부울 값 ' %s '속성에' %s '"
-
--#: ../libnm-core/nm-utils.c:5689
-+#: ../libnm-core/nm-utils.c:5720
- #, c-format
- msgid "unsupported attribute '%s' of type '%s'"
- msgstr "지원되지 않는 속성 '%s' 유형 '%s'"
-
--#: ../libnm-core/nm-utils.c:6038
--#, fuzzy, c-format
-+#: ../libnm-core/nm-utils.c:6020
-+#, c-format
- msgid "Bridge VLANs %d and %d are not sorted by ascending vid"
--msgstr "VF %d 과 %d 오름차순 색인으로 정렬되지 않음"
-+msgstr "브리지 VLAN %d 과 %d 오름차순으로 정렬되지 않습니다"
-
--#: ../libnm-core/nm-utils.c:6062
--#, fuzzy, c-format
-+#: ../libnm-core/nm-utils.c:6044
-+#, c-format
- msgid "duplicate bridge VLAN vid %u"
--msgstr "중복 VF 지수 %u"
-+msgstr "중복 브리지 VLAN vid %u"
-
--#: ../libnm-core/nm-utils.c:6074
-+#: ../libnm-core/nm-utils.c:6056
- msgid "only one VLAN can be the PVID"
--msgstr ""
-+msgstr "하나의 VLAN 만 PVID가 될 수 있습니다"
-+
-+#: ../libnm-core/nm-utils.c:6106
-+#, c-format
-+msgid "unknown flags 0x%x"
-+msgstr "알 수없는 플래그 0x%x"
-+
-+#: ../libnm-core/nm-utils.c:6116
-+msgid ""
-+"'fqdn-no-update' and 'fqdn-serv-update' flags cannot be set at the same time"
-+msgstr "'fqdn-no-update'및 'fqdn-serv-update'플래그를 동시에 설정할 수 없습니다"
-+
-+#: ../libnm-core/nm-utils.c:6127
-+msgid "'fqdn-clear-flags' flag is incompatible with other FQDN flags"
-+msgstr "'fqdn-clear-flags'플래그가 다른 FQDN 플래그와 호환되지 않습니다"
-
--#: ../libnm-core/nm-vpn-editor-plugin.c:295
-+#: ../libnm-core/nm-utils.c:6136
-+msgid "DHCPv6 does not support the E (encoded) FQDN flag"
-+msgstr "DHCPv6은 E (인코딩 된) FQDN 플래그를 지원하지 않습니다"
-+
-+#: ../libnm-core/nm-vpn-editor-plugin.c:281
- #, c-format
- msgid "cannot load plugin \"%s\": %s"
- msgstr "플러그인을로드 할 수 없습니다 \"%s\": %s"
-
--#: ../libnm-core/nm-vpn-editor-plugin.c:306
-+#: ../libnm-core/nm-vpn-editor-plugin.c:292
- #, c-format
- msgid "failed to load nm_vpn_editor_plugin_factory() from %s (%s)"
- msgstr "%s(%s)(으)로부터 nm_vpn_editor_plugin_factory() 로드에 실패했습니다"
-
--#: ../libnm-core/nm-vpn-editor-plugin.c:331
-+#: ../libnm-core/nm-vpn-editor-plugin.c:317
- #, c-format
- msgid "unknown error initializing plugin %s"
- msgstr "플러그인 %s(을)를 초기화하는 동안 알 수 없는 오류 발생"
-
--#: ../libnm-core/nm-vpn-editor-plugin.c:348
-+#: ../libnm-core/nm-vpn-editor-plugin.c:334
- #, c-format
- msgid "cannot load VPN plugin in '%s': missing plugin name"
- msgstr "'%s'에 VPN 플러그인을 로드할 수 없음: 플러그인 이름 누락"
-
--#: ../libnm-core/nm-vpn-editor-plugin.c:357
-+#: ../libnm-core/nm-vpn-editor-plugin.c:343
- #, c-format
- msgid "cannot load VPN plugin in '%s': invalid service name"
- msgstr "'%s'에 VPN 플러그인을 로드할 수 없음: 잘못된 서비스 이름"
-
--#: ../libnm-core/nm-vpn-editor-plugin.c:500
-+#: ../libnm-core/nm-vpn-editor-plugin.c:486
- #, c-format
- msgid "the plugin does not support import capability"
- msgstr "플러그인에서 가져오기 기능을 지원하지 않습니다"
-
--#: ../libnm-core/nm-vpn-editor-plugin.c:520
-+#: ../libnm-core/nm-vpn-editor-plugin.c:506
- #, c-format
- msgid "the plugin does not support export capability"
- msgstr "플러그인에서 내보내기 기능을 지원하지 않습니다"
-
--#: ../libnm-core/nm-vpn-plugin-info.c:107
-+#: ../libnm-core/nm-vpn-plugin-info.c:111
- #, c-format
- msgid "missing filename"
- msgstr "누락된 파일 이름"
-
--#: ../libnm-core/nm-vpn-plugin-info.c:115
-+#: ../libnm-core/nm-vpn-plugin-info.c:119
- #, c-format
- msgid "filename must be an absolute path (%s)"
- msgstr "파일 이름은 절대 경로여야 합니다(%s)"
-
--#: ../libnm-core/nm-vpn-plugin-info.c:124
-+#: ../libnm-core/nm-vpn-plugin-info.c:128
- #, c-format
- msgid "filename has invalid format (%s)"
- msgstr "파일 이름에 잘못된 형식이 포함되어 있습니다(%s)"
-
--#: ../libnm-core/nm-vpn-plugin-info.c:447
-+#: ../libnm-core/nm-vpn-plugin-info.c:419
- #, c-format
- msgid "there exists a conflicting plugin (%s) that has the same %s.%s value"
- msgstr "동일한 %s.%s 값이 포함된 충돌하는 플러그인(%s)이 존재합니다"
-
--#: ../libnm-core/nm-vpn-plugin-info.c:485
-+#: ../libnm-core/nm-vpn-plugin-info.c:457
- #, c-format
- msgid "there exists a conflicting plugin with the same name (%s)"
- msgstr "동일한 이름을 가진 충돌하는 플러그인이 존재합니다(%s)"
-
--#: ../libnm-core/nm-vpn-plugin-info.c:1067
-+#: ../libnm-core/nm-vpn-plugin-info.c:1045
- #, c-format
- msgid "missing \"plugin\" setting"
- msgstr "누락된 \"plugin\" 설정"
-
--#: ../libnm-core/nm-vpn-plugin-info.c:1077
-+#: ../libnm-core/nm-vpn-plugin-info.c:1055
- #, c-format
- msgid "%s: don't retry loading plugin which already failed previously"
- msgstr "%s: 이전에 이미 실패한 플러그인은 다시 로드하지 마십시오"
-
--#: ../libnm-core/nm-vpn-plugin-info.c:1153
-+#: ../libnm-core/nm-vpn-plugin-info.c:1131
- msgid "missing filename to load VPN plugin info"
- msgstr "VPN 플러그인 정보를 로드하기 위한 파일 이름 누락"
-
--#: ../libnm-core/nm-vpn-plugin-info.c:1165
-+#: ../libnm-core/nm-vpn-plugin-info.c:1143
- msgid "missing name for VPN plugin info"
- msgstr "VPN 플로그인 정보의 이름 누락"
-
--#: ../libnm-core/nm-vpn-plugin-info.c:1174
-+#: ../libnm-core/nm-vpn-plugin-info.c:1152
- msgid "missing service for VPN plugin info"
- msgstr "VPN 플러그인 정보의 서비스 누락"
-
--#: ../libnm/nm-device-adsl.c:68
-+#: ../libnm/nm-client.c:3681
-+#, c-format
-+msgid "request succeeded with %s but object is in an unsuitable state"
-+msgstr "요청이 성공했습니다 %s 그러나 개체가 부적절한 상태에 있습니다"
-+
-+#: ../libnm/nm-client.c:3772
-+#, c-format
-+msgid "operation succeeded but object %s does not exist"
-+msgstr "작업은 성공했지만 개체 %s 존재하지 않는다"
-+
-+#: ../libnm/nm-device-adsl.c:64
- msgid "The connection was not an ADSL connection."
- msgstr "연결이 ADSL 연결이 아니었습니다."
-
--#: ../libnm/nm-device-bond.c:108
-+#: ../libnm/nm-device-bond.c:105
- msgid "The connection was not a bond connection."
- msgstr "연결이 본딩 연결이 아니었습니다."
-
--#: ../libnm/nm-device-bridge.c:112
-+#: ../libnm/nm-device-bridge.c:108
- msgid "The connection was not a bridge connection."
- msgstr "연결이 브리지 연결이 아니었습니다."
-
--#: ../libnm/nm-device-bt.c:134
-+#: ../libnm/nm-device-bt.c:130
- #, c-format
- msgid "The connection was not a Bluetooth connection."
- msgstr "연결이 블루투스 연결이 아니었습니다."
-
--#: ../libnm/nm-device-bt.c:140
-+#: ../libnm/nm-device-bt.c:136
- #, c-format
- msgid "The connection is of Bluetooth NAP type."
- msgstr "연결은 Bluetooth NAP 유형입니다."
-
--#: ../libnm/nm-device-bt.c:149
-+#: ../libnm/nm-device-bt.c:145
- msgid "Invalid device Bluetooth address."
- msgstr "잘못된 장치 블루투스 주소."
-
--#: ../libnm/nm-device-bt.c:155
-+#: ../libnm/nm-device-bt.c:151
- msgid "The Bluetooth addresses of the device and the connection didn't match."
- msgstr "장치의 블루투스 주소와 연결이 일치하지 않습니다."
-
--#: ../libnm/nm-device-bt.c:164
-+#: ../libnm/nm-device-bt.c:160
- msgid ""
- "The device is lacking Bluetooth capabilities required by the connection."
- msgstr "장치에는 연결에 필요한 블루투스 기능이 없습니다."
-
--#: ../libnm/nm-device-dummy.c:74
--#, fuzzy
-+#: ../libnm/nm-device-dummy.c:61
- msgid "The connection was not a dummy connection."
--msgstr "연결이 모뎀 연결이 아니었습니다."
-+msgstr "연결이 VLAN 연결이 아니었습니다."
-
--#: ../libnm/nm-device-dummy.c:81 ../libnm/nm-device-generic.c:95
--#: ../libnm/nm-device-ovs-bridge.c:96 ../libnm/nm-device-ovs-interface.c:67
--#: ../libnm/nm-device-ovs-port.c:96
-+#: ../libnm/nm-device-dummy.c:68 ../libnm/nm-device-generic.c:85
-+#: ../libnm/nm-device-ovs-bridge.c:84 ../libnm/nm-device-ovs-interface.c:52
-+#: ../libnm/nm-device-ovs-port.c:84
- msgid "The connection did not specify an interface name."
- msgstr "연결에서 인터페이스 이름이 지정되지 않았습니다."
-
--#: ../libnm/nm-device-ethernet.c:203
-+#: ../libnm/nm-device-ethernet.c:187
- msgid "The connection was not an Ethernet or PPPoE connection."
- msgstr "연결이 이더넷 또는 PPPoE 연결이 아니었습니다."
-
--#: ../libnm/nm-device-ethernet.c:218
-+#: ../libnm/nm-device-ethernet.c:202
- msgid "The connection and device differ in S390 subchannels."
- msgstr "S390 하위 채널에서 연결과 장치가 다릅니다."
-
--#: ../libnm/nm-device-ethernet.c:233
--#, fuzzy, c-format
-+#: ../libnm/nm-device-ethernet.c:217
-+#, c-format
- msgid "Invalid device MAC address %s."
- msgstr "잘못된 장치 MAC 주소입니다."
-
--#: ../libnm/nm-device-ethernet.c:238
-+#: ../libnm/nm-device-ethernet.c:222
- msgid "The MACs of the device and the connection do not match."
- msgstr "장치와 연결의 MAC이 일치하지 않습니다."
-
--#: ../libnm/nm-device-ethernet.c:248
-+#: ../libnm/nm-device-ethernet.c:232
- #, c-format
- msgid "Invalid MAC in the blacklist: %s."
- msgstr "차단 목록의 잘못된 MAC: %s."
-
--#: ../libnm/nm-device-ethernet.c:254
-+#: ../libnm/nm-device-ethernet.c:238
- #, c-format
- msgid "Device MAC (%s) is blacklisted by the connection."
- msgstr "장치 MAC(%s)이 연결에 의해 차단되었습니다."
-
--#: ../libnm/nm-device-generic.c:88
-+#: ../libnm/nm-device-generic.c:78
- msgid "The connection was not a generic connection."
- msgstr "연결이 일반 연결이 아니었습니다."
-
--#: ../libnm/nm-device-infiniband.c:90
-+#: ../libnm/nm-device-infiniband.c:86
- msgid "The connection was not an InfiniBand connection."
- msgstr "연결이 InfiniBand 연결이 아니었습니다."
-
--#: ../libnm/nm-device-infiniband.c:98 ../libnm/nm-device-wifi.c:621
--#: ../libnm/nm-device-wimax.c:321
-+#: ../libnm/nm-device-infiniband.c:94 ../libnm/nm-device-wifi.c:470
- msgid "Invalid device MAC address."
- msgstr "잘못된 장치 MAC 주소입니다."
-
--#: ../libnm/nm-device-infiniband.c:106 ../libnm/nm-device-wifi.c:628
--#: ../libnm/nm-device-wimax.c:328
-+#: ../libnm/nm-device-infiniband.c:102 ../libnm/nm-device-wifi.c:477
- msgid "The MACs of the device and the connection didn't match."
- msgstr "장치와 연결의 MAC이 일치하지 않습니다."
-
--#: ../libnm/nm-device-ip-tunnel.c:268
-+#: ../libnm/nm-device-ip-tunnel.c:264
- msgid "The connection was not an IP tunnel connection."
- msgstr "연결이 IP 터널 연결이 아니었습니다."
-
--#: ../libnm/nm-device-macvlan.c:154
-+#: ../libnm/nm-device-macvlan.c:152
- msgid "The connection was not a MAC-VLAN connection."
- msgstr "MAC-VLAN 연결이 아닙니다."
-
--#: ../libnm/nm-device-modem.c:178
-+#: ../libnm/nm-device-modem.c:175
- msgid "The connection was not a modem connection."
- msgstr "연결이 모뎀 연결이 아니었습니다."
-
--#: ../libnm/nm-device-modem.c:186
-+#: ../libnm/nm-device-modem.c:183
- msgid "The connection was not a valid modem connection."
- msgstr "연결이 유효한 모뎀 연결이 아니었습니다."
-
--#: ../libnm/nm-device-modem.c:193
-+#: ../libnm/nm-device-modem.c:190
- msgid "The device is lacking capabilities required by the connection."
- msgstr "장치에는 연결에 필요한 기능이 없습니다."
-
--#: ../libnm/nm-device-olpc-mesh.c:111
-+#: ../libnm/nm-device-olpc-mesh.c:101
- msgid "The connection was not an OLPC Mesh connection."
- msgstr "연결이 OLPC 메시 연결이 아니었습니다."
-
--#: ../libnm/nm-device-ovs-bridge.c:89
-+#: ../libnm/nm-device-ovs-bridge.c:77
- msgid "The connection was not a ovs_bridge connection."
- msgstr "연결이 브리지 연결이 아니었습니다."
-
--#: ../libnm/nm-device-ovs-interface.c:60
-+#: ../libnm/nm-device-ovs-interface.c:45
- msgid "The connection was not a ovs_interface connection."
- msgstr "연결이 ovs_interface 연결이 아닙니다."
-
--#: ../libnm/nm-device-ovs-port.c:89
-+#: ../libnm/nm-device-ovs-port.c:77
- msgid "The connection was not a ovs_port connection."
- msgstr "연결이 ovs_port 연결이 아닙니다."
-
--#: ../libnm/nm-device-team.c:135
-+#: ../libnm/nm-device-team.c:125
- msgid "The connection was not a team connection."
- msgstr "연결이 팀 연결이 아니었습니다."
-
--#: ../libnm/nm-device-tun.c:206
-+#: ../libnm/nm-device-tun.c:202
- msgid "The connection was not a tun connection."
- msgstr "연결이 tun 연결이 아니었습니다."
-
--#: ../libnm/nm-device-tun.c:215
-+#: ../libnm/nm-device-tun.c:211
- msgid "The mode of the device and the connection didn't match"
- msgstr "장치와 연결의 모드가 일치하지 않았습니다."
-
--#: ../libnm/nm-device-vlan.c:125
-+#: ../libnm/nm-device-vlan.c:121
- msgid "The connection was not a VLAN connection."
- msgstr "연결이 VLAN 연결이 아니었습니다."
-
--#: ../libnm/nm-device-vlan.c:132
-+#: ../libnm/nm-device-vlan.c:128
- msgid "The VLAN identifiers of the device and the connection didn't match."
- msgstr "장치와 연결의 VLAN 식별자가 일치하지 않습니다."
-
--#: ../libnm/nm-device-vlan.c:147
-+#: ../libnm/nm-device-vlan.c:144
- msgid "The hardware address of the device and the connection didn't match."
- msgstr "장치와 연결의 하드웨어 주소가 일치하지 않습니다."
-
--#: ../libnm/nm-device-vxlan.c:383
-+#: ../libnm/nm-device-vrf.c:63
-+msgid "The connection was not a VRF connection."
-+msgstr "연결이 VLAN 연결이 아니었습니다."
-+
-+#: ../libnm/nm-device-vrf.c:70
-+msgid "The VRF table of the device and the connection didn't match."
-+msgstr "장치와 연결의 모드가 일치하지 않았습니다."
-+
-+#: ../libnm/nm-device-vxlan.c:381
- msgid "The connection was not a VXLAN connection."
- msgstr "연결이 VXLAN 연결이 아니었습니다."
-
--#: ../libnm/nm-device-vxlan.c:390
-+#: ../libnm/nm-device-vxlan.c:388
- msgid "The VXLAN identifiers of the device and the connection didn't match."
- msgstr "장치와 연결의 VXLAN 식별자가 일치하지 않습니다."
-
--#: ../libnm/nm-device-wifi-p2p.c:326
--#, fuzzy
-+#: ../libnm/nm-device-wifi-p2p.c:268
- msgid "The connection was not a Wi-Fi P2P connection."
- msgstr "Wi-Fi 연결이 아닙니다."
-
--#: ../libnm/nm-device-wifi.c:612
-+#: ../libnm/nm-device-wifi.c:461
- msgid "The connection was not a Wi-Fi connection."
- msgstr "Wi-Fi 연결이 아닙니다."
-
--#: ../libnm/nm-device-wifi.c:648
-+#: ../libnm/nm-device-wifi.c:496
- msgid "The device is lacking WPA capabilities required by the connection."
- msgstr "장치에는 연결에 필요한 WPA 기능이 없습니다."
-
--#: ../libnm/nm-device-wifi.c:655
--msgid ""
--"The device is lacking WPA2/RSN capabilities required by the connection."
-+#: ../libnm/nm-device-wifi.c:503
-+msgid "The device is lacking WPA2/RSN capabilities required by the connection."
- msgstr "장치에는 연결에 필요한 WPA2/RSN 기능이 없습니다."
-
--#: ../libnm/nm-device-wimax.c:312
--msgid "The connection was not a WiMAX connection."
--msgstr "연결이 WiMAX 연결이 아니었습니다."
--
--#: ../libnm/nm-device-wpan.c:81
-+#: ../libnm/nm-device-wpan.c:54
- msgid "The connection was not a wpan connection."
- msgstr "연결이 VLAN 연결이 아니었습니다."
-
--#: ../libnm/nm-device.c:1383
-+#: ../libnm/nm-device.c:1571
- msgid "Bluetooth"
- msgstr "블루투스"
-
--#: ../libnm/nm-device.c:1385
-+#: ../libnm/nm-device.c:1573
- msgid "OLPC Mesh"
- msgstr "OLPC 메시"
-
--#: ../libnm/nm-device.c:1387
-+#: ../libnm/nm-device.c:1575
- msgid "Open vSwitch Interface"
- msgstr "vSwitch 인터페이스 열기"
-
--#: ../libnm/nm-device.c:1389
-+#: ../libnm/nm-device.c:1577
- msgid "Open vSwitch Port"
- msgstr "vSwitch 포트 열기"
-
--#: ../libnm/nm-device.c:1391
-+#: ../libnm/nm-device.c:1579
- msgid "Open vSwitch Bridge"
- msgstr "vSwitch Bridge 열기"
-
--#: ../libnm/nm-device.c:1393
-+#: ../libnm/nm-device.c:1581
- msgid "WiMAX"
- msgstr "WiMAX"
-
--#: ../libnm/nm-device.c:1407
-+#: ../libnm/nm-device.c:1595
- msgid "ADSL"
- msgstr "ADSL"
-
--#: ../libnm/nm-device.c:1409
-+#: ../libnm/nm-device.c:1597
- msgid "MACVLAN"
- msgstr "MACVLAN"
-
--#: ../libnm/nm-device.c:1411
-+#: ../libnm/nm-device.c:1599
- msgid "VXLAN"
- msgstr "VXLAN"
-
--#: ../libnm/nm-device.c:1413
-+#: ../libnm/nm-device.c:1601
- msgid "IPTunnel"
- msgstr "IPTunnel"
-
--#: ../libnm/nm-device.c:1415
-+#: ../libnm/nm-device.c:1603
- msgid "Tun"
- msgstr "Tun"
-
--#: ../libnm/nm-device.c:1417
-+#: ../libnm/nm-device.c:1605
- msgid "Veth"
- msgstr "Veth"
-
--#: ../libnm/nm-device.c:1419
-+#: ../libnm/nm-device.c:1607
- msgid "MACsec"
- msgstr "MACsec"
-
--#: ../libnm/nm-device.c:1421
-+#: ../libnm/nm-device.c:1609
- msgid "Dummy"
- msgstr "더미"
-
--#: ../libnm/nm-device.c:1423
-+#: ../libnm/nm-device.c:1611
- msgid "PPP"
- msgstr "PPP"
-
--#: ../libnm/nm-device.c:1425
-+#: ../libnm/nm-device.c:1613
- msgid "IEEE 802.15.4"
- msgstr "IEEE 802.15.4"
-
--#: ../libnm/nm-device.c:1427
-+#: ../libnm/nm-device.c:1615
- msgid "6LoWPAN"
- msgstr "6LoWPAN"
-
--#: ../libnm/nm-device.c:1429
-+#: ../libnm/nm-device.c:1617
- msgid "WireGuard"
- msgstr "WireGuard"
-
--#: ../libnm/nm-device.c:1431
--#, fuzzy
-+#: ../libnm/nm-device.c:1619
- msgid "Wi-Fi P2P"
--msgstr "Wi-Fi"
-+msgstr "Wi-Fi P2P"
-+
-+#: ../libnm/nm-device.c:1621
-+msgid "VRF"
-+msgstr "VRF"
-
--#: ../libnm/nm-device.c:1463
-+#: ../libnm/nm-device.c:1653
- msgid "Wired"
- msgstr "유선"
-
--#: ../libnm/nm-device.c:1494
-+#: ../libnm/nm-device.c:1685
- msgid "PCI"
- msgstr "PCI"
-
--#: ../libnm/nm-device.c:1496
-+#: ../libnm/nm-device.c:1687
- msgid "USB"
- msgstr "USB"
-
-@@ -12435,37 +12075,28 @@ msgstr "USB"
- #. * "Ethernet"). You can change this to something like
- #. * "%2$s (%1$s)" if there's no grammatical way to combine
- #. * the strings otherwise.
--#.
--#: ../libnm/nm-device.c:1809 ../libnm/nm-device.c:1828
-+#.
-+#: ../libnm/nm-device.c:1987 ../libnm/nm-device.c:2006
- #, c-format
- msgctxt "long device name"
- msgid "%s %s"
- msgstr "%s %s"
-
--#: ../libnm/nm-device.c:2551
-+#: ../libnm/nm-device.c:2683
- #, c-format
- msgid "The connection was not valid: %s"
- msgstr "연결이 유효하지 않았음: %s"
-
--#: ../libnm/nm-device.c:2560
-+#: ../libnm/nm-device.c:2692
- #, c-format
- msgid "The interface names of the device and the connection didn't match."
- msgstr "장치와 연결의 인터페이스 이름이 일치하지 않습니다."
-
--#: ../libnm/nm-manager.c:271
--#, fuzzy
--msgid "Checkpoint was removed before it was initialized"
--msgstr "연결이 초기화 이전에 제거되었습니다"
--
--#: ../libnm/nm-manager.c:998
--msgid "Active connection removed before it was initialized"
--msgstr "활성 연결이 초기화되기 전에 제거되었습니다."
--
--#: ../libnm/nm-remote-settings.c:284
--msgid "Connection removed before it was initialized"
--msgstr "연결이 초기화 이전에 제거되었습니다"
-+#: ../libnm/nm-secret-agent-old.c:1412
-+msgid "registration failed"
-+msgstr "등록 실패했습니다."
-
--#: ../libnm/nm-vpn-plugin-old.c:845 ../libnm/nm-vpn-service-plugin.c:1044
-+#: ../libnm/nm-vpn-plugin-old.c:828 ../libnm/nm-vpn-service-plugin.c:1027
- msgid "No service name specified"
- msgstr "서비스 이름이 지정되지 않았습니다."
-
-@@ -12478,14 +12109,12 @@ msgid "System policy prevents enabling or disabling system networking"
- msgstr "시스템 정책이 시스템 네트워크의 사용 여부 설정을 금지합니다"
-
- #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:3
--#, fuzzy
- msgid "Reload NetworkManager configuration"
--msgstr "네트워크 관리자 버전 정보를 출력하고 종료합니다 "
-+msgstr "NetworkManager 구성 다시로드"
-
- #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:4
--#, fuzzy
- msgid "System policy prevents reloading NetworkManager"
--msgstr "시스템 정책이 시스템 네트워크의 사용 여부 설정을 금지합니다"
-+msgstr "시스템 정책으로 인해 NetworkManager가 다시로드되지 않습니다"
-
- #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:5
- msgid ""
-@@ -12531,14 +12160,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"
-@@ -12615,629 +12242,726 @@ msgstr "연결 확인 사용 또는 사용 안 함"
- msgid "System policy prevents enabling or disabling connectivity checking"
- msgstr "시스템 정책으로 연결 확인을 사용하거나 사용하지 않도록 설정할 수 없습니다."
-
--#: ../shared/nm-glib-aux/nm-shared-utils.c:1500
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:2346
- #, c-format
- msgid "object class '%s' has no property named '%s'"
- msgstr "개체 클래스 '%s'에 이름이 '%s'인 속성이 없습니다"
-
--#: ../shared/nm-glib-aux/nm-shared-utils.c:1507
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:2353
- #, c-format
- msgid "property '%s' of object class '%s' is not writable"
- msgstr "개체 클래스의 '%s'의 속성 '%s'에는 쓸 수 없습니다"
-
--#: ../shared/nm-glib-aux/nm-shared-utils.c:1514
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:2360
- #, c-format
- msgid ""
- "construct property \"%s\" for object '%s' can't be set after construction"
- msgstr "구성 후에는 개체 '%s'의 구성 속성 ''%s''을(를) 설정할 수 없습니다"
-
--#: ../shared/nm-glib-aux/nm-shared-utils.c:1522
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:2368
- #, c-format
- msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
- msgstr "'%s::%s'은(는) 올바른 속성 이름이 아닙니다. '%s'은(는) GObject 하위 유형이 아닙니다"
-
--#: ../shared/nm-glib-aux/nm-shared-utils.c:1531
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:2377
- #, c-format
- msgid "unable to set property '%s' of type '%s' from value of type '%s'"
- msgstr "유형 '%s'의 값에서 유형 '%s'의 속성 '%s'(을)를 설정할 수 없습니다"
-
--#: ../shared/nm-glib-aux/nm-shared-utils.c:1542
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:2388
- #, c-format
- msgid ""
- "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
- "type '%s'"
- msgstr "유형 '%s'의 값 \"%s\"이(가) 잘못되었거나 유형 '%s'의 속성 '%s' 범위에서 벗어났습니다"
-
--#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:236
--#, fuzzy, c-format
--msgid "'%s' is not valid: properties should be specified as 'key=value'"
--msgstr "'%s'이(가) 유효하지 않습니다. 2개 또는 3개 문자열을 입력해야 합니다."
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:4801
-+msgid "interface name is missing"
-+msgstr "인터페이스 이름이 없습니다"
-
--#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:251
--#, fuzzy, c-format
--msgid "'%s' is not a valid key"
--msgstr "'%s'는 올바른 밴드가 아닙니다 "
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:4807
-+msgid "interface name is too short"
-+msgstr "인터페이스 이름이 너무 짧습니다."
-
--#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:257
--#, fuzzy, c-format
--msgid "duplicate key '%s'"
--msgstr "중복 VF 지수 %u"
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:4816
-+msgid "interface name is reserved"
-+msgstr "인터페이스 이름은 예약되어 있습니다."
-
--#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:271
--#, fuzzy, c-format
--msgid "number for '%s' is out of range"
--msgstr "값 '%s'이 범위 %u 밖에 있습니다"
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:4828
-+msgid "interface name contains an invalid character"
-+msgstr "인터페이스 이름에 잘못된 문자가 있습니다."
-
--#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:274
--#, fuzzy, c-format
--msgid "value for '%s' must be a number"
--msgstr "'%s'은 번호가 아닙니다 "
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:4834
-+msgid "interface name is longer than 15 characters"
-+msgstr "인터페이스 이름이 15자를 초과합니다."
-
--#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:285
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:4857
- #, c-format
--msgid "value for '%s' must be a boolean"
--msgstr ""
-+msgid "'%%' is not allowed in interface names"
-+msgstr "인터페이스 이름에는 '%%'이 (가) 허용되지 않습니다"
-
--#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:294
--#, fuzzy
--msgid "missing 'name' attribute"
--msgstr "누락된 설정"
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:4870
-+#, c-format
-+msgid "'%s' is not allowed as interface name"
-+msgstr "' %s '는 인터페이스 이름으로 사용할 수 없습니다"
-
--#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:301
--#, fuzzy, c-format
--msgid "invalid 'name' \"%s\""
--msgstr "잘못된 라우팅: %s'"
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:4891
-+msgid ""
-+"interface name must be alphanumerical with no forward or backward slashes"
-+msgstr "인터페이스 이름은 영숫자 여야하며 슬래시가 없어야합니다."
-
--#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:313
--#, fuzzy, c-format
--msgid "attribute '%s' is invalid for \"%s\""
--msgstr "속성이 IPv4 경로에 유효하지 않습니다."
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:4908
-+msgid "interface name must not be empty"
-+msgstr "인터페이스 이름은 비워 둘 수 없습니다"
-+
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:4914
-+msgid "interface name must be UTF-8 encoded"
-+msgstr "인터페이스 이름은 UTF-8로 인코딩되어야합니다"
-
- #. TRANSLATORS: the first %s is a prefix for the connection id, such
- #. * as "Wired Connection" or "VPN Connection". The %d is a number
- #. * that is combined with the first argument to create a unique
- #. * connection id.
--#: ../src/NetworkManagerUtils.c:121
-+#: ../src/NetworkManagerUtils.c:109
- #, c-format
- msgctxt "connection id fallback"
- msgid "%s %u"
- msgstr "%s %u"
-
--#: ../src/main.c:176 ../src/main.c:341
-+#: ../src/main.c:163 ../src/main.c:335
- #, c-format
- msgid "Failed to read configuration: %s\n"
- msgstr "구성 읽기 실패: %s\n"
-
- #. Logging/debugging
--#: ../src/main.c:190 ../src/nm-iface-helper.c:292
-+#: ../src/main.c:184 ../src/nm-iface-helper.c:297
- msgid "Print NetworkManager version and exit"
- msgstr "네트워크 관리자 버전 정보를 출력하고 종료합니다 "
-
--#: ../src/main.c:191 ../src/nm-iface-helper.c:293
-+#: ../src/main.c:185 ../src/nm-iface-helper.c:298
- msgid "Don't become a daemon"
- msgstr "데몬이 되지 않습니다 "
-
--#: ../src/main.c:192 ../src/nm-iface-helper.c:295
-+#: ../src/main.c:186 ../src/nm-iface-helper.c:300
- #, c-format
- msgid "Log level: one of [%s]"
- msgstr "로그 수준: [%s] 중 하나 "
-
--#: ../src/main.c:194 ../src/nm-iface-helper.c:297
-+#: ../src/main.c:188 ../src/nm-iface-helper.c:302
- #, c-format
- msgid "Log domains separated by ',': any combination of [%s]"
- msgstr "','로 구분된 로그 도메인: [%s]의 조합 "
-
--#: ../src/main.c:196 ../src/nm-iface-helper.c:299
-+#: ../src/main.c:190 ../src/nm-iface-helper.c:304
- msgid "Make all warnings fatal"
- msgstr "모든 경고를 치명적인 것으로 취급합니다"
-
--#: ../src/main.c:197
-+#: ../src/main.c:191
- msgid "Specify the location of a PID file"
- msgstr "PID 파일의 위치를 지정합니다 "
-
--#: ../src/main.c:199
-+#: ../src/main.c:193
- msgid "Print NetworkManager configuration and exit"
- msgstr "NetworkManager 구성을 인쇄하고 종료합니다."
-
--#: ../src/main.c:209
-+#: ../src/main.c:203
- msgid ""
- "NetworkManager monitors all network connections and automatically\n"
- "chooses the best connection to use. It also allows the user to\n"
- "specify wireless access points which wireless cards in the computer\n"
- "should associate with."
--msgstr ""
--"NetworkManager는 모든 네트워크 연결을 모니터하고 사용할 최상의 \n"
-+msgstr "NetworkManager는 모든 네트워크 연결을 모니터하고 사용할 최상의 \n"
- "연결을 자동으로 선택합니다. 또한 사용자가 무선 액세스 \n"
- "지점을 지정하여 컴퓨터에 있는 무선 카드에 \n"
- "연결할 수 있게 합니다."
-
--#: ../src/main.c:331 ../src/main-utils.c:289 ../src/nm-iface-helper.c:440
-+#: ../src/main.c:325 ../src/main-utils.c:275 ../src/nm-iface-helper.c:445
- #, c-format
- msgid "%s. Please use --help to see a list of valid options.\n"
- msgstr "%s. 올바른 옵션의 목록을 보려면 --help 옵션을 이용하십시오.\n"
-
--#: ../src/main.c:364 ../src/nm-iface-helper.c:453
-+#: ../src/main.c:358 ../src/nm-iface-helper.c:458
- #, c-format
- msgid "Could not daemonize: %s [error %u]\n"
- msgstr "데몬화할 수 없습니다: %s [error %u]\n"
-
--#: ../src/main-utils.c:99
-+#: ../src/main-utils.c:85
- #, c-format
- msgid "Opening %s failed: %s\n"
- msgstr "%s을 여는데 실패했습니다: %s\n"
-
--#: ../src/main-utils.c:106
-+#: ../src/main-utils.c:92
- #, c-format
- msgid "Writing to %s failed: %s\n"
- msgstr "%s에 쓰는데 실패했습니다: %s\n"
-
--#: ../src/main-utils.c:112
-+#: ../src/main-utils.c:98
- #, c-format
- msgid "Closing %s failed: %s\n"
- msgstr "%s를 종료하는데 실패했습니다: %s\n"
-
--#: ../src/main-utils.c:151 ../src/main-utils.c:162
-+#: ../src/main-utils.c:137 ../src/main-utils.c:148
- #, c-format
- msgid "Cannot create '%s': %s"
- msgstr "'%s'을(를) 생성할 수 없음: %s"
-
--#: ../src/main-utils.c:215
-+#: ../src/main-utils.c:201
- #, c-format
- msgid "%s is already running (pid %ld)\n"
- msgstr "%s이(가) 이미 실행 중입니다(pid %ld).\n"
-
--#: ../src/main-utils.c:225
-+#: ../src/main-utils.c:211
- #, c-format
- msgid "You must be root to run %s!\n"
- msgstr "%s!을(를) 실행하려면 root여야 합니다.\n"
-
--#: ../src/dhcp/nm-dhcp-dhclient-utils.c:301
-+#: ../src/dhcp/nm-dhcp-dhclient-utils.c:324
- msgid "# Created by NetworkManager\n"
- msgstr "# 네트워크 관리에서 만들어 냄\n"
-
--#: ../src/dhcp/nm-dhcp-dhclient-utils.c:312
-+#: ../src/dhcp/nm-dhcp-dhclient-utils.c:337
- #, c-format
--msgid "# Merged from %s\n"
-+msgid ""
-+"# Merged from %s\n"
- "\n"
- msgstr "# %s에서 합침\n"
- "\n"
-
--#: ../src/devices/bluetooth/nm-bluez-device.c:209
-+#: ../src/devices/bluetooth/nm-bluez-manager.c:1341
- #, c-format
- msgid "%s Network"
- msgstr "%s 네트워크 "
-
--#: ../src/devices/bluetooth/nm-device-bt.c:271
-+#: ../src/devices/bluetooth/nm-device-bt.c:298
- msgid "PAN requested, but Bluetooth device does not support NAP"
- msgstr "PAN이 요청되었지만 블루투스 장치에서 NAP를 지원하지 않습니다"
-
--#: ../src/devices/bluetooth/nm-device-bt.c:281
-+#: ../src/devices/bluetooth/nm-device-bt.c:311
- msgid "PAN connections cannot specify GSM, CDMA, or serial settings"
- msgstr "PAN 연결에서 GSM, CDMA 또는 직렬 설정을 지정할 수 없습니다"
-
--#: ../src/devices/bluetooth/nm-device-bt.c:294
-+#: ../src/devices/bluetooth/nm-device-bt.c:324
- msgid "PAN connection"
- msgstr "PAN 연결"
-
--#: ../src/devices/bluetooth/nm-device-bt.c:301
-+#: ../src/devices/bluetooth/nm-device-bt.c:331
- msgid "DUN requested, but Bluetooth device does not support DUN"
- msgstr "DUN이 요청되었지만 블루투스 장치에서 DUN을 지원하지 않습니다"
-
--#: ../src/devices/bluetooth/nm-device-bt.c:311
-+#: ../src/devices/bluetooth/nm-device-bt.c:342
- msgid "DUN connection must include a GSM or CDMA setting"
- msgstr "DUN 연결에는 GSM 또는 CDMA 설정을 포함해야 합니다"
-
--#: ../src/devices/bluetooth/nm-device-bt.c:321
--#: ../src/devices/wwan/nm-modem-broadband.c:705
-+#: ../src/devices/bluetooth/nm-device-bt.c:352
-+#: ../src/devices/wwan/nm-modem-broadband.c:784
- msgid "GSM connection"
- msgstr "GSM 연결"
-
--#: ../src/devices/bluetooth/nm-device-bt.c:323
--#: ../src/devices/wwan/nm-modem-broadband.c:730
-+#: ../src/devices/bluetooth/nm-device-bt.c:354
-+#: ../src/devices/wwan/nm-modem-broadband.c:809
- msgid "CDMA connection"
- msgstr "CDMA 연결"
-
--#: ../src/devices/bluetooth/nm-device-bt.c:331
-+#: ../src/devices/bluetooth/nm-device-bt.c:362
- msgid "Unknown/unhandled Bluetooth connection type"
- msgstr "알 수 없거나 처리되지 않은 블루투스 연결 유형"
-
--#: ../src/devices/bluetooth/nm-device-bt.c:353
-+#: ../src/devices/bluetooth/nm-device-bt.c:384
- msgid "connection does not match device"
- msgstr "연결이 장치와 일치하지 않습니다."
-
--#: ../src/devices/nm-device-6lowpan.c:191
-+#: ../src/devices/nm-device-6lowpan.c:177
- msgid "6LOWPAN connection"
- msgstr "6LOWPAN 연결"
-
--#: ../src/devices/nm-device-bond.c:70
-+#: ../src/devices/nm-device-bond.c:56
- msgid "Bond connection"
- msgstr "본딩 연결"
-
--#: ../src/devices/nm-device-bridge.c:153
-+#: ../src/devices/nm-device-bridge.c:147
- msgid "Bridge connection"
- msgstr "브리지 연결"
-
--#: ../src/devices/nm-device-dummy.c:66
--#, fuzzy
-+#: ../src/devices/nm-device-dummy.c:58
- msgid "Dummy connection"
--msgstr "ADSL 연결"
-+msgstr "더미 연결"
-
--#: ../src/devices/nm-device-ethernet.c:1415
-+#: ../src/devices/nm-device-ethernet.c:1618
- msgid "PPPoE connection"
- msgstr "PPPoE 연결"
-
--#: ../src/devices/nm-device-ethernet.c:1415
-+#: ../src/devices/nm-device-ethernet.c:1618
- msgid "Wired connection"
- msgstr "유선 연결"
-
--#: ../src/devices/nm-device-ethernet-utils.c:32
-+#: ../src/devices/nm-device-ethernet-utils.c:20
- #, c-format
- msgid "Wired connection %d"
- msgstr "유선 연결 %d"
-
--#: ../src/devices/nm-device-ip-tunnel.c:421
-+#: ../src/devices/nm-device-ip-tunnel.c:408
- msgid "IP tunnel connection"
- msgstr "IP 터널 연결"
-
--#: ../src/devices/nm-device-macvlan.c:364
-+#: ../src/devices/nm-device-macvlan.c:365
- msgid "MACVLAN connection"
- msgstr "MACVLAN 연결"
-
--#: ../src/devices/nm-device-tun.c:156
-+#: ../src/devices/nm-device-tun.c:142
- msgid "TUN connection"
- msgstr "TUN 연결"
-
--#: ../src/devices/nm-device-wpan.c:68
-+#: ../src/devices/nm-device-wpan.c:54
- msgid "WPAN connection"
- msgstr "PAN 연결"
-
--#: ../src/devices/team/nm-device-team.c:101
-+#: ../src/devices/team/nm-device-team.c:89
- msgid "Team connection"
- msgstr "팀 연결"
-
--#: ../src/devices/wifi/nm-device-wifi.c:964
--msgid "WPA Ad-Hoc disabled due to kernel bugs"
--msgstr "커널 버그로 인해 WPA 애드혹이 비활성화됨"
--
--#: ../src/devices/wifi/nm-wifi-utils.c:42
-+#: ../src/devices/wifi/nm-wifi-utils.c:28
- #, c-format
- msgid "%s is incompatible with static WEP keys"
- msgstr "%s은(는) 정적 WEP 키와 호환되지 않습니다."
-
--#: ../src/devices/wifi/nm-wifi-utils.c:76
-+#: ../src/devices/wifi/nm-wifi-utils.c:62
- msgid "LEAP authentication requires a LEAP username"
- msgstr "LEAP 인증에는 LEAP 사용자 이름이 필요합니다."
-
--#: ../src/devices/wifi/nm-wifi-utils.c:86
-+#: ../src/devices/wifi/nm-wifi-utils.c:72
- msgid "LEAP username requires 'leap' authentication"
- msgstr "LEAP 사용자 이름에 'leap' 인증이 필요합니다"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:99
-+#: ../src/devices/wifi/nm-wifi-utils.c:85
- msgid "LEAP authentication requires IEEE 802.1x key management"
- msgstr "LEAP 인증에 IEEE 802.1x 키 관리가 필요합니다"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:119
-+#: ../src/devices/wifi/nm-wifi-utils.c:105
- msgid "LEAP authentication is incompatible with Ad-Hoc mode"
- msgstr "LEAP 인증이 애드혹 모드와 호환되지 않습니다"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:131
-+#: ../src/devices/wifi/nm-wifi-utils.c:117
- msgid "LEAP authentication is incompatible with 802.1x setting"
- msgstr "LEAP 인증이 802.1x 설정과 호환되지 않습니다"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:153
-+#: ../src/devices/wifi/nm-wifi-utils.c:139
- #, c-format
- msgid "a connection using '%s' authentication cannot use WPA key management"
- msgstr "'%s' 인증을 사용하는 연결에는 WPA 키 관리를 사용할 수 없습니다"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:164
-+#: ../src/devices/wifi/nm-wifi-utils.c:150
- #, c-format
- msgid "a connection using '%s' authentication cannot specify WPA protocols"
- msgstr "'%s' 인증을 사용하는 연결에는 WPA 프로토콜을 지정할 수 없습니다"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:180
--#: ../src/devices/wifi/nm-wifi-utils.c:197
-+#: ../src/devices/wifi/nm-wifi-utils.c:166
-+#: ../src/devices/wifi/nm-wifi-utils.c:183
- #, c-format
- msgid "a connection using '%s' authentication cannot specify WPA ciphers"
- msgstr "'%s' 인증을 사용하는 연결에는 WPA 암호화를 지정할 수 없습니다"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:209
-+#: ../src/devices/wifi/nm-wifi-utils.c:195
- #, c-format
- msgid "a connection using '%s' authentication cannot specify a WPA password"
- msgstr "'%s' 인증을 사용하는 연결에는 WPA 암호를 지정할 수 없습니다"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:240
-+#: ../src/devices/wifi/nm-wifi-utils.c:226
- msgid "Dynamic WEP requires an 802.1x setting"
- msgstr "동적 WEP에는 802.1x 설정이 필요합니다."
-
--#: ../src/devices/wifi/nm-wifi-utils.c:250
--#: ../src/devices/wifi/nm-wifi-utils.c:278
-+#: ../src/devices/wifi/nm-wifi-utils.c:236
-+#: ../src/devices/wifi/nm-wifi-utils.c:264
- msgid "Dynamic WEP requires 'open' authentication"
- msgstr "동적 WEP에는 '공개' 인증이 필요합니다"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:265
-+#: ../src/devices/wifi/nm-wifi-utils.c:251
- msgid "Dynamic WEP requires 'ieee8021x' key management"
- msgstr "동적 WEP에는 'ieee8021x' 키 관리가 필요합니다"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:312
-+#: ../src/devices/wifi/nm-wifi-utils.c:298
- msgid "WPA-PSK authentication is incompatible with 802.1x"
- msgstr "WPA-PSK 인증이 802.1x와 호환되지 않습니다"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:322
-+#: ../src/devices/wifi/nm-wifi-utils.c:308
- msgid "WPA-PSK requires 'open' authentication"
- msgstr "WPA-PSK에는 'open' 인증이 필요합니다."
-
--#: ../src/devices/wifi/nm-wifi-utils.c:334
--msgid "WPA Ad-Hoc authentication requires an Ad-Hoc mode AP"
--msgstr "WPA 애드혹 인증에는 애드혹 모드 AP가 필요합니다"
--
--#: ../src/devices/wifi/nm-wifi-utils.c:347
--msgid "WPA Ad-Hoc authentication requires 'wpa' protocol"
--msgstr "WPA 애드혹 인증에는 'wpa' 프로토콜이 필요합니다"
-+#: ../src/devices/wifi/nm-wifi-utils.c:320
-+msgid "Access point does not support PSK but setting requires it"
-+msgstr "액세스 지점에서 PSK를 지원하지 않지만 설정에는 필요합니다"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:359
--msgid "WPA Ad-Hoc authentication requires 'none' pairwise cipher"
--msgstr "WPA 애드혹 인증에는 'none' pairwise 암호가 필요합니다."
-+#: ../src/devices/wifi/nm-wifi-utils.c:333
-+msgid "WPA Ad-Hoc authentication requires 'rsn' protocol"
-+msgstr "WPA Ad-Hoc 인증에는 'rsn'프로토콜이 필요합니다"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:371
--msgid "WPA Ad-Hoc requires 'tkip' group cipher"
--msgstr "WPA 애드혹에는 'tkip' 그룹 암호화가 필요합니다"
-+#: ../src/devices/wifi/nm-wifi-utils.c:344
-+msgid "WPA Ad-Hoc authentication requires 'ccmp' pairwise cipher"
-+msgstr "WPA Ad-Hoc 인증에는 'ccmp'쌍별 암호가 필요합니다"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:385
--msgid "Access point does not support PSK but setting requires it"
--msgstr "액세스 지점에서 PSK를 지원하지 않지만 설정에는 필요합니다"
-+#: ../src/devices/wifi/nm-wifi-utils.c:355
-+msgid "WPA Ad-Hoc requires 'ccmp' group cipher"
-+msgstr "WPA Ad-Hoc에는 'ccmp'그룹 암호가 필요합니다"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:415
-+#: ../src/devices/wifi/nm-wifi-utils.c:384
- msgid "WPA-EAP authentication requires an 802.1x setting"
- msgstr "WPA-EAP 인증에는 802.1x 설정이 필요합니다"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:425
-+#: ../src/devices/wifi/nm-wifi-utils.c:394
- msgid "WPA-EAP requires 'open' authentication"
- msgstr "WPA-EAP에는 'open' 인증이 필요합니다."
-
--#: ../src/devices/wifi/nm-wifi-utils.c:436
-+#: ../src/devices/wifi/nm-wifi-utils.c:405
- msgid "802.1x setting requires 'wpa-eap' key management"
- msgstr "802.1x 설정에는 'wpa-eap' 키 관리가 필요합니다"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:449
-+#: ../src/devices/wifi/nm-wifi-utils.c:418
- msgid "Access point does not support 802.1x but setting requires it"
- msgstr "액세스 지점에서 802.1x를 지원하지 않지만 설정에는 필요합니다"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:477
--msgid ""
--"Access point mode is Ad-Hoc but setting requires Infrastructure security"
--msgstr "액세스 지점 모드는 애드혹이지만 설정에는 인프라 보안이 필요합니다"
-+#: ../src/devices/wifi/nm-wifi-utils.c:448
-+msgid "Ad-Hoc mode requires 'none' or 'wpa-psk' key management"
-+msgstr "Ad-Hoc 모드에는 '없음'또는 'wpa-psk'키 관리가 필요합니다"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:487
-+#: ../src/devices/wifi/nm-wifi-utils.c:458
- msgid "Ad-Hoc mode is incompatible with 802.1x security"
- msgstr "애드혹 모드는 802.1x 보안과 호환되지 않습니다"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:496
-+#: ../src/devices/wifi/nm-wifi-utils.c:467
- msgid "Ad-Hoc mode is incompatible with LEAP security"
- msgstr "애드혹 모드는 LEAP 보안과 호환되지 않습니다"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:506
-+#: ../src/devices/wifi/nm-wifi-utils.c:477
- msgid "Ad-Hoc mode requires 'open' authentication"
- msgstr "애드혹 모드에는 '공개' 인증이 필요합니다"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:516
--msgid ""
--"Access point mode is Infrastructure but setting requires Ad-Hoc security"
--msgstr "액세스 지점 모드는 인프라이지만 설정에는 애드혹 보안이 필요합니다"
--
--#: ../src/devices/wifi/nm-wifi-utils.c:559
--#: ../src/devices/wifi/nm-wifi-utils.c:591
-+#: ../src/devices/wifi/nm-wifi-utils.c:519
-+#: ../src/devices/wifi/nm-wifi-utils.c:551
- #, c-format
- msgid "connection does not match access point"
- msgstr "연결이 액세스 지점과 일치하지 않습니다"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:645
--#, fuzzy, c-format
-+#: ../src/devices/wifi/nm-wifi-utils.c:605
-+#, c-format
- msgid "connection does not match mesh point"
--msgstr "연결이 액세스 지점과 일치하지 않습니다"
-+msgstr "연결이 메쉬 포인트와 일치하지 않습니다"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:662
-+#: ../src/devices/wifi/nm-wifi-utils.c:622
- msgid "Access point is unencrypted but setting specifies security"
- msgstr "액세스 지점이 암호화 해제되었지만 설정에서 보안을 지정합니다"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:751
-+#: ../src/devices/wifi/nm-wifi-utils.c:711
- msgid ""
- "WPA authentication is incompatible with non-EAP (original) LEAP or Dynamic "
- "WEP"
- msgstr "WPA 인증은 비 EAP(원본) LEAP 또는 동적 WEP와 호환되지 않습니다"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:761
-+#: ../src/devices/wifi/nm-wifi-utils.c:721
- msgid "WPA authentication is incompatible with Shared Key authentication"
- msgstr "WPA 인증은 공유 키 인증과 호환되지 않습니다"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:814
-+#: ../src/devices/wifi/nm-wifi-utils.c:783
- msgid "Failed to determine AP security information"
- msgstr "AP 보안 정보를 판별할 수 없습니다."
-
--#: ../src/nm-config.c:580
--#, fuzzy, c-format
-+#: ../src/nm-config.c:565
-+#, c-format
- msgid "Bad '%s' option: "
--msgstr "'%s' 옵션이 비어있습니다 "
-+msgstr "나쁜 ' %s '옵션 : "
-
--#: ../src/nm-config.c:593
-+#: ../src/nm-config.c:578
- msgid "Config file location"
- msgstr "설정 파일 위치 "
-
--#: ../src/nm-config.c:594
-+#: ../src/nm-config.c:579
- msgid "Config directory location"
- msgstr "설정 디렉토리 위치 "
-
--#: ../src/nm-config.c:595
-+#: ../src/nm-config.c:580
- msgid "System config directory location"
- msgstr "시스템 구성 디렉터리 위치"
-
--#: ../src/nm-config.c:596
-+#: ../src/nm-config.c:581
- msgid "Internal config file location"
- msgstr "내부 구성 파일 위치"
-
--#: ../src/nm-config.c:597
-+#: ../src/nm-config.c:582
- msgid "State file location"
- msgstr "상태 파일 위치 "
-
--#: ../src/nm-config.c:598
-+#: ../src/nm-config.c:583
- msgid "State file for no-auto-default devices"
- msgstr "no-auto-default 장치의 상태 파일"
-
--#: ../src/nm-config.c:599
-+#: ../src/nm-config.c:584
- msgid "List of plugins separated by ','"
- msgstr "','로 구분된 플러그인 목록 "
-
--#: ../src/nm-config.c:600
-+#: ../src/nm-config.c:585
- msgid "Quit after initial configuration"
- msgstr "초기 구성 후 종료"
-
--#: ../src/nm-config.c:601 ../src/nm-iface-helper.c:294
-+#: ../src/nm-config.c:586 ../src/nm-iface-helper.c:299
- msgid "Don't become a daemon, and log to stderr"
- msgstr "데몬이 되지 않고 stderr에 기록합니다 "
-
- #. These three are hidden for now, and should eventually just go away.
--#: ../src/nm-config.c:604
-+#: ../src/nm-config.c:589
- msgid "An http(s) address for checking internet connectivity"
- msgstr "인터넷 연결을 확인하기 위한 http(s) 주소 "
-
--#: ../src/nm-config.c:605
-+#: ../src/nm-config.c:590
- msgid "The interval between connectivity checks (in seconds)"
- msgstr "연결 확인 사이의 간격 (초 단위)"
-
--#: ../src/nm-config.c:606
-+#: ../src/nm-config.c:591
- msgid "The expected start of the response"
- msgstr "예상되는 응답 시작 "
-
--#: ../src/nm-config.c:613
--#, fuzzy
-+#: ../src/nm-config.c:598
- msgid "NetworkManager options"
--msgstr "NetworkManager 권한"
-+msgstr "NetworkManager 옵션"
-
--#: ../src/nm-config.c:613
--#, fuzzy
-+#: ../src/nm-config.c:598
- msgid "Show NetworkManager options"
--msgstr "NetworkManager 권한"
-+msgstr "NetworkManager 옵션 표시"
-
- #. Interface/IP config
--#: ../src/nm-iface-helper.c:274
-+#: ../src/nm-iface-helper.c:279
- msgid "The interface to manage"
- msgstr "관리 인터페이스"
-
--#: ../src/nm-iface-helper.c:275
-+#: ../src/nm-iface-helper.c:280
- msgid "Connection UUID"
- msgstr "연결 UUID"
-
--#: ../src/nm-iface-helper.c:276
-+#: ../src/nm-iface-helper.c:281
- msgid "Connection Token for Stable IDs"
- msgstr "안정적인 ID를위한 연결 토큰"
-
--#: ../src/nm-iface-helper.c:277
-+#: ../src/nm-iface-helper.c:282
- msgid "Whether to manage IPv6 SLAAC"
- msgstr "IPv6 SLAAC 관리 여부"
-
--#: ../src/nm-iface-helper.c:278
-+#: ../src/nm-iface-helper.c:283
- msgid "Whether SLAAC must be successful"
- msgstr "SLAAC 성공 필요 여부"
-
--#: ../src/nm-iface-helper.c:279
-+#: ../src/nm-iface-helper.c:284
- msgid "Use an IPv6 temporary privacy address"
- msgstr "IPv6 임시 비공개 주소 사용"
-
--#: ../src/nm-iface-helper.c:280
-+#: ../src/nm-iface-helper.c:285
- msgid "Current DHCPv4 address"
- msgstr "현재 DHCPv4 주소"
-
--#: ../src/nm-iface-helper.c:281
-+#: ../src/nm-iface-helper.c:286
- msgid "Whether DHCPv4 must be successful"
- msgstr "DHCPv4 성공 필요 여부"
-
--#: ../src/nm-iface-helper.c:282
-+#: ../src/nm-iface-helper.c:287
- msgid "Hex-encoded DHCPv4 client ID"
- msgstr "16진수 인코딩 DHCPv4 클라이언트 ID"
-
--#: ../src/nm-iface-helper.c:283
-+#: ../src/nm-iface-helper.c:288
- msgid "Hostname to send to DHCP server"
- msgstr "DHCP 서버로 전송할 호스트 이름"
-
--#: ../src/nm-iface-helper.c:283
-+#: ../src/nm-iface-helper.c:288
- msgid "barbar"
- msgstr "barbar"
-
--#: ../src/nm-iface-helper.c:284
-+#: ../src/nm-iface-helper.c:289
- msgid "FQDN to send to DHCP server"
- msgstr "DHCP 서버로 전송할 FQDN"
-
--#: ../src/nm-iface-helper.c:284
-+#: ../src/nm-iface-helper.c:289
- msgid "host.domain.org"
- msgstr "host.domain.org"
-
--#: ../src/nm-iface-helper.c:285
-+#: ../src/nm-iface-helper.c:290
- msgid "Route priority for IPv4"
- msgstr "IPv4의 라우팅 우선 순위"
-
--#: ../src/nm-iface-helper.c:285
-+#: ../src/nm-iface-helper.c:290
- msgid "0"
- msgstr "0"
-
--#: ../src/nm-iface-helper.c:286
-+#: ../src/nm-iface-helper.c:291
- msgid "Route priority for IPv6"
- msgstr "IPv6의 라우팅 우선 순위"
-
- # translation auto-copied from project RHEL LVM Administration, version 6.1, document Device_Map_App
--#: ../src/nm-iface-helper.c:286
-+#: ../src/nm-iface-helper.c:291
- msgid "1024"
- msgstr "1024"
-
--#: ../src/nm-iface-helper.c:287
-+#: ../src/nm-iface-helper.c:292
- msgid "Hex-encoded Interface Identifier"
- msgstr "16 진수로 인코딩된 인터페이스 식별자"
-
--#: ../src/nm-iface-helper.c:288
-+#: ../src/nm-iface-helper.c:293
- msgid "IPv6 SLAAC address generation mode"
- msgstr "IPv6 SLAAC 주소 생성 모드"
-
--#: ../src/nm-iface-helper.c:289
-+#: ../src/nm-iface-helper.c:294
- msgid ""
- "The logging backend configuration value. See logging.backend in "
- "NetworkManager.conf"
- msgstr "로깅 백엔드 구성 값입니다. NetworkManager.conf에서 logging.backend를 확인하십시오"
-
--#: ../src/nm-iface-helper.c:309
-+#: ../src/nm-iface-helper.c:314
- msgid ""
- "nm-iface-helper is a small, standalone process that manages a single network "
- "interface."
- msgstr "nm-iface-helper는 단일 네트워크 인터페이스를 관리하는 소규모 독립 프로세스입니다."
-
--#: ../src/nm-iface-helper.c:420
-+#: ../src/nm-iface-helper.c:425
- #, c-format
- msgid "An interface name and UUID are required\n"
- msgstr "인터페이스 및 UUID가 필요합니다\n"
-
--#: ../src/nm-iface-helper.c:427
-+#: ../src/nm-iface-helper.c:432
- #, c-format
- msgid "Failed to find interface index for %s (%s)\n"
- msgstr "%s(%s)의 인터페이스 인덱스를 찾는 데 실패했습니다\n"
-
--#: ../src/nm-iface-helper.c:445
-+#: ../src/nm-iface-helper.c:450
- #, c-format
- msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n"
- msgstr "명령행에 전달된 인식할 수 없는 로그 도메인 '%s'을 무시합니다.\n"
-
--#: ../src/nm-iface-helper.c:486
-+#: ../src/nm-iface-helper.c:491
- #, c-format
- msgid "(%s): Invalid IID %s\n"
- msgstr "(%s): 잘못된 IID %s\n"
-
--#: ../src/nm-iface-helper.c:497
-+#: ../src/nm-iface-helper.c:502
- #, c-format
- msgid "(%s): Invalid DHCP client-id %s\n"
- msgstr "(%s): 잘못된 DHCP 클라이언트 ID %s\n"
-
--#: ../src/nm-logging.c:298
-+#: ../src/nm-logging.c:253
- #, c-format
- msgid "Unknown log level '%s'"
- msgstr "알려지지 않은 로그 수준 '%s'"
-
--#: ../src/nm-logging.c:408
-+#: ../src/nm-logging.c:363
- #, c-format
- msgid "Unknown log domain '%s'"
- msgstr "알려지지 않은 로그 영역 '%s'"
-+
-+#~ msgid "missing colon in 'password' entry '%s'"
-+#~ msgstr "'암호' 항목 '%s'에 콜론 누락"
-+
-+#~ msgid "missing dot in 'password' entry '%s'"
-+#~ msgstr "'암호' 항목 '%s'에 점 누락"
-+
-+#~ msgid "invalid setting name in 'password' entry '%s'"
-+#~ msgstr "'암호' 항목 '%s'의 설정 이름이 잘못됨"
-+
-+#~ msgid "Unknown parameter: %s\n"
-+#~ msgstr "알려져있지 않은 매개변수입니다: %s\n"
-+
-+#~ msgid "Error: '%s': %s"
-+#~ msgstr "오류: %s: %s."
-+
-+#~ msgid "Unknown parameter: %s"
-+#~ msgstr "알 수 없는 매개변수: %s"
-+
-+#~ msgid "Error: Device activation failed: device was disconnected"
-+#~ msgstr "오류: 장치 활성화 실패: 장치의 연결이 해제되었습니다."
-+
-+#~ msgid "Error: Unknown parameter %s."
-+#~ msgstr "오류: 알 수 없는 매개변수 %s."
-+
-+#~ msgid "Authentication message: %s\n"
-+#~ msgstr "인증 메시지: %s\n"
-+
-+#~ msgid "Authentication error: %s\n"
-+#~ msgstr "인증 오류: %s\n"
-+
-+#~ msgid "'%s' is not valid master; use ifname or connection UUID"
-+#~ msgstr ""
-+#~ "'%s'는 올바른 마스터가 아닙니다; ifname 또는 연결 UUID를 사용합니다 "
-+
-+#~ msgid "An authentication session is already underway."
-+#~ msgstr "인증 세션이 이미 진행 중입니다."
-+
-+#~ msgid "A timeout for a DHCP transaction in seconds."
-+#~ msgstr "DHCP 트랜잭션의 시간 초과 (초)."
-+
-+#~ msgid ""
-+#~ "Array of DNS options as described in man 5 resolv.conf. NULL means that "
-+#~ "the options are unset and left at the default. In this case "
-+#~ "NetworkManager will use default options. This is distinct from an empty "
-+#~ "list of properties."
-+#~ msgstr ""
-+#~ "man 5 resolv.conf에 설명 된대로 DNS 옵션 배열. NULL은 옵션이 설정되지 않았"
-+#~ "으며 기본값으로 남아 있음을 의미합니다. 이 경우 NetworkManager는 기본 옵션"
-+#~ "을 사용합니다. 이것은 속성의 빈 목록과는 다릅니다."
-+
-+#~ msgid ""
-+#~ "The gateway associated with this configuration. This is only meaningful "
-+#~ "if \"addresses\" is also set."
-+#~ msgstr ""
-+#~ "이 구성과 관련된 게이트웨이입니다. \"주소\"도 설정되어있는 경우에만 의미"
-+#~ "가 있습니다."
-+
-+#~ msgid ""
-+#~ "A list of interface names to match. Each element is a shell wildcard "
-+#~ "pattern. When an element is prefixed with exclamation mark (!) the "
-+#~ "condition is inverted. A candidate interface name is considered matching "
-+#~ "when both these conditions are satisfied: (a) any of the elements not "
-+#~ "prefixed with '!' matches or there aren't such elements; (b) none of the "
-+#~ "elements prefixed with '!' match."
-+#~ msgstr ""
-+#~ "일치시킬 인터페이스 이름 목록. 각 요소는 쉘 와일드 카드 패턴입니다. 요소"
-+#~ "에 느낌표 (!) 접두사가 있으면 조건이 반대로됩니다. 후보 인터페이스 명은 다"
-+#~ "음 두 조건이 모두 충족 될 때 일치하는 것으로 간주됩니다. (a) '!'접두어가없"
-+#~ "는 요소 일치하거나 그런 요소가 없습니다. (b) 접두어가 '!'인 요소가 없습니"
-+#~ "다. 시합."
-+
-+#~ msgid ""
-+#~ "Specifies the unicast destination IP address of a remote Open vSwitch "
-+#~ "bridge port to connect to."
-+#~ msgstr ""
-+#~ "연결할 Open vSwitch 원격 브리지 포트의 유니 캐스트 대상 IP 주소를 지정합니"
-+#~ "다."
-+
-+#~ msgid "only one of '%s' and '%s' can be set"
-+#~ msgstr "'%s' 및 '%s' 중 하나만 설정할 수 있습니다 "
-+
-+#~ msgid "unsupported offload feature"
-+#~ msgstr "지원되지 않는 오프로드 기능"
-+
-+#~ msgid "%d. route cannot be a default route"
-+#~ msgstr "%d. 라우팅은 기본 라우팅을 사용할 수 없습니다"
-+
-+#~ msgid "secret was empty"
-+#~ msgstr "secret이 비어 있었습니다."
-+
-+#~ msgid "'%s' connections require '%s' in this property"
-+#~ msgstr "'%s' 연결에는 속성에 '%s'이 필요합니다 "
-+
-+#~ msgid "The connection was not a WiMAX connection."
-+#~ msgstr "연결이 WiMAX 연결이 아니었습니다."
-+
-+#~ msgid "Checkpoint was removed before it was initialized"
-+#~ msgstr "연결이 초기화 이전에 제거되었습니다"
-+
-+#~ msgid "Active connection removed before it was initialized"
-+#~ msgstr "활성 연결이 초기화되기 전에 제거되었습니다."
-+
-+#~ msgid "Connection removed before it was initialized"
-+#~ msgstr "연결이 초기화 이전에 제거되었습니다"
-+
-+#~ msgid "WPA Ad-Hoc disabled due to kernel bugs"
-+#~ msgstr "커널 버그로 인해 WPA 애드혹이 비활성화됨"
-+
-+#~ msgid "WPA Ad-Hoc authentication requires an Ad-Hoc mode AP"
-+#~ msgstr "WPA 애드혹 인증에는 애드혹 모드 AP가 필요합니다"
-+
-+#~ msgid ""
-+#~ "Access point mode is Ad-Hoc but setting requires Infrastructure security"
-+#~ msgstr "액세스 지점 모드는 애드혹이지만 설정에는 인프라 보안이 필요합니다"
-+
-diff --git a/po/zh_CN.po b/po/zh_CN.po
-index 72d7982be0..fddbc271f1 100644
---- a/po/zh_CN.po
-+++ b/po/zh_CN.po
-@@ -18,7 +18,7 @@ msgid ""
- msgstr ""
- "Project-Id-Version: PACKAGE VERSION\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2019-12-23 18:47+0100\n"
-+"POT-Creation-Date: 2020-06-30 11:33+0200\n"
- "PO-Revision-Date: 2019-08-15 12:20+0000\n"
- "Last-Translator: tfu <tfu@redhat.com>\n"
- "Language-Team: Chinese (China) <i18n-zh@googlegroups.com>\n"
-@@ -29,19 +29,19 @@ msgstr ""
- "Plural-Forms: nplurals=1; plural=0;\n"
- "X-Generator: Zanata 4.6.2\n"
-
--#: ../clients/cli/agent.c:23
-+#: ../clients/cli/agent.c:22
- #, c-format
- msgid ""
- "Usage: nmcli agent { COMMAND | help }\n"
- "\n"
- "COMMAND := { secret | polkit | all }\n"
- "\n"
--msgstr "用法：nmcli agent { 命令 | help }\n"
-+msgstr "用法：nmcli agent { COMMAND | help }\n"
- "\n"
- "命令 := { secret | polkit | all }\n"
- "\n"
-
--#: ../clients/cli/agent.c:31
-+#: ../clients/cli/agent.c:30
- #, c-format
- msgid ""
- "Usage: nmcli agent secret { help }\n"
-@@ -57,7 +57,7 @@ msgstr "用法：nmcli agent secret { help }\n"
- "注册的代理提供。这个命令将使 nmcli 保持运行，如果要求密码则会请求用户提供。\n"
- "\n"
-
--#: ../clients/cli/agent.c:41
-+#: ../clients/cli/agent.c:40
- #, c-format
- msgid ""
- "Usage: nmcli agent polkit { help }\n"
-@@ -73,7 +73,7 @@ msgstr "用法：nmcli agent polkit { help }\n"
- "当 polkit 守护进程要求授权时，nmcli 询问用户后将其响应返回 polkit。\n"
- "\n"
-
--#: ../clients/cli/agent.c:51
-+#: ../clients/cli/agent.c:50
- #, c-format
- msgid ""
- "Usage: nmcli agent all { help }\n"
-@@ -85,48 +85,48 @@ msgstr "用法：nmcli agent all { help }\n"
- "将 nmcli 同时作为网络管理器（NetworkManager）的密钥（secret）代理及 polkit 代理运行。\n"
- "\n"
-
--#: ../clients/cli/agent.c:143
-+#: ../clients/cli/agent.c:142
- #, c-format
- msgid "nmcli successfully registered as a NetworkManager's secret agent.\n"
- msgstr "nmcli 已成功地注册为网络管理器（NetworkManager）的密钥（secret）代理。\n"
-
--#: ../clients/cli/agent.c:145
-+#: ../clients/cli/agent.c:144
- #, c-format
- msgid "Error: secret agent initialization failed"
- msgstr "错误：密钥（secret）代理初始化失败"
-
--#: ../clients/cli/agent.c:164
--#, c-format
--msgid "Error: polkit agent initialization failed: %s"
--msgstr "错误：polkit 代理初始化失败：%s"
--
--#: ../clients/cli/agent.c:172
-+#: ../clients/cli/agent.c:153
- #, c-format
- msgid "nmcli successfully registered as a polkit agent.\n"
- msgstr "nmcli 已成功地注册为 polkit 代理。\n"
-
--#: ../clients/cli/common.c:344 ../clients/cli/common.c:345
--#: ../clients/cli/common.c:376 ../clients/cli/common.c:377
--#: ../clients/cli/connections.c:1495
-+#: ../clients/cli/agent.c:176
-+#, c-format
-+msgid "Error: polkit agent initialization failed: %s"
-+msgstr "错误：polkit 代理初始化失败：%s"
-+
-+#: ../clients/cli/common.c:347 ../clients/cli/common.c:348
-+#: ../clients/cli/common.c:379 ../clients/cli/common.c:380
-+#: ../clients/cli/connections.c:1523
- msgid "GROUP"
- msgstr "组"
-
--#: ../clients/cli/common.c:628
-+#: ../clients/cli/common.c:631
- #, c-format
- msgid "Error: openconnect failed: %s\n"
- msgstr "错误：openconnect 失败：%s\n"
-
--#: ../clients/cli/common.c:635
-+#: ../clients/cli/common.c:638
- #, c-format
- msgid "Error: openconnect failed with status %d\n"
- msgstr "错误：openconnect 失败，状态为 %d\n"
-
--#: ../clients/cli/common.c:637
-+#: ../clients/cli/common.c:640
- #, c-format
- msgid "Error: openconnect failed with signal %d\n"
- msgstr "错误：openconnect 失败，信号为 %d\n"
-
--#: ../clients/cli/common.c:725
-+#: ../clients/cli/common.c:728
- #, c-format
- msgid ""
- "Warning: password for '%s' not given in 'passwd-file' and nmcli cannot ask "
-@@ -134,65 +134,65 @@ msgid ""
- msgstr "警告：\"passwd-file\" 里没有给定 \"%s\" 的密码而且 nmcli 没有 \"--ask\" 选项就无法进行\n"
- "询问。\n"
-
--#: ../clients/cli/common.c:1227
-+#: ../clients/cli/common.c:1244
- #, c-format
- msgid "Error: Could not create NMClient object: %s."
- msgstr "错误：无法创建 NMClient 对象：%s。"
-
--#: ../clients/cli/common.c:1246
-+#: ../clients/cli/common.c:1265
- msgid "Error: NetworkManager is not running."
- msgstr "错误：网络管理器（NetworkManager）未运行。"
-
--#: ../clients/cli/common.c:1339
-+#: ../clients/cli/common.c:1364
- #, c-format
- msgid "Error: argument '%s' not understood. Try passing --help instead."
- msgstr "错误：不能理解参数 \"%s\"。试下换成传递 --help 参数。"
-
--#: ../clients/cli/common.c:1347
-+#: ../clients/cli/common.c:1372
- msgid "Error: missing argument. Try passing --help."
- msgstr "错误：缺少参数。试下传递 --help 参数。"
-
--#: ../clients/cli/common.c:1414
-+#: ../clients/cli/common.c:1439
- msgid "access denied"
- msgstr "访问遭到拒绝"
-
--#: ../clients/cli/common.c:1416
-+#: ../clients/cli/common.c:1441
- msgid "NetworkManager is not running"
- msgstr "NetworkManaer 未运行"
-
--#: ../clients/cli/common.c:1442
-+#: ../clients/cli/common.c:1467
- #, c-format
- msgid "Error: error connecting to system bus: %s"
- msgstr "错误：连接到系统总线时出错： %s"
-
--#: ../clients/cli/common.c:1468 ../clients/cli/connections.c:66
--#: ../clients/cli/connections.c:75 ../clients/cli/devices.c:427
--#: ../clients/cli/devices.c:519 ../clients/cli/devices.c:526
--#: ../clients/cli/general.c:26 ../clients/cli/general.c:116
--#: ../clients/cli/general.c:121 ../clients/common/nm-client-utils.c:250
--#: ../clients/common/nm-client-utils.c:263
--#: ../clients/common/nm-client-utils.c:267
--#: ../clients/common/nm-client-utils.c:272
--#: ../clients/common/nm-meta-setting-desc.c:1724
--#: ../clients/common/nm-meta-setting-desc.c:1755
--#: ../clients/common/nm-meta-setting-desc.c:2687
--#: ../clients/common/nm-meta-setting-desc.c:2745
-+#: ../clients/cli/common.c:1493 ../clients/cli/connections.c:67
-+#: ../clients/cli/connections.c:77 ../clients/cli/devices.c:434
-+#: ../clients/cli/devices.c:526 ../clients/cli/devices.c:533
-+#: ../clients/cli/general.c:31 ../clients/cli/general.c:86
-+#: ../clients/cli/general.c:91 ../clients/common/nm-client-utils.c:252
-+#: ../clients/common/nm-client-utils.c:265
-+#: ../clients/common/nm-client-utils.c:301
-+#: ../clients/common/nm-client-utils.c:306
-+#: ../clients/common/nm-meta-setting-desc.c:1747
-+#: ../clients/common/nm-meta-setting-desc.c:1778
-+#: ../clients/common/nm-meta-setting-desc.c:2680
-+#: ../clients/common/nm-meta-setting-desc.c:2738
- msgid "unknown"
- msgstr "未知"
-
--#: ../clients/cli/common.c:1469
-+#: ../clients/cli/common.c:1494
- msgid "none"
- msgstr "无"
-
--#: ../clients/cli/common.c:1470
-+#: ../clients/cli/common.c:1495
- msgid "portal"
- msgstr "入口"
-
--#: ../clients/cli/common.c:1471
-+#: ../clients/cli/common.c:1496
- msgid "limited"
- msgstr "受限"
-
--#: ../clients/cli/common.c:1472
-+#: ../clients/cli/common.c:1497
- msgid "full"
- msgstr "完全"
-
-@@ -227,55 +227,55 @@ msgstr "连接（名称、UUID 或路径）： "
- msgid "Connection(s) (name, UUID, path or apath): "
- msgstr "连接（名称、UUID、路径或活动路径）： "
-
--#: ../clients/cli/connections.c:67
-+#: ../clients/cli/connections.c:68
- msgid "activating"
- msgstr "激活中"
-
--#: ../clients/cli/connections.c:68
-+#: ../clients/cli/connections.c:69
- msgid "activated"
- msgstr "已激活"
-
--#: ../clients/cli/connections.c:69 ../clients/common/nm-client-utils.c:261
-+#: ../clients/cli/connections.c:70 ../clients/common/nm-client-utils.c:263
- msgid "deactivating"
- msgstr "停用中"
-
--#: ../clients/cli/connections.c:70
-+#: ../clients/cli/connections.c:71
- msgid "deactivated"
- msgstr "已停用"
-
--#: ../clients/cli/connections.c:76
-+#: ../clients/cli/connections.c:78
- msgid "VPN connecting (prepare)"
- msgstr "VPN 连接中（准备）"
-
--#: ../clients/cli/connections.c:77
-+#: ../clients/cli/connections.c:79
- msgid "VPN connecting (need authentication)"
- msgstr "VPN 连接中（需要验证）"
-
--#: ../clients/cli/connections.c:78
-+#: ../clients/cli/connections.c:80
- msgid "VPN connecting"
- msgstr "VPN 连接中"
-
--#: ../clients/cli/connections.c:79
-+#: ../clients/cli/connections.c:81
- msgid "VPN connecting (getting IP configuration)"
- msgstr "VPN 连接中（获取 IP 配置中）"
-
--#: ../clients/cli/connections.c:80
-+#: ../clients/cli/connections.c:82
- msgid "VPN connected"
- msgstr "VPN 已连接"
-
--#: ../clients/cli/connections.c:81
-+#: ../clients/cli/connections.c:83
- msgid "VPN connection failed"
- msgstr "VPN 连接失败"
-
--#: ../clients/cli/connections.c:82
-+#: ../clients/cli/connections.c:84
- msgid "VPN disconnected"
- msgstr "VPN 已断开"
-
--#: ../clients/cli/connections.c:544
-+#: ../clients/cli/connections.c:546
- msgid "never"
- msgstr "从不"
-
--#: ../clients/cli/connections.c:904
-+#: ../clients/cli/connections.c:907
- #, c-format
- msgid ""
- "Usage: nmcli connection { COMMAND | help }\n"
-@@ -347,7 +347,7 @@ msgstr "Usage: nmcli connection { COMMAND | help }\n"
- " export [id | uuid | path] <ID> [<output file>]\n"
- "\n"
-
--#: ../clients/cli/connections.c:926
-+#: ../clients/cli/connections.c:929
- #, c-format
- msgid ""
- "Usage: nmcli connection show { ARGUMENTS | help }\n"
-@@ -386,7 +386,7 @@ msgstr "用法：nmcli connection show { 参数 | help }\n"
- "局的 \"--fields\" 选项过滤输出。更多信息请参考手册页。当指定 --active 选项时，只\n"
- "会考虑活动的配置集。请使用全局的 --show-secrets 选项以同时显示关联的密钥（secret）。\n"
-
--#: ../clients/cli/connections.c:947
-+#: ../clients/cli/connections.c:950
- #, c-format
- msgid ""
- "Usage: nmcli connection up { ARGUMENTS | help }\n"
-@@ -424,7 +424,7 @@ msgstr "用法：nmcli connection up { 参数 | help }\n"
- "nsp - 指定要连接的 NSP（只对 WiMAX 有效）\n"
- "passwd-file - 激活连接所需的密码文件\n"
-
--#: ../clients/cli/connections.c:968
-+#: ../clients/cli/connections.c:971
- #, c-format
- msgid ""
- "Usage: nmcli connection down { ARGUMENTS | help }\n"
-@@ -444,7 +444,7 @@ msgstr "用法：nmcli connection down { 参数 | help }\n"
- "D-Bus 路径来确定。\n"
- "\n"
-
--#: ../clients/cli/connections.c:980
-+#: ../clients/cli/connections.c:983
- #, c-format
- msgid ""
- "Usage: nmcli connection add { ARGUMENTS | help }\n"
-@@ -752,7 +752,7 @@ msgstr "Usage: nmcli connection add { ARGUMENTS | help }\n"
- " [ip6 <IPv6 address>] [gw6 <IPv6 gateway>]\n"
- "\n"
-
--#: ../clients/cli/connections.c:1104
-+#: ../clients/cli/connections.c:1107
- #, c-format
- msgid ""
- "Usage: nmcli connection modify { ARGUMENTS | help }\n"
-@@ -765,6 +765,10 @@ msgid ""
- "The '+' sign allows appending items instead of overwriting the whole value.\n"
- "The '-' sign allows removing selected items instead of the whole value.\n"
- "\n"
-+"ARGUMENTS := remove <setting>\n"
-+"\n"
-+"Remove a setting from the connection profile.\n"
-+"\n"
- "Examples:\n"
- "nmcli con mod home-wifi wifi.ssid rakosnicek\n"
- "nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, "
-@@ -774,14 +778,21 @@ msgid ""
- "nmcli con mod em1-1 -ipv6.addr \"abbe::cafe/56\"\n"
- "nmcli con mod bond0 +bond.options mii=500\n"
- "nmcli con mod bond0 -bond.options downdelay\n"
-+"nmcli con mod em1-1 remove sriov\n"
-+"\n"
-+msgstr "用法：nmcli connection modify { ARGUMENTS | help }\n"
-+"\n"
-+"ARGUMENTS := [id | uuid | path] <ID> ([+|-]<setting>.<property> <value>)+\n"
- "\n"
--msgstr "用法：nmcli connection modify { 参数 | help }\n"
-+"修改连接配置集的一个或多个属性。\n"
-+"配置集由它的名称、UUID 或 D-Bus 路径代表。对于有多个值\n"
-+"的属性，可以使用 '+' 或 '-' 为属性名加前缀。\n"
-+"'+' 代表附加项而不是覆盖整个值。\n"
-+"'-' 代表删除选项的项而不是整个值。\n"
- "\n"
--"参数 := [id | uuid | path] <ID> ([+|-]<设置>.<属性> <值>)+\n"
-+"ARGUMENTS := remove <setting>\n"
- "\n"
--"修改连接配置集的一个或多个属性。配置集由其名称、UUID 或 D-Bus 路径来确定。对\n"
--"于具有多个值的属性，您可以在属性名称前插入可选的 \"+\" 或 \"-\"。\"+\" 符号允许附加项\n"
--"而不是覆盖整个值。\"-\" 符号允许删除选中项而不是整个值。\n"
-+"从连接配置集中删除一个设置。\n"
- "\n"
- "示例：\n"
- "nmcli con mod home-wifi wifi.ssid rakosnicek\n"
-@@ -791,9 +802,10 @@ msgstr "用法：nmcli connection modify { 参数 | help }\n"
- "nmcli con mod em1-1 -ipv6.addr \"abbe::cafe/56\"\n"
- "nmcli con mod bond0 +bond.options mii=500\n"
- "nmcli con mod bond0 -bond.options downdelay\n"
-+"nmcli con mod em1-1 remove sriov\n"
- "\n"
-
--#: ../clients/cli/connections.c:1127
-+#: ../clients/cli/connections.c:1135
- #, c-format
- msgid ""
- "Usage: nmcli connection clone { ARGUMENTS | help }\n"
-@@ -813,7 +825,7 @@ msgstr "用法：nmcli connection clone { 参数 | help }\n"
- "成）和 ID（由 <新名称> 参数提供）不同。\n"
- "\n"
-
--#: ../clients/cli/connections.c:1139
-+#: ../clients/cli/connections.c:1147
- #, c-format
- msgid ""
- "Usage: nmcli connection edit { ARGUMENTS | help }\n"
-@@ -839,7 +851,7 @@ msgstr "用法：nmcli connection edit { 参数 | help }\n"
- "在交互式编辑器中添加新的连接配置文件。\n"
- "\n"
-
--#: ../clients/cli/connections.c:1154
-+#: ../clients/cli/connections.c:1162
- #, c-format
- msgid ""
- "Usage: nmcli connection delete { ARGUMENTS | help }\n"
-@@ -857,7 +869,7 @@ msgstr "用法：nmcli connection delete { 参数 | help }\n"
- "配置集由其名称、UUID 或 D-Bus 路径来确定。\n"
- "\n"
-
--#: ../clients/cli/connections.c:1165
-+#: ../clients/cli/connections.c:1173
- #, c-format
- msgid ""
- "Usage: nmcli connection monitor { ARGUMENTS | help }\n"
-@@ -876,7 +888,7 @@ msgstr "用法：nmcli connection monitor { 参数 | help }\n"
- "每当指定的连接修改时，这个命令将其打印出来。如果没有指定则监视所有的连接。\n"
- "\n"
-
--#: ../clients/cli/connections.c:1177
-+#: ../clients/cli/connections.c:1185
- #, c-format
- msgid ""
- "Usage: nmcli connection reload { help }\n"
-@@ -888,7 +900,7 @@ msgstr "用法：nmcli connection reload { help }\n"
- "从磁盘重新载入所有的连接文件。\n"
- "\n"
-
--#: ../clients/cli/connections.c:1185
-+#: ../clients/cli/connections.c:1193
- #, c-format
- msgid ""
- "Usage: nmcli connection load { ARGUMENTS | help }\n"
-@@ -908,7 +920,7 @@ msgstr "用法：nmcli connection load { 参数 | help }\n"
- "网络管理器（NetworkManager）能注意到它的最新状态。\n"
- "\n"
-
--#: ../clients/cli/connections.c:1197
-+#: ../clients/cli/connections.c:1205
- #, c-format
- msgid ""
- "Usage: nmcli connection import { ARGUMENTS | help }\n"
-@@ -929,7 +941,7 @@ msgstr "用法：nmcli connection import { 参数 | help }\n"
- "目前只支持 VPN 配置。配置通过 NetworkManager VPN 插件导入。\n"
- "\n"
-
--#: ../clients/cli/connections.c:1210
-+#: ../clients/cli/connections.c:1218
- #, c-format
- msgid ""
- "Usage: nmcli connection export { ARGUMENTS | help }\n"
-@@ -946,410 +958,414 @@ msgstr "用法：nmcli connection export { 参数 | help }\n"
- "导出连接。目前只支持 VPN 连接。数据会导出到标准输出或文件（如果给定了）。\n"
- "\n"
-
--#: ../clients/cli/connections.c:1301
-+#: ../clients/cli/connections.c:1309
- #, c-format
- msgid "Error updating secrets for %s: %s\n"
- msgstr "更新 %s 的密钥时出错：%s\n"
-
--#: ../clients/cli/connections.c:1348
-+#: ../clients/cli/connections.c:1356
- msgid "Connection profile details"
- msgstr "连接配置集详情"
-
--#: ../clients/cli/connections.c:1361 ../clients/cli/connections.c:1446
-+#: ../clients/cli/connections.c:1369 ../clients/cli/connections.c:1470
- #, c-format
- msgid "Error: 'connection show': %s"
- msgstr "错误：\"connection show\"：%s"
-
--#: ../clients/cli/connections.c:1436
-+#: ../clients/cli/connections.c:1458
- msgid "Activate connection details"
- msgstr "激活连接详情"
-
--#: ../clients/cli/connections.c:1544 ../clients/cli/devices.c:1485
--#: ../clients/cli/devices.c:1499 ../clients/cli/devices.c:1513
--#: ../clients/cli/devices.c:1528 ../clients/cli/devices.c:1586
--#: ../clients/cli/devices.c:1688
-+#: ../clients/cli/connections.c:1572 ../clients/cli/devices.c:1501
-+#: ../clients/cli/devices.c:1515 ../clients/cli/devices.c:1529
-+#: ../clients/cli/devices.c:1544 ../clients/cli/devices.c:1601
-+#: ../clients/cli/devices.c:1703
- msgid "NAME"
- msgstr "名称"
-
--#: ../clients/cli/connections.c:1637
-+#: ../clients/cli/connections.c:1665
- #, c-format
- msgid "invalid field '%s'; allowed fields: %s and %s, or %s,%s"
- msgstr "无效字段 \"%s\"；允许的字段为 %s 和 %s，或 %s,%s"
-
--#: ../clients/cli/connections.c:1647 ../clients/cli/connections.c:1655
-+#: ../clients/cli/connections.c:1675 ../clients/cli/connections.c:1683
- #, c-format
- msgid "'%s' has to be alone"
- msgstr "\"%s\" 必须是单独的"
-
--#: ../clients/cli/connections.c:1915
-+#: ../clients/cli/connections.c:1943
- #, c-format
- msgid "incorrect string '%s' of '--order' option"
- msgstr "\"--order\" 选项的字符串 \"%s\" 错误"
-
--#: ../clients/cli/connections.c:1940
-+#: ../clients/cli/connections.c:1968
- #, c-format
- msgid "incorrect item '%s' in '--order' option"
- msgstr "\"--order\" 选项里有错误项 \"%s\""
-
--#: ../clients/cli/connections.c:1978
-+#: ../clients/cli/connections.c:2006
- msgid "No connection specified"
- msgstr "未指定连接"
-
--#: ../clients/cli/connections.c:1989
-+#: ../clients/cli/connections.c:2017
- #, c-format
- msgid "%s argument is missing"
- msgstr "缺少 %s 参数"
-
--#: ../clients/cli/connections.c:2007
-+#: ../clients/cli/connections.c:2035
- #, c-format
- msgid "unknown connection '%s'"
- msgstr "未知的连接 \"%s\""
-
--#: ../clients/cli/connections.c:2036
-+#: ../clients/cli/connections.c:2064
- msgid "'--order' argument is missing"
- msgstr "缺少 \"--order\" 参数"
-
--#: ../clients/cli/connections.c:2096
-+#: ../clients/cli/connections.c:2125
- msgid "NetworkManager active profiles"
- msgstr "网络管理器活动的配置集"
-
--#: ../clients/cli/connections.c:2097
-+#: ../clients/cli/connections.c:2126
- msgid "NetworkManager connection profiles"
- msgstr "网络管理器连接配置集"
-
--#: ../clients/cli/connections.c:2149 ../clients/cli/connections.c:2895
--#: ../clients/cli/connections.c:2907 ../clients/cli/connections.c:2919
--#: ../clients/cli/connections.c:3149 ../clients/cli/connections.c:8969
--#: ../clients/cli/connections.c:8990 ../clients/cli/devices.c:3019
--#: ../clients/cli/devices.c:3031 ../clients/cli/devices.c:3044
--#: ../clients/cli/devices.c:3299 ../clients/cli/devices.c:3310
--#: ../clients/cli/devices.c:3328 ../clients/cli/devices.c:3337
--#: ../clients/cli/devices.c:3358 ../clients/cli/devices.c:3369
--#: ../clients/cli/devices.c:3387 ../clients/cli/devices.c:3905
--#: ../clients/cli/devices.c:3915 ../clients/cli/devices.c:3923
--#: ../clients/cli/devices.c:3935 ../clients/cli/devices.c:3950
--#: ../clients/cli/devices.c:3958 ../clients/cli/devices.c:4101
--#: ../clients/cli/devices.c:4112 ../clients/cli/devices.c:4326
--#: ../clients/cli/devices.c:4495
-+#: ../clients/cli/connections.c:2178 ../clients/cli/connections.c:2857
-+#: ../clients/cli/connections.c:2870 ../clients/cli/connections.c:2883
-+#: ../clients/cli/connections.c:3115 ../clients/cli/connections.c:8986
-+#: ../clients/cli/connections.c:9008 ../clients/cli/devices.c:3121
-+#: ../clients/cli/devices.c:3134 ../clients/cli/devices.c:3146
-+#: ../clients/cli/devices.c:3439 ../clients/cli/devices.c:3450
-+#: ../clients/cli/devices.c:3468 ../clients/cli/devices.c:3477
-+#: ../clients/cli/devices.c:3498 ../clients/cli/devices.c:3509
-+#: ../clients/cli/devices.c:3527 ../clients/cli/devices.c:4047
-+#: ../clients/cli/devices.c:4058 ../clients/cli/devices.c:4067
-+#: ../clients/cli/devices.c:4081 ../clients/cli/devices.c:4098
-+#: ../clients/cli/devices.c:4107 ../clients/cli/devices.c:4253
-+#: ../clients/cli/devices.c:4264 ../clients/cli/devices.c:4480
-+#: ../clients/cli/devices.c:4652
- #, c-format
- msgid "Error: %s argument is missing."
- msgstr "错误：缺少 %s 参数。"
-
--#: ../clients/cli/connections.c:2177
-+#: ../clients/cli/connections.c:2206
- #, c-format
- msgid "Error: %s - no such connection profile."
- msgstr "错误：%s - 没有这样的连接配置集。"
-
--#: ../clients/cli/connections.c:2268 ../clients/cli/connections.c:2882
--#: ../clients/cli/connections.c:2947 ../clients/cli/connections.c:8506
--#: ../clients/cli/connections.c:8597 ../clients/cli/connections.c:9090
--#: ../clients/cli/devices.c:1773 ../clients/cli/devices.c:2041
--#: ../clients/cli/devices.c:2211 ../clients/cli/devices.c:2319
--#: ../clients/cli/devices.c:2511 ../clients/cli/devices.c:3178
--#: ../clients/cli/devices.c:4064 ../clients/cli/devices.c:4501
--#: ../clients/cli/general.c:982
-+#: ../clients/cli/connections.c:2297 ../clients/cli/connections.c:2843
-+#: ../clients/cli/connections.c:2913 ../clients/cli/connections.c:8527
-+#: ../clients/cli/connections.c:8619 ../clients/cli/connections.c:9113
-+#: ../clients/cli/devices.c:1801 ../clients/cli/devices.c:2069
-+#: ../clients/cli/devices.c:2239 ../clients/cli/devices.c:2352
-+#: ../clients/cli/devices.c:2541 ../clients/cli/devices.c:3318
-+#: ../clients/cli/devices.c:4217 ../clients/cli/devices.c:4659
-+#: ../clients/cli/general.c:997
- #, c-format
- msgid "Error: %s."
- msgstr "错误：%s。"
-
--#: ../clients/cli/connections.c:2361 ../clients/cli/devices.c:4278
-+#: ../clients/cli/connections.c:2389 ../clients/cli/devices.c:4431
- #, c-format
- msgid "no active connection on device '%s'"
- msgstr "设备 \"%s\" 上没有活动的连接"
-
--#: ../clients/cli/connections.c:2369
-+#: ../clients/cli/connections.c:2397
- msgid "no active connection or device"
- msgstr "没有活动的连接或设备"
-
--#: ../clients/cli/connections.c:2389
-+#: ../clients/cli/connections.c:2417
- #, c-format
- msgid "device '%s' not compatible with connection '%s': "
- msgstr "设备 '%s' 与连接 '%s' 不兼容： "
-
--#: ../clients/cli/connections.c:2422
-+#: ../clients/cli/connections.c:2450
- #, c-format
- msgid "device '%s' not compatible with connection '%s'"
- msgstr "设备 \"%s\" 与连接 \"%s\" 不兼容"
-
--#: ../clients/cli/connections.c:2425
-+#: ../clients/cli/connections.c:2453
- #, c-format
- msgid "no device found for connection '%s'"
- msgstr "没有找到可用于连接 \"%s\" 的设备"
-
--#: ../clients/cli/connections.c:2476
-+#: ../clients/cli/connections.c:2504
- #, c-format
- msgid "Hint: use '%s' to get more details."
- msgstr "提示：使用 '%s' 来获得更详细的信息。"
-
--#: ../clients/cli/connections.c:2494
-+#: ../clients/cli/connections.c:2522
- #, c-format
- msgid "Connection successfully activated (%s) (D-Bus active path: %s)\n"
- msgstr "连接已成功激活（%s）（D-Bus 活动路径：%s）\n"
-
--#: ../clients/cli/connections.c:2498 ../clients/cli/connections.c:2648
--#: ../clients/cli/connections.c:6798
-+#: ../clients/cli/connections.c:2526 ../clients/cli/connections.c:2676
-+#: ../clients/cli/connections.c:6828
- #, c-format
- msgid "Connection successfully activated (D-Bus active path: %s)\n"
- msgstr "连接已成功激活（D-Bus 活动路径：%s）\n"
-
--#: ../clients/cli/connections.c:2505 ../clients/cli/connections.c:2627
-+#: ../clients/cli/connections.c:2533 ../clients/cli/connections.c:2655
- #, c-format
- msgid "Error: Connection activation failed: %s"
- msgstr "错误：连接激活失败：%s"
-
--#: ../clients/cli/connections.c:2542
-+#: ../clients/cli/connections.c:2570
- #, c-format
- msgid "Error: Timeout expired (%d seconds)"
- msgstr "错误：超时时间已到（%d 秒）"
-
--#: ../clients/cli/connections.c:2709
--#, c-format
--msgid "failed to read passwd-file '%s': %s"
--msgstr "读取 passwd-file \"%s\" 失败：%s"
--
--#: ../clients/cli/connections.c:2722
--#, c-format
--msgid "missing colon in 'password' entry '%s'"
--msgstr "\"password\" 条目 \"%s\" 缺失了冒号"
--
--#: ../clients/cli/connections.c:2730
--#, c-format
--msgid "missing dot in 'password' entry '%s'"
--msgstr "\"password\" 条目 \"%s\" 缺失了点号"
--
- #: ../clients/cli/connections.c:2743
- #, c-format
--msgid "invalid setting name in 'password' entry '%s'"
--msgstr "\"password\" 条目 \"%s\" 里出现无效的设置名称"
--
--#: ../clients/cli/connections.c:2800
--#, c-format
- msgid "unknown device '%s'."
- msgstr "未知设备 \"%s\"。"
-
--#: ../clients/cli/connections.c:2805
-+#: ../clients/cli/connections.c:2748
- msgid "neither a valid connection nor device given"
- msgstr "没有给定有效的连接或设备"
-
--#: ../clients/cli/connections.c:2929 ../clients/cli/connections.c:9000
--#: ../clients/cli/devices.c:1732 ../clients/cli/devices.c:1778
--#: ../clients/cli/devices.c:2216 ../clients/cli/devices.c:3076
--#: ../clients/cli/devices.c:3400 ../clients/cli/devices.c:3967
--#: ../clients/cli/devices.c:4118 ../clients/cli/devices.c:4335
--#: ../clients/cli/devices.c:4505
-+#: ../clients/cli/connections.c:2761
-+#, c-format
-+msgid "invalid passwd-file '%s' at line %zd: %s"
-+msgstr "无效的 passwd-file '%s' 在行 %zd: %s"
-+
-+#: ../clients/cli/connections.c:2767
-+#, c-format
-+msgid "invalid passwd-file '%s': %s"
-+msgstr "无效的 passwd-file '%s': %s"
-+
-+#: ../clients/cli/connections.c:2894 ../clients/cli/connections.c:9019
-+#: ../clients/cli/devices.c:1759 ../clients/cli/devices.c:1807
-+#: ../clients/cli/devices.c:2245 ../clients/cli/devices.c:3181
-+#: ../clients/cli/devices.c:3540 ../clients/cli/devices.c:4117
-+#: ../clients/cli/devices.c:4270 ../clients/cli/devices.c:4490
-+#: ../clients/cli/devices.c:4664
- #, c-format
- msgid "Error: invalid extra argument '%s'."
- msgstr "错误：无效的额外参数 \"%s\"。"
-
--#: ../clients/cli/connections.c:2955
-+#: ../clients/cli/connections.c:2922
- msgid "preparing"
- msgstr "准备中"
-
--#: ../clients/cli/connections.c:3064
-+#: ../clients/cli/connections.c:3029
- #, c-format
- msgid "Connection '%s' (%s) successfully deleted.\n"
- msgstr "成功删除连接 \"%s\" (%s)。\n"
-
--#: ../clients/cli/connections.c:3080
-+#: ../clients/cli/connections.c:3045
- #, c-format
- msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n"
- msgstr "成功停用连接 \"%s\"（D-Bus 活动路径：%s）\n"
-
--#: ../clients/cli/connections.c:3131 ../clients/cli/connections.c:8693
--#: ../clients/cli/connections.c:8724 ../clients/cli/connections.c:8890
-+#: ../clients/cli/connections.c:3096 ../clients/cli/connections.c:8716
-+#: ../clients/cli/connections.c:8747 ../clients/cli/connections.c:8910
- #, c-format
- msgid "Error: No connection specified."
- msgstr "错误：未指定连接。"
-
--#: ../clients/cli/connections.c:3161
-+#: ../clients/cli/connections.c:3128
- #, c-format
- msgid "Error: '%s' is not an active connection.\n"
- msgstr "错误：\"%s\" 不是活动的连接。\n"
-
--#: ../clients/cli/connections.c:3162
-+#: ../clients/cli/connections.c:3129
- #, c-format
- msgid "Error: not all active connections found."
- msgstr "错误：未找到所有的活动连接。"
-
--#: ../clients/cli/connections.c:3170
-+#: ../clients/cli/connections.c:3137
- #, c-format
- msgid "Error: no active connection provided."
- msgstr "错误：未提供活动连接。"
-
--#: ../clients/cli/connections.c:3201
-+#: ../clients/cli/connections.c:3169
- #, c-format
- msgid "Connection '%s' deactivation failed: %s\n"
- msgstr "错误：停用连接 \"%s\" 失败：%s\n"
-
--#: ../clients/cli/connections.c:3461 ../clients/cli/connections.c:3518
--#: ../clients/common/nm-client-utils.c:211
-+#: ../clients/cli/connections.c:3427 ../clients/cli/connections.c:3485
-+#: ../clients/common/nm-client-utils.c:213
- #, c-format
- msgid "'%s' not among [%s]"
- msgstr "\"%s\" 不在 [%s] 中"
-
- #. We should not really come here
--#: ../clients/cli/connections.c:3481 ../clients/cli/connections.c:3541
--#: ../clients/common/nm-client-utils.c:279
-+#: ../clients/cli/connections.c:3447 ../clients/cli/connections.c:3506
-+#: ../clients/common/nm-client-utils.c:313
- #, c-format
- msgid "Unknown error"
- msgstr "未知错误"
-
--#: ../clients/cli/connections.c:3675
-+#: ../clients/cli/connections.c:3640
- #, c-format
- msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
- msgstr "警告：master=\"%s\" 没有引用任何现有的配置集。\n"
-
--#: ../clients/cli/connections.c:4038
-+#: ../clients/cli/connections.c:4000
- #, c-format
- msgid "Error: invalid property '%s': %s."
- msgstr "错误：无效的属性 \"%s\"：%s。"
-
--#: ../clients/cli/connections.c:4053
-+#: ../clients/cli/connections.c:4015
- #, c-format
- msgid "Error: failed to %s %s.%s: %s."
- msgstr "错误：%s %s.%s 失败 : %s."
-
--#: ../clients/cli/connections.c:4095
-+#: ../clients/cli/connections.c:4057
- #, c-format
- msgid "Error: '%s' is mandatory."
- msgstr "错误：设置 \"%s\" 是必填的。"
-
--#: ../clients/cli/connections.c:4122
-+#: ../clients/cli/connections.c:4084
- #, c-format
- msgid "Error: invalid slave type; %s."
- msgstr "错误：无效的从属类型；%s。"
-
--#: ../clients/cli/connections.c:4130
-+#: ../clients/cli/connections.c:4092
- #, c-format
- msgid "Error: invalid connection type; %s."
- msgstr "错误：无效的连接类型；%s。"
-
--#: ../clients/cli/connections.c:4207
-+#: ../clients/cli/connections.c:4169
- #, c-format
- msgid "Error: bad connection type: %s"
- msgstr "错误：错误的连接类型：%s"
-
--#: ../clients/cli/connections.c:4263
--#, c-format
--msgid "Error: '%s': %s"
--msgstr "错误：\"%s\"：%s"
--
--#: ../clients/cli/connections.c:4290
-+#: ../clients/cli/connections.c:4244
- msgid "Error: master is required"
- msgstr "错误：需要主连接"
-
--#: ../clients/cli/connections.c:4359
-+#: ../clients/cli/connections.c:4313
- #, c-format
- msgid "Error: error adding bond option '%s=%s'."
- msgstr "错误：添加绑定（bond）选项 \"%s=%s\" 时出错。"
-
--#: ../clients/cli/connections.c:4390
-+#: ../clients/cli/connections.c:4344
- #, 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:4421
-+#: ../clients/cli/connections.c:4375
- #, 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:4686
-+#: ../clients/cli/connections.c:4669
-+#, c-format
-+msgid "Error: setting '%s' is mandatory and cannot be removed."
-+msgstr "错误：设置 \"%s\" 是必填的而且无法移除。"
-+
-+#: ../clients/cli/connections.c:4679
- #, c-format
- msgid "Error: value for '%s' is missing."
- msgstr "错误：缺少 \"%s\" 的值。"
-
--#: ../clients/cli/connections.c:4730
-+#: ../clients/cli/connections.c:4724
- msgid "Error: <setting>.<property> argument is missing."
- msgstr "错误：缺少 <设置>.<属性> 参数。"
-
--#: ../clients/cli/connections.c:4756
-+#: ../clients/cli/connections.c:4750
-+msgid "Error: missing setting."
-+msgstr "错误：缺少设置。"
-+
-+#: ../clients/cli/connections.c:4768
-+#, c-format
-+msgid "Setting '%s' is not present in the connection."
-+msgstr "设置 \"%s\" 在连接里未提供。"
-+
-+#: ../clients/cli/connections.c:4772
-+#, c-format
-+msgid "Error: invalid setting argument '%s'."
-+msgstr "错误：无效的设置参数 '%s'。"
-+
-+#: ../clients/cli/connections.c:4796
- #, c-format
- msgid "Error: invalid or not allowed setting '%s': %s."
- msgstr "错误：无效或不允许的设置 \"%s\"：%s。"
-
--#: ../clients/cli/connections.c:4805 ../clients/cli/connections.c:4821
-+#: ../clients/cli/connections.c:4845 ../clients/cli/connections.c:4861
- #, c-format
- msgid "Error: '%s' is ambiguous (%s.%s or %s.%s)."
- msgstr "错误：\"%s\" 不明确（%s.%s 或 %s.%s）。"
-
--#: ../clients/cli/connections.c:4837
-+#: ../clients/cli/connections.c:4881
- #, c-format
- msgid "Error: invalid <setting>.<property> '%s'."
- msgstr "Error: invalid <setting>.<property> '%s'."
-
--#: ../clients/cli/connections.c:4876 ../clients/cli/connections.c:8545
-+#: ../clients/cli/connections.c:4919 ../clients/cli/connections.c:8567
- #, c-format
- msgid "Error: Failed to add '%s' connection: %s"
- msgstr "错误：添加 \"%s\" 连接失败：%s"
-
--#: ../clients/cli/connections.c:4894
--#, fuzzy, c-format
-+#: ../clients/cli/connections.c:4937
-+#, 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"
-
--#: ../clients/cli/connections.c:4903
-+#: ../clients/cli/connections.c:4946
- #, c-format
- msgid "Connection '%s' (%s) successfully added.\n"
- msgstr "连接 \"%s\" (%s) 已成功添加。\n"
-
--#: ../clients/cli/connections.c:4965 ../clients/cli/connections.c:6921
--#: ../clients/cli/connections.c:6922 ../clients/cli/devices.c:518
--#: ../clients/cli/devices.c:525 ../clients/cli/devices.c:1239
--#: ../clients/cli/general.c:123 ../clients/cli/utils.h:291
--#: ../clients/common/nm-client-utils.c:269
--#: ../clients/common/nm-meta-setting-desc.c:866
--#: ../clients/common/nm-meta-setting-desc.c:2682
-+#: ../clients/cli/connections.c:5008 ../clients/cli/connections.c:6934
-+#: ../clients/cli/connections.c:6935 ../clients/cli/devices.c:525
-+#: ../clients/cli/devices.c:532 ../clients/cli/devices.c:1250
-+#: ../clients/cli/general.c:93 ../clients/cli/utils.h:294
-+#: ../clients/common/nm-client-utils.c:303
-+#: ../clients/common/nm-meta-setting-desc.c:871
-+#: ../clients/common/nm-meta-setting-desc.c:2675
- msgid "no"
- msgstr "否"
-
--#: ../clients/cli/connections.c:4966 ../clients/cli/connections.c:6921
--#: ../clients/cli/connections.c:6922 ../clients/cli/devices.c:517
--#: ../clients/cli/devices.c:524 ../clients/cli/devices.c:1239
--#: ../clients/cli/general.c:122 ../clients/cli/utils.h:291
--#: ../clients/common/nm-client-utils.c:268
--#: ../clients/common/nm-meta-setting-desc.c:866
--#: ../clients/common/nm-meta-setting-desc.c:2679
-+#: ../clients/cli/connections.c:5009 ../clients/cli/connections.c:6934
-+#: ../clients/cli/connections.c:6935 ../clients/cli/devices.c:524
-+#: ../clients/cli/devices.c:531 ../clients/cli/devices.c:1250
-+#: ../clients/cli/general.c:92 ../clients/cli/utils.h:294
-+#: ../clients/common/nm-client-utils.c:302
-+#: ../clients/common/nm-meta-setting-desc.c:871
-+#: ../clients/common/nm-meta-setting-desc.c:2672
- msgid "yes"
- msgstr "是"
-
--#: ../clients/cli/connections.c:5052
-+#: ../clients/cli/connections.c:5095
- #, 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:5154
-+#: ../clients/cli/connections.c:5197
- #, 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:5160
-+#: ../clients/cli/connections.c:5203
- #, 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:5292 ../clients/cli/utils.c:279
-+#: ../clients/cli/connections.c:5335 ../clients/cli/utils.c:279
- #, c-format
- msgid "Error: value for '%s' argument is required."
- msgstr "错误：需要 \"%s\" 参数的值。"
-
--#: ../clients/cli/connections.c:5299
-+#: ../clients/cli/connections.c:5342
- #, c-format
- msgid "Error: 'save': %s."
- msgstr "错误：\"save\"：%s。"
-
--#: ../clients/cli/connections.c:5384 ../clients/cli/connections.c:5395
-+#: ../clients/cli/connections.c:5427 ../clients/cli/connections.c:5438
- #, c-format
- msgid "Error: '%s' argument is required."
- msgstr "错误：需要 \"%s\" 参数。"
-
--#: ../clients/cli/connections.c:6354
-+#: ../clients/cli/connections.c:6384
- #, c-format
- msgid "['%s' setting values]\n"
- msgstr "[\"%s\" 设置值]\n"
-@@ -1357,7 +1373,7 @@ msgstr "[\"%s\" 设置值]\n"
- #. TRANSLATORS: do not translate command names and keywords before ::
- #. * However, you should translate terms enclosed in <>.
- #.
--#: ../clients/cli/connections.c:6463
-+#: ../clients/cli/connections.c:6493
- #, c-format
- msgid ""
- "---[ Main menu ]---\n"
-@@ -1388,7 +1404,7 @@ msgstr "---[ 主菜单 ]---\n"
- "nmcli <配置选项> <值> :: nmcli configuration\n"
- "quit :: 退出 nmcli\n"
-
--#: ../clients/cli/connections.c:6490
-+#: ../clients/cli/connections.c:6520
- #, c-format
- msgid ""
- "goto <setting>[.<prop>] | <prop> :: enter setting/property for editing\n"
-@@ -1406,7 +1422,7 @@ msgstr "goto <设置>[.<属性>] | <属性> :: 进入设置/属性进行编辑\
- " nmcli connection> goto secondaries\n"
- " nmcli> goto ipv4.addresses\n"
-
--#: ../clients/cli/connections.c:6497
-+#: ../clients/cli/connections.c:6527
- #, c-format
- msgid ""
- "remove <setting>[.<prop>] :: remove setting or reset property value\n"
-@@ -1424,7 +1440,7 @@ msgstr "remove <设置>[.<属性>] :: 移除设置或重置属性值\n"
- "示例：nmcli> remove wifi-sec\n"
- " nmcli> remove eth.mtu\n"
-
--#: ../clients/cli/connections.c:6504
-+#: ../clients/cli/connections.c:6534
- #, c-format
- msgid ""
- "set [<setting>.<prop> <value>] :: set property value\n"
-@@ -1438,7 +1454,7 @@ msgstr "set [<设置>.<属性> <值>] :: 设置属性值\n"
- "\n"
- "示例：nmcli> set con.id 我的连接\n"
-
--#: ../clients/cli/connections.c:6509
-+#: ../clients/cli/connections.c:6539
- #, c-format
- msgid ""
- "describe [<setting>.<prop>] :: describe property\n"
-@@ -1449,7 +1465,7 @@ msgstr "describe [<设置>.<属性>] :: 描述属性\n"
- "\n"
- "显示属性描述。您可以参阅 nm-settings(5) 手册页来查看全部的网络管理器（NetworkManager）设置和属性。\n"
-
--#: ../clients/cli/connections.c:6514
-+#: ../clients/cli/connections.c:6544
- #, c-format
- msgid ""
- "print [all] :: print setting or connection values\n"
-@@ -1463,7 +1479,7 @@ msgstr "print [all] :: 输出设置或连接值\n"
- "\n"
- "示例：nmcli ipv4> print all\n"
-
--#: ../clients/cli/connections.c:6519
-+#: ../clients/cli/connections.c:6549
- #, c-format
- msgid ""
- "verify [all | fix] :: verify setting or connection validity\n"
-@@ -1485,7 +1501,7 @@ msgstr "verify [all | fix] :: 验证设置或连接的有效性\n"
- " nmcli> verify fix\n"
- " nmcli bond> verify\n"
-
--#: ../clients/cli/connections.c:6528
-+#: ../clients/cli/connections.c:6558
- #, c-format
- msgid ""
- "save [persistent|temporary] :: save the connection\n"
-@@ -1507,7 +1523,7 @@ msgstr "save [persistent|temporary] :: 保存连接\n"
- "可以是临时的，也可以是永久的，但任何临时的修改在重启后都会复原。如果您想完全删\n"
- "除永久性连接，连接配置集就必须被删除。\n"
-
--#: ../clients/cli/connections.c:6539
-+#: ../clients/cli/connections.c:6569
- #, c-format
- msgid ""
- "activate [<ifname>] [/<ap>|<nsp>] :: activate the connection\n"
-@@ -1526,7 +1542,7 @@ msgstr "activate [<接口名>] [/<ap>|<nsp>] :: 激活连接\n"
- "<接口名> - 将激活连接的设备。\n"
- "/<ap>|<nsp> - AP (Wi-Fi) 或者 NSP (WiMAX)（未指定 <接口名> 时前置 / 符号。）\n"
-
--#: ../clients/cli/connections.c:6546 ../clients/cli/connections.c:6704
-+#: ../clients/cli/connections.c:6576 ../clients/cli/connections.c:6734
- #, c-format
- msgid ""
- "back :: go to upper menu level\n"
-@@ -1534,7 +1550,7 @@ msgid ""
- msgstr "back :: 转到上层菜单\n"
- "\n"
-
--#: ../clients/cli/connections.c:6549
-+#: ../clients/cli/connections.c:6579
- #, c-format
- msgid ""
- "help/? [<command>] :: help for the nmcli commands\n"
-@@ -1542,7 +1558,7 @@ msgid ""
- msgstr "help/? [<命令>] :: nmcli 命令的帮助\n"
- "\n"
-
--#: ../clients/cli/connections.c:6552
-+#: ../clients/cli/connections.c:6582
- #, c-format
- msgid ""
- "nmcli [<conf-option> <value>] :: nmcli configuration\n"
-@@ -1568,7 +1584,7 @@ msgstr "nmcli [<conf-option> <value>] :: nmcli configuration\n"
- " nmcli> nmcli save-confirmation no\n"
- " nmcli> nmcli prompt-color 3\n"
-
--#: ../clients/cli/connections.c:6574 ../clients/cli/connections.c:6710
-+#: ../clients/cli/connections.c:6604 ../clients/cli/connections.c:6740
- #, c-format
- msgid ""
- "quit :: exit nmcli\n"
-@@ -1579,8 +1595,8 @@ msgstr "quit :: 退出 nmcli\n"
- "\n"
- "此命令用于退出 nmcli。当被编辑的连接没有保存时，会询问用户确定操作。\n"
-
--#: ../clients/cli/connections.c:6579 ../clients/cli/connections.c:6715
--#: ../clients/cli/connections.c:7126 ../clients/cli/connections.c:8129
-+#: ../clients/cli/connections.c:6609 ../clients/cli/connections.c:6745
-+#: ../clients/cli/connections.c:7140 ../clients/cli/connections.c:8149
- #, c-format
- msgid "Unknown command: '%s'\n"
- msgstr "未知命令：\"%s\"\n"
-@@ -1588,7 +1604,7 @@ msgstr "未知命令：\"%s\"\n"
- #. TRANSLATORS: do not translate command names and keywords before ::
- #. * However, you should translate terms enclosed in <>.
- #.
--#: ../clients/cli/connections.c:6644
-+#: ../clients/cli/connections.c:6674
- #, c-format
- msgid ""
- "---[ Property menu ]---\n"
-@@ -1613,7 +1629,7 @@ msgstr "---[ 属性菜单 ]---\n"
- "help/? [<命令>] :: 输出该帮助或命令描述\n"
- "quit :: 退出 nmcli\n"
-
--#: ../clients/cli/connections.c:6669
-+#: ../clients/cli/connections.c:6699
- #, c-format
- msgid ""
- "set [<value>] :: set new value\n"
-@@ -1623,7 +1639,7 @@ msgstr "set [<值>] :: 设置新值\n"
- "\n"
- "此命令用于设置提供的 <值> 到该属性\n"
-
--#: ../clients/cli/connections.c:6673
-+#: ../clients/cli/connections.c:6703
- #, c-format
- msgid ""
- "add [<value>] :: append new value to the property\n"
-@@ -1635,7 +1651,7 @@ msgstr "add [<值>] :: 附加新值到这个属性\n"
- "\n"
- "如果该属性为容器类型，则这个命令在这个属性中添加提供的 <值>。对于单值属性，它会替换该值（和 \"set\" 一样）。\n"
-
--#: ../clients/cli/connections.c:6679
-+#: ../clients/cli/connections.c:6709
- #, c-format
- msgid ""
- "change :: change current value\n"
-@@ -1645,7 +1661,7 @@ msgstr "change :: 更改当前值\n"
- "\n"
- "显示当前值并允许编辑它。\n"
-
--#: ../clients/cli/connections.c:6683
-+#: ../clients/cli/connections.c:6713
- #, c-format
- msgid ""
- "remove [<value>|<index>|<option name>] :: delete the value\n"
-@@ -1674,7 +1690,7 @@ msgstr "remove [<值>|<目录>|<选项名称>] :: 删除属性值\n"
- " nmcli bond.options> remove downdelay\n"
- "\n"
-
--#: ../clients/cli/connections.c:6694
-+#: ../clients/cli/connections.c:6724
- #, c-format
- msgid ""
- "describe :: describe property\n"
-@@ -1685,7 +1701,7 @@ msgstr "describe :: 描述属性\n"
- "\n"
- "显示属性描述。您可以参阅 nm-settings(5) 手册页来查看所有的网络管理器（NetworkManager）设置和属性。\n"
-
--#: ../clients/cli/connections.c:6699
-+#: ../clients/cli/connections.c:6729
- #, c-format
- msgid ""
- "print [property|setting|connection] :: print property (setting, connection) "
-@@ -1697,7 +1713,7 @@ msgstr "print [property|setting|connection] :: 输出属性（设置、连接
- "\n"
- "显示属性。提供参数您也可以显示整个设置或连接的值。\n"
-
--#: ../clients/cli/connections.c:6707
-+#: ../clients/cli/connections.c:6737
- #, c-format
- msgid ""
- "help/? [<command>] :: help for nmcli commands\n"
-@@ -1705,88 +1721,83 @@ msgid ""
- msgstr "help/? [<命令>] :: nmcli 命令的帮助\n"
- "\n"
-
--#: ../clients/cli/connections.c:6804
-+#: ../clients/cli/connections.c:6834
- #, c-format
- msgid "Error: Connection activation failed.\n"
- msgstr "错误：连接激活失败。\n"
-
--#: ../clients/cli/connections.c:6901
--#, c-format
--msgid "Error: setting '%s' is mandatory and cannot be removed.\n"
--msgstr "错误：设置 \"%s\" 是必填的而且无法移除。\n"
--
- #. TRANSLATORS: status line in nmcli connection editor
--#: ../clients/cli/connections.c:6919
-+#: ../clients/cli/connections.c:6932
- #, 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:6955
-+#: ../clients/cli/connections.c:6968
- #, c-format
- msgid "The connection is not saved. Do you really want to quit? %s"
- msgstr "连接未保存。您真的要退出吗？%s"
-
--#: ../clients/cli/connections.c:6996
-+#: ../clients/cli/connections.c:7009
- #, c-format
- msgid ""
- "The connection profile has been removed from another client. You may type "
- "'save' in the main menu to restore it.\n"
- msgstr "此连接配置集已被其他客户端移除了。您可以在主菜单中输入 \"save\" 来还原它。\n"
-
--#: ../clients/cli/connections.c:7030 ../clients/cli/connections.c:7424
--#: ../clients/cli/connections.c:7488
-+#: ../clients/cli/connections.c:7043 ../clients/cli/connections.c:7437
-+#: ../clients/cli/connections.c:7501
- #, c-format
- msgid "Allowed values for '%s' property: %s\n"
- msgstr "\"%s\" 属性允许的值：%s\n"
-
--#: ../clients/cli/connections.c:7034 ../clients/cli/connections.c:7428
--#: ../clients/cli/connections.c:7492
-+#: ../clients/cli/connections.c:7047 ../clients/cli/connections.c:7441
-+#: ../clients/cli/connections.c:7505
- #, c-format
- msgid "Enter '%s' value: "
- msgstr "输入 \"%s\" 值： "
-
--#: ../clients/cli/connections.c:7048 ../clients/cli/connections.c:7066
--#: ../clients/cli/connections.c:7437 ../clients/cli/connections.c:7505
-+#: ../clients/cli/connections.c:7061 ../clients/cli/connections.c:7079
-+#: ../clients/cli/connections.c:7450 ../clients/cli/connections.c:7518
- #, c-format
- msgid "Error: failed to set '%s' property: %s\n"
- msgstr "错误：设置 \"%s\" 属性失败：%s\n"
-
--#: ../clients/cli/connections.c:7057
-+#: ../clients/cli/connections.c:7070
- #, c-format
- msgid "Edit '%s' value: "
- msgstr "编辑 \"%s\" 值： "
-
--#: ../clients/cli/connections.c:7080 ../clients/cli/settings.c:400
-+#: ../clients/cli/connections.c:7093 ../clients/cli/settings.c:400
- #, c-format
- msgid "Error: %s\n"
- msgstr "错误：%s\n"
-
--#: ../clients/cli/connections.c:7099
-+#: ../clients/cli/connections.c:7112
- #, c-format
- msgid "Unknown command argument: '%s'\n"
- msgstr "未知的命令参数：\"%s\"\n"
-
--#: ../clients/cli/connections.c:7190
-+#: ../clients/cli/connections.c:7204
- #, c-format
- msgid "Available settings: %s\n"
- msgstr "有效设置：%s\n"
-
--#: ../clients/cli/connections.c:7202
-+#: ../clients/cli/connections.c:7216
- #, c-format
- msgid "Error: invalid setting name; %s\n"
- msgstr "错误：无效的设置名称；%s\n"
-
--#: ../clients/cli/connections.c:7220
-+#: ../clients/cli/connections.c:7233
- #, c-format
- msgid "Available properties: %s\n"
- msgstr "有效属性：%s\n"
-
--#: ../clients/cli/connections.c:7228
-+#: ../clients/cli/connections.c:7242
- #, c-format
- msgid "Error: property %s\n"
- msgstr "错误：属性 %s\n"
-
--#: ../clients/cli/connections.c:7273
-+#: ../clients/cli/connections.c:7286
- #, c-format
- msgid ""
- "Saving the connection with 'autoconnect=yes'. That might result in an "
-@@ -1795,426 +1806,426 @@ msgid ""
- msgstr "使用 \"autoconnect=yes\" 保存该连接。这样会立即激活该连接。\n"
- "您仍要保存吗？ %s"
-
--#: ../clients/cli/connections.c:7358
-+#: ../clients/cli/connections.c:7371
- #, c-format
- msgid "You may edit the following settings: %s\n"
- msgstr "您可编辑下列设置：%s\n"
-
--#: ../clients/cli/connections.c:7389
-+#: ../clients/cli/connections.c:7402
- #, 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:7441 ../clients/cli/connections.c:7709
--#: ../clients/cli/connections.c:7741
-+#: ../clients/cli/connections.c:7454 ../clients/cli/connections.c:7729
-+#: ../clients/cli/connections.c:7761
- #, c-format
- msgid "Error: no setting selected; valid are [%s]\n"
- msgstr "错误：未选择设置；有效的为 [%s]\n"
-
--#: ../clients/cli/connections.c:7442
-+#: ../clients/cli/connections.c:7455
- #, c-format
- msgid "use 'goto <setting>' first, or 'set <setting>.<property>'\n"
- msgstr "先使用 \"goto <设置>\"，或 \"set <设置>.<属性>\"\n"
-
--#: ../clients/cli/connections.c:7457 ../clients/cli/connections.c:7634
--#: ../clients/cli/connections.c:7731
-+#: ../clients/cli/connections.c:7470 ../clients/cli/connections.c:7647
-+#: ../clients/cli/connections.c:7751
- #, c-format
- msgid "Error: invalid setting argument '%s'; valid are [%s]\n"
- msgstr "错误：无效的设置参数 \"%s\"；有效的为 [%s]\n"
-
--#: ../clients/cli/connections.c:7466
-+#: ../clients/cli/connections.c:7479
- #, c-format
- msgid "Error: missing setting for '%s' property\n"
- msgstr "错误：缺少 \"%s\" 属性的设置\n"
-
--#: ../clients/cli/connections.c:7473
-+#: ../clients/cli/connections.c:7486
- #, c-format
- msgid "Error: invalid property: %s\n"
- msgstr "错误：无效的属性：%s\n"
-
--#: ../clients/cli/connections.c:7537
-+#: ../clients/cli/connections.c:7550
- #, c-format
- msgid "Error: unknown setting '%s'\n"
- msgstr "错误：未知的设置 \"%s\"\n"
-
--#: ../clients/cli/connections.c:7562
-+#: ../clients/cli/connections.c:7575
- #, c-format
- msgid "You may edit the following properties: %s\n"
- msgstr "您可以编辑下列属性：%s\n"
-
--#: ../clients/cli/connections.c:7607 ../clients/cli/connections.c:7662
-+#: ../clients/cli/connections.c:7620 ../clients/cli/connections.c:7679
- #, c-format
- msgid "Error: failed to remove value of '%s': %s\n"
- msgstr "错误：移除 \"%s\" 的值失败：%s\n"
-
--#: ../clients/cli/connections.c:7612
-+#: ../clients/cli/connections.c:7625
- #, c-format
- msgid "Error: no argument given; valid are [%s]\n"
- msgstr "错误：未给定参数：有效的为 [%s]\n"
-
--#: ../clients/cli/connections.c:7631
-+#: ../clients/cli/connections.c:7644
- #, c-format
- msgid "Setting '%s' is not present in the connection.\n"
- msgstr "设置 \"%s\" 在连接里未提供。\n"
-
--#: ../clients/cli/connections.c:7685
-+#: ../clients/cli/connections.c:7705
- #, c-format
- msgid "Error: %s properties, nor it is a setting name.\n"
- msgstr "错误：%s 属性，也不是设置名称。\n"
-
--#: ../clients/cli/connections.c:7710 ../clients/cli/connections.c:7742
-+#: ../clients/cli/connections.c:7730 ../clients/cli/connections.c:7762
- #, c-format
- msgid "use 'goto <setting>' first, or 'describe <setting>.<property>'\n"
- msgstr "先使用 \"goto <设置>\"，或 \"describe <设置>.<属性>\"\n"
-
--#: ../clients/cli/connections.c:7765
-+#: ../clients/cli/connections.c:7785
- #, c-format
- msgid "Error: invalid property: %s, neither a valid setting name.\n"
- msgstr "错误：无效的属性：%s，也不是有效的设置名称。\n"
-
--#: ../clients/cli/connections.c:7795
-+#: ../clients/cli/connections.c:7815
- #, c-format
- msgid "Error: unknown setting: '%s'\n"
- msgstr "错误：未知的设置：\"%s\"\n"
-
--#: ../clients/cli/connections.c:7800
-+#: ../clients/cli/connections.c:7820
- #, c-format
- msgid "Error: '%s' setting not present in the connection\n"
- msgstr "错误：设置 \"%s\" 在连接里未提供。\n"
-
--#: ../clients/cli/connections.c:7831
-+#: ../clients/cli/connections.c:7851
- #, c-format
- msgid "Error: invalid property: %s%s\n"
- msgstr "错误：无效的属性：%s%s\n"
-
--#: ../clients/cli/connections.c:7833
-+#: ../clients/cli/connections.c:7853
- msgid ", neither a valid setting name"
- msgstr "，也不是有效的设置名称"
-
--#: ../clients/cli/connections.c:7849
-+#: ../clients/cli/connections.c:7869
- #, c-format
- msgid "Invalid verify option: %s\n"
- msgstr "无效的验证选项：%s\n"
-
--#: ../clients/cli/connections.c:7858
-+#: ../clients/cli/connections.c:7878
- #, c-format
- msgid "Verify setting '%s': %s\n"
- msgstr "验证设置 \"%s\"：%s\n"
-
--#: ../clients/cli/connections.c:7874
-+#: ../clients/cli/connections.c:7894
- #, c-format
- msgid "Verify connection: %s\n"
- msgstr "验证连接：%s\n"
-
--#: ../clients/cli/connections.c:7877
-+#: ../clients/cli/connections.c:7897
- #, c-format
- msgid "The error cannot be fixed automatically.\n"
- msgstr "错误无法自动修复。\n"
-
--#: ../clients/cli/connections.c:7897
-+#: ../clients/cli/connections.c:7917
- #, c-format
- msgid "Error: invalid argument '%s'\n"
- msgstr "错误：无效的参数 \"%s\"\n"
-
--#: ../clients/cli/connections.c:7947
-+#: ../clients/cli/connections.c:7967
- #, c-format
- msgid "Error: Failed to save '%s' (%s) connection: %s\n"
- msgstr "错误：保存 \"%s\" (%s) 连接失败：%s\n"
-
--#: ../clients/cli/connections.c:7953
-+#: ../clients/cli/connections.c:7973
- #, c-format
- msgid "Error: Timeout saving '%s' (%s) connection\n"
- msgstr "错误：保存 '%s' (%s) 连接超时\n"
-
--#: ../clients/cli/connections.c:7958
-+#: ../clients/cli/connections.c:7978
- #, c-format
- msgid "Connection '%s' (%s) successfully saved.\n"
- msgstr "连接 \"%s\" (%s) 已成功保存。\n"
-
--#: ../clients/cli/connections.c:7959
-+#: ../clients/cli/connections.c:7979
- #, c-format
- msgid "Connection '%s' (%s) successfully updated.\n"
- msgstr "成功地更新了连接 \"%s\" (%s)。\n"
-
--#: ../clients/cli/connections.c:7992
-+#: ../clients/cli/connections.c:8012
- #, c-format
- msgid "Error: connection verification failed: %s\n"
- msgstr "错误：连接验证失败：%s。\n"
-
--#: ../clients/cli/connections.c:7993
-+#: ../clients/cli/connections.c:8013
- msgid "(unknown error)"
- msgstr "（未知错误）"
-
--#: ../clients/cli/connections.c:7994
-+#: ../clients/cli/connections.c:8014
- #, c-format
- msgid "You may try running 'verify fix' to fix errors.\n"
- msgstr "您可以运行 \"verify fix\" 来修复错误。\n"
-
- #. TRANSLATORS: do not translate 'save', leave it as it is
--#: ../clients/cli/connections.c:8017
-+#: ../clients/cli/connections.c:8037
- #, c-format
- msgid "Error: connection is not saved. Type 'save' first.\n"
- msgstr "错误：连接还未保存。先输入 \"save\"。\n"
-
--#: ../clients/cli/connections.c:8021
-+#: ../clients/cli/connections.c:8041
- #, c-format
- msgid "Error: connection is not valid: %s\n"
- msgstr "错误：连接是无效的：%s\n"
-
--#: ../clients/cli/connections.c:8031
-+#: ../clients/cli/connections.c:8051
- #, c-format
- msgid "Error: Cannot activate connection: %s.\n"
- msgstr "错误：无法激活连接：%s。\n"
-
--#: ../clients/cli/connections.c:8040
-+#: ../clients/cli/connections.c:8060
- #, c-format
- msgid "Error: Failed to activate '%s' (%s) connection: %s\n"
- msgstr "错误：激活 \"%s\" (%s) 连接失败：%s\n"
-
--#: ../clients/cli/connections.c:8047
-+#: ../clients/cli/connections.c:8067
- msgid "Monitoring connection activation (press any key to continue)\n"
- msgstr "正在监视连接激活（按任意键继续）\n"
-
--#: ../clients/cli/connections.c:8083
-+#: ../clients/cli/connections.c:8103
- #, c-format
- msgid "Error: status-line: %s\n"
- msgstr "错误：status-line：%s\n"
-
--#: ../clients/cli/connections.c:8091
-+#: ../clients/cli/connections.c:8111
- #, c-format
- msgid "Error: save-confirmation: %s\n"
- msgstr "错误：save-confirmation：%s\n"
-
--#: ../clients/cli/connections.c:8099
-+#: ../clients/cli/connections.c:8119
- #, c-format
- msgid "Error: show-secrets: %s\n"
- msgstr "错误：show-secrets：%s\n"
-
--#: ../clients/cli/connections.c:8106
-+#: ../clients/cli/connections.c:8126
- #, c-format
- msgid "Current nmcli configuration:\n"
- msgstr "当前 nmcli 配置：\n"
-
--#: ../clients/cli/connections.c:8114
-+#: ../clients/cli/connections.c:8134
- #, c-format
- msgid "Invalid configuration option '%s'; allowed [%s]\n"
- msgstr "无效的配置选项 \"%s\"；允许 [%s]\n"
-
--#: ../clients/cli/connections.c:8335
-+#: ../clients/cli/connections.c:8356
- #, c-format
- msgid "Error: only one of 'id', 'filename', uuid, or 'path' can be provided."
- msgstr "错误：只能提供 \"id\"、\"filename\"、\"uuid\" 或 \"path\" 之一。"
-
--#: ../clients/cli/connections.c:8349 ../clients/cli/connections.c:8513
-+#: ../clients/cli/connections.c:8371 ../clients/cli/connections.c:8535
- #, c-format
- msgid "Error: Unknown connection '%s'."
- msgstr "错误：未知连接 \"%s\"。"
-
--#: ../clients/cli/connections.c:8365
-+#: ../clients/cli/connections.c:8388
- #, c-format
- msgid "Warning: editing existing connection '%s'; 'type' argument is ignored\n"
- msgstr "警告：正在编辑已有的连接 \"%s\"；\"type\" 参数已忽略\n"
-
--#: ../clients/cli/connections.c:8368
-+#: ../clients/cli/connections.c:8391
- #, c-format
- msgid ""
- "Warning: editing existing connection '%s'; 'con-name' argument is ignored\n"
- msgstr "警告：正在编辑已有的连接 \"%s\"；\"con-name\" 参数已忽略\n"
-
--#: ../clients/cli/connections.c:8395
-+#: ../clients/cli/connections.c:8418
- #, c-format
- msgid "Valid connection types: %s\n"
- msgstr "有效的连接类型：%s\n"
-
--#: ../clients/cli/connections.c:8397
-+#: ../clients/cli/connections.c:8420
- #, c-format
- msgid "Error: invalid connection type; %s\n"
- msgstr "错误：无效的连接类型；%s\n"
-
--#: ../clients/cli/connections.c:8433
-+#: ../clients/cli/connections.c:8456
- #, c-format
- msgid "===| nmcli interactive connection editor |==="
- msgstr "===| nmcli 交互式连接编辑器 |==="
-
--#: ../clients/cli/connections.c:8436
-+#: ../clients/cli/connections.c:8459
- #, c-format
- msgid "Editing existing '%s' connection: '%s'"
- msgstr "正在编辑已有的连接 \"%s\"：\"%s\""
-
--#: ../clients/cli/connections.c:8438
-+#: ../clients/cli/connections.c:8461
- #, c-format
- msgid "Adding a new '%s' connection"
- msgstr "正在添加新的 \"%s\" 连接"
-
- #. TRANSLATORS: do not translate 'help', leave it as it is
--#: ../clients/cli/connections.c:8441
-+#: ../clients/cli/connections.c:8464
- #, c-format
- msgid "Type 'help' or '?' for available commands."
- msgstr "输入 \"help\" 或 \"?\" 查看可用的命令。"
-
- #. TRANSLATORS: do not translate 'print', leave it as it is
--#: ../clients/cli/connections.c:8444
-+#: ../clients/cli/connections.c:8467
- #, c-format
- msgid "Type 'print' to show all the connection properties."
- msgstr "输入 \"print\" 来显示所有的连接属性。"
-
- #. TRANSLATORS: do not translate 'describe', leave it as it is
--#: ../clients/cli/connections.c:8447
-+#: ../clients/cli/connections.c:8470
- #, c-format
- msgid "Type 'describe [<setting>.<prop>]' for detailed property description."
- msgstr "输入 \"describe [<设置>.<属性>]\" 来获得详细的属性描述。"
-
--#: ../clients/cli/connections.c:8475
-+#: ../clients/cli/connections.c:8498
- #, c-format
- msgid "Error: Failed to modify connection '%s': %s"
- msgstr "错误：修改连接 \"%s\" 失败：%s"
-
--#: ../clients/cli/connections.c:8481
-+#: ../clients/cli/connections.c:8504
- #, c-format
- msgid "Connection '%s' (%s) successfully modified.\n"
- msgstr "连接 \"%s\" (%s) 已成功修改。\n"
-
--#: ../clients/cli/connections.c:8549
-+#: ../clients/cli/connections.c:8571
- #, c-format
- msgid "%s (%s) cloned as %s (%s).\n"
- msgstr "%s (%s) 已克隆为 %s (%s)。\n"
-
--#: ../clients/cli/connections.c:8608
-+#: ../clients/cli/connections.c:8631
- msgid "New connection name: "
- msgstr "新连接名称： "
-
--#: ../clients/cli/connections.c:8610
-+#: ../clients/cli/connections.c:8633
- #, c-format
- msgid "Error: <new name> argument is missing."
- msgstr "错误：缺少 <新名称> 参数。"
-
--#: ../clients/cli/connections.c:8615 ../clients/cli/connections.c:9101
-+#: ../clients/cli/connections.c:8639 ../clients/cli/connections.c:9124
- #, c-format
- msgid "Error: unknown extra argument: '%s'."
- msgstr "错误：未知的额外参数：\"%s\"。"
-
--#: ../clients/cli/connections.c:8648
-+#: ../clients/cli/connections.c:8671
- #, c-format
- msgid "Error: not all connections deleted."
- msgstr "错误：未删除所有的连接。"
-
--#: ../clients/cli/connections.c:8649
-+#: ../clients/cli/connections.c:8672
- #, c-format
- msgid "Error: Connection deletion failed: %s\n"
- msgstr "错误：连接删除失败：%s\n"
-
--#: ../clients/cli/connections.c:8705 ../clients/cli/connections.c:8826
-+#: ../clients/cli/connections.c:8728 ../clients/cli/connections.c:8848
- #, c-format
- msgid "Error: %s.\n"
- msgstr "错误：%s。\n"
-
--#: ../clients/cli/connections.c:8706 ../clients/cli/connections.c:8827
-+#: ../clients/cli/connections.c:8729 ../clients/cli/connections.c:8849
- #, c-format
- msgid "Error: not all connections found."
- msgstr "错误：未找到所有连接。"
-
- #. truncate trailing ", "
--#: ../clients/cli/connections.c:8757
-+#: ../clients/cli/connections.c:8780
- #, c-format
- msgid "Error: cannot delete unknown connection(s): %s."
- msgstr "错误：无法删除未知连接：%s。"
-
--#: ../clients/cli/connections.c:8767
-+#: ../clients/cli/connections.c:8789
- #, c-format
- msgid "%s: connection profile changed\n"
- msgstr "%s：连接配置集已改动\n"
-
--#: ../clients/cli/connections.c:8793
-+#: ../clients/cli/connections.c:8815
- #, c-format
- msgid "%s: connection profile created\n"
- msgstr "%s：连接配置集已创建\n"
-
--#: ../clients/cli/connections.c:8802
-+#: ../clients/cli/connections.c:8824
- #, c-format
- msgid "%s: connection profile removed\n"
- msgstr "%s：连接配置集已移除\n"
-
--#: ../clients/cli/connections.c:8873
-+#: ../clients/cli/connections.c:8894
- #, c-format
- msgid "Error: failed to reload connections: %s."
- msgstr "错误：重新加载连接失败：%s。"
-
--#: ../clients/cli/connections.c:8905
-+#: ../clients/cli/connections.c:8924
- #, c-format
- msgid "Error: failed to load connection: %s."
- msgstr "错误：加载连接失败：%s。"
-
--#: ../clients/cli/connections.c:8913
-+#: ../clients/cli/connections.c:8932
- #, c-format
- msgid "Could not load file '%s'\n"
- msgstr "无法加载文件 \"%s\"\n"
-
--#: ../clients/cli/connections.c:8920
-+#: ../clients/cli/connections.c:8936
- msgid "File to import: "
- msgstr "要导入的文件： "
-
--#: ../clients/cli/connections.c:8953
-+#: ../clients/cli/connections.c:8969
- #, c-format
- msgid "Error: No arguments provided."
- msgstr "错误：未提供参数。"
-
--#: ../clients/cli/connections.c:8984
-+#: ../clients/cli/connections.c:9002
- #, c-format
- msgid "Warning: 'type' already specified, ignoring extra one.\n"
- msgstr "警告：已指定 \"type\"，忽略额外的参数。\n"
-
--#: ../clients/cli/connections.c:8998
-+#: ../clients/cli/connections.c:9017
- #, c-format
- msgid "Warning: 'file' already specified, ignoring extra one.\n"
- msgstr "警告：已指定 \"file\"，忽略额外的参数。\n"
-
--#: ../clients/cli/connections.c:9011
-+#: ../clients/cli/connections.c:9031
- #, c-format
- msgid "Error: 'type' argument is required."
- msgstr "错误：需要 \"type\" 参数。"
-
--#: ../clients/cli/connections.c:9015
-+#: ../clients/cli/connections.c:9036
- #, c-format
- msgid "Error: 'file' argument is required."
- msgstr "错误：需要 \"file\" 参数。"
-
--#: ../clients/cli/connections.c:9024
-+#: ../clients/cli/connections.c:9046
- #, c-format
- msgid "Error: failed to find VPN plugin for %s."
- msgstr "错误：查找用于 %s 的 VPN 插件失败。"
-
--#: ../clients/cli/connections.c:9031 ../clients/cli/connections.c:9122
-+#: ../clients/cli/connections.c:9054 ../clients/cli/connections.c:9145
- #, c-format
- msgid "Error: failed to load VPN plugin: %s."
- msgstr "错误：加载 VPN 插件失败：%s。"
-
--#: ../clients/cli/connections.c:9040
-+#: ../clients/cli/connections.c:9064
- #, c-format
- msgid "Error: failed to import '%s': %s."
- msgstr "错误：导入 \"%s\" 失败失败失败失败失败失败失败失败失败失败失败：%s。"
-
--#: ../clients/cli/connections.c:9108
-+#: ../clients/cli/connections.c:9131
- msgid "Output file name: "
- msgstr "输出文件名称： "
-
--#: ../clients/cli/connections.c:9113
-+#: ../clients/cli/connections.c:9136
- #, c-format
- msgid "Error: the connection is not VPN."
- msgstr "错误：连接不是 VPN。"
-
--#: ../clients/cli/connections.c:9135
-+#: ../clients/cli/connections.c:9158
- #, c-format
- msgid "Error: failed to create temporary file %s."
- msgstr "错误：创建临时文件 %s 失败。"
-
--#: ../clients/cli/connections.c:9143
-+#: ../clients/cli/connections.c:9166
- #, c-format
- msgid "Error: failed to export '%s': %s."
- msgstr "错误：导出 \"%s\" 失败：%s。"
-
--#: ../clients/cli/connections.c:9155
-+#: ../clients/cli/connections.c:9178
- #, c-format
- msgid "Error: failed to read temporary file '%s': %s."
- msgstr "错误：读取临时文件 \"%s\" 失败：%s。"
-@@ -2228,29 +2239,29 @@ msgstr "接口： "
- msgid "Interface(s): "
- msgstr "接口： "
-
--#: ../clients/cli/devices.c:59 ../clients/cli/devices.c:1267
-+#: ../clients/cli/devices.c:64 ../clients/cli/devices.c:1278
- msgid "(none)"
- msgstr "（无）"
-
--#: ../clients/cli/devices.c:166 ../clients/cli/devices.c:173
-+#: ../clients/cli/devices.c:171 ../clients/cli/devices.c:178
- msgid "(unknown)"
- msgstr "（未知）"
-
--#: ../clients/cli/devices.c:322
-+#: ../clients/cli/devices.c:329
- #, c-format
- msgid "<invisible> | %s"
- msgstr "<invisible> | %s"
-
--#: ../clients/cli/devices.c:323
-+#: ../clients/cli/devices.c:330
- msgid "<invisible>"
- msgstr "<invisible>"
-
--#: ../clients/cli/devices.c:424
-+#: ../clients/cli/devices.c:431
- #, c-format
- msgid "%u Mb/s"
- msgstr "%u Mb/s"
-
--#: ../clients/cli/devices.c:725
-+#: ../clients/cli/devices.c:732
- #, c-format
- msgid ""
- "Usage: nmcli device { COMMAND | help }\n"
-@@ -2329,7 +2340,7 @@ msgstr "用法：nmcli device { COMMAND | help }\n"
- "\n"
-
- # 大写的 DEVICE、TYPE、STATE、CONNECTION 找不到具体对应的翻译位置，这是在 CLI 是显示的列表项，所以没有翻译。
--#: ../clients/cli/devices.c:749
-+#: ../clients/cli/devices.c:756
- #, c-format
- msgid ""
- "Usage: nmcli device status { help }\n"
-@@ -2357,7 +2368,7 @@ msgstr "用法：nmcli device status { help }\n"
- "\"nmcli device\" 会调用 \"nmcli device status\"。\n"
- "\n"
-
--#: ../clients/cli/devices.c:764
-+#: ../clients/cli/devices.c:771
- #, c-format
- msgid ""
- "Usage: nmcli device show { ARGUMENTS | help }\n"
-@@ -2375,7 +2386,7 @@ msgstr "用法：nmcli device show { 参数 | help }\n"
- "该命令列出所有设备或者给定设备的详情。\n"
- "\n"
-
--#: ../clients/cli/devices.c:775
-+#: ../clients/cli/devices.c:782
- #, c-format
- msgid ""
- "Usage: nmcli device connect { ARGUMENTS | help }\n"
-@@ -2395,7 +2406,7 @@ msgstr "用法：nmcli device connect { 参数 | help }\n"
- "网络管理器（NetworkManager）将尝试查找将激活的合适连接，包括那些没有设定为自动连接的连接。\n"
- "\n"
-
--#: ../clients/cli/devices.c:787
-+#: ../clients/cli/devices.c:794
- #, c-format
- msgid ""
- "Usage: nmcli device reapply { ARGUMENTS | help }\n"
-@@ -2412,7 +2423,7 @@ msgstr "Usage: nmcli device reapply { ARGUMENTS | help }\n"
- "尝试将自上次应用以后对当前活跃连接所做出的改变应用到设备中。\n"
- "\n"
-
--#: ../clients/cli/devices.c:798
-+#: ../clients/cli/devices.c:805
- #, c-format
- msgid ""
- "Usage: nmcli device modify { ARGUMENTS | --help }\n"
-@@ -2445,7 +2456,7 @@ msgstr "Usage: nmcli device modify { ARGUMENTS | --help }\n"
- "nmcli dev mod em1 -ipv4.dns 1\n"
- "nmcli dev mod em1 -ipv6.addr \"abbe::cafe/56\"\n"
-
--#: ../clients/cli/devices.c:818
-+#: ../clients/cli/devices.c:825
- #, c-format
- msgid ""
- "Usage: nmcli device disconnect { ARGUMENTS | help }\n"
-@@ -2464,7 +2475,7 @@ msgstr "用法：nmcli device disconnect { 参数 | help }\n"
- "该命令断开设备的连接并阻止其在没有用户/手动干预的情况下继续自动激活连接。\n"
- "\n"
-
--#: ../clients/cli/devices.c:830
-+#: ../clients/cli/devices.c:837
- #, c-format
- msgid ""
- "Usage: nmcli device delete { ARGUMENTS | help }\n"
-@@ -2485,7 +2496,7 @@ msgstr "用法：nmcli device delete { 参数 | help }\n"
- "令来删除。\n"
- "\n"
-
--#: ../clients/cli/devices.c:843
-+#: ../clients/cli/devices.c:850
- #, c-format
- msgid ""
- "Usage: nmcli device set { ARGUMENTS | help }\n"
-@@ -2507,7 +2518,7 @@ msgstr "用法：nmcli device set { 参数 | help }\n"
- "修改设备属性。\n"
- "\n"
-
--#: ../clients/cli/devices.c:856
-+#: ../clients/cli/devices.c:863
- #, c-format
- msgid ""
- "Usage: nmcli device monitor { ARGUMENTS | help }\n"
-@@ -2526,7 +2537,7 @@ msgstr "用法：nmcli device monitor { 参数 | help }\n"
- "每当指定的连接修改时，这个命令会将其打印出来。如果没有指定则监视所有的连接。\n"
- "\n"
-
--#: ../clients/cli/devices.c:868
-+#: ../clients/cli/devices.c:875
- #, c-format
- msgid ""
- "Usage: nmcli device wifi { ARGUMENTS | help }\n"
-@@ -2622,7 +2633,7 @@ msgstr "Usage: nmcli device wifi { ARGUMENTS | help }\n"
- "use 'nmcli device wifi list' for that.\n"
- "\n"
-
--#: ../clients/cli/devices.c:915
-+#: ../clients/cli/devices.c:922
- #, c-format
- msgid ""
- "Usage: nmcli device lldp { ARGUMENTS | help }\n"
-@@ -2640,465 +2651,466 @@ msgstr "用法：nmcli device lldp { 参数 | help }\n"
- "列出通过 LLDP 发现的邻居设备。可使用 \"ifname\" 选项列出具体接口的邻居设备。\n"
- "\n"
-
--#: ../clients/cli/devices.c:1013
-+#: ../clients/cli/devices.c:1021
- #, c-format
- msgid "Error: No interface specified."
- msgstr "错误：没有指定接口。"
-
--#: ../clients/cli/devices.c:1036
-+#: ../clients/cli/devices.c:1044
- #, c-format
- msgid "Warning: argument '%s' is duplicated.\n"
- msgstr "警告：重复的参数 \"%s\"。\n"
-
--#: ../clients/cli/devices.c:1039
-+#: ../clients/cli/devices.c:1047
- #, c-format
- msgid "Error: Device '%s' not found.\n"
- msgstr "错误：没有找到设备 \"%s\"。\n"
-
--#: ../clients/cli/devices.c:1040
-+#: ../clients/cli/devices.c:1048
- #, c-format
- msgid "Error: not all devices found."
- msgstr "错误：未找到所有设备。"
-
--#: ../clients/cli/devices.c:1071
-+#: ../clients/cli/devices.c:1079
- msgid "No interface specified"
- msgstr "没有指定接口"
-
--#: ../clients/cli/devices.c:1090
-+#: ../clients/cli/devices.c:1098
- #, c-format
- msgid "Device '%s' not found"
- msgstr "未找到设备 \"%s\""
-
--#: ../clients/cli/devices.c:1186
-+#: ../clients/cli/devices.c:1194
- #, c-format
- msgid "%u MHz"
- msgstr "%u MHz"
-
--#: ../clients/cli/devices.c:1187
-+#: ../clients/cli/devices.c:1195
- #, c-format
- msgid "%u Mbit/s"
- msgstr "%u Mbit/s"
-
--#: ../clients/cli/devices.c:1226
-+#: ../clients/cli/devices.c:1237
- msgid "Ad-Hoc"
- msgstr "Ad-Hoc"
-
--#: ../clients/cli/devices.c:1227
-+#: ../clients/cli/devices.c:1238
- msgid "Infra"
- msgstr "Infra"
-
--#: ../clients/cli/devices.c:1228 ../src/devices/wifi/nm-device-olpc-mesh.c:118
-+#: ../clients/cli/devices.c:1239 ../src/devices/wifi/nm-device-olpc-mesh.c:118
- msgid "Mesh"
- msgstr "Mesh"
-
--#: ../clients/cli/devices.c:1229
-+#: ../clients/cli/devices.c:1240
- msgid "N/A"
- msgstr "不可用"
-
--#: ../clients/cli/devices.c:1424
-+#: ../clients/cli/devices.c:1435
- msgid "Device details"
- msgstr "设备详情"
-
--#: ../clients/cli/devices.c:1435
-+#: ../clients/cli/devices.c:1447
- #, c-format
- msgid "Error: 'device show': %s"
- msgstr "错误：\"device show\"：%s"
-
--#: ../clients/cli/devices.c:1747
-+#: ../clients/cli/devices.c:1776
- msgid "Status of devices"
- msgstr "设备状态"
-
--#: ../clients/cli/devices.c:1751
-+#: ../clients/cli/devices.c:1780
- #, c-format
- msgid "Error: 'device status': %s"
- msgstr "错误：\"dev status\": %s"
-
--#: ../clients/cli/devices.c:1814 ../clients/cli/general.c:537
-+#: ../clients/cli/devices.c:1842 ../clients/cli/general.c:511
- #, c-format
- msgid "Error: Timeout %d sec expired."
- msgstr "错误：超时时间 %d 秒已到。"
-
--#: ../clients/cli/devices.c:1886
-+#: ../clients/cli/devices.c:1914
- #, c-format
- msgid "Device '%s' successfully activated with '%s'.\n"
- msgstr "成功用 \"%s%s\" 激活了设备 \"\"。\n"
-
--#: ../clients/cli/devices.c:1891
-+#: ../clients/cli/devices.c:1919
- #, c-format
- msgid ""
- "Hint: \"nmcli dev wifi show-password\" shows the Wi-Fi name and password.\n"
- msgstr "提示：“ nmcli dev wifi show-password” 显示Wi-Fi名称和密码。\n"
-
--#: ../clients/cli/devices.c:1895
-+#: ../clients/cli/devices.c:1923
- #, c-format
- msgid "Error: Connection activation failed: (%d) %s.\n"
- msgstr "错误：连接激活失败：(%d) %s。\n"
-
--#: ../clients/cli/devices.c:1925
-+#: ../clients/cli/devices.c:1953
- #, c-format
- msgid "Error: Failed to setup a Wi-Fi hotspot: %s"
- msgstr "错误：建立 Wi-Fi 热点失败：%s"
-
--#: ../clients/cli/devices.c:1928
-+#: ../clients/cli/devices.c:1956
- #, c-format
- msgid "Error: Failed to add/activate new connection: %s"
- msgstr "错误：添加/激活新连接失败：%s"
-
--#: ../clients/cli/devices.c:1931
-+#: ../clients/cli/devices.c:1959
- #, c-format
- msgid "Error: Failed to activate connection: %s"
- msgstr "错误：激活连接失败：%s"
-
--#: ../clients/cli/devices.c:1996
-+#: ../clients/cli/devices.c:2024
- #, c-format
- msgid "Error: Device activation failed: %s"
- msgstr "错误：激活设备失败：%s"
-
--#: ../clients/cli/devices.c:2046
-+#: ../clients/cli/devices.c:2075
- #, c-format
- msgid "Error: extra argument not allowed: '%s'."
- msgstr "错误：不允许的额外参数：\"%s\"。"
-
--#: ../clients/cli/devices.c:2116 ../clients/cli/devices.c:2131
--#: ../clients/cli/devices.c:2368
-+#: ../clients/cli/devices.c:2144 ../clients/cli/devices.c:2159
-+#: ../clients/cli/devices.c:2400
- #, c-format
- msgid "Device '%s' successfully disconnected.\n"
- msgstr "成功断开设备 \"%s\"。\n"
-
--#: ../clients/cli/devices.c:2119 ../clients/cli/devices.c:2442
-+#: ../clients/cli/devices.c:2147 ../clients/cli/devices.c:2473
- #, c-format
- msgid "Device '%s' successfully removed.\n"
- msgstr "成功移除设备 \"%s\"。\n"
-
--#: ../clients/cli/devices.c:2181 ../clients/cli/devices.c:2251
-+#: ../clients/cli/devices.c:2209 ../clients/cli/devices.c:2279
- #, c-format
- msgid "Error: Reapplying connection to device '%s' (%s) failed: %s"
- msgstr "错误：重新应用连接到 \"%s\" (%s) 失败：%s"
-
--#: ../clients/cli/devices.c:2191 ../clients/cli/devices.c:2260
-+#: ../clients/cli/devices.c:2219 ../clients/cli/devices.c:2288
- #, c-format
- msgid "Connection successfully reapplied to device '%s'.\n"
- msgstr "成功重新应用连接到设备 \"%s\"。\n"
-
--#: ../clients/cli/devices.c:2285
-+#: ../clients/cli/devices.c:2315
- #, c-format
- msgid "Error: Reading applied connection from device '%s' (%s) failed: %s"
- msgstr "错误：从设备 \"%s\" (%s) 读取已应用的连接失败：%s"
-
--#: ../clients/cli/devices.c:2352
-+#: ../clients/cli/devices.c:2384
- #, c-format
- msgid "Error: not all devices disconnected."
- msgstr "错误：未断开所有设备的连接。"
-
--#: ../clients/cli/devices.c:2353
-+#: ../clients/cli/devices.c:2385
- #, c-format
- msgid "Error: Device '%s' (%s) disconnecting failed: %s\n"
- msgstr "错误：断开设备 \"%s\" (%s) 的连接失败：%s\n"
-
--#: ../clients/cli/devices.c:2433
-+#: ../clients/cli/devices.c:2464
- #, c-format
- msgid "Error: not all devices deleted."
- msgstr "错误：未删除所有设备。"
-
--#: ../clients/cli/devices.c:2434
-+#: ../clients/cli/devices.c:2465
- #, c-format
- msgid "Error: Device '%s' (%s) deletion failed: %s\n"
- msgstr "错误：删除设备 \"%s\" (%s) 失败：%s\n"
-
--#: ../clients/cli/devices.c:2516
-+#: ../clients/cli/devices.c:2547
- #, c-format
- msgid "Error: No property specified."
- msgstr "错误：未指定属性。"
-
--#: ../clients/cli/devices.c:2531 ../clients/cli/devices.c:2548
--#: ../clients/cli/general.c:777 ../clients/cli/general.c:789
-+#: ../clients/cli/devices.c:2563 ../clients/cli/devices.c:2582
-+#: ../clients/cli/general.c:773 ../clients/cli/general.c:786
- #, c-format
- msgid "Error: '%s' argument is missing."
- msgstr "错误：缺少 \"%s\" 参数。"
-
--#: ../clients/cli/devices.c:2537
-+#: ../clients/cli/devices.c:2570
- #, c-format
- msgid "Error: 'managed': %s."
- msgstr "错误：\"managed\"：%s。"
-
--#: ../clients/cli/devices.c:2554
-+#: ../clients/cli/devices.c:2589
- #, c-format
- msgid "Error: 'autoconnect': %s."
- msgstr "错误：\"autoconnect\"：%s。"
-
--#: ../clients/cli/devices.c:2562 ../clients/cli/general.c:803
-+#: ../clients/cli/devices.c:2598 ../clients/cli/general.c:801
- #, c-format
- msgid "Error: property '%s' is not known."
- msgstr "错误：属性 \"%s\" 是未知的。"
-
--#: ../clients/cli/devices.c:2611
-+#: ../clients/cli/devices.c:2644
- #, c-format
- msgid "%s: using connection '%s'\n"
- msgstr "%s：正使用连接 \"%s\"\n"
-
--#: ../clients/cli/devices.c:2637
-+#: ../clients/cli/devices.c:2670
- #, c-format
- msgid "%s: device created\n"
- msgstr "%s：设备已创建\n"
-
--#: ../clients/cli/devices.c:2644
-+#: ../clients/cli/devices.c:2677
- #, c-format
- msgid "%s: device removed\n"
- msgstr "%s：设备已移除\n"
-
--#: ../clients/cli/devices.c:2824
-+#: ../clients/cli/devices.c:2856
- msgid "Wi-Fi scan list"
- msgstr "Wi-Fi 扫描列表"
-
--#: ../clients/cli/devices.c:2911
-+#: ../clients/cli/devices.c:2974 ../clients/cli/devices.c:3251
- #, c-format
- msgid "Error: Access point with bssid '%s' not found."
- msgstr "错误：未找到 bssid 为 \"%s\" 的接入点。"
-
--#: ../clients/cli/devices.c:3067
-+#: ../clients/cli/devices.c:3174
- #, c-format
- msgid "Error: 'device wifi': %s"
- msgstr "错误：\"device wifi\"：%s"
-
--#: ../clients/cli/devices.c:3087
-+#: ../clients/cli/devices.c:3193
- #, c-format
- msgid "Error: invalid rescan argument: '%s' not among [auto, no, yes]"
- msgstr "错误：无效的重新扫描参数：\"%s\" 未在 [auto, no, yes] 之中"
-
--#: ../clients/cli/devices.c:3094
-+#: ../clients/cli/devices.c:3232
- #, c-format
- msgid "Error: Device '%s' not found."
- msgstr "错误：没有找到设备 \"%s\"。"
-
--#: ../clients/cli/devices.c:3105
-+#: ../clients/cli/devices.c:3237
- #, c-format
- msgid ""
- "Error: Device '%s' was not recognized as a Wi-Fi device, check "
- "NetworkManager Wi-Fi plugin."
- msgstr "错误：设备 \"%s\" 没有被识别为 Wi-Fi 设备，请检查网络管理器（NetworkManager）的 Wi-Fi 插件。"
-
--#: ../clients/cli/devices.c:3109 ../clients/cli/devices.c:3430
--#: ../clients/cli/devices.c:4006 ../clients/cli/devices.c:4134
--#: ../clients/cli/devices.c:4266
-+#: ../clients/cli/devices.c:3241 ../clients/cli/devices.c:3570
-+#: ../clients/cli/devices.c:4159 ../clients/cli/devices.c:4286
-+#: ../clients/cli/devices.c:4419
- #, c-format
- msgid "Error: Device '%s' is not a Wi-Fi device."
- msgstr "错误：设备 \"%s\" 不是 Wi-Fi 设备。"
-
--#: ../clients/cli/devices.c:3277
-+#: ../clients/cli/devices.c:3417
- msgid "SSID or BSSID: "
- msgstr "SSID 或 BSSID： "
-
--#: ../clients/cli/devices.c:3282
-+#: ../clients/cli/devices.c:3422
- #, c-format
- msgid "Error: SSID or BSSID are missing."
- msgstr "错误：缺少 SSID/BSSID。"
-
--#: ../clients/cli/devices.c:3319
-+#: ../clients/cli/devices.c:3459
- #, c-format
- msgid "Error: bssid argument value '%s' is not a valid BSSID."
- msgstr "错误：bssid 参数值\"%s\"为无效 BSSID。"
-
--#: ../clients/cli/devices.c:3349
-+#: ../clients/cli/devices.c:3489
- #, 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:3376 ../clients/cli/devices.c:3394
-+#: ../clients/cli/devices.c:3516 ../clients/cli/devices.c:3534
- #, c-format
- msgid "Error: %s: %s."
- msgstr "错误：%s：%s。"
-
--#: ../clients/cli/devices.c:3413
-+#: ../clients/cli/devices.c:3553
- #, c-format
- msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
- msgstr "错误：要连接的 BSSID (%s) 与 bssid 参数 (%s) 不同。"
-
--#: ../clients/cli/devices.c:3419
-+#: ../clients/cli/devices.c:3559
- #, c-format
- msgid "Error: Parameter '%s' is neither SSID nor BSSID."
- msgstr "错误：参数 \"%s\" 不是 SSID 或 BSSID。"
-
--#: ../clients/cli/devices.c:3432 ../clients/cli/devices.c:4008
--#: ../clients/cli/devices.c:4136 ../clients/cli/devices.c:4367
-+#: ../clients/cli/devices.c:3572 ../clients/cli/devices.c:4161
-+#: ../clients/cli/devices.c:4288 ../clients/cli/devices.c:4524
- #, c-format
- msgid "Error: No Wi-Fi device found."
- msgstr "错误：未发现 Wi-Fi 设备。"
-
--#: ../clients/cli/devices.c:3452
-+#: ../clients/cli/devices.c:3592
- #, c-format
- msgid "Error: Failed to scan hidden SSID: %s."
- msgstr "错误：扫描隐藏的 SSID 失败：%s。"
-
--#: ../clients/cli/devices.c:3479
-+#: ../clients/cli/devices.c:3619
- #, c-format
- msgid "Error: No network with SSID '%s' found."
- msgstr "错误：未发现 SSID 为 \"%s\" 的网络。"
-
--#: ../clients/cli/devices.c:3481
-+#: ../clients/cli/devices.c:3621
- #, c-format
- msgid "Error: No access point with BSSID '%s' found."
- msgstr "错误：未找到 BSSID 为 \"%s\" 的接入点。"
-
--#: ../clients/cli/devices.c:3508
-+#: ../clients/cli/devices.c:3648
- #, c-format
- msgid "Error: Connection '%s' exists but properties don't match."
- msgstr "错误：连接 '%s' 存在但属性不匹配。"
-
--#: ../clients/cli/devices.c:3551
-+#: ../clients/cli/devices.c:3691
- #, 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:3588
-+#: ../clients/cli/devices.c:3732
- msgid "Password: "
- msgstr "密码： "
-
--#: ../clients/cli/devices.c:3729
-+#: ../clients/cli/devices.c:3871
- #, c-format
- msgid "'%s' is not valid WPA PSK"
- msgstr "\"%s\" 不是有效的 WPA PSK"
-
--#: ../clients/cli/devices.c:3746
-+#: ../clients/cli/devices.c:3888
- #, 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:3762
-+#: ../clients/cli/devices.c:3904
- #, c-format
- msgid "Hotspot password: %s\n"
- msgstr "热点密码：%s\n"
-
--#: ../clients/cli/devices.c:3927
-+#: ../clients/cli/devices.c:4072
- #, c-format
- msgid "Error: ssid is too long."
- msgstr "错误：SSID 太长。"
-
- # 这里 channel/band 开头不大写，表示其是命令行选项，所以不译。下面的同理。
--#: ../clients/cli/devices.c:3942
-+#: ../clients/cli/devices.c:4089
- #, c-format
- msgid "Error: band argument value '%s' is invalid; use 'a' or 'bg'."
- msgstr "错误：band 参数值 \"%s\" 无效，请使用 \"a\" 或 \"bg\"。"
-
--#: ../clients/cli/devices.c:3989
-+#: ../clients/cli/devices.c:4140
- #, c-format
- msgid "Error: channel requires band too."
- msgstr "错误：channal 也需要 band。"
-
--#: ../clients/cli/devices.c:3994
-+#: ../clients/cli/devices.c:4146
- #, c-format
- msgid "Error: channel '%s' not valid for band '%s'."
- msgstr "错误：band \"%s\" 的 channel \"%s\" 无效。"
-
--#: ../clients/cli/devices.c:4019
-+#: ../clients/cli/devices.c:4173
- #, c-format
- msgid "Error: Device '%s' supports neither AP nor Ad-Hoc mode."
- msgstr "错误：设备 \"%s\" 既不支持 AP 也不支持 Ad-Hoc 模式。"
-
--#: ../clients/cli/devices.c:4041
-+#: ../clients/cli/devices.c:4195
- #, c-format
- msgid "Error: Invalid 'password': %s."
- msgstr "错误：无效的 \"password\"：%s。"
-
--#: ../clients/cli/devices.c:4094 ../clients/cli/devices.c:4318
-+#: ../clients/cli/devices.c:4246 ../clients/cli/devices.c:4471
- #, c-format
- msgid "Error: '%s' cannot repeat."
- msgstr "错误：\"%s\" 不能重复。"
-
--#: ../clients/cli/devices.c:4227 ../clients/cli/devices.c:4231
--#: ../clients/cli/devices.c:4236 ../clients/tui/nmt-page-wifi.c:249
-+#: ../clients/cli/devices.c:4377 ../clients/cli/devices.c:4381
-+#: ../clients/cli/devices.c:4386 ../clients/cli/devices.c:4389
-+#: ../clients/tui/nmt-page-wifi.c:250
- msgid "Security"
- msgstr "安全性"
-
--#: ../clients/cli/devices.c:4227
-+#: ../clients/cli/devices.c:4377
- msgid "None"
- msgstr "无"
-
--#: ../clients/cli/devices.c:4240 ../clients/common/nm-secret-agent-simple.c:273
-+#: ../clients/cli/devices.c:4393 ../clients/common/nm-secret-agent-simple.c:273
- #: ../clients/common/nm-secret-agent-simple.c:310
- #: ../clients/common/nm-secret-agent-simple.c:333
- #: ../clients/common/nm-secret-agent-simple.c:366
- #: ../clients/common/nm-secret-agent-simple.c:903
- #: ../clients/common/nm-secret-agent-simple.c:938
- #: ../clients/common/nm-secret-agent-simple.c:961
--#: ../clients/common/nm-vpn-helpers.c:110
--#: ../clients/common/nm-vpn-helpers.c:114
--#: ../clients/common/nm-vpn-helpers.c:120
--#: ../clients/common/nm-vpn-helpers.c:125 ../clients/tui/nmt-page-dsl.c:62
--#: ../clients/tui/nmt-page-wifi.c:265 ../clients/tui/nmt-page-wifi.c:297
--#: ../clients/tui/nmt-page-wifi.c:330
-+#: ../clients/common/nm-vpn-helpers.c:137
-+#: ../clients/common/nm-vpn-helpers.c:143
-+#: ../clients/common/nm-vpn-helpers.c:151
-+#: ../clients/common/nm-vpn-helpers.c:160 ../clients/tui/nmt-page-dsl.c:62
-+#: ../clients/tui/nmt-page-wifi.c:266 ../clients/tui/nmt-page-wifi.c:298
-+#: ../clients/tui/nmt-page-wifi.c:331
- msgid "Password"
- msgstr "密码"
-
--#: ../clients/cli/devices.c:4355
-+#: ../clients/cli/devices.c:4511
- #, c-format
- msgid "%s"
- msgstr "%s"
-
- #. Main header name
--#: ../clients/cli/devices.c:4411
-+#: ../clients/cli/devices.c:4565
- msgid "Device LLDP neighbors"
- msgstr "设备 LLDP 邻居"
-
--#: ../clients/cli/devices.c:4521
-+#: ../clients/cli/devices.c:4682
- #, c-format
- msgid "Error: 'device lldp list': %s"
- msgstr "错误：\"device lldp list\"：%s"
-
--#: ../clients/cli/general.c:27
-+#: ../clients/cli/general.c:32
- msgid "asleep"
- msgstr "睡眠中"
-
--#: ../clients/cli/general.c:28
-+#: ../clients/cli/general.c:33
- msgid "connecting"
- msgstr "连接中"
-
--#: ../clients/cli/general.c:29
-+#: ../clients/cli/general.c:34
- msgid "connected (local only)"
- msgstr "已连接（仅本地）"
-
--#: ../clients/cli/general.c:30
-+#: ../clients/cli/general.c:35
- msgid "connected (site only)"
- msgstr "已连接（仅站点）"
-
--#: ../clients/cli/general.c:31 ../clients/common/nm-client-utils.c:260
-+#: ../clients/cli/general.c:36 ../clients/common/nm-client-utils.c:262
- msgid "connected"
- msgstr "已连接"
-
--#: ../clients/cli/general.c:32
-+#: ../clients/cli/general.c:37
- msgid "disconnecting"
- msgstr "断开中"
-
--#: ../clients/cli/general.c:33 ../clients/common/nm-client-utils.c:253
-+#: ../clients/cli/general.c:38 ../clients/common/nm-client-utils.c:255
- msgid "disconnected"
- msgstr "已断开"
-
--#: ../clients/cli/general.c:124
-+#: ../clients/cli/general.c:94
- msgid "auth"
- msgstr "验证"
-
--#: ../clients/cli/general.c:152
-+#: ../clients/cli/general.c:123
- msgid "running"
- msgstr "运行中"
-
--#: ../clients/cli/general.c:166
-+#: ../clients/cli/general.c:137
- msgid "starting"
- msgstr "启动中"
-
--#: ../clients/cli/general.c:166
-+#: ../clients/cli/general.c:137
- msgid "started"
- msgstr "已启动"
-
--#: ../clients/cli/general.c:200
-+#: ../clients/cli/general.c:171
- msgid "enabled"
- msgstr "已启用"
-
--#: ../clients/cli/general.c:200
-+#: ../clients/cli/general.c:171
- msgid "disabled"
- msgstr "已禁用"
-
--#: ../clients/cli/general.c:318
-+#: ../clients/cli/general.c:289
- #, c-format
- msgid ""
- "Usage: nmcli general { COMMAND | help }\n"
-@@ -3126,7 +3138,7 @@ msgstr "用法：nmcli general { 命令 | help }\n"
- " logging [level <日志级别>] [domains <日志域>]\n"
- "\n"
-
--#: ../clients/cli/general.c:329
-+#: ../clients/cli/general.c:300
- #, c-format
- msgid ""
- "Usage: nmcli general status { help }\n"
-@@ -3141,7 +3153,7 @@ msgstr "用法：nmcli general status { help }\n"
- "\"status\" 是默认操作，即 \"nmcli gen\" 调用 \"nmcli gen status\"\n"
- "\n"
-
--#: ../clients/cli/general.c:338
-+#: ../clients/cli/general.c:309
- #, c-format
- msgid ""
- "Usage: nmcli general hostname { ARGUMENTS | help }\n"
-@@ -3162,7 +3174,7 @@ msgstr "用法：nmcli general hostname { 参数 | help }\n"
- "新的永久系统主机名。\n"
- "\n"
-
--#: ../clients/cli/general.c:350
-+#: ../clients/cli/general.c:321
- #, c-format
- msgid ""
- "Usage: nmcli general permissions { help }\n"
-@@ -3174,7 +3186,7 @@ msgstr "用法：nmcli general permissions { help }\n"
- "显示验证操作的调用程序权限。\n"
- "\n"
-
--#: ../clients/cli/general.c:358
-+#: ../clients/cli/general.c:329
- #, c-format
- msgid ""
- "Usage: nmcli general reload { ARGUMENTS | help }\n"
-@@ -3232,7 +3244,7 @@ msgstr "用法：nmcli general reload { ARGUMENTS | help }\n"
- "With no flags, everything that is supported is reloaded, which is\n"
- "identical to sending a SIGHUP.\n"
-
--#: ../clients/cli/general.c:390
-+#: ../clients/cli/general.c:361
- #, c-format
- msgid ""
- "Usage: nmcli general logging { ARGUMENTS | help }\n"
-@@ -3255,7 +3267,7 @@ msgstr "用法：nmcli general logging { 参数 | help }\n"
- "可能的日志域列表请参阅手册页。\n"
- "\n"
-
--#: ../clients/cli/general.c:403
-+#: ../clients/cli/general.c:374
- #, c-format
- msgid ""
- "Usage: nmcli networking { COMMAND | help }\n"
-@@ -3279,7 +3291,7 @@ msgstr "用法：nmcli networking { 命令 | help }\n"
- " connectivity [check]\n"
- "\n"
-
--#: ../clients/cli/general.c:413
-+#: ../clients/cli/general.c:384
- #, c-format
- msgid ""
- "Usage: nmcli networking on { help }\n"
-@@ -3291,7 +3303,7 @@ msgstr "用法：nmcli networking on { help }\n"
- "打开联网。\n"
- "\n"
-
--#: ../clients/cli/general.c:421
-+#: ../clients/cli/general.c:392
- #, c-format
- msgid ""
- "Usage: nmcli networking off { help }\n"
-@@ -3303,7 +3315,7 @@ msgstr "用法：nmcli networking off { help }\n"
- "关闭联网。\n"
- "\n"
-
--#: ../clients/cli/general.c:429
-+#: ../clients/cli/general.c:400
- #, c-format
- msgid ""
- "Usage: nmcli networking connectivity { ARGUMENTS | help }\n"
-@@ -3322,7 +3334,7 @@ msgstr "用法：nmcli networking connectivity { 参数 | help }\n"
- "可选的 \"check\" 参数可让网络管理器（NetworkManager）重新检查连接性。\n"
- "\n"
-
--#: ../clients/cli/general.c:441
-+#: ../clients/cli/general.c:412
- #, c-format
- msgid ""
- "Usage: nmcli radio { COMMAND | help }\n"
-@@ -3338,7 +3350,7 @@ msgstr "用法：nmcli radio { 命令 | help }\n"
- " all | wifi | wwan [ on | off ]\n"
- "\n"
-
--#: ../clients/cli/general.c:450
-+#: ../clients/cli/general.c:421
- #, c-format
- msgid ""
- "Usage: nmcli radio all { ARGUMENTS | help }\n"
-@@ -3354,7 +3366,7 @@ msgstr "用法：nmcli radio all { 参数 | help }\n"
- "获取所有无线电开关的状态，或者打开/关闭它们。\n"
- "\n"
-
--#: ../clients/cli/general.c:460
-+#: ../clients/cli/general.c:431
- #, c-format
- msgid ""
- "Usage: nmcli radio wifi { ARGUMENTS | help }\n"
-@@ -3370,7 +3382,7 @@ msgstr "用法：nmcli radio wifi { 参数 | help }\n"
- "获取 Wi-Fi 无线电开关的状态，或者打开/关闭它。\n"
- "\n"
-
--#: ../clients/cli/general.c:470
-+#: ../clients/cli/general.c:441
- #, c-format
- msgid ""
- "Usage: nmcli radio wwan { ARGUMENTS | help }\n"
-@@ -3386,7 +3398,7 @@ msgstr "用法：nmcli radio wwan { 参数 | help }\n"
- "获取移动宽带无线电开关的状态，或者打开/关闭它。\n"
- "\n"
-
--#: ../clients/cli/general.c:480
-+#: ../clients/cli/general.c:451
- #, c-format
- msgid ""
- "Usage: nmcli monitor\n"
-@@ -3400,205 +3412,221 @@ msgstr "用法：nmcli monitor\n"
- "每当 NetworkManager 出现更改时打印一行信息。\n"
- "\n"
-
--#: ../clients/cli/general.c:510
-+#: ../clients/cli/general.c:481
- msgid "NetworkManager status"
- msgstr "网络管理器状态"
-
--#: ../clients/cli/general.c:514
-+#: ../clients/cli/general.c:485
- #, c-format
- msgid "Error: only these fields are allowed: %s"
- msgstr "错误：只允许使用这些字段：%s"
-
--#: ../clients/cli/general.c:567
-+#. NetworkManager quit while we were waiting.
-+#: ../clients/cli/general.c:541 ../clients/tui/nmtui.c:246
-+#, c-format
-+msgid "NetworkManager is not running."
-+msgstr "NetworkManaer 未运行。"
-+
-+#: ../clients/cli/general.c:563
- msgid "NetworkManager permissions"
- msgstr "网络管理器权限"
-
- # XXX: 这里考虑一下要不要翻译
- # XXX: Should we translate this?
--#: ../clients/cli/general.c:571
-+#: ../clients/cli/general.c:567
- #, c-format
- msgid "Error: 'general permissions': %s"
- msgstr "错误：\"常规权限\"：%s"
-
--#: ../clients/cli/general.c:664
-+#: ../clients/cli/general.c:644
- #, c-format
- msgid "Error: invalid reload flag '%s'. Allowed flags are: %s"
- msgstr "错误：无效的重新加载标志' %s'。允许的标志是： %s"
-
--#: ../clients/cli/general.c:674
-+#: ../clients/cli/general.c:655
- #, c-format
- msgid "Error: extra argument '%s'"
- msgstr "错误：额外参数 '%s'。"
-
--#: ../clients/cli/general.c:688
-+#: ../clients/cli/general.c:670
- #, c-format
- msgid "Error: failed to reload: %s"
- msgstr "错误：重新加载失败：%s"
-
--#: ../clients/cli/general.c:727
-+#: ../clients/cli/general.c:708
- msgid "NetworkManager logging"
- msgstr "网络管理器日志"
-
--#: ../clients/cli/general.c:731
-+#: ../clients/cli/general.c:712
- #, c-format
- msgid "Error: 'general logging': %s"
- msgstr "错误：\"常规日志\"：%s"
-
--#: ../clients/cli/general.c:813
-+#: ../clients/cli/general.c:744
- #, c-format
- msgid "Error: failed to set logging: %s"
- msgstr "错误：设置日志失败：%s"
-
--#: ../clients/cli/general.c:830
-+#: ../clients/cli/general.c:834
- #, c-format
- msgid "Error: failed to set hostname: %s"
- msgstr "错误：设置主机名失败：%s"
-
--#: ../clients/cli/general.c:900
-+#: ../clients/cli/general.c:895
- #, c-format
- msgid "Error: '--fields' value '%s' is not valid here (allowed field: %s)"
- msgstr "错误：\"--fields\" 值 \"%s\" 在此无效（允许的字段：%s）"
-
--#: ../clients/cli/general.c:925
-+#: ../clients/cli/general.c:920
- #, c-format
- msgid "Error: invalid '%s' argument: '%s' (use on/off)."
- msgstr "错误：无效的 \"%s\" 参数：\"%s\"（使用 on/off）。"
-
-+#: ../clients/cli/general.c:943
-+#, c-format
-+msgid "Error: failed to set networking: %s"
-+msgstr "错误：设置联网失败：%s"
-+
- #. no arguments -> get current state
--#: ../clients/cli/general.c:973 ../clients/cli/general.c:985
-+#: ../clients/cli/general.c:988 ../clients/cli/general.c:1000
- msgid "Connectivity"
- msgstr "连接性"
-
--#: ../clients/cli/general.c:988
-+#: ../clients/cli/general.c:1003
- #, c-format
- msgid "Error: 'networking' command '%s' is not valid."
- msgstr "错误：\"networking\" 命令 \"%s\" 无效。"
-
--#: ../clients/cli/general.c:1002
-+#: ../clients/cli/general.c:1015
- msgid "Networking"
- msgstr "联网"
-
- #. no argument, show all radio switches
--#: ../clients/cli/general.c:1037
-+#: ../clients/cli/general.c:1043
- msgid "Radio switches"
- msgstr "无线电开关"
-
-+#: ../clients/cli/general.c:1068
-+#, c-format
-+msgid "Error: failed to set Wi-Fi radio: %s"
-+msgstr "错误：设置 Wi-Fi radio 失败：%s"
-+
- #. no argument, show current Wi-Fi state
--#: ../clients/cli/general.c:1067
-+#: ../clients/cli/general.c:1086
- msgid "Wi-Fi radio switch"
- msgstr "Wi-Fi 无线电开关"
-
- #. no argument, show current WWAN (mobile broadband) state
--#: ../clients/cli/general.c:1094
-+#: ../clients/cli/general.c:1122
- msgid "WWAN radio switch"
- msgstr "WWAN 无线电开关"
-
--#: ../clients/cli/general.c:1142
-+#: ../clients/cli/general.c:1162
- msgid "NetworkManager has started"
- msgstr "网络管理器已启动"
-
--#: ../clients/cli/general.c:1142
-+#: ../clients/cli/general.c:1162
- msgid "NetworkManager has stopped"
- msgstr "网络管理器已停止"
-
--#: ../clients/cli/general.c:1153
-+#: ../clients/cli/general.c:1173
- #, c-format
- msgid "Hostname set to '%s'\n"
- msgstr "主机名已设为 \"%s\"\n"
-
--#: ../clients/cli/general.c:1168
-+#: ../clients/cli/general.c:1188
- #, c-format
- msgid "'%s' is now the primary connection\n"
- msgstr "\"%s\" 现在是主连接\n"
-
--#: ../clients/cli/general.c:1170
-+#: ../clients/cli/general.c:1190
- #, c-format
- msgid "There's no primary connection\n"
- msgstr "没有主连接\n"
-
--#: ../clients/cli/general.c:1182
-+#: ../clients/cli/general.c:1202
- #, c-format
- msgid "Connectivity is now '%s'\n"
- msgstr "连接性现在是 \"%s\"\n"
-
--#: ../clients/cli/general.c:1196
-+#: ../clients/cli/general.c:1216
- #, c-format
- msgid "Networkmanager is now in the '%s' state\n"
- msgstr "网络管理器现在处于 \"%s\" 状态\n"
-
--#: ../clients/cli/general.c:1216
-+#: ../clients/cli/general.c:1236
- msgid "connection available"
- msgstr "连接可用"
-
--#: ../clients/cli/general.c:1218
-+#: ../clients/cli/general.c:1238
- msgid "connections available"
- msgstr "连接可用"
-
--#: ../clients/cli/general.c:1236
-+#: ../clients/cli/general.c:1256
- msgid "autoconnect"
- msgstr "自动连接"
-
--#: ../clients/cli/general.c:1238
-+#: ../clients/cli/general.c:1258
- msgid "fw missing"
- msgstr "缺失固件"
-
--#: ../clients/cli/general.c:1243
-+#: ../clients/cli/general.c:1263
- msgid "plugin missing"
- msgstr "缺失插件"
-
--#: ../clients/cli/general.c:1253 ../clients/cli/general.c:1267
-+#: ../clients/cli/general.c:1273 ../clients/cli/general.c:1287
- msgid "sw disabled"
- msgstr "sw 禁用"
-
--#: ../clients/cli/general.c:1258 ../clients/cli/general.c:1272
-+#: ../clients/cli/general.c:1278 ../clients/cli/general.c:1292
- msgid "hw disabled"
- msgstr "hw 禁用"
-
--#: ../clients/cli/general.c:1283
-+#: ../clients/cli/general.c:1303
- msgid "sw"
- msgstr "软件"
-
--#: ../clients/cli/general.c:1285
-+#: ../clients/cli/general.c:1305
- msgid "hw"
- msgstr "硬件"
-
--#: ../clients/cli/general.c:1290
-+#: ../clients/cli/general.c:1310
- msgid "iface"
- msgstr "接口"
-
--#: ../clients/cli/general.c:1293
-+#: ../clients/cli/general.c:1313
- msgid "port"
- msgstr "端口"
-
--#: ../clients/cli/general.c:1296
-+#: ../clients/cli/general.c:1316
- msgid "mtu"
- msgstr "mtu"
-
--#: ../clients/cli/general.c:1313
-+#: ../clients/cli/general.c:1333
- msgid "master"
- msgstr "主连接"
-
--#: ../clients/cli/general.c:1317 ../clients/tui/nm-editor-utils.c:235
-+#: ../clients/cli/general.c:1337 ../clients/tui/nm-editor-utils.c:230
- #: ../clients/tui/nmt-connect-connection-list.c:394
- msgid "VPN"
- msgstr "VPN"
-
--#: ../clients/cli/general.c:1319
-+#: ../clients/cli/general.c:1339
- msgid "ip4 default"
- msgstr "ip4 默认"
-
--#: ../clients/cli/general.c:1321
-+#: ../clients/cli/general.c:1341
- msgid "ip6 default"
- msgstr "ip6 默认"
-
--#: ../clients/cli/general.c:1403
-+#: ../clients/cli/general.c:1417
- #, c-format
- msgid "%s VPN connection"
- msgstr "%s VPN 连接"
-
- #. TRANSLATORS: prints header line for activated device in plain `nmcli` overview output as
- #. * "<interface-name>: <device-state> to <connection-id>"
--#: ../clients/cli/general.c:1423
-+#: ../clients/cli/general.c:1436
- #, c-format
- msgctxt "nmcli-overview"
- msgid "%s: %s to %s"
-@@ -3606,13 +3634,13 @@ msgstr "%s: %s 到 %s"
-
- #. TRANSLATORS: prints header line for not active device in plain `nmcli` overview output as
- #. * "<interface-name>: <device-state>"
--#: ../clients/cli/general.c:1430
-+#: ../clients/cli/general.c:1443
- #, c-format
- msgctxt "nmcli-overview"
- msgid "%s: %s"
- msgstr "%s: %s"
-
--#: ../clients/cli/general.c:1480
-+#: ../clients/cli/general.c:1493
- #, c-format
- msgid ""
- "Use \"nmcli device show\" to get complete information about known devices "
-@@ -3626,16 +3654,16 @@ msgstr "使用 \"nmcli device show\" 获取关于已知设备的完整信息，
- "\n"
- "完整的用法细节，可参考 nmcli(1) 和 nmcli-examples(7) 手册页。\n"
-
--#: ../clients/cli/general.c:1501
-+#: ../clients/cli/general.c:1509
- #, c-format
- msgid "Error: 'monitor' command '%s' is not valid."
- msgstr "错误：\"monitor\" 命令 \"%s\" 无效。"
-
--#: ../clients/cli/general.c:1513
-+#: ../clients/cli/general.c:1521
- msgid "Networkmanager is not running (waiting for it)\n"
- msgstr "网络管理器未运行（等待中）。\n"
-
--#: ../clients/cli/nmcli.c:230
-+#: ../clients/cli/nmcli.c:233
- #, c-format
- msgid ""
- "Usage: nmcli [OPTIONS] OBJECT { COMMAND | help }\n"
-@@ -3693,96 +3721,91 @@ msgstr "Usage: nmcli [OPTIONS] OBJECT { COMMAND | help }\n"
- " m[onitor] monitor NetworkManager changes\n"
- "\n"
-
--#: ../clients/cli/nmcli.c:310
-+#: ../clients/cli/nmcli.c:308
- #, c-format
- msgid "Error: missing argument for '%s' option."
- msgstr "错误：\"%s\" 选项缺少参数。"
-
--#: ../clients/cli/nmcli.c:618
-+#: ../clients/cli/nmcli.c:621
- #, c-format
- msgid "Unexpected end of file following '%s'\n"
- msgstr "\"%s\" 后更随着意外的文件尾\n"
-
--#: ../clients/cli/nmcli.c:626
-+#: ../clients/cli/nmcli.c:629
- #, c-format
- msgid "Expected whitespace following '%s'\n"
- msgstr "期望 \"%s\" 后更随空白\n"
-
--#: ../clients/cli/nmcli.c:638
-+#: ../clients/cli/nmcli.c:641
- #, c-format
- msgid "Expected a value for '%s'\n"
- msgstr "期望一个 \"%s\" 的值\n"
-
--#: ../clients/cli/nmcli.c:652
-+#: ../clients/cli/nmcli.c:655
- #, c-format
- msgid "Expected a line break following '%s'\n"
- msgstr "期望 \"%s\" 后更随换行符\n"
-
--#: ../clients/cli/nmcli.c:741
-+#: ../clients/cli/nmcli.c:761
- #, c-format
- msgid "Error: Option '--terse' is specified the second time."
- msgstr "错误：第二次指定了选项 \"--terse\"。"
-
--#: ../clients/cli/nmcli.c:746
-+#: ../clients/cli/nmcli.c:766
- #, c-format
- msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
- msgstr "错误：选项 \"--terse\" 与 \"--pretty\" 相互排斥。"
-
--#: ../clients/cli/nmcli.c:754
-+#: ../clients/cli/nmcli.c:774
- #, c-format
- msgid "Error: Option '--pretty' is specified the second time."
- msgstr "错误：第二次指定了选项 \"--pretty\"。"
-
--#: ../clients/cli/nmcli.c:759
-+#: ../clients/cli/nmcli.c:779
- #, c-format
- msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
- msgstr "错误：选项 \"--pretty\" 与 \"--terse\" 相互排斥。"
-
--#: ../clients/cli/nmcli.c:774
-+#: ../clients/cli/nmcli.c:794
- #, c-format
- msgid "Error: '%s' is not a valid argument for '%s' option."
- msgstr "错误：\"%s\" 不是 \"%s\" 选项的有效参数。"
-
--#: ../clients/cli/nmcli.c:788 ../clients/cli/nmcli.c:800
-+#: ../clients/cli/nmcli.c:808 ../clients/cli/nmcli.c:820
- #, c-format
- msgid "Error: '%s' is not valid argument for '%s' option."
- msgstr "错误：\"%s\" 不是 \"%s\" 选项的有效参数。"
-
--#: ../clients/cli/nmcli.c:824
-+#: ../clients/cli/nmcli.c:844
- #, c-format
- msgid "Error: '%s' is not a valid timeout."
- msgstr "错误：\"%s\" 不是有效的超时时间。"
-
--#: ../clients/cli/nmcli.c:831
-+#: ../clients/cli/nmcli.c:851
- #, c-format
- msgid "nmcli tool, version %s\n"
- msgstr "nmcli 工具，版本 %s\n"
-
--#: ../clients/cli/nmcli.c:839
-+#: ../clients/cli/nmcli.c:859
- #, c-format
- msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
- msgstr "错误：选项 \"%s\" 未知，尝试 \"nmcli -help\"。"
-
--#: ../clients/cli/nmcli.c:895 ../clients/cli/nmcli.c:902
-+#: ../clients/cli/nmcli.c:915 ../clients/cli/nmcli.c:922
- #, c-format
- msgid "Error: nmcli terminated by signal %s (%d)"
- msgstr "错误：nmcli 被信号 %s (%d) 终止了"
-
--#: ../clients/cli/nmcli.c:968
-+#: ../clients/cli/nmcli.c:990
- msgid "Success"
- msgstr "成功"
-
--#: ../clients/cli/polkit-agent.c:54
-+#: ../clients/cli/polkit-agent.c:41
- #, c-format
--msgid "Authentication message: %s\n"
--msgstr "验证消息：%s\n"
-+msgid "Error: polkit agent failed: %s\n"
-+msgstr "错误：polkit 代理失败：%s\n"
-
--#: ../clients/cli/polkit-agent.c:62
--#, c-format
--msgid "Authentication error: %s\n"
--msgstr "验证错误：%s\n"
--
--#: ../clients/cli/polkit-agent.c:122
-+#: ../clients/cli/polkit-agent.c:99
- #, c-format
- msgid "Warning: polkit agent initialization failed: %s\n"
- msgstr "警告：polkit 代理初始化失败：%s\n"
-@@ -3837,19 +3860,19 @@ msgstr "警告：%s\n"
- msgid "Info: %s\n"
- msgstr "信息：%s\n"
-
--#: ../clients/cli/settings.c:490
-+#: ../clients/cli/settings.c:488
- msgid "don't know how to get the property value"
- msgstr "不知道如何获取属性值"
-
--#: ../clients/cli/settings.c:580
-+#: ../clients/cli/settings.c:578
- msgid "the property can't be changed"
- msgstr "无法更改该属性"
-
--#: ../clients/cli/settings.c:658
-+#: ../clients/cli/settings.c:656
- msgid "[NM property description]"
- msgstr "[NM 属性描述]"
-
--#: ../clients/cli/settings.c:668
-+#: ../clients/cli/settings.c:666
- msgid "[nmcli specific description]"
- msgstr "[nmcli 特定描述]"
-
-@@ -3863,60 +3886,60 @@ msgstr "错误：需要参数 \"%s\" 但提供的是 \"%s\"。"
- msgid "Error: Unexpected argument '%s'"
- msgstr "错误：意外参数 \"%s\""
-
--#: ../clients/cli/utils.c:695
-+#: ../clients/cli/utils.c:691
- #, c-format
- msgid "invalid field '%s%s%s'; no such field"
- msgstr "无效字段 \"%s%s%s\"；没有此类字段"
-
--#: ../clients/cli/utils.c:699
-+#: ../clients/cli/utils.c:695
- #, c-format
- msgid "invalid field '%s%s%s'; allowed fields: [%s]"
- msgstr "无效字段 \"%s%s%s\";允许的字段：[%s]"
-
--#: ../clients/cli/utils.c:795
-+#: ../clients/cli/utils.c:791
- #, c-format
- msgid "failure to select field"
- msgstr "选择字段失败"
-
--#: ../clients/cli/utils.c:1424
-+#: ../clients/cli/utils.c:1427
- #, c-format
- msgid "Error reading nmcli output: %s\n"
- msgstr "读取 nmcli 输出时出错：%s\n"
-
--#: ../clients/cli/utils.c:1429
-+#: ../clients/cli/utils.c:1432
- #, c-format
- msgid "Error writing nmcli output: %s\n"
- msgstr "写入 nmcli 输出时出错：%s\n"
-
--#: ../clients/cli/utils.c:1455
-+#: ../clients/cli/utils.c:1458
- #, c-format
- msgid "Failed to create pager pipe: %s\n"
- msgstr "创建与子进程通讯的管道失败：%s\n"
-
--#: ../clients/cli/utils.c:1464
-+#: ../clients/cli/utils.c:1467
- #, c-format
- msgid "Failed to fork pager: %s\n"
- msgstr "fork 子进程失败：%s\n"
-
--#: ../clients/cli/utils.c:1511 ../clients/cli/utils.c:1515
-+#: ../clients/cli/utils.c:1514 ../clients/cli/utils.c:1518
- #, c-format
- msgid "Failed to duplicate pager pipe: %s\n"
- msgstr "复制与子进程通讯的管道失败：%s\n"
-
--#: ../clients/cli/utils.h:297 ../clients/common/nm-meta-setting-desc.c:4136
-+#: ../clients/cli/utils.h:300 ../clients/common/nm-meta-setting-desc.c:4129
- msgid "on"
- msgstr "开"
-
--#: ../clients/cli/utils.h:297 ../clients/common/nm-meta-setting-desc.c:4138
-+#: ../clients/cli/utils.h:300 ../clients/common/nm-meta-setting-desc.c:4130
- msgid "off"
- msgstr "关"
-
--#: ../clients/cli/utils.h:323
-+#: ../clients/cli/utils.h:326
- #, c-format
- msgid "%lld (%s)"
- msgstr "%lld（%s）"
-
--#: ../clients/cli/utils.h:330
-+#: ../clients/cli/utils.h:333
- #, c-format
- msgid "%lld - %s"
- msgstr "%lld — %s"
-@@ -3924,416 +3947,463 @@ 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:107
--#: ../clients/common/nm-client-utils.c:138
-+#: ../clients/common/nm-client-utils.c:109
-+#: ../clients/common/nm-client-utils.c:140
- #, c-format
- msgid "'%s' is ambiguous (%s)"
- msgstr "\"%s\" 不明确（%s）"
-
--#: ../clients/common/nm-client-utils.c:117
-+#: ../clients/common/nm-client-utils.c:119
- #, c-format
- msgid "'%s' is not valid; use [%s] or [%s]"
- msgstr "\"%s\" 无效，请使用 [%s] 或 [%s]"
-
--#: ../clients/common/nm-client-utils.c:150
-+#: ../clients/common/nm-client-utils.c:152
- #, c-format
- msgid "'%s' is not valid; use [%s], [%s] or [%s]"
- msgstr "\"%s\" 无效，请使用 [%s]、[%s] 或 [%s]"
-
--#: ../clients/common/nm-client-utils.c:199
-+#: ../clients/common/nm-client-utils.c:201
- #, c-format
- msgid "'%s' is ambiguous: %s"
- msgstr "\"%s\" 不明确：%s"
-
--#: ../clients/common/nm-client-utils.c:209
-+#: ../clients/common/nm-client-utils.c:211
- #, c-format
- msgid "missing name, try one of [%s]"
- msgstr "缺少名称，请尝试使用 [%s] 之一。"
-
--#: ../clients/common/nm-client-utils.c:251
-+#: ../clients/common/nm-client-utils.c:253
- msgid "unmanaged"
- msgstr "未托管"
-
--#: ../clients/common/nm-client-utils.c:252
-+#: ../clients/common/nm-client-utils.c:254
- msgid "unavailable"
- msgstr "不可用"
-
--#: ../clients/common/nm-client-utils.c:254
-+#: ../clients/common/nm-client-utils.c:256
- msgid "connecting (prepare)"
- msgstr "连接中（准备）"
-
--#: ../clients/common/nm-client-utils.c:255
-+#: ../clients/common/nm-client-utils.c:257
- msgid "connecting (configuring)"
- msgstr "连接中（正在配置）"
-
--#: ../clients/common/nm-client-utils.c:256
-+#: ../clients/common/nm-client-utils.c:258
- msgid "connecting (need authentication)"
- msgstr "连接中（需要验证）"
-
--#: ../clients/common/nm-client-utils.c:257
-+#: ../clients/common/nm-client-utils.c:259
- msgid "connecting (getting IP configuration)"
- msgstr "连接中（正在获取 IP 配置）"
-
--#: ../clients/common/nm-client-utils.c:258
-+#: ../clients/common/nm-client-utils.c:260
- msgid "connecting (checking IP connectivity)"
- msgstr "连接中（正在检查 IP 连接性）"
-
--#: ../clients/common/nm-client-utils.c:259
-+#: ../clients/common/nm-client-utils.c:261
- msgid "connecting (starting secondary connections)"
- msgstr "连接中（正在启动次级连接）"
-
--#: ../clients/common/nm-client-utils.c:262
-+#: ../clients/common/nm-client-utils.c:264
- msgid "connection failed"
- msgstr "连接失败"
-
--#: ../clients/common/nm-client-utils.c:270
-+#: ../clients/common/nm-client-utils.c:271
-+#: ../clients/common/nm-client-utils.c:272
-+#: ../clients/common/nm-client-utils.c:273
-+#: ../clients/common/nm-client-utils.c:274
-+#: ../clients/common/nm-client-utils.c:275
-+#: ../clients/common/nm-client-utils.c:276
-+msgid "connecting (externally)"
-+msgstr "连接（外部）"
-+
-+#: ../clients/common/nm-client-utils.c:277
-+msgid "connected (externally)"
-+msgstr "连接（外部）"
-+
-+#: ../clients/common/nm-client-utils.c:278
-+#: ../clients/common/nm-client-utils.c:279
-+msgid "deactivating (externally)"
-+msgstr "取消激活（外部）"
-+
-+#: ../clients/common/nm-client-utils.c:304
- msgid "yes (guessed)"
- msgstr "是（猜测）"
-
--#: ../clients/common/nm-client-utils.c:271
-+#: ../clients/common/nm-client-utils.c:305
- 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:277
--#: ../clients/common/nm-client-utils.c:350 ../libnm/nm-device.c:1514
-+#: ../clients/common/nm-client-utils.c:311
-+#: ../clients/common/nm-client-utils.c:384 ../libnm/nm-device.c:1628
- msgid "Unknown"
- msgstr "未知"
-
--#: ../clients/common/nm-client-utils.c:278
-+#: ../clients/common/nm-client-utils.c:312
- msgid "No reason given"
- msgstr "未给出原因"
-
--#: ../clients/common/nm-client-utils.c:280
-+#: ../clients/common/nm-client-utils.c:314
- msgid "Device is now managed"
- msgstr "设备现在已托管"
-
--#: ../clients/common/nm-client-utils.c:281
-+#: ../clients/common/nm-client-utils.c:315
- msgid "Device is now unmanaged"
- msgstr "设备现在未托管"
-
--#: ../clients/common/nm-client-utils.c:282
-+#: ../clients/common/nm-client-utils.c:316
- msgid "The device could not be readied for configuration"
- msgstr "设备配置未就绪"
-
--#: ../clients/common/nm-client-utils.c:283
-+#: ../clients/common/nm-client-utils.c:317
- msgid ""
- "IP configuration could not be reserved (no available address, timeout, etc.)"
- msgstr "IP 配置无法保留（无可用地址、超时等）"
-
--#: ../clients/common/nm-client-utils.c:284
-+#: ../clients/common/nm-client-utils.c:318
- msgid "The IP configuration is no longer valid"
- msgstr "IP 配置不再有效"
-
--#: ../clients/common/nm-client-utils.c:285
-+#: ../clients/common/nm-client-utils.c:319
- msgid "Secrets were required, but not provided"
- msgstr "需要密钥，但未提供"
-
--#: ../clients/common/nm-client-utils.c:286
-+#: ../clients/common/nm-client-utils.c:320
- msgid "802.1X supplicant disconnected"
- msgstr "802.1X 请求方已断开连接"
-
--#: ../clients/common/nm-client-utils.c:287
-+#: ../clients/common/nm-client-utils.c:321
- msgid "802.1X supplicant configuration failed"
- msgstr "802.1X 请求方配置失败"
-
--#: ../clients/common/nm-client-utils.c:288
-+#: ../clients/common/nm-client-utils.c:322
- msgid "802.1X supplicant failed"
- msgstr "802.1X 请求方失败"
-
--#: ../clients/common/nm-client-utils.c:289
-+#: ../clients/common/nm-client-utils.c:323
- msgid "802.1X supplicant took too long to authenticate"
- msgstr "802.1X 请求方验证时间过长"
-
--#: ../clients/common/nm-client-utils.c:290
-+#: ../clients/common/nm-client-utils.c:324
- msgid "PPP service failed to start"
- msgstr "PPP 服务无法启动"
-
--#: ../clients/common/nm-client-utils.c:291
-+#: ../clients/common/nm-client-utils.c:325
- 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:292
-+#: ../clients/common/nm-client-utils.c:326
- msgid "PPP failed"
- msgstr "PPP 失败"
-
--#: ../clients/common/nm-client-utils.c:293
-+#: ../clients/common/nm-client-utils.c:327
- 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:294
-+#: ../clients/common/nm-client-utils.c:328
- msgid "DHCP client error"
- msgstr "DHCP 客户端错误"
-
--#: ../clients/common/nm-client-utils.c:295
-+#: ../clients/common/nm-client-utils.c:329
- msgid "DHCP client failed"
- msgstr "DHCP 客户端失败"
-
--#: ../clients/common/nm-client-utils.c:296
-+#: ../clients/common/nm-client-utils.c:330
- msgid "Shared connection service failed to start"
- msgstr "共享连接服务启动失败"
-
--#: ../clients/common/nm-client-utils.c:297
-+#: ../clients/common/nm-client-utils.c:331
- msgid "Shared connection service failed"
- msgstr "共享连接服务失败"
-
--#: ../clients/common/nm-client-utils.c:298
-+#: ../clients/common/nm-client-utils.c:332
- msgid "AutoIP service failed to start"
- msgstr "自动 IP（AutoIP）服务无法启动"
-
--#: ../clients/common/nm-client-utils.c:299
-+#: ../clients/common/nm-client-utils.c:333
- msgid "AutoIP service error"
- msgstr "自动 IP（AutoIP）服务出错"
-
--#: ../clients/common/nm-client-utils.c:300
-+#: ../clients/common/nm-client-utils.c:334
- msgid "AutoIP service failed"
- msgstr "自动 IP（AutoIP）服务失败"
-
--#: ../clients/common/nm-client-utils.c:301
-+#: ../clients/common/nm-client-utils.c:335
- msgid "The line is busy"
- msgstr "线路正忙"
-
--#: ../clients/common/nm-client-utils.c:302
-+#: ../clients/common/nm-client-utils.c:336
- msgid "No dial tone"
- msgstr "无拨号音"
-
--#: ../clients/common/nm-client-utils.c:303
-+#: ../clients/common/nm-client-utils.c:337
- msgid "No carrier could be established"
- msgstr "无法建立载波"
-
--#: ../clients/common/nm-client-utils.c:304
-+#: ../clients/common/nm-client-utils.c:338
- msgid "The dialing request timed out"
- msgstr "拨号请求超时"
-
--#: ../clients/common/nm-client-utils.c:305
-+#: ../clients/common/nm-client-utils.c:339
- msgid "The dialing attempt failed"
- msgstr "拨号尝试失败"
-
--#: ../clients/common/nm-client-utils.c:306
-+#: ../clients/common/nm-client-utils.c:340
- msgid "Modem initialization failed"
- msgstr "调制解调器初始化失败"
-
--#: ../clients/common/nm-client-utils.c:307
-+#: ../clients/common/nm-client-utils.c:341
- msgid "Failed to select the specified APN"
- msgstr "无法选择指定的 APN"
-
--#: ../clients/common/nm-client-utils.c:308
-+#: ../clients/common/nm-client-utils.c:342
- msgid "Not searching for networks"
- msgstr "不搜索网络"
-
--#: ../clients/common/nm-client-utils.c:309
-+#: ../clients/common/nm-client-utils.c:343
- msgid "Network registration denied"
- msgstr "网络注册遭拒绝"
-
--#: ../clients/common/nm-client-utils.c:310
-+#: ../clients/common/nm-client-utils.c:344
- msgid "Network registration timed out"
- msgstr "网络注册超时"
-
--#: ../clients/common/nm-client-utils.c:311
-+#: ../clients/common/nm-client-utils.c:345
- msgid "Failed to register with the requested network"
- msgstr "注册请求的网络失败"
-
--#: ../clients/common/nm-client-utils.c:312
-+#: ../clients/common/nm-client-utils.c:346
- msgid "PIN check failed"
- msgstr "PIN 检查失败"
-
--#: ../clients/common/nm-client-utils.c:313
-+#: ../clients/common/nm-client-utils.c:347
- msgid "Necessary firmware for the device may be missing"
- msgstr "该设备所需固件可能缺失"
-
--#: ../clients/common/nm-client-utils.c:314
-+#: ../clients/common/nm-client-utils.c:348
- msgid "The device was removed"
- msgstr "设备已被移除"
-
--#: ../clients/common/nm-client-utils.c:315
-+#: ../clients/common/nm-client-utils.c:349
- msgid "NetworkManager went to sleep"
- msgstr "网络管理器已挂起"
-
--#: ../clients/common/nm-client-utils.c:316
-+#: ../clients/common/nm-client-utils.c:350
- msgid "The device's active connection disappeared"
- msgstr "设备的活动连接已消失"
-
--#: ../clients/common/nm-client-utils.c:317
-+#: ../clients/common/nm-client-utils.c:351
- msgid "Device disconnected by user or client"
- msgstr "用户或客户端断开了设备连接"
-
--#: ../clients/common/nm-client-utils.c:318
-+#: ../clients/common/nm-client-utils.c:352
- msgid "Carrier/link changed"
- msgstr "载波/链路已更改"
-
--#: ../clients/common/nm-client-utils.c:319
-+#: ../clients/common/nm-client-utils.c:353
- msgid "The device's existing connection was assumed"
- msgstr "假定设备已有连接"
-
--#: ../clients/common/nm-client-utils.c:320
-+#: ../clients/common/nm-client-utils.c:354
- msgid "The supplicant is now available"
- msgstr "客户端目前可用"
-
--#: ../clients/common/nm-client-utils.c:321
-+#: ../clients/common/nm-client-utils.c:355
- msgid "The modem could not be found"
- msgstr "未找到调制解调器"
-
--#: ../clients/common/nm-client-utils.c:322
-+#: ../clients/common/nm-client-utils.c:356
- msgid "The Bluetooth connection failed or timed out"
- msgstr "蓝牙连接失败或超时"
-
--#: ../clients/common/nm-client-utils.c:323
-+#: ../clients/common/nm-client-utils.c:357
- msgid "GSM Modem's SIM card not inserted"
- msgstr "GSM 调制解调器的 SIM 卡未插入"
-
--#: ../clients/common/nm-client-utils.c:324
-+#: ../clients/common/nm-client-utils.c:358
- msgid "GSM Modem's SIM PIN required"
- msgstr "GSM 调制解调器的 SIM 需要 PIN 码"
-
--#: ../clients/common/nm-client-utils.c:325
-+#: ../clients/common/nm-client-utils.c:359
- msgid "GSM Modem's SIM PUK required"
- msgstr "GSM 调制解调器的 SIM 需要 PUK 码"
-
--#: ../clients/common/nm-client-utils.c:326
-+#: ../clients/common/nm-client-utils.c:360
- msgid "GSM Modem's SIM wrong"
- msgstr "GSM 调制解调器的 SIM 错误"
-
--#: ../clients/common/nm-client-utils.c:327
-+#: ../clients/common/nm-client-utils.c:361
- msgid "InfiniBand device does not support connected mode"
- msgstr "InfiniBand 设备不支持已连接的模式"
-
--#: ../clients/common/nm-client-utils.c:328
-+#: ../clients/common/nm-client-utils.c:362
- msgid "A dependency of the connection failed"
- msgstr "连接的依赖关系失败"
-
--#: ../clients/common/nm-client-utils.c:329
-+#: ../clients/common/nm-client-utils.c:363
- msgid "A problem with the RFC 2684 Ethernet over ADSL bridge"
- msgstr "ADSL 网桥上的 RFC 2684 以太网出现问题"
-
--#: ../clients/common/nm-client-utils.c:330
-+#: ../clients/common/nm-client-utils.c:364
- msgid "ModemManager is unavailable"
- msgstr "ModemManager 不可用"
-
--#: ../clients/common/nm-client-utils.c:331
-+#: ../clients/common/nm-client-utils.c:365
- msgid "The Wi-Fi network could not be found"
- msgstr "未找到 Wi-Fi 网络"
-
--#: ../clients/common/nm-client-utils.c:332
-+#: ../clients/common/nm-client-utils.c:366
- msgid "A secondary connection of the base connection failed"
- msgstr "基础连接的次级连接失败"
-
--#: ../clients/common/nm-client-utils.c:333
-+#: ../clients/common/nm-client-utils.c:367
- msgid "DCB or FCoE setup failed"
- msgstr "DCB 或 FCoE 设置失败"
-
--#: ../clients/common/nm-client-utils.c:334
-+#: ../clients/common/nm-client-utils.c:368
- 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:335
-+#: ../clients/common/nm-client-utils.c:369
- 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:336
-+#: ../clients/common/nm-client-utils.c:370
- msgid "Modem now ready and available"
- msgstr "调制解调器现已就绪且可用"
-
--#: ../clients/common/nm-client-utils.c:337
-+#: ../clients/common/nm-client-utils.c:371
- msgid "SIM PIN was incorrect"
- msgstr "SIM PIN 不正确"
-
--#: ../clients/common/nm-client-utils.c:338
-+#: ../clients/common/nm-client-utils.c:372
- msgid "New connection activation was enqueued"
- msgstr "新连接激活已排队"
-
--#: ../clients/common/nm-client-utils.c:339
-+#: ../clients/common/nm-client-utils.c:373
- msgid "The device's parent changed"
- msgstr "设备的上级已更改"
-
--#: ../clients/common/nm-client-utils.c:340
-+#: ../clients/common/nm-client-utils.c:374
- msgid "The device parent's management changed"
- msgstr "设备的上级管理已更改"
-
--#: ../clients/common/nm-client-utils.c:341
-+#: ../clients/common/nm-client-utils.c:375
- msgid "Open vSwitch database connection failed"
- msgstr "Open vSwitch 数据库连接失败"
-
--#: ../clients/common/nm-client-utils.c:342
-+#: ../clients/common/nm-client-utils.c:376
- msgid "A duplicate IP address was detected"
- msgstr "检测到重复的 IP 地址"
-
--#: ../clients/common/nm-client-utils.c:343
-+#: ../clients/common/nm-client-utils.c:377
- msgid "The selected IP method is not supported"
- msgstr "选中的 IP 方法未支持"
-
--#: ../clients/common/nm-client-utils.c:344
-+#: ../clients/common/nm-client-utils.c:378
- msgid "Failed to configure SR-IOV parameters"
- msgstr "配置 SR-IOV 参数失败"
-
--#: ../clients/common/nm-client-utils.c:345
-+#: ../clients/common/nm-client-utils.c:379
- msgid "The Wi-Fi P2P peer could not be found"
- msgstr "无法找到 Wi-Fi P2P peer"
-
--#: ../clients/common/nm-client-utils.c:351
-+#: ../clients/common/nm-client-utils.c:385
- msgid "Unknown reason"
- msgstr "未知原因"
-
--#: ../clients/common/nm-client-utils.c:352
-+#: ../clients/common/nm-client-utils.c:386
- msgid "The connection was disconnected"
- msgstr "连接已断开"
-
--#: ../clients/common/nm-client-utils.c:353
-+#: ../clients/common/nm-client-utils.c:387
- msgid "Disconnected by user"
- msgstr "已被用户断开连接"
-
--#: ../clients/common/nm-client-utils.c:354
-+#: ../clients/common/nm-client-utils.c:388
- msgid "The base network connection was interrupted"
- msgstr "基础网络连接已中断"
-
--#: ../clients/common/nm-client-utils.c:355
-+#: ../clients/common/nm-client-utils.c:389
- msgid "The VPN service stopped unexpectedly"
- msgstr "VPN 服务意外停止"
-
--#: ../clients/common/nm-client-utils.c:356
-+#: ../clients/common/nm-client-utils.c:390
- msgid "The VPN service returned invalid configuration"
- msgstr "VPN 服务返回了无效配置"
-
--#: ../clients/common/nm-client-utils.c:357
-+#: ../clients/common/nm-client-utils.c:391
- msgid "The connection attempt timed out"
- msgstr "连接尝试超时"
-
--#: ../clients/common/nm-client-utils.c:358
-+#: ../clients/common/nm-client-utils.c:392
- msgid "The VPN service did not start in time"
- msgstr "VPN 连接没有及时启动"
-
--#: ../clients/common/nm-client-utils.c:359
-+#: ../clients/common/nm-client-utils.c:393
- msgid "The VPN service failed to start"
- msgstr "VPN 服务启动失败"
-
--#: ../clients/common/nm-client-utils.c:360
-+#: ../clients/common/nm-client-utils.c:394
- msgid "No valid secrets"
- msgstr "没有有效的密钥"
-
--#: ../clients/common/nm-client-utils.c:361
-+#: ../clients/common/nm-client-utils.c:395
- msgid "Invalid secrets"
- msgstr "无效的密钥"
-
--#: ../clients/common/nm-client-utils.c:362
-+#: ../clients/common/nm-client-utils.c:396
- msgid "The connection was removed"
- msgstr "连接已被移除"
-
--#: ../clients/common/nm-client-utils.c:363
-+#: ../clients/common/nm-client-utils.c:397
- msgid "Master connection failed"
- msgstr "主连接失败"
-
--#: ../clients/common/nm-client-utils.c:364
-+#: ../clients/common/nm-client-utils.c:398
- msgid "Could not create a software link"
- msgstr "无法创建软件链路："
-
--#: ../clients/common/nm-client-utils.c:365
-+#: ../clients/common/nm-client-utils.c:399
- msgid "The device disappeared"
- msgstr "设备已消失"
-
-+#: ../clients/common/nm-client-utils.c:722
-+msgid "missing colon for \"<setting>.<property>:<secret>\" format"
-+msgstr "缺少 \"<setting>.<property>:<secret>\" 格式中的冒号"
-+
-+#: ../clients/common/nm-client-utils.c:738
-+msgid "missing dot for \"<setting>.<property>:<secret>\" format"
-+msgstr "缺少 \"<setting>.<property>:<secret>\" 格式中的点"
-+
-+#: ../clients/common/nm-client-utils.c:743
-+msgid "missing setting for \"<setting>.<property>:<secret>\" format"
-+msgstr "缺少 \"<setting>.<property>:<secret>\" 格式的设置"
-+
-+#: ../clients/common/nm-client-utils.c:753
-+msgid "missing property for \"<setting>.<property>:<secret>\" format"
-+msgstr "缺少 \"<setting>.<property>:<secret>\" 格式的属性"
-+
-+#: ../clients/common/nm-client-utils.c:764
-+msgid "invalid setting name"
-+msgstr "无效的设置名称"
-+
-+#: ../clients/common/nm-client-utils.c:780
-+msgid "property name is not UTF-8"
-+msgstr "属性名不是UTF-8"
-+
-+#: ../clients/common/nm-client-utils.c:795
-+#: ../clients/common/nm-client-utils.c:802
-+msgid "secret is not UTF-8"
-+msgstr "secret 不是 UTF-8"
-+
- #: ../clients/common/nm-meta-setting-access.c:496
- #, c-format
- msgid "field '%s' has to be alone"
-@@ -4344,206 +4414,208 @@ msgstr "字段 \"%s\" 必须是单独的"
- 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:297
--#: ../clients/common/nm-meta-setting-desc.c:358
-+#: ../clients/common/nm-meta-setting-desc.c:276
-+#: ../clients/common/nm-meta-setting-desc.c:337
- #, c-format
- msgid "invalid prefix '%s'; <1-%d> allowed"
- msgstr "无效的前缀 '%s'; 只允许 <1-%d>"
-
--#: ../clients/common/nm-meta-setting-desc.c:305
-+#: ../clients/common/nm-meta-setting-desc.c:284
- #, c-format
- msgid "invalid IP address: %s"
- msgstr "无效的 IP 地址：%s"
-
--#: ../clients/common/nm-meta-setting-desc.c:330
-+#: ../clients/common/nm-meta-setting-desc.c:309
- msgid ""
- "The valid syntax is: 'ip[/prefix] [next-hop] [metric] [attribute=val]... [,"
- "ip[/prefix] ...]'"
- msgstr "有效语法为：\"ip[/prefix] [next-hop] [metric] [attribute=val]... [,ip[/prefix] ...]\""
-
--#: ../clients/common/nm-meta-setting-desc.c:369
-+#: ../clients/common/nm-meta-setting-desc.c:348
- #, c-format
- msgid "the next hop ('%s') must be first"
- msgstr "下一跳（\"%s\"）必须在首位"
-
--#: ../clients/common/nm-meta-setting-desc.c:375
-+#: ../clients/common/nm-meta-setting-desc.c:354
- #, c-format
- msgid "the metric ('%s') must be before attributes"
- msgstr "跃点数（\"%s\"）必需在属性前"
-
--#: ../clients/common/nm-meta-setting-desc.c:423
-+#: ../clients/common/nm-meta-setting-desc.c:402
- #, c-format
- msgid "invalid route: %s. %s"
- msgstr "无效路由：%s。%s"
-
--#: ../clients/common/nm-meta-setting-desc.c:489
-+#: ../clients/common/nm-meta-setting-desc.c:468
- #, c-format
- msgid "cannot read pac-script from file '%s'"
- msgstr "无法从文件 \"%s\" 读取 PAC 脚本"
-
--#: ../clients/common/nm-meta-setting-desc.c:496
-+#: ../clients/common/nm-meta-setting-desc.c:475
- #, c-format
- msgid "file '%s' contains non-valid utf-8"
- msgstr "文件 \"%s\" 包含无效的 utf-8"
-
--#: ../clients/common/nm-meta-setting-desc.c:509
-+#: ../clients/common/nm-meta-setting-desc.c:488
- #, c-format
- msgid "'%s' does not contain a valid PAC Script"
- msgstr "\"%s\" 没有包含有效的 PAC 脚本"
-
--#: ../clients/common/nm-meta-setting-desc.c:512
-+#: ../clients/common/nm-meta-setting-desc.c:491
- #, c-format
- msgid "Not a valid PAC Script"
- msgstr "不是有效的 PAC 脚本"
-
--#: ../clients/common/nm-meta-setting-desc.c:565
-+#: ../clients/common/nm-meta-setting-desc.c:544
- #, c-format
- msgid "cannot read team config from file '%s'"
- msgstr "无法从文件 \"%s\" 读取组合（team）配置"
-
--#: ../clients/common/nm-meta-setting-desc.c:572
-+#: ../clients/common/nm-meta-setting-desc.c:551
- #, c-format
- msgid "team config file '%s' contains non-valid utf-8"
- msgstr "组合（team）配置文件 \"%s\" 包含无效的 utf-8"
-
--#: ../clients/common/nm-meta-setting-desc.c:1029
-+#: ../clients/common/nm-meta-setting-desc.c:1036
- msgid "auto"
- msgstr "自动"
-
--#: ../clients/common/nm-meta-setting-desc.c:1181
-+#: ../clients/common/nm-meta-setting-desc.c:1188
- #, c-format
- msgid "%s (%s)"
- msgstr "%s（%s）"
-
--#: ../clients/common/nm-meta-setting-desc.c:1329
--#: ../clients/common/nm-meta-setting-desc.c:1333
-+#: ../clients/common/nm-meta-setting-desc.c:1352
-+#: ../clients/common/nm-meta-setting-desc.c:1356
-+#: ../clients/common/nm-meta-setting-desc.c:4153
- msgid "'%s' is out of range [%"
- msgstr "'%s' 超出范围 [%"
-
--#: ../clients/common/nm-meta-setting-desc.c:1338
-+#: ../clients/common/nm-meta-setting-desc.c:1361
- #, c-format
- msgid "'%s' is not a valid number"
- msgstr "\"%s\" 不是有效的数字"
-
--#: ../clients/common/nm-meta-setting-desc.c:1395
-+#: ../clients/common/nm-meta-setting-desc.c:1418
- #, c-format
- msgid "'%s' is out of range [0, %u]"
- msgstr "\"%s\" 超出范围 [0, %u]"
-
--#: ../clients/common/nm-meta-setting-desc.c:1441
-+#: ../clients/common/nm-meta-setting-desc.c:1464
- #, c-format
- msgid "'%s' is not a valid Ethernet MAC"
- msgstr "\"%s\" 不是有效的以太网 MAC"
-
--#: ../clients/common/nm-meta-setting-desc.c:1567
-+#: ../clients/common/nm-meta-setting-desc.c:1590
- #, c-format
- msgid "invalid option '%s', use a combination of [%s]"
- msgstr "无效选项 \"%s\"，请使用 [%s] 的组合"
-
--#: ../clients/common/nm-meta-setting-desc.c:1572 ../libnm-core/nm-keyfile.c:926
-+#: ../clients/common/nm-meta-setting-desc.c:1595
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1076
- #, c-format
- msgid "invalid option '%s', use one of [%s]"
- msgstr "无效选项 \"%s\"，请使用 [%s] 中的一个。"
-
--#: ../clients/common/nm-meta-setting-desc.c:1691
-+#: ../clients/common/nm-meta-setting-desc.c:1714
- #, c-format
- msgid "%d (key)"
- msgstr "%d（密钥）"
-
--#: ../clients/common/nm-meta-setting-desc.c:1693
-+#: ../clients/common/nm-meta-setting-desc.c:1716
- #, c-format
- msgid "%d (passphrase)"
- msgstr "%d（密码）"
-
--#: ../clients/common/nm-meta-setting-desc.c:1696
-+#: ../clients/common/nm-meta-setting-desc.c:1719
- #, c-format
- msgid "%d (unknown)"
- msgstr "%d（未知）"
-
--#: ../clients/common/nm-meta-setting-desc.c:1709
-+#: ../clients/common/nm-meta-setting-desc.c:1732
- msgid "0 (NONE)"
- msgstr "0（无）"
-
--#: ../clients/common/nm-meta-setting-desc.c:1715
-+#: ../clients/common/nm-meta-setting-desc.c:1738
- msgid "REORDER_HEADERS, "
- msgstr "记录头、 "
-
--#: ../clients/common/nm-meta-setting-desc.c:1717
-+#: ../clients/common/nm-meta-setting-desc.c:1740
- msgid "GVRP, "
- msgstr "GVRP、 "
-
--#: ../clients/common/nm-meta-setting-desc.c:1719
-+#: ../clients/common/nm-meta-setting-desc.c:1742
- msgid "LOOSE_BINDING, "
- msgstr "松散绑定、 "
-
--#: ../clients/common/nm-meta-setting-desc.c:1721
-+#: ../clients/common/nm-meta-setting-desc.c:1744
- msgid "MVRP, "
- msgstr "MVRP、 "
-
--#: ../clients/common/nm-meta-setting-desc.c:1742
-+#: ../clients/common/nm-meta-setting-desc.c:1765
- msgid "0 (none)"
- msgstr "0（无）"
-
--#: ../clients/common/nm-meta-setting-desc.c:1748
-+#: ../clients/common/nm-meta-setting-desc.c:1771
- msgid "agent-owned, "
- msgstr "为代理拥有、 "
-
--#: ../clients/common/nm-meta-setting-desc.c:1750
-+#: ../clients/common/nm-meta-setting-desc.c:1773
- msgid "not saved, "
- msgstr "未保存、 "
-
--#: ../clients/common/nm-meta-setting-desc.c:1752
-+#: ../clients/common/nm-meta-setting-desc.c:1775
- msgid "not required, "
- msgstr "不必需、 "
-
--#: ../clients/common/nm-meta-setting-desc.c:1970
-+#: ../clients/common/nm-meta-setting-desc.c:1975
- #, c-format
- msgid "'%s' is not valid; use <option>=<value>"
- msgstr "'%s' 无效; 使用 <option>=<value>"
-
--#: ../clients/common/nm-meta-setting-desc.c:1980
-+#: ../clients/common/nm-meta-setting-desc.c:1985
- #, c-format
- msgid "cannot set empty \"%s\" option"
- msgstr "无法设定空的 %s 选项"
-
--#: ../clients/common/nm-meta-setting-desc.c:2039
-+#: ../clients/common/nm-meta-setting-desc.c:2044
- #, c-format
- msgid "'%u' flags are not valid; use combination of %s"
- msgstr "\"%u\" 标记无效；请使用 %s 的组合"
-
--#: ../clients/common/nm-meta-setting-desc.c:2056
-+#: ../clients/common/nm-meta-setting-desc.c:2061
- #, c-format
- msgid "'%s' is not a valid number (or out of range)"
- msgstr "\"%s\" 不是有效的数字（或超出范围）"
-
--#: ../clients/common/nm-meta-setting-desc.c:2077
--#: ../clients/common/nm-meta-setting-desc.c:4052
--#: ../libnm-core/nm-setting-ovs-bridge.c:183 ../src/nm-config.c:556
-+#: ../clients/common/nm-meta-setting-desc.c:2082
-+#: ../clients/common/nm-meta-setting-desc.c:4026
-+#: ../libnm-core/nm-setting-ovs-bridge.c:183 ../src/nm-config.c:549
- #, c-format
- msgid "'%s' is not valid"
- msgstr "\"%s\" 无效"
-
--#: ../clients/common/nm-meta-setting-desc.c:2174
-+#: ../clients/common/nm-meta-setting-desc.c:2177
- msgid "not a valid hex-string"
- msgstr "不是有效的 hex 字符串"
-
--#: ../clients/common/nm-meta-setting-desc.c:2190
-+#: ../clients/common/nm-meta-setting-desc.c:2193
- #, c-format
- msgid "'%s' is not a valid hex character"
- msgstr "\"%s\" 不是有效十六进制字符"
-
--#: ../clients/common/nm-meta-setting-desc.c:2269
-+#: ../clients/common/nm-meta-setting-desc.c:2272
- msgid ""
- "too many arguments. Please only specify a private key file and optionally a "
- "password"
- msgstr "参数太多。只能指定一个私钥或再指定一个可选的密码"
-
--#: ../clients/common/nm-meta-setting-desc.c:2376
-+#: ../clients/common/nm-meta-setting-desc.c:2387
- #, c-format
- msgid "failed to set bond option \"%s\""
- msgstr "设定绑定属性失败 %s"
-
--#: ../clients/common/nm-meta-setting-desc.c:2393
-+#: ../clients/common/nm-meta-setting-desc.c:2404
- #, c-format
- msgid ""
- "Enter a list of bonding options formatted as:\n"
-@@ -4580,125 +4652,120 @@ msgstr "输入绑定选项列表，格式为:\n"
- #. * 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:2458
-+#: ../clients/common/nm-meta-setting-desc.c:2469
- #, c-format
- msgid "Can not change the connection type"
- msgstr "无法更改连接类型"
-
--#: ../clients/common/nm-meta-setting-desc.c:2543
-+#: ../clients/common/nm-meta-setting-desc.c:2554
- #, c-format
- msgid "invalid permission \"%s\""
- msgstr "无效的权限 \"%s\""
-
--#: ../clients/common/nm-meta-setting-desc.c:2580
--#, c-format
--msgid "'%s' is not valid master; use ifname or connection UUID"
--msgstr "\"%s\" 不是有效的主连接；使用接口名或连接的 UUID"
--
--#: ../clients/common/nm-meta-setting-desc.c:2661
-+#: ../clients/common/nm-meta-setting-desc.c:2654
- #, c-format
- msgid "the value '%s' is not a valid UUID"
- msgstr "值 \"%s\" 不是有效的 UUID"
-
--#: ../clients/common/nm-meta-setting-desc.c:2732
-+#: ../clients/common/nm-meta-setting-desc.c:2725
- msgid "0 (disabled)"
- msgstr "0（禁用）"
-
--#: ../clients/common/nm-meta-setting-desc.c:2738
-+#: ../clients/common/nm-meta-setting-desc.c:2731
- msgid "enabled, "
- msgstr "启用、 "
-
--#: ../clients/common/nm-meta-setting-desc.c:2740
-+#: ../clients/common/nm-meta-setting-desc.c:2733
- msgid "advertise, "
- msgstr "通告、 "
-
--#: ../clients/common/nm-meta-setting-desc.c:2742
-+#: ../clients/common/nm-meta-setting-desc.c:2735
- msgid "willing, "
- msgstr "愿意、 "
-
--#: ../clients/common/nm-meta-setting-desc.c:2831
-+#: ../clients/common/nm-meta-setting-desc.c:2824
- #, c-format
- msgid "'%s' is not a valid DCB flag"
- msgstr "\"%s\" 不是有效的 DCB 标记"
-
--#: ../clients/common/nm-meta-setting-desc.c:2858
-+#: ../clients/common/nm-meta-setting-desc.c:2851
- msgid "must contain 8 comma-separated numbers"
- msgstr "必须包含 8 个用逗号分隔的数字"
-
--#: ../clients/common/nm-meta-setting-desc.c:2872
-+#: ../clients/common/nm-meta-setting-desc.c:2865
- #, 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:2875
-+#: ../clients/common/nm-meta-setting-desc.c:2868
- #, c-format
- msgid "'%s' not a number between 0 and %u (inclusive)"
- msgstr "\"%s\" 不是 0 和 %u（包括）之间的数字"
-
--#: ../clients/common/nm-meta-setting-desc.c:2896
-+#: ../clients/common/nm-meta-setting-desc.c:2889
- #, c-format
- msgid "changes will have no effect until '%s' includes 1 (enabled)"
- msgstr "除非 \"%s\" 包含 1（启用），否则更改无法生效"
-
--#: ../clients/common/nm-meta-setting-desc.c:2926
-+#: ../clients/common/nm-meta-setting-desc.c:2919
- #, c-format
- msgid "bandwidth percentages must total 100%%"
- msgstr "带宽百分比总和必须为 100%%"
-
--#: ../clients/common/nm-meta-setting-desc.c:2997
--#: ../clients/common/nm-meta-setting-desc.c:3003
-+#: ../clients/common/nm-meta-setting-desc.c:2990
-+#: ../clients/common/nm-meta-setting-desc.c:2996
- 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:3027
-+#: ../clients/common/nm-meta-setting-desc.c:3020
- #, c-format
- msgid "'%s' is not a valid IBoIP P_Key"
- msgstr "\"%s\" 不是有效的 IBoIP P_Key"
-
--#: ../clients/common/nm-meta-setting-desc.c:3050
-+#: ../clients/common/nm-meta-setting-desc.c:3043
- msgid "default"
- msgstr "默认"
-
--#: ../clients/common/nm-meta-setting-desc.c:3214
-+#: ../clients/common/nm-meta-setting-desc.c:3207
- #, c-format
- msgid "invalid IPv%c address '%s'"
- msgstr "无效的 IPv%c 地址 '%s'"
-
--#: ../clients/common/nm-meta-setting-desc.c:3341
-+#: ../clients/common/nm-meta-setting-desc.c:3334
- #, c-format
- msgid "invalid gateway address '%s'"
- msgstr "无效的网关地址 \"%s\""
-
--#: ../clients/common/nm-meta-setting-desc.c:3491
-+#: ../clients/common/nm-meta-setting-desc.c:3461
- #, c-format
- msgid "'%s' is not a valid channel; use <1-13>"
- msgstr "'%s' 不是一个有效的 channel; 使用 <1-13>"
-
--#: ../clients/common/nm-meta-setting-desc.c:3571
-+#: ../clients/common/nm-meta-setting-desc.c:3541
- 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:3595
--#: ../clients/common/nm-meta-setting-desc.c:3675
-+#: ../clients/common/nm-meta-setting-desc.c:3565
-+#: ../clients/common/nm-meta-setting-desc.c:3645
- msgid ""
- "The valid syntax is: '[root | parent <handle>] [handle <handle>] <kind>'"
- msgstr "正确语法为：'[root | parent <handle>] [handle <handle>] <kind>'"
-
--#: ../clients/common/nm-meta-setting-desc.c:3620
-+#: ../clients/common/nm-meta-setting-desc.c:3590
- msgid "The valid syntax is: '<vid>[-<vid>] [pvid] [untagged]'"
- msgstr "正确语法为：'<vid>[-<vid>] [pvid] [untagged]'"
-
--#: ../clients/common/nm-meta-setting-desc.c:3816
-+#: ../clients/common/nm-meta-setting-desc.c:3786
- #, c-format
- msgid "invalid priority map '%s'"
- msgstr "无效的优先级映射 \"%s\""
-
--#: ../clients/common/nm-meta-setting-desc.c:3904
-+#: ../clients/common/nm-meta-setting-desc.c:3878
- #, c-format
- msgid "'%s' is not valid; 2 or 3 strings should be provided"
- msgstr "\"%s\" 无效；应提供两至三个字符串"
-
--#: ../clients/common/nm-meta-setting-desc.c:3943
-+#: ../clients/common/nm-meta-setting-desc.c:3917
- #, c-format
- msgid ""
- "Enter a list of S/390 options formatted as:\n"
-@@ -4708,90 +4775,90 @@ msgstr "输入 S/390 选项列表，格式为:\n"
- " option = <value>, option = <value>,...\n"
- "有效选项为: %s\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:3978
-+#: ../clients/common/nm-meta-setting-desc.c:3952
- #, c-format
- msgid "'%s' is not a valid channel"
- msgstr "\"%s\" 不是有效的信道"
-
--#: ../clients/common/nm-meta-setting-desc.c:3984
-+#: ../clients/common/nm-meta-setting-desc.c:3958
- #, c-format
- msgid "'%ld' is not a valid channel"
- msgstr "\"%ld\" 不是有效的信道"
-
--#: ../clients/common/nm-meta-setting-desc.c:4001
--#: ../libnm-core/nm-setting-sriov.c:434 ../libnm-core/nm-setting-wired.c:758
-+#: ../clients/common/nm-meta-setting-desc.c:3975
-+#: ../libnm-core/nm-setting-sriov.c:438 ../libnm-core/nm-setting-wired.c:758
- #: ../libnm-core/nm-setting-wired.c:771 ../libnm-core/nm-setting-wired.c:824
--#: ../libnm-core/nm-setting-wired.c:867 ../libnm-core/nm-setting-wireless.c:876
--#: ../libnm-core/nm-setting-wireless.c:892
-+#: ../libnm-core/nm-setting-wired.c:867 ../libnm-core/nm-setting-wireless.c:881
-+#: ../libnm-core/nm-setting-wireless.c:897
- #, c-format
- msgid "'%s' is not a valid MAC address"
- msgstr "\"%s\" 不是有效的 MAC 地址"
-
--#: ../clients/common/nm-meta-setting-desc.c:4061
-+#: ../clients/common/nm-meta-setting-desc.c:4035
- #, 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:4071
-+#: ../clients/common/nm-meta-setting-desc.c:4045
- #, c-format
- msgid "WEP key is guessed to be of '%s'"
- msgstr "猜测 WEP 密钥为 \"%s\" 类型"
-
--#: ../clients/common/nm-meta-setting-desc.c:4076
-+#: ../clients/common/nm-meta-setting-desc.c:4050
- #, c-format
- msgid "WEP key index set to '%d'"
- msgstr "WEP 密钥索引已设为 \"%d\""
-
--#: ../clients/common/nm-meta-setting-desc.c:4115
-+#: ../clients/common/nm-meta-setting-desc.c:4089
- #, 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:4172
-+#: ../clients/common/nm-meta-setting-desc.c:4175
- #, c-format
- msgid "'%s' is not valid; use 'on', 'off', or 'ignore'"
- msgstr "\"%s\" 无效；请使用 \"on\"、\"off\" 或 \"ignore\""
-
--#: ../clients/common/nm-meta-setting-desc.c:4232
-+#: ../clients/common/nm-meta-setting-desc.c:4244
- msgid "Bonding primary interface [none]"
- msgstr "绑定主要接口 [无]"
-
- #. this is a virtual property, only needed during "ask" mode.
--#: ../clients/common/nm-meta-setting-desc.c:4239
-+#: ../clients/common/nm-meta-setting-desc.c:4251
- 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:4248
-+#: ../clients/common/nm-meta-setting-desc.c:4260
- msgid "Bonding miimon [100]"
- msgstr "绑定 miimon [100]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4256
-+#: ../clients/common/nm-meta-setting-desc.c:4268
- msgid "Bonding downdelay [0]"
- msgstr "绑定 downdelay [0]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4264
-+#: ../clients/common/nm-meta-setting-desc.c:4276
- msgid "Bonding updelay [0]"
- msgstr "绑定 updelay [0]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4272
-+#: ../clients/common/nm-meta-setting-desc.c:4284
- msgid "Bonding arp-interval [0]"
- msgstr "绑定 arp-interval [0]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4280
-+#: ../clients/common/nm-meta-setting-desc.c:4292
- msgid "Bonding arp-ip-target [none]"
- msgstr "绑定 arp-ip-target [none]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4288
-+#: ../clients/common/nm-meta-setting-desc.c:4300
- msgid "LACP rate ('slow' or 'fast') [slow]"
- msgstr "LACP 速率（\"slow\" 或 \"fast\"）[slow]"
-
- #. macro that returns @func as const (guint32(*)(NMSetting*)) type, but checks
- #. * that the actual type is (guint32(*)(type *)).
--#: ../clients/common/nm-meta-setting-desc.c:4455
-+#: ../clients/common/nm-meta-setting-desc.c:4467
- 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 "
-@@ -4805,7 +4872,7 @@ msgstr "nmcli 可接受直接 JSON 配置数据和包含该配置的文件名。
- "例如：set team.config { \"device\": \"team0\", \"runner\": {\"name\": \"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n"
- " set team.config /etc/my-team.conf\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:4463
-+#: ../clients/common/nm-meta-setting-desc.c:4475
- 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 "
-@@ -4846,11 +4913,11 @@ msgstr "输入链路监视器列表，其格式为键值是 teamd 属性的字
- "示例：\n"
- " name=arp_ping source-host=172.16.1.1 target-host=172.16.1.254, name=ethtool delay-up=3\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:4496
-+#: ../clients/common/nm-meta-setting-desc.c:4524
- 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:4532
-+#: ../clients/common/nm-meta-setting-desc.c:4560
- msgid ""
- "Enter file path to CA certificate (optionally prefixed with file://).\n"
- " [file://]<file path>\n"
-@@ -4861,7 +4928,7 @@ msgstr "输入 CA 证书的文件路径（前缀可选择 file://）。\n"
- "请注意，nmcli 不支持将证书指定为原始比特块（blob）数据。\n"
- "示例：/home/cimrman/cacert.crt\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:4571
-+#: ../clients/common/nm-meta-setting-desc.c:4602
- msgid ""
- "Enter file path to client certificate (optionally prefixed with file://).\n"
- " [file://]<file path>\n"
-@@ -4872,7 +4939,7 @@ msgstr "输入客户证书的文件路径（前缀可选择 file://）。\n"
- "请注意，nmcli 不支持将证书指定为原始比特块（blob）数据。\n"
- "示例：/home/cimrman/jara.crt\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:4628
-+#: ../clients/common/nm-meta-setting-desc.c:4659
- msgid ""
- "Enter file path to CA certificate for inner authentication (optionally "
- "prefixed\n"
-@@ -4885,7 +4952,7 @@ msgstr "输入内部验证的 CA 证书的文件路径（前缀可选择 file://
- "请注意，nmcli 不支持将证书指定为原始比特块（blob）数据。\n"
- "示例：/home/cimrman/ca-zweite-phase.crt\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:4668
-+#: ../clients/common/nm-meta-setting-desc.c:4702
- msgid ""
- "Enter file path to client certificate for inner authentication (optionally "
- "prefixed\n"
-@@ -4898,7 +4965,7 @@ msgstr "输入内部验证的客户证书的文件路径（前缀可选择 file:
- "请注意，nmcli 不支持将证书指定为原始比特块（blob）数据。\n"
- "示例：/home/cimrman/jara-zweite-phase.crt\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:4695
-+#: ../clients/common/nm-meta-setting-desc.c:4729
- msgid ""
- "Enter bytes as a list of hexadecimal values.\n"
- "Two formats are accepted:\n"
-@@ -4917,8 +4984,8 @@ msgstr "输入十六进制值列表。\n"
- "例如：ab0455a6ea3a74C2\n"
- " ab 4 55 0xa6 ea 3a 74 C2\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:4712
--#: ../clients/common/nm-meta-setting-desc.c:4730
-+#: ../clients/common/nm-meta-setting-desc.c:4746
-+#: ../clients/common/nm-meta-setting-desc.c:4764
- msgid ""
- "Enter path to a private key and the key password (if not set yet):\n"
- " [file://]<file path> [<password>]\n"
-@@ -4929,84 +4996,84 @@ msgstr "输入私有密钥和密钥密码的路径（如果还没有设置）：
- "请注意，nmcli 不支持将私有密钥指定为原始比特块（blob）数据。\n"
- "示例：/home/cimrman/jara-priv-key Dardanely\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:4769
-+#: ../clients/common/nm-meta-setting-desc.c:4803
- #: ../clients/common/nm-secret-agent-simple.c:268
- #: ../clients/common/nm-secret-agent-simple.c:356
--#: ../clients/tui/nmt-page-dsl.c:53 ../clients/tui/nmt-page-wifi.c:321
-+#: ../clients/tui/nmt-page-dsl.c:53 ../clients/tui/nmt-page-wifi.c:322
- msgid "Username"
- msgstr "用户名"
-
--#: ../clients/common/nm-meta-setting-desc.c:4775
--#: ../clients/common/nm-meta-setting-desc.c:4990
--#: ../clients/common/nm-meta-setting-desc.c:5385
--#: ../clients/common/nm-meta-setting-desc.c:6328
-+#: ../clients/common/nm-meta-setting-desc.c:4809
-+#: ../clients/common/nm-meta-setting-desc.c:5093
-+#: ../clients/common/nm-meta-setting-desc.c:5520
-+#: ../clients/common/nm-meta-setting-desc.c:6492
- msgid "Password [none]"
- msgstr "密码 [无]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4821
-+#: ../clients/common/nm-meta-setting-desc.c:4855
- msgid "Bluetooth device address"
- msgstr "蓝牙设备地址"
-
--#: ../clients/common/nm-meta-setting-desc.c:4869
--#: ../clients/common/nm-meta-setting-desc.c:5438
--#: ../clients/common/nm-meta-setting-desc.c:7024
--#: ../clients/common/nm-meta-setting-desc.c:7062
--#: ../clients/common/nm-meta-setting-desc.c:7244
--#: ../clients/common/nm-meta-setting-desc.c:7474
-+#: ../clients/common/nm-meta-setting-desc.c:4903
-+#: ../clients/common/nm-meta-setting-desc.c:5573
-+#: ../clients/common/nm-meta-setting-desc.c:7200
-+#: ../clients/common/nm-meta-setting-desc.c:7238
-+#: ../clients/common/nm-meta-setting-desc.c:7420
-+#: ../clients/common/nm-meta-setting-desc.c:7650
- msgid "MAC [none]"
- msgstr "MAC [无]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4875
-+#: ../clients/common/nm-meta-setting-desc.c:4909
- msgid "Enable STP [no]"
- msgstr "启用 STP [否]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4881
-+#: ../clients/common/nm-meta-setting-desc.c:4915
- msgid "STP priority [32768]"
- msgstr "STP 优先级 [32768]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4887
-+#: ../clients/common/nm-meta-setting-desc.c:4921
- msgid "Forward delay [15]"
- msgstr "转发延时 [15]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4893
-+#: ../clients/common/nm-meta-setting-desc.c:4927
- msgid "Hello time [2]"
- msgstr "呼叫时间 [2]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4899
-+#: ../clients/common/nm-meta-setting-desc.c:4933
- msgid "Max age [20]"
- msgstr "最大寿命 [20]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4905
-+#: ../clients/common/nm-meta-setting-desc.c:4939
- msgid "MAC address ageing time [300]"
- msgstr "MAC 地址老化时间 [300]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4911
-+#: ../clients/common/nm-meta-setting-desc.c:4949
- msgid "Group forward mask [0]"
- msgstr "组前向掩码 [0]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4917
-+#: ../clients/common/nm-meta-setting-desc.c:4991
- msgid "Enable IGMP snooping [no]"
- msgstr "启用 IGMP 监听 [否]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4946
-+#: ../clients/common/nm-meta-setting-desc.c:5049
- msgid "Bridge port priority [32]"
- msgstr "网桥端口优先级 [32]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4952
-+#: ../clients/common/nm-meta-setting-desc.c:5055
- msgid "Bridge port STP path cost [100]"
- msgstr "网桥端口 STP 路径开销 [100]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4958
-+#: ../clients/common/nm-meta-setting-desc.c:5061
- msgid "Hairpin [no]"
- msgstr "Hairpin [否]"
-
--#: ../clients/common/nm-meta-setting-desc.c:4984
--#: ../clients/common/nm-meta-setting-desc.c:5379
--#: ../clients/common/nm-meta-setting-desc.c:6882
-+#: ../clients/common/nm-meta-setting-desc.c:5087
-+#: ../clients/common/nm-meta-setting-desc.c:5514
-+#: ../clients/common/nm-meta-setting-desc.c:7046
- msgid "Username [none]"
- msgstr "用户名 [无]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5086
-+#: ../clients/common/nm-meta-setting-desc.c:5189
- msgid ""
- "Enter a list of user permissions. This is a list of user names formatted "
- "as:\n"
-@@ -5020,7 +5087,7 @@ msgstr "输入用户权限列表。这个列表的用户名格式为：\n"
- "\n"
- "例如：alice bob charlie\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5138
-+#: ../clients/common/nm-meta-setting-desc.c:5242
- msgid ""
- "Enter secondary connections that should be activated when this connection "
- "is\n"
-@@ -5037,7 +5104,7 @@ msgstr "输入当这个连接激活时应该被激活的次级连接。连接可
- "\n"
- "示例：private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5161
-+#: ../clients/common/nm-meta-setting-desc.c:5265
- 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"
-@@ -5050,25 +5117,25 @@ msgstr "输入的值表示连接是否有数据配额、使用成本或其他限
- "\"false\"、\"no\"、\"off\"，设置连接为不计流量的\n"
- "\"unknown\"，让网络管理器（NetworkManager）使用一些启发式算法来选择值\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5395
-+#: ../clients/common/nm-meta-setting-desc.c:5530
- msgid "APN"
- msgstr "APN"
-
--#: ../clients/common/nm-meta-setting-desc.c:5447
--#: ../clients/common/nm-meta-setting-desc.c:7093
--#: ../clients/common/nm-meta-setting-desc.c:7284
-+#: ../clients/common/nm-meta-setting-desc.c:5582
-+#: ../clients/common/nm-meta-setting-desc.c:7269
-+#: ../clients/common/nm-meta-setting-desc.c:7460
- msgid "MTU [auto]"
- msgstr "MTU [自动]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5466
-+#: ../clients/common/nm-meta-setting-desc.c:5601
- msgid "P_KEY [none]"
- msgstr "P_KEY [无]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5475
-+#: ../clients/common/nm-meta-setting-desc.c:5610
- msgid "Parent interface [none]"
- msgstr "上级接口 [无]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5502
-+#: ../clients/common/nm-meta-setting-desc.c:5637
- msgid ""
- "Enter a list of IPv4 addresses of DNS servers.\n"
- "\n"
-@@ -5077,11 +5144,11 @@ msgstr "输入 DNS 服务器的 IPv4 地址列表。\n"
- "\n"
- "示例：8.8.8.8, 8.8.4.4\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5550
-+#: ../clients/common/nm-meta-setting-desc.c:5685
- msgid "IPv4 address (IP[/plen]) [none]"
- msgstr "IPv4 地址（IP[/plen]）[无]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5552
-+#: ../clients/common/nm-meta-setting-desc.c:5687
- msgid ""
- "Enter a list of IPv4 addresses formatted as:\n"
- " ip[/prefix], ip[/prefix],...\n"
-@@ -5094,11 +5161,11 @@ msgstr "输入 IPv4 地址列表，格式为：\n"
- "\n"
- "示例：192.168.1.5/24, 10.0.0.11/24\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5571
-+#: ../clients/common/nm-meta-setting-desc.c:5706
- msgid "IPv4 gateway [none]"
- msgstr "IPv4 网关 [无]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5579
-+#: ../clients/common/nm-meta-setting-desc.c:5714
- msgid ""
- "Enter a list of IPv4 routes formatted as:\n"
- " ip[/prefix] [next-hop] [metric],...\n"
-@@ -5118,7 +5185,7 @@ msgstr "输入 IPv4 路由列表，格式为：\n"
- "示例：192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n"
- " 10.1.2.0/24\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5619
-+#: ../clients/common/nm-meta-setting-desc.c:5754
- msgid ""
- "Enter a list of IPv4 routing rules formatted as:\n"
- " priority [prio] [from [src]] [to [dst]], ,...\n"
-@@ -5127,7 +5194,7 @@ msgstr "使用以下格式输入一组 IPv4 路由规则：\n"
- " priority [prio] [from [src]] [to [dst]], ,...\n"
- "\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5721
-+#: ../clients/common/nm-meta-setting-desc.c:5845
- 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 "
-@@ -5141,11 +5208,11 @@ msgstr "输入 DNS 服务器的 IPv6 地址列表。如果 IPv6 配置方法为
- "\n"
- "示例：2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5775
-+#: ../clients/common/nm-meta-setting-desc.c:5899
- msgid "IPv6 address (IP[/plen]) [none]"
- msgstr "IPv6 地址（IP[/plen]）[无]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5777
-+#: ../clients/common/nm-meta-setting-desc.c:5901
- msgid ""
- "Enter a list of IPv6 addresses formatted as:\n"
- " ip[/prefix], ip[/prefix],...\n"
-@@ -5158,11 +5225,11 @@ msgstr "输入 IPv6 地址列表，格式为：\n"
- "\n"
- "示例：2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5796
-+#: ../clients/common/nm-meta-setting-desc.c:5920
- msgid "IPv6 gateway [none]"
- msgstr "IPv6 网关 [无]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5804
-+#: ../clients/common/nm-meta-setting-desc.c:5928
- msgid ""
- "Enter a list of IPv6 routes formatted as:\n"
- " ip[/prefix] [next-hop] [metric],...\n"
-@@ -5183,7 +5250,7 @@ msgstr "输入 IPv6 路由列表，格式为：\n"
- "示例：2001:db8:beef:2::/64 2001:db8:beef::2, 2001:db8:beef:3::/64 2001:db8:beef::3 2\n"
- " abbe::/64 55\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5844
-+#: ../clients/common/nm-meta-setting-desc.c:5968
- msgid ""
- "Enter a list of IPv6 routing rules formatted as:\n"
- " priority [prio] [from [src]] [to [dst]], ,...\n"
-@@ -5192,166 +5259,170 @@ msgstr "使用以下格式输入一组 IPv6 路由规则：\n"
- " priority [prio] [from [src]] [to [dst]], ,...\n"
- "\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:5943
--#: ../clients/common/nm-meta-setting-desc.c:6923
-+#: ../clients/common/nm-meta-setting-desc.c:6075
-+#: ../clients/common/nm-meta-setting-desc.c:7099
- msgid "Parent device [none]"
- msgstr "上级设备 [无]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5949
-+#: ../clients/common/nm-meta-setting-desc.c:6081
- msgid "Local endpoint [none]"
- msgstr "本地端点 [无]"
-
--#: ../clients/common/nm-meta-setting-desc.c:5956
--#: ../clients/common/nm-meta-setting-desc.c:6943
-+#: ../clients/common/nm-meta-setting-desc.c:6088
-+#: ../clients/common/nm-meta-setting-desc.c:7119
- msgid "Remote"
- msgstr "远程"
-
--#: ../clients/common/nm-meta-setting-desc.c:6001
-+#: ../clients/common/nm-meta-setting-desc.c:6133
- msgid "MACsec parent device or connection UUID"
- msgstr "MACsec 上级设备或连接 UUID"
-
--#: ../clients/common/nm-meta-setting-desc.c:6022
-+#: ../clients/common/nm-meta-setting-desc.c:6154
- msgid "Enable encryption [yes]"
- msgstr "启用加密 [是]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6028
-+#: ../clients/common/nm-meta-setting-desc.c:6160
- #: ../clients/common/nm-secret-agent-simple.c:917
- msgid "MKA CAK"
- msgstr "MKA CAK"
-
--#: ../clients/common/nm-meta-setting-desc.c:6038
-+#: ../clients/common/nm-meta-setting-desc.c:6170
- msgid "MKA_CKN"
- msgstr "MKA_CKN"
-
--#: ../clients/common/nm-meta-setting-desc.c:6044
-+#: ../clients/common/nm-meta-setting-desc.c:6176
- msgid "SCI port [1]"
- msgstr "SCI 端口 [1]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6070
-+#: ../clients/common/nm-meta-setting-desc.c:6202
- msgid "MACVLAN parent device or connection UUID"
- msgstr "MACVLAN 上级设备或连接 UUID"
-
--#: ../clients/common/nm-meta-setting-desc.c:6091
-+#: ../clients/common/nm-meta-setting-desc.c:6223
- msgid "Tap [no]"
- msgstr "Tap [否]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6126
--#: ../clients/common/nm-meta-setting-desc.c:7198
--#: ../clients/tui/nmt-page-wifi.c:212
-+#: ../clients/common/nm-meta-setting-desc.c:6290
-+#: ../clients/common/nm-meta-setting-desc.c:7374
-+#: ../clients/tui/nmt-page-wifi.c:213
- msgid "SSID"
- msgstr "SSID"
-
--#: ../clients/common/nm-meta-setting-desc.c:6135
-+#: ../clients/common/nm-meta-setting-desc.c:6299
- msgid "OLPC Mesh channel [1]"
- msgstr "OLPC Mesh 信道 [1]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6144
-+#: ../clients/common/nm-meta-setting-desc.c:6308
- msgid "DHCP anycast MAC address [none]"
- msgstr "DHCP 任意广播 MAC 地址 [无]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6309
-+#: ../clients/common/nm-meta-setting-desc.c:6473
- msgid "PPPoE parent device"
- msgstr "PPPoE 上级设备"
-
--#: ../clients/common/nm-meta-setting-desc.c:6315
-+#: ../clients/common/nm-meta-setting-desc.c:6479
- msgid "Service [none]"
- msgstr "服务 [无]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6322
-+#: ../clients/common/nm-meta-setting-desc.c:6486
- msgid "PPPoE username"
- msgstr "PPPoE 用户名"
-
--#: ../clients/common/nm-meta-setting-desc.c:6358
-+#: ../clients/common/nm-meta-setting-desc.c:6522
- msgid "Browser only [no]"
- msgstr "仅浏览器 [否]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6364
-+#: ../clients/common/nm-meta-setting-desc.c:6528
- msgid "PAC URL"
- msgstr "PAC URL"
-
--#: ../clients/common/nm-meta-setting-desc.c:6370
-+#: ../clients/common/nm-meta-setting-desc.c:6534
- msgid "PAC script"
- msgstr "PAC 脚本"
-
--#: ../clients/common/nm-meta-setting-desc.c:6494
--#: ../clients/common/nm-meta-setting-desc.c:6682
-+#: ../clients/common/nm-meta-setting-desc.c:6658
-+#: ../clients/common/nm-meta-setting-desc.c:6846
- msgid "Team JSON configuration [none]"
- msgstr "组合 JSON 配置 [无]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6785
-+#: ../clients/common/nm-meta-setting-desc.c:6949
- msgid "User ID [none]"
- msgstr "用户 ID [无]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6791
-+#: ../clients/common/nm-meta-setting-desc.c:6955
- msgid "Group ID [none]"
- msgstr "分组 ID [无]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6797
-+#: ../clients/common/nm-meta-setting-desc.c:6961
- msgid "Enable PI [no]"
- msgstr "启用 PI [否]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6803
-+#: ../clients/common/nm-meta-setting-desc.c:6967
- msgid "Enable VNET header [no]"
- msgstr "启用 VNET 首部 [否]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6809
-+#: ../clients/common/nm-meta-setting-desc.c:6973
- msgid "Enable multi queue [no]"
- msgstr "启用多队列 [否]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6822
-+#: ../clients/common/nm-meta-setting-desc.c:6986
- msgid "VLAN parent device or connection UUID"
- msgstr "VLAN 上级设备或连接 UUID"
-
--#: ../clients/common/nm-meta-setting-desc.c:6829
-+#: ../clients/common/nm-meta-setting-desc.c:6993
- msgid "VLAN ID (<0-4094>)"
- msgstr "VLAN ID <0-4095>"
-
--#: ../clients/common/nm-meta-setting-desc.c:6835
-+#: ../clients/common/nm-meta-setting-desc.c:6999
- msgid "VLAN flags (<0-7>) [none]"
- msgstr "VLAN 标记（<0-7>）[无]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6844
-+#: ../clients/common/nm-meta-setting-desc.c:7008
- msgid "Ingress priority maps [none]"
- msgstr "入口优先级映射 [无]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6854
-+#: ../clients/common/nm-meta-setting-desc.c:7018
- msgid "Egress priority maps [none]"
- msgstr "出口优先级映射 [无]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6930
-+#: ../clients/common/nm-meta-setting-desc.c:7086
-+msgid "Table [0]"
-+msgstr "表 [0]"
-+
-+#: ../clients/common/nm-meta-setting-desc.c:7106
- msgid "VXLAN ID"
- msgstr "VXLAN ID"
-
--#: ../clients/common/nm-meta-setting-desc.c:6936
-+#: ../clients/common/nm-meta-setting-desc.c:7112
- msgid "Local address [none]"
- msgstr "本地地址 [无]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6949
-+#: ../clients/common/nm-meta-setting-desc.c:7125
- msgid "Minimum source port [0]"
- msgstr "最小来源端口 [0]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6955
-+#: ../clients/common/nm-meta-setting-desc.c:7131
- msgid "Maximum source port [0]"
- msgstr "最大来源端口 [0]"
-
--#: ../clients/common/nm-meta-setting-desc.c:6961
-+#: ../clients/common/nm-meta-setting-desc.c:7137
- msgid "Destination port [8472]"
- msgstr "目标端口 [8472]"
-
--#: ../clients/common/nm-meta-setting-desc.c:7001
-+#: ../clients/common/nm-meta-setting-desc.c:7177
- msgid "Peer"
- msgstr "同等"
-
--#: ../clients/common/nm-meta-setting-desc.c:7031
-+#: ../clients/common/nm-meta-setting-desc.c:7207
- msgid "WiMAX NSP name"
- msgstr "WiMAX NSP 名称"
-
--#: ../clients/common/nm-meta-setting-desc.c:7068
--#: ../clients/common/nm-meta-setting-desc.c:7249
-+#: ../clients/common/nm-meta-setting-desc.c:7244
-+#: ../clients/common/nm-meta-setting-desc.c:7425
- msgid "Cloned MAC [none]"
- msgstr "克隆的 MAC 地址 [无]"
-
--#: ../clients/common/nm-meta-setting-desc.c:7101
-+#: ../clients/common/nm-meta-setting-desc.c:7277
- msgid ""
- "Enter a list of subchannels (comma or space separated).\n"
- "\n"
-@@ -5360,228 +5431,239 @@ msgstr "输入子通道列表（用逗号或者空格分开）。\n"
- "\n"
- "示例：0.0.0e20 0.0.0e21 0.0.0e22\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:7423
-+#: ../clients/common/nm-meta-setting-desc.c:7599
- msgid ""
- "Enter the type of WEP keys. The accepted values are: 0 or unknown, 1 or key, "
- "and 2 or passphrase.\n"
- msgstr "输入 WEP 密钥类型。可接受的值为：0 或者 unknown、1 或者 key, 以及 2 或者 passphrase。\n"
-
--#: ../clients/common/nm-meta-setting-desc.c:7482
-+#: ../clients/common/nm-meta-setting-desc.c:7658
- msgid "Short address (<0x0000-0xffff>)"
- msgstr "短地址（<0x0000-0xffff>）"
-
--#: ../clients/common/nm-meta-setting-desc.c:7498
-+#: ../clients/common/nm-meta-setting-desc.c:7674
- msgid "PAN Identifier (<0x0000-0xffff>)"
- msgstr "PAN 标识符（<0x0000-0xffff>）"
-
--#: ../clients/common/nm-meta-setting-desc.c:7513
-+#: ../clients/common/nm-meta-setting-desc.c:7689
- msgid "Page (<default|0-31>)"
- msgstr "页 (<default|0-31>)"
-
--#: ../clients/common/nm-meta-setting-desc.c:7527
-+#: ../clients/common/nm-meta-setting-desc.c:7703
- msgid "Channel (<default|0-26>)"
- msgstr "频道 (<default|0-26>)"
-
- #. ***************************************************************************
--#: ../clients/common/nm-meta-setting-desc.c:7662
-+#: ../clients/common/nm-meta-setting-desc.c:7838
- msgid "6LOWPAN settings"
- msgstr "6LOWPAN 设置"
-
--#: ../clients/common/nm-meta-setting-desc.c:7663
-+#: ../clients/common/nm-meta-setting-desc.c:7839
- msgid "802-1x settings"
- msgstr "802-1x 设置"
-
--#: ../clients/common/nm-meta-setting-desc.c:7664
-+#: ../clients/common/nm-meta-setting-desc.c:7840
- #: ../src/devices/adsl/nm-device-adsl.c:117
- msgid "ADSL connection"
- msgstr "ADSL 连接"
-
--#: ../clients/common/nm-meta-setting-desc.c:7665
-+#: ../clients/common/nm-meta-setting-desc.c:7841
- msgid "bluetooth connection"
- msgstr "蓝牙连接"
-
--#: ../clients/common/nm-meta-setting-desc.c:7666
-+#: ../clients/common/nm-meta-setting-desc.c:7842
- msgid "Bond device"
- msgstr "绑定设备"
-
--#: ../clients/common/nm-meta-setting-desc.c:7667
-+#: ../clients/common/nm-meta-setting-desc.c:7843
- msgid "Bridge device"
- msgstr "网桥设备"
-
--#: ../clients/common/nm-meta-setting-desc.c:7668
-+#: ../clients/common/nm-meta-setting-desc.c:7844
- msgid "Bridge port"
- msgstr "网桥端口"
-
--#: ../clients/common/nm-meta-setting-desc.c:7669
-+#: ../clients/common/nm-meta-setting-desc.c:7845
- msgid "CDMA mobile broadband connection"
- msgstr "CDMA 移动宽带连接"
-
--#: ../clients/common/nm-meta-setting-desc.c:7670
-+#: ../clients/common/nm-meta-setting-desc.c:7846
- msgid "General settings"
- msgstr "常规设置"
-
--#: ../clients/common/nm-meta-setting-desc.c:7671
-+#: ../clients/common/nm-meta-setting-desc.c:7847
- msgid "DCB settings"
- msgstr "DCB 设置"
-
--#: ../clients/common/nm-meta-setting-desc.c:7672
-+#: ../clients/common/nm-meta-setting-desc.c:7848
- msgid "Dummy settings"
- msgstr "虚拟设置"
-
--#: ../clients/common/nm-meta-setting-desc.c:7673
-+#: ../clients/common/nm-meta-setting-desc.c:7849
- msgid "Ethtool settings"
- msgstr "Ethtool 设置"
-
--#: ../clients/common/nm-meta-setting-desc.c:7674
-+#: ../clients/common/nm-meta-setting-desc.c:7850
- msgid "Generic settings"
- msgstr "通用设置"
-
--#: ../clients/common/nm-meta-setting-desc.c:7675
-+#: ../clients/common/nm-meta-setting-desc.c:7851
- msgid "GSM mobile broadband connection"
- msgstr "GSM 移动宽带连接"
-
--#: ../clients/common/nm-meta-setting-desc.c:7676
-+#: ../clients/common/nm-meta-setting-desc.c:7852
- #: ../src/devices/nm-device-infiniband.c:158
- msgid "InfiniBand connection"
- msgstr "InfiniBand 连接"
-
--#: ../clients/common/nm-meta-setting-desc.c:7677
-+#: ../clients/common/nm-meta-setting-desc.c:7853
- msgid "IPv4 protocol"
- msgstr "IPv4 协议"
-
--#: ../clients/common/nm-meta-setting-desc.c:7678
-+#: ../clients/common/nm-meta-setting-desc.c:7854
- msgid "IPv6 protocol"
- msgstr "IPv6 协议"
-
--#: ../clients/common/nm-meta-setting-desc.c:7679
-+#: ../clients/common/nm-meta-setting-desc.c:7855
- msgid "IP-tunnel settings"
- msgstr "IP 隧道设置"
-
--#: ../clients/common/nm-meta-setting-desc.c:7680
-+#: ../clients/common/nm-meta-setting-desc.c:7856
- msgid "MACsec connection"
- msgstr "MACsec 连接"
-
--#: ../clients/common/nm-meta-setting-desc.c:7681
-+#: ../clients/common/nm-meta-setting-desc.c:7857
- msgid "macvlan connection"
- msgstr "macvlan 连接"
-
--#: ../clients/common/nm-meta-setting-desc.c:7682
-+#: ../clients/common/nm-meta-setting-desc.c:7858
- msgid "Match"
- msgstr "匹配"
-
--#: ../clients/common/nm-meta-setting-desc.c:7683
-+#: ../clients/common/nm-meta-setting-desc.c:7859
- msgid "OLPC Mesh connection"
- msgstr "OLPC Mesh 连接"
-
--#: ../clients/common/nm-meta-setting-desc.c:7684
-+#: ../clients/common/nm-meta-setting-desc.c:7860
- msgid "Open vSwitch bridge settings"
- msgstr "Open vSwitch 网桥设置"
-
--#: ../clients/common/nm-meta-setting-desc.c:7685
-+#: ../clients/common/nm-meta-setting-desc.c:7861
- msgid "Open vSwitch DPDK interface settings"
- msgstr "Open vSwitch DPDK 接口设置"
-
--#: ../clients/common/nm-meta-setting-desc.c:7686
-+#: ../clients/common/nm-meta-setting-desc.c:7862
- msgid "Open vSwitch interface settings"
- msgstr "Open vSwitch 接口设置"
-
--#: ../clients/common/nm-meta-setting-desc.c:7687
-+#: ../clients/common/nm-meta-setting-desc.c:7863
- msgid "Open vSwitch patch interface settings"
- msgstr "Open vSwitch 插线接口设置"
-
--#: ../clients/common/nm-meta-setting-desc.c:7688
-+#: ../clients/common/nm-meta-setting-desc.c:7864
- msgid "Open vSwitch port settings"
- msgstr "Open vSwitch 端口设置"
-
--#: ../clients/common/nm-meta-setting-desc.c:7689
-+#: ../clients/common/nm-meta-setting-desc.c:7865
- msgid "PPP settings"
- msgstr "PPP 设置"
-
--#: ../clients/common/nm-meta-setting-desc.c:7690
-+#: ../clients/common/nm-meta-setting-desc.c:7866
- msgid "PPPoE"
- msgstr "PPPoE"
-
--#: ../clients/common/nm-meta-setting-desc.c:7691
-+#: ../clients/common/nm-meta-setting-desc.c:7867
- msgid "Proxy"
- msgstr "代理"
-
--#: ../clients/common/nm-meta-setting-desc.c:7692
-+#: ../clients/common/nm-meta-setting-desc.c:7868
- msgid "Serial settings"
- msgstr "串行设置"
-
--#: ../clients/common/nm-meta-setting-desc.c:7693
-+#: ../clients/common/nm-meta-setting-desc.c:7869
- msgid "SR-IOV settings"
- msgstr "SR-IOV 设置"
-
--#: ../clients/common/nm-meta-setting-desc.c:7694
-+#: ../clients/common/nm-meta-setting-desc.c:7870
- msgid "Traffic controls"
- msgstr "流量控制"
-
--#: ../clients/common/nm-meta-setting-desc.c:7695
-+#: ../clients/common/nm-meta-setting-desc.c:7871
- msgid "Team device"
- msgstr "组合设备"
-
--#: ../clients/common/nm-meta-setting-desc.c:7696
-+#: ../clients/common/nm-meta-setting-desc.c:7872
- msgid "Team port"
- msgstr "组合端口"
-
--#: ../clients/common/nm-meta-setting-desc.c:7697
-+#: ../clients/common/nm-meta-setting-desc.c:7873
- msgid "Tun device"
- msgstr "Tun 设备"
-
--#: ../clients/common/nm-meta-setting-desc.c:7698
-+#: ../clients/common/nm-meta-setting-desc.c:7874
- msgid "User settings"
- msgstr "用户设置"
-
--#: ../clients/common/nm-meta-setting-desc.c:7699
-+#: ../clients/common/nm-meta-setting-desc.c:7875
- #: ../src/devices/nm-device-vlan.c:385
- msgid "VLAN connection"
- msgstr "VLAN 连接"
-
--#: ../clients/common/nm-meta-setting-desc.c:7700 ../src/nm-manager.c:5652
-+#: ../clients/common/nm-meta-setting-desc.c:7876 ../src/nm-manager.c:5697
- msgid "VPN connection"
- msgstr "VPN 连接"
-
--#: ../clients/common/nm-meta-setting-desc.c:7701
-+#: ../clients/common/nm-meta-setting-desc.c:7877
-+#: ../src/devices/nm-device-vrf.c:175
-+msgid "VRF connection"
-+msgstr "VRF 连接"
-+
-+#: ../clients/common/nm-meta-setting-desc.c:7878
- #: ../src/devices/nm-device-vxlan.c:354
- msgid "VXLAN connection"
- msgstr "VXLAN 连接"
-
--#: ../clients/common/nm-meta-setting-desc.c:7702
-+#: ../clients/common/nm-meta-setting-desc.c:7879
- msgid "Wi-Fi P2P connection"
- msgstr "Wi-Fi P2P 连接"
-
--#: ../clients/common/nm-meta-setting-desc.c:7703
-+#: ../clients/common/nm-meta-setting-desc.c:7880
- msgid "WiMAX connection"
- msgstr "WiMAX 连接"
-
--#: ../clients/common/nm-meta-setting-desc.c:7704
-+#: ../clients/common/nm-meta-setting-desc.c:7881
- msgid "Wired Ethernet"
- msgstr "有线以太网"
-
--#: ../clients/common/nm-meta-setting-desc.c:7705
-+#: ../clients/common/nm-meta-setting-desc.c:7882
- msgid "WireGuard VPN settings"
- msgstr "WireGuard VPN 设置"
-
--#: ../clients/common/nm-meta-setting-desc.c:7706
-+#: ../clients/common/nm-meta-setting-desc.c:7883
- msgid "Wi-Fi connection"
- msgstr "Wi-Fi 连接"
-
--#: ../clients/common/nm-meta-setting-desc.c:7707
-+#: ../clients/common/nm-meta-setting-desc.c:7884
- msgid "Wi-Fi security settings"
- msgstr "Wi-Fi 安全设置"
-
--#: ../clients/common/nm-meta-setting-desc.c:7708
-+#: ../clients/common/nm-meta-setting-desc.c:7885
- msgid "WPAN settings"
- msgstr "WPAN 设置"
-
--#: ../clients/common/nm-meta-setting-desc.c:8074
-+#: ../clients/common/nm-meta-setting-desc.c:8262
- msgid "name"
- msgstr "名称"
-
--#: ../clients/common/nm-polkit-listener.c:225
--msgid "An authentication session is already underway."
--msgstr "验证会话已在进行。"
-+#: ../clients/common/nm-polkit-listener.c:368
-+#, c-format
-+msgid "Could not find any session id for uid %d"
-+msgstr "找不到 uid 的任何会话 ID %d"
-+
-+#: ../clients/common/nm-polkit-listener.c:370
-+#, c-format
-+msgid "Could not retrieve session id: %s"
-+msgstr "无法检索会话ID：%s"
-
- #: ../clients/common/nm-secret-agent-simple.c:217
- #, c-format
-@@ -5597,7 +5679,7 @@ msgid "Private key password"
- msgstr "私钥密码"
-
- #: ../clients/common/nm-secret-agent-simple.c:323
--#: ../clients/tui/nmt-page-wifi.c:278
-+#: ../clients/tui/nmt-page-wifi.c:279
- msgid "Key"
- msgstr "密钥"
-
-@@ -5713,59 +5795,59 @@ msgstr "由于缺少 \"%s%s\"，无法加载 VPN 插件 \"\"。缺少客户端
- msgid "failed to load VPN plugin \"%s\": %s"
- msgstr "加载 VPN 插件 \"%s\" 失败：%s"
-
--#: ../clients/common/nm-vpn-helpers.c:115
-+#: ../clients/common/nm-vpn-helpers.c:144
- msgid "Certificate password"
- msgstr "证书密码"
-
--#: ../clients/common/nm-vpn-helpers.c:116
-+#: ../clients/common/nm-vpn-helpers.c:145
- msgid "HTTP proxy password"
- msgstr "HTTP 代理密码"
-
--#: ../clients/common/nm-vpn-helpers.c:121
--#: ../clients/common/nm-vpn-helpers.c:126
-+#: ../clients/common/nm-vpn-helpers.c:152
-+#: ../clients/common/nm-vpn-helpers.c:161
- msgid "Group password"
- msgstr "组密码"
-
--#: ../clients/common/nm-vpn-helpers.c:130 ../clients/tui/nmt-page-ip4.c:130
-+#: ../clients/common/nm-vpn-helpers.c:167 ../clients/tui/nmt-page-ip4.c:130
- #: ../clients/tui/nmt-page-ip6.c:131
- msgid "Gateway"
- msgstr "网关"
-
--#: ../clients/common/nm-vpn-helpers.c:131
-+#: ../clients/common/nm-vpn-helpers.c:168
- msgid "Cookie"
- msgstr "Cookie"
-
--#: ../clients/common/nm-vpn-helpers.c:132
-+#: ../clients/common/nm-vpn-helpers.c:169
- msgid "Gateway certificate hash"
- msgstr "网关证书散列"
-
--#: ../clients/common/nm-vpn-helpers.c:257
-+#: ../clients/common/nm-vpn-helpers.c:267
- #, c-format
- msgid "Invalid peer starting at %s:%zu: %s"
- msgstr "于 %s:%zu: %s 启动的无效 peer"
-
--#: ../clients/common/nm-vpn-helpers.c:377
-+#: ../clients/common/nm-vpn-helpers.c:388
- msgid ""
--"The WireGuard config file must be a valid interface name followed by \".conf"
--"\""
--msgstr "WireGuard 配置文件需要是一个有效的接口名再加上 \".conf\""
-+"The name of the WireGuard config must be a valid interface name followed by "
-+"\".conf\""
-+msgstr "WireGuard 配置文件的名称需要是一个有效的接口名再加上 \".conf\""
-
--#: ../clients/common/nm-vpn-helpers.c:666
-+#: ../clients/common/nm-vpn-helpers.c:680
- #, c-format
- msgid "unrecognized line at %s:%zu"
- msgstr "无法识别的行 %s:%zu"
-
--#: ../clients/common/nm-vpn-helpers.c:671
-+#: ../clients/common/nm-vpn-helpers.c:685
- #, c-format
- msgid "invalid value for '%s' at %s:%zu"
- msgstr "无效的值 '%s' 于 %s:%zu"
-
--#: ../clients/common/nm-vpn-helpers.c:676
-+#: ../clients/common/nm-vpn-helpers.c:690
- #, c-format
- msgid "invalid secret '%s' at %s:%zu"
- msgstr "无效的 secret '%s' 于 %s:%zu"
-
--#: ../clients/common/nm-vpn-helpers.c:789
-+#: ../clients/common/nm-vpn-helpers.c:823
- #, c-format
- msgid "Failed to create WireGuard connection: %s"
- msgstr "创建 WireGuard 连接失败 : %s"
-@@ -5835,7 +5917,7 @@ msgid ""
- msgstr "如指定了，则请求该设备使用此 MAC 地址来代替。这个可被称为 MAC 克隆或欺骗。除了明确地指定 MAC 地址，也支持 \"preserve\"、\"permanent\"、\"random\" 和 \"stable\" 等特殊值。\"preserve\" 表示激活时不动 MAC 地址。\"permanent\" 使用设备的永久硬件地址。\"random\" 则在每个连接上创建随机的 MAC 地址。\"stable\" 则根据 connection.stable-id 和机器相关密钥创建散列的 MAC 地址。如未指定，该值可被全局默认值覆盖，参见 NetworkManager.conf 的手册。如还未指定，它就默认为 \"permanent\"。在 D-Bus 上, 此字段表示为 \"assigned-mac-address\" 或已弃用的 \"cloned-mac-address\"。"
-
- #: ../clients/common/settings-docs.h.in:11
--#: ../clients/common/settings-docs.h.in:92
-+#: ../clients/common/settings-docs.h.in:94
- msgid ""
- "With \"cloned-mac-address\" setting \"random\" or \"stable\", by default all "
- "bits of the MAC address are scrambled and a locally-administered, unicast "
-@@ -5906,7 +5988,7 @@ msgid ""
- msgstr "Wi-Fi 网络模式；\"infrastructure\"、\"mesh\"、\"adhoc\" 或 \"ap\" 之一。如果留空，假定为 infrastructure。"
-
- #: ../clients/common/settings-docs.h.in:17
--#: ../clients/common/settings-docs.h.in:95
-+#: ../clients/common/settings-docs.h.in:97
- msgid ""
- "If non-zero, only transmit packets of the specified size or smaller, "
- "breaking larger packets up into multiple Ethernet frames."
-@@ -5997,10 +6079,10 @@ msgstr "组/广播加密算法列表，用来阻止连接到那些不使用列
- #: ../clients/common/settings-docs.h.in:27
- msgid ""
- "Key management used for the connection. One of \"none\" (WEP), \"ieee8021x"
--"\" (Dynamic WEP), \"wpa-psk\" (infrastructure WPA-PSK), \"sae\" (SAE) or "
--"\"wpa-eap\" (WPA-Enterprise). This property must be set for any Wi-Fi "
--"connection that uses security."
--msgstr "用于连接的密钥管理。\"none\" (WEP)、\"ieee8021x\" (Dynamic WEP)、\"wpa-psk\" (infrastructure WPA-PSK)、\"sae\" (SAE) 或 \"wpa-eap\" (WPA-Enterprise)。任何使用安全功能的 Wi-Fi 连接都需要设置这个属性。"
-+"\" (Dynamic WEP), \"wpa-psk\" (infrastructure WPA-PSK), \"sae\" (SAE), \"owe"
-+"\" (Opportunistic Wireless Encryption) or \"wpa-eap\" (WPA-Enterprise). "
-+"This property must be set for any Wi-Fi connection that uses security."
-+msgstr "用于连接的密钥管理。需要是 \"none\" (WEP)、\"ieee8021x\" (Dynamic WEP)、\"wpa-psk\" (infrastructure WPA-PSK)、\"sae\" (SAE)、\"owe\" (Opportunistic Wireless Encryption) 或 \"wpa-eap\" (WPA-Enterprise) 中的一个。任何使用安全连接的 Wi-Fi 都需要设置这个属性。"
-
- #: ../clients/common/settings-docs.h.in:28
- msgid ""
-@@ -6138,15 +6220,17 @@ msgstr "身份验证的超时时间。零代表全局默认；如果全局默认
- #: ../clients/common/settings-docs.h.in:47
- msgid ""
- "Contains the CA certificate if used by the EAP method specified in the \"eap"
--"\" property. Certificate data is specified using a \"scheme\"; two are "
--"currently supported: blob and path. When using the blob scheme (which is "
--"backwards compatible with NM 0.7.x) this property should be set to the "
--"certificate's DER encoded data. When using the path scheme, this property "
--"should be set to the full UTF-8 encoded path of the certificate, prefixed "
--"with the string \"file://\" and ending with a terminating NUL byte. This "
--"property can be unset even if the EAP method supports CA certificates, but "
--"this allows man-in-the-middle attacks and is NOT recommended."
--msgstr "包含 \"eap\" 属性指定的 EAP 方法所使用的 CA 证书，如果其使用了。证书数据用 \"scheme\" 指定；当前支持两种方案：比特块（blob）和路径。当使用比特块方案（与 NM 0.7.x 后向兼容）时，此属性应设定为证书的 DER 编码数据。当使用路径方案时，此属性应设定为证书的完整 UTF-8 编码路径，以字符串 \"file://\" 为前缀并以终止 NUL 字节结束。此属性可不设定，即使 EAP 方法支持 CA 证书，但这将允许中间人攻击因此不推荐。"
-+"\" property. Certificate data is specified using a \"scheme\"; three are "
-+"currently supported: blob, path and pkcs#11 URL. When using the blob scheme "
-+"this property should be set to the certificate's DER encoded data. When "
-+"using the path scheme, this property should be set to the full UTF-8 encoded "
-+"path of the certificate, prefixed with the string \"file://\" and ending "
-+"with a terminating NUL byte. This property can be unset even if the EAP "
-+"method supports CA certificates, but this allows man-in-the-middle attacks "
-+"and is NOT recommended. Note that enabling NMSetting8021x:system-ca-certs "
-+"will override this setting to use the built-in path, if the built-in path is "
-+"not a directory."
-+msgstr "包含 \"eap\" 属性指定的 EAP 方法所使用的 CA 证书，证书数据由 \"scheme\" 指定；当前支持三种方案：blob、path 和 pkcs#11 URL。当使用 blob 时，此属性应设定为证书的 DER 编码数据。当使用 path 时，此属性应设定为证书的完整 UTF-8 编码路径，以字符串 \"file://\" 为前缀并以终止 NUL 字节结束。此属性可以被取消设定，即使 EAP 方法支持 CA 证书，但这将可能会受到中间人攻击，因此不推荐。请注意，启用 NMSetting8021x:system-ca-certs 将会覆盖这个设置来使用内建的路径，如果内建路径不是一个目录。"
-
- #: ../clients/common/settings-docs.h.in:48
- msgid ""
-@@ -6163,8 +6247,10 @@ msgstr "指示如何处理 \"ca-cert-password\" 属性的标志。"
- msgid ""
- "UTF-8 encoded path to a directory containing PEM or DER formatted "
- "certificates to be added to the verification chain in addition to the "
--"certificate specified in the \"ca-cert\" property."
--msgstr "指向包含 PEM 或 DER 格式化证书目录的 UTF-8 编码路径，该证书将同 \"ca-cert\" 属性里的指定证书一起添加到验证链。"
-+"certificate specified in the \"ca-cert\" property. If NMSetting8021x:system-"
-+"ca-certs is enabled and the built-in CA path is an existing directory, then "
-+"this setting is ignored."
-+msgstr "一个到包含 PEM 或 DER 格式证书的目录的 UTF-8 编码路径，它被添加到包括 \"ca-cert\" 属性中指定的证书的验证链中。如果 NMSetting8021x:system-ca-certs 被启用，并且内置的 CA 路径是一个现有的目录，那么这个设置将被忽略。"
-
- #: ../clients/common/settings-docs.h.in:51
- msgid ""
-@@ -6190,15 +6276,26 @@ msgstr "指示如何处理 \"client-cert-password\" 属性的标志。"
-
- #: ../clients/common/settings-docs.h.in:54
- msgid ""
--"Constraint for server domain name. If set, this FQDN is used as a suffix "
-+"Constraint for server domain name. If set, this list of FQDNs is used as a "
- "match requirement for dNSName element(s) of the certificate presented by the "
- "authentication server. If a matching dNSName is found, this constraint is "
- "met. If no dNSName values are present, this constraint is matched against "
--"SubjectName CN using same suffix match comparison."
--msgstr "服务器域名的约束。如果设定，此其 FQDN 用作后缀以匹配验证服务器所提供证书的 dNSName 元素需求。如果找到了匹配的 dNSName，此约束被满足。如果未提供 dNSName 值，此约束用来匹配使用同个后缀匹配对比的 SubjectName CN。"
-+"SubjectName CN using the same comparison. Multiple valid FQDNs can be passed "
-+"as a \";\" delimited list."
-+msgstr "服务器域名的约束。如果设定，在这个列表中的 FQDN 用来匹配由验证服务器提供的证书的 dNSName 元素需求。如果找到了匹配的 dNSName，此约束被满足。如果没有 dNSName 值，此约束使用同样的比较方法来匹配 SubjectName CN。可以使用 \";\" 作为分隔符来提供包括多个有效 FQDN 的列表。"
-
- #: ../clients/common/settings-docs.h.in:55
- msgid ""
-+"Constraint for server domain name. If set, this FQDN is used as a suffix "
-+"match requirement for dNSName element(s) of the certificate presented by the "
-+"authentication server. If a matching dNSName is found, this constraint is "
-+"met. If no dNSName values are present, this constraint is matched against "
-+"SubjectName CN using same suffix match comparison. Since version 1.24, "
-+"multiple valid FQDNs can be passed as a \";\" delimited list."
-+msgstr "服务器域名的约束。如果设定，在这个列表中的 FQDN 作为后缀来匹配由验证服务器提供的证书的 dNSName 元素需求。如果找到了匹配的 dNSName，此约束被满足。如果没有 dNSName 值，此约束使用同样的后缀比较来匹配 SubjectName CN。从版本 1.24 开始，可以使用 \";\" 作为分隔符来提供包括多个有效 FQDN 的列表。"
-+
-+#: ../clients/common/settings-docs.h.in:56
-+msgid ""
- "The allowed EAP method to be used when authenticating to the network with "
- "802.1x. Valid methods are: \"leap\", \"md5\", \"tls\", \"peap\", \"ttls\", "
- "\"pwd\", and \"fast\". Each method requires different configuration using "
-@@ -6206,13 +6303,13 @@ msgid ""
- "the allowed combinations."
- msgstr "当验证到 802.1x 网络时，所允许使用的 EAP 方法。有效方法有：\"leap\"、\"md5\"、\"tls\"、\"peap\"、\"ttls\"、\"pwd\" 和 \"fast\"。每种方法需要使用此设置属性的不同配置；请参考 wpa_supplicant 文档以获取允许的组合。"
-
--#: ../clients/common/settings-docs.h.in:56
-+#: ../clients/common/settings-docs.h.in:57
- msgid ""
- "Identity string for EAP authentication methods. Often the user's user or "
- "login name."
- msgstr "用于 EAP 验证方法的标识字符串。通常是用户的用户名或登录名。"
-
--#: ../clients/common/settings-docs.h.in:57
-+#: ../clients/common/settings-docs.h.in:58
- msgid ""
- "Whether the 802.1X authentication is optional. If TRUE, the activation will "
- "continue even after a timeout or an authentication failure. Setting the "
-@@ -6220,26 +6317,26 @@ msgid ""
- "to FALSE, the activation can continue only after a successful authentication."
- msgstr "802.1X 身份验证是否是可选设置。如果为TRUE，即使在超时或身份验证失败后，激活操作仍将继续。当前仅允许为以太网连接把这个属性设置为 TRUE。如果设置为 FALSE，则只有在成功通过身份验证后才能继续激活操作。"
-
--#: ../clients/common/settings-docs.h.in:58
-+#: ../clients/common/settings-docs.h.in:59
- msgid "UTF-8 encoded file path containing PAC for EAP-FAST."
- msgstr "UTF-8 编码的文件路径，包含用于 EAP-FAST 的 PAC。"
-
--#: ../clients/common/settings-docs.h.in:59
-+#: ../clients/common/settings-docs.h.in:60
- msgid ""
- "UTF-8 encoded password used for EAP authentication methods. If both the "
- "\"password\" property and the \"password-raw\" property are specified, "
- "\"password\" is preferred."
- msgstr "用于 EAP 验证方法的 UTF-8 编码密码。如果 \"password\" 属性和 \"password-raw\" 属性都指定了，首选 \"password\"。"
-
--#: ../clients/common/settings-docs.h.in:60
--#: ../clients/common/settings-docs.h.in:105
--#: ../clients/common/settings-docs.h.in:132
--#: ../clients/common/settings-docs.h.in:181
--#: ../clients/common/settings-docs.h.in:299
-+#: ../clients/common/settings-docs.h.in:61
-+#: ../clients/common/settings-docs.h.in:107
-+#: ../clients/common/settings-docs.h.in:149
-+#: ../clients/common/settings-docs.h.in:199
-+#: ../clients/common/settings-docs.h.in:321
- msgid "Flags indicating how to handle the \"password\" property."
- msgstr "指示如何处理 \"password\" 属性的标志。"
-
--#: ../clients/common/settings-docs.h.in:61
-+#: ../clients/common/settings-docs.h.in:62
- msgid ""
- "Password used for EAP authentication methods, given as a byte array to allow "
- "passwords in other encodings than UTF-8 to be used. If both the \"password\" "
-@@ -6247,11 +6344,11 @@ msgid ""
- "preferred."
- msgstr "用于 EAP 验证方法的密码，以字节数组给定以允许其他不是 UTF-8 编码的密码能够使用。如果 \"password\" 属性和 \"password-raw\" 属性都指定了，首选 \"password\"。"
-
--#: ../clients/common/settings-docs.h.in:62
-+#: ../clients/common/settings-docs.h.in:63
- msgid "Flags indicating how to handle the \"password-raw\" property."
- msgstr "指示如何处理 \"password-raw\" 属性的标志。"
-
--#: ../clients/common/settings-docs.h.in:63
-+#: ../clients/common/settings-docs.h.in:64
- msgid ""
- "Specifies authentication flags to use in \"phase 1\" outer authentication "
- "using NMSetting8021xAuthFlags options. The individual TLS versions can be "
-@@ -6261,7 +6358,7 @@ msgid ""
- "details."
- msgstr "指定 NMSetting8021xAuthFlags 选项使用的 \"phase 1\" 外部验证所要用的验证标识。可以明确地禁用个别 TLS 版本。如果未设定确切的 TLS 禁用标识，将由请求方决定允许还是禁止它。TLS 选项映射到 tls_disable_tlsv1_x 设置。详情请见 wpa_supplicant 文档。"
-
--#: ../clients/common/settings-docs.h.in:64
-+#: ../clients/common/settings-docs.h.in:65
- msgid ""
- "Enables or disables in-line provisioning of EAP-FAST credentials when FAST "
- "is specified as the EAP method in the \"eap\" property. Recognized values "
-@@ -6271,7 +6368,7 @@ msgid ""
- "documentation for more details."
- msgstr "当 \"eap\" 属性里的 EAP 方法指定为 FAST 时，启用或禁用 EAP-FAST 凭据的行内设置。可识别的值有 \"0\"（禁用）、\"1\"（允许未验证的设置）、\"2\"（允许验证的设置）和 \"3\"（验证和未验证的设置都允许）。详情请见 wpa_supplicant 文档。"
-
--#: ../clients/common/settings-docs.h.in:65
-+#: ../clients/common/settings-docs.h.in:66
- msgid ""
- "Forces use of the new PEAP label during key derivation. Some RADIUS servers "
- "may require forcing the new PEAP label to interoperate with PEAPv1. Set to "
-@@ -6279,7 +6376,7 @@ msgid ""
- "documentation for more details."
- msgstr "强制在衍生密钥时使用新的 PEAP 标签。有些 RADIUS 服务器可能需要强制使用新的 PEAP 标签以与 PEAPv1 互操作。设为 \"1\" 以强制使用新的 PEAP 标签。详情请见 wpa_supplicant 文档。"
-
--#: ../clients/common/settings-docs.h.in:66
-+#: ../clients/common/settings-docs.h.in:67
- msgid ""
- "Forces which PEAP version is used when PEAP is set as the EAP method in the "
- "\"eap\" property. When unset, the version reported by the server will be "
-@@ -6288,7 +6385,7 @@ msgid ""
- "set to \"0\" or \"1\" to force that specific PEAP version."
- msgstr "当 \"eap\" 属性里的 EAP 方法指定为 PEAP 时，强制所使用的 PEAP 版本。未设定时，将使用服务器报告的版本。有时使用旧的 RADIUS 服务器时，强制客户端使用特定的 PEAP 版本时必须的。要这么做，此属性可以设为 \"0\" 或 \"1\" 以强制所指定的 PEAP 版本。"
-
--#: ../clients/common/settings-docs.h.in:67
-+#: ../clients/common/settings-docs.h.in:68
- msgid ""
- "List of strings to be matched against the altSubjectName of the certificate "
- "presented by the authentication server during the inner \"phase 2\" "
-@@ -6296,7 +6393,7 @@ msgid ""
- "certificate's altSubjectName is performed."
- msgstr "字符串列表，在 \"phase 2\" 验证期间将与验证服务器所提供证书里的 altSubjectName 匹配。如果列表为空，不执行服务器证书的 altSubjectName 验证。"
-
--#: ../clients/common/settings-docs.h.in:68
-+#: ../clients/common/settings-docs.h.in:69
- msgid ""
- "Specifies the allowed \"phase 2\" inner non-EAP authentication method when "
- "an EAP method that uses an inner TLS tunnel is specified in the \"eap\" "
-@@ -6306,7 +6403,7 @@ msgid ""
- "authentication; see the wpa_supplicant documentation for more details."
- msgstr "当在 “eap” 属性中指定了使用内部 TLS 隧道的 EAP 方法时，指定允许的 “阶段2” 内部非 EAP 身份验证方法。可用的非 EAP “阶段2” 方法是 “pap”、“chap”、“mschap”、“mschapv2”、“gtc”、“otp”、“md5” 和 “tls”。每个“阶段2”内部方法都需要特定的参数才能成功进行身份验证。有关更多详细信息，请参见 wpa_supplicant 文档。"
-
--#: ../clients/common/settings-docs.h.in:69
-+#: ../clients/common/settings-docs.h.in:70
- msgid ""
- "Specifies the allowed \"phase 2\" inner EAP-based authentication method when "
- "an EAP method that uses an inner TLS tunnel is specified in the \"eap\" "
-@@ -6316,40 +6413,43 @@ msgid ""
- "wpa_supplicant documentation for more details."
- msgstr "当在 “eap” 属性中指定了使用内部 TLS 隧道的 EAP 方法时，指定允许的 “阶段2” 内部基于 EAP 的身份验证方法。可用的基于 EAP 的“阶段2” 方法是 \"md5\"、\"mschapv2\"、\"otp\"、\"gtc\" 和 \"tls\"。每个“阶段2”内部方法都需要特定的参数才能成功进行身份验证。有关更多详细信息，请参见 wpa_supplicant 文档。"
-
--#: ../clients/common/settings-docs.h.in:70
-+#: ../clients/common/settings-docs.h.in:71
- msgid ""
- "Contains the \"phase 2\" CA certificate if used by the EAP method specified "
- "in the \"phase2-auth\" or \"phase2-autheap\" properties. Certificate data is "
--"specified using a \"scheme\"; two are currently supported: blob and path. "
--"When using the blob scheme (which is backwards compatible with NM 0.7.x) "
--"this property should be set to the certificate's DER encoded data. When "
--"using the path scheme, this property should be set to the full UTF-8 encoded "
--"path of the certificate, prefixed with the string \"file://\" and ending "
--"with a terminating NUL byte. This property can be unset even if the EAP "
--"method supports CA certificates, but this allows man-in-the-middle attacks "
--"and is NOT recommended."
--msgstr "包含 \"phase2-auth\" 或 \"phase2-autheap\" 属性指定的 EAP 方法所使用的 \"phase 2\" CA 证书，如果其使用了。证书数据用 \"scheme\" 指定；当前支持两种方案：比特块（blob）和路径。当使用比特块方案（与 NM 0.7.x 后向兼容）时，此属性应设定为证书的 DER 编码数据。当使用路径方案时，此属性应设定为证书的完整 UTF-8 编码路径，以字符串 \"file://\" 为前缀并以终止 NUL 字节结束。此属性可不设定，即使 EAP 方法支持 CA 证书，但这将允许中间人攻击因此不推荐。"
-+"specified using a \"scheme\"; three are currently supported: blob, path and "
-+"pkcs#11 URL. When using the blob scheme this property should be set to the "
-+"certificate's DER encoded data. When using the path scheme, this property "
-+"should be set to the full UTF-8 encoded path of the certificate, prefixed "
-+"with the string \"file://\" and ending with a terminating NUL byte. This "
-+"property can be unset even if the EAP method supports CA certificates, but "
-+"this allows man-in-the-middle attacks and is NOT recommended. Note that "
-+"enabling NMSetting8021x:system-ca-certs will override this setting to use "
-+"the built-in path, if the built-in path is not a directory."
-+msgstr "包含 \"phase2-auth\" 或 \"phase2-autheap\" 属性指定的 EAP 方法所使用的 \"phase 2\" CA 证书，证书数据由 \"scheme\" 指定；当前支持三种方案：blob、path 和 pkcs#11 URL。当使用 blob 时，此属性应设定为证书的 DER 编码数据。当使用 path 时，此属性应设定为证书的完整 UTF-8 编码路径，以字符串 \"file://\" 为前缀并以终止 NUL 字节结束。此属性可以被取消设定，即使 EAP 方法支持 CA 证书，但这将可能会受到中间人攻击，因此不推荐。请注意，启用 NMSetting8021x:system-ca-certs 将会覆盖这个设置来使用内建的路径，如果内建路径不是一个目录。"
-
--#: ../clients/common/settings-docs.h.in:71
-+#: ../clients/common/settings-docs.h.in:72
- msgid ""
- "The password used to access the \"phase2\" CA certificate stored in \"phase2-"
- "ca-cert\" property. Only makes sense if the certificate is stored on a "
- "PKCS#11 token that requires a login."
- msgstr "用于访问 \"phase2-ca-cert\" 属性里存储的 \"phase2\" CA 证书的密码。只在 PKCS#11 令牌里存储的证书需要登录时有意义。"
-
--#: ../clients/common/settings-docs.h.in:72
-+#: ../clients/common/settings-docs.h.in:73
- msgid ""
- "Flags indicating how to handle the \"phase2-ca-cert-password\" property."
- msgstr "指示如何处理 \"phase2-ca-cert-password\" 属性的标志。"
-
--#: ../clients/common/settings-docs.h.in:73
-+#: ../clients/common/settings-docs.h.in:74
- msgid ""
- "UTF-8 encoded path to a directory containing PEM or DER formatted "
- "certificates to be added to the verification chain in addition to the "
--"certificate specified in the \"phase2-ca-cert\" property."
--msgstr "指向包含 PEM 或 DER 格式化证书目录的 UTF-8 编码路径，该证书将同 \"phase2-ca-cert\" 属性里的指定证书一起添加到验证链。"
-+"certificate specified in the \"phase2-ca-cert\" property. If NMSetting8021x:"
-+"system-ca-certs is enabled and the built-in CA path is an existing "
-+"directory, then this setting is ignored."
-+msgstr "一个到包含 PEM 或 DER 格式证书的目录的 UTF-8 编码路径，它被添加到包括 \"phase2-ca-cert\" 属性中指定的证书的验证链中。如果 NMSetting8021x:system-ca-certs 被启用，并且内置的 CA 路径是一个现有的目录，那么这个设置将被忽略。"
-
--#: ../clients/common/settings-docs.h.in:74
-+#: ../clients/common/settings-docs.h.in:75
- msgid ""
- "Contains the \"phase 2\" client certificate if used by the EAP method "
- "specified in the \"phase2-auth\" or \"phase2-autheap\" properties. "
-@@ -6363,29 +6463,40 @@ msgid ""
- "in-the-middle attacks and is NOT recommended."
- msgstr "包含 \"phase2-auth\" 或 \"phase2-autheap\" 属性指定的 EAP 方法所使用的 \"phase 2\" 客户端证书，如果其使用了。证书数据用 \"scheme\" 指定；当前支持两种方案：比特块（blob）和路径。当使用比特块方案（与 NM 0.7.x 后向兼容）时，此属性应设定为证书的 DER 编码数据。当使用路径方案时，此属性应设定为证书的完整 UTF-8 编码路径，以字符串 \"file://\" 为前缀并以终止 NUL 字节结束。此属性可不设定，即使 EAP 方法支持 CA 证书，但这将允许中间人攻击因此不推荐。"
-
--#: ../clients/common/settings-docs.h.in:75
-+#: ../clients/common/settings-docs.h.in:76
- msgid ""
- "The password used to access the \"phase2\" client certificate stored in "
- "\"phase2-client-cert\" property. Only makes sense if the certificate is "
- "stored on a PKCS#11 token that requires a login."
- msgstr "用于访问 \"phase2-client-cert\" 属性里存储的 \"phase2\" 客户端证书的密码。只在 PKCS#11 令牌里存储的证书需要登录时有意义。"
-
--#: ../clients/common/settings-docs.h.in:76
-+#: ../clients/common/settings-docs.h.in:77
- msgid ""
- "Flags indicating how to handle the \"phase2-client-cert-password\" property."
- msgstr "指示如何处理 \"phase2-client-cert-password\" 属性的标志。"
-
--#: ../clients/common/settings-docs.h.in:77
-+#: ../clients/common/settings-docs.h.in:78
-+msgid ""
-+"Constraint for server domain name. If set, this list of FQDNs is used as a "
-+"match requirement for dNSName element(s) of the certificate presented by the "
-+"authentication server during the inner \"phase 2\" authentication. If a "
-+"matching dNSName is found, this constraint is met. If no dNSName values are "
-+"present, this constraint is matched against SubjectName CN using the same "
-+"comparison. Multiple valid FQDNs can be passed as a \";\" delimited list."
-+msgstr "服务器域名的约束。如果设定，在 inner \"phase 2\" 验证过程中，在这个列表中的 FQDN 用来匹配由验证服务器提供的证书的 dNSName 元素需求。如果找到了匹配的 dNSName，此约束被满足。如果没有 dNSName 值，此约束使用同样的比较方法来匹配 SubjectName CN。可以使用 \";\" 作为分隔符来提供包括多个有效 FQDN 的列表。"
-+
-+#: ../clients/common/settings-docs.h.in:79
- msgid ""
- "Constraint for server domain name. If set, this FQDN is used as a suffix "
- "match requirement for dNSName element(s) of the certificate presented by the "
- "authentication server during the inner \"phase 2\" authentication. If a "
- "matching dNSName is found, this constraint is met. If no dNSName values are "
- "present, this constraint is matched against SubjectName CN using same suffix "
--"match comparison."
--msgstr "服务器域名的约束。如果设定，在内部 \"phase 2\" 验证期间，此 FQDN 用作后缀以匹配验证服务器所提供证书的 dNSName 元素需求。如果找到了匹配的 dNSName，此约束被满足。如果未提供 dNSName 值，此约束用来匹配使用同个后缀匹配对比的 SubjectName CN。"
-+"match comparison. Since version 1.24, multiple valid FQDNs can be passed as "
-+"a \";\" delimited list."
-+msgstr "服务器域名的约束。如果设定，在 inner \"phase 2\" 验证过程中，在这个列表中的 FQDN 作为后缀来匹配由验证服务器提供的证书的 dNSName 元素需求。如果找到了匹配的 dNSName，此约束被满足。如果没有 dNSName 值，此约束使用同样的后缀比较来匹配 SubjectName CN。从版本 1.24 开始，可以使用 \";\" 作为分隔符来提供包括多个有效 FQDN 的列表。"
-
--#: ../clients/common/settings-docs.h.in:78
-+#: ../clients/common/settings-docs.h.in:80
- msgid ""
- "Contains the \"phase 2\" inner private key when the \"phase2-auth\" or "
- "\"phase2-autheap\" property is set to \"tls\". Key data is specified using a "
-@@ -6404,19 +6515,19 @@ msgid ""
- "decode the PKCS#12 private key and certificate."
- msgstr "包含如果 \"phase2-auth\" 或 \"phase2-autheap\" 属性设为 \"tls\" 时的 \"phase 2\" 内部私钥。密钥数据用 \"scheme\" 指定；当前支持两种方案：比特块（blob）和路径。当使用比特块方案时，此属性应设定为私钥加密过的 PEM 编码数据。当使用路径方案时，此属性应设定为私钥的完整 UTF-8 编码路径，以字符串 \"file://\" 为前缀并以终止 NUL 字节结束。当使用 PKCS#12 格式私钥和比特块方案时，此属性应设为 PKCS#12 数据且 \"phase2-private-key-password\" 属性必须设为用于解密 PKCS#12 证书和私钥的密码。当使用 PKCS#12 文件和路径方案时，此属性应设为私钥的完整 UTF-8 编码路径，以字符串 \"file://\" 为前缀并以终止 NUL 字节结束；而与 blob 方案同用时，\"phase2-private-key-password\" 属性必须设为用于解码 PKCS#12 私钥和证书的密码。"
-
--#: ../clients/common/settings-docs.h.in:79
-+#: ../clients/common/settings-docs.h.in:81
- msgid ""
- "The password used to decrypt the \"phase 2\" private key specified in the "
- "\"phase2-private-key\" property when the private key either uses the path "
- "scheme, or is a PKCS#12 format key."
- msgstr "当私钥使用路径方案或为 PKCS#12 格式时，解密 \"phase2-private-key\" 属性指定的 \"phase 2\" 私钥所使用的密码。"
-
--#: ../clients/common/settings-docs.h.in:80
-+#: ../clients/common/settings-docs.h.in:82
- msgid ""
- "Flags indicating how to handle the \"phase2-private-key-password\" property."
- msgstr "指示如何处理 \"phase2-private-key-password\" 属性的标志。"
-
--#: ../clients/common/settings-docs.h.in:81
-+#: ../clients/common/settings-docs.h.in:83
- msgid ""
- "Substring to be matched against the subject of the certificate presented by "
- "the authentication server during the inner \"phase 2\" authentication. When "
-@@ -6425,16 +6536,16 @@ msgid ""
- "deprecated in favor of NMSetting8021x:phase2-domain-suffix-match."
- msgstr "主题字符串，在 \"phase 2\" 验证期间将与验证服务器所提供证书的主题匹配。如果未设，不执行服务器证书的主题验证。就算设定了此属性也提供不了多少安全性，而且它的使用已废弃，取代的是 NMSetting8021x:phase2-domain-suffix-match。"
-
--#: ../clients/common/settings-docs.h.in:82
-+#: ../clients/common/settings-docs.h.in:84
- msgid "PIN used for EAP authentication methods."
- msgstr "用于 EAP 验证方法的 PIN。"
-
--#: ../clients/common/settings-docs.h.in:83
--#: ../clients/common/settings-docs.h.in:183
-+#: ../clients/common/settings-docs.h.in:85
-+#: ../clients/common/settings-docs.h.in:201
- msgid "Flags indicating how to handle the \"pin\" property."
- msgstr "指示如何处理 \"pin\" 属性的标志。"
-
--#: ../clients/common/settings-docs.h.in:84
-+#: ../clients/common/settings-docs.h.in:86
- msgid ""
- "Contains the private key when the \"eap\" property is set to \"tls\". Key "
- "data is specified using a \"scheme\"; two are currently supported: blob and "
-@@ -6456,18 +6567,18 @@ msgid ""
- "to prevent unauthorized access to unencrypted private key data."
- msgstr "包含如果 \"eap\" 属性设为 \"tls\" 时的私钥。私钥数据用 \"scheme\" 指定；当前支持两种方案：比特块（blob）和路径。当使用比特块方案时，此属性应设为私钥加密过的 PEM 编码数据。当使用路径方案时，此属性应设定为私钥的完整 UTF-8 编码路径，以字符串 \"file://\" 为前缀并以终止 NUL 字节结束。当使用 PKCS#12 格式私钥和比特块方案时，此属性应设为 PKCS#12 数据且 \"private-key-password\" 属性必须设为用于解密 PKCS#12 证书和私钥的密码。当使用 PKCS#12 文件和路径方案时，此属性应设为私钥的完整 UTF-8 编码路径，以字符串 \"file://\" 为前缀并以终止 NUL 字节结束；而与比特块方案同用时，\"private-key-password\" 属性必须设为用于解码 PKCS#12 私钥和证书的密码。警告：\"private-key\" 不是 \"secret\" 属性，因此使用比特块方案时未加密的私钥数据可能会被非特权用户读取。私钥总是应该用私钥密码加密以阻止对未加密私钥数据的未授权访问。"
-
--#: ../clients/common/settings-docs.h.in:85
-+#: ../clients/common/settings-docs.h.in:87
- msgid ""
- "The password used to decrypt the private key specified in the \"private-key"
- "\" property when the private key either uses the path scheme, or if the "
- "private key is a PKCS#12 format key."
- msgstr "当私钥使用路径方案或为 PKCS#12 格式时，解密 \"private-key\" 属性指定私钥所使用的密码。"
-
--#: ../clients/common/settings-docs.h.in:86
-+#: ../clients/common/settings-docs.h.in:88
- msgid "Flags indicating how to handle the \"private-key-password\" property."
- msgstr "指示如何处理 \"private-key-password\" 属性的标志。"
-
--#: ../clients/common/settings-docs.h.in:87
-+#: ../clients/common/settings-docs.h.in:89
- msgid ""
- "Substring to be matched against the subject of the certificate presented by "
- "the authentication server. When unset, no verification of the authentication "
-@@ -6476,7 +6587,7 @@ msgid ""
- "domain-suffix-match."
- msgstr "主题字符串，将与验证服务器所提供证书的主题匹配。如果未设，不执行服务器证书的主题验证。就算设定了此属性也提供不了多少安全性，而且它的使用已废弃，取代的是 NMSetting8021x:domain-suffix-match。"
-
--#: ../clients/common/settings-docs.h.in:88
-+#: ../clients/common/settings-docs.h.in:90
- msgid ""
- "When TRUE, overrides the \"ca-path\" and \"phase2-ca-path\" properties using "
- "the system CA directory specified at configure time with the --system-ca-"
-@@ -6488,7 +6599,7 @@ msgid ""
- "options for wpa_supplicant)."
- msgstr "设为 TRUE 时，覆盖掉 \"ca-path\" 和 \"phase2-ca-path\" 属性，换成使用配置时 --system-ca-path 指定的系统 CA 目录。该目录中的证书同 \"ca-cert\" 和 \"phase2-ca-cert\" 属性指定的任何证书一起加入到验证链。如果以 --system-ca-path 提供的路径不是文件名（捆绑或受信任 CA 证书），它会变成覆盖 \"ca-cert\" 和 \"phase2-ca-cert\" 属性（为 wpa_supplicant 设定 ca_cert/ca_cert2 选项）。"
-
--#: ../clients/common/settings-docs.h.in:89
-+#: ../clients/common/settings-docs.h.in:91
- msgid ""
- "When TRUE, enforce auto-negotiation of speed and duplex mode. If \"speed\" "
- "and \"duplex\" properties are both specified, only that single mode will be "
-@@ -6499,7 +6610,7 @@ msgid ""
- "be skipped."
- msgstr "为 TRUE 时，强制速度和双工模式的自动协商。如果 \"speed\" 和 \"duplex\" 属性都指定了，只有那一个模式会在链路自动协商过程中被通告和接受：这只对 BASE-T 802.3 规范有效并用于强制吉比特模式，因为在这些情况下链路协商时强制性的。为 FALSE 时，\"speed\" 和 \"duplex\" 属性应该都设置，否则链路配置将被忽略。"
-
--#: ../clients/common/settings-docs.h.in:90
-+#: ../clients/common/settings-docs.h.in:92
- msgid ""
- "If specified, request that the device use this MAC address instead. This is "
- "known as MAC cloning or spoofing. Beside explicitly specifying a MAC "
-@@ -6516,7 +6627,7 @@ msgid ""
- "\"cloned-mac-address\"."
- msgstr "如指定了，则请求该设备使用此 MAC 地址来代替。这个可被称为 MAC 克隆或欺骗。除了明确地指定 MAC 地址，也支持 \"preserve\"、\"permanent\"、\"random\" 和 \"stable\" 等特殊值。\"preserve\" 表示激活时不动 MAC 地址。\"permanent\" 使用设备的永久硬件地址。\"random\" 则在每个连接上创建随机的 MAC 地址。\"stable\" 则根据 connection.stable-id 和机器相关密钥创建散列的 MAC 地址。如未指定，该值可被全局默认值覆盖，参见 NetworkManager.conf 的手册。如还未指定，它就默认为 \"permanent\"。在 D-Bus 上, 此字段表示为 \"assigned-mac-address\" 或已弃用的 \"cloned-mac-address\"。"
-
--#: ../clients/common/settings-docs.h.in:91
-+#: ../clients/common/settings-docs.h.in:93
- msgid ""
- "When a value is set, either \"half\" or \"full\", configures the device to "
- "use the specified duplex mode. If \"auto-negotiate\" is \"yes\" the "
-@@ -6531,21 +6642,21 @@ msgid ""
- "your device supports it."
- msgstr "设定值时，\"half\" 和 \"full\" 二选一，配置设备要使用的指定双工模式。如果 \"auto-negotiate\" 为 \"yes\"，只有指定的模式会在链路自动协商过程中被通告：这只对 BASE-T 802.3 规范有效并用于强制吉比特模式，因为在这些情况下链路协商时强制性的。如果值未设定（默认值），链路配置要么将被忽略（如果 \"auto-negotiate\" 为 \"no\"，默认值）要么将被自动协商（如果 \"auto-negotiate\" 为 \"yes\"），并且本地设备将通告所有支持的双工模式。如果指定，必须与 \"speed\" 属性一块设定。在指定双工模式前请确保您的设备支持。"
-
--#: ../clients/common/settings-docs.h.in:93
-+#: ../clients/common/settings-docs.h.in:95
- msgid ""
- "If specified, this connection will only apply to the Ethernet device whose "
- "permanent MAC address matches. This property does not change the MAC address "
- "of the device (i.e. MAC spoofing)."
- msgstr "如果指定了，此连接将只应用到其永久 MAC 地址匹配的以太网设备。此属性不会改变设备的 MAC 地址（例如 MAC 欺骗）。"
-
--#: ../clients/common/settings-docs.h.in:94
-+#: ../clients/common/settings-docs.h.in:96
- msgid ""
- "If specified, this connection will never apply to the Ethernet device whose "
- "permanent MAC address matches an address in the list. Each MAC address is "
- "in the standard hex-digits-and-colons notation (00:11:22:33:44:55)."
- msgstr "如果指定了，此连接将从不应用到其永久 MAC 地址与列表里的地址匹配的以太网设备。每个 MAC 地址采用标准的十六进制数字和冒号标记（00:11:22:33:44:55）。"
-
--#: ../clients/common/settings-docs.h.in:96
-+#: ../clients/common/settings-docs.h.in:98
- msgid ""
- "Specific port type to use if the device supports multiple attachment "
- "methods. One of \"tp\" (Twisted Pair), \"aui\" (Attachment Unit Interface), "
-@@ -6553,13 +6664,13 @@ msgid ""
- "device supports only one port type, this setting is ignored."
- msgstr "如果设备支持多个连接方法，指定其使用的端口类型。\"tp\"（双绞线）、\"aui\"（连接单元接口）、\"bnc\"（细以太网）或 \"mii\"（介质无关接口）之一。如果设备只支持一个端口类型，忽略此设置。"
-
--#: ../clients/common/settings-docs.h.in:97
-+#: ../clients/common/settings-docs.h.in:99
- msgid ""
- "s390 network device type; one of \"qeth\", \"lcs\", or \"ctc\", representing "
- "the different types of virtual network devices available on s390 systems."
- msgstr "s390 网络设备类型；\"qeth\"、\"lcs\" 或 \"ctc\" 之一，代表 s390 系统上可用的不同虚拟网络设备。"
-
--#: ../clients/common/settings-docs.h.in:98
-+#: ../clients/common/settings-docs.h.in:100
- msgid ""
- "Dictionary of key/value pairs of s390-specific device options. Both keys "
- "and values must be strings. Allowed keys include \"portno\", \"layer2\", "
-@@ -6567,7 +6678,7 @@ msgid ""
- "alphanumeric characters (ie, [a-zA-Z0-9])."
- msgstr "s390 特定设备的键值对字典。键和值都必须为字符串。允许的值包括 \"portno\"、\"layer2\"、\"portname\"、\"protocol\" 等等。键名必须只能包含字母数字字符（例如 [a-zA-Z0-9]）。"
-
--#: ../clients/common/settings-docs.h.in:99
-+#: ../clients/common/settings-docs.h.in:101
- msgid ""
- "Identifies specific subchannels that this network device uses for "
- "communication with z/VM or s390 host. Like the \"mac-address\" property for "
-@@ -6577,7 +6688,7 @@ msgid ""
- "hexadecimal characters and the period (.) character."
- msgstr "指定此网络设备与 z/VM 或 s390 主机通信使用的子通道的标识符。如 \"mac-address\" 用于非 z/VM 设备，此属性可用来确保此连接只应用到使用这些子通道的网络设备。列表应该包含 3 个字符串，且每个字符串只能由十六进制字符和半角句号（.）字符组成。"
-
--#: ../clients/common/settings-docs.h.in:100
-+#: ../clients/common/settings-docs.h.in:102
- msgid ""
- "When a value greater than 0 is set, configures the device to use the "
- "specified speed. If \"auto-negotiate\" is \"yes\" the specified speed will "
-@@ -6592,7 +6703,7 @@ msgid ""
- "supports it."
- msgstr "当设定为大于 0 的值时，配置此设备使用指定的速度。如果 \"auto-negotiate\" 为 \"yes\"，只有指定的速度会在链路自动协商过程中被通告：这只对 BASE-T 802.3 规范有效并用于强制吉比特模式，因为在这些情况下链路协商时强制性的。如果值未设定（0，默认值），链路配置要么将被忽略（如果 \"auto-negotiate\" 为 \"no\"，默认值）要么将被自动协商（如果 \"auto-negotiate\" 为 \"yes\"），并且本地设备将通告所有支持的双工模式。单位为 Mbit/s，例如 100 == 100Mbit/s。如果非零，必须与 \"duplex\" 属性一块设定。在指定速度值前请确保您的设备支持。"
-
--#: ../clients/common/settings-docs.h.in:101
-+#: ../clients/common/settings-docs.h.in:103
- msgid ""
- "The NMSettingWiredWakeOnLan options to enable. Not all devices support all "
- "options. May be any combination of NM_SETTING_WIRED_WAKE_ON_LAN_PHY (0x2), "
-@@ -6605,63 +6716,71 @@ msgid ""
- "disable management of Wake-on-LAN in NetworkManager)."
- msgstr "启用 NMSettingWiredWakeOnLan 的选项。并非全部设备都支持所有选项。可以是以下选项的任意组合：NM_SETTING_WIRED_WAKE_ON_LAN_PHY (0x2)、NM_SETTING_WIRED_WAKE_ON_LAN_UNICAST (0x4)、NM_SETTING_WIRED_WAKE_ON_LAN_MULTICAST (0x8)、NM_SETTING_WIRED_WAKE_ON_LAN_BROADCAST (0x10)、NM_SETTING_WIRED_WAKE_ON_LAN_ARP (0x20)、NM_SETTING_WIRED_WAKE_ON_LAN_MAGIC (0x40) 或特殊值 NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT (0x1)（使用全局设置）和 NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE (0x8000)（在网络管理器（NetworkManager）里禁用 LAN 唤醒的管理）。"
-
--#: ../clients/common/settings-docs.h.in:102
-+#: ../clients/common/settings-docs.h.in:104
- msgid ""
- "If specified, the password used with magic-packet-based Wake-on-LAN, "
- "represented as an Ethernet MAC address. If NULL, no password will be "
- "required."
- msgstr "如果指定了，其为基于幻数据包的 LAN 唤醒所使用的密码，表示为以太网 MAC 地址。如果为 NULL，将不需要密码。"
-
--#: ../clients/common/settings-docs.h.in:103
-+#: ../clients/common/settings-docs.h.in:105
- msgid "Encapsulation of ADSL connection. Can be \"vcmux\" or \"llc\"."
- msgstr "ADSL 连接的封装。可以是 \"vcmux\" 或 \"llc\"。"
-
--#: ../clients/common/settings-docs.h.in:104
-+#: ../clients/common/settings-docs.h.in:106
- msgid "Password used to authenticate with the ADSL service."
- msgstr "用于 ADSL 服务验证的密码。"
-
--#: ../clients/common/settings-docs.h.in:106
-+#: ../clients/common/settings-docs.h.in:108
- msgid "ADSL connection protocol. Can be \"pppoa\", \"pppoe\" or \"ipoatm\"."
- msgstr "ADSL 连接协议。可为 \"pppoa\"、\"pppoe\" 或 \"ipoatm\"。"
-
--#: ../clients/common/settings-docs.h.in:107
-+#: ../clients/common/settings-docs.h.in:109
- msgid "Username used to authenticate with the ADSL service."
- msgstr "用于 ADSL 服务验证的用户名。"
-
--#: ../clients/common/settings-docs.h.in:108
-+#: ../clients/common/settings-docs.h.in:110
- msgid "VCI of ADSL connection"
- msgstr "ADSL 连接的 VCI"
-
--#: ../clients/common/settings-docs.h.in:109
-+#: ../clients/common/settings-docs.h.in:111
- msgid "VPI of ADSL connection"
- msgstr "ADSL 连接的 VPI"
-
--#: ../clients/common/settings-docs.h.in:110
-+#: ../clients/common/settings-docs.h.in:112
- msgid "The Bluetooth address of the device."
- msgstr "设备的蓝牙地址。"
-
--#: ../clients/common/settings-docs.h.in:111
-+#: ../clients/common/settings-docs.h.in:113
- msgid ""
- "Either \"dun\" for Dial-Up Networking connections or \"panu\" for Personal "
- "Area Networking connections to devices supporting the NAP profile."
- msgstr "拨号网络连接时使用 \"dun\"，或者支持 NAP 配置集设备的个人区域网络连接时使用 \"panu\"。"
-
--#: ../clients/common/settings-docs.h.in:112
-+#: ../clients/common/settings-docs.h.in:114
- msgid ""
- "Dictionary of key/value pairs of bonding options. Both keys and values must "
- "be strings. Option names must contain only alphanumeric characters (ie, [a-"
- "zA-Z0-9])."
- msgstr "绑定（bonding）选项的键/值对目录。键和值都必须为字符串。选项名必须只能包含字母数字字符（示例 [a-zA-Z0-9]）。"
-
--#: ../clients/common/settings-docs.h.in:113
-+#: ../clients/common/settings-docs.h.in:115
- msgid "The Ethernet MAC address aging time, in seconds."
- msgstr "以太网 MAC 地址的老化时间，以秒计。"
-
--#: ../clients/common/settings-docs.h.in:114
-+#: ../clients/common/settings-docs.h.in:116
- msgid "The Spanning Tree Protocol (STP) forwarding delay, in seconds."
- msgstr "生成树协议（STP）转发延迟，以秒计。"
-
--#: ../clients/common/settings-docs.h.in:115
-+#: ../clients/common/settings-docs.h.in:117
-+msgid ""
-+"If specified, The MAC address of the multicast group this bridge uses for "
-+"STP. The address must be a link-local address in standard Ethernet MAC "
-+"address format, ie an address of the form 01:80:C2:00:00:0X, with X in [0, "
-+"4..F]. If not specified the default value is 01:80:C2:00:00:00."
-+msgstr "如果指定，此网桥用于 STP 的多播组的 MAC 地址。该地址必须是标准以太网 MAC 地址格式的 link-local 地址，例如 01:80:C2:00:00:0X，其中的 X 为 [0, 4..F] 范围中的一个值。如果没有指定，则使用默认值 01:80:C2:00:00:00。"
-+
-+#: ../clients/common/settings-docs.h.in:118
- msgid ""
- "A mask of group addresses to forward. Usually, group addresses in the range "
- "from 01:80:C2:00:00:00 to 01:80:C2:00:00:0F are not forwarded according to "
-@@ -6670,11 +6789,11 @@ msgid ""
- "or 2 set because they are used for STP, MAC pause frames and LACP."
- msgstr "要转发的组地址掩码。通常，范围在 01:80:C2:00:00:00 到 01:80:C2:00:00:0F 内的组地址根据标准不转发。此属性是个 16 位的掩码，每个对应于一个组地址，组地址范围内的地址必须被转发。掩码不能设定了位 0、1 或 2，因为它们用于 STP、MAC 暂停帧和 LACP。"
-
--#: ../clients/common/settings-docs.h.in:116
-+#: ../clients/common/settings-docs.h.in:119
- msgid "The Spanning Tree Protocol (STP) hello time, in seconds."
- msgstr "生成树协议（STP）呼叫时间，以秒计。"
-
--#: ../clients/common/settings-docs.h.in:117
-+#: ../clients/common/settings-docs.h.in:120
- msgid ""
- "If specified, the MAC address of bridge. When creating a new bridge, this "
- "MAC address will be set. If this field is left unspecified, the \"ethernet."
-@@ -6684,40 +6803,119 @@ msgid ""
- "property is deprecated. Deprecated: 1"
- msgstr "如果指定了，其为网桥的 MAC 地址。当创建新网桥时，将设定此 MAC 地址。如果不指定此字段，换成引用 \"ethernet.cloned-mac-address\" 来生成初始 MAC 地址。注意设置 \"ethernet.cloned-mac-address\" 怎样都会在之后激活网桥时覆盖网桥的 MAC 地址。因此，此属性被弃用。已弃用：1"
-
--#: ../clients/common/settings-docs.h.in:118
-+#: ../clients/common/settings-docs.h.in:121
- msgid "The Spanning Tree Protocol (STP) maximum message age, in seconds."
- msgstr "生成树协议（STP）最大消息寿命，以秒计。"
-
--#: ../clients/common/settings-docs.h.in:119
-+#: ../clients/common/settings-docs.h.in:122
-+msgid "Set maximum size of multicast hash table (value must be a power of 2)."
-+msgstr "设置多播哈希表的最大大小（数值必须是 2 的指数）。"
-+
-+#: ../clients/common/settings-docs.h.in:123
-+msgid ""
-+"Set the number of queries the bridge will send before stopping forwarding a "
-+"multicast group after a \"leave\" message has been received."
-+msgstr "设置网桥在收到 \"leave\" 消息后，停止转发一个多播组之前，将发送的查询次数。"
-+
-+#: ../clients/common/settings-docs.h.in:124
-+msgid ""
-+"Set interval (in deciseconds) between queries to find remaining members of a "
-+"group, after a \"leave\" message is received."
-+msgstr "设置在收到 \"leave\" 消息后，查询寻找组内剩余成员的时间间隔（以十分之一秒为单位）。"
-+
-+#: ../clients/common/settings-docs.h.in:125
-+msgid ""
-+"Set delay (in deciseconds) after which the bridge will leave a group, if no "
-+"membership reports for this group are received."
-+msgstr "设置延迟时间（以十分之一秒为单位），如果没有收到该组的成员报告，则桥接将在这个延迟时间后离开该组。"
-+
-+#: ../clients/common/settings-docs.h.in:126
-+msgid ""
-+"Enable or disable sending of multicast queries by the bridge. If not "
-+"specified the option is disabled."
-+msgstr "启用或禁用网桥发送多播查询。如果没有指定，则禁用该选项。"
-+
-+#: ../clients/common/settings-docs.h.in:127
-+msgid ""
-+"If no queries are seen after this delay (in deciseconds) has passed, the "
-+"bridge will start to send its own queries."
-+msgstr "如果过了这个延迟时间（以十分之一秒为单位），没有看到查询，网桥将开始发送自己的查询。"
-+
-+#: ../clients/common/settings-docs.h.in:128
-+msgid ""
-+"Interval (in deciseconds) between queries sent by the bridge after the end "
-+"of the startup phase."
-+msgstr "启动阶段结束后，网桥发送的查询之间的时间间隔（以十分之一秒为单位）。"
-+
-+#: ../clients/common/settings-docs.h.in:129
-+msgid ""
-+"Set the Max Response Time/Max Response Delay (in deciseconds) for IGMP/MLD "
-+"queries sent by the bridge."
-+msgstr "设置网桥发送的 IGMP/MLD 查询的最大响应时间/最大响应延迟（以十分之一秒为单位）。"
-+
-+#: ../clients/common/settings-docs.h.in:130
-+msgid ""
-+"If enabled the bridge's own IP address is used as the source address for "
-+"IGMP queries otherwise the default of 0.0.0.0 is used."
-+msgstr "如果启用，网桥自己的 IP 地址将作为 IGMP 查询的源地址，否则将使用默认的 0.0.0.0。"
-+
-+#: ../clients/common/settings-docs.h.in:131
-+msgid ""
-+"Sets bridge's multicast router. Multicast-snooping must be enabled for this "
-+"option to work. Supported values are: 'auto', 'disabled', 'enabled'. If not "
-+"specified the default value is 'auto'."
-+msgstr "设置网桥的多播路由器。只有在启用了multicast-snooping 时此选项才起作用。支持的值有： 'auto'、 'disabled'、 'enabled'。如果没有指定，默认值是'auto'。"
-+
-+#: ../clients/common/settings-docs.h.in:132
- msgid ""
- "Controls whether IGMP snooping is enabled for this bridge. Note that if "
- "snooping was automatically disabled due to hash collisions, the system may "
- "refuse to enable the feature until the collisions are resolved."
- msgstr "控制是否为此网桥启用 IGMP 监听。注意如果散列冲突监听会被自动禁用，系统可能拒绝启用该功能直到冲突解决。"
-
--#: ../clients/common/settings-docs.h.in:120
-+#: ../clients/common/settings-docs.h.in:133
-+msgid "Set the number of IGMP queries to send during startup phase."
-+msgstr "设置在启动阶段要发送的 IGMP 查询次数。"
-+
-+#: ../clients/common/settings-docs.h.in:134
-+msgid ""
-+"Sets the time (in deciseconds) between queries sent out at startup to "
-+"determine membership information."
-+msgstr "设置启动时为确定成员信息而发出的查询之间的间隔时间（以十分之一秒为单位）。"
-+
-+#: ../clients/common/settings-docs.h.in:135
- msgid ""
- "Sets the Spanning Tree Protocol (STP) priority for this bridge. Lower "
- "values are \"better\"; the lowest priority bridge will be elected the root "
- "bridge."
- msgstr "设定此网桥的生成树协议（STP）优先级。值越小优先级越高；最高优先级（值最低）的网桥将选为根桥。"
-
--#: ../clients/common/settings-docs.h.in:121
-+#: ../clients/common/settings-docs.h.in:136
- msgid ""
- "Controls whether Spanning Tree Protocol (STP) is enabled for this bridge."
- msgstr "控制是否为此网桥启用生成树协议（STP）。"
-
--#: ../clients/common/settings-docs.h.in:122
-+#: ../clients/common/settings-docs.h.in:137
- msgid ""
- "The default PVID for the ports of the bridge, that is the VLAN id assigned "
- "to incoming untagged frames."
- msgstr "网桥端口的默认 PVID，它是分配给入站的未经过 tag 的数据包的 VLAN id。"
-
--#: ../clients/common/settings-docs.h.in:123
-+#: ../clients/common/settings-docs.h.in:138
- msgid "Control whether VLAN filtering is enabled on the bridge."
- msgstr "控制在网桥中是否启用 VLAN 过滤。"
-
--#: ../clients/common/settings-docs.h.in:124
-+#: ../clients/common/settings-docs.h.in:139
-+msgid ""
-+"If specified, the protocol used for VLAN filtering. Supported values are: "
-+"'802.1Q', '802.1ad'. If not specified the default value is '802.1Q'."
-+msgstr "如果指定，则表示用于 VLAN 过滤的协议。支持的值有：'802.1Q'、'802.1ad'。如果没有指定，默认值是'802.1Q'。"
-+
-+#: ../clients/common/settings-docs.h.in:140
-+msgid "Controls whether per-VLAN stats accounting is enabled."
-+msgstr "控制是否启用每个 VLAN 的统计核算。"
-+
-+#: ../clients/common/settings-docs.h.in:141
- 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-"
-@@ -6727,22 +6925,22 @@ msgid ""
- "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:125
-+#: ../clients/common/settings-docs.h.in:142
- 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:126
-+#: ../clients/common/settings-docs.h.in:143
- msgid ""
- "The Spanning Tree Protocol (STP) port cost for destinations via this port."
- msgstr "通过此端口的目标的生成树协议（STP）端口开销。"
-
--#: ../clients/common/settings-docs.h.in:127
-+#: ../clients/common/settings-docs.h.in:144
- msgid "The Spanning Tree Protocol (STP) priority of this bridge port."
- msgstr "此网桥端口的生成树协议（STP）优先级。"
-
--#: ../clients/common/settings-docs.h.in:128
-+#: ../clients/common/settings-docs.h.in:145
- 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 "
-@@ -6752,38 +6950,38 @@ msgid ""
- "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:129
--#: ../clients/common/settings-docs.h.in:177
--#: ../clients/common/settings-docs.h.in:188
-+#: ../clients/common/settings-docs.h.in:146
-+#: ../clients/common/settings-docs.h.in:195
-+#: ../clients/common/settings-docs.h.in:206
- 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:130
-+#: ../clients/common/settings-docs.h.in:147
- msgid ""
- "The number to dial to establish the connection to the CDMA-based mobile "
- "broadband network, if any. If not specified, the default number (#777) is "
- "used when required."
- msgstr "建立基于 CDMA 移动宽带网络连接的拨号号码，如果有的话。如未指定，需要时默认使用号码（#777）。"
-
--#: ../clients/common/settings-docs.h.in:131
--#: ../clients/common/settings-docs.h.in:180
-+#: ../clients/common/settings-docs.h.in:148
-+#: ../clients/common/settings-docs.h.in:198
- msgid ""
- "The password used to authenticate with the network, if required. Many "
- "providers do not require a password, or accept any password. But if a "
- "password is required, it is specified here."
- msgstr "用于与网络验证的密码，如果需要。很多运营商不需要密码，或是接受任何密码。但是如果需要密码，可在这里指定。"
-
--#: ../clients/common/settings-docs.h.in:133
--#: ../clients/common/settings-docs.h.in:186
-+#: ../clients/common/settings-docs.h.in:150
-+#: ../clients/common/settings-docs.h.in:204
- msgid ""
- "The username used to authenticate with the network, if required. Many "
- "providers do not require a username, or accept any username. But if a "
- "username is required, it is specified here."
- msgstr "用于与网络验证的用户名，如果需要。很多运营商不需要用户名，或是接受任何用户名。但是如果需要用户名，可在这里指定。"
-
--#: ../clients/common/settings-docs.h.in:134
-+#: ../clients/common/settings-docs.h.in:151
- 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 "
-@@ -6791,7 +6989,7 @@ msgid ""
- "Currently this only applies to 802-1x authentication."
- msgstr "验证的重试次数。零代表无限次数；-1 代表使用全局默认值。如果全局默认值未设定，允许连接失败前验证重试 3 次。当前此属性只应用到 802.1x 验证。"
-
--#: ../clients/common/settings-docs.h.in:135
-+#: ../clients/common/settings-docs.h.in:152
- msgid ""
- "Whether or not the connection should be automatically connected by "
- "NetworkManager when the resources for the connection are available. TRUE to "
-@@ -6801,14 +6999,14 @@ msgid ""
- "profiles."
- msgstr "当连接资源可用时，网络管理器（NetworkManager）是否自动连接。TRUE 为自动激活连接，FALSE 为请求手动介入来激活连接。注意自动连接未实现于 VPN 配置集。要自动连接 VPN 配置集请参阅作为备用方法的 \"secondaries\"。"
-
--#: ../clients/common/settings-docs.h.in:136
-+#: ../clients/common/settings-docs.h.in:153
- msgid ""
- "The autoconnect priority. If the connection is set to autoconnect, "
- "connections with higher priority will be preferred. Defaults to 0. The "
- "higher number means higher priority."
- msgstr "自动连接优先级。如果连接设为自动连接时，首选高优先级的连接。默认为 0。数值越高优先级越高。"
-
--#: ../clients/common/settings-docs.h.in:137
-+#: ../clients/common/settings-docs.h.in:154
- 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 "
-@@ -6817,7 +7015,7 @@ msgid ""
- "autoconnect again."
- msgstr "自动激活放弃前连接应该尝试的次数。零表示从不，-1 表示全局默认值（未被覆盖时为 4 次）。设定此属性为 1 表示阻止自动连接前只尝试一次激活。注意一段超时时间后，网络管理器（NetworkManager）将重新尝试自动连接。"
-
--#: ../clients/common/settings-docs.h.in:138
-+#: ../clients/common/settings-docs.h.in:155
- msgid ""
- "Whether or not slaves of this connection should be automatically brought up "
- "when NetworkManager activates this connection. This only has a real effect "
-@@ -6829,19 +7027,19 @@ msgid ""
- "value. If it is default as well, this fallbacks to 0."
- msgstr "NetworkManger 激活此连接时，是否自动启动此连接的从连接。这只对主连接有实际效果。属性 \"autoconnect\"、\"autoconnect-priority\" 和 \"autoconnect-retries\" 跟此设置无关。允许的值有：0：保持从连接不变；1：激活此连接的所有从连接；-1：默认。如果设为 -1（默认）时，读取全局 connection.autoconnect-slaves 以确定实际值。如果它也是默认的，此设置回落到 0。"
-
--#: ../clients/common/settings-docs.h.in:139
-+#: ../clients/common/settings-docs.h.in:156
- 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:140
-+#: ../clients/common/settings-docs.h.in:157
- 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:141
-+#: ../clients/common/settings-docs.h.in:158
- 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 "
-@@ -6854,48 +7052,64 @@ msgid ""
- "interface."
- msgstr "此连接绑定的网络接口名称。如果未设定，此连接可以连接到任何合适类型的接口（受其他设置的限制）。对于软件设备，此值指定创建设备的名称。对于其接口名无法很容易固定的连接类型（例如 移动宽带或 USB 以太网），不应使用此属性。设置此属性会限制连接可以使用的接口，而且当接口名改变或重新排序了，连接可能会应用到错误的接口。"
-
--#: ../clients/common/settings-docs.h.in:142
-+#: ../clients/common/settings-docs.h.in:159
- msgid "Whether LLDP is enabled for the connection."
- msgstr "是否为连接启用 LLDP。"
-
--#: ../clients/common/settings-docs.h.in:143
-+#: ../clients/common/settings-docs.h.in:160
- 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 "
- "format that allows both IPv4 and IPv6 hosts to perform name resolution for "
--"hosts on the same local link. The permitted values are: yes: register "
--"hostname and resolving for the connection, no: disable LLMNR for the "
--"interface, resolve: do not register hostname but allow resolving of LLMNR "
--"host names. This feature requires a plugin which supports LLMNR. One such "
--"plugin is dns-systemd-resolved."
--msgstr "连接是否启用 LLMNR（Link-Local Multicast Name Resolution）。LLMNR 是一个基于 DNS 的数据包格式，它可以使 IPv4 和 IPv6 主机对位于本地连接中的主机进行名称解析。它的值可以是: yes: 注册主机名并为连接进行解析，no: 在接口中禁用 LLMNR，resolve: 不注册主机名，但允许解析 LLMNR 主机名。这个功能需要支持 LLMNR 的插件。例如，dns-systemd-resolved 就是这样一个插件。"
-+"hosts on the same local link. The permitted values are: \"yes\" (2) register "
-+"hostname and resolving for the connection, \"no\" (0) disable LLMNR for the "
-+"interface, \"resolve\" (1) do not register hostname but allow resolving of "
-+"LLMNR host names If unspecified, \"default\" ultimately depends on the DNS "
-+"plugin (which for systemd-resolved currently means \"yes\"). This feature "
-+"requires a plugin which supports LLMNR. Otherwise the setting has no effect. "
-+"One such plugin is dns-systemd-resolved."
-+msgstr "连接是否启用 LLMNR（Link-Local Multicast Name Resolution）。LLMNR 是一个基于 DNS 的数据包格式，它可以使 IPv4 和 IPv6 主机对位于本地连接中的主机进行名称解析。它的值可以是: \"yes\" (2) 注册主机名并为连接进行解析，\"no\" (0) 在接口中禁用 LLMNR，\"resolve\" (1) 不注册主机名，但允许解析 LLMNR 主机名。如果未指定，\"default\" 将取决于 DNS 插件 (systemd-resolved 当前代表 \"yes\")。这个功能需要支持 LLMNR 的插件，否则设置无效。例如，dns-systemd-resolved 就是这样一个插件。"
-
--#: ../clients/common/settings-docs.h.in:144
-+#: ../clients/common/settings-docs.h.in:161
- msgid "Interface name of the master device or UUID of the master connection."
- msgstr "主设备的接口名或 UUID 或主连接。"
-
--#: ../clients/common/settings-docs.h.in:145
-+#: ../clients/common/settings-docs.h.in:162
- msgid ""
--"Whether mDNS is enabled for the connection. The permitted values are: yes: "
--"register hostname and resolving for the connection, no: disable mDNS for the "
--"interface, resolve: do not register hostname but allow resolving of mDNS "
--"host names. This feature requires a plugin which supports mDNS. One such "
--"plugin is dns-systemd-resolved."
--msgstr "是否为连接启用 mDNS。它的值可以是：yes: 注册主机名并为连接进行解析，no: 接口禁用 mDNS，resolve: 不注册主机名但允许解析 mDNS 主机名。这个功能需要一个支持 mDNS 的插件。dns-systemd-resolved 就是这样一个插件。"
-+"Whether mDNS is enabled for the connection. The permitted values are: \"yes"
-+"\" (2) register hostname and resolving for the connection, \"no\" (0) "
-+"disable mDNS for the interface, \"resolve\" (1) do not register hostname but "
-+"allow resolving of mDNS host names and \"default\" (-1) to allow lookup of a "
-+"global default in NetworkManager.conf. If unspecified, \"default\" "
-+"ultimately depends on the DNS plugin (which for systemd-resolved currently "
-+"means \"no\"). This feature requires a plugin which supports mDNS. Otherwise "
-+"the setting has no effect. One such plugin is dns-systemd-resolved."
-+msgstr "是否为连接启用 mDNS。允许的值为：\"yes\" (2) 为连接注册主机名和解析，\"no\" (0) 禁用接口的mDNS，\"resolve\" (1) 不注册主机名，但允许解析 mDNS 主机名，\"default\" (-1) 允许在 NetworkManager.conf 中查找全局默认值。如果没有指定，\"default\" 最终取决于 DNS 插件（对于systemd-resolved 目前代表\"no\"）。这个功能需要一个支持 mDNS 的插件。否则这个设置无效。dns-systemd-resolved 就是这样一个插件。"
-
--#: ../clients/common/settings-docs.h.in:146
-+#: ../clients/common/settings-docs.h.in:163
- 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:147
-+#: ../clients/common/settings-docs.h.in:164
-+msgid ""
-+"If configured, set to a Manufacturer Usage Description (MUD) URL that points "
-+"to manufacturer-recommended network policies for IoT devices. It is "
-+"transmitted as a DHCPv4 or DHCPv6 option. The value must be a valid URL "
-+"starting with \"https://\". The special value \"none\" is allowed to "
-+"indicate that no MUD URL is used. If the per-profile value is unspecified "
-+"(the default), a global connection default gets consulted. If still "
-+"unspecified, the ultimate default is \"none\"."
-+msgstr "如果配置，设置为制造商使用说明（MUD）URL，该 URL 指向制造商推荐的 IoT 设备网络策略。它作为DHCPv4 或 DHCPv6 选项传输。该值必须是以 \"https://\" 开头的有效 URL。允许使用特殊值 \"none\" 来表示没有使用 MUD URL。如果每个配置文件的值是未指定的（默认），全局连接的默认值会被参考。如果仍然没有指定，最终的默认值是 \"none\"。"
-+
-+#: ../clients/common/settings-docs.h.in:165
- 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:148
-+#: ../clients/common/settings-docs.h.in:166
- 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 "
-@@ -6910,26 +7124,26 @@ msgid ""
- "[id], and [reserved] must be valid UTF-8."
- msgstr "字符串数组，用于定义给定用户对此连接的访问权。如果此属性为 NULL 或空，允许所有用户访问此连接；否则只允许在此列表中的用户。当此属性非空时，只有当指定用户之一登录到活动会话时，连接被激活。每个条目的形式为 \"[类型]:[ID]:[已保留]\"；例如 \"user:dcbw:blah\"。此时，只允许用户 \"user\" [类型]。其他任何值被忽略并保留为将来使用。[ID] 是此权限引用的用户名，不能包含冒号 \":\" 字符。存在的任何 [已保留] 信息都必须被忽略并保留为将来使用。所有的 [类型]、[ID] 和 [已保留] 都必须为有效的 UTF-8。"
-
--#: ../clients/common/settings-docs.h.in:149
-+#: ../clients/common/settings-docs.h.in:167
- msgid ""
- "FALSE if the connection can be modified using the provided settings "
- "service's D-Bus interface with the right privileges, or TRUE if the "
- "connection is read-only and cannot be modified."
- msgstr "如果连接可以用提供设置服务的 D-Bus 接口以正确的权限来修改，为 FALSE；如果连接为只读且无法修改，为 TRUE。"
-
--#: ../clients/common/settings-docs.h.in:150
-+#: ../clients/common/settings-docs.h.in:168
- 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:151
-+#: ../clients/common/settings-docs.h.in:169
- msgid ""
- "Setting name of the device type of this slave's master connection (eg, \"bond"
- "\"), or NULL if this connection is not a slave."
- msgstr "此从连接的主连接设备类型的设置名称（例如 \"bond\"），或者为 NULL 如果此连接不是从连接。"
-
--#: ../clients/common/settings-docs.h.in:152
-+#: ../clients/common/settings-docs.h.in:170
- msgid ""
- "This represents the identity of the connection used for various purposes. It "
- "allows to configure multiple profiles to share the identity. Also, the "
-@@ -6960,7 +7174,7 @@ msgid ""
- "uses a unique, fixed ID for the connection."
- msgstr "这代表了用于多个目的的连接标识。它允许通过配置多个配置集来共享这个标识。另外，stable-id 可以包括占位符，以便根据上下文来动态地进行替换。stable-id 用来生成带有 ipv6.addr-gen-mode=stable-privacy 的 IPv6 stable private 地址。它也被用来为 ethernet.cloned-mac-address=stable 和 wifi.cloned-mac-address=stable 生成的克隆做种子。同时，它也被用来作为带有 ipv4.dhcp-client-id=stable 的 DHCP 客户端标识符，并用来获得带有 ipv6.dhcp-duid=stable-[llt,ll,uuid] 的 DHCP DUID。请注意，取决于它使用时的上下文，其它参数也会作为生成算法中的种子。例如，一个主机的密钥通常会被包括，因此，不同系统会产生不同的 ID。或者在带有 ipv6.addr-gen-mode=stable-privacy 时，设备名通常也会被包括，因此不同的接口会产生不同的地址。'$' 是一个特殊的字符，在运行时会被动态替换。 当前支持的值包括 \"${CONNECTION}\"、\"${DEVICE}\", \"${BOOT}\"、 \"${RANDOM}\"。这会为每个连接，每个设备，每一次引导创建唯一的 ID。请注意，\"${DEVICE}\" 代表设备的接口名。'$'后任何其它当前不被支持的值都会被认为是原字符串，但是可能会被保留作为以后使用。因此，建议避免使用 '$'，或使用 \"$$\" 来对它进行转义。例如，\"${CONNECTION}-${BOOT}-${DEVICE}\" 对于这个连接会创建一个唯一的 id，它会在每次重启后改变，并根据配置集在不同的地方激活而不同。如果这个值没有设置，会使用一个全局默认连接。如果还没有设置，它的默认值会与 \"${CONNECTION}\" 类似，并为这个连接使用一个唯一的固定 ID。"
-
--#: ../clients/common/settings-docs.h.in:153
-+#: ../clients/common/settings-docs.h.in:171
- msgid ""
- "The time, in seconds since the Unix Epoch, that the connection was last "
- "_successfully_ fully activated. NetworkManager updates the connection "
-@@ -6969,7 +7183,7 @@ msgid ""
- "reading (changes to this property will not be preserved)."
- msgstr "连接上次完全激活的时间，以秒计算和 Unix 时间表示。当连接激活时网络管理器（NetworkManager）会定期更新连接的时间戳以确保活动连接有最新的时间戳。该用来读取（此属性的更改不被保留）。"
-
--#: ../clients/common/settings-docs.h.in:154
-+#: ../clients/common/settings-docs.h.in:172
- msgid ""
- "Base type of the connection. For hardware-dependent connections, should "
- "contain the setting name of the hardware-type specific setting (ie, \"802-3-"
-@@ -6978,7 +7192,7 @@ msgid ""
- "setting name of that setting type (ie, \"vpn\" or \"bridge\", etc)."
- msgstr "连接的基础类型。对于硬件相关的连接，应包含硬件类型特定设置的设置名称（例如 \"802-3-ethernet\" 或 \"802-11-wireless\" 或 \"bluetooth\"，等等），而对于非硬件相关的连接如 VPN 或其他的，应包含该设置类型的设置名称（例如 \"vpn\" 或 \"bridge\"，等等）。"
-
--#: ../clients/common/settings-docs.h.in:155
-+#: ../clients/common/settings-docs.h.in:173
- msgid ""
- "A universally unique identifier for the connection, for example generated "
- "with libuuid. It should be assigned when the connection is created, and "
-@@ -6990,7 +7204,7 @@ msgid ""
- "contains only hexadecimal characters and \"-\")."
- msgstr "用于连接的全局唯一标识符，例如以 libuuid 生成。它应该在连接创建时分配，并且只要连接仍应用到同个网络就不改变。例如，当 \"id\" 属性或 NMSettingIP4Config 更改时它不应改变；但当 Wi-Fi SSID、移动宽带网络运营商或 \"type\" 属性改变时它可能需要重新创建。UUIS 必须为如 \"2815492f-7e56-435e-b2e9-246bd7cdc664\" 的格式（示例，只包含十六进制和 \"-\"）。"
-
--#: ../clients/common/settings-docs.h.in:156
-+#: ../clients/common/settings-docs.h.in:174
- msgid ""
- "Timeout in milliseconds to wait for device at startup. During boot, devices "
- "may take a while to be detected by the driver. This property will cause to "
-@@ -7001,7 +7215,7 @@ msgid ""
- "currently has the same meaning as no wait time."
- msgstr "等待设备启动的超时时间（以毫秒为单位）。在引导期间，设备可能需要一段时间才能被驱动程序检测到。使用此属性将可以延迟 NetworkManager-wait-online.service 和 nm-online 以使设备有时间可以被驱动程序检测到。请注意，此属性仅与 NMSettingConnection:interface-name 一起使用以标识将等待的设备。如果为 0，则表示没有等待时间。 默认值为 -1，当前代表无等待时间。"
-
--#: ../clients/common/settings-docs.h.in:157
-+#: ../clients/common/settings-docs.h.in:175
- msgid ""
- "The trust level of a the connection. Free form case-insensitive string (for "
- "example \"Home\", \"Work\", \"Public\"). NULL or unspecified zone means the "
-@@ -7010,53 +7224,53 @@ msgid ""
- "takes effect immediately."
- msgstr "连接的信任级别。格式自由、不区分大小写的字符串（例如 \"Home\"、\"工作\"、\"公共\"）。NULL 或为指定区域表示连接将放置到防火墙定义的默认区域。当在当前激活的连接上更新此属性时，更改立即生效。"
-
--#: ../clients/common/settings-docs.h.in:158
-+#: ../clients/common/settings-docs.h.in:176
- msgid ""
- "Specifies the NMSettingDcbFlags for the DCB FCoE application. Flags may be "
- "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
- "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
- msgstr "指定 DCB FCoE 应用程序的 NMSettingDcbFlags。标志可以是 NM_SETTING_DCB_FLAG_ENABLE (0x1)、NM_SETTING_DCB_FLAG_ADVERTISE (0x2) 和 NM_SETTING_DCB_FLAG_WILLING (0x4) 的任意组合。"
-
--#: ../clients/common/settings-docs.h.in:159
-+#: ../clients/common/settings-docs.h.in:177
- msgid "The FCoE controller mode; either \"fabric\" (default) or \"vn2vn\"."
- msgstr "FCoE 控制器模式；为 \"fabric\"（默认）或 \"vn2vn\"。"
-
--#: ../clients/common/settings-docs.h.in:160
-+#: ../clients/common/settings-docs.h.in:178
- msgid ""
- "The highest User Priority (0 - 7) which FCoE frames should use, or -1 for "
- "default priority. Only used when the \"app-fcoe-flags\" property includes "
- "the NM_SETTING_DCB_FLAG_ENABLE (0x1) flag."
- msgstr "FCoE 帧应使用的最高用户优先级（0～7），或 -1 代表默认优先级。只当 \"app-fcoe-flags\" 属性包含 NM_SETTING_DCB_FLAG_ENABLE (0x1) 标志时使用。"
-
--#: ../clients/common/settings-docs.h.in:161
-+#: ../clients/common/settings-docs.h.in:179
- msgid ""
- "Specifies the NMSettingDcbFlags for the DCB FIP application. Flags may be "
- "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
- "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
- msgstr "指定 DCB FIP 应用程序的 NMSettingDcbFlags。标志可以是 NM_SETTING_DCB_FLAG_ENABLE (0x1)、NM_SETTING_DCB_FLAG_ADVERTISE (0x2) 和 NM_SETTING_DCB_FLAG_WILLING (0x4) 的任意组合。"
-
--#: ../clients/common/settings-docs.h.in:162
-+#: ../clients/common/settings-docs.h.in:180
- msgid ""
- "The highest User Priority (0 - 7) which FIP frames should use, or -1 for "
- "default priority. Only used when the \"app-fip-flags\" property includes "
- "the NM_SETTING_DCB_FLAG_ENABLE (0x1) flag."
- msgstr "FIP 帧应使用的最高用户优先级（0～7），或 -1 代表默认优先级。只当 \"app-fip-flags\" 属性包含 NM_SETTING_DCB_FLAG_ENABLE (0x1) 标志时使用。"
-
--#: ../clients/common/settings-docs.h.in:163
-+#: ../clients/common/settings-docs.h.in:181
- msgid ""
- "Specifies the NMSettingDcbFlags for the DCB iSCSI application. Flags may be "
- "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
- "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
- msgstr "指定 DCB iSCSI 应用程序的 NMSettingDcbFlags。标志可以是 NM_SETTING_DCB_FLAG_ENABLE (0x1)、NM_SETTING_DCB_FLAG_ADVERTISE (0x2) 和 NM_SETTING_DCB_FLAG_WILLING (0x4) 的任意组合。"
-
--#: ../clients/common/settings-docs.h.in:164
-+#: ../clients/common/settings-docs.h.in:182
- msgid ""
- "The highest User Priority (0 - 7) which iSCSI frames should use, or -1 for "
- "default priority. Only used when the \"app-iscsi-flags\" property includes "
- "the NM_SETTING_DCB_FLAG_ENABLE (0x1) flag."
- msgstr "iSCSI 帧应使用的最高用户优先级（0～7），或 -1 代表默认优先级。只当 \"app-iscsi-flags\" 属性包含 NM_SETTING_DCB_FLAG_ENABLE (0x1) 标志时使用。"
-
--#: ../clients/common/settings-docs.h.in:165
-+#: ../clients/common/settings-docs.h.in:183
- 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 "
-@@ -7065,21 +7279,21 @@ msgid ""
- "percents."
- msgstr "8 个无符号整数值组成的数组，其数组索引对应于用户优先级（0～7）而其值指示优先级可使用的优先级指定组的带宽百分比。属于同个组的所有优先级百分比总和必须为 100%。"
-
--#: ../clients/common/settings-docs.h.in:166
-+#: ../clients/common/settings-docs.h.in:184
- msgid ""
- "An array of 8 boolean values, where the array index corresponds to the User "
- "Priority (0 - 7) and the value indicates whether or not the corresponding "
- "priority should transmit priority pause."
- msgstr "8 个布尔值组成的数组，其数组索引对应于用户优先级（0～7）而其值指示对应优先级是否应该传输优先级暂停。"
-
--#: ../clients/common/settings-docs.h.in:167
-+#: ../clients/common/settings-docs.h.in:185
- msgid ""
- "Specifies the NMSettingDcbFlags for DCB Priority Flow Control (PFC). Flags "
- "may be any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
- "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
- msgstr "指定 DCB 优先级流量控制（PFC）的 NMSettingDcbFlags。标志可以是 NM_SETTING_DCB_FLAG_ENABLE (0x1)、NM_SETTING_DCB_FLAG_ADVERTISE (0x2) 和 NM_SETTING_DCB_FLAG_WILLING (0x4) 的任意组合。"
-
--#: ../clients/common/settings-docs.h.in:168
-+#: ../clients/common/settings-docs.h.in:186
- 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 "
-@@ -7087,35 +7301,35 @@ msgid ""
- "values must total 100 percents."
- msgstr "8 个无符号整数值组成的数组，其数组索引对应于用户优先级（0～7）而其值指示分配到该组的链路带宽百分比。允许的值为 0～100，且所有值的总和必须为 100%。"
-
--#: ../clients/common/settings-docs.h.in:169
-+#: ../clients/common/settings-docs.h.in:187
- msgid ""
- "Specifies the NMSettingDcbFlags for DCB Priority Groups. Flags may be any "
- "combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
- "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
- msgstr "指定 DCB 优先级组的 NMSettingDcbFlags。标志可以是 NM_SETTING_DCB_FLAG_ENABLE (0x1)、NM_SETTING_DCB_FLAG_ADVERTISE (0x2) 和 NM_SETTING_DCB_FLAG_WILLING (0x4) 的任意组合。"
-
--#: ../clients/common/settings-docs.h.in:170
-+#: ../clients/common/settings-docs.h.in:188
- msgid ""
- "An array of 8 uint values, where the array index corresponds to the User "
- "Priority (0 - 7) and the value indicates the Priority Group ID. Allowed "
- "Priority Group ID values are 0 - 7 or 15 for the unrestricted group."
- msgstr "8 个无符号整数值组成的数组，其数组索引对应于用户优先级（0～7）而其值指示优先级组 ID。允许的优先级组 ID 值为 0～7，或 15 表示无限制组。"
-
--#: ../clients/common/settings-docs.h.in:171
-+#: ../clients/common/settings-docs.h.in:189
- msgid ""
- "An array of 8 boolean values, where the array index corresponds to the User "
- "Priority (0 - 7) and the value indicates whether or not the priority may use "
- "all of the bandwidth allocated to its assigned group."
- msgstr "8 个布尔值组成的数组，其数组索引对应于用户优先级（0～7）而其值指示优先级是否可以使用分配到它指定组的全部带宽。"
-
--#: ../clients/common/settings-docs.h.in:172
-+#: ../clients/common/settings-docs.h.in:190
- msgid ""
- "An array of 8 uint values, where the array index corresponds to the User "
- "Priority (0 - 7) and the value indicates the traffic class (0 - 7) to which "
- "the priority is mapped."
- msgstr "8 个无符号整数值组成的数组，其数组索引对应于用户优先级（0～7）而其值指示该优先级映射的流量等级（0～7）。"
-
--#: ../clients/common/settings-docs.h.in:173
-+#: ../clients/common/settings-docs.h.in:191
- 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 "
-@@ -7126,27 +7340,27 @@ msgid ""
- "14.9."
- msgstr "当与基于 GSM 网络建立数据会话时指定使用的 APN 的 GPRS 接入点名称。APN 通常确定了用户如何为他们的网络使用付费，和用户能否访问互联网或只是运营商特定的封闭平台，因此为用户的移动带宽套餐使用正确的 APN 很重要。根据 GSM 03.60 章节 14.9，APN 只能由字符 a～z、0～9、. 和 - 组成。"
-
--#: ../clients/common/settings-docs.h.in:174
-+#: ../clients/common/settings-docs.h.in:192
- msgid ""
- "When TRUE, the settings such as APN, username, or password will default to "
- "values that match the network the modem will register to in the Mobile "
- "Broadband Provider database."
- msgstr "如果为TRUE，则设置（例如 APN，用户名或密码）将默认为与调制解调器将在移动宽带提供商数据库中注册的网络相匹配的值。"
-
--#: ../clients/common/settings-docs.h.in:175
-+#: ../clients/common/settings-docs.h.in:193
- msgid ""
- "The device unique identifier (as given by the WWAN management service) which "
- "this connection applies to. If given, the connection will only apply to the "
- "specified device."
- msgstr "此连接要应用的设备唯一标识符（由 WWAN 管理服务给定）。如果给定了，连接将只应用到指定的设备。"
-
--#: ../clients/common/settings-docs.h.in:176
-+#: ../clients/common/settings-docs.h.in:194
- 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:178
-+#: ../clients/common/settings-docs.h.in:196
- msgid ""
- "The Network ID (GSM LAI format, ie MCC-MNC) to force specific network "
- "registration. If the Network ID is specified, NetworkManager will attempt "
-@@ -7155,20 +7369,20 @@ msgid ""
- "the device is not otherwise possible."
- msgstr "要强制指定网络注册的网络 ID（GSM LAI 格式，如 MCC-MNC）。如果指定了网络 ID，网络管理器（NetworkManager）将尝试强制设备只在指定的网络注册。当设备不能直接控制漫游时，这可以用于确保设备不漫游。"
-
--#: ../clients/common/settings-docs.h.in:179
-+#: ../clients/common/settings-docs.h.in:197
- 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:182
-+#: ../clients/common/settings-docs.h.in:200
- msgid ""
- "If the SIM is locked with a PIN it must be unlocked before any other "
- "operations are requested. Specify the PIN here to allow operation of the "
- "device."
- msgstr "如果 SIM 被 PIN 锁住了，在请求任何其他操作前必须解锁。在这里指定 PIN 以允许设备的操作。"
-
--#: ../clients/common/settings-docs.h.in:184
-+#: ../clients/common/settings-docs.h.in:202
- 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 "
-@@ -7176,7 +7390,7 @@ msgid ""
- "the given identifier."
- msgstr "此连接应用的 SIM 卡的唯一标识符（由 WWAN 管理服务给定）。如果给定了，此连接将应用到包含匹配给定标识符 SIM 卡的 \"device-id\" 所允许的任何设备。"
-
--#: ../clients/common/settings-docs.h.in:185
-+#: ../clients/common/settings-docs.h.in:203
- msgid ""
- "A MCC/MNC string like \"310260\" or \"21601\" identifying the specific "
- "mobile network operator which this connection applies to. If given, the "
-@@ -7184,39 +7398,39 @@ msgid ""
- "id\" which contains a SIM card provisioned by the given operator."
- msgstr "一个如 \"310260\" 或 \"21601\" 的 MCC/MNC 字符串，用来鉴定此连接应用到的指定移动网络运营商。如果给定了，连接将应用到包含给定运营商提供 SIM 卡的 \"device-id\" 和 \"sim-id\" 所允许的任何设备。"
-
--#: ../clients/common/settings-docs.h.in:187
-+#: ../clients/common/settings-docs.h.in:205
- msgid ""
- "If specified, this connection will only apply to the IPoIB device whose "
- "permanent MAC address matches. This property does not change the MAC address "
- "of the device (i.e. MAC spoofing)."
- msgstr "如指定了，此连接将只应用到符合永久 MAC 地址的 IPoIB 设备。此属性不会改变设备的 MAC 地址（例如 MAC 欺骗）。"
-
--#: ../clients/common/settings-docs.h.in:189
-+#: ../clients/common/settings-docs.h.in:207
- msgid ""
- "The InfiniBand P_Key to use for this device. A value of -1 means to use the "
- "default P_Key (aka \"the P_Key at index 0\"). Otherwise it is a 16-bit "
- "unsigned integer, whose high bit is set if it is a \"full membership\" P_Key."
- msgstr "用于此设备的 InfiniBand P_Key。值 -1 代表使用默认的 P_Key（又名 \"索引 0 的 P_Key\"）。否则它是个 16 位无符号整数，其高位已设定如果它是个 \"正式会员\" P_Key。"
-
--#: ../clients/common/settings-docs.h.in:190
-+#: ../clients/common/settings-docs.h.in:208
- msgid ""
- "The interface name of the parent device of this device. Normally NULL, but "
- "if the \"p_key\" property is set, then you must specify the base device by "
- "setting either this property or \"mac-address\"."
- msgstr "此设备的上级设备的接口名称。一般是 NULL，但如果 \"p_key\" 已设定，您必须通过设置此属性或 \"mac-address\" 来指定基础设备。"
-
--#: ../clients/common/settings-docs.h.in:191
-+#: ../clients/common/settings-docs.h.in:209
- msgid ""
- "The IP-over-InfiniBand transport mode. Either \"datagram\" or \"connected\"."
- msgstr "IP-over-InfiniBand 传输模式。要么为 \"datagram\" 要么为 \"connected\"。"
-
--#: ../clients/common/settings-docs.h.in:192
-+#: ../clients/common/settings-docs.h.in:210
- 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:193
-+#: ../clients/common/settings-docs.h.in:211
- msgid ""
- "Tunnel flags. Currently the following values are supported: "
- "NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT (0x1), "
-@@ -7227,78 +7441,78 @@ msgid ""
- "for IPv6 tunnels."
- msgstr "隧道标志。当前支持下列值：NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT (0x1)、NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_TCLASS (0x2)、NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FLOWLABEL (0x4)、NM_IP_TUNNEL_FLAG_IP6_MIP6_DEV (0x8)、NM_IP_TUNNEL_FLAG_IP6_RCV_DSCP_COPY (0x10)、NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK (0x20)。它们只对 IPv6 隧道有效。"
-
--#: ../clients/common/settings-docs.h.in:194
-+#: ../clients/common/settings-docs.h.in:212
- msgid ""
- "The flow label to assign to tunnel packets. This property applies only to "
- "IPv6 tunnels."
- msgstr "要分配到隧道数据包的流量标签。此属性只应用到 IPv6 隧道。"
-
--#: ../clients/common/settings-docs.h.in:195
-+#: ../clients/common/settings-docs.h.in:213
- msgid ""
- "The key used for tunnel input packets; the property is valid only for "
- "certain tunnel modes (GRE, IP6GRE). If empty, no key is used."
- msgstr "用于隧道输入数据包的密钥。该属性值对某些隧道模式有效（GRE、IP6GRE）。如果留空则不使用密钥。"
-
--#: ../clients/common/settings-docs.h.in:196
-+#: ../clients/common/settings-docs.h.in:214
- 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:197
-+#: ../clients/common/settings-docs.h.in:215
- 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:198
-+#: ../clients/common/settings-docs.h.in:216
- 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:199
-+#: ../clients/common/settings-docs.h.in:217
- msgid ""
- "The key used for tunnel output packets; the property is valid only for "
- "certain tunnel modes (GRE, IP6GRE). If empty, no key is used."
- msgstr "用于隧道输出数据包的密钥。该属性值对某些隧道模式有效（GRE、IP6GRE）。如果留空则不使用密钥。"
-
--#: ../clients/common/settings-docs.h.in:200
-+#: ../clients/common/settings-docs.h.in:218
- msgid ""
- "If given, specifies the parent interface name or parent connection UUID the "
- "new device will be bound to so that tunneled packets will only be routed via "
- "that interface."
- msgstr "如果给定了，指定新设备将绑定到的上级接口名或上级连接 UUID，以让隧道的数据包只能通过该接口进行路由。"
-
--#: ../clients/common/settings-docs.h.in:201
-+#: ../clients/common/settings-docs.h.in:219
- msgid "Whether to enable Path MTU Discovery on this tunnel."
- msgstr "是否在此隧道启用路径 MTU 发现。"
-
--#: ../clients/common/settings-docs.h.in:202
-+#: ../clients/common/settings-docs.h.in:220
- 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:203
-+#: ../clients/common/settings-docs.h.in:221
- 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:204
-+#: ../clients/common/settings-docs.h.in:222
- 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:205
--#: ../clients/common/settings-docs.h.in:228
-+#: ../clients/common/settings-docs.h.in:223
-+#: ../clients/common/settings-docs.h.in:246
- msgid "Array of IP addresses."
- msgstr "IP 地址数组。"
-
--#: ../clients/common/settings-docs.h.in:206
--#: ../clients/common/settings-docs.h.in:229
-+#: ../clients/common/settings-docs.h.in:224
-+#: ../clients/common/settings-docs.h.in:247
- msgid ""
- "Timeout in milliseconds used to check for the presence of duplicate IP "
- "addresses on the network. If an address conflict is detected, the "
-@@ -7308,7 +7522,7 @@ msgid ""
- "in milliseconds. The property is currently implemented only for IPv4."
- msgstr "用于检查网络中是否存在重复 IP 地址的超时时间。如果检测到了冲突，激活将失败。零值表示不执行重复 IP 检查，-1 表示默认值（配置 ipvx.dad-timeout 覆盖或 3 秒）。大于零的值为以毫秒计算的超时时间。该属性当前只实现于 IPv4。"
-
--#: ../clients/common/settings-docs.h.in:207
-+#: ../clients/common/settings-docs.h.in:225
- 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 "
-@@ -7331,23 +7545,23 @@ msgid ""
- "plugin."
- msgstr "发送到 DHCP 服务器的字符串，用以确定 DHCP 服务器可能用于自定义 DHCP 租约和选项的本地机器。当属性值为十六进制字符串时，将其解读为二进制的客户端 ID，这种情况下根据 RFC 2132 章节 9.14 首字节被认为是 \"type\" 字段而剩下的字节可为一个硬件地址（例如 \"01:xx:xx:xx:xx:xx:xx\" 中 1 是以太网 ARP 类型而其余的是个 MAC 地址）。如果属性不是十六进制字符串，它被视作非硬件地址客户端 ID 且 \"type\" 字段被设为 0。支持特殊值 \"mac\" 和 \"perm-mac\"，其使用设备的当前或永久 MAC 地址来生成类型为以太网类型 (01) 的客户端标识符。当前这些选项仅适用于以太网类型的链路。支持特殊值 \"stable\" 基于 stable-id 和每个主机的密钥生成一个类型 0 的客户端标识符（参见 connection.stable-id）。如果未设，使用全局默认值。如果仍未设定，默认值取决于 DHCP 插件。"
-
--#: ../clients/common/settings-docs.h.in:208
-+#: ../clients/common/settings-docs.h.in:226
- msgid ""
- "If the \"dhcp-send-hostname\" property is TRUE, then the specified FQDN will "
- "be sent to the DHCP server when acquiring a lease. This property and \"dhcp-"
- "hostname\" are mutually exclusive and cannot be set at the same time."
- msgstr "如果 \"dhcp-send-hostname\" 属性为 TRUE，当获取租约时指定的 FQDN 将被发送到 DHCP 服务器。此属性与 \"dhcp-hostname\" 相互排斥而且无法被同时设定。"
-
--#: ../clients/common/settings-docs.h.in:209
--#: ../clients/common/settings-docs.h.in:231
-+#: ../clients/common/settings-docs.h.in:227
-+#: ../clients/common/settings-docs.h.in:249
- msgid ""
- "If the \"dhcp-send-hostname\" property is TRUE, then the specified name will "
- "be sent to the DHCP server when acquiring a lease. This property and \"dhcp-"
- "fqdn\" are mutually exclusive and cannot be set at the same time."
- msgstr "如果 \"dhcp-send-hostname\" 属性为 TRUE，当获取租约时指定的名称将被发送到 DHCP 服务器。此属性与 \"dhcp-fqdn\" 相互排斥而且无法被同时设定。"
-
--#: ../clients/common/settings-docs.h.in:210
--#: ../clients/common/settings-docs.h.in:232
-+#: ../clients/common/settings-docs.h.in:228
-+#: ../clients/common/settings-docs.h.in:250
- msgid ""
- "Flags for the DHCP hostname and FQDN. Currently this property only includes "
- "flags to control the FQDN flags set in the DHCP FQDN option. Supported FQDN "
-@@ -7366,8 +7580,8 @@ msgid ""
- "above are sent in the DHCP requests."
- msgstr "DHCP 主机名和 FQDN 的标志。当前，此属性仅包含用于控制在 DHCP FQDN 选项中设置的FQDN 标志的标志。支持的 FQDN 标志是NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1)、 NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) 和 NM_DHCP_HOSTNAME_FLAG_FQDN_NO_UPDATE (0x4)。如果未设置 FQDN 标志并且设置了NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8)，则 DHCP FQDN 选项将不包含标志。否则，如果未设置 FQDN 标志并且未设置NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8)，则将在请求中设置标准 FQDN 标志： NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1)、NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2)（IPv4）和 NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1) （IPv6）。当此属性设置为默认值NM_DHCP_HOSTNAME_FLAG_NONE（0x0）时，将在NetworkManager配置中查找全局默认值。如果未设置该值，或者也未设置NM_DHCP_HOSTNAME_FLAG_NONE（0x0），则在DHCP请求中发送上述标准FQDN标志。"
-
--#: ../clients/common/settings-docs.h.in:211
--#: ../clients/common/settings-docs.h.in:233
-+#: ../clients/common/settings-docs.h.in:229
-+#: ../clients/common/settings-docs.h.in:251
- msgid ""
- "A string containing the \"Identity Association Identifier\" (IAID) used by "
- "the DHCP client. The property is a 32-bit decimal value or a special value "
-@@ -7382,8 +7596,8 @@ msgid ""
- "for IPv6 by dhclient, which always derives the IAID from the MAC address."
- msgstr "一个包含 DHCP 客户端使用的“身份关联标识符”（IAID）的字符串。该属性是一个 32 位的十进制值，或 “mac”、“ perm-mac”、“ifname” 和 “stable”特殊值中的一个。当设置为“ mac”（或“ perm-mac”）时，当前（或永久）MAC 地址的最后 4 个字节用作 IAID。当设置为 “ifname” 时，通过对接口名称进行散列处理来计算出 IAID。特殊值 “stable” 可用于基于稳定 ID（请参阅connection.stable-id）、每个主机的密钥和接口名称来生成一个 IAID。取消设置属性后，将使用全局配置中的值；如果未设置全局默认值，则将 IAID 假定为 “ifname”。请注意，此刻 dhclient 会忽略 IPv6 的此属性，该属性始终从 MAC 地址获取 IAID。"
-
--#: ../clients/common/settings-docs.h.in:212
--#: ../clients/common/settings-docs.h.in:234
-+#: ../clients/common/settings-docs.h.in:230
-+#: ../clients/common/settings-docs.h.in:252
- 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 "
-@@ -7392,54 +7606,66 @@ msgid ""
- "of the computer is sent."
- msgstr "如果为 TRUE，当获取租约时发送主机名到 DHCP 服务器。有些 DHCP 服务器使用这个主机名来更新 DNS 数据库，实质上为计算机提供了个静态的主机名。如果 \"dhcp-hostname\" 属性为 NULL 且此属性为 TRUE，以计算机的当前永久主机。"
-
--#: ../clients/common/settings-docs.h.in:213
--#: ../clients/common/settings-docs.h.in:235
--msgid "A timeout for a DHCP transaction in seconds."
--msgstr "DHCP 事务的超时时间，以秒计。"
-+#: ../clients/common/settings-docs.h.in:231
-+#: ../clients/common/settings-docs.h.in:253
-+msgid ""
-+"A timeout for a DHCP transaction in seconds. If zero (the default), a "
-+"globally configured default is used. If still unspecified, a device specific "
-+"timeout is used (usually 45 seconds). Set to 2147483647 (MAXINT32) for "
-+"infinity."
-+msgstr "DHCP 的超时时间，以秒为单位。如果为 0（默认值），则使用全局配置的默认值。如果还没有指定，则使用特定于设备的超时（通常为 45 秒）。设为 2147483647 (MAXINT32) 代表无限大。"
-
--#: ../clients/common/settings-docs.h.in:214
--#: ../clients/common/settings-docs.h.in:236
-+#: ../clients/common/settings-docs.h.in:232
-+#: ../clients/common/settings-docs.h.in:254
- msgid "Array of IP addresses of DNS servers."
- msgstr "DNS 服务器的 IP 地址数组。"
-
--#: ../clients/common/settings-docs.h.in:215
--#: ../clients/common/settings-docs.h.in:237
-+#: ../clients/common/settings-docs.h.in:233
-+#: ../clients/common/settings-docs.h.in:255
- msgid ""
- "Array of DNS options as described in man 5 resolv.conf. NULL means that the "
- "options are unset and left at the default. In this case NetworkManager will "
--"use default options. This is distinct from an empty list of properties."
--msgstr "在 man 5 resolv.conf 中描述的 DNS 选项数组。NULL 代表选项未设定并保留默认值。此情况下网络管理器（NetworkManager）将使用默认选项。这跟空列表的属性不同。"
-+"use default options. This is distinct from an empty list of properties. The "
-+"currently supported options are \"attempts\", \"debug\", \"edns0\", "
-+"\"inet6\", \"ip6-bytestring\", \"ip6-dotint\", \"ndots\", \"no-check-names"
-+"\", \"no-ip6-dotint\", \"no-reload\", \"no-tld-query\", \"rotate\", \"single-"
-+"request\", \"single-request-reopen\", \"timeout\", \"trust-ad\", \"use-vc\". "
-+"The \"trust-ad\" setting is only honored if the profile contributes name "
-+"servers to resolv.conf, and if all contributing profiles have \"trust-ad\" "
-+"enabled."
-+msgstr "DNS 选项的信息包括在 resolv.conf 的 man 5 中。NULL表示未设置选项，保持默认值。在这种情况下，NetworkManager 将使用默认选项。这与空的属性列表不同。目前支持的选项是 \"attempts\"、\"debug\"、\"edns0\"、\"inet6\"、\"ip6-bytestring\"、\"ip6-dotint\"、\"ndots\"、\"no-check-names\"、\"no-ip6-dotint\"、\"no-reload\"、\"no-tld-query\"、\"rotate\"、\"single-request\"、\"single-request-reopen\"、\"timeout\"、\"trust-ad\"、\"use-vc\"。只有当配置文件向 resolv.conf 提供名称服务器，并且所有提供名称服务器的配置文件都启用了 \"trust-ad\" 时，\"trust-ad\" 设置才会生效。"
-
--#: ../clients/common/settings-docs.h.in:216
--#: ../clients/common/settings-docs.h.in:238
-+#: ../clients/common/settings-docs.h.in:234
-+#: ../clients/common/settings-docs.h.in:256
- msgid ""
- "DNS servers priority. The relative priority for DNS servers specified by "
- "this setting. A lower value is better (higher priority). Zero selects a "
- "globally configured default value. If the latter is missing or zero too, it "
--"defaults to 50 for VPNs and 100 for other connections. Note that the "
--"priority is to order DNS settings for multiple active connections. It does "
--"not disambiguate multiple DNS servers within the same connection profile. "
--"When using dns=default, servers with higher priority will be on top of "
--"resolv.conf. To prioritize a given server over another one within the same "
--"connection, just specify them in the desired order. When multiple devices "
--"have configurations with the same priority, the one with an active default "
--"route will be preferred. Negative values have the special effect of "
--"excluding other configurations with a greater priority value; so in presence "
--"of at least a negative priority, only DNS servers from connections with the "
--"lowest priority value will be used. When using a DNS resolver that supports "
--"Conditional Forwarding as dns=dnsmasq or dns=systemd-resolved, each "
--"connection is used to query domains in its search list. Queries for domains "
--"not present in any search list are routed through connections having the "
--"'~.' special wildcard domain, which is added automatically to connections "
--"with the default route (or can be added manually). When multiple "
--"connections specify the same domain, the one with the highest priority "
--"(lowest numerical value) wins. If a connection specifies a domain which is "
--"subdomain of another domain with a negative DNS priority value, the "
--"subdomain is ignored."
--msgstr "DNS 服务器优先级。此设置指定 DNS 服务器的相关优先级。值越低优先级越高。零代表默认值，即 50 用于 VPN 和 100 用于其他连接。注意此优先级用于为多个活动连接排序 DNS 设置。它不是对同个连接配置集中的多个 DNS 服务器进行明确选择。当使用 dns=default 时，更高优先级的服务器将在 resolv.conf 里的更顶部。要让给定服务器优先于同连接内的另一服务器，只要以期望的顺序指定它们就行。当多个设备配置了同样的优先级，将优先选择活动默认路由的那一个。注意当使用 dns=dnsmasq 时，此顺序无意义因为 dnsmasq 同时转发查询到所有已知服务器。负值具有排除其他拥有更高优先级值的配置的特殊效果；所以存在至少一个负值优先级的情况下，只使用具有最低优先级值的连接的 DNS 服务器。当使用支持拆分 DNS 为 dns=dnsmasq 或 dns=systemd-resolved 的 DNS 解析器时，每个连接用于查询它搜索列表中的域。未在任何搜索列表中的域查询会由具有 \"~.\" 特殊通配符的域进行路由，被自动以默认路由添加到连接（或可以手动添加）。当多个连接指定了同个域时，拥有最高权限（最低的数值）的那个连接将获选。如果连接指定了个域，其为具有负 DNS 优先级值的另一域的子域，那这个子域会被忽略。"
-+"defaults to 50 for VPNs (including WireGuard) and 100 for other connections. "
-+"Note that the priority is to order DNS settings for multiple active "
-+"connections. It does not disambiguate multiple DNS servers within the same "
-+"connection profile. When using dns=default, servers with higher priority "
-+"will be on top of resolv.conf. To prioritize a given server over another "
-+"one within the same connection, just specify them in the desired order. "
-+"When multiple devices have configurations with the same priority, VPNs will "
-+"be considered first, then devices with the best (lowest metric) default "
-+"route and then all other devices. Negative values have the special effect "
-+"of excluding other configurations with a greater priority value; so in "
-+"presence of at least one negative priority, only DNS servers from "
-+"connections with the lowest priority value will be used. When using a DNS "
-+"resolver that supports Conditional Forwarding as dns=dnsmasq or dns=systemd-"
-+"resolved, each connection is used to query domains in its search list. "
-+"Queries for domains not present in any search list are routed through "
-+"connections having the '~.' special wildcard domain, which is added "
-+"automatically to connections with the default route (or can be added "
-+"manually). When multiple connections specify the same domain, the one with "
-+"the highest priority (lowest numerical value) wins. If a connection "
-+"specifies a domain which is subdomain of another domain with a negative DNS "
-+"priority value, the subdomain is ignored."
-+msgstr "DNS 服务器优先级。此设置指定 DNS 服务器的相关优先级。值越低优先级越高。零代表默认值，即 50 用于 VPN（包括 WireGuard） 和 100 用于其他连接。注意此优先级用于为多个活动连接排序 DNS 设置。它不是对同个连接配置集中的多个 DNS 服务器进行明确选择。当使用 dns=default 时，更高优先级的服务器将在 resolv.conf 里的更顶部。要让给定服务器优先于同连接内的另一服务器，只要以期望的顺序指定它们就行。当多个设备配置了同样的优先级，VPN 会被首先考虑，然后是带有最好（最低的指标数据）默认路由的设备，然后是所有其他设置。负值具有排除其他拥有更高优先级值的配置的特殊效果；所以存在至少一个负值优先级的情况下，只使用具有最低优先级值的连接的 DNS 服务器。当使用支持拆分 DNS 为 dns=dnsmasq 或 dns=systemd-resolved 的 DNS 解析器时，每个连接用于查询它搜索列表中的域。未在任何搜索列表中的域查询会由具有 \"~.\" 特殊通配符的域进行路由，被自动以默认路由添加到连接（或可以手动添加）。当多个连接指定了同个域时，拥有最高权限（最低的数值）的那个连接将获选。如果连接指定了个域，其为具有负 DNS 优先级值的另一域的子域，那这个子域会被忽略。"
-
--#: ../clients/common/settings-docs.h.in:217
--#: ../clients/common/settings-docs.h.in:239
-+#: ../clients/common/settings-docs.h.in:235
-+#: ../clients/common/settings-docs.h.in:257
- msgid ""
- "Array of DNS search domains. Domains starting with a tilde ('~') are "
- "considered 'routing' domains and are used only to decide the interface over "
-@@ -7447,15 +7673,19 @@ msgid ""
- "host names."
- msgstr "DNS 搜索域的数组。域以半角波浪号（\"~\"）开头的视为 \"路由\" 域并只用于确定查询必须转发的接口；它们不用于完全未限定的主机名。"
-
--#: ../clients/common/settings-docs.h.in:218
--#: ../clients/common/settings-docs.h.in:240
-+#: ../clients/common/settings-docs.h.in:236
-+#: ../clients/common/settings-docs.h.in:258
- msgid ""
- "The gateway associated with this configuration. This is only meaningful if "
--"\"addresses\" is also set."
--msgstr "与此配置关联的网关。这只在 \"addresses\" 也设定的时候有意义。"
-+"\"addresses\" is also set. The gateway's main purpose is to control the next "
-+"hop of the standard default route on the device. Hence, the gateway property "
-+"conflicts with \"never-default\" and will be automatically dropped if the IP "
-+"configuration is set to never-default. As an alternative to set the gateway, "
-+"configure a static default route with /0 as prefix length."
-+msgstr "与此配置相关联的网关。只有当 \"addresses\" 也被设置时，这才有意义。网关的主要目的是控制设备上标准默认路由的下一跳。因此，网关属性与 \"never-default\" 冲突，如果 IP 配置设置为 never-default，则会自动放弃。作为设置网关的替代方案，可以配置一个静态默认路由，前缀长度为 /0。"
-
--#: ../clients/common/settings-docs.h.in:219
--#: ../clients/common/settings-docs.h.in:241
-+#: ../clients/common/settings-docs.h.in:237
-+#: ../clients/common/settings-docs.h.in:259
- msgid ""
- "When \"method\" is set to \"auto\" and this property to TRUE, automatically "
- "configured nameservers and search domains are ignored and only nameservers "
-@@ -7463,16 +7693,16 @@ msgid ""
- "if any, are used."
- msgstr "当 \"method\" 设为 \"auto\" 且此属性为 TRUE 时，自动配置的名称服务器和搜索域被忽略且只有 \"dns\" 和 \"dns-search\" 属性中指定的名称服务器和搜索域被使用，如果有的话。"
-
--#: ../clients/common/settings-docs.h.in:220
--#: ../clients/common/settings-docs.h.in:242
-+#: ../clients/common/settings-docs.h.in:238
-+#: ../clients/common/settings-docs.h.in:260
- msgid ""
- "When \"method\" is set to \"auto\" and this property to TRUE, automatically "
- "configured routes are ignored and only routes specified in the \"routes\" "
- "property, if any, are used."
- msgstr "当 \"method\" 设为 \"auto\" 且此属性为 TRUE 时，自动配置的路由被忽略且只有 \"routes\" 属性中指定的路由被使用，如果有的话。"
-
--#: ../clients/common/settings-docs.h.in:221
--#: ../clients/common/settings-docs.h.in:244
-+#: ../clients/common/settings-docs.h.in:239
-+#: ../clients/common/settings-docs.h.in:262
- msgid ""
- "If TRUE, allow overall network configuration to proceed even if the "
- "configuration specified by this property times out. Note that at least one "
-@@ -7482,8 +7712,8 @@ msgid ""
- "if IPv4 configuration fails but IPv6 configuration completes successfully."
- msgstr "如果为 TURE，允许进行整体网络配置不管此属性指定的配置是否超时。注意至少要有一个 IP 配置成功不然整体网络配置仍将失败。示例，在纯 IPv6 网络，在 NMSettingIP4Config 设置此属性为 TRUE 时允许整体网络配置在 IPv4 配置失败但 IPv6 配置成功完成时成功。"
-
--#: ../clients/common/settings-docs.h.in:222
--#: ../clients/common/settings-docs.h.in:245
-+#: ../clients/common/settings-docs.h.in:240
-+#: ../clients/common/settings-docs.h.in:263
- msgid ""
- "IP configuration method. NMSettingIP4Config and NMSettingIP6Config both "
- "support \"disabled\", \"auto\", \"manual\", and \"link-local\". See the "
-@@ -7499,15 +7729,15 @@ msgid ""
- "the uplink which is shared."
- msgstr "IP 配置方法。 NMSettingIP4Config 和 NMSettingIP6Config 都支持“auto”，“manual”和“link-local”。对于其它值，请参阅相关子类的文档。通常情况下，对于“auto”方法，“dns”和“routes”等属性指定是在从自动配置返回的信息添加的信息。 \"ignore-auto-routes\" 和 \"ignore-auto-dns\"属性会改变这个行为。对于意味着没有上游网络的方法，如“shared”或“link-local”，这些性能必须为空。对于 IPv4 的方法“sharded”，IP 子网可以通过加入一个手工 IPv4 地址或选择 10.42.x.0/24 来配置。注意，shared 的方法必须在这个子网中的用来共享互联网的接口中进行配置，而不是在共享的上部连接中进行配置。"
-
--#: ../clients/common/settings-docs.h.in:223
--#: ../clients/common/settings-docs.h.in:246
-+#: ../clients/common/settings-docs.h.in:241
-+#: ../clients/common/settings-docs.h.in:264
- msgid ""
- "If TRUE, this connection will never be the default connection for this IP "
- "type, meaning it will never be assigned the default route by NetworkManager."
- msgstr "如果为 TRUE，此连接将永不成为此 IP 类型的默认连接，这表示网络管理器（NetworkManager）永远不会为其分配默认路由。"
-
--#: ../clients/common/settings-docs.h.in:224
--#: ../clients/common/settings-docs.h.in:247
-+#: ../clients/common/settings-docs.h.in:242
-+#: ../clients/common/settings-docs.h.in:266
- 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 "
-@@ -7518,8 +7748,8 @@ msgid ""
- "mean setting it to 1024. For IPv4, zero is a regular value for the metric."
- msgstr "用于没有明确指定跃点的路由器的默认跃点。默认值 -1 表示根据设备类型自动选择跃点。该跃点应用到自动路由、没有明确跃点设置的手动（静态）路由、地址前缀路由和默认路由。注意对于 IPv6，内核接受零值（0）但会将其转为 1024（用户默认）。因此，设置此属性为零等于设置它为 1024。对于 IPv4，零是跃点的常规值。"
-
--#: ../clients/common/settings-docs.h.in:225
--#: ../clients/common/settings-docs.h.in:248
-+#: ../clients/common/settings-docs.h.in:243
-+#: ../clients/common/settings-docs.h.in:267
- msgid ""
- "Enable policy routing (source routing) and set the routing table used when "
- "adding routes. This affects all routes, including device-routes, IPv4LL, "
-@@ -7536,12 +7766,12 @@ msgid ""
- "tables outside of NetworkManager."
- msgstr "启用策略路由（源路由）并在添加路由时设定路由表。此属性影响所有的路由器，包括设备路由、IPv4LL、DHCP、SLAAC、默认路由和静态路由。但请注意静态路由可以通过明确地指定非零的路由表来自己覆盖掉设置。如果表设置保留为零，它有权被全局配置覆盖。如果在应用全局配置值后属性仍为零，对此连接的地址族禁用策略路由。禁用策略路由意味着网络管理器（NetworkManager）将添加所有路由到主表（除了明确配置了不同路由表的静态路由）。另外，网络管理器将不会从表中删除任何外部路由，除了主路由。这是为了给用网络管理器之外工具管理路由表的用户保持后向兼容性。"
-
--#: ../clients/common/settings-docs.h.in:226
--#: ../clients/common/settings-docs.h.in:249
-+#: ../clients/common/settings-docs.h.in:244
-+#: ../clients/common/settings-docs.h.in:268
- msgid "Array of IP routes."
- msgstr "IP 路由数组。"
-
--#: ../clients/common/settings-docs.h.in:227
-+#: ../clients/common/settings-docs.h.in:245
- msgid ""
- "Configure method for creating the address for use with RFC4862 IPv6 "
- "Stateless Address Autoconfiguration. The permitted values are: "
-@@ -7563,7 +7793,7 @@ msgid ""
- "affect the temporary addresses configured with this option."
- msgstr "创建用于 RFC4862 IPv6 无状态地址自动配置的地址的配置方法。允许的值有：NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_EUI64 (0) 或 NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_STABLE_PRIVACY (1)。如果属性设为 EUI64，地址将使用衍生自硬件地址的接口令牌来生成。这会让地址的主机部分保持不变，使得在地址变化时能够追踪主机的存在。接口硬件被替换时地址改变。stable-privacy 值启用主机特定密钥的加密安全散列，随同连接的 stable-id 和由 RFC7217 指定的网络地址一起使用。这使得可以利用地址追踪主机的存在，且在网络接口硬件被替换时能保持地址固定。在 D-Bus 上，没有 addr-gen-mode 设置等于启用 stable-privacy。对于密钥文件，磁盘上没有设置则表示 EUI6，因此属性在从旧版本升级时不会改变。注意此设置与由 \"ip6-privacy\" 配置的隐私扩展不同，而且它不会影响此选项配置的临时地址。"
-
--#: ../clients/common/settings-docs.h.in:230
-+#: ../clients/common/settings-docs.h.in:248
- 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 "
-@@ -7592,7 +7822,7 @@ msgid ""
- "assumed."
- msgstr "包含 DHCPv6 唯一标识符（DUID）的字符串，用于 dhcp 客户端鉴定它自己到 DHCPv6 服务器（RFC 3315）。DUID 携带在客户端标识符选项中。如果属性为十六进制的字符串（\"aa:bb:cc\"），它被解读为二进制 DUID 并在客户端标识符选项中以不透明值填充。特殊值 \"lease\" 将重试连接所属租约文件上次使用的 DUID。如果为找到且 \"dhclient\" 为配置的 dhcp 客户端，DUID 将在系统范围的 dhclient 租约文件中搜索。如果仍为找到 DUID 或使用了其他 dhcp 客户端，将基于 machine-id 生成全局和永久的 DUID-UUID（RFC 6355）。特殊值 \"llt\" 和 \"ll\" 将基于设备的当前 MAC 地址生成 LLT 或 LL 类型的 DUID（参阅 RFC 3315）。为了试着提供稳定的 DUID-LLT，时间字段将包含固定时间戳，用于全局（的所有配置集）且保留到磁盘上。特殊值 \"stable-llt\"、\"stable-ll\" 和 \"stable-uuid\" 将生成相应类型的 DUID，衍生自连接的 stable-id 和每个主机的唯一密钥。因此，\"stable-ll\" 和 \"stable-llt\" 的链路层地址将是衍生自稳定 id 的生成地址。\"stable-llt\" 选项中的 DUID-LLT 时间值将在静态的三年时间跨度中选择（区间的上限与用在 \"llt\" 中的固定时间戳相同）。当属性未设定时，使用 \"ipv6.dhcp-duid\" 提供的全局值。如果未提供全局值，认定为默认的 \"lease\" 值。"
-
--#: ../clients/common/settings-docs.h.in:243
-+#: ../clients/common/settings-docs.h.in:261
- msgid ""
- "Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941. If "
- "enabled, it makes the kernel generate a temporary IPv6 address in addition "
-@@ -7609,38 +7839,46 @@ msgid ""
- "IPv6 addresses."
- msgstr "配置 SLAAC 的 IPv6 隐私扩展，描述于 RFC4941。如果启用，它让内核通过修改 EUI-64 生成临时的 IPv6 地址附加到从 MAC 地址生成的公共地址上。此可以增强隐私性，但另一方面也可能在有些应用程序上引起问题。允许的值有：-1，未知；0：禁用；1：启用（首选公共地址）；2：启用（首选临时地址）。把单个连接的设置设为 \"-1\" 表示其回落到全局配置 \"ipv6.ip6-privacy\"。如果全局配置也为配置或设为 \"-1\"，回落到读取 \"/proc/sys/net/ipv6/conf/default/use_tempaddr\" 的值。注意此设置与固定隐私地址不同，后者可通过 \"addr-gen-mode\" 属性的 \"stable-privacy\" 设置启用，可作为避免 IPv6 地址追踪的另一种方法。"
-
--#: ../clients/common/settings-docs.h.in:250
-+#: ../clients/common/settings-docs.h.in:265
-+msgid ""
-+"A timeout for waiting Router Advertisements in seconds. If zero (the "
-+"default), a globally configured default is used. If still unspecified, the "
-+"timeout depends on the sysctl settings of the device. Set to 2147483647 "
-+"(MAXINT32) for infinity."
-+msgstr "等待 Router Advertisements 的超时时间，单位为秒。如果为 0（默认值），则使用全局配置的默认值。如果仍未指定，则超时时间取决于设备的 sysctl 设置。设置为2147483647（MAXINT32）为无穷大。"
-+
-+#: ../clients/common/settings-docs.h.in:269
- msgid ""
- "Configure the token for draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 "
- "tokenized interface identifiers. Useful with eui64 addr-gen-mode."
- msgstr "配置用于 draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 令牌化接口标识符的令牌。对 eui64 addr-gen-mode 有用。"
-
--#: ../clients/common/settings-docs.h.in:251
-+#: ../clients/common/settings-docs.h.in:270
- msgid "Whether the transmitted traffic must be encrypted."
- msgstr "是否加密传输的流量。"
-
--#: ../clients/common/settings-docs.h.in:252
-+#: ../clients/common/settings-docs.h.in:271
- msgid ""
- "The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement."
- msgstr "用于 MACsec 密钥协商的预共享 CAK。"
-
--#: ../clients/common/settings-docs.h.in:253
-+#: ../clients/common/settings-docs.h.in:272
- msgid "Flags indicating how to handle the \"mka-cak\" property."
- msgstr "指示如何处理 \"mka-cak\" 属性的标志。"
-
--#: ../clients/common/settings-docs.h.in:254
-+#: ../clients/common/settings-docs.h.in:273
- msgid ""
- "The pre-shared CKN (Connectivity-association Key Name) for MACsec Key "
- "Agreement."
- msgstr "用于 MACsec 密钥协商的预共享 CKN（连接关联密钥名称）。"
-
--#: ../clients/common/settings-docs.h.in:255
-+#: ../clients/common/settings-docs.h.in:274
- 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:256
-+#: ../clients/common/settings-docs.h.in:275
- 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 "
-@@ -7648,29 +7886,29 @@ msgid ""
- "\"mac-address\" property."
- msgstr "如果给定了，其指定从此 MACSEC 接口应该创建自的上级接口名称或上级连接的 UUID。如果此属性未指定，该连接必须包含具有 \"mac-address\" 属性的 \"802-3-ethernet\" 设置。"
-
--#: ../clients/common/settings-docs.h.in:257
-+#: ../clients/common/settings-docs.h.in:276
- msgid ""
- "The port component of the SCI (Secure Channel Identifier), between 1 and "
- "65534."
- msgstr "SCI（安全信道标识符）的端口组件，介于 1 和 65534 之间。"
-
--#: ../clients/common/settings-docs.h.in:258
-+#: ../clients/common/settings-docs.h.in:277
- msgid ""
- "Specifies whether the SCI (Secure Channel Identifier) is included in every "
- "packet."
- msgstr "指定 SCI（安全信道标识符）是否包括在每个数据包中。"
-
--#: ../clients/common/settings-docs.h.in:259
-+#: ../clients/common/settings-docs.h.in:278
- msgid "Specifies the validation mode for incoming frames."
- msgstr "指定传入帧的验证模式。"
-
--#: ../clients/common/settings-docs.h.in:260
-+#: ../clients/common/settings-docs.h.in:279
- 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:261
-+#: ../clients/common/settings-docs.h.in:280
- 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 "
-@@ -7678,102 +7916,145 @@ msgid ""
- "\"mac-address\" property."
- msgstr "如果给定了，其指定从此 MAC-VLAN 接口应该创建自的上级接口名称或上级连接的 UUID。如果此属性未指定，该连接必须包含具有 \"mac-address\" 属性的 \"802-3-ethernet\" 设置。"
-
--#: ../clients/common/settings-docs.h.in:262
-+#: ../clients/common/settings-docs.h.in:281
- msgid "Whether the interface should be put in promiscuous mode."
- msgstr "是否应将接口置于混杂模式。"
-
--#: ../clients/common/settings-docs.h.in:263
-+#: ../clients/common/settings-docs.h.in:282
- msgid "Whether the interface should be a MACVTAP."
- msgstr "接口是否应为 MACVTAP。"
-
--#: ../clients/common/settings-docs.h.in:264
-+#: ../clients/common/settings-docs.h.in:283
-+msgid ""
-+"A list of driver names to match. Each element is a shell wildcard pattern. "
-+"See NMSettingMatch:interface-name for how special characters '|', '&', '!' "
-+"and '\\' are used for optional and mandatory matches and inverting the "
-+"pattern."
-+msgstr "要匹配的驱动程序名称列表。每个元素都是一个 shell 通配符模式。请参阅 NMSettingMatch:interface-name，了解特殊字符'|'、'&'、'!'和'\\'如何用于可选和强制匹配以及反转模式。"
-+
-+#: ../clients/common/settings-docs.h.in:284
- msgid ""
- "A list of interface names to match. Each element is a shell wildcard "
--"pattern. When an element is prefixed with exclamation mark (!) the "
--"condition is inverted. A candidate interface name is considered matching "
--"when both these conditions are satisfied: (a) any of the elements not "
--"prefixed with '!' matches or there aren't such elements; (b) none of the "
--"elements prefixed with '!' match."
--msgstr "要匹配的接口名列表。每个元素都为 shell 通配符模式。当元素以感叹号（!）为前缀时，条件反转。当满足下列条件时，视为匹配的候选接口名：(a) 未前插 \"!\" 的任意元素匹配或不存此类元素；(b) 无前插 \"!\" 的元素匹配。"
-+"pattern. An element can be prefixed with a pipe symbol (|) or an ampersand "
-+"(&). The former means that the element is optional and the latter means that "
-+"it is mandatory. If there are any optional elements, than the match "
-+"evaluates to true if at least one of the optional element matches (logical "
-+"OR). If there are any mandatory elements, then they all must match (logical "
-+"AND). By default, an element is optional. This means that an element \"foo\" "
-+"behaves the same as \"|foo\". An element can also be inverted with "
-+"exclamation mark (!) between the pipe symbol (or the ampersand) and before "
-+"the pattern. Note that \"!foo\" is a shortcut for the mandatory match \"&!foo"
-+"\". Finally, a backslash can be used at the beginning of the element (after "
-+"the optional special characters) to escape the start of the pattern. For "
-+"example, \"&\\!a\" is an mandatory match for literally \"!a\"."
-+msgstr "要匹配的接口名称列表。每个元素都是一个 shell 通配符模式。一个元素可以用一个 | 或 & 作为前缀。前者表示该元素是可选的，后者表示它是必须的。如果有任何可选元素，如果至少有一个可选元素匹配，则匹配值为 true（逻辑 OR）。如果有任何强制性元素，那么它们必须全部匹配（逻辑 AND）。默认情况下，一个元素是可选的。这意味着 \"foo\" 和 \"|foo\" 的效果是一样的。在 ！（或 &）和特征直接使用 ! 可以进行反转。请注意，\"!foo\" 和 \"&!foo\" 的的一个快捷模式。最后，可以在元素的开头（在可选的特殊字符之后）使用反斜杠来转义特殊字符。例如，\"&\\!a\"代表按字面意思匹配 \"!a\"。"
-
--#: ../clients/common/settings-docs.h.in:265
-+#: ../clients/common/settings-docs.h.in:285
-+msgid ""
-+"A list of kernel command line arguments to match. This may be used to check "
-+"whether a specific kernel command line option is set (or if prefixed with "
-+"the exclamation mark unset). The argument must either be a single word, or "
-+"an assignment (i.e. two words, separated \"=\"). In the former case the "
-+"kernel command line is searched for the word appearing as is, or as left "
-+"hand side of an assignment. In the latter case, the exact assignment is "
-+"looked for with right and left hand side matching. See NMSettingMatch:"
-+"interface-name for how special characters '|', '&', '!' and '\\' are used "
-+"for optional and mandatory matches and inverting the pattern."
-+msgstr "一个需要匹配的内核命令行参数列表。它可以用来检查一个特定的内核命令行选项是否被设置（或者如果前缀为感叹号则为 unset）。参数必须是单个单词，或者是赋值（即两个单词，用 \"=\" 分开）。在前一种情况下，内核命令行会搜索单词的原样，或者作为一个赋值的左面部分。在后一种情况下，是寻找左面部分和右面部分匹配的赋值。请参阅 NMSettingMatch:interface-name 了解特殊字符 '|'、'&'、'!' 和 '\\' 如何用于可选和强制匹配以及反转模式。"
-+
-+#: ../clients/common/settings-docs.h.in:286
-+msgid ""
-+"A list of paths to match against the ID_PATH udev property of devices. "
-+"ID_PATH represents the topological persistent path of a device. It typically "
-+"contains a subsystem string (pci, usb, platform, etc.) and a subsystem-"
-+"specific identifier. For PCI devices the path has the form \"pci-$domain:"
-+"$bus:$device.$function\", where each variable is an hexadecimal value; for "
-+"example \"pci-0000:0a:00.0\". The path of a device can be obtained with "
-+"\"udevadm info /sys/class/net/$dev | grep ID_PATH=\" or by looking at the "
-+"\"path\" property exported by NetworkManager (\"nmcli -f general.path device "
-+"show $dev\"). Each element of the list is a shell wildcard pattern. See "
-+"NMSettingMatch:interface-name for how special characters '|', '&', '!' and "
-+"'\\' are used for optional and mandatory matches and inverting the pattern."
-+msgstr "要与设备的 ID_PATH udev 属性匹配的路径列表。ID_PATH 表示设备的拓扑持久路径。它通常包含一个子系统字符串（pci、usb、platform 等）和一个子系统特定的标识符。对于PCI设备，路径的形式是 \"pci-$domain:$bus:$device.$function\"，其中每个变量是一个十六进制值，例如 \"pci-0000:0a:00.0\"。设备的路径可以通过 \"udevadm info /sys/class/net/$dev | grep ID_PATH=\" 或查看 NetworkManager导出的 \"path\" 属性来获得（\"nmcli -f general.path device show\"）。列表中的每个元素都是一个 shell 通配符模式。请参阅NMSettingMatch:interface-name，了解特殊字符 '|'、'&'、'!' 和 '\\ '如何用于可选和强制匹配以及反转模式。"
-+
-+#: ../clients/common/settings-docs.h.in:287
- msgid "The data path type. One of \"system\", \"netdev\" or empty."
- msgstr "数据路径类型。\"system\"、\"netdev\" 之一或留空。"
-
--#: ../clients/common/settings-docs.h.in:266
-+#: ../clients/common/settings-docs.h.in:288
- msgid "The bridge failure mode. One of \"secure\", \"standalone\" or empty."
- msgstr "网桥失败模式。\"secure\"、\"standalone\" 之一或留空。"
-
--#: ../clients/common/settings-docs.h.in:267
-+#: ../clients/common/settings-docs.h.in:289
- msgid "Enable or disable multicast snooping."
- msgstr "启用或禁用多播监听。"
-
--#: ../clients/common/settings-docs.h.in:268
-+#: ../clients/common/settings-docs.h.in:290
- msgid "Enable or disable RSTP."
- msgstr "启用或禁用 RSTP。"
-
--#: ../clients/common/settings-docs.h.in:269
-+#: ../clients/common/settings-docs.h.in:291
- msgid "Enable or disable STP."
- msgstr "启用或禁用 STP。"
-
--#: ../clients/common/settings-docs.h.in:270
-+#: ../clients/common/settings-docs.h.in:292
- msgid "Open vSwitch DPDK device arguments."
- msgstr "Open vSwitch DPDK 设备参数。"
-
--#: ../clients/common/settings-docs.h.in:271
-+#: ../clients/common/settings-docs.h.in:293
- msgid ""
- "The interface type. Either \"internal\", \"system\", \"patch\", \"dpdk\", or "
- "empty."
- msgstr "接口类型。\"internal\"、\"system\"、\"patch\"、\"dpdk\" 之一或留空。"
-
--#: ../clients/common/settings-docs.h.in:272
-+#: ../clients/common/settings-docs.h.in:294
- msgid ""
--"Specifies the unicast destination IP address of a remote Open vSwitch bridge "
--"port to connect to."
--msgstr "指定要连接的远程 Open vSwitch 网桥端口的单播目标 IP 地址。"
-+"Specifies the name of the interface for the other side of the patch. The "
-+"patch on the other side must also set this interface as peer."
-+msgstr "指定补丁另一侧的接口名称。另一边的补丁也必须将此接口设置为对等体。"
-
--#: ../clients/common/settings-docs.h.in:273
-+#: ../clients/common/settings-docs.h.in:295
- msgid "The time port must be inactive in order to be considered down."
- msgstr "端口被视为关闭所需停用的时间。"
-
--#: ../clients/common/settings-docs.h.in:274
-+#: ../clients/common/settings-docs.h.in:296
- 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:275
-+#: ../clients/common/settings-docs.h.in:297
- msgid "The time port must be active before it starts forwarding traffic."
- msgstr "端口开始流量转发所需激活的时间。"
-
--#: ../clients/common/settings-docs.h.in:276
-+#: ../clients/common/settings-docs.h.in:298
- msgid "LACP mode. One of \"active\", \"off\", or \"passive\"."
- msgstr "LACP 模式。\"active\"、\"off\" 或 \"passive\" 之一。"
-
--#: ../clients/common/settings-docs.h.in:277
-+#: ../clients/common/settings-docs.h.in:299
- msgid "The VLAN tag in the range 0-4095."
- msgstr "VLAN 标记在 0～4095 范围内。"
-
--#: ../clients/common/settings-docs.h.in:278
-+#: ../clients/common/settings-docs.h.in:300
- msgid ""
- "The VLAN mode. One of \"access\", \"native-tagged\", \"native-untagged\", "
- "\"trunk\" or unset."
- msgstr "VLAN 模式。\"access\"、\"native-tagged\"、\"native-untagged\"、\"trunk\" 之一或不设定。"
-
--#: ../clients/common/settings-docs.h.in:279
-+#: ../clients/common/settings-docs.h.in:301
- msgid ""
- "If non-zero, instruct pppd to set the serial port to the specified "
- "baudrate. This value should normally be left as 0 to automatically choose "
- "the speed."
- msgstr "如果非零，指示 pppd 设定串口到指定的波特率。要自动选择速度时此值通常保留为 0。"
-
--#: ../clients/common/settings-docs.h.in:280
-+#: ../clients/common/settings-docs.h.in:302
- msgid ""
- "If TRUE, specify that pppd should set the serial port to use hardware flow "
- "control with RTS and CTS signals. This value should normally be set to "
- "FALSE."
- msgstr "如果为 TRUE，指定 pppd 应设定串口以使用通过 RTS 和 CTS 信号的硬件流量控制。此值通常应设为 FALSE。"
-
--#: ../clients/common/settings-docs.h.in:281
-+#: ../clients/common/settings-docs.h.in:303
- 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 "
-@@ -7781,7 +8062,7 @@ msgid ""
- "property is used."
- msgstr "如果非零，指示如果指定的 LCP 回响请求号码未被节点回应时 pppd 就认定到节点的连接失败了。如果要使用此属性，\"lcp-echo-interval\" 属性也必须设为非零值。"
-
--#: ../clients/common/settings-docs.h.in:282
-+#: ../clients/common/settings-docs.h.in:304
- 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 "
-@@ -7789,78 +8070,78 @@ msgid ""
- "autodetect this."
- msgstr "如果非零，指示 pppd 每几秒发送一个 LCP 回响请求帧到节点（几秒为该属性指定）。注意有些 PPP 节点将响应回响请求而有些不会，并且无法自动检测此行为。"
-
--#: ../clients/common/settings-docs.h.in:283
-+#: ../clients/common/settings-docs.h.in:305
- 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:284
-+#: ../clients/common/settings-docs.h.in:306
- msgid ""
- "If non-zero, instruct pppd to request that the peer send packets no larger "
- "than the specified size. If non-zero, the MRU should be between 128 and "
- "16384."
- msgstr "如果非零，指示 pppd 请求节点发送的数据包不要超过指定的大小。如果非零，MRU 应在 128 和 16384 之间。"
-
--#: ../clients/common/settings-docs.h.in:285
-+#: ../clients/common/settings-docs.h.in:307
- msgid ""
- "If non-zero, instruct pppd to send packets no larger than the specified size."
- msgstr "如果非零，指示 pppd 不要发送超过指定大小的数据包。"
-
--#: ../clients/common/settings-docs.h.in:286
-+#: ../clients/common/settings-docs.h.in:308
- msgid "If TRUE, Van Jacobsen TCP header compression will not be requested."
- msgstr "如果为 TRUE，将不请求压缩 Van Jacobsen TCP 首部。"
-
--#: ../clients/common/settings-docs.h.in:287
-+#: ../clients/common/settings-docs.h.in:309
- msgid ""
- "If TRUE, do not require the other side (usually the PPP server) to "
- "authenticate itself to the client. If FALSE, require authentication from "
- "the remote side. In almost all cases, this should be TRUE."
- msgstr "如果为 TRUE，不需要其他方（通常是 PPP 服务器）验证自己到客户端。如果为 FALSE，需要来自远端的验证。在大多数情况下，此属性应为 TRUE。"
-
--#: ../clients/common/settings-docs.h.in:288
-+#: ../clients/common/settings-docs.h.in:310
- msgid "If TRUE, BSD compression will not be requested."
- msgstr "如果为 TURE，将不会请求 BSD 压缩。"
-
--#: ../clients/common/settings-docs.h.in:289
-+#: ../clients/common/settings-docs.h.in:311
- msgid "If TRUE, \"deflate\" compression will not be requested."
- msgstr "如果为 TURE，将不会请求 \"deflate\" 压缩。"
-
--#: ../clients/common/settings-docs.h.in:290
-+#: ../clients/common/settings-docs.h.in:312
- msgid "If TRUE, the CHAP authentication method will not be used."
- msgstr "如果为 TRUE，将不会使用 CHAP 验证方法。"
-
--#: ../clients/common/settings-docs.h.in:291
-+#: ../clients/common/settings-docs.h.in:313
- msgid "If TRUE, the EAP authentication method will not be used."
- msgstr "如果为 TRUE，将不会使用 EAP 验证方法。"
-
--#: ../clients/common/settings-docs.h.in:292
-+#: ../clients/common/settings-docs.h.in:314
- msgid "If TRUE, the MSCHAP authentication method will not be used."
- msgstr "如果为 TRUE，将不会使用 MSCHAP 验证方法。"
-
--#: ../clients/common/settings-docs.h.in:293
-+#: ../clients/common/settings-docs.h.in:315
- msgid "If TRUE, the MSCHAPv2 authentication method will not be used."
- msgstr "如果为 TRUE，将不会使用 MSCHAPv2 验证方法。"
-
--#: ../clients/common/settings-docs.h.in:294
-+#: ../clients/common/settings-docs.h.in:316
- msgid "If TRUE, the PAP authentication method will not be used."
- msgstr "如果为 TRUE，将不会使用 PAP 验证方法。"
-
--#: ../clients/common/settings-docs.h.in:295
-+#: ../clients/common/settings-docs.h.in:317
- msgid ""
- "If TRUE, MPPE (Microsoft Point-to-Point Encryption) will be required for the "
- "PPP session. If either 64-bit or 128-bit MPPE is not available the session "
- "will fail. Note that MPPE is not used on mobile broadband connections."
- msgstr "如果为 TRUE，PPP 会话将需要 MPPE（微软点对点加密）。如果 64 位或 128 位的 MPPE 都不可用，会话将失败。注意 MPPE 不用在移动宽带连接。"
-
--#: ../clients/common/settings-docs.h.in:296
-+#: ../clients/common/settings-docs.h.in:318
- msgid ""
- "If TRUE, 128-bit MPPE (Microsoft Point-to-Point Encryption) will be required "
- "for the PPP session, and the \"require-mppe\" property must also be set to "
- "TRUE. If 128-bit MPPE is not available the session will fail."
- msgstr "如果为 TRUE，PPP 会话将需要 MPPE（微软点对点加密）且 \"require-mppe\" 也必须设为 TRUE。如果 128 位的 MPPE 不可用，会话将失败。"
-
--#: ../clients/common/settings-docs.h.in:297
-+#: ../clients/common/settings-docs.h.in:319
- 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 "
-@@ -7868,11 +8149,11 @@ msgid ""
- "NMSettingConnection."
- msgstr "如果给定了，指定此 PPPoE 连接应被创建在的上级接口名。如果此属性未指定，连接将激活到 NMSettingConnection 的 \"interface-name\" 所指定的接口。"
-
--#: ../clients/common/settings-docs.h.in:298
-+#: ../clients/common/settings-docs.h.in:320
- msgid "Password used to authenticate with the PPPoE service."
- msgstr "用于 PPPoE 服务验证的密码。"
-
--#: ../clients/common/settings-docs.h.in:300
-+#: ../clients/common/settings-docs.h.in:322
- msgid ""
- "If specified, instruct PPPoE to only initiate sessions with access "
- "concentrators that provide the specified service. For most providers, this "
-@@ -7880,53 +8161,53 @@ msgid ""
- "concentrators or a specific service is known to be required."
- msgstr "如果指定了，指示 PPPoE 只启动与提供了指定服务的集线器的会话。对于大多数运营商，此属性应留空。如果有多个集线器存在或者特定服务需要时，此属性才需要设定。"
-
--#: ../clients/common/settings-docs.h.in:301
-+#: ../clients/common/settings-docs.h.in:323
- msgid "Username used to authenticate with the PPPoE service."
- msgstr "用于 PPPoE 服务验证的用户名。"
-
--#: ../clients/common/settings-docs.h.in:302
-+#: ../clients/common/settings-docs.h.in:324
- msgid "Whether the proxy configuration is for browser only."
- msgstr "代理配置是否只用于浏览器。"
-
--#: ../clients/common/settings-docs.h.in:303
-+#: ../clients/common/settings-docs.h.in:325
- 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:304
-+#: ../clients/common/settings-docs.h.in:326
- msgid "PAC script for the connection."
- msgstr "用于连接的 PAC 脚本。"
-
--#: ../clients/common/settings-docs.h.in:305
-+#: ../clients/common/settings-docs.h.in:327
- msgid "PAC URL for obtaining PAC file."
- msgstr "用户获取 PAC 文件的 PAC URL。"
-
--#: ../clients/common/settings-docs.h.in:306
-+#: ../clients/common/settings-docs.h.in:328
- msgid ""
- "Speed to use for communication over the serial port. Note that this value "
- "usually has no effect for mobile broadband modems as they generally ignore "
- "speed settings and use the highest available speed."
- msgstr "通过串口通信使用的速度。注意该值一般对移动宽带调制解调器没有效果，因为它们通常忽略速度设置并使用最高的可用速度。"
-
--#: ../clients/common/settings-docs.h.in:307
-+#: ../clients/common/settings-docs.h.in:329
- msgid "Byte-width of the serial communication. The 8 in \"8n1\" for example."
- msgstr "串口通信的字节宽度。以 \"8n1\" 中的 8 为例。"
-
--#: ../clients/common/settings-docs.h.in:308
-+#: ../clients/common/settings-docs.h.in:330
- msgid "Parity setting of the serial port."
- msgstr "串口的奇偶校验设置。"
-
--#: ../clients/common/settings-docs.h.in:309
-+#: ../clients/common/settings-docs.h.in:331
- msgid "Time to delay between each byte sent to the modem, in microseconds."
- msgstr "每次发送字节到调制解调器的延迟时间，以微秒计。"
-
--#: ../clients/common/settings-docs.h.in:310
-+#: ../clients/common/settings-docs.h.in:332
- 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:311
-+#: ../clients/common/settings-docs.h.in:333
- 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 "
-@@ -7937,15 +8218,16 @@ msgid ""
- "assumed to be NM_TERNARY_TRUE (1)."
- msgstr "是否通过兼容的驱动程序自动探测虚拟功能（virtual function）。如果设为 NM_TERNARY_TRUE (1)，内核将尝试绑定虚拟功能到兼容的驱动，而且如果成功，每个虚拟功能都将实例化一个新的网络接口。如果设为 NM_TERNARY_FALSE (0)，虚拟功能将不被声明且不会为它们创建网络接口。当设为 NM_TERNARY_DEFAULT (-1) 时，使用全局默认值；全局默认未指定的情况下则假定为 NM_TERNARY_TRUE (1)。"
-
--#: ../clients/common/settings-docs.h.in:312
-+#: ../clients/common/settings-docs.h.in:334
- msgid ""
- "The total number of virtual functions to create. Note that when the sriov "
- "setting is present NetworkManager enforces the number of virtual functions "
--"on the interface also when it is zero. To prevent any changes to SR-IOV "
--"parameters don't add a sriov setting to the connection."
--msgstr "要创建的虚拟功能的总数。请注意，如果存在 sriov 设置（即使为 0），NetworkManager 都会强制实现在接口上的虚拟功能的数量。为了防止对 SR-IOV 参数的任何改变，则不要向连接添加 sriov 设置。"
-+"on the interface (also when it is zero) during activation and resets it upon "
-+"deactivation. 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:313
-+#: ../clients/common/settings-docs.h.in:335
- msgid ""
- "Array of virtual function descriptors. Each VF descriptor is a dictionary "
- "mapping attribute names to GVariant values. The 'index' entry is mandatory "
-@@ -7959,15 +8241,15 @@ msgid ""
- "default) or 'ad' for 802.1ad."
- msgstr "虚拟功能描述符阵列。每个虚拟功能描述符是个映射属性名到 GVariant 值的字典。\"index\" 条目为每个虚拟功能的必填项。当表示为字符串时，虚拟功能的格式为：\"INDEX [ATTR=VALUE[ ATTR=VALUE]...]\"。例如：\"2 mac=00:11:22:33:44:55 spoof-check=true\"。\"vlans\" 属性表示为分号分隔的 VLAN 描述符列表，其中每个描述符的格式为 \"ID[.PRIORITY[.PROTO]]\"。PROTO 可以是用于 802.1Q（默认）的 \"q\" 或用于 802.1ad 的 \"ad\"。"
-
--#: ../clients/common/settings-docs.h.in:314
-+#: ../clients/common/settings-docs.h.in:336
- msgid "Array of TC queueing disciplines."
- msgstr "TC 排队规则阵列。"
-
--#: ../clients/common/settings-docs.h.in:315
-+#: ../clients/common/settings-docs.h.in:337
- msgid "Array of TC traffic filters."
- msgstr "TC 流量过滤器阵列。"
-
--#: ../clients/common/settings-docs.h.in:316
-+#: ../clients/common/settings-docs.h.in:338
- msgid ""
- "The JSON configuration for the team network interface. The property should "
- "contain raw JSON configuration data suitable for teamd, because the value is "
-@@ -7975,8 +8257,8 @@ msgid ""
- "used. See man teamd.conf for the format details."
- msgstr "组合（team）网络接口的 JSON 配置。此属性应包含适用于 teamd 的原始 JSON 配置，因为该值直接传递给 teamd。如果未指定则使用默认的配置。格式详情请参阅 teamd.conf 手册。"
-
--#: ../clients/common/settings-docs.h.in:317
--#: ../clients/common/settings-docs.h.in:335
-+#: ../clients/common/settings-docs.h.in:339
-+#: ../clients/common/settings-docs.h.in:357
- msgid ""
- "Link watchers configuration for the connection: each link watcher is defined "
- "by a dictionary, whose keys depend upon the selected link watcher. Available "
-@@ -7988,65 +8270,65 @@ msgid ""
- "for more details."
- msgstr "连接的链路监视器配置：每个链路监视器都由一个目录定义，其密钥取决于所选的链路监视器。可用的链路监视器有 \"ethtool\"、\"nsna_ping\" 和 \"arp_ping\"，并且在目录中以密钥 \"name\" 指定。可用的密钥有： ethtool：\"delay-up\"、\"delay-down\"、\"init-wait\"；nsna_ping：\"init-wait\"、\"interval\"、\"missed-max\"、\"target-host\"；arp_ping：包括 nsna_ping 中的所有以及 \"source-host\"、\"validate-active\"、\"validate-incative\"、\"send-always\"。请参阅 teamd.conf 的 man 页了解详细信息。"
-
--#: ../clients/common/settings-docs.h.in:318
-+#: ../clients/common/settings-docs.h.in:340
- msgid "Corresponds to the teamd mcast_rejoin.count."
- msgstr "对应于 teamd mcast_rejoin.count。"
-
--#: ../clients/common/settings-docs.h.in:319
-+#: ../clients/common/settings-docs.h.in:341
- msgid "Corresponds to the teamd mcast_rejoin.interval."
- msgstr "对应于 teamd mcast_rejoin.interval。"
-
--#: ../clients/common/settings-docs.h.in:320
-+#: ../clients/common/settings-docs.h.in:342
- msgid "Corresponds to the teamd notify_peers.count."
- msgstr "对应于 teamd notify_peers.count。"
-
--#: ../clients/common/settings-docs.h.in:321
-+#: ../clients/common/settings-docs.h.in:343
- msgid "Corresponds to the teamd notify_peers.interval."
- msgstr "对应于 teamd notify_peers.interval。"
-
--#: ../clients/common/settings-docs.h.in:322
-+#: ../clients/common/settings-docs.h.in:344
- msgid ""
- "Corresponds to the teamd runner.name. Permitted values are: \"roundrobin\", "
- "\"broadcast\", \"activebackup\", \"loadbalance\", \"lacp\", \"random\"."
- msgstr "对应于 teamd runner.name。允许的值为 \"roundrobin\"、\"broadcast\"、\"activebackup\"、 \"loadbalance\"、\"lacp\"、\"random\"。"
-
--#: ../clients/common/settings-docs.h.in:323
-+#: ../clients/common/settings-docs.h.in:345
- msgid "Corresponds to the teamd runner.active."
- msgstr "对应于 teamd runner.active。"
-
--#: ../clients/common/settings-docs.h.in:324
-+#: ../clients/common/settings-docs.h.in:346
- msgid "Corresponds to the teamd runner.agg_select_policy."
- msgstr "对应于 teamd runner.agg_select_policy。"
-
--#: ../clients/common/settings-docs.h.in:325
-+#: ../clients/common/settings-docs.h.in:347
- msgid "Corresponds to the teamd runner.fast_rate."
- msgstr "对应于 teamd runner.fast_rate。"
-
--#: ../clients/common/settings-docs.h.in:326
-+#: ../clients/common/settings-docs.h.in:348
- msgid "Corresponds to the teamd runner.hwaddr_policy."
- msgstr "对应于 teamd runner.hwaddr_policy。"
-
--#: ../clients/common/settings-docs.h.in:327
-+#: ../clients/common/settings-docs.h.in:349
- msgid "Corresponds to the teamd runner.min_ports."
- msgstr "对应于 teamd runner.min_ports。"
-
--#: ../clients/common/settings-docs.h.in:328
-+#: ../clients/common/settings-docs.h.in:350
- msgid "Corresponds to the teamd runner.sys_prio."
- msgstr "对应于 teamd runner.sys_prio。"
-
--#: ../clients/common/settings-docs.h.in:329
-+#: ../clients/common/settings-docs.h.in:351
- msgid "Corresponds to the teamd runner.tx_balancer.name."
- msgstr "对应于 teamd runner.tx_balancer.name。"
-
--#: ../clients/common/settings-docs.h.in:330
-+#: ../clients/common/settings-docs.h.in:352
- msgid "Corresponds to the teamd runner.tx_balancer.interval."
- msgstr "对应于 teamd runner.tx_balancer.interval。"
-
--#: ../clients/common/settings-docs.h.in:331
-+#: ../clients/common/settings-docs.h.in:353
- msgid "Corresponds to the teamd runner.tx_hash."
- msgstr "对应于 teamd runner.tx_hash。"
-
--#: ../clients/common/settings-docs.h.in:332
-+#: ../clients/common/settings-docs.h.in:354
- msgid ""
- "The JSON configuration for the team port. The property should contain raw "
- "JSON configuration data suitable for teamd, because the value is passed "
-@@ -8054,67 +8336,67 @@ msgid ""
- "man teamd.conf for the format details."
- msgstr "组合（team）接口的 JSON 配置。此属性应包含适用于 teamd 的原始 JSON 配置，因为该值直接传递给 teamd。如果未指定则使用默认的配置。格式详情请参阅 teamd.conf 手册。"
-
--#: ../clients/common/settings-docs.h.in:333
-+#: ../clients/common/settings-docs.h.in:355
- msgid "Corresponds to the teamd ports.PORTIFNAME.lacp_key."
- msgstr "对应于 teamd ports.PORTIFNAME.lacp_key。"
-
--#: ../clients/common/settings-docs.h.in:334
-+#: ../clients/common/settings-docs.h.in:356
- msgid "Corresponds to the teamd ports.PORTIFNAME.lacp_prio."
- msgstr "对应于 teamd ports.PORTIFNAME.lacp_prio。"
-
--#: ../clients/common/settings-docs.h.in:336
-+#: ../clients/common/settings-docs.h.in:358
- msgid "Corresponds to the teamd ports.PORTIFNAME.prio."
- msgstr "对应于 teamd ports.PORTIFNAME.prio。"
-
--#: ../clients/common/settings-docs.h.in:337
-+#: ../clients/common/settings-docs.h.in:359
- msgid ""
- "Corresponds to the teamd ports.PORTIFNAME.queue_id. When set to -1 means the "
- "parameter is skipped from the json config."
- msgstr "对应于 teamd ports.PORTIFNAME.queue_id。设定为 -1 时表示参数从 json 配置忽略。"
-
--#: ../clients/common/settings-docs.h.in:338
-+#: ../clients/common/settings-docs.h.in:360
- msgid "Corresponds to the teamd ports.PORTIFNAME.sticky."
- msgstr "对应于 teamd ports.PORTIFNAME.sticky。"
-
--#: ../clients/common/settings-docs.h.in:339
-+#: ../clients/common/settings-docs.h.in:361
- 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:340
-+#: ../clients/common/settings-docs.h.in:362
- msgid ""
- "The operating mode of the virtual device. Allowed values are "
- "NM_SETTING_TUN_MODE_TUN (1) to create a layer 3 device and "
- "NM_SETTING_TUN_MODE_TAP (2) to create an Ethernet-like layer 2 one."
- msgstr "虚拟设备的操作模式。允许值有 NM_SETTING_TUN_MODE_TUN (1) 以创建第三层设备和 NM_SETTING_TUN_MODE_TAP (2) 以创建类以太网的第二层设备。"
-
--#: ../clients/common/settings-docs.h.in:341
-+#: ../clients/common/settings-docs.h.in:363
- msgid ""
- "If the property is set to TRUE, the interface will support multiple file "
- "descriptors (queues) to parallelize packet sending or receiving. Otherwise, "
- "the interface will only support a single queue."
- msgstr "如果属性设为 TRUE，接口将支持多个文件描述符（队列）以并行化数据包的发送和接收，接口将只支持单个队列。"
-
--#: ../clients/common/settings-docs.h.in:342
-+#: ../clients/common/settings-docs.h.in:364
- 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:343
-+#: ../clients/common/settings-docs.h.in:365
- 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:344
-+#: ../clients/common/settings-docs.h.in:366
- 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:345
-+#: ../clients/common/settings-docs.h.in:367
- 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 "
-@@ -8122,14 +8404,14 @@ msgid ""
- "up to a certain length."
- msgstr "包含用户数据的键/值对字典。此数据被网络管理器（NetworkManager）忽略且可被用户随意使用。键只支持严格的 ASCII 格式，但是值可以为长度有限的任意 UTF8 字符串。"
-
--#: ../clients/common/settings-docs.h.in:346
-+#: ../clients/common/settings-docs.h.in:368
- msgid ""
- "For outgoing packets, a list of mappings from Linux SKB priorities to 802.1p "
- "priorities. The mapping is given in the format \"from:to\" where both \"from"
- "\" and \"to\" are unsigned integers, ie \"7:3\"."
- msgstr "用于传出的数据包，从 Linux SKB 优先级到 802.1p 优先级的映射列表。映射以 \"从:到\" 的格式给定，其中 \"从\" 和 \"到\" 都是无符号整数，如 \"7:3\"。"
-
--#: ../clients/common/settings-docs.h.in:347
-+#: ../clients/common/settings-docs.h.in:369
- 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 "
-@@ -8142,20 +8424,20 @@ msgid ""
- "missing property on D-Bus is still considered as 0."
- msgstr "控制 VLAN 接口的行为和功能的一个或多个标志。标识包含 NM_VLAN_FLAG_REORDER_HEADERS (0x1)（重新排序输出数据包首部）、NM_VLAN_FLAG_GVRP (0x2)（使用 GVRP 协议）、NM_VLAN_FLAG_LOOSE_BINDING (0x4)（接口到它主设备运行状态的松散绑定）和 NM_VLAN_FLAG_MVRP (0x8)（使用 MVRP 协议）。此属性的默认值为 NM_VLAN_FLAG_REORDER_HEADERS，但它以前是 0。为了保持后向兼容性，D-Bus API 里的默认值继续为 0 而且 D-Bus 上缺少属性时仍视为 0。"
-
--#: ../clients/common/settings-docs.h.in:348
-+#: ../clients/common/settings-docs.h.in:370
- msgid ""
- "The VLAN identifier that the interface created by this connection should be "
- "assigned. The valid range is from 0 to 4094, without the reserved id 4095."
- msgstr "由此连接创建的接口应该分配的 VLAN 标识符。有效范围为从 0 到 4094，不包括保留的 ID 4095。"
-
--#: ../clients/common/settings-docs.h.in:349
-+#: ../clients/common/settings-docs.h.in:371
- msgid ""
- "For incoming packets, a list of mappings from 802.1p priorities to Linux SKB "
- "priorities. The mapping is given in the format \"from:to\" where both \"from"
- "\" and \"to\" are unsigned integers, ie \"7:3\"."
- msgstr "用于传入的数据包，从 802.1p 优先级到 Linux SKB 优先级的映射列表。映射以 \"从:到\" 的格式给定，其中 \"从\" 和 \"到\" 都是无符号整数，如 \"7:3\"。"
-
--#: ../clients/common/settings-docs.h.in:350
-+#: ../clients/common/settings-docs.h.in:372
- 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 "
-@@ -8163,32 +8445,32 @@ msgid ""
- "\"mac-address\" property."
- msgstr "如果给定了，其指定从此 VLAN 接口应该创建自的上级接口名称或上级连接的 UUID。如果此属性未指定，该连接必须包含具有 \"mac-address\" 属性的 \"802-3-ethernet\" 设置。"
-
--#: ../clients/common/settings-docs.h.in:351
-+#: ../clients/common/settings-docs.h.in:373
- 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:352
-+#: ../clients/common/settings-docs.h.in:374
- msgid ""
- "If the VPN service supports persistence, and this property is TRUE, the VPN "
- "will attempt to stay connected across link changes and outages, until "
- "explicitly disconnected."
- msgstr "如果 VPN 服务支持持久连接，并且此属性为 TRUE，VPN 将尝试在链路更改和中断的整个期间都保持连接，直到手动断开连接。"
-
--#: ../clients/common/settings-docs.h.in:353
-+#: ../clients/common/settings-docs.h.in:375
- 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:354
-+#: ../clients/common/settings-docs.h.in:376
- msgid ""
- "D-Bus service name of the VPN plugin that this setting uses to connect to "
- "its network. i.e. org.freedesktop.NetworkManager.vpnc for the vpnc plugin."
- msgstr "此连接用于连接到它网络的 VPN 插件的 D-Bus 服务名。例如 org.freedesktop.NetworkManager.vpnc 用于 vpnc 插件。"
-
--#: ../clients/common/settings-docs.h.in:355
-+#: ../clients/common/settings-docs.h.in:377
- 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 "
-@@ -8196,7 +8478,7 @@ msgid ""
- "Values greater than zero mean timeout in seconds."
- msgstr "VPN 服务建立连接的超时时间。有些服务可能需要很多时间才能连接。值 0 表示默认的超时，即 60 秒（除非被配置文件中的 vpn.timeout 覆盖）。大于零的值表示以秒计算的超时时间。"
-
--#: ../clients/common/settings-docs.h.in:356
-+#: ../clients/common/settings-docs.h.in:378
- 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 "
-@@ -8206,92 +8488,96 @@ msgid ""
- "connection."
- msgstr "如果 VPN 连接需要用户名用于验证，应在这里提供。如果连接可用于多个用户，且 VPN 需要每个用户提供个不同的名称，那么让此属性留空。如果此属性留空，网络管理器（NetworkManager）将自动提供 VPN 连接所需要用户的用户名。"
-
--#: ../clients/common/settings-docs.h.in:357
-+#: ../clients/common/settings-docs.h.in:379
-+msgid "The routing table for this VRF."
-+msgstr "该 VRF 的路由表。"
-+
-+#: ../clients/common/settings-docs.h.in:380
- msgid "Specifies the lifetime in seconds of FDB entries learnt by the kernel."
- msgstr "指定内核已获知 FDB 条目的生存期，以秒计。"
-
--#: ../clients/common/settings-docs.h.in:358
-+#: ../clients/common/settings-docs.h.in:381
- msgid ""
- "Specifies the UDP destination port to communicate to the remote VXLAN tunnel "
- "endpoint."
- msgstr "指定连接到远程 VXLAN 隧道端点的 UDP 目标端口。"
-
--#: ../clients/common/settings-docs.h.in:359
-+#: ../clients/common/settings-docs.h.in:382
- msgid ""
- "Specifies the VXLAN Network Identifier (or VXLAN Segment Identifier) to use."
- msgstr "指定要使用的 VXLAN 网络标识符（或 VXLAN 分段标识符）。"
-
--#: ../clients/common/settings-docs.h.in:360
-+#: ../clients/common/settings-docs.h.in:383
- msgid "Specifies whether netlink LL ADDR miss notifications are generated."
- msgstr "指定是否生成网络链路 LL ADDR 未命中通知。"
-
--#: ../clients/common/settings-docs.h.in:361
-+#: ../clients/common/settings-docs.h.in:384
- msgid "Specifies whether netlink IP ADDR miss notifications are generated."
- msgstr "指定是否生成网络链路 IP ADDR 未命中通知。"
-
--#: ../clients/common/settings-docs.h.in:362
-+#: ../clients/common/settings-docs.h.in:385
- 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:363
-+#: ../clients/common/settings-docs.h.in:386
- 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:364
-+#: ../clients/common/settings-docs.h.in:387
- msgid "If given, specifies the source IP address to use in outgoing packets."
- msgstr "如果给定，指定要在传出数据包使用的来源 IP 地址。"
-
--#: ../clients/common/settings-docs.h.in:365
-+#: ../clients/common/settings-docs.h.in:388
- msgid ""
- "If given, specifies the parent interface name or parent connection UUID."
- msgstr "如果给定了，其指定上级接口名称或上级连接的 UUID。"
-
--#: ../clients/common/settings-docs.h.in:366
-+#: ../clients/common/settings-docs.h.in:389
- msgid "Specifies whether ARP proxy is turned on."
- msgstr "指定是否打开 ARP 代理。"
-
--#: ../clients/common/settings-docs.h.in:367
-+#: ../clients/common/settings-docs.h.in:390
- msgid ""
- "Specifies the unicast destination IP address to use in outgoing packets when "
- "the destination link layer address is not known in the VXLAN device "
- "forwarding database, or the multicast IP address to join."
- msgstr "指定当目标链路层地址在 VXLAN 设备转发数据库中未知时要在传出数据包中使用的单播目标 IP 地址，或者要加入的多播 IP 地址。"
-
--#: ../clients/common/settings-docs.h.in:368
-+#: ../clients/common/settings-docs.h.in:391
- msgid "Specifies whether route short circuit is turned on."
- msgstr "指定是否打开路由短路。"
-
--#: ../clients/common/settings-docs.h.in:369
-+#: ../clients/common/settings-docs.h.in:392
- msgid ""
- "Specifies the maximum UDP source port to communicate to the remote VXLAN "
- "tunnel endpoint."
- msgstr "指定连接到远程 VXLAN 隧道端点的最大 UDP 来源端口。"
-
--#: ../clients/common/settings-docs.h.in:370
-+#: ../clients/common/settings-docs.h.in:393
- msgid ""
- "Specifies the minimum UDP source port to communicate to the remote VXLAN "
- "tunnel endpoint."
- msgstr "指定连接到远程 VXLAN 隧道端点的最小 UDP 来源端口。"
-
--#: ../clients/common/settings-docs.h.in:371
-+#: ../clients/common/settings-docs.h.in:394
- msgid "Specifies the TOS value to use in outgoing packets."
- msgstr "指定要在传出数据包使用的 TOS 值。"
-
--#: ../clients/common/settings-docs.h.in:372
-+#: ../clients/common/settings-docs.h.in:395
- msgid "Specifies the time-to-live value to use in outgoing packets."
- msgstr "指定要在传出数据包使用的存活时间值。"
-
--#: ../clients/common/settings-docs.h.in:373
-+#: ../clients/common/settings-docs.h.in:396
- 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:374
-+#: ../clients/common/settings-docs.h.in:397
- 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 "
-@@ -8300,27 +8586,27 @@ msgid ""
- "client."
- msgstr "要设置的 WFD（Wi-Fi Display）IE（Information Elements）。WFD 需要在特定 Wi-Fi 数据帧中设置一个特定于协议的 IE。它们可以在这里设置来建立连接。这个设置只在实现一个 WFD 客户端时有用。"
-
--#: ../clients/common/settings-docs.h.in:375
-+#: ../clients/common/settings-docs.h.in:398
- 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）会自动决定要使用的最佳方法，因此改变默认设置几乎没有意义。"
-
--#: ../clients/common/settings-docs.h.in:376
-+#: ../clients/common/settings-docs.h.in:399
- msgid ""
- "If specified, this connection will only apply to the WiMAX device whose MAC "
- "address matches. This property does not change the MAC address of the device "
- "(known as MAC spoofing). Deprecated: 1"
- msgstr "如指定了，此连接将只应用到其 MAC 地址符合的 WiMAX 设备。此属性不会改变设备的 MAC 地址（又名 MAC 欺骗）。已弃用：1"
-
--#: ../clients/common/settings-docs.h.in:377
-+#: ../clients/common/settings-docs.h.in:400
- 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:378
-+#: ../clients/common/settings-docs.h.in:401
- msgid ""
- "The use of fwmark is optional and is by default off. Setting it to 0 "
- "disables it. Otherwise it is a 32-bit fwmark for outgoing packets. Note that "
-@@ -8328,29 +8614,32 @@ msgid ""
- "automatically choose a fwmark."
- msgstr "使用 fwmark 是可选的，它在默认情况下被禁用。如果把它设为 0，则代表被禁用，其他情况下，它是一个用于出站数据包的 32 位 fwmark。请注意，如果 \"ip4-auto-default-route\" 或 \"ip6-auto-default-route\" 已启用，则意味着自动选择一个 fwmark。"
-
--#: ../clients/common/settings-docs.h.in:379
-+#: ../clients/common/settings-docs.h.in:402
- msgid ""
- "Whether to enable special handling of the IPv4 default route. If enabled, "
--"the IPv4 default route will be placed to a dedicated routing-table and two "
--"policy routing rules will be added. The fwmark number is also used as "
--"routing-table for the default-route, and if fwmark is zero, a unused fwmark/"
--"table is chosen automatically. This corresponds to what wg-quick does with "
--"Table=auto. Leaving this at the default will enable this option "
--"automatically if ipv4.never-default is not set and there are any peers that "
--"use a default-route as allowed-ips."
--msgstr "是否启用 IPv4 默认路由的特殊处理。 如果启用，IPv4 默认路由将被放置到专用路由表中，并将添加两个策略路由规则。 fwmark 编号也用作默认路由的路由表，如果 fwmark 为零，则自动选择未使用的 fwmark/table。 这与 wg-quick 设置了 Table = auto 的作用相同。如果 ipv4.never-default 没有设置且有使用 default-route 作为 allowed-ips 的 peer 存在时，将此值保留为默认值将自动启用此选项。"
--
--#: ../clients/common/settings-docs.h.in:380
-+"the IPv4 default route from wireguard.peer-routes will be placed to a "
-+"dedicated routing-table and two policy routing rules will be added. The "
-+"fwmark number is also used as routing-table for the default-route, and if "
-+"fwmark is zero, an unused fwmark/table is chosen automatically. This "
-+"corresponds to what wg-quick does with Table=auto and what WireGuard calls "
-+"\"Improved Rule-based Routing\". Note that for this automatism to work, you "
-+"usually don't want to set ipv4.gateway, because that will result in a "
-+"conflicting default route. Leaving this at the default will enable this "
-+"option automatically if ipv4.never-default is not set and there are any "
-+"peers that use a default-route as allowed-ips."
-+msgstr "是否启用 IPv4 默认路由的特殊处理。 如果启用，来自 wireguard.peer-routes 的 IPv4 默认路由将被放置到专用路由表中，并将添加两个策略路由规则。 fwmark 编号也用作默认路由的路由表，如果 fwmark 为零，则自动选择未使用的 fwmark/table。这与 wg-quick 设置了 Table=auto，以及 WireGuard 中的 \"Improved Rule-based Routing\" 作用相同。请注意，为了使这个自动性可以正常工作，您通常不应该设置 ipv4.gateway，因为这可能会导致默认路由冲突。如果 ipv4.never-default 没有设置，且有使用 default-route 作为 allowed-ips 的 peer 存在时，将此值保留为默认值将自动启用此选项。"
-+
-+#: ../clients/common/settings-docs.h.in:403
- msgid "Like ip4-auto-default-route, but for the IPv6 default route."
- msgstr "与 ip4-auto-default-route 相同，但针对于 IPv6 默认路由。"
-
--#: ../clients/common/settings-docs.h.in:381
-+#: ../clients/common/settings-docs.h.in:404
- 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:382
-+#: ../clients/common/settings-docs.h.in:405
- 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 "
-@@ -8358,94 +8647,98 @@ msgid ""
- "account the current routes at the time of activation."
- msgstr "如果非零，只传输指定大小或更小的数据包，大的数据包会被分成多个以太网帧。如果为 0， 则使用默认的 MTU。请注意，与 wg-quick 的 MTU 不同，它不会考虑在激活时当前的路由。"
-
--#: ../clients/common/settings-docs.h.in:383
-+#: ../clients/common/settings-docs.h.in:406
- msgid ""
- "Whether to automatically add routes for the AllowedIPs ranges of the peers. "
- "If TRUE (the default), NetworkManager will automatically add routes in the "
--"routing tables according to ipv4.route-table and ipv6.route-table. If FALSE, "
--"no such routes are added automatically. In this case, the user may want to "
--"configure static routes in ipv4.routes and ipv6.routes, respectively."
--msgstr "是否为 peer 的 AllowedIPs 范围自动添加路由。如果为 TRUE (默认设置)，NetworkManager 会根据 ipv4.route-table 和 ipv6.route-table 在路由表中自动添加路由。如果为 FALSE，不会自动添加路由。在这种情况下，用户需要分别在 ipv4.routes 和 ipv6.routes 中添加静态路由。"
--
--#: ../clients/common/settings-docs.h.in:384
-+"routing tables according to ipv4.route-table and ipv6.route-table. Usually "
-+"you want this automatism enabled. 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. Note that if the peer's "
-+"AllowedIPs is \"0.0.0.0/0\" or \"::/0\" and the profile's ipv4.never-default "
-+"or ipv6.never-default setting is enabled, the peer route for this peer won't "
-+"be added automatically."
-+msgstr "是否为 peer 的 AllowedIPs 范围自动添加路由。如果为 TRUE (默认设置)，NetworkManager 会根据 ipv4.route-table 和 ipv6.route-table 在路由表中自动添加路由。通常情况下这个自动性应该被启用。如果为 FALSE，不会自动添加路由。在这种情况下，用户需要分别在 ipv4.routes 和 ipv6.routes 中添加静态路由。注意，如果 peer 的AllowedIPs 为 \"0.0.0.0/0\" 或 \"::/0\"，并且启用了配置文件的 ipv4.never-default 或 ipv6.never-default 设置，则不会自动添加该 peer 的路由。"
-+
-+#: ../clients/common/settings-docs.h.in:407
- msgid "The 256 bit private-key in base64 encoding."
- msgstr "以 base64 编码的 256 为私钥。"
-
--#: ../clients/common/settings-docs.h.in:385
-+#: ../clients/common/settings-docs.h.in:408
- msgid "Flags indicating how to handle the \"private-key\" property."
- msgstr "指示如何处理 \"private-key\" 属性的标志。"
-
--#: ../clients/common/settings-docs.h.in:386
-+#: ../clients/common/settings-docs.h.in:409
- 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:387
-+#: ../clients/common/settings-docs.h.in:410
- msgid ""
- "If specified, this connection will only apply to the IEEE 802.15.4 (WPAN) "
- "MAC layer device whose permanent MAC address matches."
- msgstr "如果指定了，此连接将只应用到其永久 MAC 地址匹配的 IEEE 802.15.4 (WPAN) MAC 层设备。"
-
--#: ../clients/common/settings-docs.h.in:388
-+#: ../clients/common/settings-docs.h.in:411
- 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:389
-+#: ../clients/common/settings-docs.h.in:412
- msgid "IEEE 802.15.4 Personal Area Network (PAN) identifier."
- msgstr "IEEE 802.15.4 个人区域网络（PAN）标识符。"
-
--#: ../clients/common/settings-docs.h.in:390
-+#: ../clients/common/settings-docs.h.in:413
- msgid "Short IEEE 802.15.4 address to be used within a restricted environment."
- msgstr "在受限环境中使用的短 IEEE 802.15.4 地址。"
-
--#: ../clients/nm-online.c:75
-+#: ../clients/nm-online.c:77
- msgid "Connecting"
- msgstr "正在连接"
-
--#: ../clients/nm-online.c:191
-+#: ../clients/nm-online.c:193
- #, c-format
- msgid "Error: timeout creating NMClient object\n"
- msgstr "错误：创建 NMClient 对象时超时\n"
-
--#: ../clients/nm-online.c:211
-+#: ../clients/nm-online.c:216
- #, c-format
- msgid "Error: Could not create NMClient object: %s\n"
- msgstr "错误：无法创建 NMClient 对象：%s\n"
-
--#: ../clients/nm-online.c:237
-+#: ../clients/nm-online.c:240
- msgid "Don't print anything"
- msgstr "不输出任何结果"
-
--#: ../clients/nm-online.c:238
-+#: ../clients/nm-online.c:241
- msgid "Wait for NetworkManager startup instead of a connection"
- msgstr "等待网络管理器启动而不是连接"
-
--#: ../clients/nm-online.c:239
-+#: ../clients/nm-online.c:242
- msgid ""
- "Time to wait for a connection, in seconds (without the option, default value "
- "is 30)"
- msgstr "等待连接时间，以秒计（没有该选项时，默认为 30）"
-
--#: ../clients/nm-online.c:240
-+#: ../clients/nm-online.c:243
- msgid "Exit immediately if NetworkManager is not running or connecting"
- msgstr "如果网络管理器未运行或连接则立即退出"
-
--#: ../clients/nm-online.c:260
-+#: ../clients/nm-online.c:265
- msgid ""
- "Waits for NetworkManager to finish activating startup network connections."
- msgstr "等待网络管理完成激活启动网络连接。"
-
--#: ../clients/nm-online.c:267 ../clients/nm-online.c:273
-+#: ../clients/nm-online.c:272 ../clients/nm-online.c:278
- msgid "Invalid option. Please use --help to see a list of valid options."
- msgstr "无效选项。请使用 --help 查看有效选项列表。"
-
- #: ../clients/tui/newt/nmt-newt-utils.c:163 ../clients/tui/nmt-editor.c:420
- #: ../clients/tui/nmt-password-dialog.c:161
- #: ../clients/tui/nmt-route-editor.c:109 ../clients/tui/nmtui-hostname.c:56
--#: ../clients/tui/nmtui.c:121
-+#: ../clients/tui/nmtui.c:123
- msgid "OK"
- msgstr "确定"
-
-@@ -8465,105 +8758,105 @@ msgstr "编辑器失败：%s"
- msgid "Could not re-read file: %s"
- msgstr "无法重新读取文件：%s"
-
--#: ../clients/tui/nm-editor-utils.c:140 ../libnm/nm-device.c:1455
-+#: ../clients/tui/nm-editor-utils.c:135 ../libnm/nm-device.c:1567
- msgid "Ethernet"
- msgstr "以太网"
-
--#: ../clients/tui/nm-editor-utils.c:144
-+#: ../clients/tui/nm-editor-utils.c:139
- #, c-format
- msgid "Ethernet connection %d"
- msgstr "以太网连接 %d"
-
--#: ../clients/tui/nm-editor-utils.c:148 ../libnm/nm-device.c:1457
-+#: ../clients/tui/nm-editor-utils.c:143 ../libnm/nm-device.c:1569
- msgid "Wi-Fi"
- msgstr "Wi-Fi"
-
--#: ../clients/tui/nm-editor-utils.c:152
-+#: ../clients/tui/nm-editor-utils.c:147
- #, c-format
- msgid "Wi-Fi connection %d"
- msgstr "Wi-Fi 连接 %d"
-
--#: ../clients/tui/nm-editor-utils.c:157 ../libnm-core/nm-connection.c:2752
--#: ../libnm/nm-device.c:1473
-+#: ../clients/tui/nm-editor-utils.c:152 ../libnm-core/nm-connection.c:2713
-+#: ../libnm/nm-device.c:1585
- msgid "InfiniBand"
- msgstr "InfiniBand"
-
--#: ../clients/tui/nm-editor-utils.c:161
-+#: ../clients/tui/nm-editor-utils.c:156
- #, c-format
- msgid "InfiniBand connection %d"
- msgstr "InfiniBand 连接 %d"
-
--#: ../clients/tui/nm-editor-utils.c:166 ../libnm/nm-device.c:1471
-+#: ../clients/tui/nm-editor-utils.c:161 ../libnm/nm-device.c:1583
- msgid "Mobile Broadband"
- msgstr "移动宽带"
-
--#: ../clients/tui/nm-editor-utils.c:169
-+#: ../clients/tui/nm-editor-utils.c:164
- #, c-format
- msgid "Mobile broadband connection %d"
- msgstr "移动宽带连接 %d"
-
--#: ../clients/tui/nm-editor-utils.c:175 ../clients/tui/nmt-page-dsl.c:49
-+#: ../clients/tui/nm-editor-utils.c:170 ../clients/tui/nmt-page-dsl.c:49
- msgid "DSL"
- msgstr "DSL"
-
--#: ../clients/tui/nm-editor-utils.c:179
-+#: ../clients/tui/nm-editor-utils.c:174
- #, c-format
- msgid "DSL connection %d"
- msgstr "DSL 连接 %d"
-
--#: ../clients/tui/nm-editor-utils.c:184 ../libnm-core/nm-connection.c:2744
--#: ../libnm/nm-device.c:1475
--#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4959
-+#: ../clients/tui/nm-editor-utils.c:179 ../libnm-core/nm-connection.c:2705
-+#: ../libnm/nm-device.c:1587
-+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5216
- msgid "Bond"
- msgstr "绑定"
-
--#: ../clients/tui/nm-editor-utils.c:188
-+#: ../clients/tui/nm-editor-utils.c:183
- #, c-format
- msgid "Bond connection %d"
- msgstr "绑定连接 %d"
-
--#: ../clients/tui/nm-editor-utils.c:193 ../libnm-core/nm-connection.c:2748
--#: ../libnm/nm-device.c:1479
--#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5314
-+#: ../clients/tui/nm-editor-utils.c:188 ../libnm-core/nm-connection.c:2709
-+#: ../libnm/nm-device.c:1591
-+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5599
- msgid "Bridge"
- msgstr "网桥"
-
--#: ../clients/tui/nm-editor-utils.c:198
-+#: ../clients/tui/nm-editor-utils.c:193
- #, c-format
- msgid "Bridge connection %d"
- msgstr "网桥连接 %d"
-
--#: ../clients/tui/nm-editor-utils.c:202 ../libnm-core/nm-connection.c:2746
--#: ../libnm/nm-device.c:1477
--#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5032
-+#: ../clients/tui/nm-editor-utils.c:197 ../libnm-core/nm-connection.c:2707
-+#: ../libnm/nm-device.c:1589
-+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5289
- msgid "Team"
- msgstr "组合"
-
--#: ../clients/tui/nm-editor-utils.c:207
-+#: ../clients/tui/nm-editor-utils.c:202
- #, c-format
- msgid "Team connection %d"
- msgstr "组合连接 %d"
-
--#: ../clients/tui/nm-editor-utils.c:211 ../clients/tui/nmt-page-vlan.c:69
--#: ../libnm-core/nm-connection.c:2750 ../libnm/nm-device.c:1481
-+#: ../clients/tui/nm-editor-utils.c:206 ../clients/tui/nmt-page-vlan.c:69
-+#: ../libnm-core/nm-connection.c:2711 ../libnm/nm-device.c:1593
- msgid "VLAN"
- msgstr "VLAN"
-
--#: ../clients/tui/nm-editor-utils.c:215
-+#: ../clients/tui/nm-editor-utils.c:210
- #, c-format
- msgid "VLAN connection %d"
- msgstr "VLAN 连接 %d"
-
--#: ../clients/tui/nm-editor-utils.c:219 ../clients/tui/nmt-page-ip-tunnel.c:123
-+#: ../clients/tui/nm-editor-utils.c:214 ../clients/tui/nmt-page-ip-tunnel.c:123
- msgid "IP tunnel"
- msgstr "IP 隧道"
-
--#: ../clients/tui/nm-editor-utils.c:223
-+#: ../clients/tui/nm-editor-utils.c:218
- #, c-format
- msgid "IP tunnel connection %d"
- msgstr "IP 隧道连接 %d"
-
--#: ../clients/tui/nm-editor-utils.c:238
-+#: ../clients/tui/nm-editor-utils.c:233
- #, c-format
- msgid "VPN connection %d"
- msgstr "VPN 连接 %d"
-@@ -8700,7 +8993,7 @@ msgid "Slaves"
- msgstr "从机"
-
- #: ../clients/tui/nmt-page-bond.c:365 ../clients/tui/nmt-page-ip-tunnel.c:135
--#: ../clients/tui/nmt-page-wifi.c:218
-+#: ../clients/tui/nmt-page-wifi.c:219
- msgid "Mode"
- msgstr "模式"
-
-@@ -8735,7 +9028,7 @@ msgid "ARP targets"
- msgstr "ARP 目标"
-
- #: ../clients/tui/nmt-page-bond.c:418 ../clients/tui/nmt-page-ethernet.c:64
--#: ../clients/tui/nmt-page-vlan.c:97 ../clients/tui/nmt-page-wifi.c:353
-+#: ../clients/tui/nmt-page-vlan.c:97 ../clients/tui/nmt-page-wifi.c:354
- msgid "Cloned MAC address"
- msgstr "克隆的 MAC 地址"
-
-@@ -8800,7 +9093,7 @@ msgstr "以太网"
- #: ../clients/tui/nmt-page-ethernet.c:70
- #: ../clients/tui/nmt-page-infiniband.c:81
- #: ../clients/tui/nmt-page-ip-tunnel.c:173 ../clients/tui/nmt-page-vlan.c:103
--#: ../clients/tui/nmt-page-wifi.c:359
-+#: ../clients/tui/nmt-page-wifi.c:360
- msgid "MTU"
- msgstr "MTU"
-
-@@ -8845,7 +9138,7 @@ msgid "(No custom routes)"
- msgstr "（没有自定义路由）"
-
- #: ../clients/tui/nmt-page-ip4.c:72 ../clients/tui/nmt-page-ip6.c:73
--#, fuzzy, c-format
-+#, c-format
- msgid "One custom route"
- msgid_plural "%d custom routes"
- msgstr[0] "个自定义路由"
-@@ -9092,63 +9385,67 @@ msgstr "动态 WEP（802.1x）"
- msgid "LEAP"
- msgstr "LEAP"
-
--#: ../clients/tui/nmt-page-wifi.c:79
-+#: ../clients/tui/nmt-page-wifi.c:75
-+msgid "Enhanced Open (OWE)"
-+msgstr "强化开放（OWE）"
-+
-+#: ../clients/tui/nmt-page-wifi.c:80
- msgctxt "WEP key index"
- msgid "1 (Default)"
- msgstr "1（默认）"
-
--#: ../clients/tui/nmt-page-wifi.c:80
-+#: ../clients/tui/nmt-page-wifi.c:81
- msgctxt "WEP key index"
- msgid "2"
- msgstr "2"
-
--#: ../clients/tui/nmt-page-wifi.c:81
-+#: ../clients/tui/nmt-page-wifi.c:82
- msgctxt "WEP key index"
- msgid "3"
- msgstr "3"
-
--#: ../clients/tui/nmt-page-wifi.c:82
-+#: ../clients/tui/nmt-page-wifi.c:83
- msgctxt "WEP key index"
- msgid "4"
- msgstr "4"
-
--#: ../clients/tui/nmt-page-wifi.c:87
-+#: ../clients/tui/nmt-page-wifi.c:88
- msgid "Open System"
- msgstr "开放系统"
-
--#: ../clients/tui/nmt-page-wifi.c:88
-+#: ../clients/tui/nmt-page-wifi.c:89
- msgid "Shared Key"
- msgstr "共享密钥"
-
--#: ../clients/tui/nmt-page-wifi.c:202
-+#: ../clients/tui/nmt-page-wifi.c:203
- msgid "WI-FI"
- msgstr "WI-FI"
-
--#: ../clients/tui/nmt-page-wifi.c:244
-+#: ../clients/tui/nmt-page-wifi.c:245
- msgid "Channel"
- msgstr "信道"
-
- #. "wpa-enterprise"
- #. FIXME
--#: ../clients/tui/nmt-page-wifi.c:271
-+#: ../clients/tui/nmt-page-wifi.c:272
- msgid "(No support for wpa-enterprise yet...)"
- msgstr "（还未支持 WPA 企业...）"
-
--#: ../clients/tui/nmt-page-wifi.c:281 ../clients/tui/nmt-page-wifi.c:300
-+#: ../clients/tui/nmt-page-wifi.c:282 ../clients/tui/nmt-page-wifi.c:301
- msgid "WEP index"
- msgstr "WEP 索引"
-
--#: ../clients/tui/nmt-page-wifi.c:289 ../clients/tui/nmt-page-wifi.c:308
-+#: ../clients/tui/nmt-page-wifi.c:290 ../clients/tui/nmt-page-wifi.c:309
- msgid "Authentication"
- msgstr "验证"
-
- #. "dynamic-wep"
- #. FIXME
--#: ../clients/tui/nmt-page-wifi.c:314
-+#: ../clients/tui/nmt-page-wifi.c:315
- msgid "(No support for dynamic-wep yet...)"
- msgstr "（还未支持动态 WEP...）"
-
--#: ../clients/tui/nmt-page-wifi.c:347
-+#: ../clients/tui/nmt-page-wifi.c:348
- msgid "BSSID"
- msgstr "BSSID"
-
-@@ -9218,38 +9515,43 @@ msgstr "openconnect 失败，信号为 %d"
- msgid "Activation failed: %s"
- msgstr "激活失败：%s"
-
--#: ../clients/tui/nmtui-connect.c:241
-+#: ../clients/tui/nmtui-connect.c:230
-+#, c-format
-+msgid "Could not deactivate connection: %s"
-+msgstr "无法取消激活连接：%s"
-+
-+#: ../clients/tui/nmtui-connect.c:252
- msgid "Connecting..."
- msgstr "正在连接..."
-
--#: ../clients/tui/nmtui-connect.c:279 ../clients/tui/nmtui-connect.c:316
-+#: ../clients/tui/nmtui-connect.c:290 ../clients/tui/nmtui-connect.c:327
- #, c-format
- msgid "Could not activate connection: %s"
- msgstr "无法激活连接：%s"
-
--#: ../clients/tui/nmtui-connect.c:378 ../clients/tui/nmtui-connect.c:427
-+#: ../clients/tui/nmtui-connect.c:389 ../clients/tui/nmtui-connect.c:438
- msgid "Activate"
- msgstr "激活"
-
--#: ../clients/tui/nmtui-connect.c:380
-+#: ../clients/tui/nmtui-connect.c:391
- msgid "Deactivate"
- msgstr "停用"
-
--#: ../clients/tui/nmtui-connect.c:432 ../clients/tui/nmtui-edit.c:105
--#: ../clients/tui/nmtui.c:115
-+#: ../clients/tui/nmtui-connect.c:443 ../clients/tui/nmtui-edit.c:105
-+#: ../clients/tui/nmtui.c:117
- msgid "Quit"
- msgstr "退出"
-
--#: ../clients/tui/nmtui-connect.c:432 ../clients/tui/nmtui-edit.c:105
-+#: ../clients/tui/nmtui-connect.c:443 ../clients/tui/nmtui-edit.c:105
- msgid "Back"
- msgstr "返回"
-
--#: ../clients/tui/nmtui-connect.c:455
-+#: ../clients/tui/nmtui-connect.c:466
- #, c-format
- msgid "No such connection '%s'"
- msgstr "无此连接 \"%s\""
-
--#: ../clients/tui/nmtui-connect.c:457
-+#: ../clients/tui/nmtui-connect.c:468
- msgid "Connection is already active"
- msgstr "连接已经激活"
-
-@@ -9305,51 +9607,47 @@ msgstr "主机名已设为 \"%s\""
- msgid "Unable to set hostname: %s"
- msgstr "无法设置主机名：%s"
-
--#: ../clients/tui/nmtui.c:38 ../clients/tui/nmtui.c:41
-+#: ../clients/tui/nmtui.c:40 ../clients/tui/nmtui.c:43
- msgid "connection"
- msgstr "连接"
-
--#: ../clients/tui/nmtui.c:39
-+#: ../clients/tui/nmtui.c:41
- msgid "Edit a connection"
- msgstr "编辑连接"
-
--#: ../clients/tui/nmtui.c:42
-+#: ../clients/tui/nmtui.c:44
- msgid "Activate a connection"
- msgstr "启用连接"
-
--#: ../clients/tui/nmtui.c:44
-+#: ../clients/tui/nmtui.c:46
- msgid "new hostname"
- msgstr "新主机名"
-
--#: ../clients/tui/nmtui.c:45
-+#: ../clients/tui/nmtui.c:47
- msgid "Set system hostname"
- msgstr "设置系统主机名"
-
--#: ../clients/tui/nmtui.c:89
-+#: ../clients/tui/nmtui.c:91
- msgid "NetworkManager TUI"
- msgstr "网络管理器文本用户界面"
-
--#: ../clients/tui/nmtui.c:97
-+#: ../clients/tui/nmtui.c:99
- msgid "Please select an option"
- msgstr "请选择选项"
-
--#: ../clients/tui/nmtui.c:145
-+#: ../clients/tui/nmtui.c:147
- msgid "Usage"
- msgstr "用法"
-
--#: ../clients/tui/nmtui.c:226
-+#: ../clients/tui/nmtui.c:228
- msgid "Could not parse arguments"
- msgstr "无法解析参数"
-
--#: ../clients/tui/nmtui.c:236
-+#: ../clients/tui/nmtui.c:241
- #, c-format
- msgid "Could not contact NetworkManager: %s.\n"
- msgstr "无法联系网络管理器：%s\n"
-
--#: ../clients/tui/nmtui.c:241
--msgid "NetworkManager is not running."
--msgstr "NetworkManaer 未运行。"
--
- #: ../libnm-core/nm-crypto.c:204
- #, c-format
- msgid "PEM key file had no start tag"
-@@ -9476,12 +9774,12 @@ msgstr "无效的私钥"
- msgid "Failed to initialize the crypto engine."
- msgstr "初始化加密引擎失败。"
-
--#: ../libnm-core/nm-crypto-gnutls.c:90 ../libnm-core/nm-crypto-nss.c:112
-+#: ../libnm-core/nm-crypto-gnutls.c:90 ../libnm-core/nm-crypto-nss.c:114
- #, c-format
- msgid "Unsupported key cipher for decryption"
- msgstr "解密不支持的密钥密码"
-
--#: ../libnm-core/nm-crypto-gnutls.c:100 ../libnm-core/nm-crypto-nss.c:119
-+#: ../libnm-core/nm-crypto-gnutls.c:100 ../libnm-core/nm-crypto-nss.c:121
- #, c-format
- msgid "Invalid IV length (must be at least %u)."
- msgstr "无效的初始向量长度（至少为 %u）。"
-@@ -9496,17 +9794,17 @@ msgstr "初始化解密计算内容失败：%s（%s）"
- msgid "Failed to decrypt the private key: %s (%s)"
- msgstr "解密私钥失败：%s（%s）"
-
--#: ../libnm-core/nm-crypto-gnutls.c:143 ../libnm-core/nm-crypto-nss.c:206
-+#: ../libnm-core/nm-crypto-gnutls.c:143 ../libnm-core/nm-crypto-nss.c:208
- #, c-format
- msgid "Failed to decrypt the private key: unexpected padding length."
- msgstr "解密私钥失败：意外的填充长度。"
-
--#: ../libnm-core/nm-crypto-gnutls.c:154 ../libnm-core/nm-crypto-nss.c:217
-+#: ../libnm-core/nm-crypto-gnutls.c:154 ../libnm-core/nm-crypto-nss.c:219
- #, c-format
- msgid "Failed to decrypt the private key."
- msgstr "解密私钥失败。"
-
--#: ../libnm-core/nm-crypto-gnutls.c:188 ../libnm-core/nm-crypto-nss.c:272
-+#: ../libnm-core/nm-crypto-gnutls.c:188 ../libnm-core/nm-crypto-nss.c:274
- #, c-format
- msgid "Unsupported key cipher for encryption"
- msgstr "加密不支持的密钥密码"
-@@ -9556,107 +9854,107 @@ msgstr "无法初始化 PKCS#8 解码器：%s"
- msgid "Couldn't decode PKCS#8 file: %s"
- msgstr "无法解码 PKCS#8 文件：%s"
-
--#: ../libnm-core/nm-crypto-nss.c:65
-+#: ../libnm-core/nm-crypto-nss.c:67
- #, c-format
- msgid "Failed to initialize the crypto engine: %d."
- msgstr "初始化加密引擎失败：%d。"
-
--#: ../libnm-core/nm-crypto-nss.c:131
-+#: ../libnm-core/nm-crypto-nss.c:133
- #, c-format
- msgid "Failed to initialize the decryption cipher slot."
- msgstr "初始化解密计算插槽失败。"
-
--#: ../libnm-core/nm-crypto-nss.c:141
-+#: ../libnm-core/nm-crypto-nss.c:143
- #, c-format
- msgid "Failed to set symmetric key for decryption."
- msgstr "为解密设置对称密钥失败。"
-
--#: ../libnm-core/nm-crypto-nss.c:151
-+#: ../libnm-core/nm-crypto-nss.c:153
- #, c-format
- msgid "Failed to set IV for decryption."
- msgstr "为解密设置初始向量失败。"
-
--#: ../libnm-core/nm-crypto-nss.c:159
-+#: ../libnm-core/nm-crypto-nss.c:161
- #, c-format
- msgid "Failed to initialize the decryption context."
- msgstr "初始化解密环境失败。"
-
--#: ../libnm-core/nm-crypto-nss.c:175
-+#: ../libnm-core/nm-crypto-nss.c:177
- #, c-format
- msgid "Failed to decrypt the private key: %d."
- msgstr "解密私钥失败：%d。"
-
--#: ../libnm-core/nm-crypto-nss.c:183
-+#: ../libnm-core/nm-crypto-nss.c:185
- #, c-format
- msgid "Failed to decrypt the private key: decrypted data too large."
- msgstr "解密私钥失败：解密后的数据太大。"
-
--#: ../libnm-core/nm-crypto-nss.c:194
-+#: ../libnm-core/nm-crypto-nss.c:196
- #, c-format
- msgid "Failed to finalize decryption of the private key: %d."
- msgstr "结束解密私钥失败：%d。"
-
--#: ../libnm-core/nm-crypto-nss.c:283
-+#: ../libnm-core/nm-crypto-nss.c:285
- #, c-format
- msgid "Failed to initialize the encryption cipher slot."
- msgstr "初始化加密计算插槽空间失败。"
-
--#: ../libnm-core/nm-crypto-nss.c:291
-+#: ../libnm-core/nm-crypto-nss.c:293
- #, c-format
- msgid "Failed to set symmetric key for encryption."
- msgstr "为加密设置对称密钥失败。"
-
--#: ../libnm-core/nm-crypto-nss.c:299
-+#: ../libnm-core/nm-crypto-nss.c:301
- #, c-format
- msgid "Failed to set IV for encryption."
- msgstr "为加密设置初始向量失败。"
-
--#: ../libnm-core/nm-crypto-nss.c:307
-+#: ../libnm-core/nm-crypto-nss.c:309
- #, c-format
- msgid "Failed to initialize the encryption context."
- msgstr "初始化加密内容失败。"
-
--#: ../libnm-core/nm-crypto-nss.c:330
-+#: ../libnm-core/nm-crypto-nss.c:332
- #, c-format
- msgid "Failed to encrypt: %d."
- msgstr "加密失败：%d。"
-
--#: ../libnm-core/nm-crypto-nss.c:338
-+#: ../libnm-core/nm-crypto-nss.c:340
- #, c-format
- msgid "Unexpected amount of data after encrypting."
- msgstr "加密后意外的数据量。"
-
--#: ../libnm-core/nm-crypto-nss.c:376
-+#: ../libnm-core/nm-crypto-nss.c:378
- #, c-format
- msgid "Couldn't decode certificate: %d"
- msgstr "无法解码证书：%d"
-
--#: ../libnm-core/nm-crypto-nss.c:422
-+#: ../libnm-core/nm-crypto-nss.c:424
- #, c-format
- msgid "Password must be UTF-8"
- msgstr "密码必须是 UTF-8 格式"
-
--#: ../libnm-core/nm-crypto-nss.c:445
-+#: ../libnm-core/nm-crypto-nss.c:447
- #, c-format
- msgid "Couldn't initialize slot"
- msgstr "无法初始 slot"
-
--#: ../libnm-core/nm-crypto-nss.c:453
-+#: ../libnm-core/nm-crypto-nss.c:455
- #, c-format
- msgid "Couldn't initialize PKCS#12 decoder: %d"
- msgstr "无法初始化 PKCS#12 解码器：%d"
-
--#: ../libnm-core/nm-crypto-nss.c:462
-+#: ../libnm-core/nm-crypto-nss.c:464
- #, c-format
- msgid "Couldn't decode PKCS#12 file: %d"
- msgstr "无法解码 PKCS#12 文件：%d"
-
--#: ../libnm-core/nm-crypto-nss.c:471
-+#: ../libnm-core/nm-crypto-nss.c:473
- #, c-format
- msgid "Couldn't verify PKCS#12 file: %d"
- msgstr "无法校验 PKCS#12 文件：%d"
-
--#: ../libnm-core/nm-crypto-nss.c:521
-+#: ../libnm-core/nm-crypto-nss.c:523
- msgid "Could not generate random data."
- msgstr "无法生成随机数据。"
-
-@@ -9672,57 +9970,57 @@ msgstr "未知的设置名称"
- msgid "duplicate setting name"
- msgstr "重复的设置名称"
-
--#: ../libnm-core/nm-connection.c:1423
-+#: ../libnm-core/nm-connection.c:1424
- msgid "setting not found"
- msgstr "未找到设置"
-
--#: ../libnm-core/nm-connection.c:1489 ../libnm-core/nm-connection.c:1514
--#: ../libnm-core/nm-connection.c:1539
-+#: ../libnm-core/nm-connection.c:1476 ../libnm-core/nm-connection.c:1501
-+#: ../libnm-core/nm-connection.c:1526
- msgid "setting is required for non-slave connections"
- msgstr "对于非从连接，设置是必需的"
-
--#: ../libnm-core/nm-connection.c:1502 ../libnm-core/nm-connection.c:1527
--#: ../libnm-core/nm-connection.c:1552
-+#: ../libnm-core/nm-connection.c:1489 ../libnm-core/nm-connection.c:1514
-+#: ../libnm-core/nm-connection.c:1539
- msgid "setting not allowed in slave connection"
- msgstr "从连接中不允许设置"
-
--#: ../libnm-core/nm-connection.c:1657
-+#: ../libnm-core/nm-connection.c:1644
- msgid "Unexpected failure to normalize the connection"
- msgstr "正常化连接意外地失败"
-
--#: ../libnm-core/nm-connection.c:1720
-+#: ../libnm-core/nm-connection.c:1707
- msgid "Unexpected failure to verify the connection"
- msgstr "检验连接意外地失败"
-
--#: ../libnm-core/nm-connection.c:1756
-+#: ../libnm-core/nm-connection.c:1743
- #, c-format
- msgid "unexpected uuid %s instead of %s"
- msgstr "非预期的 uuid %s，而不是 %s"
-
--#: ../libnm-core/nm-connection.c:2609 ../libnm-core/nm-setting-8021x.c:2574
--#: ../libnm-core/nm-setting-8021x.c:2591 ../libnm-core/nm-setting-8021x.c:2622
--#: ../libnm-core/nm-setting-8021x.c:2639 ../libnm-core/nm-setting-8021x.c:2681
--#: ../libnm-core/nm-setting-8021x.c:2693 ../libnm-core/nm-setting-8021x.c:2711
--#: ../libnm-core/nm-setting-8021x.c:2723 ../libnm-core/nm-setting-8021x.c:2747
--#: ../libnm-core/nm-setting-8021x.c:2840 ../libnm-core/nm-setting-adsl.c:158
-+#: ../libnm-core/nm-connection.c:2569 ../libnm-core/nm-setting-8021x.c:2610
-+#: ../libnm-core/nm-setting-8021x.c:2627 ../libnm-core/nm-setting-8021x.c:2658
-+#: ../libnm-core/nm-setting-8021x.c:2675 ../libnm-core/nm-setting-8021x.c:2717
-+#: ../libnm-core/nm-setting-8021x.c:2729 ../libnm-core/nm-setting-8021x.c:2747
-+#: ../libnm-core/nm-setting-8021x.c:2759 ../libnm-core/nm-setting-8021x.c:2783
-+#: ../libnm-core/nm-setting-8021x.c:2876 ../libnm-core/nm-setting-adsl.c:158
- #: ../libnm-core/nm-setting-bluetooth.c:109
- #: ../libnm-core/nm-setting-bluetooth.c:167
- #: ../libnm-core/nm-setting-bluetooth.c:181 ../libnm-core/nm-setting-cdma.c:128
--#: ../libnm-core/nm-setting-connection.c:954
--#: ../libnm-core/nm-setting-connection.c:997
--#: ../libnm-core/nm-setting-connection.c:1177
--#: ../libnm-core/nm-setting-ip-config.c:4946
--#: ../libnm-core/nm-setting-ip-tunnel.c:359
-+#: ../libnm-core/nm-setting-connection.c:975
-+#: ../libnm-core/nm-setting-connection.c:1004
-+#: ../libnm-core/nm-setting-connection.c:1266
-+#: ../libnm-core/nm-setting-ip-config.c:4974
-+#: ../libnm-core/nm-setting-ip-tunnel.c:367
- #: ../libnm-core/nm-setting-olpc-mesh.c:84
- #: ../libnm-core/nm-setting-ovs-patch.c:77 ../libnm-core/nm-setting-pppoe.c:130
--#: ../libnm-core/nm-setting-vpn.c:516 ../libnm-core/nm-setting-vxlan.c:323
-+#: ../libnm-core/nm-setting-vpn.c:551 ../libnm-core/nm-setting-vxlan.c:323
- #: ../libnm-core/nm-setting-wifi-p2p.c:122 ../libnm-core/nm-setting-wimax.c:94
--#: ../libnm-core/nm-setting-wireless-security.c:902
--#: ../libnm-core/nm-setting-wireless.c:759
-+#: ../libnm-core/nm-setting-wireless-security.c:894
-+#: ../libnm-core/nm-setting-wireless.c:764
- msgid "property is missing"
- msgstr "缺少属性"
-
--#: ../libnm-core/nm-connection.c:2755
-+#: ../libnm-core/nm-connection.c:2716
- msgid "IP Tunnel"
- msgstr "IP 隧道"
-
-@@ -9731,215 +10029,275 @@ msgstr "IP 隧道"
- msgid "Method returned type '%s', but expected '%s'"
- msgstr "方法返回类型 \"%s\"，但期望的是 \"%s\""
-
--#: ../libnm-core/nm-keyfile-utils.c:242
-+#: ../libnm-core/nm-keyfile/nm-keyfile-utils.c:171
-+#, c-format
-+msgid "Value cannot be interpreted as a list of numbers."
-+msgstr "值不能解释为一个数字列表。"
-+
-+#: ../libnm-core/nm-keyfile/nm-keyfile-utils.c:307
- #, c-format
- msgid "value is not an integer in range [%lld, %lld]"
- msgstr "值不是在 [%lld, %lld] 范围内的一个整数"
-
--#: ../libnm-core/nm-keyfile.c:196
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:271
- msgid "ignoring missing number"
- msgstr "忽略缺失的数字"
-
--#: ../libnm-core/nm-keyfile.c:204
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:283
- #, c-format
- msgid "ignoring invalid number '%s'"
- msgstr "忽略无效的数字 \"%s\""
-
--#: ../libnm-core/nm-keyfile.c:225
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:312
- #, c-format
- msgid "ignoring invalid %s address: %s"
- msgstr "忽略无效的 %s 地址：%s"
-
--#: ../libnm-core/nm-keyfile.c:268
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:359
- #, c-format
- msgid "ignoring invalid gateway '%s' for %s route"
- msgstr "忽略 %s%s 路由的无效网关 \"\""
-
--#: ../libnm-core/nm-keyfile.c:292
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:391
- #, c-format
- msgid "ignoring invalid %s route: %s"
- msgstr "忽略无效的 %s 路由：%s"
-
--#: ../libnm-core/nm-keyfile.c:464
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:566
- #, 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:474
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:582
- #, 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:483
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:597
- #, 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:494
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:614
- #, c-format
- msgid "garbage at the end of value %s: '%s'"
- msgstr "值 %s 的末尾有无用信息：\"%s\""
-
--#: ../libnm-core/nm-keyfile.c:500
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:624
- #, c-format
- msgid "deprecated semicolon at the end of value %s: '%s'"
- msgstr "值 %s 的末尾有舍弃的分号：\"%s\""
-
--#: ../libnm-core/nm-keyfile.c:514
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:647
- #, c-format
- msgid "invalid prefix length for %s '%s', defaulting to %d"
- msgstr "%s 的前缀长度 \"%s\" 无效，默认为 %d"
-
--#: ../libnm-core/nm-keyfile.c:521
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:659
- #, c-format
- msgid "missing prefix length for %s '%s', defaulting to %d"
- msgstr "缺少 %s 的前缀长度 \"%s\"，默认为 %d"
-
--#: ../libnm-core/nm-keyfile.c:856 ../libnm-core/nm-setting-user.c:358
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1001
-+#: ../libnm-core/nm-setting-user.c:358
- #, c-format
- msgid "invalid value for \"%s\": %s"
- msgstr "对 \"%s\" 无效的值：%s"
-
--#: ../libnm-core/nm-keyfile.c:894
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1041
- #, c-format
- msgid "ignoring invalid DNS server IPv%c address '%s'"
- msgstr "忽略无效的 DNS 服务器 IPv%c 地址 \"%s\""
-
--#: ../libnm-core/nm-keyfile.c:990 ../libnm-core/nm-keyfile.c:3143
--#, c-format
--msgid "ignoring invalid byte element '%d' (not between 0 and 255 inclusive)"
--msgstr "忽略无效的字节元素 \"%d\"（不在 0 和 255 之间）"
--
--#: ../libnm-core/nm-keyfile.c:1001
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1132
- msgid "ignoring invalid MAC address"
- msgstr "忽略无效的 MAC 地址"
-
--#: ../libnm-core/nm-keyfile.c:1260
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1391
- msgid "ignoring invalid SSID"
- msgstr "忽略无效的 SSID"
-
--#: ../libnm-core/nm-keyfile.c:1276
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1409
- msgid "ignoring invalid raw password"
- msgstr "忽略无效的原始密码"
-
--#: ../libnm-core/nm-keyfile.c:1416
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1554
- msgid "invalid key/cert value"
- msgstr "无效的密钥/证书值"
-
--#: ../libnm-core/nm-keyfile.c:1427
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1568
- #, c-format
- msgid "invalid key/cert value path \"%s\""
- msgstr "无效的密钥/证书值路径 \"%s\""
-
--#: ../libnm-core/nm-keyfile.c:1447 ../libnm-core/nm-keyfile.c:1530
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1592
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1688
- #, c-format
- msgid "certificate or key file '%s' does not exist"
- msgstr "证书或密钥文件 \"%s\" 不存在"
-
--#: ../libnm-core/nm-keyfile.c:1456
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1604
- #, c-format
- msgid "invalid PKCS#11 URI \"%s\""
- msgstr "无效的 PKCS#11 URI \"%s\""
-
--#: ../libnm-core/nm-keyfile.c:1500
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1652
- msgid "invalid key/cert value data:;base64, is not base64"
- msgstr "无效的密钥/证书值 data:;base64，不是 base64"
-
--#: ../libnm-core/nm-keyfile.c:1509
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1664
- msgid "invalid key/cert value data:;base64,file://"
- msgstr "无效的密钥/证书值 data:;base64,file://"
-
--#: ../libnm-core/nm-keyfile.c:1542
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1703
- msgid "invalid key/cert value is not a valid blob"
- msgstr "无效的密钥/证书值，不是有效的比特块（blob）"
-
--#: ../libnm-core/nm-keyfile.c:1644
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1808
- #, c-format
- msgid "invalid parity value '%s'"
- msgstr "无效的奇偶校验值 \"%s\""
-
--#: ../libnm-core/nm-keyfile.c:1661 ../libnm-core/nm-keyfile.c:3198
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1826
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3391
- #, c-format
- msgid "invalid setting: %s"
- msgstr "无效设置：%s"
-
--#: ../libnm-core/nm-keyfile.c:1678
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1847
- #, c-format
- msgid "ignoring invalid team configuration: %s"
- msgstr "忽略无效的组合（team）配置：%s"
-
--#: ../libnm-core/nm-keyfile.c:1756
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1932
- #, c-format
- msgid "invalid qdisc: %s"
- msgstr "无效的排队规则（qdisc）：%s"
-
--#: ../libnm-core/nm-keyfile.c:1802
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:1981
- #, c-format
- msgid "invalid tfilter: %s"
- msgstr "无效的流量过滤器（tfilter）：%s"
-
--#: ../libnm-core/nm-keyfile.c:3042
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3234
- #, c-format
- msgid "error loading setting value: %s"
- msgstr "加载设置值时出错：%s"
-
--#: ../libnm-core/nm-keyfile.c:3070 ../libnm-core/nm-keyfile.c:3081
--#: ../libnm-core/nm-keyfile.c:3099 ../libnm-core/nm-keyfile.c:3110
--#: ../libnm-core/nm-keyfile.c:3121 ../libnm-core/nm-keyfile.c:3173
--#: ../libnm-core/nm-keyfile.c:3184
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3262
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3273
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3291
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3302
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3313
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3365
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3376
- msgid "value cannot be interpreted as integer"
- msgstr "值无法被解析为整数"
-
--#: ../libnm-core/nm-keyfile.c:3219
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3338
-+#, c-format
-+msgid "ignoring invalid byte element '%u' (not between 0 and 255 inclusive)"
-+msgstr "忽略无效的字节元素 '%u'（不在 0 和 255 之间）"
-+
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3416
- #, c-format
- msgid "invalid setting name '%s'"
- msgstr "无效的设置名称 \"%s\""
-
--#: ../libnm-core/nm-keyfile.c:3264
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3465
- #, c-format
- msgid "invalid key '%s.%s'"
- msgstr "无效的密钥 \"%s.%s\""
-
--#: ../libnm-core/nm-keyfile.c:3279
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3484
- #, c-format
- msgid "key '%s.%s' is not boolean"
- msgstr "密钥 \"%s.%s\" 不是布尔值"
-
--#: ../libnm-core/nm-keyfile.c:3336
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3504
-+#, c-format
-+msgid "key '%s.%s' is not a uint32"
-+msgstr "key '%s.%s' 不是一个 uint32"
-+
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3565
- #, c-format
- msgid "invalid peer public key in section '%s'"
- msgstr "'%s' 项中无效的 peer 公钥"
-
--#: ../libnm-core/nm-keyfile.c:3348
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3580
- #, 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:3361
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3597
- #, c-format
- msgid "key '%s.%s' is not a valid secret flag"
- msgstr "'%s.%s' 不是一个有效的 secret 标记"
-
--#: ../libnm-core/nm-keyfile.c:3373
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3613
- #, c-format
- msgid "key '%s.%s' is not a integer in range 0 to 2^32"
- msgstr "'%s.%s' 不是在 0 到 2^32 范围内的一个整数"
-
--#: ../libnm-core/nm-keyfile.c:3385
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3629
- #, c-format
- msgid "key '%s.%s' is not a valid endpoint"
- msgstr "'%s.%s' 不是一个有效的端点"
-
--#: ../libnm-core/nm-keyfile.c:3407
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3655
- #, c-format
- msgid "key '%s.%s' has invalid allowed-ips"
- msgstr "'%s.%s' 包括无效的 allowed-ips"
-
--#: ../libnm-core/nm-keyfile.c:3419
-+#: ../libnm-core/nm-keyfile/nm-keyfile.c:3670
- #, c-format
- msgid "peer '%s' is invalid: %s"
- msgstr "peer '%s' 无效 : %s"
-
-+#: ../libnm-core/nm-libnm-core-aux/nm-libnm-core-aux.c:221
-+#, c-format
-+msgid "'%s' is not valid: properties should be specified as 'key=value'"
-+msgstr "'%s' 无效：属性需要以 'key=value' 的形式指定"
-+
-+#: ../libnm-core/nm-libnm-core-aux/nm-libnm-core-aux.c:236
-+#, c-format
-+msgid "'%s' is not a valid key"
-+msgstr "'%s' 不是一个有效的关键字"
-+
-+#: ../libnm-core/nm-libnm-core-aux/nm-libnm-core-aux.c:242
-+#, c-format
-+msgid "duplicate key '%s'"
-+msgstr "重复的关键字 '%s'"
-+
-+#: ../libnm-core/nm-libnm-core-aux/nm-libnm-core-aux.c:256
-+#, c-format
-+msgid "number for '%s' is out of range"
-+msgstr "'%s' 的值超出了范围"
-+
-+#: ../libnm-core/nm-libnm-core-aux/nm-libnm-core-aux.c:259
-+#, c-format
-+msgid "value for '%s' must be a number"
-+msgstr "'%s' 的值需要是一个数字"
-+
-+#: ../libnm-core/nm-libnm-core-aux/nm-libnm-core-aux.c:270
-+#, c-format
-+msgid "value for '%s' must be a boolean"
-+msgstr "'%s' 的值需要是一个布尔值"
-+
-+#: ../libnm-core/nm-libnm-core-aux/nm-libnm-core-aux.c:279
-+msgid "missing 'name' attribute"
-+msgstr "缺少 'name' 属性"
-+
-+#: ../libnm-core/nm-libnm-core-aux/nm-libnm-core-aux.c:286
-+#, c-format
-+msgid "invalid 'name' \"%s\""
-+msgstr "无效的 'name' \"%s\""
-+
-+#: ../libnm-core/nm-libnm-core-aux/nm-libnm-core-aux.c:298
-+#, c-format
-+msgid "attribute '%s' is invalid for \"%s\""
-+msgstr "属性 '%s' 无效（对于\"%s\"）"
-+
- #: ../libnm-core/nm-setting-6lowpan.c:79
- #, c-format
- msgid "property is not specified"
-@@ -9952,122 +10310,123 @@ msgid "'%s' value doesn't match '%s=%s'"
- msgstr "\"%s\" 值与 \"%s=%s\" 不匹配"
-
- #: ../libnm-core/nm-setting-6lowpan.c:112
--#: ../libnm-core/nm-setting-ip-tunnel.c:337
-+#: ../libnm-core/nm-setting-ip-tunnel.c:345
- #: ../libnm-core/nm-setting-macsec.c:298 ../libnm-core/nm-setting-macvlan.c:127
- #: ../libnm-core/nm-setting-vlan.c:611 ../libnm-core/nm-setting-vxlan.c:366
- #, c-format
- msgid "'%s' is neither an UUID nor an interface name"
- msgstr "\"%s\" 不是 UUID 或接口名称"
-
--#: ../libnm-core/nm-setting-8021x.c:213
-+#: ../libnm-core/nm-setting-8021x.c:217
- msgid "binary data missing"
- msgstr "二进制数据缺失"
-
--#: ../libnm-core/nm-setting-8021x.c:241
-+#: ../libnm-core/nm-setting-8021x.c:245
- msgid "URI not NUL terminated"
- msgstr "URI 非 NUL 终止符"
-
--#: ../libnm-core/nm-setting-8021x.c:250
-+#: ../libnm-core/nm-setting-8021x.c:254
- msgid "URI is empty"
- msgstr "URI 为空"
-
--#: ../libnm-core/nm-setting-8021x.c:258
-+#: ../libnm-core/nm-setting-8021x.c:262
- msgid "URI is not valid UTF-8"
- msgstr "URI 不是有效的 UTF-8"
-
--#: ../libnm-core/nm-setting-8021x.c:276
-+#: ../libnm-core/nm-setting-8021x.c:280
- msgid "data missing"
- msgstr "数据缺失"
-
--#: ../libnm-core/nm-setting-8021x.c:299 ../libnm-core/nm-setting-8021x.c:666
-+#: ../libnm-core/nm-setting-8021x.c:303 ../libnm-core/nm-setting-8021x.c:670
- #, c-format
- msgid "certificate is invalid: %s"
- msgstr "证书是无效的：%s"
-
--#: ../libnm-core/nm-setting-8021x.c:307
-+#: ../libnm-core/nm-setting-8021x.c:311
- #, c-format
- msgid "certificate detected as invalid scheme"
- msgstr "证书无效"
-
--#: ../libnm-core/nm-setting-8021x.c:521
-+#: ../libnm-core/nm-setting-8021x.c:525
- msgid "CA certificate must be in X.509 format"
- msgstr "CA 证书必须是 X.509 格式"
-
--#: ../libnm-core/nm-setting-8021x.c:537
-+#: ../libnm-core/nm-setting-8021x.c:541
- msgid "invalid certificate format"
- msgstr "无效的证书格式"
-
--#: ../libnm-core/nm-setting-8021x.c:676
-+#: ../libnm-core/nm-setting-8021x.c:680
- #, 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:2581 ../libnm-core/nm-setting-8021x.c:2598
--#: ../libnm-core/nm-setting-8021x.c:2629 ../libnm-core/nm-setting-8021x.c:2646
--#: ../libnm-core/nm-setting-8021x.c:2687 ../libnm-core/nm-setting-8021x.c:2699
--#: ../libnm-core/nm-setting-8021x.c:2717 ../libnm-core/nm-setting-8021x.c:2729
--#: ../libnm-core/nm-setting-8021x.c:2754 ../libnm-core/nm-setting-adsl.c:165
-+#: ../libnm-core/nm-setting-8021x.c:2617 ../libnm-core/nm-setting-8021x.c:2634
-+#: ../libnm-core/nm-setting-8021x.c:2665 ../libnm-core/nm-setting-8021x.c:2682
-+#: ../libnm-core/nm-setting-8021x.c:2723 ../libnm-core/nm-setting-8021x.c:2735
-+#: ../libnm-core/nm-setting-8021x.c:2753 ../libnm-core/nm-setting-8021x.c:2765
-+#: ../libnm-core/nm-setting-8021x.c:2790 ../libnm-core/nm-setting-adsl.c:166
- #: ../libnm-core/nm-setting-cdma.c:135 ../libnm-core/nm-setting-cdma.c:144
--#: ../libnm-core/nm-setting-connection.c:961
--#: ../libnm-core/nm-setting-connection.c:1009
--#: ../libnm-core/nm-setting-gsm.c:289 ../libnm-core/nm-setting-gsm.c:347
--#: ../libnm-core/nm-setting-gsm.c:384 ../libnm-core/nm-setting-gsm.c:393
--#: ../libnm-core/nm-setting-ip-config.c:4953
-+#: ../libnm-core/nm-setting-connection.c:982
-+#: ../libnm-core/nm-setting-connection.c:1016
-+#: ../libnm-core/nm-setting-connection.c:1238
-+#: ../libnm-core/nm-setting-gsm.c:283 ../libnm-core/nm-setting-gsm.c:341
-+#: ../libnm-core/nm-setting-gsm.c:378 ../libnm-core/nm-setting-gsm.c:387
-+#: ../libnm-core/nm-setting-ip-config.c:4981
- #: ../libnm-core/nm-setting-ip4-config.c:167
- #: ../libnm-core/nm-setting-ip4-config.c:174
- #: ../libnm-core/nm-setting-pppoe.c:137 ../libnm-core/nm-setting-pppoe.c:146
--#: ../libnm-core/nm-setting-vpn.c:525 ../libnm-core/nm-setting-vpn.c:535
-+#: ../libnm-core/nm-setting-vpn.c:559 ../libnm-core/nm-setting-vpn.c:570
- #: ../libnm-core/nm-setting-wimax.c:103
--#: ../libnm-core/nm-setting-wireless-security.c:945
--#: ../libnm-core/nm-setting-wireless-security.c:969
--#: ../libnm-core/nm-setting.c:1243
-+#: ../libnm-core/nm-setting-wireless-security.c:937
-+#: ../libnm-core/nm-setting-wireless-security.c:961
-+#: ../libnm-core/nm-setting.c:1257
- msgid "property is empty"
- msgstr "属性为空"
-
--#: ../libnm-core/nm-setting-8021x.c:2611 ../libnm-core/nm-setting-8021x.c:2659
-+#: ../libnm-core/nm-setting-8021x.c:2647 ../libnm-core/nm-setting-8021x.c:2695
- #, c-format
- msgid "has to match '%s' property for PKCS#12"
- msgstr "必须匹配 PKCS#12 的 \"%s\" 属性"
-
--#: ../libnm-core/nm-setting-8021x.c:2831
-+#: ../libnm-core/nm-setting-8021x.c:2867
- msgid "can be enabled only on Ethernet connections"
- msgstr "只能为以太网连接启用"
-
--#: ../libnm-core/nm-setting-8021x.c:2849
-+#: ../libnm-core/nm-setting-8021x.c:2885
- #: ../libnm-core/nm-setting-bluetooth.c:94
--#: ../libnm-core/nm-setting-infiniband.c:162
--#: ../libnm-core/nm-setting-infiniband.c:172
-+#: ../libnm-core/nm-setting-infiniband.c:163
-+#: ../libnm-core/nm-setting-infiniband.c:173
- #: ../libnm-core/nm-setting-ip4-config.c:158
--#: ../libnm-core/nm-setting-ip6-config.c:207
--#: ../libnm-core/nm-setting-ip6-config.c:218
-+#: ../libnm-core/nm-setting-ip6-config.c:226
-+#: ../libnm-core/nm-setting-ip6-config.c:237
- #: ../libnm-core/nm-setting-olpc-mesh.c:113
- #: ../libnm-core/nm-setting-wifi-p2p.c:131 ../libnm-core/nm-setting-wimax.c:112
- #: ../libnm-core/nm-setting-wired.c:785 ../libnm-core/nm-setting-wired.c:795
--#: ../libnm-core/nm-setting-wireless-security.c:988
--#: ../libnm-core/nm-setting-wireless-security.c:997
--#: ../libnm-core/nm-setting-wireless-security.c:1006
--#: ../libnm-core/nm-setting-wireless-security.c:1016
--#: ../libnm-core/nm-setting-wireless-security.c:1026
--#: ../libnm-core/nm-setting-wireless-security.c:1049
--#: ../libnm-core/nm-setting-wireless-security.c:1087
--#: ../libnm-core/nm-setting-wireless-security.c:1128
--#: ../libnm-core/nm-setting-wireless.c:830
--#: ../libnm-core/nm-setting-wireless.c:839
--#: ../libnm-core/nm-setting-wireless.c:850 ../libnm-core/nm-setting-wpan.c:162
--#: ../libnm-core/nm-utils.c:4566
-+#: ../libnm-core/nm-setting-wireless-security.c:980
-+#: ../libnm-core/nm-setting-wireless-security.c:989
-+#: ../libnm-core/nm-setting-wireless-security.c:998
-+#: ../libnm-core/nm-setting-wireless-security.c:1008
-+#: ../libnm-core/nm-setting-wireless-security.c:1018
-+#: ../libnm-core/nm-setting-wireless-security.c:1041
-+#: ../libnm-core/nm-setting-wireless-security.c:1079
-+#: ../libnm-core/nm-setting-wireless-security.c:1120
-+#: ../libnm-core/nm-setting-wireless.c:835
-+#: ../libnm-core/nm-setting-wireless.c:844
-+#: ../libnm-core/nm-setting-wireless.c:855 ../libnm-core/nm-setting-wpan.c:162
-+#: ../libnm-core/nm-utils.c:4596
- msgid "property is invalid"
- msgstr "属性无效"
-
--#: ../libnm-core/nm-setting-8021x.c:2876 ../libnm-core/nm-setting-8021x.c:2888
--#: ../libnm-core/nm-setting-8021x.c:2902 ../libnm-core/nm-setting-8021x.c:2929
--#: ../libnm-core/nm-setting-8021x.c:2944 ../libnm-core/nm-setting-adsl.c:177
-+#: ../libnm-core/nm-setting-8021x.c:2912 ../libnm-core/nm-setting-8021x.c:2924
-+#: ../libnm-core/nm-setting-8021x.c:2938 ../libnm-core/nm-setting-8021x.c:2965
-+#: ../libnm-core/nm-setting-8021x.c:2980 ../libnm-core/nm-setting-adsl.c:177
- #: ../libnm-core/nm-setting-adsl.c:189 ../libnm-core/nm-setting-bluetooth.c:122
--#: ../libnm-core/nm-setting-wireless-security.c:923
-+#: ../libnm-core/nm-setting-wireless-security.c:915
- #, c-format
- msgid "'%s' is not a valid value for the property"
- msgstr "\"%s\" 不是该属性的有效取值"
-
--#: ../libnm-core/nm-setting-8021x.c:2912
-+#: ../libnm-core/nm-setting-8021x.c:2948
- msgid "invalid auth flags"
- msgstr "无效的验证标记"
-
-@@ -10081,93 +10440,92 @@ msgstr "\"%s\" 连接需要 \"%s\" 或者 \"%s\" 设置"
- msgid "'%s' connection requires '%s' setting"
- msgstr "\"%s\" 连接需要 \"%s\" 设置"
-
--#: ../libnm-core/nm-setting-bond.c:541
-+#: ../libnm-core/nm-setting-bond.c:757
- #, c-format
- msgid "invalid option '%s' or its value '%s'"
- msgstr "无效的选项 \"%s\" 或其值 \"%s\""
-
--#: ../libnm-core/nm-setting-bond.c:566
--#, c-format
--msgid "only one of '%s' and '%s' can be set"
--msgstr "只能设置 \"%s\" 和 \"%s\" 中的一个"
--
--#: ../libnm-core/nm-setting-bond.c:579
-+#: ../libnm-core/nm-setting-bond.c:789
- #, c-format
- msgid "mandatory option '%s' is missing"
- msgstr "缺少必填选项 \"%s\""
-
--#: ../libnm-core/nm-setting-bond.c:589
-+#: ../libnm-core/nm-setting-bond.c:799
- #, c-format
- msgid "'%s' is not a valid value for '%s'"
- msgstr "\"%s\" 不是 \"%s\" 的有效取值"
-
--#: ../libnm-core/nm-setting-bond.c:603
-+#: ../libnm-core/nm-setting-bond.c:816
- #, c-format
- msgid "'%s=%s' is incompatible with '%s > 0'"
- msgstr "\"%s=%s\" 与 \"%s > 0\" 不兼容"
-
--#: ../libnm-core/nm-setting-bond.c:618
-+#: ../libnm-core/nm-setting-bond.c:836
- #, c-format
- msgid "'%s' is not valid for the '%s' option: %s"
- msgstr "\"%s\" 对 \"%s\" 选项无效：%s"
-
--#: ../libnm-core/nm-setting-bond.c:629
-+#: ../libnm-core/nm-setting-bond.c:849
- #, c-format
- msgid "'%s' option is only valid for '%s=%s'"
- msgstr "\"%s\" 选项只能在 \"%s=%s\" 中使用"
-
--#: ../libnm-core/nm-setting-bond.c:642
-+#: ../libnm-core/nm-setting-bond.c:862
- #, c-format
- msgid "'%s=%s' is not a valid configuration for '%s'"
- msgstr "\"%s=%s\" 不是 \"%s\" 的有效配置"
-
--#: ../libnm-core/nm-setting-bond.c:655 ../libnm-core/nm-setting-bond.c:664
--#: ../libnm-core/nm-setting-bond.c:684 ../libnm-core/nm-setting-bond.c:720
-+#: ../libnm-core/nm-setting-bond.c:877 ../libnm-core/nm-setting-bond.c:890
-+#, c-format
-+msgid "'%s' option requires '%s' option to be enabled"
-+msgstr "'%s' 选项需要 '%s' 选项来启用"
-+
-+#: ../libnm-core/nm-setting-bond.c:912 ../libnm-core/nm-setting-bond.c:958
- #, c-format
- msgid "'%s' option requires '%s' option to be set"
- msgstr "\"%s\" 选项需要设置 \"%s\" 选项"
-
--#: ../libnm-core/nm-setting-bond.c:695
-+#: ../libnm-core/nm-setting-bond.c:927
- #, c-format
- msgid "'%s' option is empty"
- msgstr "\"%s\"选项为空"
-
--#: ../libnm-core/nm-setting-bond.c:707
-+#: ../libnm-core/nm-setting-bond.c:941
- #, c-format
- msgid "'%s' is not a valid IPv4 address for '%s' option"
- msgstr "\"%s\" 不是 \"%s\" 选项的有效 IPv4 地址"
-
--#: ../libnm-core/nm-setting-bond.c:735
-+#: ../libnm-core/nm-setting-bond.c:975
- #, c-format
- msgid "'%s' option is only valid with mode '%s'"
- msgstr "\"%s\" 选项只在 \"%s\" 模式里有效"
-
--#: ../libnm-core/nm-setting-bond.c:746
-+#: ../libnm-core/nm-setting-bond.c:987
- #, c-format
- msgid "'%s' and '%s' cannot have different values"
- msgstr "\"%s\" 和 \"%s\" 不能有不同的值"
-
--#: ../libnm-core/nm-setting-bond.c:762
-+#: ../libnm-core/nm-setting-bond.c:1010
- #, c-format
- msgid "'%s' option should be string"
- msgstr "\"%s\" 选项应该为字符串"
-
--#: ../libnm-core/nm-setting-bond.c:778
-+#: ../libnm-core/nm-setting-bond.c:1023
- #, c-format
- msgid "'%s' option is not valid with mode '%s'"
- msgstr "\"%s\" 选项在 \"%s\" 模式里无效"
-
--#: ../libnm-core/nm-setting-bridge-port.c:301
-+#: ../libnm-core/nm-setting-bridge-port.c:303
- #: ../libnm-core/nm-setting-ovs-bridge.c:153
--#: ../libnm-core/nm-setting-ovs-interface.c:259
-+#: ../libnm-core/nm-setting-ovs-interface.c:269
- #: ../libnm-core/nm-setting-ovs-port.c:172
- #: ../libnm-core/nm-setting-team-port.c:299
- #, c-format
- msgid "missing setting"
- msgstr "缺少设置"
-
--#: ../libnm-core/nm-setting-bridge-port.c:312
--#: ../libnm-core/nm-setting-ovs-interface.c:280
-+#: ../libnm-core/nm-setting-bridge-port.c:314
-+#: ../libnm-core/nm-setting-ovs-interface.c:290
- #: ../libnm-core/nm-setting-ovs-port.c:193
- #: ../libnm-core/nm-setting-team-port.c:310
- #, c-format
-@@ -10176,505 +10534,549 @@ msgid ""
- "Instead it is '%s'"
- msgstr "具有 \"%s\" 设置的连接必须将 slave-type 设置为 \"%s\"。而它是 \"%s\""
-
--#: ../libnm-core/nm-setting-bridge.c:896
-+#: ../libnm-core/nm-setting-bridge.c:1180
- #, c-format
- msgid "value '%d' is out of range <%d-%d>"
- msgstr "值 '%d' 超出了范围 <%d-%d>"
-
--#: ../libnm-core/nm-setting-bridge.c:913
-+#: ../libnm-core/nm-setting-bridge.c:1197
- msgid "is not a valid MAC address"
- msgstr "不是有效的 MAC 地址"
-
--#: ../libnm-core/nm-setting-bridge.c:954
-+#: ../libnm-core/nm-setting-bridge.c:1238
- 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:931
-+#: ../libnm-core/nm-setting-bridge.c:1258
-+msgid "is not a valid link local MAC address"
-+msgstr "不是一个有效的链路本地 MAC 地址"
-+
-+#: ../libnm-core/nm-setting-bridge.c:1270
-+msgid "is not a valid VLAN filtering protocol"
-+msgstr "不是一个有效的 VLAN 过滤协议"
-+
-+#: ../libnm-core/nm-setting-bridge.c:1283
-+msgid "is not a valid option"
-+msgstr "不是一个有效的选项"
-+
-+#: ../libnm-core/nm-setting-bridge.c:1292
-+#, c-format
-+msgid "'%s' option must be a power of 2"
-+msgstr "'%s' 选项需要是 2 个指数"
-+
-+#: ../libnm-core/nm-setting-connection.c:952
- #, c-format
- msgid "setting required for connection of type '%s'"
- msgstr "类型为 \"%s\" 的连接需要设置"
-
--#: ../libnm-core/nm-setting-connection.c:970
-+#: ../libnm-core/nm-setting-connection.c:991
- #, c-format
- msgid "'%s' is not a valid UUID"
- msgstr "\"%s\"不是有效的 UUID"
-
--#: ../libnm-core/nm-setting-connection.c:1020
-+#: ../libnm-core/nm-setting-connection.c:1027
- #, c-format
- msgid "connection type '%s' is not valid"
- msgstr "连接类型 \"%s\" 无效"
-
--#: ../libnm-core/nm-setting-connection.c:1056
-+#: ../libnm-core/nm-setting-connection.c:1120
- #, c-format
- msgid "Unknown slave type '%s'"
- msgstr "未知的从类型 \"%s\""
-
--#: ../libnm-core/nm-setting-connection.c:1067
-+#: ../libnm-core/nm-setting-connection.c:1131
- #, c-format
- msgid "Slave connections need a valid '%s' property"
- msgstr "从连接需要有效的 \"%s\" 属性"
-
--#: ../libnm-core/nm-setting-connection.c:1088
-+#: ../libnm-core/nm-setting-connection.c:1152
- #, c-format
- msgid "Cannot set '%s' without '%s'"
- msgstr "没有 \"%s\" 无法设置 \"%s\""
-
--#: ../libnm-core/nm-setting-connection.c:1102
-+#: ../libnm-core/nm-setting-connection.c:1166
- #, c-format
- msgid "'%s' connections must be enslaved to '%s', not '%s'"
- msgstr "\"%s\" 连接必须从属于 \"%s\"，而不是 \"%s\""
-
--#: ../libnm-core/nm-setting-connection.c:1116
-+#: ../libnm-core/nm-setting-connection.c:1180
- #, c-format
- msgid "metered value %d is not valid"
- msgstr "计量值 %d 无效"
-
--#: ../libnm-core/nm-setting-connection.c:1127
--#: ../libnm-core/nm-setting-connection.c:1138
--#: ../libnm-core/nm-setting-connection.c:1151
-+#: ../libnm-core/nm-setting-connection.c:1191
-+#: ../libnm-core/nm-setting-connection.c:1202
-+#: ../libnm-core/nm-setting-connection.c:1215
- #, c-format
- msgid "value %d is not valid"
- msgstr "值 %d 无效"
-
--#: ../libnm-core/nm-setting-connection.c:1164
-+#: ../libnm-core/nm-setting-connection.c:1228
- #, c-format
- msgid "wait-device-timeout requires %s"
- msgstr "wait-device-timeout 需要 %s"
-
--#: ../libnm-core/nm-setting-connection.c:1186
-+#: ../libnm-core/nm-setting-connection.c:1247
-+msgid "DHCP option cannot be longer than 255 characters"
-+msgstr "DHCP选项不能多于 255 个字符"
-+
-+#: ../libnm-core/nm-setting-connection.c:1253
-+msgid "MUD URL is not a valid URL"
-+msgstr "MUD URL不是一个有效的URL"
-+
-+#: ../libnm-core/nm-setting-connection.c:1275
- #, c-format
- msgid "property type should be set to '%s'"
- msgstr "属性类型应该设置为 \"%s\""
-
--#: ../libnm-core/nm-setting-connection.c:1201
-+#: ../libnm-core/nm-setting-connection.c:1290
- #, c-format
- msgid "slave-type '%s' requires a '%s' setting in the connection"
- msgstr "slave-type \"%s\" 要求连接中有 \"%s\" 设置"
-
--#: ../libnm-core/nm-setting-connection.c:1211
-+#: ../libnm-core/nm-setting-connection.c:1300
- #, c-format
- msgid ""
- "Detect a slave connection with '%s' set and a port type '%s'. '%s' should be "
- "set to '%s'"
- msgstr "检测到设置了 \"%s\" 和端口类型为 \"%s\" 的从连接。\"%s\" 应该设置为 \"%s\""
-
--#: ../libnm-core/nm-setting-connection.c:1228
-+#: ../libnm-core/nm-setting-connection.c:1317
- #, 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:492
-+#: ../libnm-core/nm-setting-dcb.c:486
- msgid "flags invalid"
- msgstr "标志无效"
-
--#: ../libnm-core/nm-setting-dcb.c:501
-+#: ../libnm-core/nm-setting-dcb.c:495
- msgid "flags invalid - disabled"
- msgstr "标志无效 — 已禁用"
-
--#: ../libnm-core/nm-setting-dcb.c:527 ../libnm-core/nm-setting-dcb.c:576
-+#: ../libnm-core/nm-setting-dcb.c:521 ../libnm-core/nm-setting-dcb.c:570
- msgid "property invalid (not enabled)"
- msgstr "属性无效（未启用）"
-
--#: ../libnm-core/nm-setting-dcb.c:536
-+#: ../libnm-core/nm-setting-dcb.c:530
- msgid "element invalid"
- msgstr "元素无效"
-
--#: ../libnm-core/nm-setting-dcb.c:551
-+#: ../libnm-core/nm-setting-dcb.c:545
- msgid "sum not 100%"
- msgstr "总和不是 100%"
-
--#: ../libnm-core/nm-setting-dcb.c:585 ../libnm-core/nm-setting-dcb.c:617
-+#: ../libnm-core/nm-setting-dcb.c:579 ../libnm-core/nm-setting-dcb.c:611
- msgid "property invalid"
- msgstr "属性无效"
-
--#: ../libnm-core/nm-setting-dcb.c:607
-+#: ../libnm-core/nm-setting-dcb.c:601
- msgid "property missing"
- msgstr "缺少属性"
-
--#: ../libnm-core/nm-setting-ethtool.c:291
--msgid "unsupported offload feature"
--msgstr "不支持的卸载功能"
-+#: ../libnm-core/nm-setting-ethtool.c:302
-+msgid "unsupported ethtool setting"
-+msgstr "不支持的 ethtool 设置"
-+
-+#: ../libnm-core/nm-setting-ethtool.c:311
-+msgid "setting has invalid variant type"
-+msgstr "设置有无效的变量类型"
-
--#: ../libnm-core/nm-setting-ethtool.c:299
--msgid "offload feature has invalid variant type"
--msgstr "卸载功能有无效的变种类型"
-+#: ../libnm-core/nm-setting-ethtool.c:323
-+msgid "coalesce option must be either 0 or 1"
-+msgstr "coalesce 选项必须是 0 或 1。"
-
--#: ../libnm-core/nm-setting-ethtool.c:322
-+#: ../libnm-core/nm-setting-ethtool.c:348
- #, c-format
- msgid "unknown ethtool option '%s'"
- msgstr "未知的 ethtool 选项 \"%s\""
-
--#: ../libnm-core/nm-setting-gsm.c:302
-+#: ../libnm-core/nm-setting-gsm.c:296
- #, c-format
- msgid "property value '%s' is empty or too long (>64)"
- msgstr "属性值 \"%s\" 为空或过长（>64）"
-
--#: ../libnm-core/nm-setting-gsm.c:334
-+#: ../libnm-core/nm-setting-gsm.c:328
- #, c-format
- msgid "'%s' contains invalid char(s) (use [A-Za-z._-])"
- msgstr "\"%s\" 包含无效字符（请使用 [A-Za-z._-]）"
-
--#: ../libnm-core/nm-setting-gsm.c:361
-+#: ../libnm-core/nm-setting-gsm.c:355
- #, c-format
- msgid "'%s' length is invalid (should be 5 or 6 digits)"
- msgstr "\"%s\" 长度无效（应为 5 位或 6 位数）"
-
--#: ../libnm-core/nm-setting-gsm.c:372
-+#: ../libnm-core/nm-setting-gsm.c:366
- #, c-format
- msgid "'%s' is not a number"
- msgstr "\"%s\" 不是数字"
-
--#: ../libnm-core/nm-setting-gsm.c:406
-+#: ../libnm-core/nm-setting-gsm.c:400
- msgid "property is empty or wrong size"
- msgstr "属性为空或大小错误"
-
--#: ../libnm-core/nm-setting-gsm.c:416
-+#: ../libnm-core/nm-setting-gsm.c:410
- msgid "property must contain only digits"
- msgstr "属性必须只包含数字"
-
--#: ../libnm-core/nm-setting-gsm.c:428
-+#: ../libnm-core/nm-setting-gsm.c:422
- msgid "can't be enabled when manual configuration is present"
- msgstr "如果手工配置，则不能启用"
-
--#: ../libnm-core/nm-setting-infiniband.c:193
-+#: ../libnm-core/nm-setting-infiniband.c:194
- msgid "Must specify a P_Key if specifying parent"
- msgstr "如果指定上级接口，则必须指定 P_Key"
-
--#: ../libnm-core/nm-setting-infiniband.c:203
-+#: ../libnm-core/nm-setting-infiniband.c:204
- msgid "InfiniBand P_Key connection did not specify parent interface name"
- msgstr "InfiniBand P_Key 连接未指定上级接口名"
-
--#: ../libnm-core/nm-setting-infiniband.c:241
-+#: ../libnm-core/nm-setting-infiniband.c:227
- #, c-format
- msgid ""
- "interface name of software infiniband device must be '%s' or unset (instead "
- "it is '%s')"
- msgstr "软件 infiniband 设备的接口名必须为 \"%s\" 或未设置（但现在是 \"%s\"）"
-
--#: ../libnm-core/nm-setting-infiniband.c:265
-+#: ../libnm-core/nm-setting-infiniband.c:250
- #, c-format
- msgid "mtu can be at most %u but it is %u"
- msgstr "mtu 最大为 %u，但它的值是 %u"
-
--#: ../libnm-core/nm-setting-ip-config.c:120
-+#: ../libnm-core/nm-setting-ip-config.c:109
- #, c-format
- msgid "Missing IPv4 address"
- msgstr "缺失 IPv4 地址"
-
--#: ../libnm-core/nm-setting-ip-config.c:120
-+#: ../libnm-core/nm-setting-ip-config.c:109
- #, c-format
- msgid "Missing IPv6 address"
- msgstr "缺失 IPv6 地址"
-
--#: ../libnm-core/nm-setting-ip-config.c:125
-+#: ../libnm-core/nm-setting-ip-config.c:114
- #, c-format
- msgid "Invalid IPv4 address '%s'"
- msgstr "无效的 IPv4 地址 \"%s\""
-
--#: ../libnm-core/nm-setting-ip-config.c:125
-+#: ../libnm-core/nm-setting-ip-config.c:114
- #, c-format
- msgid "Invalid IPv6 address '%s'"
- msgstr "无效的 IPv6 地址 \"%s\""
-
--#: ../libnm-core/nm-setting-ip-config.c:140
-+#: ../libnm-core/nm-setting-ip-config.c:129
- #, c-format
- msgid "Invalid IPv4 address prefix '%u'"
- msgstr "无效 IPv4 地址前缀 \"%u\""
-
--#: ../libnm-core/nm-setting-ip-config.c:140
-+#: ../libnm-core/nm-setting-ip-config.c:129
- #, c-format
- msgid "Invalid IPv6 address prefix '%u'"
- msgstr "无效 IPv6 地址前缀 \"%u\""
-
--#: ../libnm-core/nm-setting-ip-config.c:155
-+#: ../libnm-core/nm-setting-ip-config.c:144
- #, c-format
- msgid "Invalid routing metric '%s'"
- msgstr "无效的路由度量 \"%s\""
-
--#: ../libnm-core/nm-setting-ip-config.c:1282
--#: ../libnm-core/nm-setting-sriov.c:409
-+#: ../libnm-core/nm-setting-ip-config.c:1272
-+#: ../libnm-core/nm-setting-sriov.c:413
- msgid "unknown attribute"
- msgstr "未知属性"
-
--#: ../libnm-core/nm-setting-ip-config.c:1292
--#: ../libnm-core/nm-setting-sriov.c:419
-+#: ../libnm-core/nm-setting-ip-config.c:1282
-+#: ../libnm-core/nm-setting-sriov.c:423
- #, c-format
- msgid "invalid attribute type '%s'"
- msgstr "无效的属性类型 \"%s\""
-
--#: ../libnm-core/nm-setting-ip-config.c:1303
-+#: ../libnm-core/nm-setting-ip-config.c:1293
- #, c-format
- msgid "attribute is not valid for a IPv4 route"
- msgstr "属性对 IPv4 路由无效"
-
--#: ../libnm-core/nm-setting-ip-config.c:1304
-+#: ../libnm-core/nm-setting-ip-config.c:1294
- #, c-format
- msgid "attribute is not valid for a IPv6 route"
- msgstr "属性对 IPv6 路由无效"
-
--#: ../libnm-core/nm-setting-ip-config.c:1318
--#: ../libnm-core/nm-setting-ip-config.c:1346
-+#: ../libnm-core/nm-setting-ip-config.c:1308
-+#: ../libnm-core/nm-setting-ip-config.c:1336
- #, c-format
- msgid "'%s' is not a valid IPv4 address"
- msgstr "\"%s\" 不是有效的 IPv4 地址"
-
--#: ../libnm-core/nm-setting-ip-config.c:1319
--#: ../libnm-core/nm-setting-ip-config.c:1347
-+#: ../libnm-core/nm-setting-ip-config.c:1309
-+#: ../libnm-core/nm-setting-ip-config.c:1337
- #, c-format
- msgid "'%s' is not a valid IPv6 address"
- msgstr "\"%s\" 不是有效的 IPv6 地址"
-
--#: ../libnm-core/nm-setting-ip-config.c:1337
-+#: ../libnm-core/nm-setting-ip-config.c:1327
- #, c-format
- msgid "invalid prefix %s"
- msgstr "无效的前缀 %s"
-
--#: ../libnm-core/nm-setting-ip-config.c:2513
-+#: ../libnm-core/nm-setting-ip-config.c:1350
-+#, c-format
-+msgid "%s is not a valid route type"
-+msgstr "%s 不是有效的路由类型"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:1400
-+#, c-format
-+msgid "route scope is invalid"
-+msgstr "路由范围无效"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:2541
- msgid "invalid priority"
- msgstr "无效的优先级"
-
--#: ../libnm-core/nm-setting-ip-config.c:2524
-+#: ../libnm-core/nm-setting-ip-config.c:2552
- msgid "missing table"
- msgstr "缺少表"
-
--#: ../libnm-core/nm-setting-ip-config.c:2530
-+#: ../libnm-core/nm-setting-ip-config.c:2558
- msgid "invalid action"
- msgstr "无效操作"
-
--#: ../libnm-core/nm-setting-ip-config.c:2537
-+#: ../libnm-core/nm-setting-ip-config.c:2565
- msgid "has from/src but the prefix-length is zero"
- msgstr "带有 from/src 但是 prefix-length 为 0"
-
--#: ../libnm-core/nm-setting-ip-config.c:2544
-+#: ../libnm-core/nm-setting-ip-config.c:2572
- msgid "missing from/src for a non zero prefix-length"
- msgstr "一个非 0 的 prefix-length 但没有 from/src"
-
--#: ../libnm-core/nm-setting-ip-config.c:2549
-+#: ../libnm-core/nm-setting-ip-config.c:2577
- msgid "invalid from/src"
- msgstr "无效的 from/src"
-
--#: ../libnm-core/nm-setting-ip-config.c:2554
-+#: ../libnm-core/nm-setting-ip-config.c:2582
- msgid "invalid prefix length for from/src"
- msgstr "from/src 无效的前缀长度"
-
--#: ../libnm-core/nm-setting-ip-config.c:2561
-+#: ../libnm-core/nm-setting-ip-config.c:2589
- msgid "has to/dst but the prefix-length is zero"
- msgstr "带有 to/dst 但是 prefix-length 为 0"
-
--#: ../libnm-core/nm-setting-ip-config.c:2568
-+#: ../libnm-core/nm-setting-ip-config.c:2596
- msgid "missing to/dst for a non zero prefix-length"
- msgstr "一个非 0 的 prefix-length 但没有 to/dst"
-
--#: ../libnm-core/nm-setting-ip-config.c:2573
-+#: ../libnm-core/nm-setting-ip-config.c:2601
- msgid "invalid to/dst"
- msgstr "无效的 to/dst"
-
--#: ../libnm-core/nm-setting-ip-config.c:2578
-+#: ../libnm-core/nm-setting-ip-config.c:2606
- msgid "invalid prefix length for to/dst"
- msgstr "to/dst 无效的前缀长度"
-
--#: ../libnm-core/nm-setting-ip-config.c:2586
-+#: ../libnm-core/nm-setting-ip-config.c:2614
- msgid "invalid iifname"
- msgstr "无效的 iifname"
-
--#: ../libnm-core/nm-setting-ip-config.c:2594
-+#: ../libnm-core/nm-setting-ip-config.c:2622
- msgid "invalid oifname"
- msgstr "无效的 oifname"
-
--#: ../libnm-core/nm-setting-ip-config.c:2600
-+#: ../libnm-core/nm-setting-ip-config.c:2628
- msgid "invalid source port range"
- msgstr "无效的源端口范围"
-
--#: ../libnm-core/nm-setting-ip-config.c:2606
-+#: ../libnm-core/nm-setting-ip-config.c:2634
- msgid "invalid destination port range"
- msgstr "无效的目标端口范围"
-
--#: ../libnm-core/nm-setting-ip-config.c:2614
-+#: ../libnm-core/nm-setting-ip-config.c:2642
- msgid "suppress_prefixlength out of range"
- msgstr "suppress_prefixlength 超出范围"
-
--#: ../libnm-core/nm-setting-ip-config.c:2619
-+#: ../libnm-core/nm-setting-ip-config.c:2647
- msgid "suppress_prefixlength is only allowed with the to-table action"
- msgstr "只有 to-table 操作允许 suppress_prefixlength"
-
--#: ../libnm-core/nm-setting-ip-config.c:2726
-+#: ../libnm-core/nm-setting-ip-config.c:2754
- #, c-format
- msgid "duplicate key %s"
- msgstr "重复的 %s"
-
--#: ../libnm-core/nm-setting-ip-config.c:2740
-+#: ../libnm-core/nm-setting-ip-config.c:2768
- #, c-format
- msgid "invalid key \"%s\""
- msgstr "无效的 \"%s\""
-
--#: ../libnm-core/nm-setting-ip-config.c:2753
-+#: ../libnm-core/nm-setting-ip-config.c:2781
- #, c-format
- msgid "invalid variant type '%s' for \"%s\""
- msgstr "无效的变体类型 '%s'（对于 \"%s\"）"
-
--#: ../libnm-core/nm-setting-ip-config.c:2762
-+#: ../libnm-core/nm-setting-ip-config.c:2790
- msgid "missing \""
- msgstr "缺少 \""
-
--#: ../libnm-core/nm-setting-ip-config.c:2768
-+#: ../libnm-core/nm-setting-ip-config.c:2796
- msgid "invalid \""
- msgstr "无效 \""
-
--#: ../libnm-core/nm-setting-ip-config.c:2965
-+#: ../libnm-core/nm-setting-ip-config.c:2993
- msgid "Unsupported to-string-flags argument"
- msgstr "不支持的 to-string-flags 参数"
-
--#: ../libnm-core/nm-setting-ip-config.c:2972
-+#: ../libnm-core/nm-setting-ip-config.c:3000
- msgid "Unsupported extra-argument"
- msgstr "不支持的 extra-argument"
-
--#: ../libnm-core/nm-setting-ip-config.c:3239
-+#: ../libnm-core/nm-setting-ip-config.c:3267
- #, c-format
- msgid "unsupported key \"%s\""
- msgstr "不支持的 \"%s\""
-
--#: ../libnm-core/nm-setting-ip-config.c:3244
-+#: ../libnm-core/nm-setting-ip-config.c:3272
- #, c-format
- msgid "duplicate key \"%s\""
- msgstr "重复的 \"%s\""
-
--#: ../libnm-core/nm-setting-ip-config.c:3249
-+#: ../libnm-core/nm-setting-ip-config.c:3277
- #, c-format
- msgid "invalid value for \"%s\""
- msgstr "\"%s\" 无效的值"
-
--#: ../libnm-core/nm-setting-ip-config.c:3259
-+#: ../libnm-core/nm-setting-ip-config.c:3287
- msgid "empty text does not describe a rule"
- msgstr "空文本没有描述一个规则"
-
--#: ../libnm-core/nm-setting-ip-config.c:3265
-+#: ../libnm-core/nm-setting-ip-config.c:3293
- #, c-format
- msgid "missing argument for \"%s\""
- msgstr "\"%s\" 缺少参数"
-
--#: ../libnm-core/nm-setting-ip-config.c:3277
-+#: ../libnm-core/nm-setting-ip-config.c:3305
- msgid "invalid \"from\" part"
- msgstr "无效的 \"from\" 部分"
-
--#: ../libnm-core/nm-setting-ip-config.c:3291
-+#: ../libnm-core/nm-setting-ip-config.c:3319
- msgid "invalid \"to\" part"
- msgstr "无效的 \"to\" 部分"
-
--#: ../libnm-core/nm-setting-ip-config.c:3300
-+#: ../libnm-core/nm-setting-ip-config.c:3328
- #, c-format
- msgid "cannot detect address family for rule"
- msgstr "无法为规则检测到地址家族"
-
--#: ../libnm-core/nm-setting-ip-config.c:3360
--#: ../libnm-core/nm-setting-ip-config.c:3454
-+#: ../libnm-core/nm-setting-ip-config.c:3388
-+#: ../libnm-core/nm-setting-ip-config.c:3482
- #, c-format
- msgid "rule is invalid: %s"
- msgstr "规则无效：%s"
-
--#: ../libnm-core/nm-setting-ip-config.c:3437
-+#: ../libnm-core/nm-setting-ip-config.c:3465
- msgid "invalid address family"
- msgstr "无效的 地址家族"
-
--#: ../libnm-core/nm-setting-ip-config.c:4710
-+#: ../libnm-core/nm-setting-ip-config.c:4738
- #, c-format
- msgid "rule #%u is invalid: %s"
- msgstr "规则 #%u 无效：%s"
-
--#: ../libnm-core/nm-setting-ip-config.c:4966
-+#: ../libnm-core/nm-setting-ip-config.c:4994
- #, c-format
- msgid "%d. DNS server address is invalid"
- msgstr "%d。DNS 服务器地址无效"
-
--#: ../libnm-core/nm-setting-ip-config.c:4982
-+#: ../libnm-core/nm-setting-ip-config.c:5010
- #, c-format
- msgid "%d. IP address is invalid"
- msgstr "%d。IP 地址无效"
-
--#: ../libnm-core/nm-setting-ip-config.c:4994
-+#: ../libnm-core/nm-setting-ip-config.c:5022
- #, c-format
- msgid "%d. IP address has 'label' property with invalid type"
- msgstr "%d。IP 地址有无效类型的 \"label\" 属性"
-
--#: ../libnm-core/nm-setting-ip-config.c:5003
-+#: ../libnm-core/nm-setting-ip-config.c:5031
- #, c-format
- msgid "%d. IP address has invalid label '%s'"
- msgstr "%d。IP 地址有无效标签 \"%s\""
-
--#: ../libnm-core/nm-setting-ip-config.c:5017
-+#: ../libnm-core/nm-setting-ip-config.c:5045
- msgid "gateway cannot be set if there are no addresses configured"
- msgstr "如果没有配置地址，网关会无法设置"
-
--#: ../libnm-core/nm-setting-ip-config.c:5026
-+#: ../libnm-core/nm-setting-ip-config.c:5054
- msgid "gateway is invalid"
- msgstr "网关无效"
-
--#: ../libnm-core/nm-setting-ip-config.c:5040
-+#: ../libnm-core/nm-setting-ip-config.c:5069
- #, c-format
- msgid "%d. route is invalid"
- msgstr "%d。路由无效"
-
--#: ../libnm-core/nm-setting-ip-config.c:5056
-+#: ../libnm-core/nm-setting-ip-config.c:5079
-+#, c-format
-+msgid "invalid attribute: %s"
-+msgstr "无效的属性：%s"
-+
-+#: ../libnm-core/nm-setting-ip-config.c:5098
- #, c-format
- msgid "%u. rule has wrong address-family"
- msgstr "%u. 规则带有错误的地址家族"
-
--#: ../libnm-core/nm-setting-ip-config.c:5065
-+#: ../libnm-core/nm-setting-ip-config.c:5107
- #, c-format
- msgid "%u. rule is invalid: %s"
- msgstr "%u. 规则无效：%s"
-
--#: ../libnm-core/nm-setting-ip-config.c:5079
-+#: ../libnm-core/nm-setting-ip-config.c:5121
- #, c-format
- msgid "'%s' is not a valid IAID"
- msgstr "'%s' 不是一个有效的 IAID"
-
--#: ../libnm-core/nm-setting-ip-config.c:5093
-+#: ../libnm-core/nm-setting-ip-config.c:5135
- #, c-format
- msgid "the property cannot be set when '%s' is disabled"
- msgstr "当 '%s' 被禁用时不能设置这个属性"
-
--#: ../libnm-core/nm-setting-ip-config.c:5115
-+#: ../libnm-core/nm-setting-ip-config.c:5157
- #, c-format
- msgid "a gateway is incompatible with '%s'"
- msgstr "网关与 \"%s\" 不兼容"
-
--#: ../libnm-core/nm-setting-ip-tunnel.c:325
-+#: ../libnm-core/nm-setting-ip-tunnel.c:333
- #, c-format
- msgid "'%d' is not a valid tunnel mode"
- msgstr "\"%d\" 是无效的隧道模式"
-
--#: ../libnm-core/nm-setting-ip-tunnel.c:348
--#: ../libnm-core/nm-setting-ip-tunnel.c:368
-+#: ../libnm-core/nm-setting-ip-tunnel.c:356
-+#: ../libnm-core/nm-setting-ip-tunnel.c:376
- #, c-format
- msgid "'%s' is not a valid IPv%c address"
- msgstr "\"%s\" 不是有效的 IPv%c 地址"
-
--#: ../libnm-core/nm-setting-ip-tunnel.c:385
-+#: ../libnm-core/nm-setting-ip-tunnel.c:393
- msgid "tunnel keys can only be specified for GRE tunnels"
- msgstr "只能为 GRE 隧道指定隧道密钥"
-
--#: ../libnm-core/nm-setting-ip-tunnel.c:398
--#: ../libnm-core/nm-setting-ip-tunnel.c:414
-+#: ../libnm-core/nm-setting-ip-tunnel.c:406
-+#: ../libnm-core/nm-setting-ip-tunnel.c:422
- #, c-format
- msgid "'%s' is not a valid tunnel key"
- msgstr "\"%s\" 不是有效的隧道密钥"
-
--#: ../libnm-core/nm-setting-ip-tunnel.c:426
-+#: ../libnm-core/nm-setting-ip-tunnel.c:434
- msgid "a fixed TTL is allowed only when path MTU discovery is enabled"
- msgstr "只有启用路径 MTU 发现时才允许固定的 TTL"
-
--#: ../libnm-core/nm-setting-ip-tunnel.c:439
-+#: ../libnm-core/nm-setting-ip-tunnel.c:447
- #, c-format
- msgid "some flags are invalid for the select mode: %s"
- msgstr "有些标记对所选模式无效：%s"
-
--#: ../libnm-core/nm-setting-ip-tunnel.c:453
-+#: ../libnm-core/nm-setting-ip-tunnel.c:459
- #, c-format
- msgid "wired setting not allowed for mode %s"
- msgstr "模式 %s 不允许有线设置"
-
- #: ../libnm-core/nm-setting-ip4-config.c:112
--#: ../libnm-core/nm-setting-ip6-config.c:159
-+#: ../libnm-core/nm-setting-ip6-config.c:178
- #, c-format
- msgid "this property cannot be empty for '%s=%s'"
- msgstr "\"%s=%s\" 不允许这个属性为空"
-@@ -10682,9 +11084,9 @@ msgstr "\"%s=%s\" 不允许这个属性为空"
- #: ../libnm-core/nm-setting-ip4-config.c:124
- #: ../libnm-core/nm-setting-ip4-config.c:134
- #: ../libnm-core/nm-setting-ip4-config.c:146
--#: ../libnm-core/nm-setting-ip6-config.c:174
--#: ../libnm-core/nm-setting-ip6-config.c:184
--#: ../libnm-core/nm-setting-ip6-config.c:194
-+#: ../libnm-core/nm-setting-ip6-config.c:193
-+#: ../libnm-core/nm-setting-ip6-config.c:203
-+#: ../libnm-core/nm-setting-ip6-config.c:213
- #, c-format
- msgid "this property is not allowed for '%s=%s'"
- msgstr "此属性不允许用于\"%s=%s\""
-@@ -10711,23 +11113,23 @@ msgstr "\"%s=%s\" 不允许多个地址"
- msgid "property should be TRUE when method is set to disabled"
- msgstr "方法设为禁用时属性应该是 TRUE"
-
--#: ../libnm-core/nm-setting-ip6-config.c:233
-+#: ../libnm-core/nm-setting-ip6-config.c:252
- msgid "value is not a valid token"
- msgstr "值不是有效的令牌"
-
--#: ../libnm-core/nm-setting-ip6-config.c:244
-+#: ../libnm-core/nm-setting-ip6-config.c:263
- msgid "only makes sense with EUI64 address generation mode"
- msgstr "只有 EUI64 地址生成模式才有意义"
-
--#: ../libnm-core/nm-setting-ip6-config.c:255
-+#: ../libnm-core/nm-setting-ip6-config.c:274
- msgid "invalid DUID"
- msgstr "无效的 DUID"
-
--#: ../libnm-core/nm-setting-ip6-config.c:267
-+#: ../libnm-core/nm-setting-ip6-config.c:286
- msgid "token is not in canonical form"
- msgstr "令牌不是规范形式"
-
--#: ../libnm-core/nm-setting-ip6-config.c:280
-+#: ../libnm-core/nm-setting-ip6-config.c:299
- msgid "property should be TRUE when method is set to ignore or disabled"
- msgstr "方法设为禁用时属性应该是 TRUE"
-
-@@ -10772,13 +11174,19 @@ msgstr "只对 psk 模式有效"
- msgid "non promiscuous operation is allowed only in passthru mode"
- msgstr "只有通过（passthru）模式才允许无混杂操作"
-
-+#: ../libnm-core/nm-setting-match.c:738 ../libnm-core/nm-setting-match.c:752
-+#: ../libnm-core/nm-setting-match.c:766 ../libnm-core/nm-setting-match.c:780
-+#, c-format
-+msgid "is empty"
-+msgstr "是空的"
-+
- #: ../libnm-core/nm-setting-olpc-mesh.c:94
--#: ../libnm-core/nm-setting-wireless.c:769
-+#: ../libnm-core/nm-setting-wireless.c:774
- msgid "SSID length is out of range <1-32> bytes"
- msgstr "SSID 长度超出 <1-32> 字节范围"
-
- #: ../libnm-core/nm-setting-olpc-mesh.c:103
--#: ../libnm-core/nm-setting-wireless.c:809
-+#: ../libnm-core/nm-setting-wireless.c:814
- #, c-format
- msgid "'%d' is not a valid channel"
- msgstr "\"%d\" 不是有效的信道"
-@@ -10793,70 +11201,65 @@ msgstr "有 \"%s\" 设置的连接不能有主连接。"
- msgid "'%s' is not allowed in fail_mode"
- msgstr "\"%s\" 在 fail_mode 里不允许"
-
--#: ../libnm-core/nm-setting-ovs-interface.c:94
-+#: ../libnm-core/nm-setting-ovs-interface.c:96
- #, c-format
- msgid "'%s' is not a valid interface type"
- msgstr "\"%s\" 不是有效的接口类型"
-
--#: ../libnm-core/nm-setting-ovs-interface.c:116
-+#: ../libnm-core/nm-setting-ovs-interface.c:120
- #, c-format
- msgid "A connection with a '%s' setting needs connection.type explicitly set"
- msgstr "有 \"%s\" 设置的连接需要明确设定 connection.type"
-
--#: ../libnm-core/nm-setting-ovs-interface.c:128
-+#: ../libnm-core/nm-setting-ovs-interface.c:132
- #, c-format
- msgid "A connection of type '%s' cannot have ovs-interface.type \"system\""
- msgstr "\"%s\" 类型的连接不能有 ovs-interface.type \"system\""
-
--#: ../libnm-core/nm-setting-ovs-interface.c:140
-+#: ../libnm-core/nm-setting-ovs-interface.c:144
- #, c-format
- msgid "A connection of type '%s' cannot have an ovs-interface.type \"%s\""
- msgstr "\"%s\" 类型的连接不能有 ovs-interface.type \"%s\""
-
--#: ../libnm-core/nm-setting-ovs-interface.c:159
-+#: ../libnm-core/nm-setting-ovs-interface.c:163
- #, c-format
- msgid "A connection can not have both '%s' and '%s' settings at the same time"
- msgstr "一个连接不能同时设置 '%s' 和 '%s'"
-
--#: ../libnm-core/nm-setting-ovs-interface.c:173
-+#: ../libnm-core/nm-setting-ovs-interface.c:177
- #, c-format
- msgid ""
- "A connection with '%s' setting must be of connection.type \"ovs-interface\" "
- "but is \"%s\""
- msgstr "有 \"%s\" 设置的连接必须是 connection.type \"ovs-interface\" 类型，但现在是 \"%s\""
-
--#: ../libnm-core/nm-setting-ovs-interface.c:185
-+#: ../libnm-core/nm-setting-ovs-interface.c:189
- #, c-format
- msgid ""
- "A connection with '%s' setting needs to be of '%s' interface type, not '%s'"
- msgstr "一个带有 '%s' 设置的连接需要是 '%s' 接口类型，而不是 '%s'"
-
--#: ../libnm-core/nm-setting-ovs-interface.c:201
-+#: ../libnm-core/nm-setting-ovs-interface.c:206
- #, c-format
- msgid "A connection with ovs-interface.type '%s' setting a 'ovs-patch' setting"
- msgstr "ovs-interface.type \"%s\" 类型的连接缺少设置 \"ovs-patch\""
-
--#: ../libnm-core/nm-setting-ovs-interface.c:221
-+#: ../libnm-core/nm-setting-ovs-interface.c:231
- #, c-format
- msgid "Missing ovs interface setting"
- msgstr "缺少 ovs 接口设置"
-
--#: ../libnm-core/nm-setting-ovs-interface.c:227
-+#: ../libnm-core/nm-setting-ovs-interface.c:237
- #, c-format
- msgid "Missing ovs interface type"
- msgstr "缺少 ovs 接口类型"
-
--#: ../libnm-core/nm-setting-ovs-interface.c:268
-+#: ../libnm-core/nm-setting-ovs-interface.c:278
- #: ../libnm-core/nm-setting-ovs-port.c:181
- #, c-format
- msgid "A connection with a '%s' setting must have a master."
- msgstr "有 \"%s\" 设置的连接必须有个主连接。"
-
--#: ../libnm-core/nm-setting-ovs-patch.c:89 ../libnm-core/nm-setting-vxlan.c:338
--#, c-format
--msgid "'%s' is not a valid IP address"
--msgstr "\"%s\" 不是有效的 IP 地址"
--
- #: ../libnm-core/nm-setting-ovs-port.c:206
- #, c-format
- msgid "'%s' is not allowed in vlan_mode"
-@@ -10887,47 +11290,47 @@ msgstr "'%d' 超出了有效范围 <128-16384>"
- msgid "setting this property requires non-zero '%s' property"
- msgstr "设置此属性要求 \"%s\" 属性不为零"
-
--#: ../libnm-core/nm-setting-proxy.c:132
-+#: ../libnm-core/nm-setting-proxy.c:129
- #, c-format
- msgid "invalid proxy method"
- msgstr "无效的代理方法"
-
--#: ../libnm-core/nm-setting-proxy.c:142 ../libnm-core/nm-setting-proxy.c:151
-+#: ../libnm-core/nm-setting-proxy.c:139 ../libnm-core/nm-setting-proxy.c:148
- #, c-format
- msgid "this property is not allowed for method none"
- msgstr "无方法时不允许此属性"
-
--#: ../libnm-core/nm-setting-proxy.c:162
-+#: ../libnm-core/nm-setting-proxy.c:159
- #, c-format
- msgid "the script is too large"
- msgstr "脚本太大"
-
--#: ../libnm-core/nm-setting-proxy.c:170
-+#: ../libnm-core/nm-setting-proxy.c:167
- #, c-format
- msgid "the script is not valid utf8"
- msgstr "脚本不是有效的 utf8"
-
--#: ../libnm-core/nm-setting-proxy.c:178
-+#: ../libnm-core/nm-setting-proxy.c:175
- #, c-format
- msgid "the script lacks FindProxyForURL function"
- msgstr "脚本缺少 FindProxyForURL 功能"
-
--#: ../libnm-core/nm-setting-sriov.c:1066
-+#: ../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:1077
-+#: ../libnm-core/nm-setting-sriov.c:1081
- #, c-format
- msgid "invalid VF %u: %s"
- msgstr "无效的虚拟功能 %u：%s"
-
--#: ../libnm-core/nm-setting-sriov.c:1089
-+#: ../libnm-core/nm-setting-sriov.c:1093
- #, c-format
- msgid "duplicate VF index %u"
- msgstr "重复的虚拟功能索引 %u"
-
--#: ../libnm-core/nm-setting-sriov.c:1110
-+#: ../libnm-core/nm-setting-sriov.c:1114
- #, c-format
- msgid "VFs %d and %d are not sorted by ascending index"
- msgstr "虚拟功能 %d 和 %d 未按升序排列"
-@@ -11067,36 +11470,40 @@ msgstr "标记无效"
- msgid "vlan setting should have a ethernet setting as well"
- msgstr "vlan 设置也应该有以太网设置"
-
--#: ../libnm-core/nm-setting-vpn.c:546
-+#: ../libnm-core/nm-setting-vrf.c:75
-+msgid "table cannot be zero"
-+msgstr "表大小不能为零"
-+
-+#: ../libnm-core/nm-setting-vpn.c:581
- msgid "cannot set connection.multi-connect for VPN setting"
- msgstr "无法为 VPN 设置设定 connection.multi-connect"
-
--#: ../libnm-core/nm-setting-vpn.c:567
--#, c-format
--msgid "secret was empty"
--msgstr "密钥为空"
--
--#: ../libnm-core/nm-setting-vpn.c:597
-+#: ../libnm-core/nm-setting-vpn.c:626
- msgid "setting contained a secret with an empty name"
- msgstr "设置包含具有空名称的密钥"
-
--#: ../libnm-core/nm-setting-vpn.c:605
--#, c-format
--msgid "secret value was empty"
--msgstr "密钥值为空"
--
--#: ../libnm-core/nm-setting-vpn.c:652 ../libnm-core/nm-setting.c:2124
-+#: ../libnm-core/nm-setting-vpn.c:666 ../libnm-core/nm-setting.c:2138
- msgid "not a secret property"
- msgstr "不是密钥（secret）属性"
-
--#: ../libnm-core/nm-setting-vpn.c:658
-+#: ../libnm-core/nm-setting-vpn.c:672
- msgid "secret is not of correct type"
- msgstr "密钥（secret）不是正确的类型"
-
--#: ../libnm-core/nm-setting-vpn.c:742
-+#: ../libnm-core/nm-setting-vpn.c:749 ../libnm-core/nm-setting-vpn.c:798
-+#, c-format
-+msgid "secret name cannot be empty"
-+msgstr "secret 名不能为空"
-+
-+#: ../libnm-core/nm-setting-vpn.c:765
- msgid "secret flags property not found"
- msgstr "未找到 secret 标记属性"
-
-+#: ../libnm-core/nm-setting-vxlan.c:338
-+#, c-format
-+msgid "'%s' is not a valid IP address"
-+msgstr "\"%s\" 不是有效的 IP 地址"
-+
- #: ../libnm-core/nm-setting-vxlan.c:351
- #, c-format
- msgid "'%s' is not a valid IP%c address"
-@@ -11212,71 +11619,71 @@ msgstr "peer #%u 缺少 public-key"
- msgid "non-existing peer '%s'"
- msgstr "不存在 peer '%s'"
-
--#: ../libnm-core/nm-setting-wireless-security.c:913
-+#: ../libnm-core/nm-setting-wireless-security.c:905
- #, c-format
- msgid "'%s' is not a valid value for '%s' mode connections"
- msgstr "\"%s\" 不是 \"%s\" 模式连接的有效值"
-
--#: ../libnm-core/nm-setting-wireless-security.c:936
-+#: ../libnm-core/nm-setting-wireless-security.c:928
- #, c-format
- msgid "'%s' security requires '%s=%s'"
- msgstr "\"%s\" 安全需要 \"%s=%s\""
-
--#: ../libnm-core/nm-setting-wireless-security.c:957
-+#: ../libnm-core/nm-setting-wireless-security.c:949
- #, c-format
- msgid "'%s' security requires '%s' setting presence"
- msgstr "\"%s\" 安全需要 \"%s\" 设置存在"
-
--#: ../libnm-core/nm-setting-wireless-security.c:978
-+#: ../libnm-core/nm-setting-wireless-security.c:970
- #, c-format
- msgid "'%d' value is out of range <0-3>"
- msgstr "'%d' 值超出了 范围 <0-3>"
-
--#: ../libnm-core/nm-setting-wireless-security.c:1037
-+#: ../libnm-core/nm-setting-wireless-security.c:1029
- #, c-format
- msgid "'%s' can only be used with '%s=%s' (WEP)"
- msgstr "\"%s\" 只能与 \"%s=%s\"（WEP）共用"
-
--#: ../libnm-core/nm-setting-wireless-security.c:1061
-+#: ../libnm-core/nm-setting-wireless-security.c:1053
- #, c-format
- msgid ""
- "'%s' can only be used with 'wpa-eap', 'wpa-psk' or 'sae' key management "
- msgstr "'%s' 只能用于 'wpa-eap'、'wpa-psk' 或 'sae' 密钥管理 "
-
--#: ../libnm-core/nm-setting-wireless.c:778
-+#: ../libnm-core/nm-setting-wireless.c:783
- #, c-format
- msgid "'%s' is not a valid Wi-Fi mode"
- msgstr "\"%s\" 不是有效的 Wi-Fi 模式"
-
--#: ../libnm-core/nm-setting-wireless.c:788
-+#: ../libnm-core/nm-setting-wireless.c:793
- #, c-format
- msgid "'%s' is not a valid band"
- msgstr "\"%s\" 不是有效频段"
-
--#: ../libnm-core/nm-setting-wireless.c:798
-+#: ../libnm-core/nm-setting-wireless.c:803
- #, c-format
- msgid "'%s' requires setting '%s' property"
- msgstr "\"%s\" 需要设置 \"%s\" 属性"
-
--#: ../libnm-core/nm-setting-wireless.c:820
-+#: ../libnm-core/nm-setting-wireless.c:825
- #, c-format
- msgid "'%s' requires '%s' and '%s' property"
- msgstr "'%s' 需要 '%s' 和 '%s' 属性"
-
--#: ../libnm-core/nm-setting-wireless.c:907 ../libnm-core/nm-team-utils.c:1990
-+#: ../libnm-core/nm-setting-wireless.c:912 ../libnm-core/nm-team-utils.c:1990
- #, c-format
- msgid "invalid value"
- msgstr "无效值"
-
--#: ../libnm-core/nm-setting-wireless.c:917
-+#: ../libnm-core/nm-setting-wireless.c:922
- msgid "Wake-on-WLAN mode 'default' and 'ignore' are exclusive flags"
- msgstr "WLAN 唤醒模式 \"default\" 和 \"ignore\" 是相互排斥的标记"
-
--#: ../libnm-core/nm-setting-wireless.c:926
-+#: ../libnm-core/nm-setting-wireless.c:931
- msgid "Wake-on-WLAN trying to set unknown flag"
- msgstr "WLAN 唤醒正在尝试设定未知的标记"
-
--#: ../libnm-core/nm-setting-wireless.c:948
-+#: ../libnm-core/nm-setting-wireless.c:953
- #, c-format
- msgid "conflicting value of mac-address-randomization and cloned-mac-address"
- msgstr "mac-address-randomization 和 cloned-mac-address 的值冲突"
-@@ -11295,32 +11702,32 @@ msgstr "页需要在 %d 和 %d 之间"
- msgid "channel must not be between %d and %d"
- msgstr "频道不能在 %d 和 %d 之间"
-
--#: ../libnm-core/nm-setting.c:806
-+#: ../libnm-core/nm-setting.c:809
- #, c-format
- msgid "duplicate property"
- msgstr "重复的属性"
-
--#: ../libnm-core/nm-setting.c:829
-+#: ../libnm-core/nm-setting.c:832
- #, c-format
- msgid "unknown property"
- msgstr "未知属性"
-
--#: ../libnm-core/nm-setting.c:900 ../libnm-core/nm-setting.c:949
-+#: ../libnm-core/nm-setting.c:914 ../libnm-core/nm-setting.c:963
- #, 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:934
-+#: ../libnm-core/nm-setting.c:933 ../libnm-core/nm-setting.c:948
- #, c-format
- msgid "failed to set property: %s"
- msgstr "设定属性失败：%s"
-
--#: ../libnm-core/nm-setting.c:964
-+#: ../libnm-core/nm-setting.c:978
- #, c-format
- msgid "can not set property: %s"
- msgstr "无法设定属性：%s"
-
--#: ../libnm-core/nm-setting.c:2015
-+#: ../libnm-core/nm-setting.c:2029
- msgid "secret not found"
- msgstr "未找到密钥"
-
-@@ -11385,7 +11792,7 @@ msgid "team config is not valid UTF-8"
- msgstr "team 配置不是有效的 UTF-8"
-
- #: ../libnm-core/nm-team-utils.c:2104
--#: ../src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c:9025
-+#: ../src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c:9088
- #, c-format
- msgid "invalid json"
- msgstr "无效的 json"
-@@ -11400,236 +11807,226 @@ msgstr "无效的 D-Bus 类型 \"%s\""
- msgid "invalid link-watchers: %s"
- msgstr "无效的 link-watcher：%s"
-
--#: ../libnm-core/nm-utils.c:2330
-+#: ../libnm-core/nm-utils.c:2298
- #, c-format
- msgid "'%s' is not a valid handle."
- msgstr "\"%s\" 不是有效的处理模块。"
-
--#: ../libnm-core/nm-utils.c:2458
-+#: ../libnm-core/nm-utils.c:2446
- #, c-format
- msgid "'%s' unexpected: parent already specified."
- msgstr "意外的 \"%s\"：已指定上级。"
-
--#: ../libnm-core/nm-utils.c:2474
-+#: ../libnm-core/nm-utils.c:2462
- #, c-format
- msgid "invalid handle: '%s'"
- msgstr "无效的句柄：\"%s\""
-
--#: ../libnm-core/nm-utils.c:2496
-+#: ../libnm-core/nm-utils.c:2484
- msgid "parent not specified."
- msgstr "未指定上级。"
-
--#: ../libnm-core/nm-utils.c:2558
-+#: ../libnm-core/nm-utils.c:2546
- #, c-format
- msgid "unsupported qdisc option: '%s'."
- msgstr "不支持的排队规则（qdisc）选项：\"%s\"。"
-
--#: ../libnm-core/nm-utils.c:2680
-+#: ../libnm-core/nm-utils.c:2668
- msgid "action name missing."
- msgstr "操作名缺失。"
-
--#: ../libnm-core/nm-utils.c:2706
-+#: ../libnm-core/nm-utils.c:2694
- #, c-format
- msgid "unsupported action option: '%s'."
- msgstr "不支持的操作选项：\"%s\"。"
-
--#: ../libnm-core/nm-utils.c:2844
-+#: ../libnm-core/nm-utils.c:2832
- msgid "invalid action: "
- msgstr "无效操作： "
-
--#: ../libnm-core/nm-utils.c:2848
-+#: ../libnm-core/nm-utils.c:2836
- #, c-format
- msgid "unsupported tfilter option: '%s'."
- msgstr "不支持的流量过滤器（tfilter）选项：\"%s\"。"
-
--#: ../libnm-core/nm-utils.c:3449
-+#: ../libnm-core/nm-utils.c:3437
- #, c-format
- msgid "failed stat file %s: %s"
- msgstr "统计文件 %s 失败：%s"
-
--#: ../libnm-core/nm-utils.c:3458
-+#: ../libnm-core/nm-utils.c:3446
- #, c-format
- msgid "not a file (%s)"
- msgstr "不是一个文件（%s）"
-
--#: ../libnm-core/nm-utils.c:3469
-+#: ../libnm-core/nm-utils.c:3457
- #, c-format
- msgid "invalid file owner %d for %s"
- msgstr "对 %d%s 无效的文件所有者"
-
--#: ../libnm-core/nm-utils.c:3480
-+#: ../libnm-core/nm-utils.c:3468
- #, c-format
- msgid "file permissions for %s"
- msgstr "%s 的文件权限"
-
--#: ../libnm-core/nm-utils.c:3490
-+#: ../libnm-core/nm-utils.c:3478
- #, c-format
- msgid "reject %s"
- msgstr "拒绝 %s"
-
--#: ../libnm-core/nm-utils.c:3509
-+#: ../libnm-core/nm-utils.c:3497
- #, c-format
- msgid "path is not absolute (%s)"
- msgstr "路径不是绝对路径（%s）"
-
--#: ../libnm-core/nm-utils.c:3523
-+#: ../libnm-core/nm-utils.c:3511
- #, c-format
- msgid "Plugin file does not exist (%s)"
- msgstr "插件文件不存在（%s）"
-
--#: ../libnm-core/nm-utils.c:3531
-+#: ../libnm-core/nm-utils.c:3519
- #, c-format
- msgid "Plugin is not a valid file (%s)"
- msgstr "插件不是有效的文件（%s）"
-
--#: ../libnm-core/nm-utils.c:3541
-+#: ../libnm-core/nm-utils.c:3529
- #, c-format
- msgid "libtool archives are not supported (%s)"
- msgstr "不支持 libtool 归档（%s）"
-
--#: ../libnm-core/nm-utils.c:3623
-+#: ../libnm-core/nm-utils.c:3611
- #, c-format
- msgid "Could not find \"%s\" binary"
- msgstr "无法找到 \"%s\" 二进制文件"
-
--#: ../libnm-core/nm-utils.c:4517
-+#: ../libnm-core/nm-utils.c:4547
- msgid "unknown secret flags"
- msgstr "未知的 secret 标记"
-
--#: ../libnm-core/nm-utils.c:4527
-+#: ../libnm-core/nm-utils.c:4557
- msgid "conflicting secret flags"
- msgstr "冲突的 secret 标记"
-
--#: ../libnm-core/nm-utils.c:4538
-+#: ../libnm-core/nm-utils.c:4568
- msgid "secret flags must not be \"not-required\""
- msgstr "secret 标记不能为 \"not-required\""
-
--#: ../libnm-core/nm-utils.c:4546
-+#: ../libnm-core/nm-utils.c:4576
- msgid "unsupported secret flags"
- msgstr "不支持的 secret 标记"
-
--#: ../libnm-core/nm-utils.c:4576
-+#: ../libnm-core/nm-utils.c:4606
- msgid "can't be simultaneously disabled and enabled"
- msgstr "不能同时启用和禁用"
-
--#: ../libnm-core/nm-utils.c:4584
-+#: ../libnm-core/nm-utils.c:4614
- msgid "WPS is required"
- msgstr "需要 WPS"
-
--#: ../libnm-core/nm-utils.c:4650
-+#: ../libnm-core/nm-utils.c:4680
- #, c-format
- msgid "not a valid ethernet MAC address for mask at position %lld"
- msgstr "对于 %lld 位置的掩码，该以太网 MAC 地址无效"
-
--#: ../libnm-core/nm-utils.c:4665
-+#: ../libnm-core/nm-utils.c:4695
- #, c-format
- msgid "not a valid ethernet MAC address #%u at position %lld"
- msgstr "在位置 %u%lld，该以太网 MAC 地址 # 无效"
-
--#: ../libnm-core/nm-utils.c:4725
--msgid "interface name is missing"
--msgstr "缺少接口名"
--
--#: ../libnm-core/nm-utils.c:4731
--msgid "interface name is too short"
--msgstr "接口名太短"
--
--#: ../libnm-core/nm-utils.c:4740
--msgid "interface name is reserved"
--msgstr "接口名被保留"
--
--#: ../libnm-core/nm-utils.c:4752
--msgid "interface name contains an invalid character"
--msgstr "接口名包含无效字符"
--
--#: ../libnm-core/nm-utils.c:4758
--msgid "interface name is longer than 15 characters"
--msgstr "接口名长度超过 15 字符"
--
--#: ../libnm-core/nm-utils.c:5425
-+#: ../libnm-core/nm-utils.c:5390
- msgid "not valid utf-8"
- msgstr "不是有效的 utf-8"
-
--#: ../libnm-core/nm-utils.c:5446 ../libnm-core/nm-utils.c:5499
-+#: ../libnm-core/nm-utils.c:5411 ../libnm-core/nm-utils.c:5464
- msgid "is not a JSON object"
- msgstr "不是 JSON 对象"
-
--#: ../libnm-core/nm-utils.c:5475 ../libnm-core/nm-utils.c:5512
-+#: ../libnm-core/nm-utils.c:5440 ../libnm-core/nm-utils.c:5477
- msgid "value is NULL"
- msgstr "值为 NULL"
-
--#: ../libnm-core/nm-utils.c:5475 ../libnm-core/nm-utils.c:5512
-+#: ../libnm-core/nm-utils.c:5440 ../libnm-core/nm-utils.c:5477
- msgid "value is empty"
- msgstr "值为空"
-
--#: ../libnm-core/nm-utils.c:5487
-+#: ../libnm-core/nm-utils.c:5452
- #, c-format
- msgid "invalid JSON at position %d (%s)"
- msgstr "位置 %d 有无效的 JSON（%s）"
-
--#: ../libnm-core/nm-utils.c:5649 ../libnm-core/nm-utils.c:5669
-+#: ../libnm-core/nm-utils.c:5597 ../libnm-core/nm-utils.c:5617
- msgid "unterminated escape sequence"
- msgstr "未结束的转义序列"
-
--#: ../libnm-core/nm-utils.c:5694
-+#: ../libnm-core/nm-utils.c:5642
- #, c-format
- msgid "unknown attribute '%s'"
- msgstr "未知属性 \"%s\""
-
--#: ../libnm-core/nm-utils.c:5709
-+#: ../libnm-core/nm-utils.c:5657
- #, c-format
- msgid "missing key-value separator '%c' after '%s'"
- msgstr "在 \"%2$s\" 后缺少键值对分隔符 \"%1$c\""
-
--#: ../libnm-core/nm-utils.c:5725
-+#: ../libnm-core/nm-utils.c:5673
- #, c-format
- msgid "invalid uint32 value '%s' for attribute '%s'"
- msgstr "uint32 值 \"%1$s\" 对属性 \"%2$s\" 无效"
-
--#: ../libnm-core/nm-utils.c:5734
-+#: ../libnm-core/nm-utils.c:5682
-+#, c-format
-+msgid "invalid int32 value '%s' for attribute '%s'"
-+msgstr "uint32 值 \"%s\" 对属性 \"%s\" 无效"
-+
-+#: ../libnm-core/nm-utils.c:5691
-+#, c-format
-+msgid "invalid uint64 value '%s' for attribute '%s'"
-+msgstr "uint8 值 \"%s\" 对属性 \"%s\" 无效"
-+
-+#: ../libnm-core/nm-utils.c:5700
- #, c-format
- msgid "invalid uint8 value '%s' for attribute '%s'"
- msgstr "uint8 值 \"%1$s\" 对属性 \"%2$s\" 无效"
-
--#: ../libnm-core/nm-utils.c:5744
-+#: ../libnm-core/nm-utils.c:5710
- #, c-format
- msgid "invalid boolean value '%s' for attribute '%s'"
- msgstr "布尔值 \"%1$s\" 对属性 \"%2$s\" 无效"
-
--#: ../libnm-core/nm-utils.c:5754
-+#: ../libnm-core/nm-utils.c:5720
- #, c-format
- msgid "unsupported attribute '%s' of type '%s'"
- msgstr "不支持类型 \"%2$s\" 的属性 \"%1$s\""
-
--#: ../libnm-core/nm-utils.c:6119
-+#: ../libnm-core/nm-utils.c:6020
- #, c-format
- msgid "Bridge VLANs %d and %d are not sorted by ascending vid"
- msgstr "网桥 VLANs %d 和 %d 没有根据生序 vid 进行排序"
-
--#: ../libnm-core/nm-utils.c:6143
-+#: ../libnm-core/nm-utils.c:6044
- #, c-format
- msgid "duplicate bridge VLAN vid %u"
- msgstr "重复的网桥 VLAN vid %u"
-
--#: ../libnm-core/nm-utils.c:6155
-+#: ../libnm-core/nm-utils.c:6056
- msgid "only one VLAN can be the PVID"
- msgstr "只有一个 VLAN 可以是 PVID"
-
--#: ../libnm-core/nm-utils.c:6205
-+#: ../libnm-core/nm-utils.c:6106
- #, c-format
- msgid "unknown flags 0x%x"
- msgstr "未知标志 0x%x"
-
--#: ../libnm-core/nm-utils.c:6215
-+#: ../libnm-core/nm-utils.c:6116
- msgid ""
- "'fqdn-no-update' and 'fqdn-serv-update' flags cannot be set at the same time"
- msgstr "不能同时设置 'fqdn-no-update' 和 'fqdn-serv-update' 标志"
-
--#: ../libnm-core/nm-utils.c:6226
-+#: ../libnm-core/nm-utils.c:6127
- msgid "'fqdn-clear-flags' flag is incompatible with other FQDN flags"
- msgstr "'fqdn-clear-flags' 标志与其他 FQDN 标志不兼容"
-
--#: ../libnm-core/nm-utils.c:6235
-+#: ../libnm-core/nm-utils.c:6136
- msgid "DHCPv6 does not support the E (encoded) FQDN flag"
- msgstr "DHCPv6 不支持 E（编码）FQDN 标志"
-
-@@ -11668,59 +12065,59 @@ msgstr "插件不支持导入功能"
- msgid "the plugin does not support export capability"
- msgstr "插件不支持导出功能"
-
--#: ../libnm-core/nm-vpn-plugin-info.c:93
-+#: ../libnm-core/nm-vpn-plugin-info.c:111
- #, c-format
- msgid "missing filename"
- msgstr "缺少文件名"
-
--#: ../libnm-core/nm-vpn-plugin-info.c:101
-+#: ../libnm-core/nm-vpn-plugin-info.c:119
- #, c-format
- msgid "filename must be an absolute path (%s)"
- msgstr "文件名必须为绝对路径（%s）"
-
--#: ../libnm-core/nm-vpn-plugin-info.c:110
-+#: ../libnm-core/nm-vpn-plugin-info.c:128
- #, c-format
- msgid "filename has invalid format (%s)"
- msgstr "文件名具有无效的格式（%s）"
-
--#: ../libnm-core/nm-vpn-plugin-info.c:433
-+#: ../libnm-core/nm-vpn-plugin-info.c:419
- #, 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:471
-+#: ../libnm-core/nm-vpn-plugin-info.c:457
- #, c-format
- msgid "there exists a conflicting plugin with the same name (%s)"
- msgstr "已存在具有相同名称（%s）的冲突插件"
-
--#: ../libnm-core/nm-vpn-plugin-info.c:1053
-+#: ../libnm-core/nm-vpn-plugin-info.c:1045
- #, c-format
- msgid "missing \"plugin\" setting"
- msgstr "缺少 \"plugin\" 设置"
-
--#: ../libnm-core/nm-vpn-plugin-info.c:1063
-+#: ../libnm-core/nm-vpn-plugin-info.c:1055
- #, c-format
- msgid "%s: don't retry loading plugin which already failed previously"
- msgstr "%s：不要重试加载之前已失败的插件"
-
--#: ../libnm-core/nm-vpn-plugin-info.c:1139
-+#: ../libnm-core/nm-vpn-plugin-info.c:1131
- msgid "missing filename to load VPN plugin info"
- msgstr "缺少文件名来加载 VPN 插件信息"
-
--#: ../libnm-core/nm-vpn-plugin-info.c:1151
-+#: ../libnm-core/nm-vpn-plugin-info.c:1143
- msgid "missing name for VPN plugin info"
- msgstr "缺少 VPN 插件信息的名称"
-
--#: ../libnm-core/nm-vpn-plugin-info.c:1160
-+#: ../libnm-core/nm-vpn-plugin-info.c:1152
- msgid "missing service for VPN plugin info"
- msgstr "缺少 VPN 插件信息的服务"
-
--#: ../libnm/nm-client.c:3584
-+#: ../libnm/nm-client.c:3681
- #, c-format
- msgid "request succeeded with %s but object is in an unsuitable state"
- msgstr "使用 %s 请求成功，但对象处于不合适的状态"
-
--#: ../libnm/nm-client.c:3675
-+#: ../libnm/nm-client.c:3772
- #, c-format
- msgid "operation succeeded but object %s does not exist"
- msgstr "操作成功，但对象 %s 不存在"
-@@ -11729,7 +12126,7 @@ msgstr "操作成功，但对象 %s 不存在"
- msgid "The connection was not an ADSL connection."
- msgstr "此连接不是 ADSL 连接。"
-
--#: ../libnm/nm-device-bond.c:104
-+#: ../libnm/nm-device-bond.c:105
- msgid "The connection was not a bond connection."
- msgstr "此连接不是绑定（bond）连接。"
-
-@@ -11760,11 +12157,11 @@ msgid ""
- "The device is lacking Bluetooth capabilities required by the connection."
- msgstr "设备缺少连接所要求的蓝牙功能。"
-
--#: ../libnm/nm-device-dummy.c:68
-+#: ../libnm/nm-device-dummy.c:61
- msgid "The connection was not a dummy connection."
- msgstr "此连接不是虚拟（dummy）连接。"
-
--#: ../libnm/nm-device-dummy.c:75 ../libnm/nm-device-generic.c:91
-+#: ../libnm/nm-device-dummy.c:68 ../libnm/nm-device-generic.c:85
- #: ../libnm/nm-device-ovs-bridge.c:84 ../libnm/nm-device-ovs-interface.c:52
- #: ../libnm/nm-device-ovs-port.c:84
- msgid "The connection did not specify an interface name."
-@@ -11797,7 +12194,7 @@ msgstr "黑名单里无效的 MAC 地址：%s。"
- msgid "Device MAC (%s) is blacklisted by the connection."
- msgstr "设备 MAC（%s）被连接列入了黑名单。"
-
--#: ../libnm/nm-device-generic.c:84
-+#: ../libnm/nm-device-generic.c:78
- msgid "The connection was not a generic connection."
- msgstr "此连接不是通用的连接。"
-
-@@ -11817,7 +12214,7 @@ msgstr "设备和连接的 MAC 地址不匹配。"
- msgid "The connection was not an IP tunnel connection."
- msgstr "此连接不是 IP 隧道连接。"
-
--#: ../libnm/nm-device-macvlan.c:151
-+#: ../libnm/nm-device-macvlan.c:152
- msgid "The connection was not a MAC-VLAN connection."
- msgstr "此连接不是 MAC-VLAN 连接。"
-
-@@ -11833,7 +12230,7 @@ msgstr "此连接不是有效的调制解调器连接。"
- msgid "The device is lacking capabilities required by the connection."
- msgstr "设备缺少连接所要求的功能。"
-
--#: ../libnm/nm-device-olpc-mesh.c:107
-+#: ../libnm/nm-device-olpc-mesh.c:101
- msgid "The connection was not an OLPC Mesh connection."
- msgstr "此连接不是 OLPC Mesh 连接。"
-
-@@ -11849,7 +12246,7 @@ msgstr "此连接不是 ovs 接口连接。"
- msgid "The connection was not a ovs_port connection."
- msgstr "此连接不是 ovs 端口连接。"
-
--#: ../libnm/nm-device-team.c:131
-+#: ../libnm/nm-device-team.c:125
- msgid "The connection was not a team connection."
- msgstr "此连接不是组合（team）连接。"
-
-@@ -11869,10 +12266,18 @@ msgstr "此连接不是 VLAN 连接。"
- msgid "The VLAN identifiers of the device and the connection didn't match."
- msgstr "设备和连接的 VLAN 标识符不匹配。"
-
--#: ../libnm/nm-device-vlan.c:143
-+#: ../libnm/nm-device-vlan.c:144
- msgid "The hardware address of the device and the connection didn't match."
- msgstr "设备和连接的硬件地址不匹配。"
-
-+#: ../libnm/nm-device-vrf.c:63
-+msgid "The connection was not a VRF connection."
-+msgstr "此连接不是 VRF 连接。"
-+
-+#: ../libnm/nm-device-vrf.c:70
-+msgid "The VRF table of the device and the connection didn't match."
-+msgstr "设备的 VRF 表和连接不匹配"
-+
- #: ../libnm/nm-device-vxlan.c:381
- msgid "The connection was not a VXLAN connection."
- msgstr "此连接不是 VXLAN 连接。"
-@@ -11897,95 +12302,99 @@ msgstr "设备缺少连接所要求的 WPA 功能。"
- msgid "The device is lacking WPA2/RSN capabilities required by the connection."
- msgstr "设备缺少连接所要求的 WPA2/RSN 功能。"
-
--#: ../libnm/nm-device-wpan.c:64
-+#: ../libnm/nm-device-wpan.c:54
- msgid "The connection was not a wpan connection."
- msgstr "此连接不是 wpan 连接。"
-
--#: ../libnm/nm-device.c:1459
-+#: ../libnm/nm-device.c:1571
- msgid "Bluetooth"
- msgstr "蓝牙"
-
--#: ../libnm/nm-device.c:1461
-+#: ../libnm/nm-device.c:1573
- msgid "OLPC Mesh"
- msgstr "OLPC Mesh"
-
--#: ../libnm/nm-device.c:1463
-+#: ../libnm/nm-device.c:1575
- msgid "Open vSwitch Interface"
- msgstr "Open vSwitch 接口"
-
--#: ../libnm/nm-device.c:1465
-+#: ../libnm/nm-device.c:1577
- msgid "Open vSwitch Port"
- msgstr "Open vSwitch 端口"
-
--#: ../libnm/nm-device.c:1467
-+#: ../libnm/nm-device.c:1579
- msgid "Open vSwitch Bridge"
- msgstr "Open vSwitch 网桥"
-
--#: ../libnm/nm-device.c:1469
-+#: ../libnm/nm-device.c:1581
- msgid "WiMAX"
- msgstr "WiMAX"
-
--#: ../libnm/nm-device.c:1483
-+#: ../libnm/nm-device.c:1595
- msgid "ADSL"
- msgstr "ADSL"
-
--#: ../libnm/nm-device.c:1485
-+#: ../libnm/nm-device.c:1597
- msgid "MACVLAN"
- msgstr "MACVLAN"
-
--#: ../libnm/nm-device.c:1487
-+#: ../libnm/nm-device.c:1599
- msgid "VXLAN"
- msgstr "VXLAN"
-
--#: ../libnm/nm-device.c:1489
-+#: ../libnm/nm-device.c:1601
- msgid "IPTunnel"
- msgstr "IP 隧道"
-
--#: ../libnm/nm-device.c:1491
-+#: ../libnm/nm-device.c:1603
- msgid "Tun"
- msgstr "Tun"
-
--#: ../libnm/nm-device.c:1493
-+#: ../libnm/nm-device.c:1605
- msgid "Veth"
- msgstr "Veth"
-
--#: ../libnm/nm-device.c:1495
-+#: ../libnm/nm-device.c:1607
- msgid "MACsec"
- msgstr "MACsec"
-
--#: ../libnm/nm-device.c:1497
-+#: ../libnm/nm-device.c:1609
- msgid "Dummy"
- msgstr "虚拟"
-
--#: ../libnm/nm-device.c:1499
-+#: ../libnm/nm-device.c:1611
- msgid "PPP"
- msgstr "PPP"
-
--#: ../libnm/nm-device.c:1501
-+#: ../libnm/nm-device.c:1613
- msgid "IEEE 802.15.4"
- msgstr "IEEE 802.15.4"
-
--#: ../libnm/nm-device.c:1503
-+#: ../libnm/nm-device.c:1615
- msgid "6LoWPAN"
- msgstr "6LoWPAN"
-
--#: ../libnm/nm-device.c:1505
-+#: ../libnm/nm-device.c:1617
- msgid "WireGuard"
- msgstr "WireGuard"
-
--#: ../libnm/nm-device.c:1507
-+#: ../libnm/nm-device.c:1619
- msgid "Wi-Fi P2P"
- msgstr "Wi-Fi P2P"
-
--#: ../libnm/nm-device.c:1539
-+#: ../libnm/nm-device.c:1621
-+msgid "VRF"
-+msgstr "VRF"
-+
-+#: ../libnm/nm-device.c:1653
- msgid "Wired"
- msgstr "有线"
-
--#: ../libnm/nm-device.c:1571
-+#: ../libnm/nm-device.c:1685
- msgid "PCI"
- msgstr "PCI"
-
--#: ../libnm/nm-device.c:1573
-+#: ../libnm/nm-device.c:1687
- msgid "USB"
- msgstr "USB"
-
-@@ -11995,22 +12404,26 @@ msgstr "USB"
- #. * "%2$s (%1$s)" if there's no grammatical way to combine
- #. * the strings otherwise.
- #.
--#: ../libnm/nm-device.c:1873 ../libnm/nm-device.c:1892
-+#: ../libnm/nm-device.c:1987 ../libnm/nm-device.c:2006
- #, c-format
- msgctxt "long device name"
- msgid "%s %s"
- msgstr "%s %s"
-
--#: ../libnm/nm-device.c:2569
-+#: ../libnm/nm-device.c:2683
- #, c-format
- msgid "The connection was not valid: %s"
- msgstr "连接无效：%s"
-
--#: ../libnm/nm-device.c:2578
-+#: ../libnm/nm-device.c:2692
- #, c-format
- msgid "The interface names of the device and the connection didn't match."
- msgstr "这个设备的接口名和连接不匹配。"
-
-+#: ../libnm/nm-secret-agent-old.c:1412
-+msgid "registration failed"
-+msgstr "注册失败。"
-+
- #: ../libnm/nm-vpn-plugin-old.c:828 ../libnm/nm-vpn-service-plugin.c:1027
- msgid "No service name specified"
- msgstr "未指定服务"
-@@ -12157,88 +12570,87 @@ msgstr "启用或禁用连接性检查"
- msgid "System policy prevents enabling or disabling connectivity checking"
- msgstr "系统策略阻止启用或禁用连接性检查"
-
--#: ../shared/nm-glib-aux/nm-shared-utils.c:1669
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:2346
- #, c-format
- msgid "object class '%s' has no property named '%s'"
- msgstr "对象类 \"%s\" 没有名为 \"%s\" 的属性"
-
--#: ../shared/nm-glib-aux/nm-shared-utils.c:1676
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:2353
- #, c-format
- msgid "property '%s' of object class '%s' is not writable"
- msgstr "对象类 \"%2$s\" 的 \"%1$s\" 属性是不可写的"
-
--#: ../shared/nm-glib-aux/nm-shared-utils.c:1683
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:2360
- #, c-format
- msgid ""
- "construct property \"%s\" for object '%s' can't be set after construction"
- msgstr "对象 \"%2$s\" 的构造属性 \"%1$s\" 在构造后不能被设定"
-
--#: ../shared/nm-glib-aux/nm-shared-utils.c:1691
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:2368
- #, c-format
- msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
- msgstr "\"%s::%s\" 不是有效的属性名；\"%s\" 不是 GObject 子类型"
-
--#: ../shared/nm-glib-aux/nm-shared-utils.c:1700
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:2377
- #, c-format
- msgid "unable to set property '%s' of type '%s' from value of type '%s'"
- msgstr "无法从类型 \"%3$s\" 的值设定类型为 \"%2$s\" 的属性 \"%1$s\""
-
--#: ../shared/nm-glib-aux/nm-shared-utils.c:1711
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:2388
- #, c-format
- msgid ""
- "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
- "type '%s'"
- msgstr "类型 \"%2$s\" 的值 \"%1$s\" 无效或超出类型为 \"%4$s\" 的属性 \"%3$s\" 范围"
-
--#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:221
--#, c-format
--msgid "'%s' is not valid: properties should be specified as 'key=value'"
--msgstr "'%s' 无效：属性需要以 'key=value' 的形式指定"
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:4801
-+msgid "interface name is missing"
-+msgstr "缺少接口名"
-
--#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:236
--#, c-format
--msgid "'%s' is not a valid key"
--msgstr "'%s' 不是一个有效的关键字"
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:4807
-+msgid "interface name is too short"
-+msgstr "接口名太短"
-
--#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:242
--#, c-format
--msgid "duplicate key '%s'"
--msgstr "重复的关键字 '%s'"
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:4816
-+msgid "interface name is reserved"
-+msgstr "接口名被保留"
-
--#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:256
--#, c-format
--msgid "number for '%s' is out of range"
--msgstr "'%s' 的值超出了范围"
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:4828
-+msgid "interface name contains an invalid character"
-+msgstr "接口名包含无效字符"
-+
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:4834
-+msgid "interface name is longer than 15 characters"
-+msgstr "接口名长度超过 15 字符"
-
--#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:259
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:4857
- #, c-format
--msgid "value for '%s' must be a number"
--msgstr "'%s' 的值需要是一个数字"
-+msgid "'%%' is not allowed in interface names"
-+msgstr "接口名称中不允许使用 '%%'。"
-
--#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:270
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:4870
- #, c-format
--msgid "value for '%s' must be a boolean"
--msgstr "'%s' 的值需要是一个布尔值"
-+msgid "'%s' is not allowed as interface name"
-+msgstr "''%s不允许作为接口名"
-
--#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:279
--msgid "missing 'name' attribute"
--msgstr "缺少 'name' 属性"
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:4891
-+msgid ""
-+"interface name must be alphanumerical with no forward or backward slashes"
-+msgstr "接口名称必须是字母数字，没有正反斜杠。"
-
--#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:286
--#, c-format
--msgid "invalid 'name' \"%s\""
--msgstr "无效的 'name' \"%s\""
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:4908
-+msgid "interface name must not be empty"
-+msgstr "接口名称不能为空"
-
--#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:298
--#, c-format
--msgid "attribute '%s' is invalid for \"%s\""
--msgstr "属性 '%s' 无效（对于\"%s\"）"
-+#: ../shared/nm-glib-aux/nm-shared-utils.c:4914
-+msgid "interface name must be UTF-8 encoded"
-+msgstr "接口名称必须是 UTF-8 编码"
-
- #. TRANSLATORS: the first %s is a prefix for the connection id, such
- #. * as "Wired Connection" or "VPN Connection". The %d is a number
- #. * that is combined with the first argument to create a unique
- #. * connection id.
--#: ../src/NetworkManagerUtils.c:107
-+#: ../src/NetworkManagerUtils.c:109
- #, c-format
- msgctxt "connection id fallback"
- msgid "%s %u"
-@@ -12250,25 +12662,25 @@ msgid "Failed to read configuration: %s\n"
- msgstr "读取配置失败：%s\n"
-
- #. Logging/debugging
--#: ../src/main.c:184 ../src/nm-iface-helper.c:295
-+#: ../src/main.c:184 ../src/nm-iface-helper.c:297
- msgid "Print NetworkManager version and exit"
- msgstr "输出网络管理器版本并退出"
-
--#: ../src/main.c:185 ../src/nm-iface-helper.c:296
-+#: ../src/main.c:185 ../src/nm-iface-helper.c:298
- msgid "Don't become a daemon"
- msgstr "不成为守护进程"
-
--#: ../src/main.c:186 ../src/nm-iface-helper.c:298
-+#: ../src/main.c:186 ../src/nm-iface-helper.c:300
- #, c-format
- msgid "Log level: one of [%s]"
- msgstr "日志级别：取 [%s] 之一"
-
--#: ../src/main.c:188 ../src/nm-iface-helper.c:300
-+#: ../src/main.c:188 ../src/nm-iface-helper.c:302
- #, c-format
- msgid "Log domains separated by ',': any combination of [%s]"
- msgstr "以 \",\" 分开的日志域：可以是 [%s] 的任意组合"
-
--#: ../src/main.c:190 ../src/nm-iface-helper.c:302
-+#: ../src/main.c:190 ../src/nm-iface-helper.c:304
- msgid "Make all warnings fatal"
- msgstr "视所有警告为致命错误"
-
-@@ -12289,12 +12701,12 @@ msgid ""
- msgstr "网络管理器（NetworkManager）监视所有网络连接，并自动选择要使用的最佳连接。\n"
- "它还允许用户指定计算机无线网卡连接的无线访问点。"
-
--#: ../src/main.c:325 ../src/main-utils.c:275 ../src/nm-iface-helper.c:443
-+#: ../src/main.c:325 ../src/main-utils.c:275 ../src/nm-iface-helper.c:445
- #, c-format
- msgid "%s. Please use --help to see a list of valid options.\n"
- msgstr "%s。请使用 --help 查看有效选项列表。\n"
-
--#: ../src/main.c:358 ../src/nm-iface-helper.c:456
-+#: ../src/main.c:358 ../src/nm-iface-helper.c:458
- #, c-format
- msgid "Could not daemonize: %s [error %u]\n"
- msgstr "无法设为守护进程：%s [错误 %u]\n"
-@@ -12329,11 +12741,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:303
-+#: ../src/dhcp/nm-dhcp-dhclient-utils.c:324
- msgid "# Created by NetworkManager\n"
- msgstr "# 由 NetworkManger 创建\n"
-
--#: ../src/dhcp/nm-dhcp-dhclient-utils.c:316
-+#: ../src/dhcp/nm-dhcp-dhclient-utils.c:337
- #, c-format
- msgid ""
- "# Merged from %s\n"
-@@ -12400,11 +12812,11 @@ msgstr "网桥连接"
- msgid "Dummy connection"
- msgstr "虚拟连接"
-
--#: ../src/devices/nm-device-ethernet.c:1506
-+#: ../src/devices/nm-device-ethernet.c:1618
- msgid "PPPoE connection"
- msgstr "PPPoE 连接"
-
--#: ../src/devices/nm-device-ethernet.c:1506
-+#: ../src/devices/nm-device-ethernet.c:1618
- msgid "Wired connection"
- msgstr "有线连接"
-
-@@ -12413,7 +12825,7 @@ msgstr "有线连接"
- msgid "Wired connection %d"
- msgstr "有线连接 %d"
-
--#: ../src/devices/nm-device-ip-tunnel.c:407
-+#: ../src/devices/nm-device-ip-tunnel.c:408
- msgid "IP tunnel connection"
- msgstr "IP 隧道连接"
-
-@@ -12429,7 +12841,7 @@ msgstr "TUN 连接"
- msgid "WPAN connection"
- msgstr "WPAN 连接"
-
--#: ../src/devices/team/nm-device-team.c:87
-+#: ../src/devices/team/nm-device-team.c:89
- msgid "Team connection"
- msgstr "组合连接"
-
-@@ -12573,182 +12985,182 @@ msgstr "WPA 验证和非 EAP（原始的）LEAP 或动态 WEP 不兼容"
- msgid "WPA authentication is incompatible with Shared Key authentication"
- msgstr "WPA 验证和共享密钥（Shared Key）验证不兼容"
-
--#: ../src/devices/wifi/nm-wifi-utils.c:776
-+#: ../src/devices/wifi/nm-wifi-utils.c:783
- msgid "Failed to determine AP security information"
- msgstr "确定 AP 安全信息失败"
-
--#: ../src/nm-config.c:572
-+#: ../src/nm-config.c:565
- #, c-format
- msgid "Bad '%s' option: "
- msgstr "错误的 '%s' 选项： "
-
--#: ../src/nm-config.c:585
-+#: ../src/nm-config.c:578
- msgid "Config file location"
- msgstr "配置文件位置"
-
--#: ../src/nm-config.c:586
-+#: ../src/nm-config.c:579
- msgid "Config directory location"
- msgstr "配置目录位置"
-
--#: ../src/nm-config.c:587
-+#: ../src/nm-config.c:580
- msgid "System config directory location"
- msgstr "系统配置目录位置"
-
--#: ../src/nm-config.c:588
-+#: ../src/nm-config.c:581
- msgid "Internal config file location"
- msgstr "内部配置文件位置"
-
--#: ../src/nm-config.c:589
-+#: ../src/nm-config.c:582
- msgid "State file location"
- msgstr "状态文件位置"
-
--#: ../src/nm-config.c:590
-+#: ../src/nm-config.c:583
- msgid "State file for no-auto-default devices"
- msgstr "no-auto-default 设备的状态文件"
-
--#: ../src/nm-config.c:591
-+#: ../src/nm-config.c:584
- msgid "List of plugins separated by ','"
- msgstr "插件列表，以 \",\" 隔开"
-
--#: ../src/nm-config.c:592
-+#: ../src/nm-config.c:585
- msgid "Quit after initial configuration"
- msgstr "初始化配置后退出"
-
--#: ../src/nm-config.c:593 ../src/nm-iface-helper.c:297
-+#: ../src/nm-config.c:586 ../src/nm-iface-helper.c:299
- 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:596
-+#: ../src/nm-config.c:589
- msgid "An http(s) address for checking internet connectivity"
- msgstr "检查网络连通用的 http(s) 地址"
-
--#: ../src/nm-config.c:597
-+#: ../src/nm-config.c:590
- msgid "The interval between connectivity checks (in seconds)"
- msgstr "连接性检查间隔（以秒计）"
-
--#: ../src/nm-config.c:598
-+#: ../src/nm-config.c:591
- msgid "The expected start of the response"
- msgstr "预期的响应开头"
-
--#: ../src/nm-config.c:605
-+#: ../src/nm-config.c:598
- msgid "NetworkManager options"
- msgstr "NetworkManager 选项"
-
--#: ../src/nm-config.c:605
-+#: ../src/nm-config.c:598
- msgid "Show NetworkManager options"
- msgstr "显示 NetworkManager 选项"
-
- #. Interface/IP config
--#: ../src/nm-iface-helper.c:277
-+#: ../src/nm-iface-helper.c:279
- msgid "The interface to manage"
- msgstr "要管理的接口"
-
--#: ../src/nm-iface-helper.c:278
-+#: ../src/nm-iface-helper.c:280
- msgid "Connection UUID"
- msgstr "连接 UUID"
-
--#: ../src/nm-iface-helper.c:279
-+#: ../src/nm-iface-helper.c:281
- msgid "Connection Token for Stable IDs"
- msgstr "固定 ID 的连接令牌"
-
--#: ../src/nm-iface-helper.c:280
-+#: ../src/nm-iface-helper.c:282
- msgid "Whether to manage IPv6 SLAAC"
- msgstr "是否管理 IPv6 SLAAC"
-
--#: ../src/nm-iface-helper.c:281
-+#: ../src/nm-iface-helper.c:283
- msgid "Whether SLAAC must be successful"
- msgstr "SLAAC 是否必须是成功的"
-
--#: ../src/nm-iface-helper.c:282
-+#: ../src/nm-iface-helper.c:284
- msgid "Use an IPv6 temporary privacy address"
- msgstr "使用 IPv6 临时私有地址"
-
--#: ../src/nm-iface-helper.c:283
-+#: ../src/nm-iface-helper.c:285
- msgid "Current DHCPv4 address"
- msgstr "当前的 DHCPv4 地址"
-
--#: ../src/nm-iface-helper.c:284
-+#: ../src/nm-iface-helper.c:286
- msgid "Whether DHCPv4 must be successful"
- msgstr "DHCPv4 是否必须是成功的"
-
--#: ../src/nm-iface-helper.c:285
-+#: ../src/nm-iface-helper.c:287
- msgid "Hex-encoded DHCPv4 client ID"
- msgstr "十六进制编码的 DHCPv4 客户 ID"
-
--#: ../src/nm-iface-helper.c:286
-+#: ../src/nm-iface-helper.c:288
- msgid "Hostname to send to DHCP server"
- msgstr "发送至 DHCP 服务器的主机名"
-
--#: ../src/nm-iface-helper.c:286
-+#: ../src/nm-iface-helper.c:288
- msgid "barbar"
- msgstr "barbar"
-
--#: ../src/nm-iface-helper.c:287
-+#: ../src/nm-iface-helper.c:289
- msgid "FQDN to send to DHCP server"
- msgstr "发送至 DHCP 服务器的 FQDN"
-
--#: ../src/nm-iface-helper.c:287
-+#: ../src/nm-iface-helper.c:289
- msgid "host.domain.org"
- msgstr "host.domain.org"
-
--#: ../src/nm-iface-helper.c:288
-+#: ../src/nm-iface-helper.c:290
- msgid "Route priority for IPv4"
- msgstr "IPv4 的路由优先级"
-
--#: ../src/nm-iface-helper.c:288
-+#: ../src/nm-iface-helper.c:290
- msgid "0"
- msgstr "0"
-
--#: ../src/nm-iface-helper.c:289
-+#: ../src/nm-iface-helper.c:291
- msgid "Route priority for IPv6"
- msgstr "IPv6 的路由优先级"
-
--#: ../src/nm-iface-helper.c:289
-+#: ../src/nm-iface-helper.c:291
- msgid "1024"
- msgstr "1024"
-
--#: ../src/nm-iface-helper.c:290
-+#: ../src/nm-iface-helper.c:292
- msgid "Hex-encoded Interface Identifier"
- msgstr "十六进制编码的接口标识符"
-
--#: ../src/nm-iface-helper.c:291
-+#: ../src/nm-iface-helper.c:293
- msgid "IPv6 SLAAC address generation mode"
- msgstr "IPv6 SLAAC 地址生成模式"
-
--#: ../src/nm-iface-helper.c:292
-+#: ../src/nm-iface-helper.c:294
- msgid ""
- "The logging backend configuration value. See logging.backend in "
- "NetworkManager.conf"
- msgstr "日志后台的配置值。请参考 NetworkManager.conf 里的 logging.backend"
-
--#: ../src/nm-iface-helper.c:312
-+#: ../src/nm-iface-helper.c:314
- msgid ""
- "nm-iface-helper is a small, standalone process that manages a single network "
- "interface."
- msgstr "nm-iface-helper 是一个管理单个网络接口的小型独立进程。"
-
--#: ../src/nm-iface-helper.c:423
-+#: ../src/nm-iface-helper.c:425
- #, c-format
- msgid "An interface name and UUID are required\n"
- msgstr "接口名称和 UUID 是必需的\n"
-
--#: ../src/nm-iface-helper.c:430
-+#: ../src/nm-iface-helper.c:432
- #, c-format
- msgid "Failed to find interface index for %s (%s)\n"
- msgstr "寻找 %s(%s) 的接口索引失败\n"
-
--#: ../src/nm-iface-helper.c:448
-+#: ../src/nm-iface-helper.c:450
- #, c-format
- msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n"
- msgstr "正在忽略传给命令行的未识别日志域 \"%s\"。\n"
-
--#: ../src/nm-iface-helper.c:489
-+#: ../src/nm-iface-helper.c:491
- #, c-format
- msgid "(%s): Invalid IID %s\n"
- msgstr "（%s）：无效的 IID %s\n"
-
--#: ../src/nm-iface-helper.c:500
-+#: ../src/nm-iface-helper.c:502
- #, c-format
- msgid "(%s): Invalid DHCP client-id %s\n"
- msgstr "（%s）：无效的 DHCP 客户端 ID %s\n"
-@@ -12763,6 +13175,74 @@ msgstr "未知的日志等级 \"%s\""
- msgid "Unknown log domain '%s'"
- msgstr "未知的日志域 \"%s\""
-
-+#~ msgid "missing colon in 'password' entry '%s'"
-+#~ msgstr "\"password\" 条目 \"%s\" 缺失了冒号"
-+
-+#~ msgid "missing dot in 'password' entry '%s'"
-+#~ msgstr "\"password\" 条目 \"%s\" 缺失了点号"
-+
-+#~ msgid "invalid setting name in 'password' entry '%s'"
-+#~ msgstr "\"password\" 条目 \"%s\" 里出现无效的设置名称"
-+
-+#~ msgid "Error: '%s': %s"
-+#~ msgstr "错误：\"%s\"：%s"
-+
-+#~ msgid "Authentication message: %s\n"
-+#~ msgstr "验证消息：%s\n"
-+
-+#~ msgid "Authentication error: %s\n"
-+#~ msgstr "验证错误：%s\n"
-+
-+#~ msgid "'%s' is not valid master; use ifname or connection UUID"
-+#~ msgstr "\"%s\" 不是有效的主连接；使用接口名或连接的 UUID"
-+
-+#~ msgid "An authentication session is already underway."
-+#~ msgstr "验证会话已在进行。"
-+
-+#~ msgid "A timeout for a DHCP transaction in seconds."
-+#~ msgstr "DHCP 事务的超时时间，以秒计。"
-+
-+#~ msgid ""
-+#~ "Array of DNS options as described in man 5 resolv.conf. NULL means that "
-+#~ "the options are unset and left at the default. In this case "
-+#~ "NetworkManager will use default options. This is distinct from an empty "
-+#~ "list of properties."
-+#~ msgstr ""
-+#~ "在 man 5 resolv.conf 中描述的 DNS 选项数组。NULL 代表选项未设定并保留默认"
-+#~ "值。此情况下网络管理器（NetworkManager）将使用默认选项。这跟空列表的属性不"
-+#~ "同。"
-+
-+#~ msgid ""
-+#~ "The gateway associated with this configuration. This is only meaningful "
-+#~ "if \"addresses\" is also set."
-+#~ msgstr "与此配置关联的网关。这只在 \"addresses\" 也设定的时候有意义。"
-+
-+#~ msgid ""
-+#~ "A list of interface names to match. Each element is a shell wildcard "
-+#~ "pattern. When an element is prefixed with exclamation mark (!) the "
-+#~ "condition is inverted. A candidate interface name is considered matching "
-+#~ "when both these conditions are satisfied: (a) any of the elements not "
-+#~ "prefixed with '!' matches or there aren't such elements; (b) none of the "
-+#~ "elements prefixed with '!' match."
-+#~ msgstr ""
-+#~ "要匹配的接口名列表。每个元素都为 shell 通配符模式。当元素以感叹号（!）为前"
-+#~ "缀时，条件反转。当满足下列条件时，视为匹配的候选接口名：(a) 未前插 \"!\" "
-+#~ "的任意元素匹配或不存此类元素；(b) 无前插 \"!\" 的元素匹配。"
-+
-+#~ msgid ""
-+#~ "Specifies the unicast destination IP address of a remote Open vSwitch "
-+#~ "bridge port to connect to."
-+#~ msgstr "指定要连接的远程 Open vSwitch 网桥端口的单播目标 IP 地址。"
-+
-+#~ msgid "only one of '%s' and '%s' can be set"
-+#~ msgstr "只能设置 \"%s\" 和 \"%s\" 中的一个"
-+
-+#~ msgid "unsupported offload feature"
-+#~ msgstr "不支持的卸载功能"
-+
-+#~ msgid "secret was empty"
-+#~ msgstr "密钥为空"
-+
- #~ msgid "Unknown parameter: %s\n"
- #~ msgstr "未知参数：%s\n"
-
-@@ -12799,7 +13279,3 @@ msgstr "未知的日志域 \"%s\""
- #~ msgid "WPA Ad-Hoc authentication requires an Ad-Hoc mode AP"
- #~ msgstr "WPA Ad-Hoc 验证要求 Ad-Hoc 模式的 AP"
-
--#~ msgid ""
--#~ "Access point mode is Ad-Hoc but setting requires Infrastructure security"
--#~ msgstr "接入点模式是 Ad-Hoc 但设置要求 Infrastructure 安全性"
--
---
-2.26.2
-
diff --git a/SOURCES/1004-fix-warning-setting-bond-active-slave-rh1858326.patch b/SOURCES/1004-fix-warning-setting-bond-active-slave-rh1858326.patch
deleted file mode 100644
index f7bff39..0000000
--- a/SOURCES/1004-fix-warning-setting-bond-active-slave-rh1858326.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From cb125986922b6e0bd33d68306f1602b19ea1a3de Mon Sep 17 00:00:00 2001
-From: Thomas Haller <thaller@redhat.com>
-Date: Tue, 14 Jul 2020 09:16:51 +0200
-Subject: [PATCH 1/1] bond: avoid setting "active_slave" option without
- interface enslaved
-
-Kernel will reject setting "active_slave", if the interface is not enslaved or not
-up. We already handle that by setting the option whenever we enslave an interface.
-However, we also must not set it initially, otherwise we get an ugly error log message:
-
- NetworkManager[939]: <debug> [1594709143.7459] platform-linux: sysctl: setting net:/sys/class/net/bond99/bonding/active_slave to eth1 (current value is )
- NetworkManager[939]: <error> [1594709143.7459] platform-linux: sysctl: failed to set bonding/active_slave to eth1: (22) Invalid argument
- NetworkManager[939]: <warn> [1594709143.7460] device (bond99): failed to set bonding attribute active_slave to eth1
- ...
- kernel: bond99: (slave eth1): Device is not bonding slave
- kernel: bond99: option active_slave: invalid value (eth1)
-
-See-also: https://bugzilla.redhat.com/show_bug.cgi?id=1856640
-
-https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/577
-(cherry picked from commit f0a39b517e06470c4b176ef0bbd49c2eef1d7ad7)
-(cherry picked from commit e48c908e8cb5e0b426a4bf8d99608f73cd7890e4)
----
- src/devices/nm-device-bond.c | 43 +++++++++++++++++++++++++++++++-----
- 1 file changed, 38 insertions(+), 5 deletions(-)
-
-diff --git a/src/devices/nm-device-bond.c b/src/devices/nm-device-bond.c
-index 2fedc753f350..e36eba61b0b2 100644
---- a/src/devices/nm-device-bond.c
-+++ b/src/devices/nm-device-bond.c
-@@ -8,6 +8,7 @@
- #include "nm-device-bond.h"
-
- #include <stdlib.h>
-+#include <net/if.h>
-
- #include "NetworkManagerUtils.h"
- #include "nm-device-private.h"
-@@ -261,6 +262,40 @@ set_bond_attr_or_default (NMDevice *device,
- _set_bond_attr (device, opt, value);
- }
-
-+static void
-+set_bond_attr_active_slave (NMDevice *device, NMSettingBond *s_bond)
-+{
-+ NMDeviceBond *self = NM_DEVICE_BOND (device);
-+ const NMPlatformLink *plink;
-+ const char *value;
-+ const char *error_reason;
-+ int ifindex;
-+
-+ value = nm_setting_bond_get_option_or_default (s_bond, NM_SETTING_BOND_OPTION_ACTIVE_SLAVE);
-+ if (!value)
-+ return;
-+
-+ if (!nm_str_is_empty (value)) {
-+ ifindex = nm_device_get_ifindex (device);
-+ plink = nm_platform_link_get_by_ifname (nm_device_get_platform (device), value);
-+ if (!plink)
-+ error_reason = "does not exist";
-+ else if (plink->master != ifindex)
-+ error_reason = "is not yet enslaved";
-+ else if (!NM_FLAGS_HAS (plink->n_ifi_flags, IFF_UP))
-+ error_reason = "is not up";
-+ else
-+ error_reason = NULL;
-+
-+ if (error_reason) {
-+ _LOGT (LOGD_BOND, "bond option 'active_slave' not set as device \"%s\" %s", value, error_reason);
-+ return;
-+ }
-+ }
-+
-+ _set_bond_attr (device, NM_SETTING_BOND_OPTION_ACTIVE_SLAVE, value);
-+}
-+
- static gboolean
- apply_bonding_config (NMDeviceBond *self)
- {
-@@ -300,7 +335,7 @@ apply_bonding_config (NMDeviceBond *self)
- nm_setting_bond_get_option_or_default (s_bond, NM_SETTING_BOND_OPTION_ARP_IP_TARGET));
-
- set_bond_attr_or_default (device, s_bond, NM_SETTING_BOND_OPTION_AD_ACTOR_SYSTEM);
-- set_bond_attr_or_default (device, s_bond, NM_SETTING_BOND_OPTION_ACTIVE_SLAVE);
-+ set_bond_attr_active_slave (device, s_bond);
- set_bond_attr_or_default (device, s_bond, NM_SETTING_BOND_OPTION_AD_ACTOR_SYS_PRIO);
- set_bond_attr_or_default (device, s_bond, NM_SETTING_BOND_OPTION_AD_SELECT);
- set_bond_attr_or_default (device, s_bond, NM_SETTING_BOND_OPTION_AD_USER_PORT_KEY);
-@@ -378,7 +413,7 @@ enslave_slave (NMDevice *device,
- if (nm_streq0 (active, nm_device_get_iface (slave))) {
- nm_platform_sysctl_master_set_option (nm_device_get_platform (device),
- nm_device_get_ifindex (device),
-- "active_slave",
-+ NM_SETTING_BOND_OPTION_ACTIVE_SLAVE,
- active);
- _LOGD (LOGD_BOND, "setting slave %s as active one for master %s",
- active, nm_device_get_iface (device));
-@@ -577,10 +612,8 @@ reapply_connection (NMDevice *device, NMConnection *con_old, NMConnection *con_n
- mode = _nm_setting_bond_mode_from_string (value);
- g_return_if_fail (mode != NM_BOND_MODE_UNKNOWN);
-
-- /* Primary */
- set_bond_attr_or_default (device, s_bond, NM_SETTING_BOND_OPTION_PRIMARY);
-- /* Active slave */
-- set_bond_attr_or_default (device, s_bond, NM_SETTING_BOND_OPTION_ACTIVE_SLAVE);
-+ set_bond_attr_active_slave (device, s_bond);
- }
-
- /*****************************************************************************/
---
-2.26.2
-
diff --git a/SOURCES/1005-fix-managing-devices-after-sleep-rh1855563.patch b/SOURCES/1005-fix-managing-devices-after-sleep-rh1855563.patch
deleted file mode 100644
index e6a193f..0000000
--- a/SOURCES/1005-fix-managing-devices-after-sleep-rh1855563.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From 66df6ba15a4b394a71c352011eb0915b381b821a Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Thu, 16 Jul 2020 11:57:14 +0200
-Subject: [PATCH 1/2] manager: fix race condition when resuming from sleep
-
-If the device state change (to disconnected or unmanaged) triggered by
-a sleep event happens after the wake, the devices becomes wrongly
-unmanaged and it's necessary to manually manage it again, or restart
-NM.
-
-During the wake event we should disconnect the device_sleep_cb()
-callback for all devices because we don't want to react to state
-changes anymore; in particular we don't need to detect when the device
-becomes disconnected to unmanage it.
-
-(cherry picked from commit fe2d93980bd5b61c55a8b65a55f7aad35042e691)
-(cherry picked from commit 971897195a8218cb0ec08ae95a7210fce73f0b03)
----
- src/nm-manager.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/nm-manager.c b/src/nm-manager.c
-index 921125329e..d687fcd7f2 100644
---- a/src/nm-manager.c
-+++ b/src/nm-manager.c
-@@ -6048,8 +6048,9 @@ do_sleep_wake (NMManager *self, gboolean sleeping_changed)
- } else {
- _LOGD (LOGD_SUSPEND, "sleep: %s...", waking_from_suspend ? "waking up" : "re-enabling");
-
-+ sleep_devices_clear (self);
-+
- if (waking_from_suspend) {
-- sleep_devices_clear (self);
- c_list_for_each_entry (device, &priv->devices_lst_head, devices_lst) {
- if (nm_device_is_software (device))
- continue;
---
-2.26.2
-
-From 29958141b98cd0abba614b15e6f24611382f8f99 Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Thu, 16 Jul 2020 11:58:20 +0200
-Subject: [PATCH 2/2] policy: block connection from autoconnect in case of
- failed dependency
-
-A connection that fails due to dependency-failed is not able to
-reconnect until the master connection activates again; when this
-happens, the master clears the blocked reason for all its slaves in
-activate_slave_connections() and tries to reconnect them. For this to
-work, the slave should be marked as blocked when it fails with
-dependency-failed.
-
-(cherry picked from commit 725fed01cf7c8508cf426897340b2a4113406aab)
-(cherry picked from commit e1755048e35aca682c7d0d233122d4ddaf3bb089)
----
- src/nm-policy.c | 33 +++++++++++++++++++++++++--------
- 1 file changed, 25 insertions(+), 8 deletions(-)
-
-diff --git a/src/nm-policy.c b/src/nm-policy.c
-index 62ead24253..e571034bc3 100644
---- a/src/nm-policy.c
-+++ b/src/nm-policy.c
-@@ -1787,7 +1787,7 @@ device_state_changed (NMDevice *device,
- if ( sett_conn
- && old_state >= NM_DEVICE_STATE_PREPARE
- && old_state <= NM_DEVICE_STATE_ACTIVATED) {
-- gboolean block_no_secrets = FALSE;
-+ gboolean blocked = FALSE;
- int tries;
- guint64 con_v;
-
-@@ -1807,15 +1807,32 @@ device_state_changed (NMDevice *device,
- */
- con_v = nm_settings_connection_get_last_secret_agent_version_id (sett_conn);
- if ( con_v == 0
-- || con_v == nm_agent_manager_get_agent_version_id (priv->agent_mgr))
-- block_no_secrets = TRUE;
-+ || con_v == nm_agent_manager_get_agent_version_id (priv->agent_mgr)) {
-+ _LOGD (LOGD_DEVICE, "connection '%s' now blocked from autoconnect due to no secrets",
-+ nm_settings_connection_get_id (sett_conn));
-+ nm_settings_connection_autoconnect_blocked_reason_set (sett_conn,
-+ NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_NO_SECRETS,
-+ TRUE);
-+ blocked = TRUE;
-+ }
-+ } else if (nm_device_state_reason_check (reason) == NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED) {
-+ /* A connection that fails due to dependency-failed is not
-+ * able to reconnect until the master connection activates
-+ * again; when this happens, the master clears the blocked
-+ * reason for all its slaves in activate_slave_connections()
-+ * and tries to reconnect them. For this to work, the slave
-+ * should be marked as blocked when it fails with
-+ * dependency-failed.
-+ */
-+ _LOGD (LOGD_DEVICE, "connection '%s' now blocked from autoconnect due to failed dependency",
-+ nm_settings_connection_get_id (sett_conn));
-+ nm_settings_connection_autoconnect_blocked_reason_set (sett_conn,
-+ NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_FAILED,
-+ TRUE);
-+ blocked = TRUE;
- }
-
-- if (block_no_secrets) {
-- _LOGD (LOGD_DEVICE, "connection '%s' now blocked from autoconnect due to no secrets",
-- nm_settings_connection_get_id (sett_conn));
-- nm_settings_connection_autoconnect_blocked_reason_set (sett_conn, NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_NO_SECRETS, TRUE);
-- } else {
-+ if (!blocked) {
- tries = nm_settings_connection_autoconnect_retries_get (sett_conn);
- if (tries > 0) {
- _LOGD (LOGD_DEVICE, "connection '%s' failed to autoconnect; %d tries left",
---
-2.26.2
-
diff --git a/SOURCES/1006-n-dhcp4-fix-bpf-for-big-endian-arch-rh1861488.patch b/SOURCES/1006-n-dhcp4-fix-bpf-for-big-endian-arch-rh1861488.patch
deleted file mode 100644
index d8cfc1b..0000000
--- a/SOURCES/1006-n-dhcp4-fix-bpf-for-big-endian-arch-rh1861488.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From ab260205b54bf3ae4862c11a2d47b84ff6cebe24 Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Mon, 3 Aug 2020 18:02:08 +0200
-Subject: [PATCH 1/1] n-dhcp4: fix BPF filter endianness issue
-
-The BPF filter takes the byte containing IP Flags and performs a
-bitwise AND with "ntohs(IP_MF | IP_OFFMASK)".
-
-On little-endian architectures the IP_MF flag (0x20) is ANDed with
-0xFF3F and so the presence of the flag is correctly detected ignoring
-other flags as IP_DF (0x40) or IP_RF (0x80).
-
-On big-endian, "ntohs(IP_MF | IP_OFFMASK)" is 0x3FFF and so the filter
-wrongly checks the presence of *any* flags. Therefore, a packet with
-the DF flag set is dropped.
-
-Instead, take the two bytes containing flags and offset:
-
- 0 1 2 3
- 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- |Version| IHL |Type of Service| Total Length |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | Identification |Flags| Fragment Offset |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-and verify that IP_MF and the offset are zero.
-
-Fixes: e43b1791a382 ('Merge commit 'e23b3c9c3ac86b065eef002fa5c4321cc4a87df2' as 'shared/n-dhcp4'')
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1861488
-https://github.com/nettools/n-dhcp4/pull/19
-(cherry picked from commit 03d38e83e558802a82cb0e4847cb1f1ef75ccd16)
-(cherry picked from commit 0024cef23850e6141a15cb02d92551adef3cf4dd)
-(cherry picked from commit 80835f8f8991ae8292790826afa3a5fc88b44d1a)
----
- shared/n-dhcp4/src/n-dhcp4-socket.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/shared/n-dhcp4/src/n-dhcp4-socket.c b/shared/n-dhcp4/src/n-dhcp4-socket.c
-index c7e897726ef8..7291c78036bc 100644
---- a/shared/n-dhcp4/src/n-dhcp4-socket.c
-+++ b/shared/n-dhcp4/src/n-dhcp4-socket.c
-@@ -50,8 +50,8 @@ int n_dhcp4_c_socket_packet_new(int *sockfdp, int ifindex) {
- BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, IPPROTO_UDP, 1, 0), /* IP protocol == UDP ? */
- BPF_STMT(BPF_RET + BPF_K, 0), /* ignore */
-
-- BPF_STMT(BPF_LD + BPF_B + BPF_ABS, offsetof(struct iphdr, frag_off)), /* A <- Flags */
-- BPF_STMT(BPF_ALU + BPF_AND + BPF_K, ntohs(IP_MF | IP_OFFMASK)), /* A <- A & (IP_MF | IP_OFFMASK) */
-+ BPF_STMT(BPF_LD + BPF_H + BPF_ABS, offsetof(struct iphdr, frag_off)), /* A <- Flags + Fragment offset */
-+ BPF_STMT(BPF_ALU + BPF_AND + BPF_K, IP_MF | IP_OFFMASK), /* A <- A & (IP_MF | IP_OFFMASK) */
- BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, 0, 1, 0), /* fragmented packet ? */
- BPF_STMT(BPF_RET + BPF_K, 0), /* ignore */
-
---
-2.26.2
-
diff --git a/SOURCES/1007-core-no-warn-setting-mtu-with-ipv6-disabled-rh1840989.patch b/SOURCES/1007-core-no-warn-setting-mtu-with-ipv6-disabled-rh1840989.patch
deleted file mode 100644
index 8d46b7e..0000000
--- a/SOURCES/1007-core-no-warn-setting-mtu-with-ipv6-disabled-rh1840989.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 7aa3b439df293b16597df3a0a2baa6caf3bb1322 Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Thu, 23 Jul 2020 17:18:56 +0200
-Subject: [PATCH 1/1] device: downgrade warning about IPv6 MTU if IPv6 is
- disabled
-
-If IPv6 is disabled, changing the IPv6 MTU fails and NM complains with
-a warning. Since this error is expected and doesn't do any harm,
-downgrade the logging level to DEBUG.
-
-Since IPv6 kernel support can be built as a module, we have to check
-the existence of /proc/sys/net/ipv6 every time. Instead of checking it
-and then setting the MTU (adding one /proc access for everyone), just try
-to set the MTU; in case of failure, determine the reason for the error.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1840989
-https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/585
-(cherry picked from commit 9c09dcedafd51da65c04669b830bc9652000d462)
-(cherry picked from commit ce3dffd24eb21924a332794bc66705dbd6c052a2)
----
- src/devices/nm-device.c | 23 +++++++++++++++++------
- 1 file changed, 17 insertions(+), 6 deletions(-)
-
-diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
-index 57c32cef8f09..24209c8614f1 100644
---- a/src/devices/nm-device.c
-+++ b/src/devices/nm-device.c
-@@ -10268,14 +10268,25 @@ _commit_mtu (NMDevice *self, const NMIP4Config *config)
- if (!nm_device_sysctl_ip_conf_set (self, AF_INET6, "mtu",
- nm_sprintf_buf (sbuf, "%u", (unsigned) ip6_mtu))) {
- int errsv = errno;
-+ NMLogLevel level = LOGL_WARN;
-+ const char *msg = NULL;
-
-- _NMLOG (anticipated_failure && errsv == EINVAL ? LOGL_DEBUG : LOGL_WARN,
-- LOGD_DEVICE,
-- "mtu: failure to set IPv6 MTU%s",
-- anticipated_failure && errsv == EINVAL
-- ? ": Is the underlying MTU value successfully set?"
-- : "");
- success = FALSE;
-+
-+ if (anticipated_failure && errsv == EINVAL) {
-+ level = LOGL_DEBUG;
-+ msg = "Is the underlying MTU value successfully set?";
-+ } else if (!g_file_test ("/proc/sys/net/ipv6", G_FILE_TEST_IS_DIR)) {
-+ level = LOGL_DEBUG;
-+ msg = "IPv6 is disabled";
-+ success = TRUE;
-+ }
-+
-+ _NMLOG (level,
-+ LOGD_DEVICE,
-+ "mtu: failure to set IPv6 MTU%s%s",
-+ msg ? ": " : "",
-+ msg ?: "");
- }
- priv->carrier_wait_until_ms = nm_utils_get_monotonic_timestamp_msec () + CARRIER_WAIT_TIME_AFTER_MTU_MS;
- }
---
-2.26.2
-
diff --git a/SOURCES/1008-wifi-avoid-crash-due-to-incomplete-Wi-Fi-API-info-rh1866395.patch b/SOURCES/1008-wifi-avoid-crash-due-to-incomplete-Wi-Fi-API-info-rh1866395.patch
deleted file mode 100644
index 7f3cff0..0000000
--- a/SOURCES/1008-wifi-avoid-crash-due-to-incomplete-Wi-Fi-API-info-rh1866395.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From c71d29b3dbe13d6ce456200d9e8ce9d0739eb368 Mon Sep 17 00:00:00 2001
-From: Thomas Haller <thaller@redhat.com>
-Date: Mon, 3 Aug 2020 09:54:04 +0200
-Subject: [PATCH 1/1] wifi: avoid crash due to incomplete Wi-Fi API info
-
-In this case, GetAll failed with "Timeout was reached". We still
-create a dummy BSS info, because we kept track of the object to
-start with. That way, we don't simply want to ignore the failure,
-because NMDeviceWifi might track this NMWifiAP already, and we may
-need an update (even if we failed to fetch the requested information).
-
-However, that later leads to a crash, because NMDeviceWifi expect the BSSID
-present then.
-
-Avoid that, by don't processing such APs.
-
- #0 g_logv (log_domain=0x7f2ac10a60a9 "NetworkManager", log_level=G_LOG_LEVEL_CRITICAL, format=<optimized out>, args=<optimized out>) at ../glib/gmessages.c:1377
- #1 0x00007f2acf152233 in g_log
- (log_domain=log_domain@entry=0x7f2ac10a60a9 "NetworkManager", log_level=log_level@entry=G_LOG_LEVEL_CRITICAL, format=format@entry=0x7f2acf1a46ff "%s: assertion '%s' failed")
- at ../glib/gmessages.c:1415
- #2 0x00007f2acf152a2d in g_return_if_fail_warning
- (log_domain=log_domain@entry=0x7f2ac10a60a9 "NetworkManager", pretty_function=pretty_function@entry=0x7f2ac10a9e70 <__func__.50> "try_fill_ssid_for_hidden_ap", expression=expression@entry=0x7f2ac10a86d0 "bssid") at ../glib/gmessages.c:2771
- #3 0x00007f2ac108a402 in try_fill_ssid_for_hidden_ap (ap=0x5569978b61c0 [NMWifiAP], self=0x55699786ea00 [NMDeviceWifi]) at src/devices/wifi/nm-device-wifi.c:1883
- #4 supplicant_iface_bss_changed_cb (iface=0x556997777260 [NMSupplicantInterface], bss_info=0x7f2ab4028f00, is_present=1, self=0x55699786ea00 [NMDeviceWifi])
- at src/devices/wifi/nm-device-wifi.c:1946
- #5 0x00007f2ace246af0 in ffi_call_unix64 () at ../src/x86/unix64.S:76
- #6 0x00007f2ace2462ab in ffi_call (cif=cif@entry=0x7ffd9c107c90, fn=fn@entry=0x7f2ac1089e80 <supplicant_iface_bss_changed_cb>, rvalue=<optimized out>, avalue=avalue@entry=0x7ffd9c107ba0)
- at ../src/x86/ffi64.c:525
- #7 0x00007f2acf23e87a in g_cclosure_marshal_generic_va
- (closure=<optimized out>, return_value=<optimized out>, instance=<optimized out>, args_list=<optimized out>, marshal_data=<optimized out>, n_params=<optimized out>, param_types=<optimized out>) at ../gobject/gclosure.c:1614
- #8 0x00007f2acf23dae6 in _g_closure_invoke_va
- (closure=closure@entry=0x5569978a0cc0, return_value=return_value@entry=0x0, instance=instance@entry=0x556997777260, args=args@entry=0x7ffd9c107f00, n_params=2, param_types=0x55699775b990) at ../gobject/gclosure.c:873
- #9 0x00007f2acf2566e9 in g_signal_emit_valist (instance=0x556997777260, signal_id=<optimized out>, detail=0, var_args=var_args@entry=0x7ffd9c107f00) at ../gobject/gsignal.c:3407
- #10 0x00007f2acf256c63 in g_signal_emit (instance=instance@entry=0x556997777260, signal_id=<optimized out>, detail=detail@entry=0) at ../gobject/gsignal.c:3554
- #11 0x00005569972ece61 in _bss_info_changed_emit (self=self@entry=0x556997777260 [NMSupplicantInterface], bss_info=bss_info@entry=0x7f2ab4028f00, is_present=is_present@entry=1)
- at src/supplicant/nm-supplicant-interface.c:555
- #12 0x00005569972ed3a0 in _bss_info_properties_changed (self=0x556997777260 [NMSupplicantInterface], bss_info=0x7f2ab4028f00, properties=<optimized out>, initial=<optimized out>)
- at src/supplicant/nm-supplicant-interface.c:758
- #13 0x00005569972f756b in _bss_info_get_all_cb (result=0x0, error=<optimized out>, user_data=0x7f2ab4028f00) at src/supplicant/nm-supplicant-interface.c:784
- #14 0x0000556997217bc1 in _nm_dbus_connection_call_default_cb (source=0x5569977480c0 [GDBusConnection], res=<optimized out>, user_data=user_data@entry=0x556997855d50)
- at shared/nm-glib-aux/nm-dbus-aux.c:74
- #15 0x00007f2acf339e4a in g_task_return_now (task=task@entry=0x7f2ab4003f00 [GTask]) at ../gio/gtask.c:1214
- #16 0x00007f2acf33aa3d in g_task_return (task=0x7f2ab4003f00 [GTask], type=<optimized out>) at ../gio/gtask.c:1283
- #17 0x00007f2acf33b4fe in g_task_return (type=G_TASK_RETURN_ERROR, task=<optimized out>) at ../gio/gtask.c:1861
- #18 g_task_return_error (task=<optimized out>, error=<optimized out>) at ../gio/gtask.c:1867
- #19 0x0000556997893f40 in ()
- #20 0x3a85d39adfae7f00 in ()
- #21 0x00007f2ab4003cc0 in ()
- #22 0x00007f2acf396460 in g_dbus_connection_call_done () at ../gio/gdbusconnection.c:2059
- #23 0x00007f2ab4003f00 in ()
- #24 0x0000000000000086 in ()
- #25 0x0000000000000018 in ()
- #26 0x00007f2acf339e4a in g_task_return_now (task=0x7f2ab4003f00 [GTask], task@entry=0x7f2ab4003cc0 [GTask]) at ../gio/gtask.c:1214
- #27 0x00007f2acf33aa3d in g_task_return (task=0x7f2ab4003cc0 [GTask], type=<optimized out>) at ../gio/gtask.c:1283
- #28 0x00007f2acf33b4fe in g_task_return (type=G_TASK_RETURN_ERROR, task=<optimized out>) at ../gio/gtask.c:1861
- #29 g_task_return_error (task=<optimized out>, error=<optimized out>) at ../gio/gtask.c:1867
- #30 0x0000003000000028 in ()
- #31 0x00007ffd9c108290 in ()
-
-Fixes: b83f07916a54 ('supplicant: large rework of wpa_supplicant handling')
-(cherry picked from commit 4d878d7012cd9dc031682ef5e5b025081427325b)
-(cherry picked from commit 029d07b019ea6532fbf6f8db03efb648f0931625)
----
- src/devices/wifi/nm-device-wifi.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c
-index 2d97f9b117a2..2a3428861737 100644
---- a/src/devices/wifi/nm-device-wifi.c
-+++ b/src/devices/wifi/nm-device-wifi.c
-@@ -1937,6 +1937,13 @@ supplicant_iface_bss_changed_cb (NMSupplicantInterface *iface,
- } else {
- gs_unref_object NMWifiAP *ap = NULL;
-
-+ if (!bss_info->bssid_valid) {
-+ /* We failed to initialize the info about the AP. This can
-+ * happen due to an error in the D-Bus communication. In this case
-+ * we ignore the info. */
-+ return;
-+ }
-+
- ap = nm_wifi_ap_new_from_properties (bss_info);
-
- /* Let the manager try to fill in the SSID from seen-bssids lists */
---
-2.26.2
-
diff --git a/SOURCES/1009-cloud-setup-fix-allocating-buffer-for-GetConfigMetad-rh1866395.patch b/SOURCES/1009-cloud-setup-fix-allocating-buffer-for-GetConfigMetad-rh1866395.patch
deleted file mode 100644
index 042e203..0000000
--- a/SOURCES/1009-cloud-setup-fix-allocating-buffer-for-GetConfigMetad-rh1866395.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From e8e245f0ce414bbe9b8ef6c13404b73b12dd34ad Mon Sep 17 00:00:00 2001
-From: Thomas Haller <thaller@redhat.com>
-Date: Mon, 29 Jun 2020 09:52:18 +0200
-Subject: [PATCH 1/1] cloud-setup: fix allocating buffer for
- GetConfigMetadataMac in _get_config_metadata_ready_check()
-
-It's not a severe issue, because the GetConfigMetadataData struct is
-larger than GetConfigMetadataMac.
-
-Fixes: 69f048bf0ca3 ('cloud-setup: add tool for automatic IP configuration in cloud')
-(cherry picked from commit 460afe6d502f2a8f158739c176302fd7fa072913)
-(cherry picked from commit 181fd5c611e070c0563ec2659c8642ffe567e738)
----
- clients/cloud-setup/nmcs-provider-ec2.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/clients/cloud-setup/nmcs-provider-ec2.c b/clients/cloud-setup/nmcs-provider-ec2.c
-index c8db31f97f67..3b5f6d36a82e 100644
---- a/clients/cloud-setup/nmcs-provider-ec2.c
-+++ b/clients/cloud-setup/nmcs-provider-ec2.c
-@@ -487,7 +487,7 @@ _get_config_metadata_ready_check (long response_code,
- if (!response_parsed)
- response_parsed = g_hash_table_new_full (nm_str_hash, g_str_equal, g_free, g_free);
-
-- mac_data = g_malloc (sizeof (GetConfigMetadataData) + 1 + p_start_l);
-+ mac_data = g_malloc (sizeof (GetConfigMetadataMac) + 1 + p_start_l);
- mac_data->iface_idx = iface_idx_counter++;
- memcpy (mac_data->path, p_start, p_start_l);
- mac_data->path[p_start_l] = '\0';
---
-2.26.2
-
diff --git a/SOURCES/1010-shared-extend-NM_IN_STRSET-and-NM_IN_SET-rh1847814.patch b/SOURCES/1010-shared-extend-NM_IN_STRSET-and-NM_IN_SET-rh1847814.patch
deleted file mode 100644
index 7198d00..0000000
--- a/SOURCES/1010-shared-extend-NM_IN_STRSET-and-NM_IN_SET-rh1847814.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 4468cfce13bdbc0ac865ee59722ed0e4f1b537a1 Mon Sep 17 00:00:00 2001
-From: Antonio Cardace <acardace@redhat.com>
-Date: Tue, 4 Aug 2020 18:36:39 +0200
-Subject: [PATCH] shared: extend NM_IN_STRSET and NM_IN_SET to support up to 20
- args
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1847814
-(cherry picked from commit 2e70391033b5b3414491edcd8656499512342619)
-(cherry picked from commit 908d1f6cb79739f3307bfcfd64b338e215f9e4a6)
----
- shared/nm-glib-aux/nm-macros-internal.h | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/shared/nm-glib-aux/nm-macros-internal.h b/shared/nm-glib-aux/nm-macros-internal.h
-index f56ed8569..15bcd7e58 100644
---- a/shared/nm-glib-aux/nm-macros-internal.h
-+++ b/shared/nm-glib-aux/nm-macros-internal.h
-@@ -732,6 +732,10 @@ NM_G_ERROR_MSG (GError *error)
- #define _NM_IN_SET_EVAL_14(op, _x, y, ...) (_x == (y)) op _NM_IN_SET_EVAL_13 (op, _x, __VA_ARGS__)
- #define _NM_IN_SET_EVAL_15(op, _x, y, ...) (_x == (y)) op _NM_IN_SET_EVAL_14 (op, _x, __VA_ARGS__)
- #define _NM_IN_SET_EVAL_16(op, _x, y, ...) (_x == (y)) op _NM_IN_SET_EVAL_15 (op, _x, __VA_ARGS__)
-+#define _NM_IN_SET_EVAL_17(op, _x, y, ...) (_x == (y)) op _NM_IN_SET_EVAL_16 (op, _x, __VA_ARGS__)
-+#define _NM_IN_SET_EVAL_18(op, _x, y, ...) (_x == (y)) op _NM_IN_SET_EVAL_17 (op, _x, __VA_ARGS__)
-+#define _NM_IN_SET_EVAL_19(op, _x, y, ...) (_x == (y)) op _NM_IN_SET_EVAL_18 (op, _x, __VA_ARGS__)
-+#define _NM_IN_SET_EVAL_20(op, _x, y, ...) (_x == (y)) op _NM_IN_SET_EVAL_19 (op, _x, __VA_ARGS__)
-
- #define _NM_IN_SET_EVAL_N2(op, _x, n, ...) (_NM_IN_SET_EVAL_##n(op, _x, __VA_ARGS__))
- #define _NM_IN_SET_EVAL_N(op, type, x, n, ...) \
-@@ -798,6 +802,10 @@ _NM_IN_STRSET_streq (const char *x, const char *s)
- #define _NM_IN_STRSET_EVAL_14(op, _x, y, ...) _NM_IN_STRSET_streq (_x, y) op _NM_IN_STRSET_EVAL_13 (op, _x, __VA_ARGS__)
- #define _NM_IN_STRSET_EVAL_15(op, _x, y, ...) _NM_IN_STRSET_streq (_x, y) op _NM_IN_STRSET_EVAL_14 (op, _x, __VA_ARGS__)
- #define _NM_IN_STRSET_EVAL_16(op, _x, y, ...) _NM_IN_STRSET_streq (_x, y) op _NM_IN_STRSET_EVAL_15 (op, _x, __VA_ARGS__)
-+#define _NM_IN_STRSET_EVAL_17(op, _x, y, ...) _NM_IN_STRSET_streq (_x, y) op _NM_IN_STRSET_EVAL_16 (op, _x, __VA_ARGS__)
-+#define _NM_IN_STRSET_EVAL_18(op, _x, y, ...) _NM_IN_STRSET_streq (_x, y) op _NM_IN_STRSET_EVAL_17 (op, _x, __VA_ARGS__)
-+#define _NM_IN_STRSET_EVAL_19(op, _x, y, ...) _NM_IN_STRSET_streq (_x, y) op _NM_IN_STRSET_EVAL_18 (op, _x, __VA_ARGS__)
-+#define _NM_IN_STRSET_EVAL_20(op, _x, y, ...) _NM_IN_STRSET_streq (_x, y) op _NM_IN_STRSET_EVAL_19 (op, _x, __VA_ARGS__)
-
- #define _NM_IN_STRSET_EVAL_N2(op, _x, n, ...) (_NM_IN_STRSET_EVAL_##n(op, _x, __VA_ARGS__))
- #define _NM_IN_STRSET_EVAL_N(op, x, n, ...) \
---
-2.26.2
-
diff --git a/SOURCES/1011-bond-fix-can_reapply_change-rh1847814.patch b/SOURCES/1011-bond-fix-can_reapply_change-rh1847814.patch
deleted file mode 100644
index b047183..0000000
--- a/SOURCES/1011-bond-fix-can_reapply_change-rh1847814.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 957e8465acdb9aaca0fbc797ac6df1efc2270f57 Mon Sep 17 00:00:00 2001
-From: Antonio Cardace <acardace@redhat.com>
-Date: Tue, 4 Aug 2020 18:19:47 +0200
-Subject: [PATCH] bond: fix can_reapply_change() false positives
-
-can_reapply_change() would wrongly return true for
-unsupported reapply values because it used 'nm_setting_bond_get_option_default()'
-that is ill-named because it returns the overriden option other than
-its default value.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1847814
-
-Fixes: 9bd07336ef16 ('bond: bond options logic rework')
-(cherry picked from commit 04d6ca1fb8bdbfffd70a257424f9e8c29fcb8037)
-(cherry picked from commit 63b5274dda0c52148ec8e8ca41e94e47b1e7d653)
----
- src/devices/nm-device-bond.c | 31 +++++++------------------------
- 1 file changed, 7 insertions(+), 24 deletions(-)
-
-diff --git a/src/devices/nm-device-bond.c b/src/devices/nm-device-bond.c
-index e36eba61b..164f6aaa7 100644
---- a/src/devices/nm-device-bond.c
-+++ b/src/devices/nm-device-bond.c
-@@ -516,14 +516,12 @@ create_and_realize (NMDevice *device,
- static gboolean
- check_changed_options (NMSettingBond *s_a, NMSettingBond *s_b, GError **error)
- {
-- guint i, num;
-- const char *name = NULL, *value_a = NULL, *value_b = NULL;
-+ const char **option_list;
-
-- /* Check that options in @s_a have compatible changes in @s_b */
-+ option_list = nm_setting_bond_get_valid_options (NULL);
-
-- num = nm_setting_bond_get_num_options (s_a);
-- for (i = 0; i < num; i++) {
-- nm_setting_bond_get_option (s_a, i, &name, &value_a);
-+ for (; *option_list; ++option_list) {
-+ const char *name = *option_list;
-
- /* We support changes to these */
- if (NM_IN_STRSET (name,
-@@ -532,15 +530,9 @@ check_changed_options (NMSettingBond *s_a, NMSettingBond *s_b, GError **error)
- continue;
- }
-
-- /* Missing in @s_b, but has a default value in @s_a */
-- value_b = nm_setting_bond_get_option_by_name (s_b, name);
-- if ( !value_b
-- && nm_streq0 (value_a, nm_setting_bond_get_option_default (s_a, name))) {
-- continue;
-- }
--
- /* Reject any other changes */
-- if (!nm_streq0 (value_a, value_b)) {
-+ if (!nm_streq0 (nm_setting_bond_get_option_normalized (s_a, name),
-+ nm_setting_bond_get_option_normalized (s_b, name))) {
- g_set_error (error,
- NM_DEVICE_ERROR,
- NM_DEVICE_ERROR_INCOMPATIBLE_CONNECTION,
-@@ -562,7 +554,6 @@ can_reapply_change (NMDevice *device,
- GError **error)
- {
- NMDeviceClass *device_class;
-- NMSettingBond *s_bond_old, *s_bond_new;
-
- /* Only handle bond setting here, delegate other settings to parent class */
- if (nm_streq (setting_name, NM_SETTING_BOND_SETTING_NAME)) {
-@@ -572,15 +563,7 @@ can_reapply_change (NMDevice *device,
- NM_SETTING_BOND_OPTIONS))
- return FALSE;
-
-- s_bond_old = NM_SETTING_BOND (s_old);
-- s_bond_new = NM_SETTING_BOND (s_new);
--
-- if ( !check_changed_options (s_bond_old, s_bond_new, error)
-- || !check_changed_options (s_bond_new, s_bond_old, error)) {
-- return FALSE;
-- }
--
-- return TRUE;
-+ return check_changed_options (NM_SETTING_BOND (s_old), NM_SETTING_BOND (s_new), error);
- }
-
- device_class = NM_DEVICE_CLASS (nm_device_bond_parent_class);
---
-2.26.2
-
diff --git a/SOURCES/1012-bond-let-reapply-reapply-rh1847814.patch b/SOURCES/1012-bond-let-reapply-reapply-rh1847814.patch
deleted file mode 100644
index 32185a6..0000000
--- a/SOURCES/1012-bond-let-reapply-reapply-rh1847814.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-From ff509fd95afb6f5d183eeafcc1ef467d8102181f Mon Sep 17 00:00:00 2001
-From: Antonio Cardace <acardace@redhat.com>
-Date: Tue, 4 Aug 2020 17:49:04 +0200
-Subject: [PATCH] bond: let 'reapply()' reapply all supported options
-
-Reapply now handles all the options supported by kernel and NM, meaning
-that some options are simply not allowed to be set while keeping the
-bond up, one of those options is the mode for instance.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1847814
-(cherry picked from commit 746dc119a6bceb6a08b4dc9f3798d0b59a4b8575)
-(cherry picked from commit 88a399637a5279f43fd8fc7c511547fa1d179295)
----
- src/devices/nm-device-bond.c | 141 +++++++++++++++++++++++++----------
- 1 file changed, 101 insertions(+), 40 deletions(-)
-
-diff --git a/src/devices/nm-device-bond.c b/src/devices/nm-device-bond.c
-index 164f6aaa7..71332ba39 100644
---- a/src/devices/nm-device-bond.c
-+++ b/src/devices/nm-device-bond.c
-@@ -183,7 +183,6 @@ master_update_slave_connection (NMDevice *self,
-
- static void
- set_arp_targets (NMDevice *device,
-- NMBondMode mode,
- const char *cur_arp_ip_target,
- const char *new_arp_ip_target)
- {
-@@ -296,15 +295,39 @@ set_bond_attr_active_slave (NMDevice *device, NMSettingBond *s_bond)
- _set_bond_attr (device, NM_SETTING_BOND_OPTION_ACTIVE_SLAVE, value);
- }
-
-+static void
-+set_bond_attrs_or_default (NMDevice *device, NMSettingBond *s_bond, const char *const *attr_v)
-+{
-+ nm_assert (NM_IS_DEVICE (device));
-+ nm_assert (s_bond);
-+ nm_assert (attr_v);
-+
-+ for ( ; *attr_v ; ++attr_v)
-+ set_bond_attr_or_default (device, s_bond, *attr_v);
-+}
-+
-+static void
-+set_bond_arp_ip_targets (NMDevice *device, NMSettingBond *s_bond)
-+{
-+ int ifindex = nm_device_get_ifindex (device);
-+ gs_free char *cur_arp_ip_target = NULL;
-+
-+ /* ARP targets: clear and initialize the list */
-+ cur_arp_ip_target = nm_platform_sysctl_master_get_option (nm_device_get_platform (device),
-+ ifindex,
-+ NM_SETTING_BOND_OPTION_ARP_IP_TARGET);
-+ set_arp_targets (device,
-+ cur_arp_ip_target,
-+ nm_setting_bond_get_option_or_default (s_bond, NM_SETTING_BOND_OPTION_ARP_IP_TARGET));
-+}
-+
- static gboolean
- apply_bonding_config (NMDeviceBond *self)
- {
- NMDevice *device = NM_DEVICE (self);
-- int ifindex = nm_device_get_ifindex (device);
- NMSettingBond *s_bond;
- NMBondMode mode;
- const char *mode_str;
-- gs_free char *cur_arp_ip_target = NULL;
-
- s_bond = nm_device_get_applied_setting (device, NM_TYPE_SETTING_BOND);
- g_return_val_if_fail (s_bond, FALSE);
-@@ -318,40 +341,34 @@ apply_bonding_config (NMDeviceBond *self)
- */
- set_bond_attr_or_default (device, s_bond, NM_SETTING_BOND_OPTION_MODE);
-
-- set_bond_attr_or_default (device, s_bond, NM_SETTING_BOND_OPTION_MIIMON);
-- set_bond_attr_or_default (device, s_bond, NM_SETTING_BOND_OPTION_UPDELAY);
-- set_bond_attr_or_default (device, s_bond, NM_SETTING_BOND_OPTION_DOWNDELAY);
-- set_bond_attr_or_default (device, s_bond, NM_SETTING_BOND_OPTION_ARP_INTERVAL);
-- set_bond_attr_or_default (device, s_bond, NM_SETTING_BOND_OPTION_ARP_VALIDATE);
-- set_bond_attr_or_default (device, s_bond, NM_SETTING_BOND_OPTION_PRIMARY);
--
-- /* ARP targets: clear and initialize the list */
-- cur_arp_ip_target = nm_platform_sysctl_master_get_option (nm_device_get_platform (device),
-- ifindex,
-- NM_SETTING_BOND_OPTION_ARP_IP_TARGET);
-- set_arp_targets (device,
-- mode,
-- cur_arp_ip_target,
-- nm_setting_bond_get_option_or_default (s_bond, NM_SETTING_BOND_OPTION_ARP_IP_TARGET));
--
-- set_bond_attr_or_default (device, s_bond, NM_SETTING_BOND_OPTION_AD_ACTOR_SYSTEM);
-+ set_bond_arp_ip_targets (device, s_bond);
- set_bond_attr_active_slave (device, s_bond);
-- set_bond_attr_or_default (device, s_bond, NM_SETTING_BOND_OPTION_AD_ACTOR_SYS_PRIO);
-- set_bond_attr_or_default (device, s_bond, NM_SETTING_BOND_OPTION_AD_SELECT);
-- set_bond_attr_or_default (device, s_bond, NM_SETTING_BOND_OPTION_AD_USER_PORT_KEY);
-- set_bond_attr_or_default (device, s_bond, NM_SETTING_BOND_OPTION_ALL_SLAVES_ACTIVE);
-- set_bond_attr_or_default (device, s_bond, NM_SETTING_BOND_OPTION_ARP_ALL_TARGETS);
-- set_bond_attr_or_default (device, s_bond, NM_SETTING_BOND_OPTION_FAIL_OVER_MAC);
-- set_bond_attr_or_default (device, s_bond, NM_SETTING_BOND_OPTION_LACP_RATE);
-- set_bond_attr_or_default (device, s_bond, NM_SETTING_BOND_OPTION_LP_INTERVAL);
-- set_bond_attr_or_default (device, s_bond, NM_SETTING_BOND_OPTION_MIN_LINKS);
-- set_bond_attr_or_default (device, s_bond, NM_SETTING_BOND_OPTION_PACKETS_PER_SLAVE);
-- set_bond_attr_or_default (device, s_bond, NM_SETTING_BOND_OPTION_PRIMARY_RESELECT);
-- set_bond_attr_or_default (device, s_bond, NM_SETTING_BOND_OPTION_RESEND_IGMP);
-- set_bond_attr_or_default (device, s_bond, NM_SETTING_BOND_OPTION_TLB_DYNAMIC_LB);
-- set_bond_attr_or_default (device, s_bond, NM_SETTING_BOND_OPTION_USE_CARRIER);
-- set_bond_attr_or_default (device, s_bond, NM_SETTING_BOND_OPTION_XMIT_HASH_POLICY);
-- set_bond_attr_or_default (device, s_bond, NM_SETTING_BOND_OPTION_NUM_GRAT_ARP);
-+
-+ set_bond_attrs_or_default (device,
-+ s_bond,
-+ NM_MAKE_STRV (NM_SETTING_BOND_OPTION_MIIMON,
-+ NM_SETTING_BOND_OPTION_UPDELAY,
-+ NM_SETTING_BOND_OPTION_DOWNDELAY,
-+ NM_SETTING_BOND_OPTION_ARP_INTERVAL,
-+ NM_SETTING_BOND_OPTION_ARP_VALIDATE,
-+ NM_SETTING_BOND_OPTION_PRIMARY,
-+ NM_SETTING_BOND_OPTION_AD_ACTOR_SYSTEM,
-+ NM_SETTING_BOND_OPTION_AD_ACTOR_SYS_PRIO,
-+ NM_SETTING_BOND_OPTION_AD_SELECT,
-+ NM_SETTING_BOND_OPTION_AD_USER_PORT_KEY,
-+ NM_SETTING_BOND_OPTION_ALL_SLAVES_ACTIVE,
-+ NM_SETTING_BOND_OPTION_ARP_ALL_TARGETS,
-+ NM_SETTING_BOND_OPTION_FAIL_OVER_MAC,
-+ NM_SETTING_BOND_OPTION_LACP_RATE,
-+ NM_SETTING_BOND_OPTION_LP_INTERVAL,
-+ NM_SETTING_BOND_OPTION_MIN_LINKS,
-+ NM_SETTING_BOND_OPTION_PACKETS_PER_SLAVE,
-+ NM_SETTING_BOND_OPTION_PRIMARY_RESELECT,
-+ NM_SETTING_BOND_OPTION_RESEND_IGMP,
-+ NM_SETTING_BOND_OPTION_TLB_DYNAMIC_LB,
-+ NM_SETTING_BOND_OPTION_USE_CARRIER,
-+ NM_SETTING_BOND_OPTION_XMIT_HASH_POLICY,
-+ NM_SETTING_BOND_OPTION_NUM_GRAT_ARP));
- return TRUE;
- }
-
-@@ -525,8 +542,26 @@ check_changed_options (NMSettingBond *s_a, NMSettingBond *s_b, GError **error)
-
- /* We support changes to these */
- if (NM_IN_STRSET (name,
-- NM_SETTING_BOND_OPTION_ACTIVE_SLAVE,
-- NM_SETTING_BOND_OPTION_PRIMARY)) {
-+ NM_SETTING_BOND_OPTION_PRIMARY,
-+ NM_SETTING_BOND_OPTION_MIIMON,
-+ NM_SETTING_BOND_OPTION_UPDELAY,
-+ NM_SETTING_BOND_OPTION_DOWNDELAY,
-+ NM_SETTING_BOND_OPTION_ARP_INTERVAL,
-+ NM_SETTING_BOND_OPTION_ARP_VALIDATE,
-+ NM_SETTING_BOND_OPTION_PRIMARY,
-+ NM_SETTING_BOND_OPTION_AD_ACTOR_SYSTEM,
-+ NM_SETTING_BOND_OPTION_AD_ACTOR_SYS_PRIO,
-+ NM_SETTING_BOND_OPTION_ALL_SLAVES_ACTIVE,
-+ NM_SETTING_BOND_OPTION_ARP_ALL_TARGETS,
-+ NM_SETTING_BOND_OPTION_FAIL_OVER_MAC,
-+ NM_SETTING_BOND_OPTION_LP_INTERVAL,
-+ NM_SETTING_BOND_OPTION_MIN_LINKS,
-+ NM_SETTING_BOND_OPTION_PACKETS_PER_SLAVE,
-+ NM_SETTING_BOND_OPTION_PRIMARY_RESELECT,
-+ NM_SETTING_BOND_OPTION_RESEND_IGMP,
-+ NM_SETTING_BOND_OPTION_USE_CARRIER,
-+ NM_SETTING_BOND_OPTION_XMIT_HASH_POLICY,
-+ NM_SETTING_BOND_OPTION_NUM_GRAT_ARP)) {
- continue;
- }
-
-@@ -579,8 +614,8 @@ static void
- reapply_connection (NMDevice *device, NMConnection *con_old, NMConnection *con_new)
- {
- NMDeviceBond *self = NM_DEVICE_BOND (device);
-- const char *value;
- NMSettingBond *s_bond;
-+ const char *value;
- NMBondMode mode;
-
- NM_DEVICE_CLASS (nm_device_bond_parent_class)->reapply_connection (device,
-@@ -595,8 +630,34 @@ reapply_connection (NMDevice *device, NMConnection *con_old, NMConnection *con_n
- mode = _nm_setting_bond_mode_from_string (value);
- g_return_if_fail (mode != NM_BOND_MODE_UNKNOWN);
-
-- set_bond_attr_or_default (device, s_bond, NM_SETTING_BOND_OPTION_PRIMARY);
-+ /* Below we set only the bond options that kernel allows to modify
-+ * while keeping the bond interface up */
-+
- set_bond_attr_active_slave (device, s_bond);
-+ set_bond_arp_ip_targets (device, s_bond);
-+
-+ set_bond_attrs_or_default (device,
-+ s_bond,
-+ NM_MAKE_STRV (NM_SETTING_BOND_OPTION_PRIMARY,
-+ NM_SETTING_BOND_OPTION_MIIMON,
-+ NM_SETTING_BOND_OPTION_UPDELAY,
-+ NM_SETTING_BOND_OPTION_DOWNDELAY,
-+ NM_SETTING_BOND_OPTION_ARP_INTERVAL,
-+ NM_SETTING_BOND_OPTION_ARP_VALIDATE,
-+ NM_SETTING_BOND_OPTION_PRIMARY,
-+ NM_SETTING_BOND_OPTION_AD_ACTOR_SYSTEM,
-+ NM_SETTING_BOND_OPTION_AD_ACTOR_SYS_PRIO,
-+ NM_SETTING_BOND_OPTION_ALL_SLAVES_ACTIVE,
-+ NM_SETTING_BOND_OPTION_ARP_ALL_TARGETS,
-+ NM_SETTING_BOND_OPTION_FAIL_OVER_MAC,
-+ NM_SETTING_BOND_OPTION_LP_INTERVAL,
-+ NM_SETTING_BOND_OPTION_MIN_LINKS,
-+ NM_SETTING_BOND_OPTION_PACKETS_PER_SLAVE,
-+ NM_SETTING_BOND_OPTION_PRIMARY_RESELECT,
-+ NM_SETTING_BOND_OPTION_RESEND_IGMP,
-+ NM_SETTING_BOND_OPTION_USE_CARRIER,
-+ NM_SETTING_BOND_OPTION_XMIT_HASH_POLICY,
-+ NM_SETTING_BOND_OPTION_NUM_GRAT_ARP));
- }
-
- /*****************************************************************************/
---
-2.26.2
-
diff --git a/SOURCES/1013-dhcp6-hostname-rh1858344.patch b/SOURCES/1013-dhcp6-hostname-rh1858344.patch
deleted file mode 100644
index 9b345b7..0000000
--- a/SOURCES/1013-dhcp6-hostname-rh1858344.patch
+++ /dev/null
@@ -1,444 +0,0 @@
-From 40422ede3f44f4018377a81db1056fb3439107b2 Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Wed, 22 Jul 2020 05:03:47 +0200
-Subject: [PATCH 1/4] systemd: dhcp6: remove assertions in
- dhcp6_option_parse_domainname()
-
-Assertions are for programming errors; here the input comes directly
-from the DHCP response packet.
-
-https://github.com/systemd/systemd/commit/af710b535b4ceacd0aecec6748a4f8ee57742e99
-(cherry picked from commit e2248143af0d4ec61e571c4f358d5d7f1044289c)
----
- src/systemd/src/libsystemd-network/dhcp6-option.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/systemd/src/libsystemd-network/dhcp6-option.c b/src/systemd/src/libsystemd-network/dhcp6-option.c
-index d596752b3b91..717fcdffb815 100644
---- a/src/systemd/src/libsystemd-network/dhcp6-option.c
-+++ b/src/systemd/src/libsystemd-network/dhcp6-option.c
-@@ -649,8 +649,10 @@ int dhcp6_option_parse_domainname(const uint8_t *optval, uint16_t optlen, char *
- _cleanup_strv_free_ char **names = NULL;
- int r;
-
-- assert_return(optlen > 1, -ENODATA);
-- assert_return(optval[optlen - 1] == '\0', -EINVAL);
-+ if (optlen <= 1)
-+ return -ENODATA;
-+ if (optval[optlen - 1] != '\0')
-+ return -EINVAL;
-
- while (pos < optlen) {
- _cleanup_free_ char *ret = NULL;
---
-2.26.2
-
-
-From ab72f05d16d641bccaa1b4870bfb91c03661f1c5 Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Thu, 6 Aug 2020 10:49:07 +0200
-Subject: [PATCH 2/4] systemd: dhcp6: parse the FQDN option
-
-Parse option 39 (Client Fully Qualified Domain Name, RFC 4704) from the DHCP
-reply, which specifies the FQDN assigned by the server to the client.
-
-https://github.com/systemd/systemd/commit/c43eea9f2effbb066901a61eafef473558d37b0f
-(cherry picked from commit 813fb7d64ee4cb0f935a3a15b9f5b8f5771655da)
----
- .../src/libsystemd-network/dhcp6-internal.h | 5 +-
- .../libsystemd-network/dhcp6-lease-internal.h | 2 +
- .../src/libsystemd-network/dhcp6-option.c | 118 ++++++++++++------
- .../src/libsystemd-network/sd-dhcp6-client.c | 7 ++
- .../src/libsystemd-network/sd-dhcp6-lease.c | 39 +++++-
- src/systemd/src/systemd/sd-dhcp6-lease.h | 1 +
- 6 files changed, 129 insertions(+), 43 deletions(-)
-
-diff --git a/src/systemd/src/libsystemd-network/dhcp6-internal.h b/src/systemd/src/libsystemd-network/dhcp6-internal.h
-index b0d1216eed84..068dcade0583 100644
---- a/src/systemd/src/libsystemd-network/dhcp6-internal.h
-+++ b/src/systemd/src/libsystemd-network/dhcp6-internal.h
-@@ -109,8 +109,9 @@ int dhcp6_option_parse_ia(DHCP6Option *iaoption, DHCP6IA *ia, uint16_t *ret_stat
- int dhcp6_option_parse_ip6addrs(uint8_t *optval, uint16_t optlen,
- struct in6_addr **addrs, size_t count,
- size_t *allocated);
--int dhcp6_option_parse_domainname(const uint8_t *optval, uint16_t optlen,
-- char ***str_arr);
-+int dhcp6_option_parse_domainname_list(const uint8_t *optval, uint16_t optlen,
-+ char ***str_arr);
-+int dhcp6_option_parse_domainname(const uint8_t *optval, uint16_t optlen, char **str);
-
- int dhcp6_network_bind_udp_socket(int index, struct in6_addr *address);
- int dhcp6_network_send_udp_socket(int s, struct in6_addr *address,
-diff --git a/src/systemd/src/libsystemd-network/dhcp6-lease-internal.h b/src/systemd/src/libsystemd-network/dhcp6-lease-internal.h
-index e004f48b4e24..df6c95e0b360 100644
---- a/src/systemd/src/libsystemd-network/dhcp6-lease-internal.h
-+++ b/src/systemd/src/libsystemd-network/dhcp6-lease-internal.h
-@@ -35,6 +35,7 @@ struct sd_dhcp6_lease {
- size_t ntp_allocated;
- char **ntp_fqdn;
- size_t ntp_fqdn_count;
-+ char *fqdn;
- };
-
- int dhcp6_lease_ia_rebind_expire(const DHCP6IA *ia, uint32_t *expire);
-@@ -57,5 +58,6 @@ int dhcp6_lease_set_domains(sd_dhcp6_lease *lease, uint8_t *optval,
- int dhcp6_lease_set_ntp(sd_dhcp6_lease *lease, uint8_t *optval, size_t optlen);
- int dhcp6_lease_set_sntp(sd_dhcp6_lease *lease, uint8_t *optval,
- size_t optlen) ;
-+int dhcp6_lease_set_fqdn(sd_dhcp6_lease *lease, const uint8_t *optval, size_t optlen);
-
- int dhcp6_lease_new(sd_dhcp6_lease **ret);
-diff --git a/src/systemd/src/libsystemd-network/dhcp6-option.c b/src/systemd/src/libsystemd-network/dhcp6-option.c
-index 717fcdffb815..a6dad9340643 100644
---- a/src/systemd/src/libsystemd-network/dhcp6-option.c
-+++ b/src/systemd/src/libsystemd-network/dhcp6-option.c
-@@ -644,61 +644,103 @@ int dhcp6_option_parse_ip6addrs(uint8_t *optval, uint16_t optlen,
- return count;
- }
-
--int dhcp6_option_parse_domainname(const uint8_t *optval, uint16_t optlen, char ***str_arr) {
-- size_t pos = 0, idx = 0;
-- _cleanup_strv_free_ char **names = NULL;
-+static int parse_domain(const uint8_t **data, uint16_t *len, char **out_domain) {
-+ _cleanup_free_ char *ret = NULL;
-+ size_t n = 0, allocated = 0;
-+ const uint8_t *optval = *data;
-+ uint16_t optlen = *len;
-+ bool first = true;
- int r;
-
- if (optlen <= 1)
- return -ENODATA;
-- if (optval[optlen - 1] != '\0')
-- return -EINVAL;
-
-- while (pos < optlen) {
-- _cleanup_free_ char *ret = NULL;
-- size_t n = 0, allocated = 0;
-- bool first = true;
--
-- for (;;) {
-- const char *label;
-- uint8_t c;
-+ for (;;) {
-+ const char *label;
-+ uint8_t c;
-
-- c = optval[pos++];
-+ if (optlen == 0)
-+ break;
-
-- if (c == 0)
-- /* End of name */
-- break;
-- if (c > 63)
-- return -EBADMSG;
-+ c = *optval;
-+ optval++;
-+ optlen--;
-
-- /* Literal label */
-- label = (const char *)&optval[pos];
-- pos += c;
-- if (pos >= optlen)
-- return -EMSGSIZE;
-+ if (c == 0)
-+ /* End label */
-+ break;
-+ if (c > 63)
-+ return -EBADMSG;
-+ if (c > optlen)
-+ return -EMSGSIZE;
-
-- if (!GREEDY_REALLOC(ret, allocated, n + !first + DNS_LABEL_ESCAPED_MAX))
-- return -ENOMEM;
-+ /* Literal label */
-+ label = (const char *)optval;
-+ optval += c;
-+ optlen -= c;
-
-- if (first)
-- first = false;
-- else
-- ret[n++] = '.';
-+ if (!GREEDY_REALLOC(ret, allocated, n + !first + DNS_LABEL_ESCAPED_MAX))
-+ return -ENOMEM;
-
-- r = dns_label_escape(label, c, ret + n, DNS_LABEL_ESCAPED_MAX);
-- if (r < 0)
-- return r;
-+ if (first)
-+ first = false;
-+ else
-+ ret[n++] = '.';
-
-- n += r;
-- }
-+ r = dns_label_escape(label, c, ret + n, DNS_LABEL_ESCAPED_MAX);
-+ if (r < 0)
-+ return r;
-
-- if (n == 0)
-- continue;
-+ n += r;
-+ }
-
-+ if (n) {
- if (!GREEDY_REALLOC(ret, allocated, n + 1))
- return -ENOMEM;
--
- ret[n] = 0;
-+ }
-+
-+ *out_domain = TAKE_PTR(ret);
-+ *data = optval;
-+ *len = optlen;
-+
-+ return n;
-+}
-+
-+int dhcp6_option_parse_domainname(const uint8_t *optval, uint16_t optlen, char **str) {
-+ _cleanup_free_ char *domain = NULL;
-+ int r;
-+
-+ r = parse_domain(&optval, &optlen, &domain);
-+ if (r < 0)
-+ return r;
-+ if (r == 0)
-+ return -ENODATA;
-+ if (optlen != 0)
-+ return -EINVAL;
-+
-+ *str = TAKE_PTR(domain);
-+ return 0;
-+}
-+
-+int dhcp6_option_parse_domainname_list(const uint8_t *optval, uint16_t optlen, char ***str_arr) {
-+ size_t idx = 0;
-+ _cleanup_strv_free_ char **names = NULL;
-+ int r;
-+
-+ if (optlen <= 1)
-+ return -ENODATA;
-+ if (optval[optlen - 1] != '\0')
-+ return -EINVAL;
-+
-+ while (optlen > 0) {
-+ _cleanup_free_ char *ret = NULL;
-+
-+ r = parse_domain(&optval, &optlen, &ret);
-+ if (r < 0)
-+ return r;
-+ if (r == 0)
-+ continue;
-
- r = strv_extend(&names, ret);
- if (r < 0)
-diff --git a/src/systemd/src/libsystemd-network/sd-dhcp6-client.c b/src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-index d653b2571c00..b80e4e5406d9 100644
---- a/src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-+++ b/src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-@@ -1288,6 +1288,13 @@ static int client_parse_message(
-
- break;
-
-+ case SD_DHCP6_OPTION_FQDN:
-+ r = dhcp6_lease_set_fqdn(lease, optval, optlen);
-+ if (r < 0)
-+ return r;
-+
-+ break;
-+
- case SD_DHCP6_OPTION_INFORMATION_REFRESH_TIME:
- if (optlen != 4)
- return -EINVAL;
-diff --git a/src/systemd/src/libsystemd-network/sd-dhcp6-lease.c b/src/systemd/src/libsystemd-network/sd-dhcp6-lease.c
-index b6dc02791504..5f5a7fe616fa 100644
---- a/src/systemd/src/libsystemd-network/sd-dhcp6-lease.c
-+++ b/src/systemd/src/libsystemd-network/sd-dhcp6-lease.c
-@@ -238,7 +238,7 @@ int dhcp6_lease_set_domains(sd_dhcp6_lease *lease, uint8_t *optval,
- if (!optlen)
- return 0;
-
-- r = dhcp6_option_parse_domainname(optval, optlen, &domains);
-+ r = dhcp6_option_parse_domainname_list(optval, optlen, &domains);
- if (r < 0)
- return 0;
-
-@@ -296,8 +296,8 @@ int dhcp6_lease_set_ntp(sd_dhcp6_lease *lease, uint8_t *optval, size_t optlen) {
- break;
-
- case DHCP6_NTP_SUBOPTION_SRV_FQDN:
-- r = dhcp6_option_parse_domainname(subval, sublen,
-- &servers);
-+ r = dhcp6_option_parse_domainname_list(subval, sublen,
-+ &servers);
- if (r < 0)
- return 0;
-
-@@ -367,6 +367,38 @@ int sd_dhcp6_lease_get_ntp_fqdn(sd_dhcp6_lease *lease, char ***ntp_fqdn) {
- return -ENOENT;
- }
-
-+int dhcp6_lease_set_fqdn(sd_dhcp6_lease *lease, const uint8_t *optval,
-+ size_t optlen) {
-+ int r;
-+ char *fqdn;
-+
-+ assert_return(lease, -EINVAL);
-+ assert_return(optval, -EINVAL);
-+
-+ if (optlen < 2)
-+ return -ENODATA;
-+
-+ /* Ignore the flags field, it doesn't carry any useful
-+ information for clients. */
-+ r = dhcp6_option_parse_domainname(optval + 1, optlen - 1, &fqdn);
-+ if (r < 0)
-+ return r;
-+
-+ return free_and_replace(lease->fqdn, fqdn);
-+}
-+
-+int sd_dhcp6_lease_get_fqdn(sd_dhcp6_lease *lease, const char **fqdn) {
-+ assert_return(lease, -EINVAL);
-+ assert_return(fqdn, -EINVAL);
-+
-+ if (lease->fqdn) {
-+ *fqdn = lease->fqdn;
-+ return 0;
-+ }
-+
-+ return -ENOENT;
-+}
-+
- static sd_dhcp6_lease *dhcp6_lease_free(sd_dhcp6_lease *lease) {
- assert(lease);
-
-@@ -375,6 +407,7 @@ static sd_dhcp6_lease *dhcp6_lease_free(sd_dhcp6_lease *lease) {
- dhcp6_lease_free_ia(&lease->pd);
-
- free(lease->dns);
-+ free(lease->fqdn);
-
- lease->domains = strv_free(lease->domains);
-
-diff --git a/src/systemd/src/systemd/sd-dhcp6-lease.h b/src/systemd/src/systemd/sd-dhcp6-lease.h
-index 4301c6db878b..240df74af8c5 100644
---- a/src/systemd/src/systemd/sd-dhcp6-lease.h
-+++ b/src/systemd/src/systemd/sd-dhcp6-lease.h
-@@ -43,6 +43,7 @@ int sd_dhcp6_lease_get_dns(sd_dhcp6_lease *lease, const struct in6_addr **addrs)
- int sd_dhcp6_lease_get_domains(sd_dhcp6_lease *lease, char ***domains);
- int sd_dhcp6_lease_get_ntp_addrs(sd_dhcp6_lease *lease, const struct in6_addr **addrs);
- int sd_dhcp6_lease_get_ntp_fqdn(sd_dhcp6_lease *lease, char ***ntp_fqdn);
-+int sd_dhcp6_lease_get_fqdn(sd_dhcp6_lease *lease, const char **fqdn);
-
- sd_dhcp6_lease *sd_dhcp6_lease_ref(sd_dhcp6_lease *lease);
- sd_dhcp6_lease *sd_dhcp6_lease_unref(sd_dhcp6_lease *lease);
---
-2.26.2
-
-
-From 98d88e272c9d49876ad2c2b1507a4fda9456531e Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Wed, 22 Jul 2020 13:56:39 +0200
-Subject: [PATCH 3/4] dhcp: export the DHCPv6 FQDN option
-
-The dhclient backend already exports all the option passed by
-dhclient, including the FDQN. Export it also for the systemd backend.
-
-(cherry picked from commit 1621a6ddb1b3f5c51ad774012150bd56cf65fcea)
-(cherry picked from commit c6a7618f2be4236997362db43cf44a3fdee2d9c9)
----
- src/dhcp/nm-dhcp-options.c | 1 +
- src/dhcp/nm-dhcp-options.h | 2 ++
- src/dhcp/nm-dhcp-systemd.c | 8 ++++++++
- 3 files changed, 11 insertions(+)
-
-diff --git a/src/dhcp/nm-dhcp-options.c b/src/dhcp/nm-dhcp-options.c
-index b10635fc674a..d902c77c8c21 100644
---- a/src/dhcp/nm-dhcp-options.c
-+++ b/src/dhcp/nm-dhcp-options.c
-@@ -183,6 +183,7 @@ const NMDhcpOption _nm_dhcp_option_dhcp6_options[] = {
- REQ (NM_DHCP_OPTION_DHCP6_DNS_SERVERS, "dhcp6_name_servers", TRUE ),
- REQ (NM_DHCP_OPTION_DHCP6_DOMAIN_LIST, "dhcp6_domain_search", TRUE ),
- REQ (NM_DHCP_OPTION_DHCP6_SNTP_SERVERS, "dhcp6_sntp_servers", TRUE ),
-+ REQ (NM_DHCP_OPTION_DHCP6_FQDN, "fqdn_fqdn", FALSE ),
- REQ (NM_DHCP_OPTION_DHCP6_MUD_URL, "dhcp6_mud_url", FALSE ),
-
- /* Internal values */
-diff --git a/src/dhcp/nm-dhcp-options.h b/src/dhcp/nm-dhcp-options.h
-index 7c0121702dad..bc3df5acd330 100644
---- a/src/dhcp/nm-dhcp-options.h
-+++ b/src/dhcp/nm-dhcp-options.h
-@@ -160,7 +160,9 @@ typedef enum {
- NM_DHCP_OPTION_DHCP6_DNS_SERVERS = 23,
- NM_DHCP_OPTION_DHCP6_DOMAIN_LIST = 24,
- NM_DHCP_OPTION_DHCP6_SNTP_SERVERS = 31,
-+ NM_DHCP_OPTION_DHCP6_FQDN = 39,
- NM_DHCP_OPTION_DHCP6_MUD_URL = 112,
-+
- /* Internal values */
- NM_DHCP_OPTION_DHCP6_NM_IP_ADDRESS = 1026,
- NM_DHCP_OPTION_DHCP6_NM_PREFIXLEN = 1027,
-diff --git a/src/dhcp/nm-dhcp-systemd.c b/src/dhcp/nm-dhcp-systemd.c
-index f65937d8e035..7ee101128b43 100644
---- a/src/dhcp/nm-dhcp-systemd.c
-+++ b/src/dhcp/nm-dhcp-systemd.c
-@@ -740,6 +740,7 @@ lease_to_ip6_config (NMDedupMultiIndex *multi_idx,
- uint32_t lft_pref, lft_valid;
- char addr_str[NM_UTILS_INET_ADDRSTRLEN];
- char **domains;
-+ const char *s;
- nm_auto_free_gstring GString *str = NULL;
- int num, i;
-
-@@ -808,6 +809,13 @@ lease_to_ip6_config (NMDedupMultiIndex *multi_idx,
- str->str);
- }
-
-+ if (sd_dhcp6_lease_get_fqdn (lease, &s) >= 0) {
-+ nm_dhcp_option_add_option (options,
-+ _nm_dhcp_option_dhcp6_options,
-+ NM_DHCP_OPTION_DHCP6_FQDN,
-+ s);
-+ }
-+
- NM_SET_OUT (out_options, g_steal_pointer (&options));
- return g_steal_pointer (&ip6_config);
- }
---
-2.26.2
-
-
-From bce988af55e0444a23a4c3881a075ff2387b798a Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Wed, 22 Jul 2020 13:49:42 +0200
-Subject: [PATCH 4/4] policy: get the DHCPv6 hostname from the FQDN option
-
-There isn't any 'host-name' option for DHCPv6. Read instead the
-'fqdn-fqdn' option that carries the FQDN assigned by the server to the
-client.
-
-(cherry picked from commit 1f74ea52f5818c6e7d5cacd1dffdb2e1f5ee1913)
-(cherry picked from commit 4e1da002a920888daf5bb3aa4bd21a2d61e3214b)
----
- src/nm-policy.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/nm-policy.c b/src/nm-policy.c
-index e571034bc345..04cbace6019a 100644
---- a/src/nm-policy.c
-+++ b/src/nm-policy.c
-@@ -764,7 +764,7 @@ update_system_hostname (NMPolicy *self, const char *msg)
- /* Grab a hostname out of the device's DHCP6 config */
- dhcp_config = nm_device_get_dhcp_config (get_default_device (self, AF_INET6), AF_INET6);
- if (dhcp_config) {
-- dhcp_hostname = nm_dhcp_config_get_option (dhcp_config, "host_name");
-+ dhcp_hostname = nm_dhcp_config_get_option (dhcp_config, "fqdn_fqdn");
- if (dhcp_hostname && dhcp_hostname[0]) {
- p = nm_str_skip_leading_spaces (dhcp_hostname);
- if (p[0]) {
---
-2.26.2
-
diff --git a/SOURCES/1014-settings-fix-wait-device-timeout-rh1853348.patch b/SOURCES/1014-settings-fix-wait-device-timeout-rh1853348.patch
deleted file mode 100644
index 8ac0a91..0000000
--- a/SOURCES/1014-settings-fix-wait-device-timeout-rh1853348.patch
+++ /dev/null
@@ -1,1277 +0,0 @@
-From 707e63e684e3cbd3dff986a26ca725329c5e70f5 Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Wed, 5 Aug 2020 13:26:34 +0200
-Subject: [PATCH 1/7] initrd: disable STP on bridges
-
-NM enables by default STP on bridges, which causes a forwarding delay
-of 15 seconds on boot. Disable it.
-
-(cherry picked from commit 0a006c04121a13221de585d3f778c5341f36b504)
-(cherry picked from commit e2830af77a981fef5b7ea7e54dc13de17231fee9)
----
- src/initrd/nmi-cmdline-reader.c | 12 +++++++++---
- src/initrd/tests/test-cmdline-reader.c | 1 +
- 2 files changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/src/initrd/nmi-cmdline-reader.c b/src/initrd/nmi-cmdline-reader.c
-index 17f9e1dfd2a9..8ba6dbb827b6 100644
---- a/src/initrd/nmi-cmdline-reader.c
-+++ b/src/initrd/nmi-cmdline-reader.c
-@@ -584,7 +584,6 @@ reader_parse_master (Reader *reader,
- {
- NMConnection *connection;
- NMSettingConnection *s_con;
-- NMSettingBond *s_bond;
- gs_free char *master_to_free = NULL;
- const char *master;
- char *slaves;
-@@ -603,8 +602,15 @@ reader_parse_master (Reader *reader,
- s_con = nm_connection_get_setting_connection (connection);
- master = nm_setting_connection_get_uuid (s_con);
-
-- if (nm_streq (type_name, NM_SETTING_BOND_SETTING_NAME)) {
-- s_bond = (NMSettingBond *)nm_connection_get_setting_by_name (connection, type_name);
-+ if (nm_streq (type_name, NM_SETTING_BRIDGE_SETTING_NAME)) {
-+ NMSettingBridge *s_bridge = nm_connection_get_setting_bridge (connection);
-+
-+ /* Avoid the forwarding delay */
-+ g_object_set (s_bridge,
-+ NM_SETTING_BRIDGE_STP, FALSE,
-+ NULL);
-+ } else if (nm_streq (type_name, NM_SETTING_BOND_SETTING_NAME)) {
-+ NMSettingBond *s_bond = nm_connection_get_setting_bond (connection);
-
- opts = get_word (&argument, ':');
- while (opts && *opts) {
-diff --git a/src/initrd/tests/test-cmdline-reader.c b/src/initrd/tests/test-cmdline-reader.c
-index 04594c48bee6..074654d347d8 100644
---- a/src/initrd/tests/test-cmdline-reader.c
-+++ b/src/initrd/tests/test-cmdline-reader.c
-@@ -774,6 +774,7 @@ test_bridge (void)
-
- s_bridge = nm_connection_get_setting_bridge (connection);
- g_assert (s_bridge);
-+ g_assert_cmpint (nm_setting_bridge_get_stp (s_bridge), ==, FALSE);
-
- connection = g_hash_table_lookup (connections, "eth0");
- g_assert (connection);
---
-2.26.2
-
-
-From 43d1669601cc106e354bbbb1fc94240a0275c9e9 Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Wed, 5 Aug 2020 16:57:41 +0200
-Subject: [PATCH 2/7] initrd: wait for bootdev or all devices if rd.neednet=1
-
-The network-legacy dracut module waits for all ethernet devices if the
-command line contains rd.neednet=1. It also waits for the device
-specified by 'bootdev='.
-
-Do the same.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1853348
-(cherry picked from commit f114e16fddf854d72a8b08318359569cd83245e3)
-(cherry picked from commit 98ccd2a10e89d6d251a519eb63d085b2f327bad8)
----
- src/initrd/nm-initrd-generator.h | 2 +
- src/initrd/nmi-cmdline-reader.c | 35 +++++++++++--
- src/initrd/tests/test-cmdline-reader.c | 70 ++++++++++++++++++++++++++
- 3 files changed, 104 insertions(+), 3 deletions(-)
-
-diff --git a/src/initrd/nm-initrd-generator.h b/src/initrd/nm-initrd-generator.h
-index 9719992125ea..8e17f0455574 100644
---- a/src/initrd/nm-initrd-generator.h
-+++ b/src/initrd/nm-initrd-generator.h
-@@ -9,6 +9,8 @@
- #include "nm-connection.h"
- #include "nm-utils.h"
-
-+#define NMI_WAIT_DEVICE_TIMEOUT_MS 60000
-+
- static inline gboolean
- guess_ip_address_family (const char *str)
- {
-diff --git a/src/initrd/nmi-cmdline-reader.c b/src/initrd/nmi-cmdline-reader.c
-index 8ba6dbb827b6..85be9f132eda 100644
---- a/src/initrd/nmi-cmdline-reader.c
-+++ b/src/initrd/nmi-cmdline-reader.c
-@@ -873,6 +873,30 @@ reader_add_nameservers (Reader *reader, GPtrArray *nameservers)
- }
- }
-
-+static void
-+connection_set_needed (NMConnection *connection)
-+{
-+ NMSettingConnection *s_con;
-+
-+ s_con = nm_connection_get_setting_connection (connection);
-+ if (!nm_streq0 (nm_setting_connection_get_connection_type (s_con),
-+ NM_SETTING_WIRED_SETTING_NAME))
-+ return;
-+
-+ if (nm_str_is_empty (nm_setting_connection_get_interface_name (s_con)))
-+ return;
-+
-+ g_object_set (s_con,
-+ NM_SETTING_CONNECTION_WAIT_DEVICE_TIMEOUT, NMI_WAIT_DEVICE_TIMEOUT_MS,
-+ NULL);
-+}
-+
-+static void
-+connection_set_needed_cb (gpointer key, gpointer value, gpointer user_data)
-+{
-+ connection_set_needed (value);
-+}
-+
- GHashTable *
- nmi_cmdline_reader_parse (const char *sysfs_dir, const char *const*argv, char **hostname)
- {
-@@ -1007,11 +1031,16 @@ nmi_cmdline_reader_parse (const char *sysfs_dir, const char *const*argv, char **
-
- connection = reader_get_connection (reader, bootdev, NULL, TRUE);
- reader->bootdev_connection = connection;
-+ connection_set_needed (connection);
- }
-
-- if (neednet && g_hash_table_size (reader->hash) == 0) {
-- /* Make sure there's some connection. */
-- reader_get_default_connection (reader);
-+ if (neednet) {
-+ if (g_hash_table_size (reader->hash) == 0) {
-+ /* Make sure there's some connection. */
-+ reader_get_default_connection (reader);
-+ }
-+
-+ g_hash_table_foreach (reader->hash, connection_set_needed_cb, NULL);
- }
-
- if (routes)
-diff --git a/src/initrd/tests/test-cmdline-reader.c b/src/initrd/tests/test-cmdline-reader.c
-index 074654d347d8..7787cf5ea043 100644
---- a/src/initrd/tests/test-cmdline-reader.c
-+++ b/src/initrd/tests/test-cmdline-reader.c
-@@ -49,6 +49,7 @@ test_auto (void)
- g_assert_cmpstr (nm_setting_connection_get_id (s_con), ==, "Wired Connection");
- g_assert_cmpint (nm_setting_connection_get_timestamp (s_con), ==, 0);
- g_assert_cmpint (nm_setting_connection_get_multi_connect (s_con), ==, NM_CONNECTION_MULTI_CONNECT_MULTIPLE);
-+ g_assert_cmpint (nm_setting_connection_get_wait_device_timeout (s_con), ==, -1);
-
- g_assert (nm_setting_connection_get_autoconnect (s_con));
-
-@@ -190,6 +191,7 @@ test_if_ip4_manual (void)
- "ip=203.0.113.2::203.0.113.1:26:"
- "hostname1.example.com:eth4");
- NMConnection *connection;
-+ NMSettingConnection *s_con;
- NMSettingIPConfig *s_ip4;
- NMSettingIPConfig *s_ip6;
- NMIPAddress *ip_addr;
-@@ -205,6 +207,10 @@ test_if_ip4_manual (void)
- nmtst_assert_connection_verifies_without_normalization (connection);
- g_assert_cmpstr (nm_connection_get_id (connection), ==, "eth3");
-
-+ s_con = nm_connection_get_setting_connection (connection);
-+ g_assert (s_con);
-+ g_assert_cmpint (nm_setting_connection_get_wait_device_timeout (s_con), ==, -1);
-+
- s_ip4 = nm_connection_get_setting_ip4_config (connection);
- g_assert (s_ip4);
- g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip4), ==, NM_SETTING_IP4_CONFIG_METHOD_MANUAL);
-@@ -294,6 +300,7 @@ test_multiple_merge (void)
- const char *const*ARGV = NM_MAKE_STRV ("ip=192.0.2.2:::::eth0",
- "ip=[2001:db8::2]:::::eth0");
- NMConnection *connection;
-+ NMSettingConnection *s_con;
- NMSettingWired *s_wired;
- NMSettingIPConfig *s_ip4;
- NMSettingIPConfig *s_ip6;
-@@ -310,6 +317,10 @@ test_multiple_merge (void)
- nmtst_assert_connection_verifies_without_normalization (connection);
- g_assert_cmpstr (nm_connection_get_id (connection), ==, "eth0");
-
-+ s_con = nm_connection_get_setting_connection (connection);
-+ g_assert (s_con);
-+ g_assert_cmpint (nm_setting_connection_get_wait_device_timeout (s_con), ==, -1);
-+
- s_wired = nm_connection_get_setting_wired (connection);
- g_assert (s_wired);
-
-@@ -341,6 +352,7 @@ test_multiple_bootdev (void)
- "ip=eth4:dhcp",
- "bootdev=eth4");
- NMConnection *connection;
-+ NMSettingConnection *s_con;
- NMSettingIPConfig *s_ip4;
- NMSettingIPConfig *s_ip6;
- gs_free char *hostname = NULL;
-@@ -352,12 +364,18 @@ test_multiple_bootdev (void)
-
- connection = g_hash_table_lookup (connections, "eth3");
- g_assert (connection);
-+ s_con = nm_connection_get_setting_connection (connection);
-+ g_assert (s_con);
-+ g_assert_cmpint (nm_setting_connection_get_wait_device_timeout (s_con), ==, -1);
- s_ip6 = nm_connection_get_setting_ip6_config (connection);
- g_assert (s_ip6);
- g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_AUTO);
-
- connection = g_hash_table_lookup (connections, "eth4");
- g_assert (connection);
-+ s_con = nm_connection_get_setting_connection (connection);
-+ g_assert (s_con);
-+ g_assert_cmpint (nm_setting_connection_get_wait_device_timeout (s_con), ==, NMI_WAIT_DEVICE_TIMEOUT_MS);
- s_ip4 = nm_connection_get_setting_ip4_config (connection);
- g_assert (s_ip4);
- g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip4), ==, NM_SETTING_IP4_CONFIG_METHOD_AUTO);
-@@ -388,6 +406,7 @@ test_bootdev (void)
- g_assert_cmpstr (nm_setting_connection_get_connection_type (s_con), ==, NM_SETTING_WIRED_SETTING_NAME);
- g_assert_cmpstr (nm_setting_connection_get_id (s_con), ==, "ens3");
- g_assert_cmpstr (nm_setting_connection_get_interface_name (s_con), ==, "ens3");
-+ g_assert_cmpint (nm_setting_connection_get_wait_device_timeout(s_con), ==, NMI_WAIT_DEVICE_TIMEOUT_MS);
-
- connection = g_hash_table_lookup (connections, "vlan2");
- g_assert (connection);
-@@ -1255,6 +1274,56 @@ test_bootif_ip (void)
- g_assert (!nm_setting_ip_config_get_ignore_auto_dns (s_ip6));
- }
-
-+static void
-+test_neednet (void)
-+{
-+ gs_unref_hashtable GHashTable *connections = NULL;
-+ const char *const*ARGV = NM_MAKE_STRV ("rd.neednet",
-+ "ip=eno1:dhcp",
-+ "ip=172.25.1.100::172.25.1.1:24::eno2",
-+ "bridge=br0:eno3");
-+ NMConnection *connection;
-+ NMSettingConnection *s_con;
-+ gs_free char *hostname = NULL;
-+
-+ connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
-+ g_assert (connections);
-+ g_assert_cmpint (g_hash_table_size (connections), ==, 4);
-+ g_assert_cmpstr (hostname, ==, NULL);
-+
-+ connection = g_hash_table_lookup (connections, "eno1");
-+ g_assert (connection);
-+ nmtst_assert_connection_verifies_without_normalization (connection);
-+ s_con = nm_connection_get_setting_connection (connection);
-+ g_assert (s_con);
-+ g_assert_cmpstr (nm_setting_connection_get_interface_name (s_con), ==, "eno1");
-+ g_assert_cmpint (nm_setting_connection_get_wait_device_timeout (s_con), ==, NMI_WAIT_DEVICE_TIMEOUT_MS);
-+
-+ connection = g_hash_table_lookup (connections, "eno2");
-+ g_assert (connection);
-+ nmtst_assert_connection_verifies_without_normalization (connection);
-+ s_con = nm_connection_get_setting_connection (connection);
-+ g_assert (s_con);
-+ g_assert_cmpstr (nm_setting_connection_get_interface_name (s_con), ==, "eno2");
-+ g_assert_cmpint (nm_setting_connection_get_wait_device_timeout (s_con), ==, NMI_WAIT_DEVICE_TIMEOUT_MS);
-+
-+ connection = g_hash_table_lookup (connections, "eno3");
-+ g_assert (connection);
-+ nmtst_assert_connection_verifies_without_normalization (connection);
-+ s_con = nm_connection_get_setting_connection (connection);
-+ g_assert (s_con);
-+ g_assert_cmpstr (nm_setting_connection_get_interface_name (s_con), ==, "eno3");
-+ g_assert_cmpint (nm_setting_connection_get_wait_device_timeout (s_con), ==, NMI_WAIT_DEVICE_TIMEOUT_MS);
-+
-+ connection = g_hash_table_lookup (connections, "br0");
-+ g_assert (connection);
-+ nmtst_assert_connection_verifies_without_normalization (connection);
-+ s_con = nm_connection_get_setting_connection (connection);
-+ g_assert (s_con);
-+ g_assert_cmpstr (nm_setting_connection_get_interface_name (s_con), ==, "br0");
-+ g_assert_cmpint (nm_setting_connection_get_wait_device_timeout (s_con), ==, -1);
-+}
-+
- static void
- test_bootif_no_ip (void)
- {
-@@ -1451,6 +1520,7 @@ int main (int argc, char **argv)
- g_test_add_func ("/initrd/cmdline/bootif/no_ip", test_bootif_no_ip);
- g_test_add_func ("/initrd/cmdline/bootif/hwtype", test_bootif_hwtype);
- g_test_add_func ("/initrd/cmdline/bootif/off", test_bootif_off);
-+ g_test_add_func ("/initrd/cmdline/neednet", test_neednet);
-
- return g_test_run ();
- }
---
-2.26.2
-
-
-From 38da5dabaccc377695e6cc4d3621cdf0f12b28e1 Mon Sep 17 00:00:00 2001
-From: Thomas Haller <thaller@redhat.com>
-Date: Tue, 11 Aug 2020 15:32:46 +0200
-Subject: [PATCH 3/7] settings: let NMSettings reference NMManager
-
-NMSettings needs access to the list of all devices, which is tracked
-by NMManager. Of course, this ties NMSettings and NMManager closer
-together. Note that NMManager already owns a reference to NMSettings,
-so they are in fact related.
-
-The alternatives of just letting NMSettings reference NMManager (and
-vice versa) would be more complicated, and likely not help to simplify
-the code (on the contrary).
-
-(cherry picked from commit d27a6055b9094163356ae2c650c566307df9a93c)
-(cherry picked from commit 1745b4e0c0895df61cd4117b304dfa4e9a1d8c53)
----
- src/nm-manager.c | 2 +-
- src/settings/nm-settings.c | 44 ++++++++++++++++++++++++++++++++++++--
- src/settings/nm-settings.h | 3 ++-
- 3 files changed, 45 insertions(+), 4 deletions(-)
-
-diff --git a/src/nm-manager.c b/src/nm-manager.c
-index d687fcd7f219..6095f2687153 100644
---- a/src/nm-manager.c
-+++ b/src/nm-manager.c
-@@ -7455,7 +7455,7 @@ constructed (GObject *object)
-
- G_OBJECT_CLASS (nm_manager_parent_class)->constructed (object);
-
-- priv->settings = nm_settings_new ();
-+ priv->settings = nm_settings_new (self);
-
- nm_dbus_object_export (NM_DBUS_OBJECT (priv->settings));
-
-diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c
-index 0a1e7b47d6c4..85c5e5e77f85 100644
---- a/src/settings/nm-settings.c
-+++ b/src/settings/nm-settings.c
-@@ -60,6 +60,7 @@
- #include "plugins/keyfile/nms-keyfile-storage.h"
- #include "nm-agent-manager.h"
- #include "nm-config.h"
-+#include "nm-manager.h"
- #include "nm-audit-manager.h"
- #include "NetworkManagerUtils.h"
- #include "nm-dispatcher.h"
-@@ -324,6 +325,7 @@ _sett_conn_entry_find_shadowed_storage (SettConnEntry *sett_conn_entry,
- /*****************************************************************************/
-
- NM_GOBJECT_PROPERTIES_DEFINE (NMSettings,
-+ PROP_MANAGER,
- PROP_UNMANAGED_SPECS,
- PROP_HOSTNAME,
- PROP_CAN_MODIFY,
-@@ -348,6 +350,8 @@ typedef struct {
-
- NMPlatform *platform;
-
-+ NMManager *manager;
-+
- NMHostnameManager *hostname_manager;
-
- NMSessionMonitor *session_monitor;
-@@ -3805,6 +3809,26 @@ get_property (GObject *object, guint prop_id,
- }
- }
-
-+static void
-+set_property (GObject *object, guint prop_id,
-+ const GValue *value, GParamSpec *pspec)
-+{
-+ NMSettings *self = NM_SETTINGS (object);
-+ NMSettingsPrivate *priv = NM_SETTINGS_GET_PRIVATE (self);
-+
-+ switch (prop_id) {
-+ case PROP_MANAGER:
-+ /* construct-only */
-+ priv->manager = g_value_get_pointer (value);
-+ nm_assert (NM_IS_MANAGER (priv->manager));
-+ g_object_add_weak_pointer (G_OBJECT (priv->manager), (gpointer *) &priv->manager);
-+ break;
-+ default:
-+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-+ break;
-+ }
-+}
-+
- /*****************************************************************************/
-
- static void
-@@ -3833,9 +3857,13 @@ nm_settings_init (NMSettings *self)
- }
-
- NMSettings *
--nm_settings_new (void)
-+nm_settings_new (NMManager *manager)
- {
-- return g_object_new (NM_TYPE_SETTINGS, NULL);
-+ nm_assert (NM_IS_MANAGER (manager));
-+
-+ return g_object_new (NM_TYPE_SETTINGS,
-+ NM_SETTINGS_MANAGER, manager,
-+ NULL);
- }
-
- static void
-@@ -3915,6 +3943,11 @@ finalize (GObject *object)
- g_clear_object (&priv->config);
-
- g_clear_object (&priv->platform);
-+
-+ if (priv->manager) {
-+ g_object_remove_weak_pointer (G_OBJECT (priv->manager), (gpointer *) &priv->manager);
-+ priv->manager = NULL;
-+ }
- }
-
- static const GDBusSignalInfo signal_info_new_connection = NM_DEFINE_GDBUS_SIGNAL_INFO_INIT (
-@@ -4051,9 +4084,16 @@ nm_settings_class_init (NMSettingsClass *class)
- dbus_object_class->interface_infos = NM_DBUS_INTERFACE_INFOS (&interface_info_settings);
-
- object_class->get_property = get_property;
-+ object_class->set_property = set_property;
- object_class->dispose = dispose;
- object_class->finalize = finalize;
-
-+ obj_properties[PROP_MANAGER] =
-+ g_param_spec_pointer (NM_SETTINGS_MANAGER, "", "",
-+ G_PARAM_CONSTRUCT_ONLY |
-+ G_PARAM_WRITABLE |
-+ G_PARAM_STATIC_STRINGS);
-+
- obj_properties[PROP_UNMANAGED_SPECS] =
- g_param_spec_boxed (NM_SETTINGS_UNMANAGED_SPECS, "", "",
- G_TYPE_STRV,
-diff --git a/src/settings/nm-settings.h b/src/settings/nm-settings.h
-index aa7e36e09395..b7baf4373280 100644
---- a/src/settings/nm-settings.h
-+++ b/src/settings/nm-settings.h
-@@ -26,6 +26,7 @@
- #define NM_SETTINGS_CAN_MODIFY "can-modify"
- #define NM_SETTINGS_CONNECTIONS "connections"
- #define NM_SETTINGS_STARTUP_COMPLETE "startup-complete"
-+#define NM_SETTINGS_MANAGER "manager"
-
- #define NM_SETTINGS_SIGNAL_CONNECTION_ADDED "connection-added"
- #define NM_SETTINGS_SIGNAL_CONNECTION_UPDATED "connection-updated"
-@@ -53,7 +54,7 @@ GType nm_settings_get_type (void);
- NMSettings *nm_settings_get (void);
- #define NM_SETTINGS_GET (nm_settings_get ())
-
--NMSettings *nm_settings_new (void);
-+NMSettings *nm_settings_new (NMManager *manager);
-
- gboolean nm_settings_start (NMSettings *self, GError **error);
-
---
-2.26.2
-
-
-From bc8ea71287204996830a4f02657d4d036e8c85ff Mon Sep 17 00:00:00 2001
-From: Thomas Haller <thaller@redhat.com>
-Date: Tue, 11 Aug 2020 15:34:59 +0200
-Subject: [PATCH 4/7] settings: rework wait-device-timeout handling and
- consider device compatibility
-
-A profile can configure "connection.wait-device-timeout" to indicate
-that startup complete is blocked until a suitable device around.
-This is useful for NetworkManager-wait-online and initrd mode.
-
-Previously, we looked at NMPlatform whether a link with matching
-interface-name was present. That is wrong because it cannot handle
-profiles that rely on "ethernet.mac-address" setting or other "match"
-settings. Also, the mere presence of the link does not yet mean
-that the NMDevice was created and ready. In fact, there is a race here:
-NMPlatform indicates that the device is ready (unblocking NMSettings),
-but there is no corresponding NMDevice yet which keeps NetworkManager
-busy to block startup complete.
-
-Rework this. Now, only check whether there is a compatible device for
-the profile.
-
-Since we wait for compatible devices, it works now not only for the
-interface name. Note that we do some optimizations so that we don't have
-to re-evaluate all profiles (w.r.t. all devices) whenever something on the
-device changes: we only care about this when all devices finally become
-ready.
-
-Also, we no longer start the timeout for "connection.wait-device-timeout"
-when the profile appears. Instead, there is one system-wide start time
-(NMSettingsPrivate.startup_complete_start_timestamp_msec). That simplifies
-code and makes sense: we start waiting when NetworkManager is starting, not
-when the profile gets added. Also, we wait for all profiles to become
-ready together.
-
-(cherry picked from commit 3df662f534c49c9df3e16808be125a562c97d954)
-(cherry picked from commit 7ab8c5ba252e38b5cdeb958a7753df5fee1c55db)
----
- clients/common/settings-docs.h.in | 2 +-
- libnm-core/nm-setting-connection.c | 23 +-
- src/nm-manager.c | 32 ++-
- src/settings/nm-settings.c | 336 +++++++++++++++--------------
- src/settings/nm-settings.h | 3 +-
- 5 files changed, 209 insertions(+), 187 deletions(-)
-
-diff --git a/clients/common/settings-docs.h.in b/clients/common/settings-docs.h.in
-index 7b891500d8c9..606a1b95c5df 100644
---- a/clients/common/settings-docs.h.in
-+++ b/clients/common/settings-docs.h.in
-@@ -171,7 +171,7 @@
- #define DESCRIBE_DOC_NM_SETTING_CONNECTION_TIMESTAMP N_("The time, in seconds since the Unix Epoch, that the connection was last _successfully_ fully activated. NetworkManager updates the connection timestamp periodically when the connection is active to ensure that an active connection has the latest timestamp. The property is only meant for reading (changes to this property will not be preserved).")
- #define DESCRIBE_DOC_NM_SETTING_CONNECTION_TYPE N_("Base type of the connection. For hardware-dependent connections, should contain the setting name of the hardware-type specific setting (ie, \"802-3-ethernet\" or \"802-11-wireless\" or \"bluetooth\", etc), and for non-hardware dependent connections like VPN or otherwise, should contain the setting name of that setting type (ie, \"vpn\" or \"bridge\", etc).")
- #define DESCRIBE_DOC_NM_SETTING_CONNECTION_UUID N_("A universally unique identifier for the connection, for example generated with libuuid. It should be assigned when the connection is created, and never changed as long as the connection still applies to the same network. For example, it should not be changed when the \"id\" property or NMSettingIP4Config changes, but might need to be re-created when the Wi-Fi SSID, mobile broadband network provider, or \"type\" property changes. The UUID must be in the format \"2815492f-7e56-435e-b2e9-246bd7cdc664\" (ie, contains only hexadecimal characters and \"-\").")
--#define DESCRIBE_DOC_NM_SETTING_CONNECTION_WAIT_DEVICE_TIMEOUT N_("Timeout in milliseconds to wait for device at startup. During boot, devices may take a while to be detected by the driver. This property will cause to delay NetworkManager-wait-online.service and nm-online to give the device a chance to appear. Note that this property only works together with NMSettingConnection:interface-name to identify the device that will be waited for. The value 0 means no wait time. The default value is -1, which currently has the same meaning as no wait time.")
-+#define DESCRIBE_DOC_NM_SETTING_CONNECTION_WAIT_DEVICE_TIMEOUT N_("Timeout in milliseconds to wait for device at startup. During boot, devices may take a while to be detected by the driver. This property will cause to delay NetworkManager-wait-online.service and nm-online to give the device a chance to appear. This works by waiting for the given timeout until a compatible device for the profile is available and managed. The value 0 means no wait time. The default value is -1, which currently has the same meaning as no wait time.")
- #define DESCRIBE_DOC_NM_SETTING_CONNECTION_ZONE N_("The trust level of a the connection. Free form case-insensitive string (for example \"Home\", \"Work\", \"Public\"). NULL or unspecified zone means the connection will be placed in the default zone as defined by the firewall. When updating this property on a currently activated connection, the change takes effect immediately.")
- #define DESCRIBE_DOC_NM_SETTING_DCB_APP_FCOE_FLAGS N_("Specifies the NMSettingDcbFlags for the DCB FCoE application. Flags may be any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4).")
- #define DESCRIBE_DOC_NM_SETTING_DCB_APP_FCOE_MODE N_("The FCoE controller mode; either \"fabric\" (default) or \"vn2vn\".")
-diff --git a/libnm-core/nm-setting-connection.c b/libnm-core/nm-setting-connection.c
-index 018129bef200..03f8fb23c099 100644
---- a/libnm-core/nm-setting-connection.c
-+++ b/libnm-core/nm-setting-connection.c
-@@ -689,7 +689,7 @@ nm_setting_connection_is_slave_type (NMSettingConnection *setting,
- * @setting: the #NMSettingConnection
- *
- * Returns: the %NM_SETTING_CONNECTION_WAIT_DEVICE_TIMEOUT property with
-- * the timeout in milli seconds. -1 is the default.
-+ * the timeout in milliseconds. -1 is the default.
- *
- * Since: 1.20
- */
-@@ -1218,20 +1218,6 @@ after_interface_name:
- return FALSE;
- }
-
-- if ( priv->wait_device_timeout != -1
-- && !priv->interface_name) {
-- /* currently, only waiting by interface-name is implemented. Hence reject
-- * configurations that are not implemented (yet). */
-- g_set_error (error,
-- NM_CONNECTION_ERROR,
-- NM_CONNECTION_ERROR_INVALID_PROPERTY,
-- _("wait-device-timeout requires %s"),
-- NM_SETTING_CONNECTION_INTERFACE_NAME);
-- g_prefix_error (error, "%s.%s: ", NM_SETTING_CONNECTION_SETTING_NAME,
-- NM_SETTING_CONNECTION_WAIT_DEVICE_TIMEOUT);
-- return FALSE;
-- }
--
- if (priv->mud_url) {
- if (!priv->mud_url[0]) {
- g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
-@@ -2314,10 +2300,9 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
- * Timeout in milliseconds to wait for device at startup.
- * During boot, devices may take a while to be detected by the driver.
- * This property will cause to delay NetworkManager-wait-online.service
-- * and nm-online to give the device a chance to appear.
-- *
-- * Note that this property only works together with NMSettingConnection:interface-name
-- * to identify the device that will be waited for.
-+ * and nm-online to give the device a chance to appear. This works by
-+ * waiting for the given timeout until a compatible device for the
-+ * profile is available and managed.
- *
- * The value 0 means no wait time. The default value is -1, which
- * currently has the same meaning as no wait time.
-diff --git a/src/nm-manager.c b/src/nm-manager.c
-index 6095f2687153..778e3b946ac9 100644
---- a/src/nm-manager.c
-+++ b/src/nm-manager.c
-@@ -1561,13 +1561,6 @@ check_if_startup_complete (NMManager *self)
- if (!priv->devices_inited)
- return;
-
-- reason = nm_settings_get_startup_complete_blocked_reason (priv->settings);
-- if (reason) {
-- _LOGD (LOGD_CORE, "startup complete is waiting for connection (%s)",
-- reason);
-- return;
-- }
--
- c_list_for_each_entry (device, &priv->devices_lst_head, devices_lst) {
- reason = nm_device_has_pending_action_reason (device);
- if (reason) {
-@@ -1578,6 +1571,31 @@ check_if_startup_complete (NMManager *self)
- }
- }
-
-+ /* All NMDevice must be ready. But also NMSettings tracks profiles that wait for
-+ * ready devices via "connection.wait-device-timeout".
-+ *
-+ * Note that we only re-check nm_settings_get_startup_complete_blocked_reason() when
-+ * all of the devices become ready (again).
-+ *
-+ * For example, assume we have device "eth1" and "profile-eth2" which waits for "eth2".
-+ * If "eth1" is ready (no pending action), we only need to re-evaluate "profile-eth2"
-+ * if we have another device ("eth2"), that becomes non-ready (had pending actions)
-+ * and again become ready. We don't need to check "profile-eth2" until "eth2" becomes
-+ * non-ready.
-+ * That is why nm_settings_get_startup_complete_blocked_reason() only has any significance
-+ * if all devices are ready too. It allows us to cut down the number of checks whether
-+ * NMSettings is ready. That's because we don't need to re-evaluate on minor changes of
-+ * a device, only when all devices become managed and ready. */
-+
-+ g_signal_handlers_block_by_func (priv->settings, settings_startup_complete_changed, self);
-+ reason = nm_settings_get_startup_complete_blocked_reason (priv->settings, TRUE);
-+ g_signal_handlers_unblock_by_func (priv->settings, settings_startup_complete_changed, self);
-+ if (reason) {
-+ _LOGD (LOGD_CORE, "startup complete is waiting for connection (%s)",
-+ reason);
-+ return;
-+ }
-+
- _LOGI (LOGD_CORE, "startup complete");
-
- priv->startup = FALSE;
-diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c
-index 85c5e5e77f85..ef86d2d2c836 100644
---- a/src/settings/nm-settings.c
-+++ b/src/settings/nm-settings.c
-@@ -376,9 +376,9 @@ typedef struct {
- GSList *unmanaged_specs;
- GSList *unrecognized_specs;
-
-+ gint64 startup_complete_start_timestamp_msec;
- GHashTable *startup_complete_idx;
-- NMSettingsConnection *startup_complete_blocked_by;
-- gulong startup_complete_platform_change_id;
-+ CList startup_complete_scd_lst_head;
- guint startup_complete_timeout_id;
-
- guint connections_len;
-@@ -427,7 +427,7 @@ static void default_wired_clear_tag (NMSettings *self,
- static void _clear_connections_cached_list (NMSettingsPrivate *priv);
-
- static void _startup_complete_check (NMSettings *self,
-- gint64 now_us);
-+ gint64 now_msec);
-
- /*****************************************************************************/
-
-@@ -465,34 +465,51 @@ _emit_connection_flags_changed (NMSettings *self,
-
- typedef struct {
- NMSettingsConnection *sett_conn;
-- gint64 start_at;
-- gint64 timeout;
-+ CList scd_lst;
-+ gint64 timeout_msec;
- } StartupCompleteData;
-
- static void
- _startup_complete_data_destroy (StartupCompleteData *scd)
- {
-+ c_list_unlink_stale (&scd->scd_lst);
- g_object_unref (scd->sett_conn);
-- g_slice_free (StartupCompleteData, scd);
-+ nm_g_slice_free (scd);
- }
-
- static gboolean
--_startup_complete_check_is_ready (NMPlatform *platform,
-+_startup_complete_check_is_ready (NMSettings *self,
- NMSettingsConnection *sett_conn)
- {
-- const NMPlatformLink *plink;
-- const char *ifname;
-+ NMSettingsPrivate *priv = NM_SETTINGS_GET_PRIVATE (self);
-+ NMConnection *conn;
-+ const CList *tmp_lst;
-+ NMDevice *device;
-+
-+ if (!priv->manager)
-+ return TRUE;
-+
-+ conn = nm_settings_connection_get_connection (sett_conn);
-
-- /* FIXME: instead of just looking for the interface name, it would be better
-- * to wait for a device that is compatible with the profile. */
-+ nm_manager_for_each_device (priv->manager, device, tmp_lst) {
-
-- ifname = nm_connection_get_interface_name (nm_settings_connection_get_connection (sett_conn));
-+ if (!nm_device_is_real (device))
-+ continue;
-+
-+ if ( nm_device_get_state (device) < NM_DEVICE_STATE_UNAVAILABLE
-+ || nm_device_has_pending_action (device)) {
-+ /* while a device is not yet available and still has a pending
-+ * action itself, it's not a suitable candidate. */
-+ continue;
-+ }
-+
-+ if (!nm_device_check_connection_compatible (device, conn, NULL))
-+ continue;
-
-- if (!ifname)
- return TRUE;
-+ }
-
-- plink = nm_platform_link_get_by_ifname (platform, ifname);
-- return plink && plink->initialized;
-+ return FALSE;
- }
-
- static gboolean
-@@ -506,117 +523,98 @@ _startup_complete_timeout_cb (gpointer user_data)
- return G_SOURCE_REMOVE;
- }
-
--static void
--_startup_complete_platform_change_cb (NMPlatform *platform,
-- int obj_type_i,
-- int ifindex,
-- const NMPlatformLink *link,
-- int change_type_i,
-- NMSettings *self)
--{
-- const NMPlatformSignalChangeType change_type = change_type_i;
-- NMSettingsPrivate *priv;
-- const char *ifname;
--
-- if (change_type == NM_PLATFORM_SIGNAL_REMOVED)
-- return;
--
-- if (!link->initialized)
-- return;
--
-- priv = NM_SETTINGS_GET_PRIVATE (self);
--
-- ifname = nm_connection_get_interface_name (nm_settings_connection_get_connection (priv->startup_complete_blocked_by));
-- if ( ifname
-- && !nm_streq (ifname, link->name))
-- return;
--
-- nm_assert (priv->startup_complete_timeout_id > 0);
--
-- nm_clear_g_source (&priv->startup_complete_timeout_id);
-- priv->startup_complete_timeout_id = g_idle_add (_startup_complete_timeout_cb, self);
--}
--
- static void
- _startup_complete_check (NMSettings *self,
-- gint64 now_us)
-+ gint64 now_msec)
- {
- NMSettingsPrivate *priv = NM_SETTINGS_GET_PRIVATE (self);
-- gint64 next_expiry;
-+ StartupCompleteData *scd_not_ready;
-+ StartupCompleteData *scd_safe;
- StartupCompleteData *scd;
-- NMSettingsConnection *next_sett_conn = NULL;
-- GHashTableIter iter;
-+ gint64 elapsed_msec;
-+ CList ready_lst;
-+
-+ if (priv->startup_complete_start_timestamp_msec == 0) {
-+ /* we are already done for good or didn't start yet. */
-+ return;
-+ }
-
- if (!priv->started) {
-- /* before we are started, we don't setup the timers... */
-+ /* before we are started there is no need to evaluate our list because
-+ * we are anyway blocking startup-complete. */
- return;
- }
-
-- if (!priv->startup_complete_idx)
-+ if (c_list_is_empty (&priv->startup_complete_scd_lst_head))
- goto ready;
-
-- if (!now_us)
-- now_us = nm_utils_get_monotonic_timestamp_usec ();
-+ nm_utils_get_monotonic_timestamp_msec_cached (&now_msec);
-
-- next_expiry = 0;
-+ elapsed_msec = now_msec - priv->startup_complete_start_timestamp_msec;
-
-- g_hash_table_iter_init (&iter, priv->startup_complete_idx);
-- while (g_hash_table_iter_next (&iter, (gpointer *) &scd, NULL)) {
-- gint64 expiry;
--
-- if (scd->start_at == 0) {
-- /* once ready, the decision is remembered and there is nothing
-- * left to check. */
-- continue;
-- }
-+ /* We search the entire list whether they all timed-out or found a compatible device.
-+ * We do that by appending elements that are ready to the end of the list, so that
-+ * we hopefully keep testing the elements that are ready already (and can shortcut
-+ * the test in common cases).
-+ *
-+ * Note that all profiles that we wait for need to have their dependencies satisfied
-+ * at the same time. For example, consider connection A is waiting for device A' which is ready.
-+ * Connection B waits for device B', which isn't ready. Once B'/B becomes ready, A/A' must
-+ * still be ready. Otherwise, we would wait for A/A' to become ready again. */
-+ scd_not_ready = NULL;
-+ c_list_init (&ready_lst);
-+ c_list_for_each_entry_safe (scd, scd_safe, &priv->startup_complete_scd_lst_head, scd_lst) {
-
-- expiry = scd->start_at + scd->timeout;
-- if (expiry <= now_us) {
-- scd->start_at = 0;
-- continue;
-- }
-+ if (scd->timeout_msec <= elapsed_msec)
-+ goto next_with_ready;
-
-- if (_startup_complete_check_is_ready (priv->platform, scd->sett_conn)) {
-- scd->start_at = 0;
-- continue;
-- }
-+ if (_startup_complete_check_is_ready (self, scd->sett_conn))
-+ goto next_with_ready;
-
-- next_expiry = expiry;
-- next_sett_conn = scd->sett_conn;
-- /* we found one timeout for which to wait. that's good enough. */
-+ scd_not_ready = scd;
- break;
-+
-+next_with_ready:
-+ /* this element is ready. We move it to a temporary list, so that we
-+ * can reorder the list (to next time evaluate the non-ready element first). */
-+ nm_c_list_move_tail (&ready_lst, &scd->scd_lst);
- }
-+ c_list_splice (&priv->startup_complete_scd_lst_head, &ready_lst);
-
- nm_clear_g_source (&priv->startup_complete_timeout_id);
-- nm_g_object_ref_set (&priv->startup_complete_blocked_by, next_sett_conn);
-- if (next_expiry > 0) {
-- nm_assert (priv->startup_complete_blocked_by);
-- if (priv->startup_complete_platform_change_id == 0) {
-- priv->startup_complete_platform_change_id = g_signal_connect (priv->platform,
-- NM_PLATFORM_SIGNAL_LINK_CHANGED,
-- G_CALLBACK (_startup_complete_platform_change_cb),
-- self);
-- }
-- priv->startup_complete_timeout_id = g_timeout_add (NM_MIN (3600u*1000u, (next_expiry - now_us) / 1000u),
-+
-+ if (scd_not_ready) {
-+ gint64 timeout_msec;
-+
-+ timeout_msec = priv->startup_complete_start_timestamp_msec + scd_not_ready->timeout_msec - nm_utils_get_monotonic_timestamp_msec ();
-+ priv->startup_complete_timeout_id = g_timeout_add (NM_CLAMP (0, timeout_msec, 60000),
- _startup_complete_timeout_cb,
- self);
-- _LOGT ("startup-complete: wait for device \"%s\" due to connection %s (%s)",
-- nm_connection_get_interface_name (nm_settings_connection_get_connection (priv->startup_complete_blocked_by)),
-- nm_settings_connection_get_uuid (priv->startup_complete_blocked_by),
-- nm_settings_connection_get_id (priv->startup_complete_blocked_by));
-+ _LOGT ("startup-complete: wait for suitable device for connection \"%s\" (%s) which has \"connection.wait-device-timeout\" set",
-+ nm_settings_connection_get_id (scd_not_ready->sett_conn),
-+ nm_settings_connection_get_uuid (scd_not_ready->sett_conn));
- return;
- }
-
-- nm_clear_pointer (&priv->startup_complete_idx, g_hash_table_destroy);
-- nm_clear_g_signal_handler (priv->platform, &priv->startup_complete_platform_change_id);
-+ if (_LOGW_ENABLED ()) {
-+ c_list_for_each_entry (scd, &priv->startup_complete_scd_lst_head, scd_lst) {
-+ if (!_startup_complete_check_is_ready (self, scd->sett_conn)) {
-+ _LOGW ("startup-complete: profile \"%s\" (%s) was waiting for non-existing device (with timeout \"connection.wait-device-timeout=%"G_GINT64_FORMAT"\")",
-+ nm_settings_connection_get_id (scd->sett_conn),
-+ nm_settings_connection_get_uuid (scd->sett_conn),
-+ scd->timeout_msec);
-+ }
-+ }
-+ }
-
- ready:
-- _LOGT ("startup-complete: ready, no profiles to wait for");
-+ nm_clear_pointer (&priv->startup_complete_idx, g_hash_table_destroy);
-+ nm_assert (c_list_is_empty (&priv->startup_complete_scd_lst_head));
- nm_assert (priv->started);
-- nm_assert (!priv->startup_complete_blocked_by);
-+ _LOGT ("startup-complete: ready, no more profiles to wait for");
-+ priv->startup_complete_start_timestamp_msec = 0;
- nm_assert (!priv->startup_complete_idx);
- nm_assert (priv->startup_complete_timeout_id == 0);
-- nm_assert (priv->startup_complete_platform_change_id == 0);
- _notify (self, PROP_STARTUP_COMPLETE);
- }
-
-@@ -626,75 +624,95 @@ _startup_complete_notify_connection (NMSettings *self,
- gboolean forget)
- {
- NMSettingsPrivate *priv = NM_SETTINGS_GET_PRIVATE (self);
-- gint64 timeout;
-- gint64 now_us = 0;
--
-- nm_assert ( !priv->started
-- || priv->startup_complete_idx);
--
-- timeout = 0;
-- if (!forget) {
-- NMSettingConnection *s_con;
-- gint32 v;
--
-- s_con = nm_connection_get_setting_connection (nm_settings_connection_get_connection (sett_conn));
-- v = nm_setting_connection_get_wait_device_timeout (s_con);
-- if (v > 0) {
-- nm_assert (nm_setting_connection_get_interface_name (s_con));
-- timeout = ((gint64) v) * 1000;
-- }
-+ StartupCompleteData *scd;
-+ gint64 timeout_msec;
-+ gint64 now_msec = 0;
-+ NMSettingConnection *s_con;
-+ gint32 v;
-+
-+ nm_assert (priv->startup_complete_start_timestamp_msec != 0);
-+
-+ if (forget) {
-+ if (!priv->startup_complete_idx)
-+ return;
-+ if (!g_hash_table_remove (priv->startup_complete_idx, &sett_conn))
-+ return;
-+ goto check;
- }
-
-- if (timeout == 0) {
-- if ( !priv->startup_complete_idx
-- || !g_hash_table_remove (priv->startup_complete_idx, &sett_conn))
-+ s_con = nm_connection_get_setting_connection (nm_settings_connection_get_connection (sett_conn));
-+ v = nm_setting_connection_get_wait_device_timeout (s_con);
-+ if (v > 0)
-+ timeout_msec = v;
-+ else
-+ timeout_msec = 0;
-+
-+ if (!priv->startup_complete_idx) {
-+ nm_assert (!priv->started);
-+
-+ if (timeout_msec == 0)
-+ return;
-+
-+ priv->startup_complete_idx = g_hash_table_new_full (nm_pdirect_hash,
-+ nm_pdirect_equal,
-+ NULL,
-+ (GDestroyNotify) _startup_complete_data_destroy);
-+ scd = NULL;
-+ } else
-+ scd = g_hash_table_lookup (priv->startup_complete_idx, &sett_conn);
-+
-+ if (!scd) {
-+ if (timeout_msec == 0)
- return;
-+ scd = g_slice_new (StartupCompleteData);
-+ *scd = (StartupCompleteData) {
-+ .sett_conn = g_object_ref (sett_conn),
-+ .timeout_msec = timeout_msec,
-+ };
-+ g_hash_table_add (priv->startup_complete_idx, scd);
-+ c_list_link_tail (&priv->startup_complete_scd_lst_head, &scd->scd_lst);
- } else {
-- StartupCompleteData *scd;
--
-- if (!priv->startup_complete_idx) {
-- nm_assert (!priv->started);
-- priv->startup_complete_idx = g_hash_table_new_full (nm_pdirect_hash,
-- nm_pdirect_equal,
-- NULL,
-- (GDestroyNotify) _startup_complete_data_destroy);
-- scd = NULL;
-- } else
-- scd = g_hash_table_lookup (priv->startup_complete_idx, &sett_conn);
-- if (!scd) {
-- now_us = nm_utils_get_monotonic_timestamp_usec ();
-- scd = g_slice_new (StartupCompleteData);
-- *scd = (StartupCompleteData) {
-- .sett_conn = g_object_ref (sett_conn),
-- .start_at = now_us,
-- .timeout = timeout,
-- };
-- g_hash_table_add (priv->startup_complete_idx, scd);
-- } else {
-- if (scd->start_at == 0) {
-- /* the entry already is ready and no longer relevant. Ignore it. */
-- return;
-- }
-- scd->timeout = timeout;
-- }
-+ scd->timeout_msec = timeout_msec;
-+ nm_c_list_move_front (&priv->startup_complete_scd_lst_head, &scd->scd_lst);
- }
-
-- _startup_complete_check (self, now_us);
-+check:
-+ _startup_complete_check (self, now_msec);
- }
-
- const char *
--nm_settings_get_startup_complete_blocked_reason (NMSettings *self)
-+nm_settings_get_startup_complete_blocked_reason (NMSettings *self,
-+ gboolean force_reload)
- {
- NMSettingsPrivate *priv = NM_SETTINGS_GET_PRIVATE (self);
-- const char *uuid = NULL;
-+ StartupCompleteData *scd;
-+ const char *uuid;
-
-- if (priv->started) {
-- if (!priv->startup_complete_idx)
-- return NULL;
-- if (priv->startup_complete_blocked_by)
-- uuid = nm_settings_connection_get_uuid (priv->startup_complete_blocked_by);
-- }
-- return uuid ?: "unknown";
-+ if (priv->startup_complete_start_timestamp_msec == 0)
-+ goto out_done;
-+
-+ if (force_reload)
-+ _startup_complete_check (self, 0);
-+
-+ if (c_list_is_empty (&priv->startup_complete_scd_lst_head))
-+ goto out_done;
-+
-+ scd = c_list_first_entry (&priv->startup_complete_scd_lst_head, StartupCompleteData, scd_lst);
-+
-+ nm_assert (scd);
-+ nm_assert (NM_IS_SETTINGS_CONNECTION (scd->sett_conn));
-+ nm_assert (scd == nm_g_hash_table_lookup (priv->startup_complete_idx, &scd->sett_conn));
-+
-+ uuid = nm_settings_connection_get_uuid (scd->sett_conn);
-+ if (uuid)
-+ return uuid;
-+
-+ g_return_val_if_reached ("settings-starting");
-+
-+out_done:
-+ if (!priv->started)
-+ return "settings-starting";
-+ return NULL;
- }
-
- /*****************************************************************************/
-@@ -1142,8 +1160,7 @@ _connection_changed_update (NMSettings *self,
- _emit_connection_updated (self, sett_conn, update_reason);
- }
-
-- if ( !priv->started
-- || priv->startup_complete_idx) {
-+ if (priv->startup_complete_start_timestamp_msec != 0) {
- if (nm_settings_has_connection (self, sett_conn))
- _startup_complete_notify_connection (self, sett_conn, FALSE);
- }
-@@ -1217,8 +1234,7 @@ _connection_changed_delete (NMSettings *self,
- nm_key_file_db_remove_key (priv->kf_db_timestamps, uuid);
- nm_key_file_db_remove_key (priv->kf_db_seen_bssids, uuid);
-
-- if ( !priv->started
-- || priv->startup_complete_idx)
-+ if (priv->startup_complete_start_timestamp_msec != 0)
- _startup_complete_notify_connection (self, sett_conn, TRUE);
- }
-
-@@ -3715,6 +3731,8 @@ nm_settings_start (NMSettings *self, GError **error)
-
- nm_assert (!priv->started);
-
-+ priv->startup_complete_start_timestamp_msec = nm_utils_get_monotonic_timestamp_msec ();
-+
- priv->hostname_manager = g_object_ref (nm_hostname_manager_get ());
-
- priv->kf_db_timestamps = nm_key_file_db_new (NMSTATEDIR "/timestamps",
-@@ -3801,7 +3819,7 @@ get_property (GObject *object, guint prop_id,
- g_value_take_boxed (value, nm_utils_strv_make_deep_copied (strv));
- break;
- case PROP_STARTUP_COMPLETE:
-- g_value_set_boolean (value, !nm_settings_get_startup_complete_blocked_reason (self));
-+ g_value_set_boolean (value, !nm_settings_get_startup_complete_blocked_reason (self, FALSE));
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-@@ -3838,6 +3856,7 @@ nm_settings_init (NMSettings *self)
-
- c_list_init (&priv->auth_lst_head);
- c_list_init (&priv->connections_lst_head);
-+ c_list_init (&priv->startup_complete_scd_lst_head);
-
- c_list_init (&priv->sce_dirty_lst_head);
- priv->sce_idx = g_hash_table_new_full (nm_pstr_hash, nm_pstr_equal,
-@@ -3877,9 +3896,8 @@ dispose (GObject *object)
- nm_assert (g_hash_table_size (priv->sce_idx) == 0);
-
- nm_clear_g_source (&priv->startup_complete_timeout_id);
-- nm_clear_g_signal_handler (priv->platform, &priv->startup_complete_platform_change_id);
- nm_clear_pointer (&priv->startup_complete_idx, g_hash_table_destroy);
-- g_clear_object (&priv->startup_complete_blocked_by);
-+ nm_assert (c_list_is_empty (&priv->startup_complete_scd_lst_head));
-
- while ((iter = c_list_first (&priv->auth_lst_head)))
- nm_auth_chain_destroy (nm_auth_chain_parent_lst_entry (iter));
-diff --git a/src/settings/nm-settings.h b/src/settings/nm-settings.h
-index b7baf4373280..35c62ff71dd2 100644
---- a/src/settings/nm-settings.h
-+++ b/src/settings/nm-settings.h
-@@ -123,7 +123,8 @@ void nm_settings_device_added (NMSettings *self, NMDevice *device);
-
- void nm_settings_device_removed (NMSettings *self, NMDevice *device, gboolean quitting);
-
--const char *nm_settings_get_startup_complete_blocked_reason (NMSettings *self);
-+const char *nm_settings_get_startup_complete_blocked_reason (NMSettings *self,
-+ gboolean force_reload);
-
- void nm_settings_kf_db_write (NMSettings *settings);
-
---
-2.26.2
-
-
-From 8ffcba687043cded8cd229d0ea2546654ef25e04 Mon Sep 17 00:00:00 2001
-From: Thomas Haller <thaller@redhat.com>
-Date: Thu, 13 Aug 2020 10:09:09 +0200
-Subject: [PATCH 5/7] settings: suppress wrong warning about
- wait-device-timeout for devices that are still busy
-
-Imagine we wait for a device, the device appears and starts activating.
-That might take a while (during which it has a pending action). In the
-meantime, the "connection.wait-device-timeout" timeout expires.
-
-Now we want to log a warning about profiles that don't have their
-device upon timeout. However, that the device is still busy at that
-point is irrelevant. Skip logging a message about those profiles.
-
-Fixes: 3df662f534c4 ('settings: rework wait-device-timeout handling and consider device compatibility')
-(cherry picked from commit d9568ca3ee810897633bbc05f4f01e416add8182)
-(cherry picked from commit 4e6fcb4a71f708dc06117584799015644abca81f)
----
- src/settings/nm-settings.c | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c
-index ef86d2d2c836..4573d5f78ac3 100644
---- a/src/settings/nm-settings.c
-+++ b/src/settings/nm-settings.c
-@@ -479,7 +479,8 @@ _startup_complete_data_destroy (StartupCompleteData *scd)
-
- static gboolean
- _startup_complete_check_is_ready (NMSettings *self,
-- NMSettingsConnection *sett_conn)
-+ NMSettingsConnection *sett_conn,
-+ gboolean ignore_pending_actions)
- {
- NMSettingsPrivate *priv = NM_SETTINGS_GET_PRIVATE (self);
- NMConnection *conn;
-@@ -497,7 +498,8 @@ _startup_complete_check_is_ready (NMSettings *self,
- continue;
-
- if ( nm_device_get_state (device) < NM_DEVICE_STATE_UNAVAILABLE
-- || nm_device_has_pending_action (device)) {
-+ || ( !ignore_pending_actions
-+ && nm_device_has_pending_action (device))) {
- /* while a device is not yet available and still has a pending
- * action itself, it's not a suitable candidate. */
- continue;
-@@ -568,7 +570,7 @@ _startup_complete_check (NMSettings *self,
- if (scd->timeout_msec <= elapsed_msec)
- goto next_with_ready;
-
-- if (_startup_complete_check_is_ready (self, scd->sett_conn))
-+ if (_startup_complete_check_is_ready (self, scd->sett_conn, FALSE))
- goto next_with_ready;
-
- scd_not_ready = scd;
-@@ -598,7 +600,7 @@ next_with_ready:
-
- if (_LOGW_ENABLED ()) {
- c_list_for_each_entry (scd, &priv->startup_complete_scd_lst_head, scd_lst) {
-- if (!_startup_complete_check_is_ready (self, scd->sett_conn)) {
-+ if (!_startup_complete_check_is_ready (self, scd->sett_conn, TRUE)) {
- _LOGW ("startup-complete: profile \"%s\" (%s) was waiting for non-existing device (with timeout \"connection.wait-device-timeout=%"G_GINT64_FORMAT"\")",
- nm_settings_connection_get_id (scd->sett_conn),
- nm_settings_connection_get_uuid (scd->sett_conn),
---
-2.26.2
-
-
-From 3f1067a30b23e9eec12d1e39233604c6962c963d Mon Sep 17 00:00:00 2001
-From: Thomas Haller <thaller@redhat.com>
-Date: Wed, 12 Aug 2020 17:35:25 +0200
-Subject: [PATCH 6/7] initrd: always set "connection.wait-device-timeout" even
- if profile has no interface-name set
-
-Since commit 3df662f534c4 ('settings: rework wait-device-timeout
-handling and consider device compatibility'), "connection.wait-device-timeout"
-works with profiles in general and doesn't require an interface-name
-set.
-
-Remove that restriction and let initrd generator create profiles that
-always wait.
-
-(cherry picked from commit 52af5e901e4e5e7727ae83db18a37730b5f898fe)
-(cherry picked from commit f0d8d6f15778ffa861312c0c5a22f6bffe07c359)
----
- src/initrd/nmi-cmdline-reader.c | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/src/initrd/nmi-cmdline-reader.c b/src/initrd/nmi-cmdline-reader.c
-index 85be9f132eda..be39ef896fb4 100644
---- a/src/initrd/nmi-cmdline-reader.c
-+++ b/src/initrd/nmi-cmdline-reader.c
-@@ -883,11 +883,8 @@ connection_set_needed (NMConnection *connection)
- NM_SETTING_WIRED_SETTING_NAME))
- return;
-
-- if (nm_str_is_empty (nm_setting_connection_get_interface_name (s_con)))
-- return;
--
- g_object_set (s_con,
-- NM_SETTING_CONNECTION_WAIT_DEVICE_TIMEOUT, NMI_WAIT_DEVICE_TIMEOUT_MS,
-+ NM_SETTING_CONNECTION_WAIT_DEVICE_TIMEOUT, (int) NMI_WAIT_DEVICE_TIMEOUT_MS,
- NULL);
- }
-
---
-2.26.2
-
-
-From 98fca91c687084a80231d5f797f3257cc826a7fd Mon Sep 17 00:00:00 2001
-From: Thomas Haller <thaller@redhat.com>
-Date: Wed, 12 Aug 2020 16:57:02 +0200
-Subject: [PATCH 7/7] rhel8: revert changes to translated strings in libnm/docs
-
----
- clients/common/settings-docs.h.in | 2 +-
- libnm-core/nm-setting-connection.c | 9 +++++----
- 2 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/clients/common/settings-docs.h.in b/clients/common/settings-docs.h.in
-index 606a1b95c5df..7b891500d8c9 100644
---- a/clients/common/settings-docs.h.in
-+++ b/clients/common/settings-docs.h.in
-@@ -171,7 +171,7 @@
- #define DESCRIBE_DOC_NM_SETTING_CONNECTION_TIMESTAMP N_("The time, in seconds since the Unix Epoch, that the connection was last _successfully_ fully activated. NetworkManager updates the connection timestamp periodically when the connection is active to ensure that an active connection has the latest timestamp. The property is only meant for reading (changes to this property will not be preserved).")
- #define DESCRIBE_DOC_NM_SETTING_CONNECTION_TYPE N_("Base type of the connection. For hardware-dependent connections, should contain the setting name of the hardware-type specific setting (ie, \"802-3-ethernet\" or \"802-11-wireless\" or \"bluetooth\", etc), and for non-hardware dependent connections like VPN or otherwise, should contain the setting name of that setting type (ie, \"vpn\" or \"bridge\", etc).")
- #define DESCRIBE_DOC_NM_SETTING_CONNECTION_UUID N_("A universally unique identifier for the connection, for example generated with libuuid. It should be assigned when the connection is created, and never changed as long as the connection still applies to the same network. For example, it should not be changed when the \"id\" property or NMSettingIP4Config changes, but might need to be re-created when the Wi-Fi SSID, mobile broadband network provider, or \"type\" property changes. The UUID must be in the format \"2815492f-7e56-435e-b2e9-246bd7cdc664\" (ie, contains only hexadecimal characters and \"-\").")
--#define DESCRIBE_DOC_NM_SETTING_CONNECTION_WAIT_DEVICE_TIMEOUT N_("Timeout in milliseconds to wait for device at startup. During boot, devices may take a while to be detected by the driver. This property will cause to delay NetworkManager-wait-online.service and nm-online to give the device a chance to appear. This works by waiting for the given timeout until a compatible device for the profile is available and managed. The value 0 means no wait time. The default value is -1, which currently has the same meaning as no wait time.")
-+#define DESCRIBE_DOC_NM_SETTING_CONNECTION_WAIT_DEVICE_TIMEOUT N_("Timeout in milliseconds to wait for device at startup. During boot, devices may take a while to be detected by the driver. This property will cause to delay NetworkManager-wait-online.service and nm-online to give the device a chance to appear. Note that this property only works together with NMSettingConnection:interface-name to identify the device that will be waited for. The value 0 means no wait time. The default value is -1, which currently has the same meaning as no wait time.")
- #define DESCRIBE_DOC_NM_SETTING_CONNECTION_ZONE N_("The trust level of a the connection. Free form case-insensitive string (for example \"Home\", \"Work\", \"Public\"). NULL or unspecified zone means the connection will be placed in the default zone as defined by the firewall. When updating this property on a currently activated connection, the change takes effect immediately.")
- #define DESCRIBE_DOC_NM_SETTING_DCB_APP_FCOE_FLAGS N_("Specifies the NMSettingDcbFlags for the DCB FCoE application. Flags may be any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4).")
- #define DESCRIBE_DOC_NM_SETTING_DCB_APP_FCOE_MODE N_("The FCoE controller mode; either \"fabric\" (default) or \"vn2vn\".")
-diff --git a/libnm-core/nm-setting-connection.c b/libnm-core/nm-setting-connection.c
-index 03f8fb23c099..fd2309e76cc6 100644
---- a/libnm-core/nm-setting-connection.c
-+++ b/libnm-core/nm-setting-connection.c
-@@ -689,7 +689,7 @@ nm_setting_connection_is_slave_type (NMSettingConnection *setting,
- * @setting: the #NMSettingConnection
- *
- * Returns: the %NM_SETTING_CONNECTION_WAIT_DEVICE_TIMEOUT property with
-- * the timeout in milliseconds. -1 is the default.
-+ * the timeout in milli seconds. -1 is the default.
- *
- * Since: 1.20
- */
-@@ -2300,9 +2300,10 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
- * Timeout in milliseconds to wait for device at startup.
- * During boot, devices may take a while to be detected by the driver.
- * This property will cause to delay NetworkManager-wait-online.service
-- * and nm-online to give the device a chance to appear. This works by
-- * waiting for the given timeout until a compatible device for the
-- * profile is available and managed.
-+ * and nm-online to give the device a chance to appear.
-+ *
-+ * Note that this property only works together with NMSettingConnection:interface-name
-+ * to identify the device that will be waited for.
- *
- * The value 0 means no wait time. The default value is -1, which
- * currently has the same meaning as no wait time.
---
-2.26.2
-
diff --git a/SOURCES/1015-local-route-fixes-rh1868982.patch b/SOURCES/1015-local-route-fixes-rh1868982.patch
deleted file mode 100644
index 903cd98..0000000
--- a/SOURCES/1015-local-route-fixes-rh1868982.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 09c7c911d702fbe906c5c97435551416d27a2bf9 Mon Sep 17 00:00:00 2001
-From: Thomas Haller <thaller@redhat.com>
-Date: Tue, 21 Jul 2020 13:51:17 +0200
-Subject: [PATCH 1/2] core: only expose "type unicast" routes on D-Bus
-
-Currently, we would not mark non-unicast routes with their type, so they
-would wrongly appear as unicast routes in the D-Bus API.
-
-That is wrong. For now, just hide them.
-
-Fixes: 5d0d13f57010 ('platform: add support for local routes')
-(cherry picked from commit 5035687a7be4c67e32b4e08319f2e66c76b42212)
-(cherry picked from commit cf3cff4f12e78615c18fd829b1f32eac4f607c0b)
----
- src/nm-ip4-config.c | 3 +++
- src/nm-ip6-config.c | 3 +++
- 2 files changed, 6 insertions(+)
-
-diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c
-index f017a3e809f4..9ad811642317 100644
---- a/src/nm-ip4-config.c
-+++ b/src/nm-ip4-config.c
-@@ -3227,6 +3227,9 @@ out_addresses_cached:
-
- nm_assert (_route_valid (route));
-
-+ if (route->type_coerced != nm_platform_route_type_coerce (RTN_UNICAST))
-+ continue;
-+
- g_variant_builder_init (&route_builder, G_VARIANT_TYPE ("a{sv}"));
- g_variant_builder_add (&route_builder, "{sv}",
- "dest",
-diff --git a/src/nm-ip6-config.c b/src/nm-ip6-config.c
-index 1589cad004af..deb30e77d757 100644
---- a/src/nm-ip6-config.c
-+++ b/src/nm-ip6-config.c
-@@ -2682,6 +2682,9 @@ out_addresses_cached:
-
- nm_assert (_route_valid (route));
-
-+ if (route->type_coerced != nm_platform_route_type_coerce (RTN_UNICAST))
-+ continue;
-+
- g_variant_builder_init (&route_builder, G_VARIANT_TYPE ("a{sv}"));
- g_variant_builder_add (&route_builder, "{sv}",
- "dest",
---
-2.26.2
-
-
-From 52fe9dec97eb7d57594141732694453ce2db08d5 Mon Sep 17 00:00:00 2001
-From: Thomas Haller <thaller@redhat.com>
-Date: Tue, 21 Jul 2020 18:06:21 +0200
-Subject: [PATCH 2/2] core: fix selecting of best-default-route to consider
- only unicast routes
-
-Fixes: 5d0d13f57010 ('platform: add support for local routes')
-(cherry picked from commit 2a1bac6b8a7d107f33bbdb9d91eaf924fa67b64a)
-(cherry picked from commit 99b362c9443591b2b643aa09980f1a5dd42b1f6b)
----
- src/nm-ip4-config.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/nm-ip4-config.h b/src/nm-ip4-config.h
-index dc8222fd5a7b..ea0617497607 100644
---- a/src/nm-ip4-config.h
-+++ b/src/nm-ip4-config.h
-@@ -83,7 +83,8 @@ nm_ip_config_best_default_route_is (const NMPObject *obj)
- * Note that this only considers the main routing table. */
- return r
- && NM_PLATFORM_IP_ROUTE_IS_DEFAULT (r)
-- && nm_platform_route_table_is_main (r->table_coerced);
-+ && nm_platform_route_table_is_main (r->table_coerced)
-+ && r->type_coerced == nm_platform_route_type_coerce (1 /*RTN_UNICAST*/);
- }
-
- const NMPObject *_nm_ip_config_best_default_route_find_better (const NMPObject *obj_cur, const NMPObject *obj_cmp);
---
-2.26.2
-
diff --git a/SOURCES/1016-dhcp-implement-dhcp-vendor-class-identifier-option-rh1871042.patch b/SOURCES/1016-dhcp-implement-dhcp-vendor-class-identifier-option-rh1871042.patch
deleted file mode 100644
index bf03a32..0000000
--- a/SOURCES/1016-dhcp-implement-dhcp-vendor-class-identifier-option-rh1871042.patch
+++ /dev/null
@@ -1,5502 +0,0 @@
-From e5009c6ec65ec6ef41d76c2df85dc85409d817d1 Mon Sep 17 00:00:00 2001
-From: Antonio Cardace <acardace@redhat.com>
-Date: Wed, 26 Aug 2020 11:24:45 +0200
-Subject: [PATCH 1/7] version: add NM_VERSION_1_26_4/NM_AVAILABLE_IN_1_26_4
- macros
-
-Signed-off-by: Antonio Cardace <acardace@redhat.com>
-(cherry picked from commit 00132cecb59f4931b4c5a86e23b979d0a0dc7e51)
----
- libnm-core/nm-version.h | 6 ++++++
- shared/nm-version-macros.h.in | 1 +
- 2 files changed, 7 insertions(+)
-
-diff --git a/libnm-core/nm-version.h b/libnm-core/nm-version.h
-index 203840376..b96066fbe 100644
---- a/libnm-core/nm-version.h
-+++ b/libnm-core/nm-version.h
-@@ -243,6 +243,12 @@
- # define NM_AVAILABLE_IN_1_26
- #endif
-
-+#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_26_4
-+# define NM_AVAILABLE_IN_1_26_4 G_UNAVAILABLE(1,26.4)
-+#else
-+# define NM_AVAILABLE_IN_1_26_4
-+#endif
-+
- /*
- * Synchronous API for calling D-Bus in libnm is deprecated. See
- * https://developer.gnome.org/libnm/stable/usage.html#sync-api
-diff --git a/shared/nm-version-macros.h.in b/shared/nm-version-macros.h.in
-index 83da86ce1..858b70832 100644
---- a/shared/nm-version-macros.h.in
-+++ b/shared/nm-version-macros.h.in
-@@ -65,6 +65,7 @@
- #define NM_VERSION_1_22 (NM_ENCODE_VERSION (1, 22, 0))
- #define NM_VERSION_1_24 (NM_ENCODE_VERSION (1, 24, 0))
- #define NM_VERSION_1_26 (NM_ENCODE_VERSION (1, 26, 0))
-+#define NM_VERSION_1_26_4 (NM_ENCODE_VERSION (1, 26, 4))
-
- /* For releases, NM_API_VERSION is equal to NM_VERSION.
- *
---
-2.26.2
-
-
-From 409d04a8fee63a2a133d41639785ed60ed5b4548 Mon Sep 17 00:00:00 2001
-From: Antonio Cardace <acardace@redhat.com>
-Date: Mon, 24 Aug 2020 18:01:42 +0200
-Subject: [PATCH 2/7] libnm-core,clients: add support for
- ipv4.dhcp-vendor-class-identifier option
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1871042
-Signed-off-by: Antonio Cardace <acardace@redhat.com>
-(cherry picked from commit d7235394b2f2ace930d0ebcdb68d5fc0fc9938a2)
-(cherry picked from commit 555f2bfc61553dc63709b7be076eecf42aadb5ba)
----
- clients/common/nm-meta-setting-desc.c | 3 +
- clients/common/settings-docs.h.in | 1 +
- .../test_003.expected | 482 +++++++------
- .../test_004.expected | 678 ++++++++++--------
- libnm-core/nm-setting-ip4-config.c | 101 +++
- libnm-core/nm-setting-ip4-config.h | 8 +-
- libnm-core/tests/test-general.c | 47 +-
- libnm/libnm.ver | 5 +
- man/NetworkManager.conf.xml | 4 +
- 9 files changed, 792 insertions(+), 537 deletions(-)
-
-diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c
-index 2ac91b415..3519df488 100644
---- a/clients/common/nm-meta-setting-desc.c
-+++ b/clients/common/nm-meta-setting-desc.c
-@@ -5834,6 +5834,9 @@ static const NMMetaPropertyInfo *const property_infos_IP4_CONFIG[] = {
- ),
- ),
- ),
-+ PROPERTY_INFO_WITH_DESC (NM_SETTING_IP4_CONFIG_DHCP_VENDOR_CLASS_IDENTIFIER,
-+ .property_type = &_pt_gobject_string,
-+ ),
- NULL
- };
-
-diff --git a/clients/common/settings-docs.h.in b/clients/common/settings-docs.h.in
-index 7b891500d..b694eade3 100644
---- a/clients/common/settings-docs.h.in
-+++ b/clients/common/settings-docs.h.in
-@@ -229,6 +229,7 @@
- #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_IAID N_("A string containing the \"Identity Association Identifier\" (IAID) used by the DHCP client. The property is a 32-bit decimal value or a special value among \"mac\", \"perm-mac\", \"ifname\" and \"stable\". When set to \"mac\" (or \"perm-mac\"), the last 4 bytes of the current (or permanent) MAC address are used as IAID. When set to \"ifname\", the IAID is computed by hashing the interface name. The special value \"stable\" can be used to generate an IAID based on the stable-id (see connection.stable-id), a per-host key and the interface name. When the property is unset, the value from global configuration is used; if no global default is set then the IAID is assumed to be \"ifname\". Note that at the moment this property is ignored for IPv6 by dhclient, which always derives the IAID from the MAC address.")
- #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME N_("If TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer. If the \"dhcp-hostname\" property is NULL and this property is TRUE, the current persistent hostname of the computer is sent.")
- #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_TIMEOUT N_("A timeout for a DHCP transaction in seconds. If zero (the default), a globally configured default is used. If still unspecified, a device specific timeout is used (usually 45 seconds). Set to 2147483647 (MAXINT32) for infinity.")
-+#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_VENDOR_CLASS_IDENTIFIER N_("The Vendor Class Identifier DHCP option (60). Special characters in the data string may be escaped using C-style escapes, nevertheless this property cannot contain nul bytes. If the per-profile value is unspecified (the default), a global connection default gets consulted. If still unspecified, the DHCP option is not sent to the server. Since 1.28, 1.26.4")
- #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS N_("Array of IP addresses of DNS servers.")
- #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS_OPTIONS N_("Array of DNS options as described in man 5 resolv.conf. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties. The currently supported options are \"attempts\", \"debug\", \"edns0\", \"inet6\", \"ip6-bytestring\", \"ip6-dotint\", \"ndots\", \"no-check-names\", \"no-ip6-dotint\", \"no-reload\", \"no-tld-query\", \"rotate\", \"single-request\", \"single-request-reopen\", \"timeout\", \"trust-ad\", \"use-vc\". The \"trust-ad\" setting is only honored if the profile contributes name servers to resolv.conf, and if all contributing profiles have \"trust-ad\" enabled.")
- #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS_PRIORITY N_("DNS servers priority. The relative priority for DNS servers specified by this setting. A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 50 for VPNs (including WireGuard) and 100 for other connections. Note that the priority is to order DNS settings for multiple active connections. It does not disambiguate multiple DNS servers within the same connection profile. When using dns=default, servers with higher priority will be on top of resolv.conf. To prioritize a given server over another one within the same connection, just specify them in the desired order. When multiple devices have configurations with the same priority, VPNs will be considered first, then devices with the best (lowest metric) default route and then all other devices. Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least one negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports Conditional Forwarding as dns=dnsmasq or dns=systemd-resolved, each connection is used to query domains in its search list. Queries for domains not present in any search list are routed through connections having the '~.' special wildcard domain, which is added automatically to connections with the default route (or can be added manually). When multiple connections specify the same domain, the one with the highest priority (lowest numerical value) wins. If a connection specifies a domain which is subdomain of another domain with a negative DNS priority value, the subdomain is ignored.")
-diff --git a/clients/tests/test-client.check-on-disk/test_003.expected b/clients/tests/test-client.check-on-disk/test_003.expected
-index 74a434769..50d02d815 100644
---- a/clients/tests/test-client.check-on-disk/test_003.expected
-+++ b/clients/tests/test-client.check-on-disk/test_003.expected
-@@ -150,12 +150,12 @@ id
- path
- uuid
- <<<
--size: 4447
-+size: 4490
- location: clients/tests/test-client.py:test_003()/12
- cmd: $NMCLI con s con-gsm1
- lang: C
- returncode: 0
--stdout: 4317 bytes
-+stdout: 4360 bytes
- >>>
- connection.id: con-gsm1
- connection.uuid: UUID-con-gsm1-REPLACED-REPLACED-REPL
-@@ -204,6 +204,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: no
- ipv4.may-fail: yes
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -254,12 +255,12 @@ proxy.pac-url: --
- proxy.pac-script: --
-
- <<<
--size: 4477
-+size: 4520
- location: clients/tests/test-client.py:test_003()/13
- cmd: $NMCLI con s con-gsm1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 4337 bytes
-+stdout: 4380 bytes
- >>>
- connection.id: con-gsm1
- connection.uuid: UUID-con-gsm1-REPLACED-REPLACED-REPL
-@@ -308,6 +309,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: nie
- ipv4.may-fail: tak
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -490,12 +492,12 @@ UUID NAME
- UUID-ethernet-REPLACED-REPLACED-REPL ethernet
-
- <<<
--size: 4222
-+size: 4265
- location: clients/tests/test-client.py:test_003()/25
- cmd: $NMCLI -f ALL con s ethernet
- lang: C
- returncode: 0
--stdout: 4085 bytes
-+stdout: 4128 bytes
- >>>
- connection.id: ethernet
- connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
-@@ -558,6 +560,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: no
- ipv4.may-fail: yes
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -589,12 +592,12 @@ proxy.pac-url: --
- proxy.pac-script: --
-
- <<<
--size: 4250
-+size: 4293
- location: clients/tests/test-client.py:test_003()/26
- cmd: $NMCLI -f ALL con s ethernet
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 4103 bytes
-+stdout: 4146 bytes
- >>>
- connection.id: ethernet
- connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
-@@ -657,6 +660,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: nie
- ipv4.may-fail: tak
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -708,12 +712,12 @@ stdout: 51 bytes
- GENERAL.STATE: aktywowano
-
- <<<
--size: 4922
-+size: 4965
- location: clients/tests/test-client.py:test_003()/29
- cmd: $NMCLI con s ethernet
- lang: C
- returncode: 0
--stdout: 4792 bytes
-+stdout: 4835 bytes
- >>>
- connection.id: ethernet
- connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
-@@ -776,6 +780,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: no
- ipv4.may-fail: yes
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -820,12 +825,12 @@ GENERAL.ZONE: --
- GENERAL.MASTER-PATH: --
-
- <<<
--size: 4954
-+size: 4997
- location: clients/tests/test-client.py:test_003()/30
- cmd: $NMCLI con s ethernet
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 4814 bytes
-+stdout: 4857 bytes
- >>>
- connection.id: ethernet
- connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
-@@ -888,6 +893,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: nie
- ipv4.may-fail: tak
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -1406,12 +1412,12 @@ UUID NAME
- UUID-ethernet-REPLACED-REPLACED-REPL ethernet
-
- <<<
--size: 4222
-+size: 4265
- location: clients/tests/test-client.py:test_003()/50
- cmd: $NMCLI -f ALL con s ethernet
- lang: C
- returncode: 0
--stdout: 4085 bytes
-+stdout: 4128 bytes
- >>>
- connection.id: ethernet
- connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
-@@ -1474,6 +1480,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: no
- ipv4.may-fail: yes
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -1505,12 +1512,12 @@ proxy.pac-url: --
- proxy.pac-script: --
-
- <<<
--size: 4250
-+size: 4293
- location: clients/tests/test-client.py:test_003()/51
- cmd: $NMCLI -f ALL con s ethernet
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 4103 bytes
-+stdout: 4146 bytes
- >>>
- connection.id: ethernet
- connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
-@@ -1573,6 +1580,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: nie
- ipv4.may-fail: tak
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -1628,12 +1636,12 @@ GENERAL.STATE: aktywowano
- GENERAL.STATE: aktywowano
-
- <<<
--size: 5630
-+size: 5673
- location: clients/tests/test-client.py:test_003()/54
- cmd: $NMCLI con s ethernet
- lang: C
- returncode: 0
--stdout: 5500 bytes
-+stdout: 5543 bytes
- >>>
- connection.id: ethernet
- connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
-@@ -1696,6 +1704,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: no
- ipv4.may-fail: yes
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -1754,12 +1763,12 @@ GENERAL.ZONE: --
- GENERAL.MASTER-PATH: --
-
- <<<
--size: 5666
-+size: 5709
- location: clients/tests/test-client.py:test_003()/55
- cmd: $NMCLI con s ethernet
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 5526 bytes
-+stdout: 5569 bytes
- >>>
- connection.id: ethernet
- connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
-@@ -1822,6 +1831,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: nie
- ipv4.may-fail: tak
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -2272,12 +2282,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL gsm
- UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet
-
- <<<
--size: 5633
-+size: 5676
- location: clients/tests/test-client.py:test_003()/68
- cmd: $NMCLI con s ethernet
- lang: C
- returncode: 0
--stdout: 5503 bytes
-+stdout: 5546 bytes
- >>>
- connection.id: ethernet
- connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
-@@ -2340,6 +2350,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: no
- ipv4.may-fail: yes
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -2398,12 +2409,12 @@ GENERAL.ZONE: --
- GENERAL.MASTER-PATH: --
-
- <<<
--size: 5670
-+size: 5713
- location: clients/tests/test-client.py:test_003()/69
- cmd: $NMCLI con s ethernet
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 5530 bytes
-+stdout: 5573 bytes
- >>>
- connection.id: ethernet
- connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
-@@ -2466,6 +2477,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: nie
- ipv4.may-fail: tak
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -2524,12 +2536,12 @@ GENERAL.ZONE: --
- GENERAL.MASTER-PATH: --
-
- <<<
--size: 4965
-+size: 5008
- location: clients/tests/test-client.py:test_003()/70
- cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1
- lang: C
- returncode: 0
--stdout: 4795 bytes
-+stdout: 4838 bytes
- >>>
- connection.id: ethernet
- connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
-@@ -2592,6 +2604,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: no
- ipv4.may-fail: yes
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -2636,12 +2649,12 @@ GENERAL.ZONE: --
- GENERAL.MASTER-PATH: --
-
- <<<
--size: 4998
-+size: 5041
- location: clients/tests/test-client.py:test_003()/71
- cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 4818 bytes
-+stdout: 4861 bytes
- >>>
- connection.id: ethernet
- connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
-@@ -2704,6 +2717,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: nie
- ipv4.may-fail: tak
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -2948,12 +2962,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL gsm
- UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet
-
- <<<
--size: 5645
-+size: 5688
- location: clients/tests/test-client.py:test_003()/78
- cmd: $NMCLI --color yes con s ethernet
- lang: C
- returncode: 0
--stdout: 5503 bytes
-+stdout: 5546 bytes
- >>>
- connection.id: ethernet
- connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
-@@ -3016,6 +3030,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: no
- ipv4.may-fail: yes
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -3074,12 +3089,12 @@ GENERAL.ZONE: --
- GENERAL.MASTER-PATH: --
-
- <<<
--size: 5682
-+size: 5725
- location: clients/tests/test-client.py:test_003()/79
- cmd: $NMCLI --color yes con s ethernet
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 5530 bytes
-+stdout: 5573 bytes
- >>>
- connection.id: ethernet
- connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
-@@ -3142,6 +3157,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: nie
- ipv4.may-fail: tak
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -3200,12 +3216,12 @@ GENERAL.ZONE: --
- GENERAL.MASTER-PATH: --
-
- <<<
--size: 4977
-+size: 5020
- location: clients/tests/test-client.py:test_003()/80
- cmd: $NMCLI --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
- lang: C
- returncode: 0
--stdout: 4795 bytes
-+stdout: 4838 bytes
- >>>
- connection.id: ethernet
- connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
-@@ -3268,6 +3284,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: no
- ipv4.may-fail: yes
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -3312,12 +3329,12 @@ GENERAL.ZONE: --
- GENERAL.MASTER-PATH: --
-
- <<<
--size: 5010
-+size: 5053
- location: clients/tests/test-client.py:test_003()/81
- cmd: $NMCLI --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 4818 bytes
-+stdout: 4861 bytes
- >>>
- connection.id: ethernet
- connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
-@@ -3380,6 +3397,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: nie
- ipv4.may-fail: tak
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -3640,12 +3658,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL gsm
- UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet
-
- <<<
--size: 6887
-+size: 6930
- location: clients/tests/test-client.py:test_003()/88
- cmd: $NMCLI --pretty con s ethernet
- lang: C
- returncode: 0
--stdout: 6748 bytes
-+stdout: 6791 bytes
- >>>
- ===============================================================================
- Connection profile details (ethernet)
-@@ -3713,6 +3731,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: no
- ipv4.may-fail: yes
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- -------------------------------------------------------------------------------
- ipv6.method: auto
- ipv6.dns: --
-@@ -3782,12 +3801,12 @@ GENERAL.MASTER-PATH: --
- -------------------------------------------------------------------------------
-
- <<<
--size: 6943
-+size: 6986
- location: clients/tests/test-client.py:test_003()/89
- cmd: $NMCLI --pretty con s ethernet
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 6794 bytes
-+stdout: 6837 bytes
- >>>
- ===============================================================================
- Szczegóły profilu połączenia (ethernet)
-@@ -3855,6 +3874,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: nie
- ipv4.may-fail: tak
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- -------------------------------------------------------------------------------
- ipv6.method: auto
- ipv6.dns: --
-@@ -3924,12 +3944,12 @@ GENERAL.MASTER-PATH: --
- -------------------------------------------------------------------------------
-
- <<<
--size: 5906
-+size: 5949
- location: clients/tests/test-client.py:test_003()/90
- cmd: $NMCLI --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
- lang: C
- returncode: 0
--stdout: 5727 bytes
-+stdout: 5770 bytes
- >>>
- ===============================================================================
- Connection profile details (ethernet)
-@@ -3997,6 +4017,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: no
- ipv4.may-fail: yes
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- -------------------------------------------------------------------------------
- ipv6.method: auto
- ipv6.dns: --
-@@ -4048,12 +4069,12 @@ GENERAL.MASTER-PATH: --
- -------------------------------------------------------------------------------
-
- <<<
--size: 5951
-+size: 5994
- location: clients/tests/test-client.py:test_003()/91
- cmd: $NMCLI --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 5762 bytes
-+stdout: 5805 bytes
- >>>
- ===============================================================================
- Szczegóły profilu połączenia (ethernet)
-@@ -4121,6 +4142,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: nie
- ipv4.may-fail: tak
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- -------------------------------------------------------------------------------
- ipv6.method: auto
- ipv6.dns: --
-@@ -4412,12 +4434,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL gsm
- UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet
-
- <<<
--size: 6899
-+size: 6942
- location: clients/tests/test-client.py:test_003()/98
- cmd: $NMCLI --pretty --color yes con s ethernet
- lang: C
- returncode: 0
--stdout: 6748 bytes
-+stdout: 6791 bytes
- >>>
- ===============================================================================
- Connection profile details (ethernet)
-@@ -4485,6 +4507,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: no
- ipv4.may-fail: yes
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- -------------------------------------------------------------------------------
- ipv6.method: auto
- ipv6.dns: --
-@@ -4554,12 +4577,12 @@ GENERAL.MASTER-PATH: --
- -------------------------------------------------------------------------------
-
- <<<
--size: 6955
-+size: 6998
- location: clients/tests/test-client.py:test_003()/99
- cmd: $NMCLI --pretty --color yes con s ethernet
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 6794 bytes
-+stdout: 6837 bytes
- >>>
- ===============================================================================
- Szczegóły profilu połączenia (ethernet)
-@@ -4627,6 +4650,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: nie
- ipv4.may-fail: tak
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- -------------------------------------------------------------------------------
- ipv6.method: auto
- ipv6.dns: --
-@@ -4696,12 +4720,12 @@ GENERAL.MASTER-PATH: --
- -------------------------------------------------------------------------------
-
- <<<
--size: 5919
-+size: 5962
- location: clients/tests/test-client.py:test_003()/100
- cmd: $NMCLI --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
- lang: C
- returncode: 0
--stdout: 5727 bytes
-+stdout: 5770 bytes
- >>>
- ===============================================================================
- Connection profile details (ethernet)
-@@ -4769,6 +4793,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: no
- ipv4.may-fail: yes
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- -------------------------------------------------------------------------------
- ipv6.method: auto
- ipv6.dns: --
-@@ -4820,12 +4845,12 @@ GENERAL.MASTER-PATH: --
- -------------------------------------------------------------------------------
-
- <<<
--size: 5964
-+size: 6007
- location: clients/tests/test-client.py:test_003()/101
- cmd: $NMCLI --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 5762 bytes
-+stdout: 5805 bytes
- >>>
- ===============================================================================
- Szczegóły profilu połączenia (ethernet)
-@@ -4893,6 +4918,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: nie
- ipv4.may-fail: tak
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- -------------------------------------------------------------------------------
- ipv6.method: auto
- ipv6.dns: --
-@@ -5164,12 +5190,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL:gsm
- UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
-
- <<<
--size: 3001
-+size: 3036
- location: clients/tests/test-client.py:test_003()/108
- cmd: $NMCLI --terse con s ethernet
- lang: C
- returncode: 0
--stdout: 2862 bytes
-+stdout: 2897 bytes
- >>>
- connection.id:ethernet
- connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
-@@ -5232,6 +5258,7 @@ ipv4.dhcp-hostname-flags:0x0
- ipv4.never-default:no
- ipv4.may-fail:yes
- ipv4.dad-timeout:-1
-+ipv4.dhcp-vendor-class-identifier:
- ipv6.method:auto
- ipv6.dns:
- ipv6.dns-search:
-@@ -5290,12 +5317,12 @@ GENERAL.ZONE:
- GENERAL.MASTER-PATH:
-
- <<<
--size: 3011
-+size: 3046
- location: clients/tests/test-client.py:test_003()/109
- cmd: $NMCLI --terse con s ethernet
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 2862 bytes
-+stdout: 2897 bytes
- >>>
- connection.id:ethernet
- connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
-@@ -5358,6 +5385,7 @@ ipv4.dhcp-hostname-flags:0x0
- ipv4.never-default:no
- ipv4.may-fail:yes
- ipv4.dad-timeout:-1
-+ipv4.dhcp-vendor-class-identifier:
- ipv6.method:auto
- ipv6.dns:
- ipv6.dns-search:
-@@ -5416,12 +5444,12 @@ GENERAL.ZONE:
- GENERAL.MASTER-PATH:
-
- <<<
--size: 2655
-+size: 2690
- location: clients/tests/test-client.py:test_003()/110
- cmd: $NMCLI --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
- lang: C
- returncode: 0
--stdout: 2476 bytes
-+stdout: 2511 bytes
- >>>
- connection.id:ethernet
- connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
-@@ -5484,6 +5512,7 @@ ipv4.dhcp-hostname-flags:0x0
- ipv4.never-default:no
- ipv4.may-fail:yes
- ipv4.dad-timeout:-1
-+ipv4.dhcp-vendor-class-identifier:
- ipv6.method:auto
- ipv6.dns:
- ipv6.dns-search:
-@@ -5528,12 +5557,12 @@ GENERAL.ZONE:
- GENERAL.MASTER-PATH:
-
- <<<
--size: 2665
-+size: 2700
- location: clients/tests/test-client.py:test_003()/111
- cmd: $NMCLI --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 2476 bytes
-+stdout: 2511 bytes
- >>>
- connection.id:ethernet
- connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
-@@ -5596,6 +5625,7 @@ ipv4.dhcp-hostname-flags:0x0
- ipv4.never-default:no
- ipv4.may-fail:yes
- ipv4.dad-timeout:-1
-+ipv4.dhcp-vendor-class-identifier:
- ipv6.method:auto
- ipv6.dns:
- ipv6.dns-search:
-@@ -5836,12 +5866,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL:gsm
- UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
-
- <<<
--size: 3013
-+size: 3048
- location: clients/tests/test-client.py:test_003()/118
- cmd: $NMCLI --terse --color yes con s ethernet
- lang: C
- returncode: 0
--stdout: 2862 bytes
-+stdout: 2897 bytes
- >>>
- connection.id:ethernet
- connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
-@@ -5904,6 +5934,7 @@ ipv4.dhcp-hostname-flags:0x0
- ipv4.never-default:no
- ipv4.may-fail:yes
- ipv4.dad-timeout:-1
-+ipv4.dhcp-vendor-class-identifier:
- ipv6.method:auto
- ipv6.dns:
- ipv6.dns-search:
-@@ -5962,12 +5993,12 @@ GENERAL.ZONE:
- GENERAL.MASTER-PATH:
-
- <<<
--size: 3023
-+size: 3058
- location: clients/tests/test-client.py:test_003()/119
- cmd: $NMCLI --terse --color yes con s ethernet
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 2862 bytes
-+stdout: 2897 bytes
- >>>
- connection.id:ethernet
- connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
-@@ -6030,6 +6061,7 @@ ipv4.dhcp-hostname-flags:0x0
- ipv4.never-default:no
- ipv4.may-fail:yes
- ipv4.dad-timeout:-1
-+ipv4.dhcp-vendor-class-identifier:
- ipv6.method:auto
- ipv6.dns:
- ipv6.dns-search:
-@@ -6088,12 +6120,12 @@ GENERAL.ZONE:
- GENERAL.MASTER-PATH:
-
- <<<
--size: 2667
-+size: 2702
- location: clients/tests/test-client.py:test_003()/120
- cmd: $NMCLI --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
- lang: C
- returncode: 0
--stdout: 2476 bytes
-+stdout: 2511 bytes
- >>>
- connection.id:ethernet
- connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
-@@ -6156,6 +6188,7 @@ ipv4.dhcp-hostname-flags:0x0
- ipv4.never-default:no
- ipv4.may-fail:yes
- ipv4.dad-timeout:-1
-+ipv4.dhcp-vendor-class-identifier:
- ipv6.method:auto
- ipv6.dns:
- ipv6.dns-search:
-@@ -6200,12 +6233,12 @@ GENERAL.ZONE:
- GENERAL.MASTER-PATH:
-
- <<<
--size: 2677
-+size: 2712
- location: clients/tests/test-client.py:test_003()/121
- cmd: $NMCLI --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 2476 bytes
-+stdout: 2511 bytes
- >>>
- connection.id:ethernet
- connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
-@@ -6268,6 +6301,7 @@ ipv4.dhcp-hostname-flags:0x0
- ipv4.never-default:no
- ipv4.may-fail:yes
- ipv4.dad-timeout:-1
-+ipv4.dhcp-vendor-class-identifier:
- ipv6.method:auto
- ipv6.dns:
- ipv6.dns-search:
-@@ -6512,12 +6546,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL gsm
- UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet
-
- <<<
--size: 3736
-+size: 3796
- location: clients/tests/test-client.py:test_003()/128
- cmd: $NMCLI --mode tabular con s ethernet
- lang: C
- returncode: 0
--stdout: 3590 bytes
-+stdout: 3650 bytes
- >>>
- name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout
- connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1
-@@ -6525,8 +6559,8 @@ connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-eth
- name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password
- 802-3-ethernet -- 0 -- no -- -- -- -- auto -- -- -- default --
-
--name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout
--ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default)
-+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout dhcp-vendor-class-identifier
-+ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) --
-
- name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token
- ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no no yes -1 (unknown) stable-privacy 0 (default) -- -- 0 (default) yes -- 0x0 (none) --
-@@ -6543,12 +6577,12 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 -- deac
-
-
- <<<
--size: 3770
-+size: 3830
- location: clients/tests/test-client.py:test_003()/129
- cmd: $NMCLI --mode tabular con s ethernet
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 3614 bytes
-+stdout: 3674 bytes
- >>>
- name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout
- connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1
-@@ -6556,8 +6590,8 @@ connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-eth
- name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password
- 802-3-ethernet -- 0 -- nie -- -- -- -- automatyczne -- -- -- default --
-
--name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout
--ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default)
-+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout dhcp-vendor-class-identifier
-+ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) --
-
- name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token
- ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie nie tak -1 (unknown) stable-privacy 0 (default) -- -- 0 (default) tak -- 0x0 (none) --
-@@ -6574,12 +6608,12 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 -- deza
-
-
- <<<
--size: 3274
-+size: 3334
- location: clients/tests/test-client.py:test_003()/130
- cmd: $NMCLI --mode tabular c s /org/freedesktop/NetworkManager/ActiveConnection/1
- lang: C
- returncode: 0
--stdout: 3088 bytes
-+stdout: 3148 bytes
- >>>
- name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout
- connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1
-@@ -6587,8 +6621,8 @@ connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-eth
- name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password
- 802-3-ethernet -- 0 -- no -- -- -- -- auto -- -- -- default --
-
--name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout
--ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default)
-+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout dhcp-vendor-class-identifier
-+ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) --
-
- name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token
- ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no no yes -1 (unknown) stable-privacy 0 (default) -- -- 0 (default) yes -- 0x0 (none) --
-@@ -6601,12 +6635,12 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 -- deac
-
-
- <<<
--size: 3306
-+size: 3366
- location: clients/tests/test-client.py:test_003()/131
- cmd: $NMCLI --mode tabular c s /org/freedesktop/NetworkManager/ActiveConnection/1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 3110 bytes
-+stdout: 3170 bytes
- >>>
- name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout
- connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1
-@@ -6614,8 +6648,8 @@ connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-eth
- name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password
- 802-3-ethernet -- 0 -- nie -- -- -- -- automatyczne -- -- -- default --
-
--name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout
--ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default)
-+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout dhcp-vendor-class-identifier
-+ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) --
-
- name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token
- ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie nie tak -1 (unknown) stable-privacy 0 (default) -- -- 0 (default) tak -- 0x0 (none) --
-@@ -6756,12 +6790,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL gsm
- UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet
-
- <<<
--size: 3748
-+size: 3808
- location: clients/tests/test-client.py:test_003()/138
- cmd: $NMCLI --mode tabular --color yes con s ethernet
- lang: C
- returncode: 0
--stdout: 3590 bytes
-+stdout: 3650 bytes
- >>>
- name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout
- connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1
-@@ -6769,8 +6803,8 @@ connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-eth
- name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password
- 802-3-ethernet -- 0 -- no -- -- -- -- auto -- -- -- default --
-
--name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout
--ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default)
-+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout dhcp-vendor-class-identifier
-+ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) --
-
- name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token
- ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no no yes -1 (unknown) stable-privacy 0 (default) -- -- 0 (default) yes -- 0x0 (none) --
-@@ -6787,12 +6821,12 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 -- deac
-
-
- <<<
--size: 3782
-+size: 3842
- location: clients/tests/test-client.py:test_003()/139
- cmd: $NMCLI --mode tabular --color yes con s ethernet
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 3614 bytes
-+stdout: 3674 bytes
- >>>
- name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout
- connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1
-@@ -6800,8 +6834,8 @@ connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-eth
- name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password
- 802-3-ethernet -- 0 -- nie -- -- -- -- automatyczne -- -- -- default --
-
--name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout
--ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default)
-+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout dhcp-vendor-class-identifier
-+ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) --
-
- name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token
- ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie nie tak -1 (unknown) stable-privacy 0 (default) -- -- 0 (default) tak -- 0x0 (none) --
-@@ -6818,12 +6852,12 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 -- deza
-
-
- <<<
--size: 3286
-+size: 3346
- location: clients/tests/test-client.py:test_003()/140
- cmd: $NMCLI --mode tabular --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
- lang: C
- returncode: 0
--stdout: 3088 bytes
-+stdout: 3148 bytes
- >>>
- name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout
- connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1
-@@ -6831,8 +6865,8 @@ connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-eth
- name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password
- 802-3-ethernet -- 0 -- no -- -- -- -- auto -- -- -- default --
-
--name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout
--ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default)
-+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout dhcp-vendor-class-identifier
-+ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) --
-
- name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token
- ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no no yes -1 (unknown) stable-privacy 0 (default) -- -- 0 (default) yes -- 0x0 (none) --
-@@ -6845,12 +6879,12 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 -- deac
-
-
- <<<
--size: 3318
-+size: 3378
- location: clients/tests/test-client.py:test_003()/141
- cmd: $NMCLI --mode tabular --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 3110 bytes
-+stdout: 3170 bytes
- >>>
- name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout
- connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1
-@@ -6858,8 +6892,8 @@ connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-eth
- name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password
- 802-3-ethernet -- 0 -- nie -- -- -- -- automatyczne -- -- -- default --
-
--name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout
--ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default)
-+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout dhcp-vendor-class-identifier
-+ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) --
-
- name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token
- ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie nie tak -1 (unknown) stable-privacy 0 (default) -- -- 0 (default) tak -- 0x0 (none) --
-@@ -7016,12 +7050,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL gsm
- UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet
-
- <<<
--size: 6089
-+size: 6179
- location: clients/tests/test-client.py:test_003()/148
- cmd: $NMCLI --mode tabular --pretty con s ethernet
- lang: C
- returncode: 0
--stdout: 5934 bytes
-+stdout: 6024 bytes
- >>>
- =========================================
- Connection profile details (ethernet)
-@@ -7034,9 +7068,9 @@ name port speed duplex auto-negotiate mac-address cloned-mac-add
- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- 802-3-ethernet -- 0 -- no -- -- -- -- auto -- -- -- default --
-
--name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default)
-+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout dhcp-vendor-class-identifier
-+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-+ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) --
-
- name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token
- --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-@@ -7063,12 +7097,12 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 -- deac
-
-
- <<<
--size: 6183
-+size: 6273
- location: clients/tests/test-client.py:test_003()/149
- cmd: $NMCLI --mode tabular --pretty con s ethernet
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 6018 bytes
-+stdout: 6108 bytes
- >>>
- ===========================================
- Szczegóły profilu połączenia (ethernet)
-@@ -7081,9 +7115,9 @@ name port speed duplex auto-negotiate mac-address cloned-mac-add
- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- 802-3-ethernet -- 0 -- nie -- -- -- -- automatyczne -- -- -- default --
-
--name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default)
-+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout dhcp-vendor-class-identifier
-+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-+ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) --
-
- name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token
- --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-@@ -7110,12 +7144,12 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 -- deza
-
-
- <<<
--size: 5165
-+size: 5255
- location: clients/tests/test-client.py:test_003()/150
- cmd: $NMCLI --mode tabular --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
- lang: C
- returncode: 0
--stdout: 4970 bytes
-+stdout: 5060 bytes
- >>>
- =========================================
- Connection profile details (ethernet)
-@@ -7128,9 +7162,9 @@ name port speed duplex auto-negotiate mac-address cloned-mac-add
- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- 802-3-ethernet -- 0 -- no -- -- -- -- auto -- -- -- default --
-
--name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default)
-+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout dhcp-vendor-class-identifier
-+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-+ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) --
-
- name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token
- --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-@@ -7149,12 +7183,12 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 -- deac
-
-
- <<<
--size: 5237
-+size: 5327
- location: clients/tests/test-client.py:test_003()/151
- cmd: $NMCLI --mode tabular --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 5032 bytes
-+stdout: 5122 bytes
- >>>
- ===========================================
- Szczegóły profilu połączenia (ethernet)
-@@ -7167,9 +7201,9 @@ name port speed duplex auto-negotiate mac-address cloned-mac-add
- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- 802-3-ethernet -- 0 -- nie -- -- -- -- automatyczne -- -- -- default --
-
--name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default)
-+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout dhcp-vendor-class-identifier
-+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-+ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) --
-
- name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token
- --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-@@ -7356,12 +7390,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL gsm
- UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet
-
- <<<
--size: 6101
-+size: 6191
- location: clients/tests/test-client.py:test_003()/158
- cmd: $NMCLI --mode tabular --pretty --color yes con s ethernet
- lang: C
- returncode: 0
--stdout: 5934 bytes
-+stdout: 6024 bytes
- >>>
- =========================================
- Connection profile details (ethernet)
-@@ -7374,9 +7408,9 @@ name port speed duplex auto-negotiate mac-address cloned-mac-add
- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- 802-3-ethernet -- 0 -- no -- -- -- -- auto -- -- -- default --
-
--name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default)
-+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout dhcp-vendor-class-identifier
-+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-+ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) --
-
- name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token
- --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-@@ -7403,12 +7437,12 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 -- deac
-
-
- <<<
--size: 6195
-+size: 6285
- location: clients/tests/test-client.py:test_003()/159
- cmd: $NMCLI --mode tabular --pretty --color yes con s ethernet
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 6018 bytes
-+stdout: 6108 bytes
- >>>
- ===========================================
- Szczegóły profilu połączenia (ethernet)
-@@ -7421,9 +7455,9 @@ name port speed duplex auto-negotiate mac-address cloned-mac-add
- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- 802-3-ethernet -- 0 -- nie -- -- -- -- automatyczne -- -- -- default --
-
--name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default)
-+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout dhcp-vendor-class-identifier
-+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-+ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) --
-
- name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token
- --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-@@ -7450,12 +7484,12 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 -- deza
-
-
- <<<
--size: 5177
-+size: 5267
- location: clients/tests/test-client.py:test_003()/160
- cmd: $NMCLI --mode tabular --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
- lang: C
- returncode: 0
--stdout: 4970 bytes
-+stdout: 5060 bytes
- >>>
- =========================================
- Connection profile details (ethernet)
-@@ -7468,9 +7502,9 @@ name port speed duplex auto-negotiate mac-address cloned-mac-add
- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- 802-3-ethernet -- 0 -- no -- -- -- -- auto -- -- -- default --
-
--name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default)
-+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout dhcp-vendor-class-identifier
-+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-+ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) --
-
- name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token
- --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-@@ -7489,12 +7523,12 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 -- deac
-
-
- <<<
--size: 5249
-+size: 5339
- location: clients/tests/test-client.py:test_003()/161
- cmd: $NMCLI --mode tabular --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 5032 bytes
-+stdout: 5122 bytes
- >>>
- ===========================================
- Szczegóły profilu połączenia (ethernet)
-@@ -7507,9 +7541,9 @@ name port speed duplex auto-negotiate mac-address cloned-mac-add
- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- 802-3-ethernet -- 0 -- nie -- -- -- -- automatyczne -- -- -- default --
-
--name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default)
-+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout dhcp-vendor-class-identifier
-+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-+ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) --
-
- name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token
- --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-@@ -7676,16 +7710,16 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL:gsm
- UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
-
- <<<
--size: 843
-+size: 844
- location: clients/tests/test-client.py:test_003()/168
- cmd: $NMCLI --mode tabular --terse con s ethernet
- lang: C
- returncode: 0
--stdout: 690 bytes
-+stdout: 691 bytes
- >>>
- connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
- 802-3-ethernet::0::no:::::auto::::default:
--ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
-+ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1:
- ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
- proxy:none:no::
- GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1::activated:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/4::
-@@ -7693,16 +7727,16 @@ GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1::activated:no:no::no:
- GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0::deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
-
- <<<
--size: 853
-+size: 854
- location: clients/tests/test-client.py:test_003()/169
- cmd: $NMCLI --mode tabular --terse con s ethernet
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 690 bytes
-+stdout: 691 bytes
- >>>
- connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
- 802-3-ethernet::0::no:::::auto::::default:
--ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
-+ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1:
- ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
- proxy:none:no::
- GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1::activated:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/4::
-@@ -7710,31 +7744,31 @@ GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1::activated:no:no::no:
- GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0::deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
-
- <<<
--size: 695
-+size: 696
- location: clients/tests/test-client.py:test_003()/170
- cmd: $NMCLI --mode tabular --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
- lang: C
- returncode: 0
--stdout: 502 bytes
-+stdout: 503 bytes
- >>>
- connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
- 802-3-ethernet::0::no:::::auto::::default:
--ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
-+ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1:
- ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
- proxy:none:no::
- GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0::deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
-
- <<<
--size: 705
-+size: 706
- location: clients/tests/test-client.py:test_003()/171
- cmd: $NMCLI --mode tabular --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 502 bytes
-+stdout: 503 bytes
- >>>
- connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
- 802-3-ethernet::0::no:::::auto::::default:
--ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
-+ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1:
- ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
- proxy:none:no::
- GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0::deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
-@@ -7830,16 +7864,16 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL:gsm
- UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
-
- <<<
--size: 855
-+size: 856
- location: clients/tests/test-client.py:test_003()/178
- cmd: $NMCLI --mode tabular --terse --color yes con s ethernet
- lang: C
- returncode: 0
--stdout: 690 bytes
-+stdout: 691 bytes
- >>>
- connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
- 802-3-ethernet::0::no:::::auto::::default:
--ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
-+ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1:
- ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
- proxy:none:no::
- GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1::activated:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/4::
-@@ -7847,16 +7881,16 @@ GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1::activated:no:no::no:
- GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0::deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
-
- <<<
--size: 865
-+size: 866
- location: clients/tests/test-client.py:test_003()/179
- cmd: $NMCLI --mode tabular --terse --color yes con s ethernet
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 690 bytes
-+stdout: 691 bytes
- >>>
- connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
- 802-3-ethernet::0::no:::::auto::::default:
--ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
-+ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1:
- ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
- proxy:none:no::
- GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1::activated:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/4::
-@@ -7864,31 +7898,31 @@ GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1::activated:no:no::no:
- GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0::deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
-
- <<<
--size: 707
-+size: 708
- location: clients/tests/test-client.py:test_003()/180
- cmd: $NMCLI --mode tabular --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
- lang: C
- returncode: 0
--stdout: 502 bytes
-+stdout: 503 bytes
- >>>
- connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
- 802-3-ethernet::0::no:::::auto::::default:
--ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
-+ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1:
- ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
- proxy:none:no::
- GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0::deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
-
- <<<
--size: 717
-+size: 718
- location: clients/tests/test-client.py:test_003()/181
- cmd: $NMCLI --mode tabular --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 502 bytes
-+stdout: 503 bytes
- >>>
- connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
- 802-3-ethernet::0::no:::::auto::::default:
--ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
-+ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1:
- ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
- proxy:none:no::
- GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0::deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
-@@ -8132,12 +8166,12 @@ UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA
- TYPE: ethernet
-
- <<<
--size: 5651
-+size: 5694
- location: clients/tests/test-client.py:test_003()/188
- cmd: $NMCLI --mode multiline con s ethernet
- lang: C
- returncode: 0
--stdout: 5503 bytes
-+stdout: 5546 bytes
- >>>
- connection.id: ethernet
- connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
-@@ -8200,6 +8234,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: no
- ipv4.may-fail: yes
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -8258,12 +8293,12 @@ GENERAL.ZONE: --
- GENERAL.MASTER-PATH: --
-
- <<<
--size: 5688
-+size: 5731
- location: clients/tests/test-client.py:test_003()/189
- cmd: $NMCLI --mode multiline con s ethernet
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 5530 bytes
-+stdout: 5573 bytes
- >>>
- connection.id: ethernet
- connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
-@@ -8326,6 +8361,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: nie
- ipv4.may-fail: tak
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -8384,12 +8420,12 @@ GENERAL.ZONE: --
- GENERAL.MASTER-PATH: --
-
- <<<
--size: 4983
-+size: 5026
- location: clients/tests/test-client.py:test_003()/190
- cmd: $NMCLI --mode multiline c s /org/freedesktop/NetworkManager/ActiveConnection/1
- lang: C
- returncode: 0
--stdout: 4795 bytes
-+stdout: 4838 bytes
- >>>
- connection.id: ethernet
- connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
-@@ -8452,6 +8488,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: no
- ipv4.may-fail: yes
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -8496,12 +8533,12 @@ GENERAL.ZONE: --
- GENERAL.MASTER-PATH: --
-
- <<<
--size: 5016
-+size: 5059
- location: clients/tests/test-client.py:test_003()/191
- cmd: $NMCLI --mode multiline c s /org/freedesktop/NetworkManager/ActiveConnection/1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 4818 bytes
-+stdout: 4861 bytes
- >>>
- connection.id: ethernet
- connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
-@@ -8564,6 +8601,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: nie
- ipv4.may-fail: tak
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -8952,12 +8990,12 @@ UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA
- TYPE: ethernet
-
- <<<
--size: 5663
-+size: 5706
- location: clients/tests/test-client.py:test_003()/198
- cmd: $NMCLI --mode multiline --color yes con s ethernet
- lang: C
- returncode: 0
--stdout: 5503 bytes
-+stdout: 5546 bytes
- >>>
- connection.id: ethernet
- connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
-@@ -9020,6 +9058,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: no
- ipv4.may-fail: yes
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -9078,12 +9117,12 @@ GENERAL.ZONE: --
- GENERAL.MASTER-PATH: --
-
- <<<
--size: 5700
-+size: 5743
- location: clients/tests/test-client.py:test_003()/199
- cmd: $NMCLI --mode multiline --color yes con s ethernet
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 5530 bytes
-+stdout: 5573 bytes
- >>>
- connection.id: ethernet
- connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
-@@ -9146,6 +9185,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: nie
- ipv4.may-fail: tak
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -9204,12 +9244,12 @@ GENERAL.ZONE: --
- GENERAL.MASTER-PATH: --
-
- <<<
--size: 4995
-+size: 5038
- location: clients/tests/test-client.py:test_003()/200
- cmd: $NMCLI --mode multiline --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
- lang: C
- returncode: 0
--stdout: 4795 bytes
-+stdout: 4838 bytes
- >>>
- connection.id: ethernet
- connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
-@@ -9272,6 +9312,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: no
- ipv4.may-fail: yes
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -9316,12 +9357,12 @@ GENERAL.ZONE: --
- GENERAL.MASTER-PATH: --
-
- <<<
--size: 5028
-+size: 5071
- location: clients/tests/test-client.py:test_003()/201
- cmd: $NMCLI --mode multiline --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 4818 bytes
-+stdout: 4861 bytes
- >>>
- connection.id: ethernet
- connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
-@@ -9384,6 +9425,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: nie
- ipv4.may-fail: tak
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -9802,12 +9844,12 @@ TYPE: ethernet
- -------------------------------------------------------------------------------
-
- <<<
--size: 6905
-+size: 6948
- location: clients/tests/test-client.py:test_003()/208
- cmd: $NMCLI --mode multiline --pretty con s ethernet
- lang: C
- returncode: 0
--stdout: 6748 bytes
-+stdout: 6791 bytes
- >>>
- ===============================================================================
- Connection profile details (ethernet)
-@@ -9875,6 +9917,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: no
- ipv4.may-fail: yes
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- -------------------------------------------------------------------------------
- ipv6.method: auto
- ipv6.dns: --
-@@ -9944,12 +9987,12 @@ GENERAL.MASTER-PATH: --
- -------------------------------------------------------------------------------
-
- <<<
--size: 6961
-+size: 7004
- location: clients/tests/test-client.py:test_003()/209
- cmd: $NMCLI --mode multiline --pretty con s ethernet
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 6794 bytes
-+stdout: 6837 bytes
- >>>
- ===============================================================================
- Szczegóły profilu połączenia (ethernet)
-@@ -10017,6 +10060,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: nie
- ipv4.may-fail: tak
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- -------------------------------------------------------------------------------
- ipv6.method: auto
- ipv6.dns: --
-@@ -10086,12 +10130,12 @@ GENERAL.MASTER-PATH: --
- -------------------------------------------------------------------------------
-
- <<<
--size: 5924
-+size: 5967
- location: clients/tests/test-client.py:test_003()/210
- cmd: $NMCLI --mode multiline --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
- lang: C
- returncode: 0
--stdout: 5727 bytes
-+stdout: 5770 bytes
- >>>
- ===============================================================================
- Connection profile details (ethernet)
-@@ -10159,6 +10203,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: no
- ipv4.may-fail: yes
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- -------------------------------------------------------------------------------
- ipv6.method: auto
- ipv6.dns: --
-@@ -10210,12 +10255,12 @@ GENERAL.MASTER-PATH: --
- -------------------------------------------------------------------------------
-
- <<<
--size: 5969
-+size: 6012
- location: clients/tests/test-client.py:test_003()/211
- cmd: $NMCLI --mode multiline --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 5762 bytes
-+stdout: 5805 bytes
- >>>
- ===============================================================================
- Szczegóły profilu połączenia (ethernet)
-@@ -10283,6 +10328,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: nie
- ipv4.may-fail: tak
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- -------------------------------------------------------------------------------
- ipv6.method: auto
- ipv6.dns: --
-@@ -10732,12 +10778,12 @@ TYPE: ethernet
- -------------------------------------------------------------------------------
-
- <<<
--size: 6917
-+size: 6960
- location: clients/tests/test-client.py:test_003()/218
- cmd: $NMCLI --mode multiline --pretty --color yes con s ethernet
- lang: C
- returncode: 0
--stdout: 6748 bytes
-+stdout: 6791 bytes
- >>>
- ===============================================================================
- Connection profile details (ethernet)
-@@ -10805,6 +10851,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: no
- ipv4.may-fail: yes
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- -------------------------------------------------------------------------------
- ipv6.method: auto
- ipv6.dns: --
-@@ -10874,12 +10921,12 @@ GENERAL.MASTER-PATH: --
- -------------------------------------------------------------------------------
-
- <<<
--size: 6973
-+size: 7016
- location: clients/tests/test-client.py:test_003()/219
- cmd: $NMCLI --mode multiline --pretty --color yes con s ethernet
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 6794 bytes
-+stdout: 6837 bytes
- >>>
- ===============================================================================
- Szczegóły profilu połączenia (ethernet)
-@@ -10947,6 +10994,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: nie
- ipv4.may-fail: tak
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- -------------------------------------------------------------------------------
- ipv6.method: auto
- ipv6.dns: --
-@@ -11016,12 +11064,12 @@ GENERAL.MASTER-PATH: --
- -------------------------------------------------------------------------------
-
- <<<
--size: 5936
-+size: 5979
- location: clients/tests/test-client.py:test_003()/220
- cmd: $NMCLI --mode multiline --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
- lang: C
- returncode: 0
--stdout: 5727 bytes
-+stdout: 5770 bytes
- >>>
- ===============================================================================
- Connection profile details (ethernet)
-@@ -11089,6 +11137,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: no
- ipv4.may-fail: yes
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- -------------------------------------------------------------------------------
- ipv6.method: auto
- ipv6.dns: --
-@@ -11140,12 +11189,12 @@ GENERAL.MASTER-PATH: --
- -------------------------------------------------------------------------------
-
- <<<
--size: 5981
-+size: 6024
- location: clients/tests/test-client.py:test_003()/221
- cmd: $NMCLI --mode multiline --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 5762 bytes
-+stdout: 5805 bytes
- >>>
- ===============================================================================
- Szczegóły profilu połączenia (ethernet)
-@@ -11213,6 +11262,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: nie
- ipv4.may-fail: tak
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- -------------------------------------------------------------------------------
- ipv6.method: auto
- ipv6.dns: --
-@@ -11632,12 +11682,12 @@ UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA
- TYPE:802-3-ethernet
-
- <<<
--size: 3018
-+size: 3053
- location: clients/tests/test-client.py:test_003()/228
- cmd: $NMCLI --mode multiline --terse con s ethernet
- lang: C
- returncode: 0
--stdout: 2862 bytes
-+stdout: 2897 bytes
- >>>
- connection.id:ethernet
- connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
-@@ -11700,6 +11750,7 @@ ipv4.dhcp-hostname-flags:0x0
- ipv4.never-default:no
- ipv4.may-fail:yes
- ipv4.dad-timeout:-1
-+ipv4.dhcp-vendor-class-identifier:
- ipv6.method:auto
- ipv6.dns:
- ipv6.dns-search:
-@@ -11758,12 +11809,12 @@ GENERAL.ZONE:
- GENERAL.MASTER-PATH:
-
- <<<
--size: 3028
-+size: 3063
- location: clients/tests/test-client.py:test_003()/229
- cmd: $NMCLI --mode multiline --terse con s ethernet
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 2862 bytes
-+stdout: 2897 bytes
- >>>
- connection.id:ethernet
- connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
-@@ -11826,6 +11877,7 @@ ipv4.dhcp-hostname-flags:0x0
- ipv4.never-default:no
- ipv4.may-fail:yes
- ipv4.dad-timeout:-1
-+ipv4.dhcp-vendor-class-identifier:
- ipv6.method:auto
- ipv6.dns:
- ipv6.dns-search:
-@@ -11884,12 +11936,12 @@ GENERAL.ZONE:
- GENERAL.MASTER-PATH:
-
- <<<
--size: 2672
-+size: 2707
- location: clients/tests/test-client.py:test_003()/230
- cmd: $NMCLI --mode multiline --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
- lang: C
- returncode: 0
--stdout: 2476 bytes
-+stdout: 2511 bytes
- >>>
- connection.id:ethernet
- connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
-@@ -11952,6 +12004,7 @@ ipv4.dhcp-hostname-flags:0x0
- ipv4.never-default:no
- ipv4.may-fail:yes
- ipv4.dad-timeout:-1
-+ipv4.dhcp-vendor-class-identifier:
- ipv6.method:auto
- ipv6.dns:
- ipv6.dns-search:
-@@ -11996,12 +12049,12 @@ GENERAL.ZONE:
- GENERAL.MASTER-PATH:
-
- <<<
--size: 2682
-+size: 2717
- location: clients/tests/test-client.py:test_003()/231
- cmd: $NMCLI --mode multiline --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 2476 bytes
-+stdout: 2511 bytes
- >>>
- connection.id:ethernet
- connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
-@@ -12064,6 +12117,7 @@ ipv4.dhcp-hostname-flags:0x0
- ipv4.never-default:no
- ipv4.may-fail:yes
- ipv4.dad-timeout:-1
-+ipv4.dhcp-vendor-class-identifier:
- ipv6.method:auto
- ipv6.dns:
- ipv6.dns-search:
-@@ -12452,12 +12506,12 @@ UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA
- TYPE:802-3-ethernet
-
- <<<
--size: 3030
-+size: 3065
- location: clients/tests/test-client.py:test_003()/238
- cmd: $NMCLI --mode multiline --terse --color yes con s ethernet
- lang: C
- returncode: 0
--stdout: 2862 bytes
-+stdout: 2897 bytes
- >>>
- connection.id:ethernet
- connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
-@@ -12520,6 +12574,7 @@ ipv4.dhcp-hostname-flags:0x0
- ipv4.never-default:no
- ipv4.may-fail:yes
- ipv4.dad-timeout:-1
-+ipv4.dhcp-vendor-class-identifier:
- ipv6.method:auto
- ipv6.dns:
- ipv6.dns-search:
-@@ -12578,12 +12633,12 @@ GENERAL.ZONE:
- GENERAL.MASTER-PATH:
-
- <<<
--size: 3040
-+size: 3075
- location: clients/tests/test-client.py:test_003()/239
- cmd: $NMCLI --mode multiline --terse --color yes con s ethernet
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 2862 bytes
-+stdout: 2897 bytes
- >>>
- connection.id:ethernet
- connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
-@@ -12646,6 +12701,7 @@ ipv4.dhcp-hostname-flags:0x0
- ipv4.never-default:no
- ipv4.may-fail:yes
- ipv4.dad-timeout:-1
-+ipv4.dhcp-vendor-class-identifier:
- ipv6.method:auto
- ipv6.dns:
- ipv6.dns-search:
-@@ -12704,12 +12760,12 @@ GENERAL.ZONE:
- GENERAL.MASTER-PATH:
-
- <<<
--size: 2684
-+size: 2719
- location: clients/tests/test-client.py:test_003()/240
- cmd: $NMCLI --mode multiline --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
- lang: C
- returncode: 0
--stdout: 2476 bytes
-+stdout: 2511 bytes
- >>>
- connection.id:ethernet
- connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
-@@ -12772,6 +12828,7 @@ ipv4.dhcp-hostname-flags:0x0
- ipv4.never-default:no
- ipv4.may-fail:yes
- ipv4.dad-timeout:-1
-+ipv4.dhcp-vendor-class-identifier:
- ipv6.method:auto
- ipv6.dns:
- ipv6.dns-search:
-@@ -12816,12 +12873,12 @@ GENERAL.ZONE:
- GENERAL.MASTER-PATH:
-
- <<<
--size: 2694
-+size: 2729
- location: clients/tests/test-client.py:test_003()/241
- cmd: $NMCLI --mode multiline --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 2476 bytes
-+stdout: 2511 bytes
- >>>
- connection.id:ethernet
- connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
-@@ -12884,6 +12941,7 @@ ipv4.dhcp-hostname-flags:0x0
- ipv4.never-default:no
- ipv4.may-fail:yes
- ipv4.dad-timeout:-1
-+ipv4.dhcp-vendor-class-identifier:
- ipv6.method:auto
- ipv6.dns:
- ipv6.dns-search:
-diff --git a/clients/tests/test-client.check-on-disk/test_004.expected b/clients/tests/test-client.check-on-disk/test_004.expected
-index 5ee00fc9e..8274bf9e6 100644
---- a/clients/tests/test-client.check-on-disk/test_004.expected
-+++ b/clients/tests/test-client.check-on-disk/test_004.expected
-@@ -58,12 +58,12 @@ location: clients/tests/test-client.py:test_004()/7
- cmd: $NMCLI connection mod con-xx1 ipv4.addresses 192.168.77.5/24 ipv4.routes '2.3.4.5/32 192.168.77.1' ipv6.addresses 1:2:3:4::6/64 ipv6.routes 1:2:3:4:5:6::5/128
- lang: C
- returncode: 0
--size: 4464
-+size: 4507
- location: clients/tests/test-client.py:test_004()/8
- cmd: $NMCLI con s con-xx1
- lang: C
- returncode: 0
--stdout: 4336 bytes
-+stdout: 4379 bytes
- >>>
- connection.id: con-xx1
- connection.uuid: UUID-con-xx1-REPLACED-REPLACED-REPLA
-@@ -129,6 +129,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: no
- ipv4.may-fail: yes
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -160,12 +161,12 @@ proxy.pac-url: --
- proxy.pac-script: --
-
- <<<
--size: 4492
-+size: 4535
- location: clients/tests/test-client.py:test_004()/9
- cmd: $NMCLI con s con-xx1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 4354 bytes
-+stdout: 4397 bytes
- >>>
- connection.id: con-xx1
- connection.uuid: UUID-con-xx1-REPLACED-REPLACED-REPLA
-@@ -231,6 +232,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: nie
- ipv4.may-fail: tak
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -298,12 +300,12 @@ con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP vpn --
- con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA wifi --
-
- <<<
--size: 3931
-+size: 3974
- location: clients/tests/test-client.py:test_004()/13
- cmd: $NMCLI con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 3800 bytes
-+stdout: 3843 bytes
- >>>
- connection.id: con-vpn-1
- connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP
-@@ -352,6 +354,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: no
- ipv4.may-fail: yes
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -389,12 +392,12 @@ proxy.pac-url: --
- proxy.pac-script: --
-
- <<<
--size: 3951
-+size: 3994
- location: clients/tests/test-client.py:test_004()/14
- cmd: $NMCLI con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 3810 bytes
-+stdout: 3853 bytes
- >>>
- connection.id: con-vpn-1
- connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP
-@@ -443,6 +446,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: nie
- ipv4.may-fail: tak
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -552,12 +556,12 @@ con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA wifi wlan0
- con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet --
-
- <<<
--size: 5056
-+size: 5099
- location: clients/tests/test-client.py:test_004()/21
- cmd: $NMCLI con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 4925 bytes
-+stdout: 4968 bytes
- >>>
- connection.id: con-vpn-1
- connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP
-@@ -606,6 +610,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: no
- ipv4.may-fail: yes
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -664,12 +669,12 @@ VPN.CFG[2]: key2 = val2
- VPN.CFG[3]: key3 = val3
-
- <<<
--size: 5082
-+size: 5125
- location: clients/tests/test-client.py:test_004()/22
- cmd: $NMCLI con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 4941 bytes
-+stdout: 4984 bytes
- >>>
- connection.id: con-vpn-1
- connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP
-@@ -718,6 +723,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: nie
- ipv4.may-fail: tak
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -776,12 +782,12 @@ VPN.CFG[2]: key2 = val2
- VPN.CFG[3]: key3 = val3
-
- <<<
--size: 5062
-+size: 5105
- location: clients/tests/test-client.py:test_004()/23
- cmd: $NMCLI con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 4931 bytes
-+stdout: 4974 bytes
- >>>
- connection.id: con-vpn-1
- connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP
-@@ -830,6 +836,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: no
- ipv4.may-fail: yes
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -888,12 +895,12 @@ VPN.CFG[2]: key2 = val2
- VPN.CFG[3]: key3 = val3
-
- <<<
--size: 5092
-+size: 5135
- location: clients/tests/test-client.py:test_004()/24
- cmd: $NMCLI con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 4951 bytes
-+stdout: 4994 bytes
- >>>
- connection.id: con-vpn-1
- connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP
-@@ -942,6 +949,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: nie
- ipv4.may-fail: tak
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -1000,12 +1008,12 @@ VPN.CFG[2]: key2 = val2
- VPN.CFG[3]: key3 = val3
-
- <<<
--size: 5062
-+size: 5105
- location: clients/tests/test-client.py:test_004()/25
- cmd: $NMCLI con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 4931 bytes
-+stdout: 4974 bytes
- >>>
- connection.id: con-vpn-1
- connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP
-@@ -1054,6 +1062,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: no
- ipv4.may-fail: yes
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -1112,12 +1121,12 @@ VPN.CFG[2]: key2 = val2
- VPN.CFG[3]: key3 = val3
-
- <<<
--size: 5092
-+size: 5135
- location: clients/tests/test-client.py:test_004()/26
- cmd: $NMCLI con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 4951 bytes
-+stdout: 4994 bytes
- >>>
- connection.id: con-vpn-1
- connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP
-@@ -1166,6 +1175,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: nie
- ipv4.may-fail: tak
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -1224,12 +1234,12 @@ VPN.CFG[2]: key2 = val2
- VPN.CFG[3]: key3 = val3
-
- <<<
--size: 3938
-+size: 3981
- location: clients/tests/test-client.py:test_004()/27
- cmd: $NMCLI -f ALL con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 3800 bytes
-+stdout: 3843 bytes
- >>>
- connection.id: con-vpn-1
- connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP
-@@ -1278,6 +1288,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: no
- ipv4.may-fail: yes
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -1315,12 +1326,12 @@ proxy.pac-url: --
- proxy.pac-script: --
-
- <<<
--size: 3958
-+size: 4001
- location: clients/tests/test-client.py:test_004()/28
- cmd: $NMCLI -f ALL con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 3810 bytes
-+stdout: 3853 bytes
- >>>
- connection.id: con-vpn-1
- connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP
-@@ -1369,6 +1380,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: nie
- ipv4.may-fail: tak
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -3986,12 +3998,12 @@ connection.type: 802-11-wireless
- connection.interface-name: --
-
- <<<
--size: 5074
-+size: 5117
- location: clients/tests/test-client.py:test_004()/73
- cmd: $NMCLI --color yes con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 4931 bytes
-+stdout: 4974 bytes
- >>>
- connection.id: con-vpn-1
- connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP
-@@ -4040,6 +4052,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: no
- ipv4.may-fail: yes
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -4098,12 +4111,12 @@ VPN.CFG[2]: key2 = val2
- VPN.CFG[3]: key3 = val3
-
- <<<
--size: 5104
-+size: 5147
- location: clients/tests/test-client.py:test_004()/74
- cmd: $NMCLI --color yes con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 4951 bytes
-+stdout: 4994 bytes
- >>>
- connection.id: con-vpn-1
- connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP
-@@ -4152,6 +4165,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: nie
- ipv4.may-fail: tak
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -4210,12 +4224,12 @@ VPN.CFG[2]: key2 = val2
- VPN.CFG[3]: key3 = val3
-
- <<<
--size: 5074
-+size: 5117
- location: clients/tests/test-client.py:test_004()/75
- cmd: $NMCLI --color yes con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 4931 bytes
-+stdout: 4974 bytes
- >>>
- connection.id: con-vpn-1
- connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP
-@@ -4264,6 +4278,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: no
- ipv4.may-fail: yes
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -4322,12 +4337,12 @@ VPN.CFG[2]: key2 = val2
- VPN.CFG[3]: key3 = val3
-
- <<<
--size: 5104
-+size: 5147
- location: clients/tests/test-client.py:test_004()/76
- cmd: $NMCLI --color yes con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 4951 bytes
-+stdout: 4994 bytes
- >>>
- connection.id: con-vpn-1
- connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP
-@@ -4376,6 +4391,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: nie
- ipv4.may-fail: tak
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -4434,12 +4450,12 @@ VPN.CFG[2]: key2 = val2
- VPN.CFG[3]: key3 = val3
-
- <<<
--size: 3950
-+size: 3993
- location: clients/tests/test-client.py:test_004()/77
- cmd: $NMCLI --color yes -f ALL con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 3800 bytes
-+stdout: 3843 bytes
- >>>
- connection.id: con-vpn-1
- connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP
-@@ -4488,6 +4504,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: no
- ipv4.may-fail: yes
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -4525,12 +4542,12 @@ proxy.pac-url: --
- proxy.pac-script: --
-
- <<<
--size: 3970
-+size: 4013
- location: clients/tests/test-client.py:test_004()/78
- cmd: $NMCLI --color yes -f ALL con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 3810 bytes
-+stdout: 3853 bytes
- >>>
- connection.id: con-vpn-1
- connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP
-@@ -4579,6 +4596,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: nie
- ipv4.may-fail: tak
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -7196,12 +7214,12 @@ connection.type: 802-11-wireless
- connection.interface-name: --
-
- <<<
--size: 6084
-+size: 6127
- location: clients/tests/test-client.py:test_004()/123
- cmd: $NMCLI --pretty con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 5943 bytes
-+stdout: 5986 bytes
- >>>
- ===============================================================================
- Connection profile details (con-vpn-1)
-@@ -7254,6 +7272,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: no
- ipv4.may-fail: yes
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- -------------------------------------------------------------------------------
- ipv6.method: auto
- ipv6.dns: --
-@@ -7321,12 +7340,12 @@ VPN.CFG[3]: key3 = val3
- -------------------------------------------------------------------------------
-
- <<<
--size: 6126
-+size: 6169
- location: clients/tests/test-client.py:test_004()/124
- cmd: $NMCLI --pretty con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 5975 bytes
-+stdout: 6018 bytes
- >>>
- ===============================================================================
- Szczegóły profilu połączenia (con-vpn-1)
-@@ -7379,6 +7398,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: nie
- ipv4.may-fail: tak
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- -------------------------------------------------------------------------------
- ipv6.method: auto
- ipv6.dns: --
-@@ -7446,12 +7466,12 @@ VPN.CFG[3]: key3 = val3
- -------------------------------------------------------------------------------
-
- <<<
--size: 6084
-+size: 6127
- location: clients/tests/test-client.py:test_004()/125
- cmd: $NMCLI --pretty con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 5943 bytes
-+stdout: 5986 bytes
- >>>
- ===============================================================================
- Connection profile details (con-vpn-1)
-@@ -7504,6 +7524,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: no
- ipv4.may-fail: yes
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- -------------------------------------------------------------------------------
- ipv6.method: auto
- ipv6.dns: --
-@@ -7571,12 +7592,12 @@ VPN.CFG[3]: key3 = val3
- -------------------------------------------------------------------------------
-
- <<<
--size: 6126
-+size: 6169
- location: clients/tests/test-client.py:test_004()/126
- cmd: $NMCLI --pretty con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 5975 bytes
-+stdout: 6018 bytes
- >>>
- ===============================================================================
- Szczegóły profilu połączenia (con-vpn-1)
-@@ -7629,6 +7650,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: nie
- ipv4.may-fail: tak
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- -------------------------------------------------------------------------------
- ipv6.method: auto
- ipv6.dns: --
-@@ -7696,12 +7718,12 @@ VPN.CFG[3]: key3 = val3
- -------------------------------------------------------------------------------
-
- <<<
--size: 4567
-+size: 4610
- location: clients/tests/test-client.py:test_004()/127
- cmd: $NMCLI --pretty -f ALL con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 4419 bytes
-+stdout: 4462 bytes
- >>>
- ===============================================================================
- Connection profile details (con-vpn-1)
-@@ -7754,6 +7776,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: no
- ipv4.may-fail: yes
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- -------------------------------------------------------------------------------
- ipv6.method: auto
- ipv6.dns: --
-@@ -7795,12 +7818,12 @@ proxy.pac-script: --
- -------------------------------------------------------------------------------
-
- <<<
--size: 4592
-+size: 4635
- location: clients/tests/test-client.py:test_004()/128
- cmd: $NMCLI --pretty -f ALL con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 4434 bytes
-+stdout: 4477 bytes
- >>>
- ===============================================================================
- Szczegóły profilu połączenia (con-vpn-1)
-@@ -7853,6 +7876,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: nie
- ipv4.may-fail: tak
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- -------------------------------------------------------------------------------
- ipv6.method: auto
- ipv6.dns: --
-@@ -11078,12 +11102,12 @@ connection.interface-name: --
- -------------------------------------------------------------------------------
-
- <<<
--size: 6096
-+size: 6139
- location: clients/tests/test-client.py:test_004()/173
- cmd: $NMCLI --pretty --color yes con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 5943 bytes
-+stdout: 5986 bytes
- >>>
- ===============================================================================
- Connection profile details (con-vpn-1)
-@@ -11136,6 +11160,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: no
- ipv4.may-fail: yes
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- -------------------------------------------------------------------------------
- ipv6.method: auto
- ipv6.dns: --
-@@ -11203,12 +11228,12 @@ VPN.CFG[3]: key3 = val3
- -------------------------------------------------------------------------------
-
- <<<
--size: 6138
-+size: 6181
- location: clients/tests/test-client.py:test_004()/174
- cmd: $NMCLI --pretty --color yes con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 5975 bytes
-+stdout: 6018 bytes
- >>>
- ===============================================================================
- Szczegóły profilu połączenia (con-vpn-1)
-@@ -11261,6 +11286,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: nie
- ipv4.may-fail: tak
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- -------------------------------------------------------------------------------
- ipv6.method: auto
- ipv6.dns: --
-@@ -11328,12 +11354,12 @@ VPN.CFG[3]: key3 = val3
- -------------------------------------------------------------------------------
-
- <<<
--size: 6096
-+size: 6139
- location: clients/tests/test-client.py:test_004()/175
- cmd: $NMCLI --pretty --color yes con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 5943 bytes
-+stdout: 5986 bytes
- >>>
- ===============================================================================
- Connection profile details (con-vpn-1)
-@@ -11386,6 +11412,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: no
- ipv4.may-fail: yes
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- -------------------------------------------------------------------------------
- ipv6.method: auto
- ipv6.dns: --
-@@ -11453,12 +11480,12 @@ VPN.CFG[3]: key3 = val3
- -------------------------------------------------------------------------------
-
- <<<
--size: 6138
-+size: 6181
- location: clients/tests/test-client.py:test_004()/176
- cmd: $NMCLI --pretty --color yes con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 5975 bytes
-+stdout: 6018 bytes
- >>>
- ===============================================================================
- Szczegóły profilu połączenia (con-vpn-1)
-@@ -11511,6 +11538,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: nie
- ipv4.may-fail: tak
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- -------------------------------------------------------------------------------
- ipv6.method: auto
- ipv6.dns: --
-@@ -11578,12 +11606,12 @@ VPN.CFG[3]: key3 = val3
- -------------------------------------------------------------------------------
-
- <<<
--size: 4579
-+size: 4622
- location: clients/tests/test-client.py:test_004()/177
- cmd: $NMCLI --pretty --color yes -f ALL con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 4419 bytes
-+stdout: 4462 bytes
- >>>
- ===============================================================================
- Connection profile details (con-vpn-1)
-@@ -11636,6 +11664,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: no
- ipv4.may-fail: yes
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- -------------------------------------------------------------------------------
- ipv6.method: auto
- ipv6.dns: --
-@@ -11677,12 +11706,12 @@ proxy.pac-script: --
- -------------------------------------------------------------------------------
-
- <<<
--size: 4604
-+size: 4647
- location: clients/tests/test-client.py:test_004()/178
- cmd: $NMCLI --pretty --color yes -f ALL con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 4434 bytes
-+stdout: 4477 bytes
- >>>
- ===============================================================================
- Szczegóły profilu połączenia (con-vpn-1)
-@@ -11735,6 +11764,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: nie
- ipv4.may-fail: tak
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- -------------------------------------------------------------------------------
- ipv6.method: auto
- ipv6.dns: --
-@@ -14960,12 +14990,12 @@ connection.interface-name: --
- -------------------------------------------------------------------------------
-
- <<<
--size: 2536
-+size: 2571
- location: clients/tests/test-client.py:test_004()/223
- cmd: $NMCLI --terse con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 2396 bytes
-+stdout: 2431 bytes
- >>>
- connection.id:con-vpn-1
- connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
-@@ -15014,6 +15044,7 @@ ipv4.dhcp-hostname-flags:0x0
- ipv4.never-default:no
- ipv4.may-fail:yes
- ipv4.dad-timeout:-1
-+ipv4.dhcp-vendor-class-identifier:
- ipv6.method:auto
- ipv6.dns:
- ipv6.dns-search:
-@@ -15072,12 +15103,12 @@ VPN.CFG[2]:key2 = val2
- VPN.CFG[3]:key3 = val3
-
- <<<
--size: 2546
-+size: 2581
- location: clients/tests/test-client.py:test_004()/224
- cmd: $NMCLI --terse con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 2396 bytes
-+stdout: 2431 bytes
- >>>
- connection.id:con-vpn-1
- connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
-@@ -15126,6 +15157,7 @@ ipv4.dhcp-hostname-flags:0x0
- ipv4.never-default:no
- ipv4.may-fail:yes
- ipv4.dad-timeout:-1
-+ipv4.dhcp-vendor-class-identifier:
- ipv6.method:auto
- ipv6.dns:
- ipv6.dns-search:
-@@ -15184,12 +15216,12 @@ VPN.CFG[2]:key2 = val2
- VPN.CFG[3]:key3 = val3
-
- <<<
--size: 2536
-+size: 2571
- location: clients/tests/test-client.py:test_004()/225
- cmd: $NMCLI --terse con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 2396 bytes
-+stdout: 2431 bytes
- >>>
- connection.id:con-vpn-1
- connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
-@@ -15238,6 +15270,7 @@ ipv4.dhcp-hostname-flags:0x0
- ipv4.never-default:no
- ipv4.may-fail:yes
- ipv4.dad-timeout:-1
-+ipv4.dhcp-vendor-class-identifier:
- ipv6.method:auto
- ipv6.dns:
- ipv6.dns-search:
-@@ -15296,12 +15329,12 @@ VPN.CFG[2]:key2 = val2
- VPN.CFG[3]:key3 = val3
-
- <<<
--size: 2546
-+size: 2581
- location: clients/tests/test-client.py:test_004()/226
- cmd: $NMCLI --terse con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 2396 bytes
-+stdout: 2431 bytes
- >>>
- connection.id:con-vpn-1
- connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
-@@ -15350,6 +15383,7 @@ ipv4.dhcp-hostname-flags:0x0
- ipv4.never-default:no
- ipv4.may-fail:yes
- ipv4.dad-timeout:-1
-+ipv4.dhcp-vendor-class-identifier:
- ipv6.method:auto
- ipv6.dns:
- ipv6.dns-search:
-@@ -15408,12 +15442,12 @@ VPN.CFG[2]:key2 = val2
- VPN.CFG[3]:key3 = val3
-
- <<<
--size: 1966
-+size: 2001
- location: clients/tests/test-client.py:test_004()/227
- cmd: $NMCLI --terse -f ALL con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 1819 bytes
-+stdout: 1854 bytes
- >>>
- connection.id:con-vpn-1
- connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
-@@ -15462,6 +15496,7 @@ ipv4.dhcp-hostname-flags:0x0
- ipv4.never-default:no
- ipv4.may-fail:yes
- ipv4.dad-timeout:-1
-+ipv4.dhcp-vendor-class-identifier:
- ipv6.method:auto
- ipv6.dns:
- ipv6.dns-search:
-@@ -15499,12 +15534,12 @@ proxy.pac-url:
- proxy.pac-script:
-
- <<<
--size: 1976
-+size: 2011
- location: clients/tests/test-client.py:test_004()/228
- cmd: $NMCLI --terse -f ALL con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 1819 bytes
-+stdout: 1854 bytes
- >>>
- connection.id:con-vpn-1
- connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
-@@ -15553,6 +15588,7 @@ ipv4.dhcp-hostname-flags:0x0
- ipv4.never-default:no
- ipv4.may-fail:yes
- ipv4.dad-timeout:-1
-+ipv4.dhcp-vendor-class-identifier:
- ipv6.method:auto
- ipv6.dns:
- ipv6.dns-search:
-@@ -18140,12 +18176,12 @@ connection.type:802-11-wireless
- connection.interface-name:
-
- <<<
--size: 2548
-+size: 2583
- location: clients/tests/test-client.py:test_004()/273
- cmd: $NMCLI --terse --color yes con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 2396 bytes
-+stdout: 2431 bytes
- >>>
- connection.id:con-vpn-1
- connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
-@@ -18194,6 +18230,7 @@ ipv4.dhcp-hostname-flags:0x0
- ipv4.never-default:no
- ipv4.may-fail:yes
- ipv4.dad-timeout:-1
-+ipv4.dhcp-vendor-class-identifier:
- ipv6.method:auto
- ipv6.dns:
- ipv6.dns-search:
-@@ -18252,12 +18289,12 @@ VPN.CFG[2]:key2 = val2
- VPN.CFG[3]:key3 = val3
-
- <<<
--size: 2558
-+size: 2593
- location: clients/tests/test-client.py:test_004()/274
- cmd: $NMCLI --terse --color yes con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 2396 bytes
-+stdout: 2431 bytes
- >>>
- connection.id:con-vpn-1
- connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
-@@ -18306,6 +18343,7 @@ ipv4.dhcp-hostname-flags:0x0
- ipv4.never-default:no
- ipv4.may-fail:yes
- ipv4.dad-timeout:-1
-+ipv4.dhcp-vendor-class-identifier:
- ipv6.method:auto
- ipv6.dns:
- ipv6.dns-search:
-@@ -18364,12 +18402,12 @@ VPN.CFG[2]:key2 = val2
- VPN.CFG[3]:key3 = val3
-
- <<<
--size: 2548
-+size: 2583
- location: clients/tests/test-client.py:test_004()/275
- cmd: $NMCLI --terse --color yes con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 2396 bytes
-+stdout: 2431 bytes
- >>>
- connection.id:con-vpn-1
- connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
-@@ -18418,6 +18456,7 @@ ipv4.dhcp-hostname-flags:0x0
- ipv4.never-default:no
- ipv4.may-fail:yes
- ipv4.dad-timeout:-1
-+ipv4.dhcp-vendor-class-identifier:
- ipv6.method:auto
- ipv6.dns:
- ipv6.dns-search:
-@@ -18476,12 +18515,12 @@ VPN.CFG[2]:key2 = val2
- VPN.CFG[3]:key3 = val3
-
- <<<
--size: 2558
-+size: 2593
- location: clients/tests/test-client.py:test_004()/276
- cmd: $NMCLI --terse --color yes con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 2396 bytes
-+stdout: 2431 bytes
- >>>
- connection.id:con-vpn-1
- connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
-@@ -18530,6 +18569,7 @@ ipv4.dhcp-hostname-flags:0x0
- ipv4.never-default:no
- ipv4.may-fail:yes
- ipv4.dad-timeout:-1
-+ipv4.dhcp-vendor-class-identifier:
- ipv6.method:auto
- ipv6.dns:
- ipv6.dns-search:
-@@ -18588,12 +18628,12 @@ VPN.CFG[2]:key2 = val2
- VPN.CFG[3]:key3 = val3
-
- <<<
--size: 1978
-+size: 2013
- location: clients/tests/test-client.py:test_004()/277
- cmd: $NMCLI --terse --color yes -f ALL con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 1819 bytes
-+stdout: 1854 bytes
- >>>
- connection.id:con-vpn-1
- connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
-@@ -18642,6 +18682,7 @@ ipv4.dhcp-hostname-flags:0x0
- ipv4.never-default:no
- ipv4.may-fail:yes
- ipv4.dad-timeout:-1
-+ipv4.dhcp-vendor-class-identifier:
- ipv6.method:auto
- ipv6.dns:
- ipv6.dns-search:
-@@ -18679,12 +18720,12 @@ proxy.pac-url:
- proxy.pac-script:
-
- <<<
--size: 1988
-+size: 2023
- location: clients/tests/test-client.py:test_004()/278
- cmd: $NMCLI --terse --color yes -f ALL con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 1819 bytes
-+stdout: 1854 bytes
- >>>
- connection.id:con-vpn-1
- connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
-@@ -18733,6 +18774,7 @@ ipv4.dhcp-hostname-flags:0x0
- ipv4.never-default:no
- ipv4.may-fail:yes
- ipv4.dad-timeout:-1
-+ipv4.dhcp-vendor-class-identifier:
- ipv6.method:auto
- ipv6.dns:
- ipv6.dns-search:
-@@ -21320,18 +21362,18 @@ connection.type:802-11-wireless
- connection.interface-name:
-
- <<<
--size: 3277
-+size: 3337
- location: clients/tests/test-client.py:test_004()/323
- cmd: $NMCLI --mode tabular con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 3130 bytes
-+stdout: 3190 bytes
- >>>
- name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout
- connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1
-
--name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout
--ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default)
-+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout dhcp-vendor-class-identifier
-+ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) --
-
- name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token
- ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no no yes -1 (unknown) stable-privacy 0 (default) -- -- 0 (default) yes -- 0x0 (none) --
-@@ -21349,18 +21391,18 @@ NAME TYPE USERNAME GATEWAY BANNER VPN-STATE
- VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 - VPN connected key1 = val1 | key2 = val2 | key3 = val3
-
- <<<
--size: 3300
-+size: 3360
- location: clients/tests/test-client.py:test_004()/324
- cmd: $NMCLI --mode tabular con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 3143 bytes
-+stdout: 3203 bytes
- >>>
- name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout
- connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1
-
--name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout
--ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default)
-+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout dhcp-vendor-class-identifier
-+ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) --
-
- name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token
- ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie nie tak -1 (unknown) stable-privacy 0 (default) -- -- 0 (default) tak -- 0x0 (none) --
-@@ -21378,18 +21420,18 @@ NAME TYPE USERNAME GATEWAY BANNER VPN-STATE
- VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 — Połączono z VPN key1 = val1 | key2 = val2 | key3 = val3
-
- <<<
--size: 3277
-+size: 3337
- location: clients/tests/test-client.py:test_004()/325
- cmd: $NMCLI --mode tabular con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 3130 bytes
-+stdout: 3190 bytes
- >>>
- name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout
- connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1
-
--name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout
--ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default)
-+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout dhcp-vendor-class-identifier
-+ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) --
-
- name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token
- ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no no yes -1 (unknown) stable-privacy 0 (default) -- -- 0 (default) yes -- 0x0 (none) --
-@@ -21407,18 +21449,18 @@ NAME TYPE USERNAME GATEWAY BANNER VPN-STATE
- VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 - VPN connected key1 = val1 | key2 = val2 | key3 = val3
-
- <<<
--size: 3300
-+size: 3360
- location: clients/tests/test-client.py:test_004()/326
- cmd: $NMCLI --mode tabular con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 3143 bytes
-+stdout: 3203 bytes
- >>>
- name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout
- connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1
-
--name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout
--ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default)
-+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout dhcp-vendor-class-identifier
-+ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) --
-
- name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token
- ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie nie tak -1 (unknown) stable-privacy 0 (default) -- -- 0 (default) tak -- 0x0 (none) --
-@@ -21436,18 +21478,18 @@ NAME TYPE USERNAME GATEWAY BANNER VPN-STATE
- VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 — Połączono z VPN key1 = val1 | key2 = val2 | key3 = val3
-
- <<<
--size: 2525
-+size: 2585
- location: clients/tests/test-client.py:test_004()/327
- cmd: $NMCLI --mode tabular -f ALL con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 2371 bytes
-+stdout: 2431 bytes
- >>>
- name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout
- connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1
-
--name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout
--ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default)
-+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout dhcp-vendor-class-identifier
-+ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) --
-
- name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token
- ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no no yes -1 (unknown) stable-privacy 0 (default) -- -- 0 (default) yes -- 0x0 (none) --
-@@ -21460,18 +21502,18 @@ proxy none no -- --
-
-
- <<<
--size: 2537
-+size: 2597
- location: clients/tests/test-client.py:test_004()/328
- cmd: $NMCLI --mode tabular -f ALL con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 2373 bytes
-+stdout: 2433 bytes
- >>>
- name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout
- connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1
-
--name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout
--ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default)
-+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout dhcp-vendor-class-identifier
-+ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) --
-
- name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token
- ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie nie tak -1 (unknown) stable-privacy 0 (default) -- -- 0 (default) tak -- 0x0 (none) --
-@@ -22974,18 +23016,18 @@ interface-name
-
-
- <<<
--size: 3289
-+size: 3349
- location: clients/tests/test-client.py:test_004()/373
- cmd: $NMCLI --mode tabular --color yes con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 3130 bytes
-+stdout: 3190 bytes
- >>>
- name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout
- connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1
-
--name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout
--ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default)
-+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout dhcp-vendor-class-identifier
-+ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) --
-
- name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token
- ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no no yes -1 (unknown) stable-privacy 0 (default) -- -- 0 (default) yes -- 0x0 (none) --
-@@ -23003,18 +23045,18 @@ NAME TYPE USERNAME GATEWAY BANNER VPN-STATE
- VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 - VPN connected key1 = val1 | key2 = val2 | key3 = val3
-
- <<<
--size: 3312
-+size: 3372
- location: clients/tests/test-client.py:test_004()/374
- cmd: $NMCLI --mode tabular --color yes con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 3143 bytes
-+stdout: 3203 bytes
- >>>
- name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout
- connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1
-
--name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout
--ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default)
-+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout dhcp-vendor-class-identifier
-+ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) --
-
- name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token
- ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie nie tak -1 (unknown) stable-privacy 0 (default) -- -- 0 (default) tak -- 0x0 (none) --
-@@ -23032,18 +23074,18 @@ NAME TYPE USERNAME GATEWAY BANNER VPN-STATE
- VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 — Połączono z VPN key1 = val1 | key2 = val2 | key3 = val3
-
- <<<
--size: 3289
-+size: 3349
- location: clients/tests/test-client.py:test_004()/375
- cmd: $NMCLI --mode tabular --color yes con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 3130 bytes
-+stdout: 3190 bytes
- >>>
- name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout
- connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1
-
--name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout
--ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default)
-+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout dhcp-vendor-class-identifier
-+ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) --
-
- name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token
- ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no no yes -1 (unknown) stable-privacy 0 (default) -- -- 0 (default) yes -- 0x0 (none) --
-@@ -23061,18 +23103,18 @@ NAME TYPE USERNAME GATEWAY BANNER VPN-STATE
- VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 - VPN connected key1 = val1 | key2 = val2 | key3 = val3
-
- <<<
--size: 3312
-+size: 3372
- location: clients/tests/test-client.py:test_004()/376
- cmd: $NMCLI --mode tabular --color yes con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 3143 bytes
-+stdout: 3203 bytes
- >>>
- name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout
- connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1
-
--name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout
--ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default)
-+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout dhcp-vendor-class-identifier
-+ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) --
-
- name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token
- ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie nie tak -1 (unknown) stable-privacy 0 (default) -- -- 0 (default) tak -- 0x0 (none) --
-@@ -23090,18 +23132,18 @@ NAME TYPE USERNAME GATEWAY BANNER VPN-STATE
- VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 — Połączono z VPN key1 = val1 | key2 = val2 | key3 = val3
-
- <<<
--size: 2537
-+size: 2597
- location: clients/tests/test-client.py:test_004()/377
- cmd: $NMCLI --mode tabular --color yes -f ALL con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 2371 bytes
-+stdout: 2431 bytes
- >>>
- name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout
- connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1
-
--name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout
--ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default)
-+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout dhcp-vendor-class-identifier
-+ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) --
-
- name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token
- ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no no yes -1 (unknown) stable-privacy 0 (default) -- -- 0 (default) yes -- 0x0 (none) --
-@@ -23114,18 +23156,18 @@ proxy none no -- --
-
-
- <<<
--size: 2549
-+size: 2609
- location: clients/tests/test-client.py:test_004()/378
- cmd: $NMCLI --mode tabular --color yes -f ALL con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 2373 bytes
-+stdout: 2433 bytes
- >>>
- name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout
- connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1
-
--name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout
--ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default)
-+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout dhcp-vendor-class-identifier
-+ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) --
-
- name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token
- ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie nie tak -1 (unknown) stable-privacy 0 (default) -- -- 0 (default) tak -- 0x0 (none) --
-@@ -24628,12 +24670,12 @@ interface-name
-
-
- <<<
--size: 5193
-+size: 5283
- location: clients/tests/test-client.py:test_004()/423
- cmd: $NMCLI --mode tabular --pretty con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 5037 bytes
-+stdout: 5127 bytes
- >>>
- ==========================================
- Connection profile details (con-vpn-1)
-@@ -24642,9 +24684,9 @@ name id uuid stable-id type in
- --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1
-
--name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default)
-+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout dhcp-vendor-class-identifier
-+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-+ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) --
-
- name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token
- --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-@@ -24670,12 +24712,12 @@ NAME TYPE USERNAME GATEWAY BANNER VPN-STATE
- VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 - VPN connected key1 = val1 | key2 = val2 | key3 = val3
-
- <<<
--size: 5249
-+size: 5339
- location: clients/tests/test-client.py:test_004()/424
- cmd: $NMCLI --mode tabular --pretty con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 5083 bytes
-+stdout: 5173 bytes
- >>>
- ============================================
- Szczegóły profilu połączenia (con-vpn-1)
-@@ -24684,9 +24726,9 @@ name id uuid stable-id type in
- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1
-
--name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default)
-+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout dhcp-vendor-class-identifier
-+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-+ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) --
-
- name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token
- --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-@@ -24712,12 +24754,12 @@ NAME TYPE USERNAME GATEWAY BANNER VPN-STATE
- VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 — Połączono z VPN key1 = val1 | key2 = val2 | key3 = val3
-
- <<<
--size: 5193
-+size: 5283
- location: clients/tests/test-client.py:test_004()/425
- cmd: $NMCLI --mode tabular --pretty con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 5037 bytes
-+stdout: 5127 bytes
- >>>
- ==========================================
- Connection profile details (con-vpn-1)
-@@ -24726,9 +24768,9 @@ name id uuid stable-id type in
- --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1
-
--name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default)
-+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout dhcp-vendor-class-identifier
-+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-+ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) --
-
- name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token
- --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-@@ -24754,12 +24796,12 @@ NAME TYPE USERNAME GATEWAY BANNER VPN-STATE
- VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 - VPN connected key1 = val1 | key2 = val2 | key3 = val3
-
- <<<
--size: 5249
-+size: 5339
- location: clients/tests/test-client.py:test_004()/426
- cmd: $NMCLI --mode tabular --pretty con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 5083 bytes
-+stdout: 5173 bytes
- >>>
- ============================================
- Szczegóły profilu połączenia (con-vpn-1)
-@@ -24768,9 +24810,9 @@ name id uuid stable-id type in
- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1
-
--name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default)
-+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout dhcp-vendor-class-identifier
-+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-+ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) --
-
- name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token
- --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-@@ -24796,12 +24838,12 @@ NAME TYPE USERNAME GATEWAY BANNER VPN-STATE
- VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 — Połączono z VPN key1 = val1 | key2 = val2 | key3 = val3
-
- <<<
--size: 3849
-+size: 3939
- location: clients/tests/test-client.py:test_004()/427
- cmd: $NMCLI --mode tabular --pretty -f ALL con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 3686 bytes
-+stdout: 3776 bytes
- >>>
- ==========================================
- Connection profile details (con-vpn-1)
-@@ -24810,9 +24852,9 @@ name id uuid stable-id type in
- --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1
-
--name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default)
-+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout dhcp-vendor-class-identifier
-+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-+ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) --
-
- name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token
- --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-@@ -24828,12 +24870,12 @@ proxy none no -- --
-
-
- <<<
--size: 3872
-+size: 3962
- location: clients/tests/test-client.py:test_004()/428
- cmd: $NMCLI --mode tabular --pretty -f ALL con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 3699 bytes
-+stdout: 3789 bytes
- >>>
- ============================================
- Szczegóły profilu połączenia (con-vpn-1)
-@@ -24842,9 +24884,9 @@ name id uuid stable-id type in
- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1
-
--name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default)
-+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout dhcp-vendor-class-identifier
-+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-+ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) --
-
- name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token
- --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-@@ -26936,12 +26978,12 @@ interface-name
-
-
- <<<
--size: 5205
-+size: 5295
- location: clients/tests/test-client.py:test_004()/473
- cmd: $NMCLI --mode tabular --pretty --color yes con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 5037 bytes
-+stdout: 5127 bytes
- >>>
- ==========================================
- Connection profile details (con-vpn-1)
-@@ -26950,9 +26992,9 @@ name id uuid stable-id type in
- --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1
-
--name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default)
-+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout dhcp-vendor-class-identifier
-+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-+ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) --
-
- name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token
- --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-@@ -26978,12 +27020,12 @@ NAME TYPE USERNAME GATEWAY BANNER VPN-STATE
- VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 - VPN connected key1 = val1 | key2 = val2 | key3 = val3
-
- <<<
--size: 5261
-+size: 5351
- location: clients/tests/test-client.py:test_004()/474
- cmd: $NMCLI --mode tabular --pretty --color yes con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 5083 bytes
-+stdout: 5173 bytes
- >>>
- ============================================
- Szczegóły profilu połączenia (con-vpn-1)
-@@ -26992,9 +27034,9 @@ name id uuid stable-id type in
- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1
-
--name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default)
-+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout dhcp-vendor-class-identifier
-+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-+ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) --
-
- name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token
- --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-@@ -27020,12 +27062,12 @@ NAME TYPE USERNAME GATEWAY BANNER VPN-STATE
- VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 — Połączono z VPN key1 = val1 | key2 = val2 | key3 = val3
-
- <<<
--size: 5205
-+size: 5295
- location: clients/tests/test-client.py:test_004()/475
- cmd: $NMCLI --mode tabular --pretty --color yes con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 5037 bytes
-+stdout: 5127 bytes
- >>>
- ==========================================
- Connection profile details (con-vpn-1)
-@@ -27034,9 +27076,9 @@ name id uuid stable-id type in
- --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1
-
--name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default)
-+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout dhcp-vendor-class-identifier
-+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-+ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) --
-
- name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token
- --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-@@ -27062,12 +27104,12 @@ NAME TYPE USERNAME GATEWAY BANNER VPN-STATE
- VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 - VPN connected key1 = val1 | key2 = val2 | key3 = val3
-
- <<<
--size: 5261
-+size: 5351
- location: clients/tests/test-client.py:test_004()/476
- cmd: $NMCLI --mode tabular --pretty --color yes con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 5083 bytes
-+stdout: 5173 bytes
- >>>
- ============================================
- Szczegóły profilu połączenia (con-vpn-1)
-@@ -27076,9 +27118,9 @@ name id uuid stable-id type in
- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1
-
--name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default)
-+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout dhcp-vendor-class-identifier
-+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-+ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) --
-
- name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token
- --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-@@ -27104,12 +27146,12 @@ NAME TYPE USERNAME GATEWAY BANNER VPN-STATE
- VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 — Połączono z VPN key1 = val1 | key2 = val2 | key3 = val3
-
- <<<
--size: 3861
-+size: 3951
- location: clients/tests/test-client.py:test_004()/477
- cmd: $NMCLI --mode tabular --pretty --color yes -f ALL con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 3686 bytes
-+stdout: 3776 bytes
- >>>
- ==========================================
- Connection profile details (con-vpn-1)
-@@ -27118,9 +27160,9 @@ name id uuid stable-id type in
- --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1
-
--name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default)
-+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout dhcp-vendor-class-identifier
-+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-+ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) --
-
- name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token
- --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-@@ -27136,12 +27178,12 @@ proxy none no -- --
-
-
- <<<
--size: 3884
-+size: 3974
- location: clients/tests/test-client.py:test_004()/478
- cmd: $NMCLI --mode tabular --pretty --color yes -f ALL con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 3699 bytes
-+stdout: 3789 bytes
- >>>
- ============================================
- Szczegóły profilu połączenia (con-vpn-1)
-@@ -27150,9 +27192,9 @@ name id uuid stable-id type in
- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1
-
--name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default)
-+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout dhcp-vendor-class-identifier
-+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-+ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) --
-
- name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token
- --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-@@ -29244,15 +29286,15 @@ interface-name
-
-
- <<<
--size: 804
-+size: 805
- location: clients/tests/test-client.py:test_004()/523
- cmd: $NMCLI --mode tabular --terse con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 650 bytes
-+stdout: 651 bytes
- >>>
- connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
--ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
-+ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1:
- ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
- vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
- proxy:none:no::
-@@ -29260,15 +29302,15 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::y
- VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3
-
- <<<
--size: 814
-+size: 815
- location: clients/tests/test-client.py:test_004()/524
- cmd: $NMCLI --mode tabular --terse con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 650 bytes
-+stdout: 651 bytes
- >>>
- connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
--ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
-+ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1:
- ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
- vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
- proxy:none:no::
-@@ -29276,15 +29318,15 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::y
- VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3
-
- <<<
--size: 804
-+size: 805
- location: clients/tests/test-client.py:test_004()/525
- cmd: $NMCLI --mode tabular --terse con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 650 bytes
-+stdout: 651 bytes
- >>>
- connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
--ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
-+ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1:
- ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
- vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
- proxy:none:no::
-@@ -29292,15 +29334,15 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::y
- VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3
-
- <<<
--size: 814
-+size: 815
- location: clients/tests/test-client.py:test_004()/526
- cmd: $NMCLI --mode tabular --terse con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 650 bytes
-+stdout: 651 bytes
- >>>
- connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
--ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
-+ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1:
- ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
- vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
- proxy:none:no::
-@@ -29308,29 +29350,29 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::y
- VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3
-
- <<<
--size: 516
-+size: 517
- location: clients/tests/test-client.py:test_004()/527
- cmd: $NMCLI --mode tabular --terse -f ALL con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 355 bytes
-+stdout: 356 bytes
- >>>
- connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
--ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
-+ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1:
- ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
- vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
- proxy:none:no::
-
- <<<
--size: 526
-+size: 527
- location: clients/tests/test-client.py:test_004()/528
- cmd: $NMCLI --mode tabular --terse -f ALL con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 355 bytes
-+stdout: 356 bytes
- >>>
- connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
--ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
-+ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1:
- ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
- vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
- proxy:none:no::
-@@ -30182,15 +30224,15 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA
-
-
- <<<
--size: 816
-+size: 817
- location: clients/tests/test-client.py:test_004()/573
- cmd: $NMCLI --mode tabular --terse --color yes con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 650 bytes
-+stdout: 651 bytes
- >>>
- connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
--ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
-+ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1:
- ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
- vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
- proxy:none:no::
-@@ -30198,15 +30240,15 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::y
- VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3
-
- <<<
--size: 826
-+size: 827
- location: clients/tests/test-client.py:test_004()/574
- cmd: $NMCLI --mode tabular --terse --color yes con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 650 bytes
-+stdout: 651 bytes
- >>>
- connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
--ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
-+ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1:
- ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
- vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
- proxy:none:no::
-@@ -30214,15 +30256,15 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::y
- VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3
-
- <<<
--size: 816
-+size: 817
- location: clients/tests/test-client.py:test_004()/575
- cmd: $NMCLI --mode tabular --terse --color yes con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 650 bytes
-+stdout: 651 bytes
- >>>
- connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
--ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
-+ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1:
- ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
- vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
- proxy:none:no::
-@@ -30230,15 +30272,15 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::y
- VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3
-
- <<<
--size: 826
-+size: 827
- location: clients/tests/test-client.py:test_004()/576
- cmd: $NMCLI --mode tabular --terse --color yes con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 650 bytes
-+stdout: 651 bytes
- >>>
- connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
--ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
-+ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1:
- ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
- vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
- proxy:none:no::
-@@ -30246,29 +30288,29 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::y
- VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3
-
- <<<
--size: 528
-+size: 529
- location: clients/tests/test-client.py:test_004()/577
- cmd: $NMCLI --mode tabular --terse --color yes -f ALL con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 355 bytes
-+stdout: 356 bytes
- >>>
- connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
--ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
-+ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1:
- ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
- vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
- proxy:none:no::
-
- <<<
--size: 538
-+size: 539
- location: clients/tests/test-client.py:test_004()/578
- cmd: $NMCLI --mode tabular --terse --color yes -f ALL con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 355 bytes
-+stdout: 356 bytes
- >>>
- connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
--ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
-+ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1:
- ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
- vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
- proxy:none:no::
-@@ -31120,12 +31162,12 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA
-
-
- <<<
--size: 5080
-+size: 5123
- location: clients/tests/test-client.py:test_004()/623
- cmd: $NMCLI --mode multiline con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 4931 bytes
-+stdout: 4974 bytes
- >>>
- connection.id: con-vpn-1
- connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP
-@@ -31174,6 +31216,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: no
- ipv4.may-fail: yes
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -31232,12 +31275,12 @@ VPN.CFG[2]: key2 = val2
- VPN.CFG[3]: key3 = val3
-
- <<<
--size: 5110
-+size: 5153
- location: clients/tests/test-client.py:test_004()/624
- cmd: $NMCLI --mode multiline con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 4951 bytes
-+stdout: 4994 bytes
- >>>
- connection.id: con-vpn-1
- connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP
-@@ -31286,6 +31329,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: nie
- ipv4.may-fail: tak
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -31344,12 +31388,12 @@ VPN.CFG[2]: key2 = val2
- VPN.CFG[3]: key3 = val3
-
- <<<
--size: 5080
-+size: 5123
- location: clients/tests/test-client.py:test_004()/625
- cmd: $NMCLI --mode multiline con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 4931 bytes
-+stdout: 4974 bytes
- >>>
- connection.id: con-vpn-1
- connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP
-@@ -31398,6 +31442,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: no
- ipv4.may-fail: yes
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -31456,12 +31501,12 @@ VPN.CFG[2]: key2 = val2
- VPN.CFG[3]: key3 = val3
-
- <<<
--size: 5110
-+size: 5153
- location: clients/tests/test-client.py:test_004()/626
- cmd: $NMCLI --mode multiline con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 4951 bytes
-+stdout: 4994 bytes
- >>>
- connection.id: con-vpn-1
- connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP
-@@ -31510,6 +31555,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: nie
- ipv4.may-fail: tak
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -31568,12 +31614,12 @@ VPN.CFG[2]: key2 = val2
- VPN.CFG[3]: key3 = val3
-
- <<<
--size: 3956
-+size: 3999
- location: clients/tests/test-client.py:test_004()/627
- cmd: $NMCLI --mode multiline -f ALL con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 3800 bytes
-+stdout: 3843 bytes
- >>>
- connection.id: con-vpn-1
- connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP
-@@ -31622,6 +31668,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: no
- ipv4.may-fail: yes
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -31659,12 +31706,12 @@ proxy.pac-url: --
- proxy.pac-script: --
-
- <<<
--size: 3976
-+size: 4019
- location: clients/tests/test-client.py:test_004()/628
- cmd: $NMCLI --mode multiline -f ALL con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 3810 bytes
-+stdout: 3853 bytes
- >>>
- connection.id: con-vpn-1
- connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP
-@@ -31713,6 +31760,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: nie
- ipv4.may-fail: tak
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -34830,12 +34878,12 @@ connection.type: 802-11-wireless
- connection.interface-name: --
-
- <<<
--size: 5092
-+size: 5135
- location: clients/tests/test-client.py:test_004()/673
- cmd: $NMCLI --mode multiline --color yes con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 4931 bytes
-+stdout: 4974 bytes
- >>>
- connection.id: con-vpn-1
- connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP
-@@ -34884,6 +34932,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: no
- ipv4.may-fail: yes
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -34942,12 +34991,12 @@ VPN.CFG[2]: key2 = val2
- VPN.CFG[3]: key3 = val3
-
- <<<
--size: 5122
-+size: 5165
- location: clients/tests/test-client.py:test_004()/674
- cmd: $NMCLI --mode multiline --color yes con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 4951 bytes
-+stdout: 4994 bytes
- >>>
- connection.id: con-vpn-1
- connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP
-@@ -34996,6 +35045,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: nie
- ipv4.may-fail: tak
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -35054,12 +35104,12 @@ VPN.CFG[2]: key2 = val2
- VPN.CFG[3]: key3 = val3
-
- <<<
--size: 5092
-+size: 5135
- location: clients/tests/test-client.py:test_004()/675
- cmd: $NMCLI --mode multiline --color yes con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 4931 bytes
-+stdout: 4974 bytes
- >>>
- connection.id: con-vpn-1
- connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP
-@@ -35108,6 +35158,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: no
- ipv4.may-fail: yes
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -35166,12 +35217,12 @@ VPN.CFG[2]: key2 = val2
- VPN.CFG[3]: key3 = val3
-
- <<<
--size: 5122
-+size: 5165
- location: clients/tests/test-client.py:test_004()/676
- cmd: $NMCLI --mode multiline --color yes con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 4951 bytes
-+stdout: 4994 bytes
- >>>
- connection.id: con-vpn-1
- connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP
-@@ -35220,6 +35271,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: nie
- ipv4.may-fail: tak
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -35278,12 +35330,12 @@ VPN.CFG[2]: key2 = val2
- VPN.CFG[3]: key3 = val3
-
- <<<
--size: 3968
-+size: 4011
- location: clients/tests/test-client.py:test_004()/677
- cmd: $NMCLI --mode multiline --color yes -f ALL con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 3800 bytes
-+stdout: 3843 bytes
- >>>
- connection.id: con-vpn-1
- connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP
-@@ -35332,6 +35384,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: no
- ipv4.may-fail: yes
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -35369,12 +35422,12 @@ proxy.pac-url: --
- proxy.pac-script: --
-
- <<<
--size: 3988
-+size: 4031
- location: clients/tests/test-client.py:test_004()/678
- cmd: $NMCLI --mode multiline --color yes -f ALL con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 3810 bytes
-+stdout: 3853 bytes
- >>>
- connection.id: con-vpn-1
- connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP
-@@ -35423,6 +35476,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: nie
- ipv4.may-fail: tak
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- ipv6.method: auto
- ipv6.dns: --
- ipv6.dns-search: --
-@@ -38540,12 +38594,12 @@ connection.type: 802-11-wireless
- connection.interface-name: --
-
- <<<
--size: 6101
-+size: 6144
- location: clients/tests/test-client.py:test_004()/723
- cmd: $NMCLI --mode multiline --pretty con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 5943 bytes
-+stdout: 5986 bytes
- >>>
- ===============================================================================
- Connection profile details (con-vpn-1)
-@@ -38598,6 +38652,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: no
- ipv4.may-fail: yes
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- -------------------------------------------------------------------------------
- ipv6.method: auto
- ipv6.dns: --
-@@ -38665,12 +38720,12 @@ VPN.CFG[3]: key3 = val3
- -------------------------------------------------------------------------------
-
- <<<
--size: 6143
-+size: 6186
- location: clients/tests/test-client.py:test_004()/724
- cmd: $NMCLI --mode multiline --pretty con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 5975 bytes
-+stdout: 6018 bytes
- >>>
- ===============================================================================
- Szczegóły profilu połączenia (con-vpn-1)
-@@ -38723,6 +38778,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: nie
- ipv4.may-fail: tak
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- -------------------------------------------------------------------------------
- ipv6.method: auto
- ipv6.dns: --
-@@ -38790,12 +38846,12 @@ VPN.CFG[3]: key3 = val3
- -------------------------------------------------------------------------------
-
- <<<
--size: 6101
-+size: 6144
- location: clients/tests/test-client.py:test_004()/725
- cmd: $NMCLI --mode multiline --pretty con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 5943 bytes
-+stdout: 5986 bytes
- >>>
- ===============================================================================
- Connection profile details (con-vpn-1)
-@@ -38848,6 +38904,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: no
- ipv4.may-fail: yes
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- -------------------------------------------------------------------------------
- ipv6.method: auto
- ipv6.dns: --
-@@ -38915,12 +38972,12 @@ VPN.CFG[3]: key3 = val3
- -------------------------------------------------------------------------------
-
- <<<
--size: 6143
-+size: 6186
- location: clients/tests/test-client.py:test_004()/726
- cmd: $NMCLI --mode multiline --pretty con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 5975 bytes
-+stdout: 6018 bytes
- >>>
- ===============================================================================
- Szczegóły profilu połączenia (con-vpn-1)
-@@ -38973,6 +39030,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: nie
- ipv4.may-fail: tak
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- -------------------------------------------------------------------------------
- ipv6.method: auto
- ipv6.dns: --
-@@ -39040,12 +39098,12 @@ VPN.CFG[3]: key3 = val3
- -------------------------------------------------------------------------------
-
- <<<
--size: 4584
-+size: 4627
- location: clients/tests/test-client.py:test_004()/727
- cmd: $NMCLI --mode multiline --pretty -f ALL con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 4419 bytes
-+stdout: 4462 bytes
- >>>
- ===============================================================================
- Connection profile details (con-vpn-1)
-@@ -39098,6 +39156,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: no
- ipv4.may-fail: yes
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- -------------------------------------------------------------------------------
- ipv6.method: auto
- ipv6.dns: --
-@@ -39139,12 +39198,12 @@ proxy.pac-script: --
- -------------------------------------------------------------------------------
-
- <<<
--size: 4609
-+size: 4652
- location: clients/tests/test-client.py:test_004()/728
- cmd: $NMCLI --mode multiline --pretty -f ALL con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 4434 bytes
-+stdout: 4477 bytes
- >>>
- ===============================================================================
- Szczegóły profilu połączenia (con-vpn-1)
-@@ -39197,6 +39256,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: nie
- ipv4.may-fail: tak
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- -------------------------------------------------------------------------------
- ipv6.method: auto
- ipv6.dns: --
-@@ -42952,12 +43012,12 @@ connection.interface-name: --
- -------------------------------------------------------------------------------
-
- <<<
--size: 6113
-+size: 6156
- location: clients/tests/test-client.py:test_004()/773
- cmd: $NMCLI --mode multiline --pretty --color yes con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 5943 bytes
-+stdout: 5986 bytes
- >>>
- ===============================================================================
- Connection profile details (con-vpn-1)
-@@ -43010,6 +43070,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: no
- ipv4.may-fail: yes
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- -------------------------------------------------------------------------------
- ipv6.method: auto
- ipv6.dns: --
-@@ -43077,12 +43138,12 @@ VPN.CFG[3]: key3 = val3
- -------------------------------------------------------------------------------
-
- <<<
--size: 6155
-+size: 6198
- location: clients/tests/test-client.py:test_004()/774
- cmd: $NMCLI --mode multiline --pretty --color yes con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 5975 bytes
-+stdout: 6018 bytes
- >>>
- ===============================================================================
- Szczegóły profilu połączenia (con-vpn-1)
-@@ -43135,6 +43196,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: nie
- ipv4.may-fail: tak
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- -------------------------------------------------------------------------------
- ipv6.method: auto
- ipv6.dns: --
-@@ -43202,12 +43264,12 @@ VPN.CFG[3]: key3 = val3
- -------------------------------------------------------------------------------
-
- <<<
--size: 6113
-+size: 6156
- location: clients/tests/test-client.py:test_004()/775
- cmd: $NMCLI --mode multiline --pretty --color yes con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 5943 bytes
-+stdout: 5986 bytes
- >>>
- ===============================================================================
- Connection profile details (con-vpn-1)
-@@ -43260,6 +43322,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: no
- ipv4.may-fail: yes
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- -------------------------------------------------------------------------------
- ipv6.method: auto
- ipv6.dns: --
-@@ -43327,12 +43390,12 @@ VPN.CFG[3]: key3 = val3
- -------------------------------------------------------------------------------
-
- <<<
--size: 6155
-+size: 6198
- location: clients/tests/test-client.py:test_004()/776
- cmd: $NMCLI --mode multiline --pretty --color yes con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 5975 bytes
-+stdout: 6018 bytes
- >>>
- ===============================================================================
- Szczegóły profilu połączenia (con-vpn-1)
-@@ -43385,6 +43448,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: nie
- ipv4.may-fail: tak
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- -------------------------------------------------------------------------------
- ipv6.method: auto
- ipv6.dns: --
-@@ -43452,12 +43516,12 @@ VPN.CFG[3]: key3 = val3
- -------------------------------------------------------------------------------
-
- <<<
--size: 4596
-+size: 4639
- location: clients/tests/test-client.py:test_004()/777
- cmd: $NMCLI --mode multiline --pretty --color yes -f ALL con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 4419 bytes
-+stdout: 4462 bytes
- >>>
- ===============================================================================
- Connection profile details (con-vpn-1)
-@@ -43510,6 +43574,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: no
- ipv4.may-fail: yes
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- -------------------------------------------------------------------------------
- ipv6.method: auto
- ipv6.dns: --
-@@ -43551,12 +43616,12 @@ proxy.pac-script: --
- -------------------------------------------------------------------------------
-
- <<<
--size: 4621
-+size: 4664
- location: clients/tests/test-client.py:test_004()/778
- cmd: $NMCLI --mode multiline --pretty --color yes -f ALL con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 4434 bytes
-+stdout: 4477 bytes
- >>>
- ===============================================================================
- Szczegóły profilu połączenia (con-vpn-1)
-@@ -43609,6 +43674,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none)
- ipv4.never-default: nie
- ipv4.may-fail: tak
- ipv4.dad-timeout: -1 (default)
-+ipv4.dhcp-vendor-class-identifier: --
- -------------------------------------------------------------------------------
- ipv6.method: auto
- ipv6.dns: --
-@@ -47364,12 +47430,12 @@ connection.interface-name: --
- -------------------------------------------------------------------------------
-
- <<<
--size: 2553
-+size: 2588
- location: clients/tests/test-client.py:test_004()/823
- cmd: $NMCLI --mode multiline --terse con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 2396 bytes
-+stdout: 2431 bytes
- >>>
- connection.id:con-vpn-1
- connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
-@@ -47418,6 +47484,7 @@ ipv4.dhcp-hostname-flags:0x0
- ipv4.never-default:no
- ipv4.may-fail:yes
- ipv4.dad-timeout:-1
-+ipv4.dhcp-vendor-class-identifier:
- ipv6.method:auto
- ipv6.dns:
- ipv6.dns-search:
-@@ -47476,12 +47543,12 @@ VPN.CFG[2]:key2 = val2
- VPN.CFG[3]:key3 = val3
-
- <<<
--size: 2563
-+size: 2598
- location: clients/tests/test-client.py:test_004()/824
- cmd: $NMCLI --mode multiline --terse con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 2396 bytes
-+stdout: 2431 bytes
- >>>
- connection.id:con-vpn-1
- connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
-@@ -47530,6 +47597,7 @@ ipv4.dhcp-hostname-flags:0x0
- ipv4.never-default:no
- ipv4.may-fail:yes
- ipv4.dad-timeout:-1
-+ipv4.dhcp-vendor-class-identifier:
- ipv6.method:auto
- ipv6.dns:
- ipv6.dns-search:
-@@ -47588,12 +47656,12 @@ VPN.CFG[2]:key2 = val2
- VPN.CFG[3]:key3 = val3
-
- <<<
--size: 2553
-+size: 2588
- location: clients/tests/test-client.py:test_004()/825
- cmd: $NMCLI --mode multiline --terse con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 2396 bytes
-+stdout: 2431 bytes
- >>>
- connection.id:con-vpn-1
- connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
-@@ -47642,6 +47710,7 @@ ipv4.dhcp-hostname-flags:0x0
- ipv4.never-default:no
- ipv4.may-fail:yes
- ipv4.dad-timeout:-1
-+ipv4.dhcp-vendor-class-identifier:
- ipv6.method:auto
- ipv6.dns:
- ipv6.dns-search:
-@@ -47700,12 +47769,12 @@ VPN.CFG[2]:key2 = val2
- VPN.CFG[3]:key3 = val3
-
- <<<
--size: 2563
-+size: 2598
- location: clients/tests/test-client.py:test_004()/826
- cmd: $NMCLI --mode multiline --terse con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 2396 bytes
-+stdout: 2431 bytes
- >>>
- connection.id:con-vpn-1
- connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
-@@ -47754,6 +47823,7 @@ ipv4.dhcp-hostname-flags:0x0
- ipv4.never-default:no
- ipv4.may-fail:yes
- ipv4.dad-timeout:-1
-+ipv4.dhcp-vendor-class-identifier:
- ipv6.method:auto
- ipv6.dns:
- ipv6.dns-search:
-@@ -47812,12 +47882,12 @@ VPN.CFG[2]:key2 = val2
- VPN.CFG[3]:key3 = val3
-
- <<<
--size: 1983
-+size: 2018
- location: clients/tests/test-client.py:test_004()/827
- cmd: $NMCLI --mode multiline --terse -f ALL con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 1819 bytes
-+stdout: 1854 bytes
- >>>
- connection.id:con-vpn-1
- connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
-@@ -47866,6 +47936,7 @@ ipv4.dhcp-hostname-flags:0x0
- ipv4.never-default:no
- ipv4.may-fail:yes
- ipv4.dad-timeout:-1
-+ipv4.dhcp-vendor-class-identifier:
- ipv6.method:auto
- ipv6.dns:
- ipv6.dns-search:
-@@ -47903,12 +47974,12 @@ proxy.pac-url:
- proxy.pac-script:
-
- <<<
--size: 1993
-+size: 2028
- location: clients/tests/test-client.py:test_004()/828
- cmd: $NMCLI --mode multiline --terse -f ALL con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 1819 bytes
-+stdout: 1854 bytes
- >>>
- connection.id:con-vpn-1
- connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
-@@ -47957,6 +48028,7 @@ ipv4.dhcp-hostname-flags:0x0
- ipv4.never-default:no
- ipv4.may-fail:yes
- ipv4.dad-timeout:-1
-+ipv4.dhcp-vendor-class-identifier:
- ipv6.method:auto
- ipv6.dns:
- ipv6.dns-search:
-@@ -51074,12 +51146,12 @@ connection.type:802-11-wireless
- connection.interface-name:
-
- <<<
--size: 2565
-+size: 2600
- location: clients/tests/test-client.py:test_004()/873
- cmd: $NMCLI --mode multiline --terse --color yes con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 2396 bytes
-+stdout: 2431 bytes
- >>>
- connection.id:con-vpn-1
- connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
-@@ -51128,6 +51200,7 @@ ipv4.dhcp-hostname-flags:0x0
- ipv4.never-default:no
- ipv4.may-fail:yes
- ipv4.dad-timeout:-1
-+ipv4.dhcp-vendor-class-identifier:
- ipv6.method:auto
- ipv6.dns:
- ipv6.dns-search:
-@@ -51186,12 +51259,12 @@ VPN.CFG[2]:key2 = val2
- VPN.CFG[3]:key3 = val3
-
- <<<
--size: 2575
-+size: 2610
- location: clients/tests/test-client.py:test_004()/874
- cmd: $NMCLI --mode multiline --terse --color yes con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 2396 bytes
-+stdout: 2431 bytes
- >>>
- connection.id:con-vpn-1
- connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
-@@ -51240,6 +51313,7 @@ ipv4.dhcp-hostname-flags:0x0
- ipv4.never-default:no
- ipv4.may-fail:yes
- ipv4.dad-timeout:-1
-+ipv4.dhcp-vendor-class-identifier:
- ipv6.method:auto
- ipv6.dns:
- ipv6.dns-search:
-@@ -51298,12 +51372,12 @@ VPN.CFG[2]:key2 = val2
- VPN.CFG[3]:key3 = val3
-
- <<<
--size: 2565
-+size: 2600
- location: clients/tests/test-client.py:test_004()/875
- cmd: $NMCLI --mode multiline --terse --color yes con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 2396 bytes
-+stdout: 2431 bytes
- >>>
- connection.id:con-vpn-1
- connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
-@@ -51352,6 +51426,7 @@ ipv4.dhcp-hostname-flags:0x0
- ipv4.never-default:no
- ipv4.may-fail:yes
- ipv4.dad-timeout:-1
-+ipv4.dhcp-vendor-class-identifier:
- ipv6.method:auto
- ipv6.dns:
- ipv6.dns-search:
-@@ -51410,12 +51485,12 @@ VPN.CFG[2]:key2 = val2
- VPN.CFG[3]:key3 = val3
-
- <<<
--size: 2575
-+size: 2610
- location: clients/tests/test-client.py:test_004()/876
- cmd: $NMCLI --mode multiline --terse --color yes con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 2396 bytes
-+stdout: 2431 bytes
- >>>
- connection.id:con-vpn-1
- connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
-@@ -51464,6 +51539,7 @@ ipv4.dhcp-hostname-flags:0x0
- ipv4.never-default:no
- ipv4.may-fail:yes
- ipv4.dad-timeout:-1
-+ipv4.dhcp-vendor-class-identifier:
- ipv6.method:auto
- ipv6.dns:
- ipv6.dns-search:
-@@ -51522,12 +51598,12 @@ VPN.CFG[2]:key2 = val2
- VPN.CFG[3]:key3 = val3
-
- <<<
--size: 1995
-+size: 2030
- location: clients/tests/test-client.py:test_004()/877
- cmd: $NMCLI --mode multiline --terse --color yes -f ALL con s con-vpn-1
- lang: C
- returncode: 0
--stdout: 1819 bytes
-+stdout: 1854 bytes
- >>>
- connection.id:con-vpn-1
- connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
-@@ -51576,6 +51652,7 @@ ipv4.dhcp-hostname-flags:0x0
- ipv4.never-default:no
- ipv4.may-fail:yes
- ipv4.dad-timeout:-1
-+ipv4.dhcp-vendor-class-identifier:
- ipv6.method:auto
- ipv6.dns:
- ipv6.dns-search:
-@@ -51613,12 +51690,12 @@ proxy.pac-url:
- proxy.pac-script:
-
- <<<
--size: 2005
-+size: 2040
- location: clients/tests/test-client.py:test_004()/878
- cmd: $NMCLI --mode multiline --terse --color yes -f ALL con s con-vpn-1
- lang: pl_PL.UTF-8
- returncode: 0
--stdout: 1819 bytes
-+stdout: 1854 bytes
- >>>
- connection.id:con-vpn-1
- connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
-@@ -51667,6 +51744,7 @@ ipv4.dhcp-hostname-flags:0x0
- ipv4.never-default:no
- ipv4.may-fail:yes
- ipv4.dad-timeout:-1
-+ipv4.dhcp-vendor-class-identifier:
- ipv6.method:auto
- ipv6.dns:
- ipv6.dns-search:
-diff --git a/libnm-core/nm-setting-ip4-config.c b/libnm-core/nm-setting-ip4-config.c
-index 31c822202..d351b2984 100644
---- a/libnm-core/nm-setting-ip4-config.c
-+++ b/libnm-core/nm-setting-ip4-config.c
-@@ -38,11 +38,13 @@
- NM_GOBJECT_PROPERTIES_DEFINE_BASE (
- PROP_DHCP_CLIENT_ID,
- PROP_DHCP_FQDN,
-+ PROP_DHCP_VENDOR_CLASS_IDENTIFIER,
- );
-
- typedef struct {
- char *dhcp_client_id;
- char *dhcp_fqdn;
-+ char *dhcp_vendor_class_identifier;
- } NMSettingIP4ConfigPrivate;
-
- G_DEFINE_TYPE (NMSettingIP4Config, nm_setting_ip4_config, NM_TYPE_SETTING_IP_CONFIG)
-@@ -88,6 +90,25 @@ nm_setting_ip4_config_get_dhcp_fqdn (NMSettingIP4Config *setting)
- return NM_SETTING_IP4_CONFIG_GET_PRIVATE (setting)->dhcp_fqdn;
- }
-
-+/**
-+ * nm_setting_ip4_config_get_dhcp_vendor_class_identifier:
-+ * @setting: the #NMSettingIP4Config
-+ *
-+ * Returns the value contained in the #NMSettingIP4Config:dhcp_vendor_class_identifier
-+ * property.
-+ *
-+ * Returns: the vendor class identifier option to send to the DHCP server
-+ *
-+ * Since: 1.28, 1.26.4
-+ **/
-+const char *
-+nm_setting_ip4_config_get_dhcp_vendor_class_identifier (NMSettingIP4Config *setting)
-+{
-+ g_return_val_if_fail (NM_IS_SETTING_IP4_CONFIG (setting), NULL);
-+
-+ return NM_SETTING_IP4_CONFIG_GET_PRIVATE (setting)->dhcp_vendor_class_identifier;
-+}
-+
- static gboolean
- verify (NMSetting *setting, NMConnection *connection, GError **error)
- {
-@@ -206,6 +227,52 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
- return FALSE;
- }
-
-+ if (priv->dhcp_vendor_class_identifier) {
-+ const char * bin;
-+ gsize unescaped_len;
-+ gs_free char *to_free = NULL;
-+
-+ if (priv->dhcp_vendor_class_identifier[0] == '\0') {
-+ g_set_error_literal (error,
-+ NM_CONNECTION_ERROR,
-+ NM_CONNECTION_ERROR_INVALID_PROPERTY,
-+ _ ("property cannot be an empty string"));
-+ g_prefix_error (error,
-+ "%s.%s: ",
-+ NM_SETTING_IP4_CONFIG_SETTING_NAME,
-+ NM_SETTING_IP4_CONFIG_DHCP_VENDOR_CLASS_IDENTIFIER);
-+ return FALSE;
-+ }
-+
-+ bin = nm_utils_buf_utf8safe_unescape (priv->dhcp_vendor_class_identifier,
-+ NM_UTILS_STR_UTF8_SAFE_FLAG_NONE,
-+ &unescaped_len,
-+ (gpointer *) &to_free);
-+ /* a DHCP option cannot be longer than 255 bytes */
-+ if (unescaped_len > 255) {
-+ g_set_error_literal (error,
-+ NM_CONNECTION_ERROR,
-+ NM_CONNECTION_ERROR_INVALID_PROPERTY,
-+ _ ("property cannot be longer than 255 bytes"));
-+ g_prefix_error (error,
-+ "%s.%s: ",
-+ NM_SETTING_IP4_CONFIG_SETTING_NAME,
-+ NM_SETTING_IP4_CONFIG_DHCP_VENDOR_CLASS_IDENTIFIER);
-+ return FALSE;
-+ }
-+ if (strlen (bin) != unescaped_len) {
-+ g_set_error_literal (error,
-+ NM_CONNECTION_ERROR,
-+ NM_CONNECTION_ERROR_INVALID_PROPERTY,
-+ _ ("property cannot contain any nul bytes"));
-+ g_prefix_error (error,
-+ "%s.%s: ",
-+ NM_SETTING_IP4_CONFIG_SETTING_NAME,
-+ NM_SETTING_IP4_CONFIG_DHCP_VENDOR_CLASS_IDENTIFIER);
-+ return FALSE;
-+ }
-+ }
-+
- /* Failures from here on are NORMALIZABLE_ERROR... */
-
- if ( nm_streq (method, NM_SETTING_IP4_CONFIG_METHOD_SHARED)
-@@ -474,6 +541,9 @@ get_property (GObject *object, guint prop_id,
- case PROP_DHCP_FQDN:
- g_value_set_string (value, nm_setting_ip4_config_get_dhcp_fqdn (s_ip4));
- break;
-+ case PROP_DHCP_VENDOR_CLASS_IDENTIFIER:
-+ g_value_set_string (value, nm_setting_ip4_config_get_dhcp_vendor_class_identifier (s_ip4));
-+ break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
-@@ -495,6 +565,10 @@ set_property (GObject *object, guint prop_id,
- g_free (priv->dhcp_fqdn);
- priv->dhcp_fqdn = g_value_dup_string (value);
- break;
-+ case PROP_DHCP_VENDOR_CLASS_IDENTIFIER:
-+ g_free (priv->dhcp_vendor_class_identifier);
-+ priv->dhcp_vendor_class_identifier = g_value_dup_string (value);
-+ break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
-@@ -528,6 +602,7 @@ finalize (GObject *object)
-
- g_free (priv->dhcp_client_id);
- g_free (priv->dhcp_fqdn);
-+ g_free (priv->dhcp_vendor_class_identifier);
-
- G_OBJECT_CLASS (nm_setting_ip4_config_parent_class)->finalize (object);
- }
-@@ -806,6 +881,32 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *klass)
- G_PARAM_READWRITE |
- G_PARAM_STATIC_STRINGS);
-
-+ /**
-+ * NMSettingIP4Config:dhcp-vendor-class-identifier:
-+ *
-+ * The Vendor Class Identifier DHCP option (60).
-+ * Special characters in the data string may be escaped using C-style escapes,
-+ * nevertheless this property cannot contain nul bytes.
-+ * If the per-profile value is unspecified (the default),
-+ * a global connection default gets consulted.
-+ * If still unspecified, the DHCP option is not sent to the server.
-+ *
-+ * Since 1.28, 1.26.4
-+ */
-+ /* ---ifcfg-rh---
-+ * property: dhcp-vendor-class-identifier
-+ * variable: DHCP_VENDOR_CLASS_IDENTIFIER(+)
-+ * description: The Vendor Class Identifier DHCP option (60).
-+ * example: DHCP_VENDOR_CLASS_IDENTIFIER=foo
-+ * ---end---
-+ */
-+ obj_properties[PROP_DHCP_VENDOR_CLASS_IDENTIFIER]
-+ = g_param_spec_string (NM_SETTING_IP4_CONFIG_DHCP_VENDOR_CLASS_IDENTIFIER,
-+ "",
-+ "",
-+ NULL,
-+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
-+
- /* IP4-specific property overrides */
-
- /* ---dbus---
-diff --git a/libnm-core/nm-setting-ip4-config.h b/libnm-core/nm-setting-ip4-config.h
-index fedec334a..a89fd43cf 100644
---- a/libnm-core/nm-setting-ip4-config.h
-+++ b/libnm-core/nm-setting-ip4-config.h
-@@ -24,8 +24,9 @@ G_BEGIN_DECLS
-
- #define NM_SETTING_IP4_CONFIG_SETTING_NAME "ipv4"
-
--#define NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID "dhcp-client-id"
--#define NM_SETTING_IP4_CONFIG_DHCP_FQDN "dhcp-fqdn"
-+#define NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID "dhcp-client-id"
-+#define NM_SETTING_IP4_CONFIG_DHCP_FQDN "dhcp-fqdn"
-+#define NM_SETTING_IP4_CONFIG_DHCP_VENDOR_CLASS_IDENTIFIER "dhcp-vendor-class-identifier"
-
- /**
- * NM_SETTING_IP4_CONFIG_METHOD_AUTO:
-@@ -95,6 +96,9 @@ const char *nm_setting_ip4_config_get_dhcp_client_id (NMSettingIP4Config *se
- NM_AVAILABLE_IN_1_2
- const char *nm_setting_ip4_config_get_dhcp_fqdn (NMSettingIP4Config *setting);
-
-+NM_AVAILABLE_IN_1_26_4
-+const char *nm_setting_ip4_config_get_dhcp_vendor_class_identifier (NMSettingIP4Config *setting);
-+
- G_END_DECLS
-
- #endif /* __NM_SETTING_IP4_CONFIG_H__ */
-diff --git a/libnm-core/tests/test-general.c b/libnm-core/tests/test-general.c
-index f70a7d5a6..a968609d3 100644
---- a/libnm-core/tests/test-general.c
-+++ b/libnm-core/tests/test-general.c
-@@ -3363,29 +3363,30 @@ test_connection_diff_a_only (void)
- { NULL, NM_SETTING_DIFF_RESULT_UNKNOWN },
- } },
- { NM_SETTING_IP4_CONFIG_SETTING_NAME, {
-- { NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_DIFF_RESULT_IN_A },
-- { NM_SETTING_IP_CONFIG_DNS, NM_SETTING_DIFF_RESULT_IN_A },
-- { NM_SETTING_IP_CONFIG_DNS_SEARCH, NM_SETTING_DIFF_RESULT_IN_A },
-- { NM_SETTING_IP_CONFIG_DNS_OPTIONS, NM_SETTING_DIFF_RESULT_IN_A },
-- { NM_SETTING_IP_CONFIG_ADDRESSES, NM_SETTING_DIFF_RESULT_IN_A },
-- { NM_SETTING_IP_CONFIG_GATEWAY, NM_SETTING_DIFF_RESULT_IN_A },
-- { NM_SETTING_IP_CONFIG_ROUTES, NM_SETTING_DIFF_RESULT_IN_A },
-- { NM_SETTING_IP_CONFIG_ROUTE_METRIC, NM_SETTING_DIFF_RESULT_IN_A },
-- { NM_SETTING_IP_CONFIG_ROUTE_TABLE, NM_SETTING_DIFF_RESULT_IN_A },
-- { NM_SETTING_IP_CONFIG_ROUTING_RULES, NM_SETTING_DIFF_RESULT_IN_A },
-- { NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES, NM_SETTING_DIFF_RESULT_IN_A },
-- { NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS, NM_SETTING_DIFF_RESULT_IN_A },
-- { NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID, NM_SETTING_DIFF_RESULT_IN_A },
-- { NM_SETTING_IP_CONFIG_DHCP_TIMEOUT, NM_SETTING_DIFF_RESULT_IN_A },
-- { NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME, NM_SETTING_DIFF_RESULT_IN_A },
-- { NM_SETTING_IP_CONFIG_DHCP_HOSTNAME, NM_SETTING_DIFF_RESULT_IN_A },
-- { NM_SETTING_IP_CONFIG_DHCP_HOSTNAME_FLAGS,NM_SETTING_DIFF_RESULT_IN_A },
-- { NM_SETTING_IP4_CONFIG_DHCP_FQDN, NM_SETTING_DIFF_RESULT_IN_A },
-- { NM_SETTING_IP_CONFIG_NEVER_DEFAULT, NM_SETTING_DIFF_RESULT_IN_A },
-- { NM_SETTING_IP_CONFIG_MAY_FAIL, NM_SETTING_DIFF_RESULT_IN_A },
-- { NM_SETTING_IP_CONFIG_DAD_TIMEOUT, NM_SETTING_DIFF_RESULT_IN_A },
-- { NM_SETTING_IP_CONFIG_DNS_PRIORITY, NM_SETTING_DIFF_RESULT_IN_A },
-- { NM_SETTING_IP_CONFIG_DHCP_IAID, NM_SETTING_DIFF_RESULT_IN_A },
-+ { NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_DIFF_RESULT_IN_A },
-+ { NM_SETTING_IP_CONFIG_DNS, NM_SETTING_DIFF_RESULT_IN_A },
-+ { NM_SETTING_IP_CONFIG_DNS_SEARCH, NM_SETTING_DIFF_RESULT_IN_A },
-+ { NM_SETTING_IP_CONFIG_DNS_OPTIONS, NM_SETTING_DIFF_RESULT_IN_A },
-+ { NM_SETTING_IP_CONFIG_ADDRESSES, NM_SETTING_DIFF_RESULT_IN_A },
-+ { NM_SETTING_IP_CONFIG_GATEWAY, NM_SETTING_DIFF_RESULT_IN_A },
-+ { NM_SETTING_IP_CONFIG_ROUTES, NM_SETTING_DIFF_RESULT_IN_A },
-+ { NM_SETTING_IP_CONFIG_ROUTE_METRIC, NM_SETTING_DIFF_RESULT_IN_A },
-+ { NM_SETTING_IP_CONFIG_ROUTE_TABLE, NM_SETTING_DIFF_RESULT_IN_A },
-+ { NM_SETTING_IP_CONFIG_ROUTING_RULES, NM_SETTING_DIFF_RESULT_IN_A },
-+ { NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES, NM_SETTING_DIFF_RESULT_IN_A },
-+ { NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS, NM_SETTING_DIFF_RESULT_IN_A },
-+ { NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID, NM_SETTING_DIFF_RESULT_IN_A },
-+ { NM_SETTING_IP_CONFIG_DHCP_TIMEOUT, NM_SETTING_DIFF_RESULT_IN_A },
-+ { NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME, NM_SETTING_DIFF_RESULT_IN_A },
-+ { NM_SETTING_IP_CONFIG_DHCP_HOSTNAME, NM_SETTING_DIFF_RESULT_IN_A },
-+ { NM_SETTING_IP_CONFIG_DHCP_HOSTNAME_FLAGS, NM_SETTING_DIFF_RESULT_IN_A },
-+ { NM_SETTING_IP4_CONFIG_DHCP_FQDN, NM_SETTING_DIFF_RESULT_IN_A },
-+ { NM_SETTING_IP_CONFIG_NEVER_DEFAULT, NM_SETTING_DIFF_RESULT_IN_A },
-+ { NM_SETTING_IP_CONFIG_MAY_FAIL, NM_SETTING_DIFF_RESULT_IN_A },
-+ { NM_SETTING_IP_CONFIG_DAD_TIMEOUT, NM_SETTING_DIFF_RESULT_IN_A },
-+ { NM_SETTING_IP_CONFIG_DNS_PRIORITY, NM_SETTING_DIFF_RESULT_IN_A },
-+ { NM_SETTING_IP_CONFIG_DHCP_IAID, NM_SETTING_DIFF_RESULT_IN_A },
-+ { NM_SETTING_IP4_CONFIG_DHCP_VENDOR_CLASS_IDENTIFIER, NM_SETTING_DIFF_RESULT_IN_A },
- { NULL, NM_SETTING_DIFF_RESULT_UNKNOWN },
- } },
- };
-diff --git a/libnm/libnm.ver b/libnm/libnm.ver
-index 44437435d..55af13a6f 100644
---- a/libnm/libnm.ver
-+++ b/libnm/libnm.ver
-@@ -1741,3 +1741,8 @@ global:
- nm_setting_option_set_boolean;
- nm_setting_option_set_uint32;
- } libnm_1_24_0;
-+
-+libnm_1_26_4 {
-+global:
-+ nm_setting_ip4_config_get_dhcp_vendor_class_identifier;
-+} libnm_1_26_0;
-diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml
-index 76a535fb5..91fb06bd9 100644
---- a/man/NetworkManager.conf.xml
-+++ b/man/NetworkManager.conf.xml
-@@ -740,6 +740,10 @@ ipv6.ip6-privacy=0
- <listitem><para>If left unspecified, the default value for
- the interface type is used.</para></listitem>
- </varlistentry>
-+ <varlistentry>
-+ <term><varname>ipv4.dhcp-vendor-class-identifier</varname></term>
-+ <listitem><para>If left unspecified, the default is to not send the DHCP option to the server.</para></listitem>
-+ </varlistentry>
- <varlistentry>
- <term><varname>ipv4.dns-priority</varname></term>
- <listitem><para>If unspecified or zero, use 50 for VPN profiles
---
-2.26.2
-
-
-From 654a617bd6fcf32c035f502c5b06202984148d21 Mon Sep 17 00:00:00 2001
-From: Antonio Cardace <acardace@redhat.com>
-Date: Mon, 24 Aug 2020 18:15:57 +0200
-Subject: [PATCH 3/7] ifcfg-rh: add support for the
- DHCP_VENDOR_CLASS_IDENTIFIER option
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1871042
-Signed-off-by: Antonio Cardace <acardace@redhat.com>
-(cherry picked from commit e9ed5f02ba5723e1a93120359dd96190b564cc23)
-(cherry picked from commit 8b791c98372c58537c546f3ed39a1f06c1f96816)
----
- src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c | 5 +++++
- src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c | 1 +
- src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h | 2 +-
- src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c | 5 +++++
- 4 files changed, 12 insertions(+), 1 deletion(-)
-
-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 1a9df92ce..82733895b 100644
---- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
-+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
-@@ -1803,6 +1803,11 @@ make_ip4_setting (shvarFile *ifcfg,
- if (v)
- g_object_set (s_ip4, NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID, v, NULL);
-
-+ nm_clear_g_free (&value);
-+ v = svGetValueStr (ifcfg, "DHCP_VENDOR_CLASS_IDENTIFIER", &value);
-+ if (v)
-+ g_object_set (s_ip4, NM_SETTING_IP4_CONFIG_DHCP_VENDOR_CLASS_IDENTIFIER, v, NULL);
-+
- nm_clear_g_free (&value);
- v = svGetValueStr (ifcfg, "DHCP_IAID", &value);
- if (v)
-diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c
-index d1500dbdb..975b65b02 100644
---- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c
-+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c
-@@ -872,6 +872,7 @@ const NMSIfcfgKeyTypeInfo nms_ifcfg_well_known_keys[] = {
- _KEY_TYPE ("DHCP_HOSTNAME_FLAGS", NMS_IFCFG_KEY_TYPE_IS_PLAIN ),
- _KEY_TYPE ("DHCP_IAID", NMS_IFCFG_KEY_TYPE_IS_PLAIN ),
- _KEY_TYPE ("DHCP_SEND_HOSTNAME", NMS_IFCFG_KEY_TYPE_IS_PLAIN ),
-+ _KEY_TYPE ("DHCP_VENDOR_CLASS_IDENTIFIER", NMS_IFCFG_KEY_TYPE_IS_PLAIN ),
- _KEY_TYPE ("DHCPv6_DUID", NMS_IFCFG_KEY_TYPE_IS_PLAIN ),
- _KEY_TYPE ("DHCPv6_IAID", NMS_IFCFG_KEY_TYPE_IS_PLAIN ),
- _KEY_TYPE ("DNS", NMS_IFCFG_KEY_TYPE_IS_NUMBERED ),
-diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h
-index 459c5ae95..a864137ec 100644
---- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h
-+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h
-@@ -33,7 +33,7 @@ typedef struct {
- NMSIfcfgKeyTypeFlags key_flags;
- } NMSIfcfgKeyTypeInfo;
-
--extern const NMSIfcfgKeyTypeInfo nms_ifcfg_well_known_keys[240];
-+extern const NMSIfcfgKeyTypeInfo nms_ifcfg_well_known_keys[241];
-
- const NMSIfcfgKeyTypeInfo *nms_ifcfg_well_known_key_find_info (const char *key, gssize *out_idx);
-
-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 e6526944c..a75f595ae 100644
---- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
-+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
-@@ -2668,6 +2668,11 @@ write_ip4_setting (NMConnection *connection,
- value = nm_setting_ip4_config_get_dhcp_client_id (NM_SETTING_IP4_CONFIG (s_ip4));
- svSetValueStr (ifcfg, "DHCP_CLIENT_ID", value);
-
-+ svSetValue (
-+ ifcfg,
-+ "DHCP_VENDOR_CLASS_IDENTIFIER",
-+ nm_setting_ip4_config_get_dhcp_vendor_class_identifier (NM_SETTING_IP4_CONFIG (s_ip4)));
-+
- value = nm_setting_ip_config_get_dhcp_iaid (s_ip4);
- svSetValueStr (ifcfg, "DHCP_IAID", value);
-
---
-2.26.2
-
-
-From c03dcd27122f0489b86b1dd78bb594e66ea0500b Mon Sep 17 00:00:00 2001
-From: Antonio Cardace <acardace@redhat.com>
-Date: Mon, 24 Aug 2020 18:08:09 +0200
-Subject: [PATCH 4/7] core: add support for dhcpv4 vendor class identifier
- option
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1871042
-Signed-off-by: Antonio Cardace <acardace@redhat.com>
-(cherry picked from commit f71f40bc20ea085bf49f2a31fed5476bce0eee91)
-(cherry picked from commit c7c5b88a833736d62c391baf0f5f9e2969440cba)
----
- src/devices/nm-device.c | 45 ++++++++++++++++++++++++++++++++++++++
- src/dhcp/nm-dhcp-client.c | 21 ++++++++++++++++++
- src/dhcp/nm-dhcp-client.h | 35 +++++++++++++++--------------
- src/dhcp/nm-dhcp-manager.c | 8 +++++++
- src/dhcp/nm-dhcp-manager.h | 1 +
- src/dhcp/nm-dhcp-options.h | 1 +
- src/nm-iface-helper.c | 1 +
- 7 files changed, 96 insertions(+), 16 deletions(-)
-
-diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
-index 24209c861..f2887267d 100644
---- a/src/devices/nm-device.c
-+++ b/src/devices/nm-device.c
-@@ -8749,11 +8749,53 @@ out_good:
- return result;
- }
-
-+static GBytes *
-+dhcp4_get_vendor_class_identifier (NMDevice *self, NMSettingIP4Config *s_ip4)
-+{
-+ gs_free char *config_data_prop = NULL;
-+ gs_free char *to_free = NULL;
-+ gboolean validate = FALSE;
-+ const char *conn_prop;
-+ GBytes *bytes = NULL;
-+ const char *bin;
-+ gsize len;
-+
-+ conn_prop = nm_setting_ip4_config_get_dhcp_vendor_class_identifier (s_ip4);
-+
-+ if (!conn_prop) {
-+ /* set in NetworkManager.conf ? */
-+ validate = TRUE;
-+ config_data_prop = nm_config_data_get_connection_default (
-+ NM_CONFIG_GET_DATA,
-+ NM_CON_DEFAULT ("ipv4.dhcp-vendor-class-identifier"),
-+ self);
-+ conn_prop = config_data_prop;
-+ }
-+
-+ if (conn_prop) {
-+ bin = nm_utils_buf_utf8safe_unescape (conn_prop,
-+ NM_UTILS_STR_UTF8_SAFE_FLAG_NONE,
-+ &len,
-+ (gpointer *) &to_free);
-+
-+ if (validate && (bin[0] == '\0' || len > 255 || strlen (bin) != len))
-+ return NULL;
-+
-+ if (to_free)
-+ bytes = g_bytes_new_take (g_steal_pointer (&to_free), len);
-+ else
-+ bytes = g_bytes_new (bin, len);
-+ }
-+
-+ return bytes;
-+}
-+
- static NMActStageReturn
- dhcp4_start (NMDevice *self)
- {
- NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
- NMSettingIPConfig *s_ip4;
-+ gs_unref_bytes GBytes *vendor_class_identifier = NULL;
- gs_unref_bytes GBytes *hwaddr = NULL;
- gs_unref_bytes GBytes *bcast_hwaddr = NULL;
- gs_unref_bytes GBytes *client_id = NULL;
-@@ -8782,6 +8824,8 @@ dhcp4_start (NMDevice *self)
- }
-
- client_id = dhcp4_get_client_id (self, connection, hwaddr);
-+ vendor_class_identifier
-+ = dhcp4_get_vendor_class_identifier (self, NM_SETTING_IP4_CONFIG (s_ip4));
-
- g_warn_if_fail (priv->dhcp_data_4.client == NULL);
- priv->dhcp_data_4.client = nm_dhcp_manager_start_ip4 (nm_dhcp_manager_get (),
-@@ -8802,6 +8846,7 @@ dhcp4_start (NMDevice *self)
- get_dhcp_timeout (self, AF_INET),
- priv->dhcp_anycast_address,
- NULL,
-+ vendor_class_identifier,
- &error);
- if (!priv->dhcp_data_4.client) {
- _LOGW (LOGD_DHCP4, "failure to start DHCP: %s", error->message);
-diff --git a/src/dhcp/nm-dhcp-client.c b/src/dhcp/nm-dhcp-client.c
-index f7324baf6..0cc357ebb 100644
---- a/src/dhcp/nm-dhcp-client.c
-+++ b/src/dhcp/nm-dhcp-client.c
-@@ -51,6 +51,7 @@ NM_GOBJECT_PROPERTIES_DEFINE (NMDhcpClient,
- PROP_HOSTNAME,
- PROP_HOSTNAME_FLAGS,
- PROP_MUD_URL,
-+ PROP_VENDOR_CLASS_IDENTIFIER,
- );
-
- typedef struct _NMDhcpClientPrivate {
-@@ -62,6 +63,7 @@ typedef struct _NMDhcpClientPrivate {
- GBytes * client_id;
- char * hostname;
- char * mud_url;
-+ GBytes * vendor_class_identifier;
- pid_t pid;
- guint timeout_id;
- guint watch_id;
-@@ -322,6 +324,14 @@ nm_dhcp_client_get_mud_url (NMDhcpClient *self)
- return NM_DHCP_CLIENT_GET_PRIVATE (self)->mud_url;
- }
-
-+GBytes *
-+nm_dhcp_client_get_vendor_class_identifier (NMDhcpClient *self)
-+{
-+ g_return_val_if_fail (NM_IS_DHCP_CLIENT (self), NULL);
-+
-+ return NM_DHCP_CLIENT_GET_PRIVATE (self)->vendor_class_identifier;
-+}
-+
- /*****************************************************************************/
-
- static const char *state_table[NM_DHCP_STATE_MAX + 1] = {
-@@ -1076,6 +1086,10 @@ set_property (GObject *object, guint prop_id,
- /* construct-only */
- priv->timeout = g_value_get_uint (value);
- break;
-+ case PROP_VENDOR_CLASS_IDENTIFIER:
-+ /* construct-only */
-+ priv->vendor_class_identifier = g_value_dup_boxed (value);
-+ break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
-@@ -1120,6 +1134,7 @@ dispose (GObject *object)
- nm_clear_pointer (&priv->client_id, g_bytes_unref);
- nm_clear_pointer (&priv->hwaddr, g_bytes_unref);
- nm_clear_pointer (&priv->bcast_hwaddr, g_bytes_unref);
-+ nm_clear_pointer (&priv->vendor_class_identifier, g_bytes_unref);
-
- G_OBJECT_CLASS (nm_dhcp_client_parent_class)->dispose (object);
-
-@@ -1237,6 +1252,12 @@ nm_dhcp_client_class_init (NMDhcpClientClass *client_class)
- G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY |
- G_PARAM_STATIC_STRINGS);
-
-+ obj_properties[PROP_VENDOR_CLASS_IDENTIFIER] =
-+ g_param_spec_boxed (NM_DHCP_CLIENT_VENDOR_CLASS_IDENTIFIER, "", "",
-+ G_TYPE_BYTES,
-+ G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY |
-+ G_PARAM_STATIC_STRINGS);
-+
- g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
-
- signals[SIGNAL_STATE_CHANGED] =
-diff --git a/src/dhcp/nm-dhcp-client.h b/src/dhcp/nm-dhcp-client.h
-index 479ea000a..11e531999 100644
---- a/src/dhcp/nm-dhcp-client.h
-+++ b/src/dhcp/nm-dhcp-client.h
-@@ -22,22 +22,23 @@
- #define NM_IS_DHCP_CLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DHCP_CLIENT))
- #define NM_DHCP_CLIENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DHCP_CLIENT, NMDhcpClientClass))
-
--#define NM_DHCP_CLIENT_ADDR_FAMILY "addr-family"
--#define NM_DHCP_CLIENT_FLAGS "flags"
--#define NM_DHCP_CLIENT_HWADDR "hwaddr"
--#define NM_DHCP_CLIENT_BROADCAST_HWADDR "broadcast-hwaddr"
--#define NM_DHCP_CLIENT_IFINDEX "ifindex"
--#define NM_DHCP_CLIENT_INTERFACE "iface"
--#define NM_DHCP_CLIENT_MULTI_IDX "multi-idx"
--#define NM_DHCP_CLIENT_HOSTNAME "hostname"
--#define NM_DHCP_CLIENT_MUD_URL "mud-url"
--#define NM_DHCP_CLIENT_ROUTE_METRIC "route-metric"
--#define NM_DHCP_CLIENT_ROUTE_TABLE "route-table"
--#define NM_DHCP_CLIENT_TIMEOUT "timeout"
--#define NM_DHCP_CLIENT_UUID "uuid"
--#define NM_DHCP_CLIENT_IAID "iaid"
--#define NM_DHCP_CLIENT_IAID_EXPLICIT "iaid-explicit"
--#define NM_DHCP_CLIENT_HOSTNAME_FLAGS "hostname-flags"
-+#define NM_DHCP_CLIENT_ADDR_FAMILY "addr-family"
-+#define NM_DHCP_CLIENT_FLAGS "flags"
-+#define NM_DHCP_CLIENT_HWADDR "hwaddr"
-+#define NM_DHCP_CLIENT_BROADCAST_HWADDR "broadcast-hwaddr"
-+#define NM_DHCP_CLIENT_IFINDEX "ifindex"
-+#define NM_DHCP_CLIENT_INTERFACE "iface"
-+#define NM_DHCP_CLIENT_MULTI_IDX "multi-idx"
-+#define NM_DHCP_CLIENT_HOSTNAME "hostname"
-+#define NM_DHCP_CLIENT_MUD_URL "mud-url"
-+#define NM_DHCP_CLIENT_ROUTE_METRIC "route-metric"
-+#define NM_DHCP_CLIENT_ROUTE_TABLE "route-table"
-+#define NM_DHCP_CLIENT_TIMEOUT "timeout"
-+#define NM_DHCP_CLIENT_UUID "uuid"
-+#define NM_DHCP_CLIENT_IAID "iaid"
-+#define NM_DHCP_CLIENT_IAID_EXPLICIT "iaid-explicit"
-+#define NM_DHCP_CLIENT_HOSTNAME_FLAGS "hostname-flags"
-+#define NM_DHCP_CLIENT_VENDOR_CLASS_IDENTIFIER "vendor-class-identifier"
-
- #define NM_DHCP_CLIENT_SIGNAL_STATE_CHANGED "state-changed"
- #define NM_DHCP_CLIENT_SIGNAL_PREFIX_DELEGATED "prefix-delegated"
-@@ -150,6 +151,8 @@ gboolean nm_dhcp_client_get_info_only (NMDhcpClient *self);
-
- gboolean nm_dhcp_client_get_use_fqdn (NMDhcpClient *self);
-
-+GBytes *nm_dhcp_client_get_vendor_class_identifier (NMDhcpClient *self);
-+
- gboolean nm_dhcp_client_start_ip4 (NMDhcpClient *self,
- GBytes *client_id,
- const char *dhcp_anycast_addr,
-diff --git a/src/dhcp/nm-dhcp-manager.c b/src/dhcp/nm-dhcp-manager.c
-index 7565bfc8c..00e70da53 100644
---- a/src/dhcp/nm-dhcp-manager.c
-+++ b/src/dhcp/nm-dhcp-manager.c
-@@ -225,6 +225,7 @@ client_start (NMDhcpManager *self,
- NMSettingIP6ConfigPrivacy privacy,
- const char *last_ip4_address,
- guint needed_prefixes,
-+ GBytes *vendor_class_identifier,
- GError **error)
- {
- NMDhcpManagerPrivate *priv;
-@@ -238,6 +239,9 @@ client_start (NMDhcpManager *self,
- g_return_val_if_fail (ifindex > 0, NULL);
- g_return_val_if_fail (uuid != NULL, NULL);
- g_return_val_if_fail (!dhcp_client_id || g_bytes_get_size (dhcp_client_id) >= 2, NULL);
-+ g_return_val_if_fail ( !vendor_class_identifier
-+ || g_bytes_get_size (vendor_class_identifier) <= 255,
-+ NULL);
- g_return_val_if_fail (!error || !*error, NULL);
-
- if (!hwaddr || !bcast_hwaddr) {
-@@ -309,6 +313,7 @@ client_start (NMDhcpManager *self,
- NM_DHCP_CLIENT_ROUTE_METRIC, (guint) route_metric,
- NM_DHCP_CLIENT_TIMEOUT, (guint) timeout,
- NM_DHCP_CLIENT_HOSTNAME_FLAGS, (guint) hostname_flags,
-+ NM_DHCP_CLIENT_VENDOR_CLASS_IDENTIFIER, vendor_class_identifier,
- NM_DHCP_CLIENT_FLAGS, (guint) (0
- | (hostname_use_fqdn ? NM_DHCP_CLIENT_FLAGS_USE_FQDN : 0)
- | (info_only ? NM_DHCP_CLIENT_FLAGS_INFO_ONLY : 0)
-@@ -389,6 +394,7 @@ nm_dhcp_manager_start_ip4 (NMDhcpManager *self,
- guint32 timeout,
- const char *dhcp_anycast_addr,
- const char *last_ip_address,
-+ GBytes *vendor_class_identifier,
- GError **error)
- {
- NMDhcpManagerPrivate *priv;
-@@ -448,6 +454,7 @@ nm_dhcp_manager_start_ip4 (NMDhcpManager *self,
- 0,
- last_ip_address,
- 0,
-+ vendor_class_identifier,
- error);
- }
-
-@@ -513,6 +520,7 @@ nm_dhcp_manager_start_ip6 (NMDhcpManager *self,
- privacy,
- NULL,
- needed_prefixes,
-+ NULL,
- error);
- }
-
-diff --git a/src/dhcp/nm-dhcp-manager.h b/src/dhcp/nm-dhcp-manager.h
-index 88435282e..34993784b 100644
---- a/src/dhcp/nm-dhcp-manager.h
-+++ b/src/dhcp/nm-dhcp-manager.h
-@@ -48,6 +48,7 @@ NMDhcpClient * nm_dhcp_manager_start_ip4 (NMDhcpManager *manager,
- guint32 timeout,
- const char *dhcp_anycast_addr,
- const char *last_ip_address,
-+ GBytes *vendor_class_identifier,
- GError **error);
-
- NMDhcpClient * nm_dhcp_manager_start_ip6 (NMDhcpManager *manager,
-diff --git a/src/dhcp/nm-dhcp-options.h b/src/dhcp/nm-dhcp-options.h
-index bc3df5acd..118ae4707 100644
---- a/src/dhcp/nm-dhcp-options.h
-+++ b/src/dhcp/nm-dhcp-options.h
-@@ -59,6 +59,7 @@ typedef enum {
- NM_DHCP_OPTION_DHCP4_SERVER_ID = 54,
- NM_DHCP_OPTION_DHCP4_RENEWAL_T1_TIME = 58,
- NM_DHCP_OPTION_DHCP4_REBINDING_T2_TIME = 59,
-+ NM_DHCP_OPTION_DHCP4_VENDOR_CLASS_IDENTIFIER = 60,
- NM_DHCP_OPTION_DHCP4_CLIENT_ID = 61,
- NM_DHCP_OPTION_DHCP4_NWIP_DOMAIN = 62,
- NM_DHCP_OPTION_DHCP4_NWIP_SUBOPTIONS = 63,
-diff --git a/src/nm-iface-helper.c b/src/nm-iface-helper.c
-index c7d65d2a6..da84640d2 100644
---- a/src/nm-iface-helper.c
-+++ b/src/nm-iface-helper.c
-@@ -538,6 +538,7 @@ main (int argc, char *argv[])
- NM_DHCP_TIMEOUT_DEFAULT,
- NULL,
- global_opt.dhcp4_address,
-+ NULL,
- &error);
- if (!dhcp4_client)
- g_error ("failure to start DHCP: %s", error->message);
---
-2.26.2
-
-
-From 23863fa81661f0d4a5da19ea44cf005e5878b2b5 Mon Sep 17 00:00:00 2001
-From: Antonio Cardace <acardace@redhat.com>
-Date: Mon, 24 Aug 2020 18:14:04 +0200
-Subject: [PATCH 5/7] dhcp: implement dhcp-vendor-class-identifier option for
- internal DHCP client
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1871042
-Signed-off-by: Antonio Cardace <acardace@redhat.com>
-(cherry picked from commit f8a729015380b367bd2ecff66f31cb6253793e50)
-(cherry picked from commit 18ff5984f76fbebe12178ba301129221fc18c782)
----
- src/dhcp/nm-dhcp-nettools.c | 20 ++++++++++++++++++++
- 1 file changed, 20 insertions(+)
-
-diff --git a/src/dhcp/nm-dhcp-nettools.c b/src/dhcp/nm-dhcp-nettools.c
-index fe6a4582b..56f7b6ce3 100644
---- a/src/dhcp/nm-dhcp-nettools.c
-+++ b/src/dhcp/nm-dhcp-nettools.c
-@@ -1289,6 +1289,7 @@ ip4_start (NMDhcpClient *client,
- struct in_addr last_addr = { 0 };
- const char *hostname;
- const char *mud_url;
-+ GBytes *vendor_class_identifier;
- int r, i;
-
- g_return_val_if_fail (!priv->probe, FALSE);
-@@ -1410,6 +1411,25 @@ ip4_start (NMDhcpClient *client,
- }
- }
-
-+ vendor_class_identifier = nm_dhcp_client_get_vendor_class_identifier (client);
-+ if (vendor_class_identifier) {
-+ const void *option_data;
-+ gsize option_size;
-+
-+ option_data = g_bytes_get_data (vendor_class_identifier, &option_size);
-+ nm_assert (option_data);
-+ nm_assert (option_size <= 255);
-+
-+ r = n_dhcp4_client_probe_config_append_option (config,
-+ NM_DHCP_OPTION_DHCP4_VENDOR_CLASS_IDENTIFIER,
-+ option_data,
-+ option_size);
-+ if (r) {
-+ set_error_nettools (error, r, "failed to set vendor class identifier");
-+ return FALSE;
-+ }
-+ }
-+
- g_free (priv->lease_file);
- priv->lease_file = g_steal_pointer (&lease_file);
-
---
-2.26.2
-
-
-From 628fc722759d9872eec7589c8adcaaa4cca500cb Mon Sep 17 00:00:00 2001
-From: Antonio Cardace <acardace@redhat.com>
-Date: Mon, 24 Aug 2020 18:15:01 +0200
-Subject: [PATCH 6/7] dhcp: implement dhcp-vendor-class-identifier option for
- systemd's DHCP client
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1871042
-Signed-off-by: Antonio Cardace <acardace@redhat.com>
-(cherry picked from commit 5da0939a3f73aa002cb3d19e7d56087efec5d196)
-(cherry picked from commit 76820f04c761abb0d49512e5b2d2078471193843)
----
- src/dhcp/nm-dhcp-systemd.c | 19 +++++++++++++++++++
- 1 file changed, 19 insertions(+)
-
-diff --git a/src/dhcp/nm-dhcp-systemd.c b/src/dhcp/nm-dhcp-systemd.c
-index 7ee101128..48b4dd7a1 100644
---- a/src/dhcp/nm-dhcp-systemd.c
-+++ b/src/dhcp/nm-dhcp-systemd.c
-@@ -569,6 +569,7 @@ ip4_start (NMDhcpClient *client,
- int arp_type;
- GBytes *client_id;
- gs_unref_bytes GBytes *client_id_new = NULL;
-+ GBytes *vendor_class_identifier;
- const uint8_t *client_id_arr;
- size_t client_id_len;
- struct in_addr last_addr = { 0 };
-@@ -698,6 +699,24 @@ ip4_start (NMDhcpClient *client,
- }
- }
-
-+ vendor_class_identifier = nm_dhcp_client_get_vendor_class_identifier (client);
-+ if (vendor_class_identifier) {
-+ const char *option_data;
-+ gsize len;
-+
-+ option_data = g_bytes_get_data (vendor_class_identifier, &len);
-+ nm_assert (option_data);
-+ nm_assert (len <= 255);
-+
-+ option_data = nm_strndup_a (300, option_data, len, NULL);
-+
-+ r = sd_dhcp_client_set_vendor_class_identifier (sd_client, option_data);
-+ if (r < 0) {
-+ nm_utils_error_set_errno (error, r, "failed to set DHCP vendor class identifier: %s");
-+ return FALSE;
-+ }
-+ }
-+
- r = sd_dhcp_client_set_callback (sd_client, dhcp_event_cb, client);
- if (r < 0) {
- nm_utils_error_set_errno (error, r, "failed to set callback: %s");
---
-2.26.2
-
-
-From 3566ab23a67197af1c84392c2ede9b17fbc791f7 Mon Sep 17 00:00:00 2001
-From: Antonio Cardace <acardace@redhat.com>
-Date: Wed, 26 Aug 2020 15:41:33 +0200
-Subject: [PATCH 7/7] downstream: patch to add
- nm_setting_ip4_config_get_dhcp_vendor_class_identifier() API to RHEL 8.3
-
-This patch makes the symbol available on NM 1.26.0
-
-Signed-off-by: Antonio Cardace <acardace@redhat.com>
----
- libnm-core/nm-core-internal.h | 8 ++++++++
- libnm-core/nm-setting-ip4-config.c | 2 +-
- src/devices/nm-device.c | 2 +-
- src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c | 2 +-
- 4 files changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h
-index 3a15d2e95..81417c4a4 100644
---- a/libnm-core/nm-core-internal.h
-+++ b/libnm-core/nm-core-internal.h
-@@ -906,4 +906,12 @@ const NMVariantAttributeSpec *_nm_variant_attribute_spec_find_binary_search (con
-
- gboolean _nm_ip_tunnel_mode_is_layer2 (NMIPTunnelMode mode);
-
-+static inline const char *
-+_nm_setting_ip4_config_get_dhcp_vendor_class_identifier (NMSettingIP4Config *setting)
-+{
-+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-+ return nm_setting_ip4_config_get_dhcp_vendor_class_identifier (setting);
-+G_GNUC_END_IGNORE_DEPRECATIONS
-+}
-+
- #endif
-diff --git a/libnm-core/nm-setting-ip4-config.c b/libnm-core/nm-setting-ip4-config.c
-index d351b2984..0b8dc89b3 100644
---- a/libnm-core/nm-setting-ip4-config.c
-+++ b/libnm-core/nm-setting-ip4-config.c
-@@ -542,7 +542,7 @@ get_property (GObject *object, guint prop_id,
- g_value_set_string (value, nm_setting_ip4_config_get_dhcp_fqdn (s_ip4));
- break;
- case PROP_DHCP_VENDOR_CLASS_IDENTIFIER:
-- g_value_set_string (value, nm_setting_ip4_config_get_dhcp_vendor_class_identifier (s_ip4));
-+ g_value_set_string (value, _nm_setting_ip4_config_get_dhcp_vendor_class_identifier (s_ip4));
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
-index f2887267d..72a2b1008 100644
---- a/src/devices/nm-device.c
-+++ b/src/devices/nm-device.c
-@@ -8760,7 +8760,7 @@ dhcp4_get_vendor_class_identifier (NMDevice *self, NMSettingIP4Config *s_ip4)
- const char *bin;
- gsize len;
-
-- conn_prop = nm_setting_ip4_config_get_dhcp_vendor_class_identifier (s_ip4);
-+ conn_prop = _nm_setting_ip4_config_get_dhcp_vendor_class_identifier (s_ip4);
-
- if (!conn_prop) {
- /* set in NetworkManager.conf ? */
-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 a75f595ae..17c261bdc 100644
---- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
-+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
-@@ -2671,7 +2671,7 @@ write_ip4_setting (NMConnection *connection,
- svSetValue (
- ifcfg,
- "DHCP_VENDOR_CLASS_IDENTIFIER",
-- nm_setting_ip4_config_get_dhcp_vendor_class_identifier (NM_SETTING_IP4_CONFIG (s_ip4)));
-+ _nm_setting_ip4_config_get_dhcp_vendor_class_identifier (NM_SETTING_IP4_CONFIG (s_ip4)));
-
- value = nm_setting_ip_config_get_dhcp_iaid (s_ip4);
- svSetValueStr (ifcfg, "DHCP_IAID", value);
---
-2.26.2
-
diff --git a/SOURCES/1017-initrd-parse-rd.net.dhcp.vendor-class-rh1870692.patch b/SOURCES/1017-initrd-parse-rd.net.dhcp.vendor-class-rh1870692.patch
deleted file mode 100644
index 177b3ec..0000000
--- a/SOURCES/1017-initrd-parse-rd.net.dhcp.vendor-class-rh1870692.patch
+++ /dev/null
@@ -1,432 +0,0 @@
-From d15b8c6c561258eb0e0b92d6176a16ccc8c23be3 Mon Sep 17 00:00:00 2001
-From: Antonio Cardace <acardace@redhat.com>
-Date: Thu, 27 Aug 2020 18:18:31 +0200
-Subject: [PATCH 1/4] core: add 'dhcp-vendor-class-identifier' validation
- function
-
-So that it can be reused.
-
-Signed-off-by: Antonio Cardace <acardace@redhat.com>
-(cherry picked from commit 5cca669ff39c6909be906e8974e424ffd2ea42c2)
-(cherry picked from commit 847488cb2f9f0ba8017938e0876677180c0c91a0)
----
- .../nm-libnm-core-utils.c | 55 +++++++++++++++++++
- .../nm-libnm-core-utils.h | 2 +
- libnm-core/nm-setting-ip4-config.c | 48 +---------------
- po/POTFILES.in | 1 +
- src/devices/nm-device.c | 11 ++--
- 5 files changed, 65 insertions(+), 52 deletions(-)
-
-diff --git a/libnm-core/nm-libnm-core-intern/nm-libnm-core-utils.c b/libnm-core/nm-libnm-core-intern/nm-libnm-core-utils.c
-index f2c85cc60..8be7d913f 100644
---- a/libnm-core/nm-libnm-core-intern/nm-libnm-core-utils.c
-+++ b/libnm-core/nm-libnm-core-intern/nm-libnm-core-utils.c
-@@ -6,6 +6,8 @@
-
- #include "nm-common-macros.h"
-
-+#include "nm-errors.h"
-+
- #include <linux/rtnetlink.h>
-
- /*****************************************************************************/
-@@ -257,3 +259,56 @@ NM_UTILS_ENUM2STR_DEFINE (nm_utils_route_type2str, guint8,
- NM_UTILS_ENUM2STR (RTN_UNREACHABLE, "unreachable"),
- NM_UTILS_ENUM2STR (RTN_UNSPEC, "unspecified"),
- );
-+
-+gboolean
-+nm_utils_validate_dhcp4_vendor_class_id (const char *vci, GError **error)
-+{
-+ const char * bin;
-+ gsize unescaped_len;
-+ gs_free char *to_free = NULL;
-+
-+ g_return_val_if_fail (!error || !(*error), FALSE);
-+ g_return_val_if_fail (vci, FALSE);
-+
-+ if (vci[0] == '\0') {
-+ g_set_error_literal (error,
-+ NM_CONNECTION_ERROR,
-+ NM_CONNECTION_ERROR_INVALID_PROPERTY,
-+ _ ("property cannot be an empty string"));
-+ g_prefix_error (error,
-+ "%s.%s: ",
-+ NM_SETTING_IP4_CONFIG_SETTING_NAME,
-+ NM_SETTING_IP4_CONFIG_DHCP_VENDOR_CLASS_IDENTIFIER);
-+ return FALSE;
-+ }
-+
-+ bin = nm_utils_buf_utf8safe_unescape (vci,
-+ NM_UTILS_STR_UTF8_SAFE_FLAG_NONE,
-+ &unescaped_len,
-+ (gpointer *) &to_free);
-+ /* a DHCP option cannot be longer than 255 bytes */
-+ if (unescaped_len > 255) {
-+ g_set_error_literal (error,
-+ NM_CONNECTION_ERROR,
-+ NM_CONNECTION_ERROR_INVALID_PROPERTY,
-+ _ ("property cannot be longer than 255 bytes"));
-+ g_prefix_error (error,
-+ "%s.%s: ",
-+ NM_SETTING_IP4_CONFIG_SETTING_NAME,
-+ NM_SETTING_IP4_CONFIG_DHCP_VENDOR_CLASS_IDENTIFIER);
-+ return FALSE;
-+ }
-+ if (strlen (bin) != unescaped_len) {
-+ g_set_error_literal (error,
-+ NM_CONNECTION_ERROR,
-+ NM_CONNECTION_ERROR_INVALID_PROPERTY,
-+ _ ("property cannot contain any nul bytes"));
-+ g_prefix_error (error,
-+ "%s.%s: ",
-+ NM_SETTING_IP4_CONFIG_SETTING_NAME,
-+ NM_SETTING_IP4_CONFIG_DHCP_VENDOR_CLASS_IDENTIFIER);
-+ return FALSE;
-+ }
-+
-+ return TRUE;
-+}
-diff --git a/libnm-core/nm-libnm-core-intern/nm-libnm-core-utils.h b/libnm-core/nm-libnm-core-intern/nm-libnm-core-utils.h
-index bb3fa5fcf..6c1337d88 100644
---- a/libnm-core/nm-libnm-core-intern/nm-libnm-core-utils.h
-+++ b/libnm-core/nm-libnm-core-intern/nm-libnm-core-utils.h
-@@ -140,4 +140,6 @@ guint8 nm_utils_route_type_by_name (const char *name);
-
- const char *nm_utils_route_type2str (guint8 val, char *buf, gsize len);
-
-+gboolean nm_utils_validate_dhcp4_vendor_class_id (const char *vci, GError **error);
-+
- #endif /* __NM_LIBNM_SHARED_UTILS_H__ */
-diff --git a/libnm-core/nm-setting-ip4-config.c b/libnm-core/nm-setting-ip4-config.c
-index 0b8dc89b3..7ffefc25b 100644
---- a/libnm-core/nm-setting-ip4-config.c
-+++ b/libnm-core/nm-setting-ip4-config.c
-@@ -227,51 +227,9 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
- return FALSE;
- }
-
-- if (priv->dhcp_vendor_class_identifier) {
-- const char * bin;
-- gsize unescaped_len;
-- gs_free char *to_free = NULL;
--
-- if (priv->dhcp_vendor_class_identifier[0] == '\0') {
-- g_set_error_literal (error,
-- NM_CONNECTION_ERROR,
-- NM_CONNECTION_ERROR_INVALID_PROPERTY,
-- _ ("property cannot be an empty string"));
-- g_prefix_error (error,
-- "%s.%s: ",
-- NM_SETTING_IP4_CONFIG_SETTING_NAME,
-- NM_SETTING_IP4_CONFIG_DHCP_VENDOR_CLASS_IDENTIFIER);
-- return FALSE;
-- }
--
-- bin = nm_utils_buf_utf8safe_unescape (priv->dhcp_vendor_class_identifier,
-- NM_UTILS_STR_UTF8_SAFE_FLAG_NONE,
-- &unescaped_len,
-- (gpointer *) &to_free);
-- /* a DHCP option cannot be longer than 255 bytes */
-- if (unescaped_len > 255) {
-- g_set_error_literal (error,
-- NM_CONNECTION_ERROR,
-- NM_CONNECTION_ERROR_INVALID_PROPERTY,
-- _ ("property cannot be longer than 255 bytes"));
-- g_prefix_error (error,
-- "%s.%s: ",
-- NM_SETTING_IP4_CONFIG_SETTING_NAME,
-- NM_SETTING_IP4_CONFIG_DHCP_VENDOR_CLASS_IDENTIFIER);
-- return FALSE;
-- }
-- if (strlen (bin) != unescaped_len) {
-- g_set_error_literal (error,
-- NM_CONNECTION_ERROR,
-- NM_CONNECTION_ERROR_INVALID_PROPERTY,
-- _ ("property cannot contain any nul bytes"));
-- g_prefix_error (error,
-- "%s.%s: ",
-- NM_SETTING_IP4_CONFIG_SETTING_NAME,
-- NM_SETTING_IP4_CONFIG_DHCP_VENDOR_CLASS_IDENTIFIER);
-- return FALSE;
-- }
-- }
-+ if ( priv->dhcp_vendor_class_identifier
-+ && !nm_utils_validate_dhcp4_vendor_class_id (priv->dhcp_vendor_class_identifier, error))
-+ return FALSE;
-
- /* Failures from here on are NORMALIZABLE_ERROR... */
-
-diff --git a/po/POTFILES.in b/po/POTFILES.in
-index 25cb5c4a6..ea2eafa3f 100644
---- a/po/POTFILES.in
-+++ b/po/POTFILES.in
-@@ -59,6 +59,7 @@ libnm-core/nm-dbus-utils.c
- libnm-core/nm-keyfile/nm-keyfile-utils.c
- libnm-core/nm-keyfile/nm-keyfile.c
- libnm-core/nm-libnm-core-aux/nm-libnm-core-aux.c
-+libnm-core/nm-libnm-core-intern/nm-libnm-core-utils.c
- libnm-core/nm-setting-6lowpan.c
- libnm-core/nm-setting-8021x.c
- libnm-core/nm-setting-adsl.c
-diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
-index 72a2b1008..012af4d9a 100644
---- a/src/devices/nm-device.c
-+++ b/src/devices/nm-device.c
-@@ -8754,7 +8754,6 @@ dhcp4_get_vendor_class_identifier (NMDevice *self, NMSettingIP4Config *s_ip4)
- {
- gs_free char *config_data_prop = NULL;
- gs_free char *to_free = NULL;
-- gboolean validate = FALSE;
- const char *conn_prop;
- GBytes *bytes = NULL;
- const char *bin;
-@@ -8764,12 +8763,14 @@ dhcp4_get_vendor_class_identifier (NMDevice *self, NMSettingIP4Config *s_ip4)
-
- if (!conn_prop) {
- /* set in NetworkManager.conf ? */
-- validate = TRUE;
- config_data_prop = nm_config_data_get_connection_default (
- NM_CONFIG_GET_DATA,
- NM_CON_DEFAULT ("ipv4.dhcp-vendor-class-identifier"),
- self);
-- conn_prop = config_data_prop;
-+
-+ if ( config_data_prop
-+ && nm_utils_validate_dhcp4_vendor_class_id (config_data_prop, NULL))
-+ conn_prop = config_data_prop;
- }
-
- if (conn_prop) {
-@@ -8777,10 +8778,6 @@ dhcp4_get_vendor_class_identifier (NMDevice *self, NMSettingIP4Config *s_ip4)
- NM_UTILS_STR_UTF8_SAFE_FLAG_NONE,
- &len,
- (gpointer *) &to_free);
--
-- if (validate && (bin[0] == '\0' || len > 255 || strlen (bin) != len))
-- return NULL;
--
- if (to_free)
- bytes = g_bytes_new_take (g_steal_pointer (&to_free), len);
- else
---
-2.26.2
-
-
-From a491bad06f7c29b257fd948f2149ef80b179da22 Mon Sep 17 00:00:00 2001
-From: Antonio Cardace <acardace@redhat.com>
-Date: Thu, 27 Aug 2020 17:43:54 +0200
-Subject: [PATCH 2/4] initrd: parse 'rd.net.dhcp.vendor-class' kernel cmdline
- arg
-
-This arguments makes NM set the ipv4.dhcp-vendor-class-identifier
-property for all connections.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1872299
-
-Signed-off-by: Antonio Cardace <acardace@redhat.com>
-(cherry picked from commit c056cb9306be29a2c194a308b3b6cc639980abe2)
-(cherry picked from commit 15856a4fa20feaae6bd073fc2874180b2a1a335d)
----
- src/initrd/nmi-cmdline-reader.c | 6 ++++
- src/initrd/tests/test-cmdline-reader.c | 47 ++++++++++++++++++++++++++
- 2 files changed, 53 insertions(+)
-
-diff --git a/src/initrd/nmi-cmdline-reader.c b/src/initrd/nmi-cmdline-reader.c
-index be39ef896..ba747b30a 100644
---- a/src/initrd/nmi-cmdline-reader.c
-+++ b/src/initrd/nmi-cmdline-reader.c
-@@ -28,6 +28,7 @@ typedef struct {
- /* Parameters to be set for all connections */
- gboolean ignore_auto_dns;
- int dhcp_timeout;
-+ char *dhcp4_vci;
- } Reader;
-
- static Reader *
-@@ -52,6 +53,7 @@ reader_destroy (Reader *reader, gboolean free_hash)
- g_ptr_array_unref (reader->array);
- hash = g_steal_pointer (&reader->hash);
- nm_clear_g_free (&reader->hostname);
-+ nm_clear_g_free (&reader->dhcp4_vci);
- nm_g_slice_free (reader);
- if (!free_hash)
- return g_steal_pointer (&hash);
-@@ -95,6 +97,7 @@ reader_create_connection (Reader *reader,
- NM_SETTING_IP_CONFIG_MAY_FAIL, TRUE,
- NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS, reader->ignore_auto_dns,
- NM_SETTING_IP_CONFIG_DHCP_TIMEOUT, reader->dhcp_timeout,
-+ NM_SETTING_IP4_CONFIG_DHCP_VENDOR_CLASS_IDENTIFIER, reader->dhcp4_vci,
- NULL);
-
- setting = nm_setting_ip6_config_new ();
-@@ -927,6 +930,9 @@ nmi_cmdline_reader_parse (const char *sysfs_dir, const char *const*argv, char **
- else if (nm_streq (tag, "rd.net.timeout.dhcp")) {
- reader->dhcp_timeout = _nm_utils_ascii_str_to_int64 (argument,
- 10, 0, G_MAXINT32, 0);
-+ } else if (nm_streq (tag, "rd.net.dhcp.vendor-class")) {
-+ if (nm_utils_validate_dhcp4_vendor_class_id (argument, NULL))
-+ nm_utils_strdup_reset (&reader->dhcp4_vci, argument);
- }
- }
-
-diff --git a/src/initrd/tests/test-cmdline-reader.c b/src/initrd/tests/test-cmdline-reader.c
-index 7787cf5ea..a909bc380 100644
---- a/src/initrd/tests/test-cmdline-reader.c
-+++ b/src/initrd/tests/test-cmdline-reader.c
-@@ -1485,6 +1485,52 @@ test_bootif_off (void)
- g_assert_cmpstr (hostname, ==, NULL);
- }
-
-+static void
-+test_dhcp_vendor_class_id (void)
-+{
-+ gs_unref_hashtable GHashTable *connections = NULL;
-+ const char *const*ARGV = NM_MAKE_STRV ("rd.net.dhcp.vendor-class=testvci",
-+ "ip=eno1:dhcp");
-+ NMConnection *connection;
-+ NMSettingIP4Config *s_ip4;
-+ gs_free char *hostname = NULL;
-+ gs_free char *vci_long = NULL;
-+ char vci_arg_long[512] = {0};
-+
-+ connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
-+ g_assert (connections);
-+ g_assert_cmpint (g_hash_table_size (connections), ==, 1);
-+ g_assert_cmpstr (hostname, ==, NULL);
-+
-+ connection = g_hash_table_lookup (connections, "eno1");
-+ g_assert (connection);
-+ nmtst_assert_connection_verifies_without_normalization (connection);
-+ s_ip4 = NM_SETTING_IP4_CONFIG (nm_connection_get_setting_ip4_config (connection));
-+ g_assert_cmpstr (nm_setting_ip4_config_get_dhcp_vendor_class_identifier (s_ip4), ==, "testvci");
-+
-+ ARGV = NM_MAKE_STRV ("rd.net.dhcp.vendor-class",
-+ "ip=eno1:dhcp");
-+ connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
-+ connection = g_hash_table_lookup (connections, "eno1");
-+ g_assert (connection);
-+ nmtst_assert_connection_verifies_without_normalization (connection);
-+ s_ip4 = NM_SETTING_IP4_CONFIG (nm_connection_get_setting_ip4_config (connection));
-+ g_assert (nm_setting_ip4_config_get_dhcp_vendor_class_identifier (s_ip4) == NULL);
-+
-+
-+
-+ memset (vci_arg_long, 'A', 400);
-+ vci_long = g_strdup_printf ("rd.net.dhcp.vendor-class=%s", vci_arg_long);
-+ ARGV = NM_MAKE_STRV (vci_long,
-+ "ip=eno1:dhcp");
-+ connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
-+ connection = g_hash_table_lookup (connections, "eno1");
-+ g_assert (connection);
-+ nmtst_assert_connection_verifies_without_normalization (connection);
-+ s_ip4 = NM_SETTING_IP4_CONFIG (nm_connection_get_setting_ip4_config (connection));
-+ g_assert (nm_setting_ip4_config_get_dhcp_vendor_class_identifier (s_ip4) == NULL);
-+}
-+
- NMTST_DEFINE ();
-
- int main (int argc, char **argv)
-@@ -1521,6 +1567,7 @@ int main (int argc, char **argv)
- g_test_add_func ("/initrd/cmdline/bootif/hwtype", test_bootif_hwtype);
- g_test_add_func ("/initrd/cmdline/bootif/off", test_bootif_off);
- g_test_add_func ("/initrd/cmdline/neednet", test_neednet);
-+ g_test_add_func ("/initrd/cmdline/dhcp/vendor_class_id", test_dhcp_vendor_class_id);
-
- return g_test_run ();
- }
---
-2.26.2
-
-
-From bbd77df8ae1cc2510b1ff2c1c27ddf3d907faec3 Mon Sep 17 00:00:00 2001
-From: Antonio Cardace <acardace@redhat.com>
-Date: Tue, 1 Sep 2020 18:38:45 +0200
-Subject: [PATCH 3/4] initrd: fix memory leak
-
-Signed-off-by: Antonio Cardace <acardace@redhat.com>
-Fixes: 9f9609555d1c ('initrd: add configuration generator')
-(cherry picked from commit d5c05d07c7aff317284d2d5197d75e0f605b4364)
-(cherry picked from commit bba54613eb4255166c921844e8b6d2a2bd0000a1)
----
- shared/nm-glib-aux/nm-macros-internal.h | 8 ++++++++
- src/initrd/nm-initrd-generator.c | 2 +-
- 2 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/shared/nm-glib-aux/nm-macros-internal.h b/shared/nm-glib-aux/nm-macros-internal.h
-index 15bcd7e58..57ddee050 100644
---- a/shared/nm-glib-aux/nm-macros-internal.h
-+++ b/shared/nm-glib-aux/nm-macros-internal.h
-@@ -216,6 +216,14 @@ NM_AUTO_DEFINE_FCN0 (GError *, gs_local_free_error, g_error_free)
- #define gs_unref_keyfile nm_auto(gs_local_keyfile_unref)
- NM_AUTO_DEFINE_FCN0 (GKeyFile *, gs_local_keyfile_unref, g_key_file_unref)
-
-+/**
-+ * gs_free_option_context:
-+ *
-+ * Call g_option_context_free() on a variable location when it goes out of scope.
-+ */
-+#define gs_free_option_context nm_auto(gs_local_option_context)
-+NM_AUTO_DEFINE_FCN0 (GOptionContext *, gs_local_option_context, g_option_context_free);
-+
- /*****************************************************************************/
-
- #include "nm-glib.h"
-diff --git a/src/initrd/nm-initrd-generator.c b/src/initrd/nm-initrd-generator.c
-index f984ed739..5a93480bf 100644
---- a/src/initrd/nm-initrd-generator.c
-+++ b/src/initrd/nm-initrd-generator.c
-@@ -83,7 +83,7 @@ main (int argc, char *argv[])
- { G_OPTION_REMAINING, '\0', 0, G_OPTION_ARG_STRING_ARRAY, &remaining, NULL, NULL },
- { NULL }
- };
-- GOptionContext *option_context;
-+ gs_free_option_context GOptionContext *option_context = NULL;
- gs_free_error GError *error = NULL;
- gs_free char *hostname = NULL;
- int errsv;
---
-2.26.2
-
-
-From 3dec958f413a4566e97183a522afb27b47a9146e Mon Sep 17 00:00:00 2001
-From: Thomas Haller <thaller@redhat.com>
-Date: Thu, 3 Sep 2020 11:35:40 +0200
-Subject: [PATCH 4/4] initrd/tests: fix memleak in test_dhcp_vendor_class_id()
-
-Having leaks in the tests, breaks running the test under valgrind. There
-must be no leaks.
-
-Fixes: c056cb9306be ('initrd: parse 'rd.net.dhcp.vendor-class' kernel cmdline arg')
-(cherry picked from commit bff23d15d41a42c7b5f43cb3d18d66e7cd289823)
-(cherry picked from commit 5bea8db7ca8fd7520fe605b59e29b974e04b4721)
-Signed-off-by: Antonio Cardace <acardace@redhat.com>
----
- src/initrd/tests/test-cmdline-reader.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/initrd/tests/test-cmdline-reader.c b/src/initrd/tests/test-cmdline-reader.c
-index a909bc380..a11b76e01 100644
---- a/src/initrd/tests/test-cmdline-reader.c
-+++ b/src/initrd/tests/test-cmdline-reader.c
-@@ -1508,6 +1508,8 @@ test_dhcp_vendor_class_id (void)
- s_ip4 = NM_SETTING_IP4_CONFIG (nm_connection_get_setting_ip4_config (connection));
- g_assert_cmpstr (nm_setting_ip4_config_get_dhcp_vendor_class_identifier (s_ip4), ==, "testvci");
-
-+ nm_clear_pointer (&connections, g_hash_table_unref);
-+
- ARGV = NM_MAKE_STRV ("rd.net.dhcp.vendor-class",
- "ip=eno1:dhcp");
- connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
-@@ -1517,7 +1519,7 @@ test_dhcp_vendor_class_id (void)
- s_ip4 = NM_SETTING_IP4_CONFIG (nm_connection_get_setting_ip4_config (connection));
- g_assert (nm_setting_ip4_config_get_dhcp_vendor_class_identifier (s_ip4) == NULL);
-
--
-+ nm_clear_pointer (&connections, g_hash_table_unref);
-
- memset (vci_arg_long, 'A', 400);
- vci_long = g_strdup_printf ("rd.net.dhcp.vendor-class=%s", vci_arg_long);
---
-2.26.2
-
diff --git a/SPECS/NetworkManager.spec b/SPECS/NetworkManager.spec
index 94379be..4cb0b9b 100644
--- a/SPECS/NetworkManager.spec
+++ b/SPECS/NetworkManager.spec
@@ -5,9 +5,9 @@
%global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad)
%global epoch_version 1
-%global rpm_version 1.26.0
-%global real_version 1.26.0
-%global release_version 7
+%global rpm_version 1.28.0
+%global real_version 1.27.3
+%global release_version 0.1
%global snapshot %{nil}
%global git_sha %{nil}
@@ -54,7 +54,11 @@
%bcond_with debug
%bcond_with test
+%if 0%{?fedora} >= 33 || 0%{?rhel} >= 9
+%bcond_without lto
+%else
%bcond_with lto
+%endif
%bcond_with sanitizer
%if 0%{?fedora}
%bcond_without connectivity_fedora
@@ -106,13 +110,21 @@
%if 0%{?fedora} || 0%{?rhel} > 7
%global logging_backend_default journal
+%if 0%{?fedora} || 0%{?rhel} > 8
+%global dns_rc_manager_default auto
+%else
%global dns_rc_manager_default symlink
+%endif
%else
%global logging_backend_default syslog
%global dns_rc_manager_default file
%endif
+%if 0%{?rhel} > 8 || 0%{?fedora} > 32
+%global config_plugins_default keyfile,ifcfg-rh
+%else
%global config_plugins_default ifcfg-rh
+%endif
%if 0%{?fedora}
# Although eBPF would be available on Fedora's kernel, it seems
@@ -125,6 +137,11 @@
%global ebpf_enabled "no"
%endif
+# Fedora 33 enables LTO by default by setting CFLAGS="-flto -ffat-lto-objects".
+# However, we also require "-flto -flto-partition=none", so disable Fedora's
+# default and use our configure option --with-lto instead.
+%define _lto_cflags %{nil}
+
###############################################################################
Name: NetworkManager
@@ -149,24 +166,7 @@ Source6: 70-nm-connectivity.conf
Patch1: 0001-cloud-setup-systemd-unit-rh1791758.patch
# Bugfixes that are only relevant until next rebase of the package.
-Patch1000: 1000-team-fix-crash-rh1856723.patch
-Patch1001: 1001-core-fix-generation-of-dependent-rh1857133.patch
-Patch1002: 1002-fix-check-on-master-ac-failure-rh1845018.patch
-Patch1003: 1003-translations-rh1820552.patch
-Patch1004: 1004-fix-warning-setting-bond-active-slave-rh1858326.patch
-Patch1005: 1005-fix-managing-devices-after-sleep-rh1855563.patch
-Patch1006: 1006-n-dhcp4-fix-bpf-for-big-endian-arch-rh1861488.patch
-Patch1007: 1007-core-no-warn-setting-mtu-with-ipv6-disabled-rh1840989.patch
-Patch1008: 1008-wifi-avoid-crash-due-to-incomplete-Wi-Fi-API-info-rh1866395.patch
-Patch1009: 1009-cloud-setup-fix-allocating-buffer-for-GetConfigMetad-rh1866395.patch
-Patch1010: 1010-shared-extend-NM_IN_STRSET-and-NM_IN_SET-rh1847814.patch
-Patch1011: 1011-bond-fix-can_reapply_change-rh1847814.patch
-Patch1012: 1012-bond-let-reapply-reapply-rh1847814.patch
-Patch1013: 1013-dhcp6-hostname-rh1858344.patch
-Patch1014: 1014-settings-fix-wait-device-timeout-rh1853348.patch
-Patch1015: 1015-local-route-fixes-rh1868982.patch
-Patch1016: 1016-dhcp-implement-dhcp-vendor-class-identifier-option-rh1871042.patch
-Patch1017: 1017-initrd-parse-rd.net.dhcp.vendor-class-rh1870692.patch
+# Patch1000: my.patch
# The pregenerated docs contain default values and paths that depend
# on the configure options when creating the source tarball.
@@ -651,6 +651,8 @@ This tool is still experimental.
%endif
-Ddist_version=%{version}-%{release} \
-Dconfig_plugins_default=%{config_plugins_default} \
+ -Dresolvconf=no \
+ -Dnetconfig=no \
-Dconfig_dns_rc_manager_default=%{dns_rc_manager_default} \
-Dconfig_logging_backend_default=%{logging_backend_default} \
-Djson_validation=true
@@ -789,6 +791,8 @@ intltoolize --automake --copy --force
%endif
--with-dist-version=%{version}-%{release} \
--with-config-plugins-default=%{config_plugins_default} \
+ --with-resolvconf=no \
+ --with-netconfig=no \
--with-config-dns-rc-manager-default=%{dns_rc_manager_default} \
--with-config-logging-backend-default=%{logging_backend_default} \
--enable-json-validation
@@ -1114,6 +1118,11 @@ fi
%changelog
+* Fri Sep 18 2020 Beniamino Galvani <bgalvani@redhat.com> - 1:1.28.0-0.1
+- Update to 1.27.3 (development)
+- device: enforce the absence of a master during activation (rh #1869079)
+- bond: fix race condition setting the "active_slave" option (rh #1856640)
+
* Tue Sep 1 2020 Antonio Cardace <acardace@redhat.com> - 1:1.26.0-7
- dhcp: add dhcp-vendor-class-identifier option (rh #1871042)
- initrd: parse 'rd.net.dhcp.vendor-class' kernel cmdline arg (rh #1872299)