From 613f66118e25615dc3e57f35c0772d9029ddfba5 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Apr 28 2020 09:42:12 +0000 Subject: import NetworkManager-1.22.8-4.el8 --- diff --git a/.NetworkManager.metadata b/.NetworkManager.metadata index d54a8e9..0d0abc8 100644 --- a/.NetworkManager.metadata +++ b/.NetworkManager.metadata @@ -1 +1 @@ -b5a5d0c44078e63071d0c4c392ed8dd571584c04 SOURCES/NetworkManager-1.20.0.tar.xz +93b74524dbd01bf62f6885f2cdae6ff15c5bfd7e SOURCES/NetworkManager-1.22.8.tar.xz diff --git a/.gitignore b/.gitignore index c515315..9796ed6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/NetworkManager-1.20.0.tar.xz +SOURCES/NetworkManager-1.22.8.tar.xz diff --git a/SOURCES/0001-cloud-setup-systemd-unit-rh1791758.patch b/SOURCES/0001-cloud-setup-systemd-unit-rh1791758.patch new file mode 100644 index 0000000..b356d93 --- /dev/null +++ b/SOURCES/0001-cloud-setup-systemd-unit-rh1791758.patch @@ -0,0 +1,37 @@ +From 04ad92e259cd81fb0a492bc0e2284877ccb297ea Mon Sep 17 00:00:00 2001 +From: Thomas Haller +Date: Thu, 16 Jan 2020 13:40:26 +0100 +Subject: [PATCH 1/1] cloud-setup: avoid unsupported systemd settings in + nm-cloud-setup.service init for rhel-8.2 + +https://bugzilla.redhat.com/show_bug.cgi?id=1791758 +--- + clients/cloud-setup/nm-cloud-setup.service.in | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/clients/cloud-setup/nm-cloud-setup.service.in b/clients/cloud-setup/nm-cloud-setup.service.in +index 69a1a29ccba1..92e427beb8a1 100644 +--- a/clients/cloud-setup/nm-cloud-setup.service.in ++++ b/clients/cloud-setup/nm-cloud-setup.service.in +@@ -21,15 +21,15 @@ PrivateDevices=yes + PrivateTmp=yes + ProtectControlGroups=yes + ProtectHome=yes +-ProtectHostname=yes +-ProtectKernelLogs=yes ++#ProtectHostname=yes ++#ProtectKernelLogs=yes + ProtectKernelModules=yes + ProtectKernelTunables=yes + ProtectSystem=strict + RestrictAddressFamilies=AF_UNIX AF_NETLINK AF_INET AF_INET6 + RestrictNamespaces=yes + RestrictRealtime=yes +-RestrictSUIDSGID=yes ++#RestrictSUIDSGID=yes + SystemCallFilter=@system-service + + [Install] +-- +2.24.1 + diff --git a/SOURCES/1000-dhcp-disable-nettools-DHCP-plugin.patch b/SOURCES/1000-dhcp-disable-nettools-DHCP-plugin.patch deleted file mode 100644 index e258ce3..0000000 --- a/SOURCES/1000-dhcp-disable-nettools-DHCP-plugin.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 67fb0801eb6fe80e8b76a6bd35a039f5d93421ad Mon Sep 17 00:00:00 2001 -From: Thomas Haller -Date: Wed, 31 Jul 2019 10:51:58 +0200 -Subject: [PATCH 1/1] dhcp: disable nettools DHCP plugin - -The "nettools" DHCP plugin one day will replace the systemd-base -implementation and become the "internal" plugin. - -The "nettools" plugin is never supposed to become its own plugin. It -later will become the "internal" plugin. - -For now, it is undocumented and experimental. For RHEL, patch it out. -This makes also all the code unreachable and the linker removes all -n_dhcp4* symbols. ---- - src/dhcp/nm-dhcp-listener.c | 3 +++ - src/nm-iface-helper.c | 3 +++ - 2 files changed, 6 insertions(+) - -diff --git a/src/dhcp/nm-dhcp-listener.c b/src/dhcp/nm-dhcp-listener.c -index 88aafeb0b16d..ce0493aa425e 100644 ---- a/src/dhcp/nm-dhcp-listener.c -+++ b/src/dhcp/nm-dhcp-listener.c -@@ -52,7 +52,10 @@ const NMDhcpClientFactory *const _nm_dhcp_manager_factories[5] = { - &_nm_dhcp_client_factory_dhcpcd, - #endif - &_nm_dhcp_client_factory_internal, -+#if 0 -+ /* Disabled on RHEL */ - &_nm_dhcp_client_factory_nettools, -+#endif - }; - - /*****************************************************************************/ -diff --git a/src/nm-iface-helper.c b/src/nm-iface-helper.c -index dd5bb327a0a3..519c7bf1a053 100644 ---- a/src/nm-iface-helper.c -+++ b/src/nm-iface-helper.c -@@ -598,7 +598,10 @@ main (int argc, char *argv[]) - - const NMDhcpClientFactory *const _nm_dhcp_manager_factories[5] = { - &_nm_dhcp_client_factory_internal, -+#if 0 -+ /* Disabled on RHEL */ - &_nm_dhcp_client_factory_nettools, -+#endif - }; - - /*****************************************************************************/ --- -2.21.0 - diff --git a/SOURCES/1000-ifcfg-fix-writer-rh1804167.patch b/SOURCES/1000-ifcfg-fix-writer-rh1804167.patch new file mode 100644 index 0000000..9c6bffb --- /dev/null +++ b/SOURCES/1000-ifcfg-fix-writer-rh1804167.patch @@ -0,0 +1,50 @@ +From ff9c477f3238aeca9b8ca2e0805d419a449ea4d9 Mon Sep 17 00:00:00 2001 +From: Thomas Haller +Date: Tue, 18 Feb 2020 18:30:19 +0100 +Subject: [PATCH] ifcfg: fix writer when changing OVS slave to clear previous + settings + +We need to reset the OVS_PORT and OVS_PORT_UUID variables. +Otherwise, clearing the slave type doesn't work. + +On master this is solved differently, by automatically clearing all +variables that are not explicitly set. + +Reproducer: + + nmcli con del t-eth1 + nmcli con add type ethernet autoconnect no ifname eth1 master port0 con-name t-eth1 slave-type ovs-port + echo " + remove ovs-interface + remove connection.master + remove connection.slave-type + print + save + quit + " | nmcli c edit t-eth1 + nmcli con show t-eth1 | grep 'ovs\|slave-type' + +Fixes: 1440fe6a8804 ('ifcfg: don't forget master of ovs interfaces') + +https://bugzilla.redhat.com/show_bug.cgi?id=1804167 +(cherry picked from commit 0c8046574e782ca926d265348d10866f1653aef1) +--- + src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c | 2 ++ + 1 file changed, 2 insertions(+) + +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 f328cc8f0..90a1a2b8f 100644 +--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c ++++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c +@@ -1923,6 +1923,8 @@ write_connection_setting (NMSettingConnection *s_con, shvarFile *ifcfg) + svSetValueStr (ifcfg, "BRIDGE", NULL); + svSetValueStr (ifcfg, "TEAM_MASTER_UUID", NULL); + svSetValueStr (ifcfg, "TEAM_MASTER", NULL); ++ svSetValueStr (ifcfg, "OVS_PORT_UUID", NULL); ++ svSetValueStr (ifcfg, "OVS_PORT", NULL); + + master = nm_setting_connection_get_master (s_con); + if (master) { +-- +2.24.1 + diff --git a/SOURCES/1001-Revert-core-create-virtual-device-on-settings-change-rh1804350.patch b/SOURCES/1001-Revert-core-create-virtual-device-on-settings-change-rh1804350.patch new file mode 100644 index 0000000..9762320 --- /dev/null +++ b/SOURCES/1001-Revert-core-create-virtual-device-on-settings-change-rh1804350.patch @@ -0,0 +1,131 @@ +From c6e479eb14779e42bc7eafdcd913cbdf7bd6c312 Mon Sep 17 00:00:00 2001 +From: Beniamino Galvani +Date: Tue, 18 Feb 2020 19:09:18 +0100 +Subject: [PATCH] Revert "core: create virtual device on settings changes in + idle handler" + +When AddConnection() or Update() terminate, the (unrealized) virtual +device should be already be available, otherwise an activation attempt +of that connection can fail. + +https://bugzilla.redhat.com/show_bug.cgi?id=1804350 + +This reverts commit c163207b077a0e66e344b2352ccbe392c76e63ed. + +(cherry picked from commit efc04b1285674ba2aea459039f4143b3307b4bcf) +--- + src/nm-manager.c | 51 ++---------------------------------------------- + 1 file changed, 2 insertions(+), 49 deletions(-) + +diff --git a/src/nm-manager.c b/src/nm-manager.c +index 6d3a5ddbf..7f6657fd7 100644 +--- a/src/nm-manager.c ++++ b/src/nm-manager.c +@@ -168,9 +168,6 @@ typedef struct { + + NMSettings *settings; + +- CList connection_changed_on_idle_lst; +- guint connection_changed_on_idle_id; +- + RadioState radio_states[RFKILL_TYPE_MAX]; + NMVpnManager *vpn_manager; + +@@ -2098,7 +2095,6 @@ static void + connection_changed (NMManager *self, + NMSettingsConnection *sett_conn) + { +- NMManagerPrivate *priv; + NMConnection *connection; + NMDevice *device; + +@@ -2106,11 +2102,6 @@ connection_changed (NMManager *self, + NM_SETTINGS_CONNECTION_INT_FLAGS_VOLATILE)) + return; + +- priv = NM_MANAGER_GET_PRIVATE (self); +- +- if (!nm_settings_has_connection (priv->settings, sett_conn)) +- return; +- + connection = nm_settings_connection_get_connection (sett_conn); + + if (!nm_connection_is_virtual (connection)) +@@ -2126,46 +2117,12 @@ connection_changed (NMManager *self, + retry_connections_for_parent_device (self, device); + } + +-static gboolean +-connection_changed_on_idle_cb (gpointer user_data) +-{ +- NMManager *self = user_data; +- NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self); +- NMCListElem *elem; +- +- priv->connection_changed_on_idle_id = 0; +- +- while ((elem = c_list_first_entry (&priv->connection_changed_on_idle_lst, NMCListElem, lst))) { +- gs_unref_object NMSettingsConnection *sett_conn = NULL; +- +- sett_conn = nm_c_list_elem_free_steal (elem); +- connection_changed (self, sett_conn); +- } +- +- return G_SOURCE_REMOVE; +-} +- +-static void +-connection_changed_on_idle (NMManager *self, +- NMSettingsConnection *sett_conn) +-{ +- NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self); +- +- if (priv->connection_changed_on_idle_id == 0) +- priv->connection_changed_on_idle_id = g_idle_add (connection_changed_on_idle_cb, self); +- +- if (!nm_c_list_elem_find_first_ptr (&priv->connection_changed_on_idle_lst, sett_conn)) { +- c_list_link_tail (&priv->connection_changed_on_idle_lst, +- &nm_c_list_elem_new_stale (g_object_ref (sett_conn))->lst); +- } +-} +- + static void + connection_added_cb (NMSettings *settings, + NMSettingsConnection *sett_conn, + NMManager *self) + { +- connection_changed_on_idle (self, sett_conn); ++ connection_changed (self, sett_conn); + } + + static void +@@ -2174,7 +2131,7 @@ connection_updated_cb (NMSettings *settings, + guint update_reason_u, + NMManager *self) + { +- connection_changed_on_idle (self, sett_conn); ++ connection_changed (self, sett_conn); + } + + /*****************************************************************************/ +@@ -7511,7 +7468,6 @@ nm_manager_init (NMManager *self) + c_list_init (&priv->active_connections_lst_head); + c_list_init (&priv->async_op_lst_head); + c_list_init (&priv->delete_volatile_connection_lst_head); +- c_list_init (&priv->connection_changed_on_idle_lst); + + priv->platform = g_object_ref (NM_PLATFORM_GET); + +@@ -7817,9 +7773,6 @@ dispose (GObject *object) + g_clear_object (&priv->policy); + } + +- nm_clear_g_source (&priv->connection_changed_on_idle_id); +- nm_c_list_elem_free_all (&priv->connection_changed_on_idle_lst, g_object_unref); +- + if (priv->settings) { + g_signal_handlers_disconnect_by_func (priv->settings, settings_startup_complete_changed, self); + g_signal_handlers_disconnect_by_func (priv->settings, system_unmanaged_devices_changed_cb, self); +-- +2.24.1 + diff --git a/SOURCES/1001-po-RHEL-8.1-translations-rh1689999.patch b/SOURCES/1001-po-RHEL-8.1-translations-rh1689999.patch deleted file mode 100644 index 611694b..0000000 --- a/SOURCES/1001-po-RHEL-8.1-translations-rh1689999.patch +++ /dev/null @@ -1,53682 +0,0 @@ -From 9e57873e9c5cda8976d0cf00e08283ae080c52a9 Mon Sep 17 00:00:00 2001 -From: Ludek Janda -Date: Thu, 15 Aug 2019 11:45:03 +0200 -Subject: [PATCH] po: RHEL 8.1 translations - -https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/242 ---- - po/fr.po | 4995 +++++++++++++++++------------------- - po/ja.po | 7088 +++++++++++++++++++++++---------------------------- - po/ko.po | 6494 +++++++++++++++++++++------------------------- - po/zh_CN.po | 6156 ++++++++++++++++++++------------------------ - 4 files changed, 11273 insertions(+), 13460 deletions(-) - -diff --git a/po/fr.po b/po/fr.po -index 24f5cd5523..3000c83182 100644 ---- a/po/fr.po -+++ b/po/fr.po -@@ -1,7 +1,7 @@ - # French translation of NetworkManager. - # Copyright (C) 2004-2011 The GNOME Foundation. - # This file is distributed under the same license as the NetworkManager package. --# -+# - # Raphaël Tournoy , 2004. - # Stéphane Raimbault , 2006-2008. - # Jonathan Ernst , 2007. -@@ -11,19 +11,18 @@ - # Sam Friedmann , 2010, 2014. - # croe , 2019. #zanata - # ljanda , 2019. #zanata --# lrintel , 2019. #zanata - msgid "" - msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2019-05-28 14:23+0200\n" --"PO-Revision-Date: 2017-11-07 06:49+0000\n" --"Last-Translator: Copied by Zanata \n" --"Language-Team: French \n" --"Language: fr\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" -+"PO-Revision-Date: 2019-08-15 10:06+0000\n" -+"Last-Translator: ljanda \n" -+"Language-Team: French \n" -+"Language: fr\n" - "Plural-Forms: nplurals=2; plural=n>1;\n" - "X-Generator: Zanata 4.6.2\n" - -@@ -35,7 +34,7 @@ msgid "" - "COMMAND := { secret | polkit | all }\n" - "\n" - msgstr "" --"Syntaxe : nmcli agent { COMMANDE | help }\n" -+"Syntaxe : nmcli agent { COMMAND | help }\n" - "\n" - "COMMAND := { secret | polkit | all }\n" - "\n" -@@ -117,7 +116,7 @@ msgstr "nmcli est enregistré comme agent polkit.\n" - - #: ../clients/cli/common.c:360 ../clients/cli/common.c:361 - #: ../clients/cli/common.c:392 ../clients/cli/common.c:393 --#: ../clients/cli/connections.c:1460 -+#: ../clients/cli/connections.c:1503 - msgid "GROUP" - msgstr "GROUPE" - -@@ -168,8 +167,8 @@ msgstr "Erreur : paramètre manquant. Essayez --help." - msgid "access denied" - msgstr "accès refusé" - --#: ../clients/cli/common.c:1444 ../clients/cli/connections.c:79 --#: ../clients/cli/connections.c:88 ../clients/cli/devices.c:438 -+#: ../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 -@@ -178,8 +177,8 @@ msgstr "accès refusé" - #: ../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:2667 --#: ../clients/common/nm-meta-setting-desc.c:2725 -+#: ../clients/common/nm-meta-setting-desc.c:2674 -+#: ../clients/common/nm-meta-setting-desc.c:2732 - msgid "unknown" - msgstr "inconnu" - -@@ -200,84 +199,84 @@ msgid "full" - msgstr "plein" - - #. define some prompts for connection editor --#: ../clients/cli/connections.c:63 -+#: ../clients/cli/connections.c:64 - msgid "Setting name? " - msgstr "Nom du paramètre ?" - --#: ../clients/cli/connections.c:64 -+#: ../clients/cli/connections.c:65 - msgid "Property name? " - msgstr "Nom de la propriété ?" - --#: ../clients/cli/connections.c:65 -+#: ../clients/cli/connections.c:66 - msgid "Enter connection type: " - msgstr "Saisissez le type de connexion : " - - #. define some other prompts --#: ../clients/cli/connections.c:69 -+#: ../clients/cli/connections.c:70 - msgid "Connection (name, UUID, or path): " - msgstr "Connexion (nom, UUID, ou chemin) :" - --#: ../clients/cli/connections.c:70 -+#: ../clients/cli/connections.c:71 - msgid "VPN connection (name, UUID, or path): " - msgstr "Connexion VPN (nom, UUID, ou chemin) :" - --#: ../clients/cli/connections.c:71 -+#: ../clients/cli/connections.c:72 - msgid "Connection(s) (name, UUID, or path): " - msgstr "Connexion(s) (nom, UUID, ou chemin) :" - --#: ../clients/cli/connections.c:72 -+#: ../clients/cli/connections.c:73 - msgid "Connection(s) (name, UUID, path or apath): " - msgstr "Connexion(s) (nom, UUID, path ou apath) : " - --#: ../clients/cli/connections.c:80 -+#: ../clients/cli/connections.c:81 - msgid "activating" - msgstr "activation" - --#: ../clients/cli/connections.c:81 -+#: ../clients/cli/connections.c:82 - msgid "activated" - msgstr "activé" - --#: ../clients/cli/connections.c:82 ../clients/common/nm-client-utils.c:275 -+#: ../clients/cli/connections.c:83 ../clients/common/nm-client-utils.c:275 - msgid "deactivating" - msgstr "désactivation" - --#: ../clients/cli/connections.c:83 -+#: ../clients/cli/connections.c:84 - msgid "deactivated" - msgstr "désactivé" - --#: ../clients/cli/connections.c:89 -+#: ../clients/cli/connections.c:90 - msgid "VPN connecting (prepare)" - msgstr "Connexion VPN (préparation)" - --#: ../clients/cli/connections.c:90 -+#: ../clients/cli/connections.c:91 - msgid "VPN connecting (need authentication)" - msgstr "Connexion VPN (authentification requise)" - --#: ../clients/cli/connections.c:91 -+#: ../clients/cli/connections.c:92 - msgid "VPN connecting" - msgstr "Connexion VPN" - --#: ../clients/cli/connections.c:92 -+#: ../clients/cli/connections.c:93 - msgid "VPN connecting (getting IP configuration)" - msgstr "Connexion VPN (obtention de la configuration IP)" - --#: ../clients/cli/connections.c:93 -+#: ../clients/cli/connections.c:94 - msgid "VPN connected" - msgstr "VPN connecté" - --#: ../clients/cli/connections.c:94 -+#: ../clients/cli/connections.c:95 - msgid "VPN connection failed" - msgstr "Échec de la connexion VPN" - --#: ../clients/cli/connections.c:95 -+#: ../clients/cli/connections.c:96 - msgid "VPN disconnected" - msgstr "VPN déconnecté" - --#: ../clients/cli/connections.c:516 -+#: ../clients/cli/connections.c:558 - msgid "never" - msgstr "jamais" - --#: ../clients/cli/connections.c:868 -+#: ../clients/cli/connections.c:911 - #, c-format - msgid "" - "Usage: nmcli connection { COMMAND | help }\n" -@@ -293,8 +292,8 @@ msgid "" - "\n" - " down [id | uuid | path | apath] ...\n" - "\n" --" add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- " --"([+|-]. )+]\n" -+" add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- ([+|-" -+"]. )+]\n" - "\n" - " modify [--temporary] [id | uuid | path] ([+|-]. " - ")+\n" -@@ -330,8 +329,8 @@ msgstr "" - "\n" - " down [id | uuid | path | apath] ...\n" - "\n" --" add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- " --"([+|-]. )+]\n" -+" add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- ([+|-" -+"]. )+]\n" - "\n" - " modify [--temporary] [id | uuid | path] ([+|-]. " - ")+\n" -@@ -354,7 +353,7 @@ msgstr "" - " export [id | uuid | path] []\n" - "\n" - --#: ../clients/cli/connections.c:890 -+#: ../clients/cli/connections.c:933 - #, c-format - msgid "" - "Usage: nmcli connection show { ARGUMENTS | help }\n" -@@ -405,7 +404,7 @@ msgstr "" - "compte. L'utilisation de l'option --show-secrets révéle également les " - "secrets associés.\n" - --#: ../clients/cli/connections.c:911 -+#: ../clients/cli/connections.c:954 - #, c-format - msgid "" - "Usage: nmcli connection up { ARGUMENTS | help }\n" -@@ -452,7 +451,7 @@ msgstr "" - "de la connexion\n" - "\n" - --#: ../clients/cli/connections.c:932 -+#: ../clients/cli/connections.c:975 - #, c-format - msgid "" - "Usage: nmcli connection down { ARGUMENTS | help }\n" -@@ -471,18 +470,17 @@ msgstr "" - "\n" - "Désactive une connexion d'un périphérique (sans empêcher le périphérique " - "d'utiliser\n" --"l'activation automatique). Le profil à désactiver est identifié par son " --"nom,\n" -+"l'activation automatique). Le profil à désactiver est identifié par son nom,\n" - "UUID ou chemin D-Bus.\n" - "\n" - --#: ../clients/cli/connections.c:944 -+#: ../clients/cli/connections.c:987 - #, c-format - msgid "" - "Usage: nmcli connection add { ARGUMENTS | help }\n" - "\n" --"ARGUMENTS := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS " --"[-- ([+|-]. )+]\n" -+"ARGUMENTS := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-" -+"- ([+|-]. )+]\n" - "\n" - " COMMON_OPTIONS:\n" - " type \n" -@@ -569,8 +567,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 ]\n" - "\n" - " olpc-mesh: ssid \n" -@@ -636,8 +634,8 @@ msgid "" - msgstr "" - "Usage: nmcli connection add { ARGUMENTS | help }\n" - "\n" --"ARGUMENTS := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS " --"[-- ([+|-]. )+]\n" -+"ARGUMENTS := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-" -+"- ([+|-]. )+]\n" - "\n" - " COMMON_OPTIONS:\n" - " type \n" -@@ -724,8 +722,8 @@ msgstr "" - " [path-cost <1-65535>]\n" - " [hairpin yes|no]\n" - "\n" --" vpn: vpn-type vpnc|openvpn|pptp|openconnect|openswan|libreswan|" --"ssh|l2tp|iodine|...\n" -+" vpn: vpn-type " -+"vpnc|openvpn|pptp|openconnect|openswan|libreswan|ssh|l2tp|iodine|...\n" - " [user ]\n" - "\n" - " olpc-mesh: ssid \n" -@@ -789,7 +787,7 @@ msgstr "" - " [ip6 ] [gw6 ]\n" - "\n" - --#: ../clients/cli/connections.c:1068 -+#: ../clients/cli/connections.c:1111 - #, c-format - msgid "" - "Usage: nmcli connection modify { ARGUMENTS | help }\n" -@@ -804,8 +802,8 @@ msgid "" - "\n" - "Examples:\n" - "nmcli con mod home-wifi wifi.ssid rakosnicek\n" --"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, " --"10.10.1.5/8\"\n" -+"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, 10.10.1.5/" -+"8\"\n" - "nmcli con mod em1-1 +ipv4.dns 8.8.4.4\n" - "nmcli con mod em1-1 -ipv4.dns 1\n" - "nmcli con mod em1-1 -ipv6.addr \"abbe::cafe/56\"\n" -@@ -822,15 +820,15 @@ msgstr "" - "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 l’ajout d’éléments au lieu d’écraser la valeur entière." -+"\n" - "Le « - » signe permet de supprimer les éléments sélectionnés, plutôt que la " - "valeur entière.\n" - "\n" - "Exemples :\n" - "nmcli con mod home-wifi wifi.ssid rakosnicek\n" --"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, " --"10.10.1.5/8\"\n" -+"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, 10.10.1.5/" -+"8\"\n" - "nmcli con mod em1-1 +ipv4.dns 8.8.4.4\n" - "nmcli con mod em1-1 -ipv4.dns 1\n" - "nmcli con mod em1-1 -ipv6.addr \"abbe::cafe/56\"\n" -@@ -838,7 +836,7 @@ msgstr "" - "nmcli con mod bond0 -bond.options downdelay\n" - "\n" - --#: ../clients/cli/connections.c:1091 -+#: ../clients/cli/connections.c:1134 - #, c-format - msgid "" - "Usage: nmcli connection clone { ARGUMENTS | help }\n" -@@ -846,8 +844,7 @@ msgid "" - "ARGUMENTS := [--temporary] [id | uuid | path] \n" - "\n" - "Clone an existing connection profile. The newly created connection will be\n" --"the exact copy of the , except the uuid property (will be generated) " --"and\n" -+"the exact copy of the , except the uuid property (will be generated) and\n" - "id (provided as argument).\n" - "\n" - msgstr "" -@@ -861,7 +858,7 @@ msgstr "" - "l'id (fourni comme argument ).\n" - "\n" - --#: ../clients/cli/connections.c:1103 -+#: ../clients/cli/connections.c:1146 - #, c-format - msgid "" - "Usage: nmcli connection edit { ARGUMENTS | help }\n" -@@ -888,7 +885,7 @@ msgstr "" - "Ajoute un nouveau profil de connexion dans un éditeur interactif.\n" - "\n" - --#: ../clients/cli/connections.c:1118 -+#: ../clients/cli/connections.c:1161 - #, c-format - msgid "" - "Usage: nmcli connection delete { ARGUMENTS | help }\n" -@@ -907,7 +904,7 @@ msgstr "" - "Le profil est identifié par son nom, UUID ou chemin D-Bus.\n" - "\n" - --#: ../clients/cli/connections.c:1129 -+#: ../clients/cli/connections.c:1172 - #, c-format - msgid "" - "Usage: nmcli connection monitor { ARGUMENTS | help }\n" -@@ -929,7 +926,7 @@ msgstr "" - "Surveille tous les profils de connexion si rien n'est spécifié \n" - "\n" - --#: ../clients/cli/connections.c:1141 -+#: ../clients/cli/connections.c:1184 - #, c-format - msgid "" - "Usage: nmcli connection reload { help }\n" -@@ -942,7 +939,7 @@ msgstr "" - "Recharge tous les fichiers de connexion à partir du disque.\n" - "\n" - --#: ../clients/cli/connections.c:1149 -+#: ../clients/cli/connections.c:1192 - #, c-format - msgid "" - "Usage: nmcli connection load { ARGUMENTS | help }\n" -@@ -966,7 +963,7 @@ msgstr "" - "conscient de l'état le plus récent.\n" - "\n" - --#: ../clients/cli/connections.c:1161 -+#: ../clients/cli/connections.c:1204 - #, c-format - msgid "" - "Usage: nmcli connection import { ARGUMENTS | help }\n" -@@ -992,7 +989,7 @@ msgstr "" - "est importée par les greffons de VPN du NetworkManager.\n" - "\n" - --#: ../clients/cli/connections.c:1174 -+#: ../clients/cli/connections.c:1217 - #, c-format - msgid "" - "Usage: nmcli connection export { ARGUMENTS | help }\n" -@@ -1013,342 +1010,342 @@ msgstr "" - "nom est donné.\n" - "\n" - --#: ../clients/cli/connections.c:1264 -+#: ../clients/cli/connections.c:1307 - #, 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:1313 -+#: ../clients/cli/connections.c:1356 - msgid "Connection profile details" - msgstr "Informations de profil de connexion" - --#: ../clients/cli/connections.c:1326 ../clients/cli/connections.c:1411 -+#: ../clients/cli/connections.c:1369 ../clients/cli/connections.c:1454 - #, c-format - msgid "Error: 'connection show': %s" - msgstr "Erreur : « connection show » : %s" - --#: ../clients/cli/connections.c:1401 -+#: ../clients/cli/connections.c:1444 - msgid "Activate connection details" - msgstr "Informations d'activation de connexion" - --#: ../clients/cli/connections.c:1509 ../clients/cli/devices.c:1447 --#: ../clients/cli/devices.c:1461 ../clients/cli/devices.c:1476 --#: ../clients/cli/devices.c:1534 ../clients/cli/devices.c:1636 -+#: ../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 - msgid "NAME" - msgstr "NOM" - --#: ../clients/cli/connections.c:1602 -+#: ../clients/cli/connections.c:1645 - #, 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:1612 ../clients/cli/connections.c:1620 -+#: ../clients/cli/connections.c:1655 ../clients/cli/connections.c:1663 - #, c-format - msgid "'%s' has to be alone" - msgstr "« %s » doit être seul" - --#: ../clients/cli/connections.c:1880 -+#: ../clients/cli/connections.c:1923 - #, c-format - msgid "incorrect string '%s' of '--order' option" - msgstr "chaîne incorrecte « %s » de l'option « --order »" - --#: ../clients/cli/connections.c:1905 -+#: ../clients/cli/connections.c:1948 - #, c-format - msgid "incorrect item '%s' in '--order' option" - msgstr "élément incorrect « %s » de l'option « --order »" - --#: ../clients/cli/connections.c:1943 -+#: ../clients/cli/connections.c:1986 - msgid "No connection specified" - msgstr "Aucune connexion spécifiée." - --#: ../clients/cli/connections.c:1954 -+#: ../clients/cli/connections.c:1997 - #, c-format - msgid "%s argument is missing" - msgstr "le paramètre %s est manquant" - --#: ../clients/cli/connections.c:1972 -+#: ../clients/cli/connections.c:2015 - #, c-format - msgid "unknown connection '%s'" - msgstr "connexion inconnue : « %s »" - --#: ../clients/cli/connections.c:2001 -+#: ../clients/cli/connections.c:2044 - msgid "'--order' argument is missing" - msgstr "l'argument de « --order » est manquant" - --#: ../clients/cli/connections.c:2061 -+#: ../clients/cli/connections.c:2104 - 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:2062 -+#: ../clients/cli/connections.c:2105 - msgid "NetworkManager connection profiles" - msgstr "Profils de connexion NetworkManager" - --#: ../clients/cli/connections.c:2114 ../clients/cli/connections.c:2859 --#: ../clients/cli/connections.c:2871 ../clients/cli/connections.c:2883 --#: ../clients/cli/connections.c:3112 ../clients/cli/connections.c:8868 --#: ../clients/cli/connections.c:8889 ../clients/cli/devices.c:2970 --#: ../clients/cli/devices.c:2982 ../clients/cli/devices.c:2995 --#: ../clients/cli/devices.c:3189 ../clients/cli/devices.c:3200 --#: ../clients/cli/devices.c:3218 ../clients/cli/devices.c:3227 --#: ../clients/cli/devices.c:3248 ../clients/cli/devices.c:3259 --#: ../clients/cli/devices.c:3277 ../clients/cli/devices.c:3721 --#: ../clients/cli/devices.c:3731 ../clients/cli/devices.c:3739 --#: ../clients/cli/devices.c:3751 ../clients/cli/devices.c:3766 --#: ../clients/cli/devices.c:3774 ../clients/cli/devices.c:3949 --#: ../clients/cli/devices.c:3960 ../clients/cli/devices.c:4131 -+#: ../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 - #, c-format - msgid "Error: %s argument is missing." - msgstr "Erreur : le paramètre %s est manquant." - --#: ../clients/cli/connections.c:2142 -+#: ../clients/cli/connections.c:2185 - #, c-format - msgid "Error: %s - no such connection profile." - msgstr "Erreur : %s - profil de connexion introuvable." - --#: ../clients/cli/connections.c:2233 ../clients/cli/connections.c:2846 --#: ../clients/cli/connections.c:2910 ../clients/cli/connections.c:8385 --#: ../clients/cli/connections.c:8491 ../clients/cli/connections.c:8994 --#: ../clients/cli/devices.c:1721 ../clients/cli/devices.c:1989 --#: ../clients/cli/devices.c:2162 ../clients/cli/devices.c:2270 --#: ../clients/cli/devices.c:2462 ../clients/cli/devices.c:3912 --#: ../clients/cli/devices.c:4137 ../clients/cli/general.c:896 -+#: ../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 - #, c-format - msgid "Error: %s." - msgstr "Erreur : %s." - --#: ../clients/cli/connections.c:2326 -+#: ../clients/cli/connections.c:2369 - #, c-format - msgid "no active connection on device '%s'" - msgstr "aucune connexion active sur le périphérique « %s »" - --#: ../clients/cli/connections.c:2334 -+#: ../clients/cli/connections.c:2377 - msgid "no active connection or device" - msgstr "aucune connexion ou périphérique actif" - --#: ../clients/cli/connections.c:2354 -+#: ../clients/cli/connections.c:2397 - #, c-format - msgid "device '%s' not compatible with connection '%s': " - msgstr "périphérique « %s » incompatible avec la connexion « %s » :" - --#: ../clients/cli/connections.c:2387 -+#: ../clients/cli/connections.c:2430 - #, c-format - msgid "device '%s' not compatible with connection '%s'" - msgstr "périphérique « %s » incompatible avec la connexion « %s »" - --#: ../clients/cli/connections.c:2390 -+#: ../clients/cli/connections.c:2433 - #, c-format - msgid "no device found for connection '%s'" - msgstr "aucun périphérique trouvé pour la connexion « %s »" - --#: ../clients/cli/connections.c:2441 -+#: ../clients/cli/connections.c:2484 - #, c-format - msgid "Hint: use '%s' to get more details." - msgstr "Astuce : utiliser « %s » pour obtenir plus d'informations." - --#: ../clients/cli/connections.c:2459 -+#: ../clients/cli/connections.c:2502 - #, 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:2463 ../clients/cli/connections.c:2613 --#: ../clients/cli/connections.c:6701 -+#: ../clients/cli/connections.c:2506 ../clients/cli/connections.c:2656 -+#: ../clients/cli/connections.c:6738 - #, 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:2470 ../clients/cli/connections.c:2592 -+#: ../clients/cli/connections.c:2513 ../clients/cli/connections.c:2635 - #, c-format - msgid "Error: Connection activation failed: %s" - msgstr "Erreur : l'activation de la connexion a échoué : %s" - --#: ../clients/cli/connections.c:2507 -+#: ../clients/cli/connections.c:2550 - #, c-format - msgid "Error: Timeout expired (%d seconds)" - msgstr "Erreur : le délai d'attente a expiré (%d secondes)" - --#: ../clients/cli/connections.c:2675 -+#: ../clients/cli/connections.c:2718 - #, 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:2688 -+#: ../clients/cli/connections.c:2731 - #, c-format - msgid "missing colon in 'password' entry '%s'" - msgstr "Virgule manquant dans la saisie du mot de passe « %s »" - --#: ../clients/cli/connections.c:2696 -+#: ../clients/cli/connections.c:2739 - #, c-format - msgid "missing dot in 'password' entry '%s'" - msgstr "Point manquant dans la saisie du mot de passe « %s »" - --#: ../clients/cli/connections.c:2709 -+#: ../clients/cli/connections.c:2752 - #, 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:2763 -+#: ../clients/cli/connections.c:2806 - #, c-format - msgid "unknown device '%s'." - msgstr "périphérique inconnu « %s »." - --#: ../clients/cli/connections.c:2768 -+#: ../clients/cli/connections.c:2811 - 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:2893 ../clients/cli/devices.c:1680 --#: ../clients/cli/devices.c:3027 ../clients/cli/devices.c:3290 --#: ../clients/cli/devices.c:3966 -+#: ../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 - #, c-format - msgid "Unknown parameter: %s\n" - msgstr "Paramètre inconnu : %s\n" - --#: ../clients/cli/connections.c:2918 -+#: ../clients/cli/connections.c:2961 - msgid "preparing" - msgstr "préparation" - --#: ../clients/cli/connections.c:3027 -+#: ../clients/cli/connections.c:3070 - #, c-format - msgid "Connection '%s' (%s) successfully deleted.\n" - msgstr "Connexion « %s » (%s) supprimée.\n" - --#: ../clients/cli/connections.c:3043 -+#: ../clients/cli/connections.c:3086 - #, 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:3094 ../clients/cli/connections.c:8599 --#: ../clients/cli/connections.c:8630 ../clients/cli/connections.c:8788 -+#: ../clients/cli/connections.c:3137 ../clients/cli/connections.c:8604 -+#: ../clients/cli/connections.c:8635 ../clients/cli/connections.c:8794 - #, c-format - msgid "Error: No connection specified." - msgstr "Erreur : aucune connexion spécifiée." - --#: ../clients/cli/connections.c:3124 -+#: ../clients/cli/connections.c:3167 - #, 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:3125 -+#: ../clients/cli/connections.c:3168 - #, c-format - msgid "Error: not all active connections found." - msgstr "Erreur : les connexions n'ont pas toutes été trouvées." - --#: ../clients/cli/connections.c:3133 -+#: ../clients/cli/connections.c:3176 - #, c-format - msgid "Error: no active connection provided." - msgstr "Erreur : aucune connexion fournie." - --#: ../clients/cli/connections.c:3164 -+#: ../clients/cli/connections.c:3207 - #, 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:3415 ../clients/cli/connections.c:3472 -+#: ../clients/cli/connections.c:3458 ../clients/cli/connections.c:3515 - #: ../clients/common/nm-client-utils.c:225 - #, c-format - msgid "'%s' not among [%s]" - msgstr "« %s » ne fait pas partie de [%s]" - - #. We should not really come here --#: ../clients/cli/connections.c:3435 ../clients/cli/connections.c:3495 -+#: ../clients/cli/connections.c:3478 ../clients/cli/connections.c:3538 - #: ../clients/common/nm-client-utils.c:293 - #, c-format - msgid "Unknown error" - msgstr "Erreur inconnue" - --#: ../clients/cli/connections.c:3629 -+#: ../clients/cli/connections.c:3672 - #, 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:3984 -+#: ../clients/cli/connections.c:4027 - #, c-format - msgid "Error: invalid property '%s': %s." - msgstr "Erreur : propriété « %s » non valide : %s." - --#: ../clients/cli/connections.c:3998 -+#: ../clients/cli/connections.c:4041 - #, c-format - msgid "Error: failed to %s %s.%s: %s." - msgstr "Erreur : échec %s %s.%s: %s." - --#: ../clients/cli/connections.c:4033 -+#: ../clients/cli/connections.c:4076 - #, c-format - msgid "Error: '%s' is mandatory." - msgstr "Erreur : « %s » est obligatoire." - --#: ../clients/cli/connections.c:4060 -+#: ../clients/cli/connections.c:4103 - #, c-format - msgid "Error: invalid slave type; %s." - msgstr "Erreur : type esclave invalide ; %s." - --#: ../clients/cli/connections.c:4068 -+#: ../clients/cli/connections.c:4111 - #, c-format - msgid "Error: invalid connection type; %s." - msgstr "Erreur : type de connexion non valide ; %s." - --#: ../clients/cli/connections.c:4145 -+#: ../clients/cli/connections.c:4188 - #, c-format - msgid "Error: bad connection type: %s" - msgstr "Erreur : type de connexion invalide : %s." - --#: ../clients/cli/connections.c:4191 -+#: ../clients/cli/connections.c:4234 - #, c-format - msgid "Error: '%s': %s" - msgstr "Erreur : « %s » : %s" - --#: ../clients/cli/connections.c:4212 -+#: ../clients/cli/connections.c:4255 - msgid "Error: master is required" - msgstr "Erreur : « master » requis." - --#: ../clients/cli/connections.c:4271 -+#: ../clients/cli/connections.c:4314 - #, 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:4302 -+#: ../clients/cli/connections.c:4345 - #, 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:4333 -+#: ../clients/cli/connections.c:4376 - #, 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:4582 -+#: ../clients/cli/connections.c:4625 - #, c-format - msgid "Error: value for '%s' is missing." - msgstr "Erreur : la valeur de l'argument « %s » est requise." - --#: ../clients/cli/connections.c:4628 -+#: ../clients/cli/connections.c:4671 - msgid "Error: . argument is missing." - msgstr "Erreur : l'argument . est manquant." - --#: ../clients/cli/connections.c:4651 -+#: ../clients/cli/connections.c:4694 - #, 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:4699 ../clients/cli/connections.c:4715 -+#: ../clients/cli/connections.c:4742 ../clients/cli/connections.c:4758 - #, 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:4733 -+#: ../clients/cli/connections.c:4776 - #, c-format - msgid "Error: invalid . '%s'." - msgstr "Erreur : . non valide '%s’." - --#: ../clients/cli/connections.c:4777 ../clients/cli/connections.c:8431 -+#: ../clients/cli/connections.c:4815 ../clients/cli/connections.c:8456 - #, c-format - msgid "Error: Failed to add '%s' connection: %s" - msgstr "Erreur: impossible d'ajouter la connexion « %s » : %s" - --#: ../clients/cli/connections.c:4795 -+#: ../clients/cli/connections.c:4833 - #, c-format - msgid "" - "Warning: There is another connection with the name '%1$s'. Reference the " -@@ -1363,78 +1360,79 @@ 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:4804 -+#: ../clients/cli/connections.c:4842 - #, c-format - msgid "Connection '%s' (%s) successfully added.\n" - msgstr "Connexion « %s » (%s) ajoutée avec succès.\n" - --#: ../clients/cli/connections.c:4857 ../clients/cli/connections.c:6824 --#: ../clients/cli/connections.c:6825 ../clients/cli/devices.c:529 --#: ../clients/cli/devices.c:536 ../clients/cli/devices.c:1201 --#: ../clients/cli/general.c:137 ../clients/cli/utils.h:296 -+#: ../clients/cli/connections.c:4904 ../clients/cli/connections.c:6861 -+#: ../clients/cli/connections.c:6862 ../clients/cli/devices.c:529 -+#: ../clients/cli/devices.c:536 ../clients/cli/devices.c:1206 -+#: ../clients/cli/general.c:137 ../clients/cli/utils.h:297 - #: ../clients/common/nm-client-utils.c:283 - #: ../clients/common/nm-meta-setting-desc.c:871 --#: ../clients/common/nm-meta-setting-desc.c:2662 -+#: ../clients/common/nm-meta-setting-desc.c:2669 - msgid "no" - msgstr "non" - --#: ../clients/cli/connections.c:4858 ../clients/cli/connections.c:6824 --#: ../clients/cli/connections.c:6825 ../clients/cli/devices.c:528 --#: ../clients/cli/devices.c:535 ../clients/cli/devices.c:1201 --#: ../clients/cli/general.c:136 ../clients/cli/utils.h:296 -+#: ../clients/cli/connections.c:4905 ../clients/cli/connections.c:6861 -+#: ../clients/cli/connections.c:6862 ../clients/cli/devices.c:528 -+#: ../clients/cli/devices.c:535 ../clients/cli/devices.c:1206 -+#: ../clients/cli/general.c:136 ../clients/cli/utils.h:297 - #: ../clients/common/nm-client-utils.c:282 - #: ../clients/common/nm-meta-setting-desc.c:871 --#: ../clients/common/nm-meta-setting-desc.c:2659 -+#: ../clients/common/nm-meta-setting-desc.c:2666 - msgid "yes" - msgstr "oui" - --#: ../clients/cli/connections.c:4944 -+#: ../clients/cli/connections.c:4991 - #, c-format - msgid "" --"You can specify this option more than once. Press when you're done.\n" -+"You can specify this option more than once. Press when you're done." -+"\n" - msgstr "" - "Vous pouvez spécifier cette option plus d'une fois. Tapez quand " - "vous avez terminé.\n" - - #. Ask for optional arguments. --#: ../clients/cli/connections.c:5046 -+#: ../clients/cli/connections.c:5093 - #, 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:5052 -+#: ../clients/cli/connections.c:5099 - #, 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:5185 ../clients/cli/utils.c:293 -+#: ../clients/cli/connections.c:5231 ../clients/cli/utils.c:293 - #, c-format - msgid "Error: value for '%s' argument is required." - msgstr "Erreur : la valeur de l'argument « %s » est requise." - --#: ../clients/cli/connections.c:5192 -+#: ../clients/cli/connections.c:5238 - #, c-format - msgid "Error: 'save': %s." - msgstr "Erreur: « save » : %s." - --#: ../clients/cli/connections.c:5278 ../clients/cli/connections.c:5289 -+#: ../clients/cli/connections.c:5324 ../clients/cli/connections.c:5335 - #, c-format - msgid "Error: '%s' argument is required." - msgstr "Erreur : l'argument « %s » est requis." - --#: ../clients/cli/connections.c:6254 -+#: ../clients/cli/connections.c:6294 - #, c-format - msgid "['%s' setting values]\n" - msgstr "[« %s » setting values]\n" - - #. TRANSLATORS: do not translate command names and keywords before :: - #. * However, you should translate terms enclosed in <>. --#. --#: ../clients/cli/connections.c:6363 -+#. -+#: ../clients/cli/connections.c:6403 - #, c-format - msgid "" - "---[ Main menu ]---\n" -@@ -1469,7 +1467,7 @@ msgstr "" - "nmcli :: configuration de nmcli\n" - "quit :: quitter nmcli\n" - --#: ../clients/cli/connections.c:6390 -+#: ../clients/cli/connections.c:6430 - #, c-format - msgid "" - "goto [.] | :: enter setting/property for editing\n" -@@ -1483,20 +1481,18 @@ msgstr "" - "goto [.] | :: saisir le paramètre ou la propriété " - "pour la modification\n" - "\n" --"Cette commande entre dans un paramètre ou une propriété pour le/la " --"modifier.\n" -+"Cette commande entre dans un paramètre ou une propriété pour le/la modifier.\n" - "\n" - "Exemples : nmcli> goto connection\n" - " nmcli connection> goto secondaries\n" - " nmcli> goto ipv4.addresses\n" - --#: ../clients/cli/connections.c:6397 -+#: ../clients/cli/connections.c:6437 - #, c-format - msgid "" - "remove [.] :: 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" -@@ -1512,7 +1508,7 @@ msgstr "" - "Exemples : nmcli> remove wifi-sec\n" - " nmcli> remove eth.mtu\n" - --#: ../clients/cli/connections.c:6404 -+#: ../clients/cli/connections.c:6444 - #, c-format - msgid "" - "set [. ] :: set property value\n" -@@ -1527,7 +1523,7 @@ msgstr "" - "\n" - "Exemple : nmcli> set con.id My connection\n" - --#: ../clients/cli/connections.c:6409 -+#: ../clients/cli/connections.c:6449 - #, c-format - msgid "" - "describe [.] :: describe property\n" -@@ -1540,7 +1536,7 @@ msgstr "" - "Affiche la description de la propriété. Vous pouvez consulter la page du " - "manuel nm-settings(5) pour afficher tous les paramètres et propriétés NM.\n" - --#: ../clients/cli/connections.c:6414 -+#: ../clients/cli/connections.c:6454 - #, c-format - msgid "" - "print [all] :: print setting or connection values\n" -@@ -1555,14 +1551,13 @@ msgstr "" - "\n" - "Exemple : nmcli ipv4> print all\n" - --#: ../clients/cli/connections.c:6419 -+#: ../clients/cli/connections.c:6459 - #, 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" -@@ -1581,7 +1576,7 @@ msgstr "" - " nmcli> verify fix\n" - " nmcli bond> verifyerify\n" - --#: ../clients/cli/connections.c:6428 -+#: ../clients/cli/connections.c:6468 - #, c-format - msgid "" - "save [persistent|temporary] :: save the connection\n" -@@ -1611,7 +1606,7 @@ msgstr "" - "connexion\n" - "persitante, le profil de connexion devra être supprimé.\n" - --#: ../clients/cli/connections.c:6439 -+#: ../clients/cli/connections.c:6479 - #, c-format - msgid "" - "activate [] [/|] :: activate the connection\n" -@@ -1632,25 +1627,21 @@ msgstr "" - "/| - AP (Wi-Fi) ou NSP (WiMAX) (ajouter avec ou lorsque " - "n'est pas spécifié)\n" - --#: ../clients/cli/connections.c:6446 ../clients/cli/connections.c:6604 -+#: ../clients/cli/connections.c:6486 ../clients/cli/connections.c:6644 - #, c-format --msgid "" --"back :: go to upper menu level\n" -+msgid "back :: go to upper menu level\n" - "\n" --msgstr "" --"back :: aller au niveau supérieur du menu\n" -+msgstr "back :: aller au niveau supérieur du menu\n" - "\n" - --#: ../clients/cli/connections.c:6449 -+#: ../clients/cli/connections.c:6489 - #, c-format --msgid "" --"help/? [] :: help for the nmcli commands\n" -+msgid "help/? [] :: help for the nmcli commands\n" - "\n" --msgstr "" --"help/? [] :: aide pour les commandes nmcli\n" -+msgstr "help/? [] :: aide pour les commandes nmcli\n" - "\n" - --#: ../clients/cli/connections.c:6452 -+#: ../clients/cli/connections.c:6492 - #, c-format - msgid "" - "nmcli [ ] :: nmcli configuration\n" -@@ -1676,7 +1667,7 @@ msgstr "" - " nmcli> nmcli save-confirmation no\n" - " nmcli> nmcli prompt-color 3\n" - --#: ../clients/cli/connections.c:6474 ../clients/cli/connections.c:6610 -+#: ../clients/cli/connections.c:6514 ../clients/cli/connections.c:6650 - #, c-format - msgid "" - "quit :: exit nmcli\n" -@@ -1690,16 +1681,16 @@ msgstr "" - "modification n'est pas enregistrée, il est demandé à l'utilisateur de " - "confirmer l'action.\n" - --#: ../clients/cli/connections.c:6479 ../clients/cli/connections.c:6615 --#: ../clients/cli/connections.c:7024 ../clients/cli/connections.c:8011 -+#: ../clients/cli/connections.c:6519 ../clients/cli/connections.c:6655 -+#: ../clients/cli/connections.c:7061 ../clients/cli/connections.c:8043 - #, c-format - msgid "Unknown command: '%s'\n" - msgstr "Commande inconnue : « %s »\n" - - #. TRANSLATORS: do not translate command names and keywords before :: - #. * However, you should translate terms enclosed in <>. --#. --#: ../clients/cli/connections.c:6544 -+#. -+#: ../clients/cli/connections.c:6584 - #, c-format - msgid "" - "---[ Property menu ]---\n" -@@ -1728,7 +1719,7 @@ msgstr "" - "commande\n" - "quit :: quitter nmcli\n" - --#: ../clients/cli/connections.c:6569 -+#: ../clients/cli/connections.c:6609 - #, c-format - msgid "" - "set [] :: set new value\n" -@@ -1739,7 +1730,7 @@ msgstr "" - "\n" - "Cette commande définit la (valeur) fournie à cette propriété\n" - --#: ../clients/cli/connections.c:6573 -+#: ../clients/cli/connections.c:6613 - #, c-format - msgid "" - "add [] :: append new value to the property\n" -@@ -1754,7 +1745,7 @@ msgstr "" - "propriété est d'un type de conteneur. Pour les propriétés à valeur unique, " - "ceci remplace la valeur (comme « set »).\n" - --#: ../clients/cli/connections.c:6579 -+#: ../clients/cli/connections.c:6619 - #, c-format - msgid "" - "change :: change current value\n" -@@ -1765,7 +1756,7 @@ msgstr "" - "\n" - "Affiche la valeur actuelle et permet sa modification.\n" - --#: ../clients/cli/connections.c:6583 -+#: ../clients/cli/connections.c:6623 - #, c-format - msgid "" - "remove [||