From 2804ca20994abc46f0153fe4702e0260b09c5aeb Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Oct 30 2018 04:58:36 +0000 Subject: import NetworkManager-1.12.0-6.el7 --- diff --git a/.NetworkManager.metadata b/.NetworkManager.metadata index 609fa38..a70ee3e 100644 --- a/.NetworkManager.metadata +++ b/.NetworkManager.metadata @@ -1 +1 @@ -e4559b3656b1be83a712e6d1c296becd7ca84921 SOURCES/NetworkManager-1.10.2.tar.xz +3b217472a9a96a49cdb143b66b1c2d964f6a473f SOURCES/NetworkManager-1.12.0.tar.xz diff --git a/.gitignore b/.gitignore index fd9df0e..7028f3b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/NetworkManager-1.10.2.tar.xz +SOURCES/NetworkManager-1.12.0.tar.xz diff --git a/SOURCES/0001-cloned-mac-address-permanent-rh1413312.patch b/SOURCES/0001-cloned-mac-address-permanent-rh1413312.patch index e645a74..0b2cde2 100644 --- a/SOURCES/0001-cloned-mac-address-permanent-rh1413312.patch +++ b/SOURCES/0001-cloned-mac-address-permanent-rh1413312.patch @@ -1,4 +1,4 @@ -From cf4fabd8dd1235312ebc21becda6378b770eb822 Mon Sep 17 00:00:00 2001 +From d7590dd02fd47cc32e0e76e19578116c83910591 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 24 Feb 2017 20:25:56 +0100 Subject: [PATCH] Revert "device: change default value for cloned-mac-address @@ -8,17 +8,17 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1413312 This reverts commit fae5ecec5a4d9987a1915441602cb78275a9f490. --- - clients/common/settings-docs.c.in | 4 ++-- + clients/common/settings-docs.h.in | 4 ++-- libnm-core/nm-setting-wired.c | 7 +++---- libnm-core/nm-setting-wireless.c | 7 +++---- man/NetworkManager.conf.xml | 4 ++-- src/devices/nm-device.c | 3 ++- 5 files changed, 12 insertions(+), 13 deletions(-) -diff --git a/clients/common/settings-docs.c.in b/clients/common/settings-docs.c.in -index bf544ab6e..12991cc06 100644 ---- a/clients/common/settings-docs.c.in -+++ b/clients/common/settings-docs.c.in +diff --git a/clients/common/settings-docs.h.in b/clients/common/settings-docs.h.in +index 7ad8c19a6..5aca99eee 100644 +--- a/clients/common/settings-docs.h.in ++++ b/clients/common/settings-docs.h.in @@ -7,7 +7,7 @@ #define DESCRIBE_DOC_NM_SETTING_WIRELESS_BAND N_("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.") #define DESCRIBE_DOC_NM_SETTING_WIRELESS_BSSID N_("If specified, directs the device to only associate with the given access 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.") @@ -26,22 +26,22 @@ index bf544ab6e..12991cc06 100644 -#define DESCRIBE_DOC_NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS N_("If specified, request that the device use this MAC address instead. This is known as MAC cloning or spoofing. Beside explicitly specifying a MAC address, the special values \"preserve\", \"permanent\", \"random\" and \"stable\" are supported. \"preserve\" means not to touch the MAC address on activation. \"permanent\" means to use the permanent hardware address of the device. \"random\" creates a random MAC address on each connect. \"stable\" creates a hashed MAC address based on connection.stable-id and a machine dependent key. If unspecified, the value can be overwritten via global defaults, see manual of NetworkManager.conf. If still unspecified, it defaults to \"preserve\" (older versions of NetworkManager may use a different default value). On D-Bus, this field is expressed as \"assigned-mac-address\" or the deprecated \"cloned-mac-address\".") +#define DESCRIBE_DOC_NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS N_("If specified, request that the device use this MAC address instead of its permanent MAC address. This is known as MAC cloning or spoofing. Beside explicitly specifying a MAC address, the special values \"preserve\", \"permanent\", \"random\" and \"stable\" are supported. \"preserve\" means not to touch the MAC address on activation. \"permanent\" means to use the permanent hardware address of the device. \"random\" creates a random MAC address on each connect. \"stable\" creates a hashed MAC address based on connection.stable-id and a machine dependent key. If unspecified, the value can be overwritten via global defaults, see manual of NetworkManager.conf. If still unspecified, it defaults to \"permanent\". On D-Bus, this field is expressed as \"assigned-mac-address\" or the deprecated \"cloned-mac-address\".") #define DESCRIBE_DOC_NM_SETTING_WIRELESS_GENERATE_MAC_ADDRESS_MASK N_("With \"cloned-mac-address\" setting \"random\" or \"stable\", by default all bits of the MAC address are scrambled and a locally-administered, unicast MAC address is created. This property allows to specify that certain bits are fixed. Note that the least significant bit of the first MAC address will always be unset to create a unicast MAC address. If the property is NULL, it is eligible to be overwritten by a default connection setting. If the value is still NULL or an empty string, the default is to create a locally-administered, unicast MAC address. If the value contains one MAC address, this address is used as mask. The set bits of the mask are to be filled with the current MAC address of the device, while the unset bits are subject to randomization. Setting \"FE:FF:FF:00:00:00\" means to preserve the OUI of the current MAC address and only randomize the lower 3 bytes using the \"random\" or \"stable\" algorithm. If the value contains one additional MAC address after the mask, this address is used instead of the current MAC address to fill the bits that shall not be randomized. For example, a value of \"FE:FF:FF:00:00:00 68:F7:28:00:00:00\" will set the OUI of the MAC address to 68:F7:28, while the lower bits are randomized. A value of \"02:00:00:00:00:00 00:00:00:00:00:00\" will create a fully scrambled globally-administered, burned-in MAC address. If the value contains more than one additional MAC addresses, one of them is chosen randomly. For example, \"02:00:00:00:00:00 00:00:00:00:00:00 02:00:00:00:00:00\" will create a fully scrambled MAC address, randomly locally or globally administered.") - #define DESCRIBE_DOC_NM_SETTING_WIRELESS_HIDDEN N_("If TRUE, indicates this network is a non-broadcasting network that hides its SSID. In this case various workarounds may take place, such as probe-scanning the SSID for more reliable network discovery. However, these workarounds expose inherent insecurities with hidden SSID networks, and thus hidden SSID networks should be used with caution.") + #define DESCRIBE_DOC_NM_SETTING_WIRELESS_HIDDEN N_("If TRUE, indicates this network is a non-broadcasting network that hides its SSID. In this case various workarounds may take place, such as probe-scanning the SSID for more reliable network discovery. However, these workarounds expose inherent insecurities with hidden SSID networks, and thus hidden SSID networks should be used with caution. Note that marking the network as hidden may be a privacy issue for you, as the explicit probe-scans may be distinctly recognizable on the air.") #define DESCRIBE_DOC_NM_SETTING_WIRELESS_MAC_ADDRESS N_("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).") -@@ -87,7 +87,7 @@ +@@ -89,7 +89,7 @@ #define DESCRIBE_DOC_NM_SETTING_802_1X_SUBJECT_MATCH N_("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.") #define DESCRIBE_DOC_NM_SETTING_802_1X_SYSTEM_CA_CERTS N_("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).") - #define DESCRIBE_DOC_NM_SETTING_WIRED_AUTO_NEGOTIATE N_("If TRUE, enforce auto-negotiation of port speed and duplex mode. If FALSE, \"speed\" and \"duplex\" properties should be both set or link configuration will be skipped.") + #define DESCRIBE_DOC_NM_SETTING_WIRED_AUTO_NEGOTIATE N_("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.") -#define DESCRIBE_DOC_NM_SETTING_WIRED_CLONED_MAC_ADDRESS N_("If specified, request that the device use this MAC address instead. This is known as MAC cloning or spoofing. Beside explicitly specifying a MAC address, the special values \"preserve\", \"permanent\", \"random\" and \"stable\" are supported. \"preserve\" means not to touch the MAC address on activation. \"permanent\" means to use the permanent hardware address if the device has one (otherwise this is treated as \"preserve\"). \"random\" creates a random MAC address on each connect. \"stable\" creates a hashed MAC address based on connection.stable-id and a machine dependent key. If unspecified, the value can be overwritten via global defaults, see manual of NetworkManager.conf. If still unspecified, it defaults to \"preserve\" (older versions of NetworkManager may use a different default value). On D-Bus, this field is expressed as \"assigned-mac-address\" or the deprecated \"cloned-mac-address\".") +#define DESCRIBE_DOC_NM_SETTING_WIRED_CLONED_MAC_ADDRESS N_("If specified, request that the device use this MAC address instead of its permanent MAC address. This is known as MAC cloning or spoofing. Beside explicitly specifying a MAC address, the special values \"preserve\", \"permanent\", \"random\" and \"stable\" are supported. \"preserve\" means not to touch the MAC address on activation. \"permanent\" means to use the permanent hardware address if the device has one (otherwise this is treated as \"preserve\"). \"random\" creates a random MAC address on each connect. \"stable\" creates a hashed MAC address based on connection.stable-id and a machine dependent key. If unspecified, the value can be overwritten via global defaults, see manual of NetworkManager.conf. If still unspecified, it defaults to \"permanent\". On D-Bus, this field is expressed as \"assigned-mac-address\" or the deprecated \"cloned-mac-address\".") - #define DESCRIBE_DOC_NM_SETTING_WIRED_DUPLEX N_("Can be specified only when \"auto-negotiate\" is \"off\". In that case, statically configures the device to use that specified duplex mode, either \"half\" or \"full\". Must be set together with the \"speed\" property if specified. Before specifying a duplex mode be sure your device supports it.") + #define DESCRIBE_DOC_NM_SETTING_WIRED_DUPLEX N_("When a value is set, either \"half\" or \"full\", configures the device to use the specified duplex mode. If \"auto-negotiate\" is \"yes\" the specified duplex mode will be the only one advertised during link negotiation: this works only for BASE-T 802.3 specifications and is useful for enforcing gigabits modes, as in these cases link negotiation is mandatory. If the value is unset (the default), the link configuration will be either skipped (if \"auto-negotiate\" is \"no\", the default) or will be auto-negotiated (if \"auto-negotiate\" is \"yes\") and the local device will advertise all the supported duplex modes. Must be set together with the \"speed\" property if specified. Before specifying a duplex mode be sure your device supports it.") #define DESCRIBE_DOC_NM_SETTING_WIRED_GENERATE_MAC_ADDRESS_MASK N_("With \"cloned-mac-address\" setting \"random\" or \"stable\", by default all bits of the MAC address are scrambled and a locally-administered, unicast MAC address is created. This property allows to specify that certain bits are fixed. Note that the least significant bit of the first MAC address will always be unset to create a unicast MAC address. If the property is NULL, it is eligible to be overwritten by a default connection setting. If the value is still NULL or an empty string, the default is to create a locally-administered, unicast MAC address. If the value contains one MAC address, this address is used as mask. The set bits of the mask are to be filled with the current MAC address of the device, while the unset bits are subject to randomization. Setting \"FE:FF:FF:00:00:00\" means to preserve the OUI of the current MAC address and only randomize the lower 3 bytes using the \"random\" or \"stable\" algorithm. If the value contains one additional MAC address after the mask, this address is used instead of the current MAC address to fill the bits that shall not be randomized. For example, a value of \"FE:FF:FF:00:00:00 68:F7:28:00:00:00\" will set the OUI of the MAC address to 68:F7:28, while the lower bits are randomized. A value of \"02:00:00:00:00:00 00:00:00:00:00:00\" will create a fully scrambled globally-administered, burned-in MAC address. If the value contains more than one additional MAC addresses, one of them is chosen randomly. For example, \"02:00:00:00:00:00 00:00:00:00:00:00 02:00:00:00:00:00\" will create a fully scrambled MAC address, randomly locally or globally administered.") #define DESCRIBE_DOC_NM_SETTING_WIRED_MAC_ADDRESS N_("If specified, this connection will only apply to the Ethernet device whose permanent MAC address matches. This property does not change the MAC address of the device (i.e. MAC spoofing).") diff --git a/libnm-core/nm-setting-wired.c b/libnm-core/nm-setting-wired.c -index 9d255e1d0..f36283a7e 100644 +index 5da9ce7d7..ccbc42f90 100644 --- a/libnm-core/nm-setting-wired.c +++ b/libnm-core/nm-setting-wired.c -@@ -1144,8 +1144,8 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_wired_class) +@@ -1149,8 +1149,8 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_wired_class) /** * NMSettingWired:cloned-mac-address: * @@ -52,7 +52,7 @@ index 9d255e1d0..f36283a7e 100644 * * Beside explicitly specifying a MAC address, the special values "preserve", "permanent", * "random" and "stable" are supported. -@@ -1157,8 +1157,7 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_wired_class) +@@ -1162,8 +1162,7 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_wired_class) * machine dependent key. * * If unspecified, the value can be overwritten via global defaults, see manual @@ -63,10 +63,10 @@ index 9d255e1d0..f36283a7e 100644 * On D-Bus, this field is expressed as "assigned-mac-address" or the deprecated * "cloned-mac-address". diff --git a/libnm-core/nm-setting-wireless.c b/libnm-core/nm-setting-wireless.c -index 0a3915bfc..8f457ffcc 100644 +index 89a2df8eb..e80d153f1 100644 --- a/libnm-core/nm-setting-wireless.c +++ b/libnm-core/nm-setting-wireless.c -@@ -1350,8 +1350,8 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_wireless_class) +@@ -1396,8 +1396,8 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_wireless_class) /** * NMSettingWireless:cloned-mac-address: * @@ -77,7 +77,7 @@ index 0a3915bfc..8f457ffcc 100644 * * Beside explicitly specifying a MAC address, the special values "preserve", "permanent", * "random" and "stable" are supported. -@@ -1362,8 +1362,7 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_wireless_class) +@@ -1408,8 +1408,7 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_wireless_class) * machine dependent key. * * If unspecified, the value can be overwritten via global defaults, see manual @@ -88,10 +88,10 @@ index 0a3915bfc..8f457ffcc 100644 * On D-Bus, this field is expressed as "assigned-mac-address" or the deprecated * "cloned-mac-address". diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml -index 446540aa1..fc106a51e 100644 +index 17bc42f34..aa8e66946 100644 --- a/man/NetworkManager.conf.xml +++ b/man/NetworkManager.conf.xml -@@ -659,7 +659,7 @@ ipv6.ip6-privacy=0 +@@ -661,7 +661,7 @@ ipv6.ip6-privacy=0 ethernet.cloned-mac-address @@ -100,7 +100,7 @@ index 446540aa1..fc106a51e 100644 ethernet.generate-mac-address-mask -@@ -724,7 +724,7 @@ ipv6.ip6-privacy=0 +@@ -733,7 +733,7 @@ ipv6.ip6-privacy=0 wifi.cloned-mac-address @@ -110,10 +110,10 @@ index 446540aa1..fc106a51e 100644 wifi.generate-mac-address-mask diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c -index afc81dcde..f75cc86e3 100644 +index 5a5cb50e9..613e87034 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c -@@ -13624,7 +13624,8 @@ _get_cloned_mac_address_setting (NMDevice *self, NMConnection *connection, gbool +@@ -14628,7 +14628,8 @@ _get_cloned_mac_address_setting (NMDevice *self, NMConnection *connection, gbool is_wifi ? "wifi.cloned-mac-address" : "ethernet.cloned-mac-address", self); @@ -124,5 +124,5 @@ index afc81dcde..f75cc86e3 100644 if (!a) { if (is_wifi) { -- -2.14.3 +2.17.0 diff --git a/SOURCES/0003-dhclient-no-leading-zero-client-id-rh1556983.patch b/SOURCES/0003-dhclient-no-leading-zero-client-id-rh1556983.patch new file mode 100644 index 0000000..575d0b1 --- /dev/null +++ b/SOURCES/0003-dhclient-no-leading-zero-client-id-rh1556983.patch @@ -0,0 +1,330 @@ +From 8e8c797904fc29396d340609f006add206df4973 Mon Sep 17 00:00:00 2001 +From: Beniamino Galvani +Date: Wed, 20 Jun 2018 11:49:22 +0200 +Subject: [PATCH 1/2] Revert "dhclient: write client-id with backslash and + quotes as hex" + +This reverts commit 0e4b33ee7552b036332f1bdbfed78f8ee75f000e. +--- + src/dhcp/nm-dhcp-dhclient-utils.c | 2 +- + src/dhcp/tests/test-dhcp-dhclient.c | 32 +---------------------------- + 2 files changed, 2 insertions(+), 32 deletions(-) + +diff --git a/src/dhcp/nm-dhcp-dhclient-utils.c b/src/dhcp/nm-dhcp-dhclient-utils.c +index 3290dd65c..6adb395c9 100644 +--- a/src/dhcp/nm-dhcp-dhclient-utils.c ++++ b/src/dhcp/nm-dhcp-dhclient-utils.c +@@ -124,7 +124,7 @@ add_ip4_config (GString *str, GBytes *client_id, const char *hostname, gboolean + * as long as all the characters are printable. + */ + for (i = 1; (p[0] == 0) && i < l; i++) { +- if (!g_ascii_isprint (p[i]) || p[i] == '\\' || p[i] == '"') ++ if (!g_ascii_isprint (p[i])) + break; + } + +diff --git a/src/dhcp/tests/test-dhcp-dhclient.c b/src/dhcp/tests/test-dhcp-dhclient.c +index 2f369aacc..f3b17807f 100644 +--- a/src/dhcp/tests/test-dhcp-dhclient.c ++++ b/src/dhcp/tests/test-dhcp-dhclient.c +@@ -176,35 +176,6 @@ test_quote_client_id (void) + + /*****************************************************************************/ + +-static const char *quote_client_id_expected_2 = \ +- "# Created by NetworkManager\n" +- "\n" +- "send dhcp-client-identifier 00:61:5c:62:63; # added by NetworkManager\n" +- "\n" +- "option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;\n" +- "option ms-classless-static-routes code 249 = array of unsigned integer 8;\n" +- "option wpad code 252 = string;\n" +- "\n" +- "also request rfc3442-classless-static-routes;\n" +- "also request ms-classless-static-routes;\n" +- "also request static-routes;\n" +- "also request wpad;\n" +- "also request ntp-servers;\n" +- "\n"; +- +-static void +-test_quote_client_id_2 (void) +-{ +- test_config (NULL, quote_client_id_expected_2, +- AF_INET, NULL, 0, FALSE, +- "a\\bc", +- NULL, +- "eth0", +- NULL); +-} +- +-/*****************************************************************************/ +- + static const char *hex_zero_client_id_expected = \ + "# Created by NetworkManager\n" + "\n" +@@ -1026,8 +997,7 @@ main (int argc, char **argv) + + g_test_add_func ("/dhcp/dhclient/orig_missing", test_orig_missing); + g_test_add_func ("/dhcp/dhclient/override_client_id", test_override_client_id); +- g_test_add_func ("/dhcp/dhclient/quote_client_id/1", test_quote_client_id); +- g_test_add_func ("/dhcp/dhclient/quote_client_id/2", test_quote_client_id_2); ++ g_test_add_func ("/dhcp/dhclient/quote_client_id", test_quote_client_id); + g_test_add_func ("/dhcp/dhclient/hex_zero_client_id", test_hex_zero_client_id); + g_test_add_func ("/dhcp/dhclient/ascii_client_id", test_ascii_client_id); + g_test_add_func ("/dhcp/dhclient/hex_single_client_id", test_hex_single_client_id); +-- +2.17.0 + +From 5fa45f1a84ea2e46e5fb07aeef19cb46322b64bc Mon Sep 17 00:00:00 2001 +From: Beniamino Galvani +Date: Wed, 20 Jun 2018 11:50:51 +0200 +Subject: [PATCH 2/2] Revert "dhcp: dhclient: set type 0 for printable client + IDs" + +Keep the RHEL 7.5 behavior. + +This reverts commit 8ffa22d10d3001405965826b46463663fd2dacc2. +--- + src/dhcp/nm-dhcp-dhclient-utils.c | 46 +++------------- + src/dhcp/tests/test-dhcp-dhclient.c | 83 +++-------------------------- + 2 files changed, 16 insertions(+), 113 deletions(-) + +diff --git a/src/dhcp/nm-dhcp-dhclient-utils.c b/src/dhcp/nm-dhcp-dhclient-utils.c +index 6adb395c9..90fa33397 100644 +--- a/src/dhcp/nm-dhcp-dhclient-utils.c ++++ b/src/dhcp/nm-dhcp-dhclient-utils.c +@@ -137,9 +137,8 @@ add_ip4_config (GString *str, GBytes *client_id, const char *hostname, gboolean + g_string_append_printf (str, "%02x", (guint8) p[i]); + } + } else { +- /* Printable; just add to the line with type 0 */ ++ /* Printable; just add to the line minus the 'type' */ + g_string_append_c (str, '"'); +- g_string_append (str, "\\x00"); + g_string_append_len (str, p + 1, l - 1); + g_string_append_c (str, '"'); + } +@@ -177,60 +176,31 @@ read_client_id (const char *str) + { + gs_free char *s = NULL; + char *p; +- int i = 0, j = 0; + + nm_assert (!strncmp (str, CLIENTID_TAG, NM_STRLEN (CLIENTID_TAG))); +- str += NM_STRLEN (CLIENTID_TAG); + +- if (!g_ascii_isspace (*str)) +- return NULL; ++ str += NM_STRLEN (CLIENTID_TAG); + while (g_ascii_isspace (*str)) + str++; + + if (*str == '"') { +- /* Parse string literal with escape sequences */ + s = g_strdup (str + 1); + p = strrchr (s, '"'); + if (p) + *p = '\0'; + else + return NULL; ++ } else ++ s = g_strdup (str); + +- if (!s[0]) +- return NULL; +- +- while (s[i]) { +- if ( s[i] == '\\' +- && s[i + 1] == 'x' +- && g_ascii_isxdigit (s[i + 2]) +- && g_ascii_isxdigit (s[i + 3])) { +- s[j++] = (g_ascii_xdigit_value (s[i + 2]) << 4) +- + g_ascii_xdigit_value (s[i + 3]); +- i += 4; +- continue; +- } +- if ( s[i] == '\\' +- && s[i + 1] >= '0' && s[i + 1] <= '7' +- && s[1 + 2] >= '0' && s[i + 2] <= '7' +- && s[1 + 3] >= '0' && s[i + 3] <= '7') { +- s[j++] = ((s[i + 1] - '0') << 6) +- + ((s[i + 2] - '0') << 3) +- + ( s[i + 3] - '0'); +- i += 4; +- continue; +- } +- s[j++] = s[i++]; +- } +- return g_bytes_new_take (g_steal_pointer (&s), j); +- } +- +- /* Otherwise, try to read a hexadecimal sequence */ +- s = g_strdup (str); + g_strchomp (s); + if (s[strlen (s) - 1] == ';') + s[strlen (s) - 1] = '\0'; + +- return nm_utils_hexstr2bin (s); ++ if (!s[0]) ++ return NULL; ++ ++ return nm_dhcp_utils_client_id_string_to_bytes (s); + } + + GBytes * +diff --git a/src/dhcp/tests/test-dhcp-dhclient.c b/src/dhcp/tests/test-dhcp-dhclient.c +index f3b17807f..377938c87 100644 +--- a/src/dhcp/tests/test-dhcp-dhclient.c ++++ b/src/dhcp/tests/test-dhcp-dhclient.c +@@ -150,7 +150,7 @@ test_override_client_id (void) + static const char *quote_client_id_expected = \ + "# Created by NetworkManager\n" + "\n" +- "send dhcp-client-identifier \"\\x00abcd\"; # added by NetworkManager\n" ++ "send dhcp-client-identifier \"1234\"; # added by NetworkManager\n" + "\n" + "option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;\n" + "option ms-classless-static-routes code 249 = array of unsigned integer 8;\n" +@@ -168,36 +168,7 @@ test_quote_client_id (void) + { + test_config (NULL, quote_client_id_expected, + AF_INET, NULL, 0, FALSE, +- "abcd", +- NULL, +- "eth0", +- NULL); +-} +- +-/*****************************************************************************/ +- +-static const char *hex_zero_client_id_expected = \ +- "# Created by NetworkManager\n" +- "\n" +- "send dhcp-client-identifier 00:11:22:33; # added by NetworkManager\n" +- "\n" +- "option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;\n" +- "option ms-classless-static-routes code 249 = array of unsigned integer 8;\n" +- "option wpad code 252 = string;\n" +- "\n" +- "also request rfc3442-classless-static-routes;\n" +- "also request ms-classless-static-routes;\n" +- "also request static-routes;\n" +- "also request wpad;\n" +- "also request ntp-servers;\n" +- "\n"; +- +-static void +-test_hex_zero_client_id (void) +-{ +- test_config (NULL, hex_zero_client_id_expected, +- AF_INET, NULL, 0, FALSE, +- "00:11:22:33", ++ "1234", + NULL, + "eth0", + NULL); +@@ -208,7 +179,7 @@ test_hex_zero_client_id (void) + static const char *ascii_client_id_expected = \ + "# Created by NetworkManager\n" + "\n" +- "send dhcp-client-identifier \"\\x00qb:cd:ef:12:34:56\"; # added by NetworkManager\n" ++ "send dhcp-client-identifier \"qb:cd:ef:12:34:56\"; # added by NetworkManager\n" + "\n" + "option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;\n" + "option ms-classless-static-routes code 249 = array of unsigned integer 8;\n" +@@ -264,13 +235,13 @@ test_hex_single_client_id (void) + /*****************************************************************************/ + + static const char *existing_hex_client_id_orig = \ +- "send dhcp-client-identifier 10:30:04:20:7A:08;\n"; ++ "send dhcp-client-identifier 00:30:04:20:7A:08;\n"; + + static const char *existing_hex_client_id_expected = \ + "# Created by NetworkManager\n" + "# Merged from /path/to/dhclient.conf\n" + "\n" +- "send dhcp-client-identifier 10:30:04:20:7A:08;\n" ++ "send dhcp-client-identifier 00:30:04:20:7A:08;\n" + "\n" + "option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;\n" + "option ms-classless-static-routes code 249 = array of unsigned integer 8;\n" +@@ -287,7 +258,7 @@ static void + test_existing_hex_client_id (void) + { + gs_unref_bytes GBytes *new_client_id = NULL; +- const guint8 bytes[] = { 0x10, 0x30, 0x04, 0x20, 0x7A, 0x08 }; ++ const guint8 bytes[] = { 0x00, 0x30, 0x04,0x20, 0x7A, 0x08 }; + + new_client_id = g_bytes_new (bytes, sizeof (bytes)); + test_config (existing_hex_client_id_orig, existing_hex_client_id_expected, +@@ -300,52 +271,16 @@ test_existing_hex_client_id (void) + + /*****************************************************************************/ + +-static const char *existing_escaped_client_id_orig = \ +- "send dhcp-client-identifier \"\\044test\\xfe\";\n"; +- +-static const char *existing_escaped_client_id_expected = \ +- "# Created by NetworkManager\n" +- "# Merged from /path/to/dhclient.conf\n" +- "\n" +- "send dhcp-client-identifier \"\\044test\\xfe\";\n" +- "\n" +- "option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;\n" +- "option ms-classless-static-routes code 249 = array of unsigned integer 8;\n" +- "option wpad code 252 = string;\n" +- "\n" +- "also request rfc3442-classless-static-routes;\n" +- "also request ms-classless-static-routes;\n" +- "also request static-routes;\n" +- "also request wpad;\n" +- "also request ntp-servers;\n" +- "\n"; +- +-static void +-test_existing_escaped_client_id (void) +-{ +- gs_unref_bytes GBytes *new_client_id = NULL; +- +- new_client_id = g_bytes_new ("$test\xfe", 6); +- test_config (existing_escaped_client_id_orig, existing_escaped_client_id_expected, +- AF_INET, NULL, 0, FALSE, +- NULL, +- new_client_id, +- "eth0", +- NULL); +-} +- +-/*****************************************************************************/ +- + #define EACID "qb:cd:ef:12:34:56" + + static const char *existing_ascii_client_id_orig = \ +- "send dhcp-client-identifier \"\\x00" EACID "\";\n"; ++ "send dhcp-client-identifier \"" EACID "\";\n"; + + static const char *existing_ascii_client_id_expected = \ + "# Created by NetworkManager\n" + "# Merged from /path/to/dhclient.conf\n" + "\n" +- "send dhcp-client-identifier \"\\x00" EACID "\";\n" ++ "send dhcp-client-identifier \"" EACID "\";\n" + "\n" + "option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;\n" + "option ms-classless-static-routes code 249 = array of unsigned integer 8;\n" +@@ -998,11 +933,9 @@ main (int argc, char **argv) + g_test_add_func ("/dhcp/dhclient/orig_missing", test_orig_missing); + g_test_add_func ("/dhcp/dhclient/override_client_id", test_override_client_id); + g_test_add_func ("/dhcp/dhclient/quote_client_id", test_quote_client_id); +- g_test_add_func ("/dhcp/dhclient/hex_zero_client_id", test_hex_zero_client_id); + g_test_add_func ("/dhcp/dhclient/ascii_client_id", test_ascii_client_id); + g_test_add_func ("/dhcp/dhclient/hex_single_client_id", test_hex_single_client_id); + g_test_add_func ("/dhcp/dhclient/existing-hex-client-id", test_existing_hex_client_id); +- g_test_add_func ("/dhcp/dhclient/existing-client-id", test_existing_escaped_client_id); + g_test_add_func ("/dhcp/dhclient/existing-ascii-client-id", test_existing_ascii_client_id); + g_test_add_func ("/dhcp/dhclient/fqdn", test_fqdn); + g_test_add_func ("/dhcp/dhclient/fqdn_options_override", test_fqdn_options_override); +-- +2.17.0 + diff --git a/SOURCES/0003-po-import-translations-rh1481186.patch b/SOURCES/0003-po-import-translations-rh1481186.patch deleted file mode 100644 index 165b2d4..0000000 --- a/SOURCES/0003-po-import-translations-rh1481186.patch +++ /dev/null @@ -1,56913 +0,0 @@ -From b69f6c9e747149e18ef4b6fc88b81b4f2d9837b1 Mon Sep 17 00:00:00 2001 -From: Lubomir Rintel -Date: Tue, 12 Dec 2017 10:46:10 +0100 -Subject: [PATCH 1/3] po: add zanata.xml - ---- - zanata.xml | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - create mode 100644 zanata.xml - -diff --git a/zanata.xml b/zanata.xml -new file mode 100644 -index 0000000..c3baa18 ---- /dev/null -+++ b/zanata.xml -@@ -0,0 +1,16 @@ -+ -+ -+ -+ -+ -+ https://vendors.zanata.redhat.com/ -+ networkmanager -+ RHEL-7.5 -+ gettext -+ po -+ po -+ -+ --- -2.14.3 - - -From 24d106994d46830bacaa4df8c7c7efe24d632b07 Mon Sep 17 00:00:00 2001 -From: Lubomir Rintel -Date: Tue, 12 Dec 2017 10:42:05 +0100 -Subject: [PATCH 2/3] po: import translations - -https://bugzilla.redhat.com/show_bug.cgi?id=1481186 ---- - po/de.po | 1871 +++++++++++++++------------ - po/es.po | 1892 +++++++++++++++------------ - po/fr.po | 2054 +++++++++++++++-------------- - po/it.po | 1894 +++++++++++++++------------ - po/ja.po | 4126 ++++++++++++++++++++++++++++++++++------------------------- - po/ko.po | 1889 +++++++++++++++------------ - po/pt_BR.po | 1892 +++++++++++++++------------ - po/ru.po | 1889 +++++++++++++++------------ - po/zh_CN.po | 1891 +++++++++++++++------------ - po/zh_TW.po | 1878 +++++++++++++++------------ - 10 files changed, 11947 insertions(+), 9329 deletions(-) - -diff --git a/po/de.po b/po/de.po -index b198c2f..986b2fe 100644 ---- a/po/de.po -+++ b/po/de.po -@@ -15,20 +15,21 @@ - # Christian Kirbach , 2009-2014. - # Benjamin Steinwender , 2014. - # Hedda Peters , 2014. -+# lrintel , 2017. #zanata - msgid "" - msgstr "" --"Project-Id-Version: NetworkManager HEAD\n" -+"Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2017-11-10 15:29+0100\n" --"PO-Revision-Date: 2017-09-14 00:26+0200\n" --"Last-Translator: Christian Kirbach \n" -+"POT-Creation-Date: 2017-12-12 10:42+0100\n" -+"PO-Revision-Date: 2017-11-07 06:49+0000\n" -+"Last-Translator: Copied by Zanata \n" - "Language-Team: Deutsch \n" - "Language: de\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=2; plural=(n != 1);\n" --"X-Generator: Poedit 1.8.7.1\n" -+"X-Generator: Zanata 4.3.2\n" - - #: ../clients/cli/agent.c:40 - #, c-format -@@ -197,7 +198,7 @@ msgstr "Verbindung(en) (Name, UUID oder Pfad)" - msgid "Connection(s) (name, UUID, path or apath)" - msgstr "Verbindung(en) (Name, UUID oder a-Pfad)" - --#: ../clients/cli/connections.c:196 -+#: ../clients/cli/connections.c:197 - #, c-format - msgid "" - "Usage: nmcli connection { COMMAND | help }\n" -@@ -274,7 +275,7 @@ msgstr "" - " export [id | uuid | path] []\n" - "\n" - --#: ../clients/cli/connections.c:218 -+#: ../clients/cli/connections.c:219 - #, c-format - msgid "" - "Usage: nmcli connection show { ARGUMENTS | help }\n" -@@ -325,7 +326,7 @@ msgstr "" - "Die globale Option »--show-secrets« zeigt zusätzlich zugehörige Passwörter " - "an.\n" - --#: ../clients/cli/connections.c:239 -+#: ../clients/cli/connections.c:240 - #, c-format - msgid "" - "Usage: nmcli connection up { ARGUMENTS | help }\n" -@@ -372,7 +373,7 @@ msgstr "" - "passwd-file - Datei mit Passwörtern zum Aktivieren der Verbindung\n" - "\n" - --#: ../clients/cli/connections.c:260 -+#: ../clients/cli/connections.c:261 - #, c-format - msgid "" - "Usage: nmcli connection down { ARGUMENTS | help }\n" -@@ -395,7 +396,7 @@ msgstr "" - "anhand dessen Name, UUID oder D-Bus-Pfad identifiziert.\n" - "\n" - --#: ../clients/cli/connections.c:272 -+#: ../clients/cli/connections.c:273 - #, c-format - msgid "" - "Usage: nmcli connection add { ARGUMENTS | help }\n" -@@ -703,7 +704,7 @@ msgstr "" - " [ip6 ] [gw6 ]\n" - "\n" - --#: ../clients/cli/connections.c:390 -+#: ../clients/cli/connections.c:391 - #, c-format - msgid "" - "Usage: nmcli connection modify { ARGUMENTS | help }\n" -@@ -752,7 +753,7 @@ msgstr "" - "nmcli con mod bond0 -bond.options downdelay\n" - "\n" - --#: ../clients/cli/connections.c:413 -+#: ../clients/cli/connections.c:414 - #, c-format - msgid "" - "Usage: nmcli connection clone { ARGUMENTS | help }\n" -@@ -775,7 +776,7 @@ msgstr "" - "und der id (wird als Parameter angegeben).\n" - "\n" - --#: ../clients/cli/connections.c:425 -+#: ../clients/cli/connections.c:426 - #, c-format - msgid "" - "Usage: nmcli connection edit { ARGUMENTS | help }\n" -@@ -803,7 +804,7 @@ msgstr "" - "Fügt ein neues Verbindungsprofil in einem interaktiven Editor hinzu.\n" - "\n" - --#: ../clients/cli/connections.c:440 -+#: ../clients/cli/connections.c:441 - #, c-format - msgid "" - "Usage: nmcli connection delete { ARGUMENTS | help }\n" -@@ -822,7 +823,7 @@ msgstr "" - "Das Profil wird anhand dessen Name, UUID oder D-Bus-Pfad identifiziert.\n" - "\n" - --#: ../clients/cli/connections.c:451 -+#: ../clients/cli/connections.c:452 - #, c-format - msgid "" - "Usage: nmcli connection monitor { ARGUMENTS | help }\n" -@@ -844,7 +845,7 @@ msgstr "" - "Es werden alle Verbindungsprofile überwacht, sofern keines angegeben wird.\n" - "\n" - --#: ../clients/cli/connections.c:463 -+#: ../clients/cli/connections.c:464 - #, c-format - msgid "" - "Usage: nmcli connection reload { help }\n" -@@ -857,7 +858,7 @@ msgstr "" - "Lädt alle Verbindungsdateien neu von der Festplatte.\n" - "\n" - --#: ../clients/cli/connections.c:471 -+#: ../clients/cli/connections.c:472 - #, c-format - msgid "" - "Usage: nmcli connection load { ARGUMENTS | help }\n" -@@ -880,7 +881,7 @@ msgstr "" - "um sicherzustellen, dass der NetworkManager die Änderungen übernimmt.\n" - "\n" - --#: ../clients/cli/connections.c:483 -+#: ../clients/cli/connections.c:484 - #, c-format - msgid "" - "Usage: nmcli connection import { ARGUMENTS | help }\n" -@@ -906,7 +907,7 @@ msgstr "" - "\n" - "\n" - --#: ../clients/cli/connections.c:496 -+#: ../clients/cli/connections.c:497 - #, c-format - msgid "" - "Usage: nmcli connection export { ARGUMENTS | help }\n" -@@ -927,23 +928,23 @@ msgstr "" - "sofern eine angegeben wird.\n" - "\n" - --#: ../clients/cli/connections.c:530 -+#: ../clients/cli/connections.c:531 - msgid "activating" - msgstr "wird aktiviert" - --#: ../clients/cli/connections.c:532 -+#: ../clients/cli/connections.c:533 - msgid "activated" - msgstr "aktiviert" - --#: ../clients/cli/connections.c:534 ../clients/common/nm-client-utils.c:243 -+#: ../clients/cli/connections.c:535 ../clients/common/nm-client-utils.c:243 - msgid "deactivating" - msgstr "wird deaktiviert" - --#: ../clients/cli/connections.c:536 -+#: ../clients/cli/connections.c:537 - msgid "deactivated" - msgstr "deaktiviert" - --#: ../clients/cli/connections.c:539 ../clients/cli/connections.c:562 -+#: ../clients/cli/connections.c:540 ../clients/cli/connections.c:563 - #: ../clients/cli/devices.c:1210 ../clients/cli/devices.c:1254 - #: ../clients/cli/devices.c:1256 ../clients/cli/general.c:41 - #: ../clients/cli/general.c:79 ../clients/cli/general.c:146 -@@ -951,65 +952,65 @@ msgstr "deaktiviert" - #: ../clients/common/nm-client-utils.c:250 - #: ../clients/common/nm-client-utils.c:266 - #: ../clients/common/nm-client-utils.c:269 --#: ../clients/common/nm-meta-setting-desc.c:1335 --#: ../clients/common/nm-meta-setting-desc.c:1403 --#: ../clients/common/nm-meta-setting-desc.c:2545 --#: ../clients/common/nm-meta-setting-desc.c:2599 -+#: ../clients/common/nm-meta-setting-desc.c:1480 -+#: ../clients/common/nm-meta-setting-desc.c:1548 -+#: ../clients/common/nm-meta-setting-desc.c:2693 -+#: ../clients/common/nm-meta-setting-desc.c:2747 - msgid "unknown" - msgstr "unbekannt" - --#: ../clients/cli/connections.c:548 -+#: ../clients/cli/connections.c:549 - msgid "VPN connecting (prepare)" - msgstr "VPN wird verbunden (wird vorbereitet)" - --#: ../clients/cli/connections.c:550 -+#: ../clients/cli/connections.c:551 - msgid "VPN connecting (need authentication)" - msgstr "VPN wird verbunden (Legitimierung wird benötigt)" - --#: ../clients/cli/connections.c:552 -+#: ../clients/cli/connections.c:553 - msgid "VPN connecting" - msgstr "VPN wird verbunden" - --#: ../clients/cli/connections.c:554 -+#: ../clients/cli/connections.c:555 - msgid "VPN connecting (getting IP configuration)" - msgstr "VPN wird verbunden (IP-Einstellungen werden ermittelt)" - --#: ../clients/cli/connections.c:556 -+#: ../clients/cli/connections.c:557 - msgid "VPN connected" - msgstr "VPN verbunden" - --#: ../clients/cli/connections.c:558 -+#: ../clients/cli/connections.c:559 - msgid "VPN connection failed" - msgstr "VPN-Verbindung gescheitert" - --#: ../clients/cli/connections.c:560 -+#: ../clients/cli/connections.c:561 - msgid "VPN disconnected" - msgstr "VPN getrennt" - --#: ../clients/cli/connections.c:630 -+#: ../clients/cli/connections.c:631 - #, c-format - msgid "Error updating secrets for %s: %s\n" - msgstr "Fehler beim Aktualisieren der Geheimnisse für %s: %s\n" - --#: ../clients/cli/connections.c:650 -+#: ../clients/cli/connections.c:651 - msgid "Connection profile details" - msgstr "Details des Verbindungsprofils" - --#: ../clients/cli/connections.c:663 ../clients/cli/connections.c:1113 -+#: ../clients/cli/connections.c:664 ../clients/cli/connections.c:1114 - #, c-format - msgid "Error: 'connection show': %s" - msgstr "Fehler: »connection show«: %s" - --#: ../clients/cli/connections.c:881 -+#: ../clients/cli/connections.c:882 - msgid "never" - msgstr "nie" - - #. "CAPABILITIES" --#: ../clients/cli/connections.c:882 ../clients/cli/connections.c:884 --#: ../clients/cli/connections.c:886 ../clients/cli/connections.c:919 --#: ../clients/cli/connections.c:986 ../clients/cli/connections.c:987 --#: ../clients/cli/connections.c:989 ../clients/cli/connections.c:4432 --#: ../clients/cli/connections.c:6370 ../clients/cli/connections.c:6371 -+#: ../clients/cli/connections.c:883 ../clients/cli/connections.c:885 -+#: ../clients/cli/connections.c:887 ../clients/cli/connections.c:920 -+#: ../clients/cli/connections.c:987 ../clients/cli/connections.c:988 -+#: ../clients/cli/connections.c:990 ../clients/cli/connections.c:4433 -+#: ../clients/cli/connections.c:6371 ../clients/cli/connections.c:6372 - #: ../clients/cli/devices.c:884 ../clients/cli/devices.c:1173 - #: ../clients/cli/devices.c:1174 ../clients/cli/devices.c:1175 - #: ../clients/cli/devices.c:1176 ../clients/cli/devices.c:1177 -@@ -1020,16 +1021,16 @@ msgstr "nie" - #: ../clients/cli/devices.c:1252 ../clients/cli/devices.c:1253 - #: ../clients/cli/devices.c:1255 ../clients/cli/devices.c:1257 - #: ../clients/cli/general.c:152 ../clients/common/nm-client-utils.c:258 --#: ../clients/common/nm-meta-setting-desc.c:575 --#: ../clients/common/nm-meta-setting-desc.c:2538 -+#: ../clients/common/nm-meta-setting-desc.c:720 -+#: ../clients/common/nm-meta-setting-desc.c:2686 - msgid "yes" - msgstr "ja" - --#: ../clients/cli/connections.c:882 ../clients/cli/connections.c:884 --#: ../clients/cli/connections.c:886 ../clients/cli/connections.c:986 --#: ../clients/cli/connections.c:987 ../clients/cli/connections.c:989 --#: ../clients/cli/connections.c:4431 ../clients/cli/connections.c:6370 --#: ../clients/cli/connections.c:6371 ../clients/cli/devices.c:884 -+#: ../clients/cli/connections.c:883 ../clients/cli/connections.c:885 -+#: ../clients/cli/connections.c:887 ../clients/cli/connections.c:987 -+#: ../clients/cli/connections.c:988 ../clients/cli/connections.c:990 -+#: ../clients/cli/connections.c:4432 ../clients/cli/connections.c:6371 -+#: ../clients/cli/connections.c:6372 ../clients/cli/devices.c:884 - #: ../clients/cli/devices.c:1173 ../clients/cli/devices.c:1174 - #: ../clients/cli/devices.c:1175 ../clients/cli/devices.c:1176 - #: ../clients/cli/devices.c:1177 ../clients/cli/devices.c:1214 -@@ -1040,65 +1041,65 @@ msgstr "ja" - #: ../clients/cli/devices.c:1253 ../clients/cli/devices.c:1255 - #: ../clients/cli/devices.c:1257 ../clients/cli/general.c:153 - #: ../clients/common/nm-client-utils.c:260 --#: ../clients/common/nm-meta-setting-desc.c:575 --#: ../clients/common/nm-meta-setting-desc.c:2541 -+#: ../clients/common/nm-meta-setting-desc.c:720 -+#: ../clients/common/nm-meta-setting-desc.c:2689 - msgid "no" - msgstr "nein" - --#: ../clients/cli/connections.c:1103 -+#: ../clients/cli/connections.c:1104 - msgid "Activate connection details" - msgstr "Verbindungsdetails aktivieren" - --#: ../clients/cli/connections.c:1350 -+#: ../clients/cli/connections.c:1351 - #, c-format - msgid "invalid field '%s'; allowed fields: %s and %s, or %s,%s" - msgstr "Ungültiges Feld »%s«; erlaubte Felder: %s und %s oder %s,%s" - --#: ../clients/cli/connections.c:1365 ../clients/cli/connections.c:1373 -+#: ../clients/cli/connections.c:1366 ../clients/cli/connections.c:1374 - #, c-format - msgid "'%s' has to be alone" - msgstr "»%s« muss allein stehen" - --#: ../clients/cli/connections.c:1573 -+#: ../clients/cli/connections.c:1574 - #, c-format - msgid "incorrect string '%s' of '--order' option" - msgstr "Falsche Zeichenkette »%s« der Option »--order«" - --#: ../clients/cli/connections.c:1599 -+#: ../clients/cli/connections.c:1600 - #, c-format - msgid "incorrect item '%s' in '--order' option" - msgstr "Falsches Objekt »%s« der Option »--order«" - --#: ../clients/cli/connections.c:1629 -+#: ../clients/cli/connections.c:1630 - msgid "No connection specified" - msgstr "Keine Verbindung angegeben" - --#: ../clients/cli/connections.c:1644 -+#: ../clients/cli/connections.c:1645 - #, c-format - msgid "%s argument is missing" - msgstr "Argument %s fehlt" - --#: ../clients/cli/connections.c:1654 -+#: ../clients/cli/connections.c:1655 - #, c-format - msgid "unknown connection '%s'" - msgstr "Unbekannte Verbindung »%s«" - --#: ../clients/cli/connections.c:1687 -+#: ../clients/cli/connections.c:1688 - msgid "'--order' argument is missing" - msgstr "Argument »--order« fehlt" - --#: ../clients/cli/connections.c:1742 -+#: ../clients/cli/connections.c:1743 - msgid "NetworkManager active profiles" - msgstr "NetworkManager aktive Profile" - --#: ../clients/cli/connections.c:1743 -+#: ../clients/cli/connections.c:1744 - msgid "NetworkManager connection profiles" - msgstr "NetworkManager Verbindungsprofile" - --#: ../clients/cli/connections.c:1796 ../clients/cli/connections.c:2471 --#: ../clients/cli/connections.c:2483 ../clients/cli/connections.c:2495 --#: ../clients/cli/connections.c:2671 ../clients/cli/connections.c:8431 --#: ../clients/cli/connections.c:8448 ../clients/cli/devices.c:2681 -+#: ../clients/cli/connections.c:1797 ../clients/cli/connections.c:2472 -+#: ../clients/cli/connections.c:2484 ../clients/cli/connections.c:2496 -+#: ../clients/cli/connections.c:2672 ../clients/cli/connections.c:8434 -+#: ../clients/cli/connections.c:8451 ../clients/cli/devices.c:2681 - #: ../clients/cli/devices.c:2692 ../clients/cli/devices.c:2934 - #: ../clients/cli/devices.c:2945 ../clients/cli/devices.c:2963 - #: ../clients/cli/devices.c:2972 ../clients/cli/devices.c:2993 -@@ -1112,14 +1113,14 @@ msgstr "NetworkManager Verbindungsprofile" - msgid "Error: %s argument is missing." - msgstr "Fehler: Argument %s fehlt." - --#: ../clients/cli/connections.c:1815 -+#: ../clients/cli/connections.c:1816 - #, c-format - msgid "Error: %s - no such connection profile." - msgstr "Fehler: Verbindungsprofil %s existiert nicht." - --#: ../clients/cli/connections.c:1879 ../clients/cli/connections.c:2458 --#: ../clients/cli/connections.c:2522 ../clients/cli/connections.c:7941 --#: ../clients/cli/connections.c:8052 ../clients/cli/connections.c:8562 -+#: ../clients/cli/connections.c:1880 ../clients/cli/connections.c:2459 -+#: ../clients/cli/connections.c:2523 ../clients/cli/connections.c:7944 -+#: ../clients/cli/connections.c:8055 ../clients/cli/connections.c:8565 - #: ../clients/cli/devices.c:1582 ../clients/cli/devices.c:1868 - #: ../clients/cli/devices.c:2037 ../clients/cli/devices.c:2145 - #: ../clients/cli/devices.c:2334 ../clients/cli/devices.c:3590 -@@ -1128,239 +1129,239 @@ msgstr "Fehler: Verbindungsprofil %s existiert nicht." - msgid "Error: %s." - msgstr "Fehler: %s." - --#: ../clients/cli/connections.c:1977 -+#: ../clients/cli/connections.c:1978 - #, c-format - msgid "no active connection on device '%s'" - msgstr "Keine aktive Verbindung auf Gerät »%s«" - --#: ../clients/cli/connections.c:1985 -+#: ../clients/cli/connections.c:1986 - msgid "no active connection or device" - msgstr "Keine aktive Verbindung oder Gerät" - --#: ../clients/cli/connections.c:2005 -+#: ../clients/cli/connections.c:2006 - #, c-format - msgid "device '%s' not compatible with connection '%s':" - msgstr "Gerät »%s« ist nicht mit der Verbindung »%s« kompatibel:" - --#: ../clients/cli/connections.c:2041 -+#: ../clients/cli/connections.c:2042 - #, c-format - msgid "device '%s' not compatible with connection '%s'" - msgstr "Gerät »%s« ist nicht mit der Verbindung »%s« kompatibel" - --#: ../clients/cli/connections.c:2044 -+#: ../clients/cli/connections.c:2045 - #, c-format - msgid "no device found for connection '%s'" - msgstr "Für die Verbindung »%s« wurde kein Gerät gefunden" - --#: ../clients/cli/connections.c:2072 --#, fuzzy, c-format -+#: ../clients/cli/connections.c:2073 -+#, c-format - msgid "Connection successfully activated (%s) (D-Bus active path: %s)\n" --msgstr "Verbindung wurde erfolgreich aktiviert (aktiver D-Bus-Pfad: %s)\n" -+msgstr "" - --#: ../clients/cli/connections.c:2076 ../clients/cli/connections.c:2224 --#: ../clients/cli/connections.c:6249 -+#: ../clients/cli/connections.c:2077 ../clients/cli/connections.c:2225 -+#: ../clients/cli/connections.c:6250 - #, c-format - msgid "Connection successfully activated (D-Bus active path: %s)\n" - msgstr "Verbindung wurde erfolgreich aktiviert (aktiver D-Bus-Pfad: %s)\n" - --#: ../clients/cli/connections.c:2083 ../clients/cli/connections.c:2204 -+#: ../clients/cli/connections.c:2084 ../clients/cli/connections.c:2205 - #, c-format - msgid "Error: Connection activation failed: %s" - msgstr "Fehler: Aktivierung der Verbindung ist gescheitert: %s" - --#: ../clients/cli/connections.c:2119 -+#: ../clients/cli/connections.c:2120 - #, c-format - msgid "Error: Timeout expired (%d seconds)" - msgstr "Fehler: Zeitbeschränkung (%d Sekunden) ist abgelaufen." - --#: ../clients/cli/connections.c:2285 -+#: ../clients/cli/connections.c:2286 - #, c-format - msgid "failed to read passwd-file '%s': %s" - msgstr "Fehler: Lesen der passwd-Datei »%s« ist fehlgeschlagen: %s" - --#: ../clients/cli/connections.c:2297 -+#: ../clients/cli/connections.c:2298 - #, c-format - msgid "missing colon in 'password' entry '%s'" - msgstr "Fehlender Doppelpunkt im Passwort-Eintrag »%s«" - --#: ../clients/cli/connections.c:2305 -+#: ../clients/cli/connections.c:2306 - #, c-format - msgid "missing dot in 'password' entry '%s'" - msgstr "Fehlender Punkt im Passwort-Eintrag »%s«" - --#: ../clients/cli/connections.c:2318 -+#: ../clients/cli/connections.c:2319 - #, c-format - msgid "invalid setting name in 'password' entry '%s'" - msgstr "Ungültiger Einstellungsname im Passwort-Eintrag »%s«" - --#: ../clients/cli/connections.c:2374 -+#: ../clients/cli/connections.c:2375 - #, c-format - msgid "unknown device '%s'." - msgstr "Unbekanntes Gerät »%s«." - --#: ../clients/cli/connections.c:2379 -+#: ../clients/cli/connections.c:2380 - msgid "neither a valid connection nor device given" - msgstr "weder eine gültige Verbindung noch ein Gerät angegeben" - --#: ../clients/cli/connections.c:2505 ../clients/cli/devices.c:1533 -+#: ../clients/cli/connections.c:2506 ../clients/cli/devices.c:1533 - #: ../clients/cli/devices.c:2699 ../clients/cli/devices.c:3035 - #: ../clients/cli/devices.c:3644 - #, c-format - msgid "Unknown parameter: %s\n" - msgstr "Unbekannter Parameter: %s\n" - --#: ../clients/cli/connections.c:2530 -+#: ../clients/cli/connections.c:2531 - msgid "preparing" - msgstr "Vorbereitung läuft" - --#: ../clients/cli/connections.c:2550 -+#: ../clients/cli/connections.c:2551 - #, c-format - msgid "Connection '%s' (%s) successfully deleted.\n" - msgstr "Verbindung »%s« (%s) erfolgreich gelöscht.\n" - --#: ../clients/cli/connections.c:2566 -+#: ../clients/cli/connections.c:2567 - #, c-format - msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n" - msgstr "" - "Verbindung »%s« wurde erfolgreich deaktiviert (aktiver D-Bus-Pfad: %s)\n" - --#: ../clients/cli/connections.c:2647 ../clients/cli/connections.c:8167 --#: ../clients/cli/connections.c:8199 ../clients/cli/connections.c:8356 -+#: ../clients/cli/connections.c:2648 ../clients/cli/connections.c:8170 -+#: ../clients/cli/connections.c:8202 ../clients/cli/connections.c:8359 - #, c-format - msgid "Error: No connection specified." - msgstr "Fehler: Keine Verbindung angegeben." - --#: ../clients/cli/connections.c:2688 -+#: ../clients/cli/connections.c:2689 - #, c-format - msgid "Error: '%s' is not an active connection.\n" - msgstr "Fehler: »%s« ist keine aktive Verbindung.\n" - --#: ../clients/cli/connections.c:2689 -+#: ../clients/cli/connections.c:2690 - #, c-format - msgid "Error: not all active connections found." - msgstr "Fehler: Es wurden nicht alle aktiven Verbindungen gefunden." - --#: ../clients/cli/connections.c:2698 -+#: ../clients/cli/connections.c:2699 - #, c-format - msgid "Error: no active connection provided." - msgstr "Fehler: Keine aktive Verbindung angegeben." - --#: ../clients/cli/connections.c:2732 -+#: ../clients/cli/connections.c:2733 - #, c-format - msgid "Connection '%s' deactivation failed: %s\n" - msgstr "Deaktivierung der Verbindung »%s« ist gescheitert: %s\n" - --#: ../clients/cli/connections.c:2988 ../clients/cli/connections.c:3045 -+#: ../clients/cli/connections.c:2989 ../clients/cli/connections.c:3046 - #: ../clients/common/nm-client-utils.c:169 - #, c-format - msgid "'%s' not among [%s]" - msgstr "»%s« ist nicht unter [%s]" - - #. We should not really come here --#: ../clients/cli/connections.c:3008 ../clients/cli/connections.c:3068 -+#: ../clients/cli/connections.c:3009 ../clients/cli/connections.c:3069 - #: ../clients/common/nm-client-utils.c:279 - #, c-format - msgid "Unknown error" - msgstr "Unbekannter Fehler" - --#: ../clients/cli/connections.c:3202 -+#: ../clients/cli/connections.c:3203 - #, c-format - msgid "Warning: master='%s' doesn't refer to any existing profile.\n" - msgstr "Warnung: master=»%s« bezieht sich auf kein vorhandenes Profil.\n" - --#: ../clients/cli/connections.c:3539 -+#: ../clients/cli/connections.c:3540 - #, c-format - msgid "Error: invalid property '%s': %s." - msgstr "Fehler: Ungültige Eigenschaft »%s«: %s." - --#: ../clients/cli/connections.c:3556 -+#: ../clients/cli/connections.c:3557 - #, c-format - msgid "Error: failed to modify %s.%s: %s." - msgstr "Fehler: Ändern ist fehlgeschlagen %s.%s: %s." - --#: ../clients/cli/connections.c:3575 -+#: ../clients/cli/connections.c:3576 - #, c-format - msgid "Error: failed to remove a value from %s.%s: %s." - msgstr "Fehler: Entfernen eines Wertes von %s.%s: %s ist fehlgeschlagen." - --#: ../clients/cli/connections.c:3609 -+#: ../clients/cli/connections.c:3610 - #, c-format - msgid "Error: '%s' is mandatory." - msgstr "Fehler: »%s« ist zwingend erforderlich." - --#: ../clients/cli/connections.c:3636 -+#: ../clients/cli/connections.c:3637 - #, c-format - msgid "Error: invalid slave type; %s." - msgstr "Fehler: Unzulässiger Slave-Typ; %s." - --#: ../clients/cli/connections.c:3644 -+#: ../clients/cli/connections.c:3645 - #, c-format - msgid "Error: invalid connection type; %s." - msgstr "Fehler: Unbekannter Verbindungstyp: %s." - --#: ../clients/cli/connections.c:3721 -+#: ../clients/cli/connections.c:3722 - #, c-format - msgid "Error: bad connection type: %s" - msgstr "Fehler: Falscher Verbindungstyp: %s" - --#: ../clients/cli/connections.c:3767 -+#: ../clients/cli/connections.c:3768 - #, c-format - msgid "Error: '%s': %s" - msgstr "Fehler: »%s«: %s" - --#: ../clients/cli/connections.c:3788 -+#: ../clients/cli/connections.c:3789 - msgid "Error: master is required" - msgstr "Fehler: »master« ist notwendig" - --#: ../clients/cli/connections.c:3847 -+#: ../clients/cli/connections.c:3848 - #, c-format - msgid "Error: error adding bond option '%s=%s'." - msgstr "Fehler: Fehler beim Hinzufügen der bond-Option »%s=%s«." - --#: ../clients/cli/connections.c:3878 -+#: ../clients/cli/connections.c:3879 - #, c-format - msgid "Error: '%s' is not a valid monitoring mode; use '%s' or '%s'.\n" - msgstr "" - "Fehler: »%s« ist kein gültiger Überwachungsmodus; verwenden Sie »%s« oder " - "»%s«.\n" - --#: ../clients/cli/connections.c:3909 -+#: ../clients/cli/connections.c:3910 - #, c-format - msgid "Error: 'bt-type': '%s' not valid; use [%s, %s, %s (%s), %s]." - msgstr "" - "Fehler: »bt-type«: »%s« ist nicht gültig. Verwenden Sie [%s, %s, %s (%s), " - "%s]." - --#: ../clients/cli/connections.c:4158 -+#: ../clients/cli/connections.c:4159 - #, c-format - msgid "Error: value for '%s' is missing." - msgstr "Fehler: Wert für »%s« fehlt." - --#: ../clients/cli/connections.c:4204 -+#: ../clients/cli/connections.c:4205 - msgid "Error: . argument is missing." - msgstr "Fehler: Argument für Einstellung fehlt." - --#: ../clients/cli/connections.c:4227 -+#: ../clients/cli/connections.c:4228 - #, c-format - msgid "Error: invalid or not allowed setting '%s': %s." - msgstr "Fehler: Ungültige oder nicht zulässige Einstellung »%s«: %s." - --#: ../clients/cli/connections.c:4273 ../clients/cli/connections.c:4289 -+#: ../clients/cli/connections.c:4274 ../clients/cli/connections.c:4290 - #, c-format - msgid "Error: '%s' is ambiguous (%s.%s or %s.%s)." - msgstr "Fehler: '%s' ist mehrdeutig (%s.%s oder %s.%s)." - --#: ../clients/cli/connections.c:4307 -+#: ../clients/cli/connections.c:4308 - #, c-format - msgid "Error: invalid . '%s'." - msgstr "Fehler: Ungültiger Einstellungsname: »%s«." - --#: ../clients/cli/connections.c:4351 ../clients/cli/connections.c:7992 -+#: ../clients/cli/connections.c:4352 ../clients/cli/connections.c:7995 - #, c-format - msgid "Error: Failed to add '%s' connection: %s" - msgstr "Fehler: Verbindung »%s« konnte nicht hinzugefügt werden: %s" - --#: ../clients/cli/connections.c:4369 -+#: ../clients/cli/connections.c:4370 - #, c-format - msgid "" - "Warning: There is another connection with the name '%1$s'. Reference the " -@@ -1371,12 +1372,12 @@ msgid_plural "" - msgstr[0] "" - msgstr[1] "" - --#: ../clients/cli/connections.c:4378 -+#: ../clients/cli/connections.c:4379 - #, c-format - msgid "Connection '%s' (%s) successfully added.\n" - msgstr "Verbindung »%s« (%s) erfolgreich hinzugefügt.\n" - --#: ../clients/cli/connections.c:4516 -+#: ../clients/cli/connections.c:4517 - #, c-format - msgid "" - "You can specify this option more than once. Press when you're done.\n" -@@ -1385,36 +1386,36 @@ msgstr "" - "fertig sind.\n" - - #. Ask for optional arguments. --#: ../clients/cli/connections.c:4615 -+#: ../clients/cli/connections.c:4616 - #, c-format - msgid "There is %d optional setting for %s.\n" - msgid_plural "There are %d optional settings for %s.\n" - msgstr[0] "Es gibt %d optionale Einstellung für »%s«.\n" - msgstr[1] "Es gibt %d optionale Einstellungen für »%s«.\n" - --#: ../clients/cli/connections.c:4618 -+#: ../clients/cli/connections.c:4619 - #, c-format - msgid "Do you want to provide it? %s" - msgid_plural "Do you want to provide them? %s" - msgstr[0] "Möchten Sie es zur Verfügung stellen? »%s«" - msgstr[1] "Möchten Sie diese zur Verfügung stellen? »%s«" - --#: ../clients/cli/connections.c:4754 ../clients/cli/utils.c:303 -+#: ../clients/cli/connections.c:4755 ../clients/cli/utils.c:303 - #, c-format - msgid "Error: value for '%s' argument is required." - msgstr "Fehler: Ein Wert ist für den Parameter »%s« notwendig." - --#: ../clients/cli/connections.c:4760 -+#: ../clients/cli/connections.c:4761 - #, c-format - msgid "Error: 'save': %s." - msgstr "Fehler: »save«: %s." - --#: ../clients/cli/connections.c:4848 ../clients/cli/connections.c:4859 -+#: ../clients/cli/connections.c:4849 ../clients/cli/connections.c:4860 - #, c-format - msgid "Error: '%s' argument is required." - msgstr "Fehler: Das Argument »%s« ist notwendig." - --#: ../clients/cli/connections.c:5837 -+#: ../clients/cli/connections.c:5838 - #, c-format - msgid "['%s' setting values]\n" - msgstr "['%s' Werte werden gesetzt]\n" -@@ -1423,7 +1424,7 @@ msgstr "['%s' Werte werden gesetzt]\n" - #. TRANSLATORS: do not translate command names and keywords before :: - #. * However, you should translate terms enclosed in <>. - #. --#: ../clients/cli/connections.c:5916 -+#: ../clients/cli/connections.c:5917 - #, c-format - msgid "" - "---[ Main menu ]---\n" -@@ -1459,7 +1460,7 @@ msgstr "" - "nmcli :: nmcli-Konfiguration\n" - "quit :: nmcli beenden\n" - --#: ../clients/cli/connections.c:5943 -+#: ../clients/cli/connections.c:5944 - #, c-format - msgid "" - "goto [.] | :: enter setting/property for editing\n" -@@ -1479,7 +1480,7 @@ msgstr "" - " nmcli connection> goto secondaries\n" - " nmcli> goto ipv4.addresses\n" - --#: ../clients/cli/connections.c:5950 -+#: ../clients/cli/connections.c:5951 - #, c-format - msgid "" - "remove [.] :: remove setting or reset property value\n" -@@ -1501,7 +1502,7 @@ msgstr "" - "Beispiele: nmcli> remove wifi-sec\n" - " nmcli> remove eth.mtu\n" - --#: ../clients/cli/connections.c:5957 -+#: ../clients/cli/connections.c:5958 - #, c-format - msgid "" - "set [. ] :: set property value\n" -@@ -1516,7 +1517,7 @@ msgstr "" - "\n" - "Beispiel: nmcli> s con.id Meine Verbindung\n" - --#: ../clients/cli/connections.c:5962 -+#: ../clients/cli/connections.c:5963 - #, c-format - msgid "" - "describe [.] :: describe property\n" -@@ -1529,7 +1530,7 @@ msgstr "" - "Zeigt die Eigenschaftsbeschreibung. Sie können die Hilfeseite nm-settings(5) " - "zu Rate ziehen, um alle Einstellungen und Eigenschaften nachzulesen.\n" - --#: ../clients/cli/connections.c:5967 -+#: ../clients/cli/connections.c:5968 - #, c-format - msgid "" - "print [all] :: print setting or connection values\n" -@@ -1544,7 +1545,7 @@ msgstr "" - "\n" - "Beispiel: nmcli ipv4> print all\n" - --#: ../clients/cli/connections.c:5972 -+#: ../clients/cli/connections.c:5973 - #, c-format - msgid "" - "verify [all | fix] :: verify setting or connection validity\n" -@@ -1570,7 +1571,7 @@ msgstr "" - " nmcli> verify fix\n" - " nmcli bond> verify\n" - --#: ../clients/cli/connections.c:5981 -+#: ../clients/cli/connections.c:5982 - #, c-format - msgid "" - "save [persistent|temporary] :: save the connection\n" -@@ -1597,7 +1598,7 @@ msgstr "" - "Verbindung volständig löschen möchten, so muss das Verbindungsprofil\n" - "gelöscht werden.\n" - --#: ../clients/cli/connections.c:5992 -+#: ../clients/cli/connections.c:5993 - #, c-format - msgid "" - "activate [] [/|] :: activate the connection\n" -@@ -1619,7 +1620,7 @@ msgstr "" - "/| - Zugriffspunkt (WLAN) oder NSP (WiMAX) (stellen Sie " - "»/« voraus wenn nicht angegeben wird)\n" - --#: ../clients/cli/connections.c:5999 ../clients/cli/connections.c:6158 -+#: ../clients/cli/connections.c:6000 ../clients/cli/connections.c:6159 - #, c-format - msgid "" - "back :: go to upper menu level\n" -@@ -1628,7 +1629,7 @@ msgstr "" - "back :: Eine Menüebene nach oben gehen\n" - "\n" - --#: ../clients/cli/connections.c:6002 -+#: ../clients/cli/connections.c:6003 - #, c-format - msgid "" - "help/? [] :: help for the nmcli commands\n" -@@ -1637,7 +1638,7 @@ msgstr "" - "help/? [] :: Hilfe zu den nmcli-Befehlen\n" - "\n" - --#: ../clients/cli/connections.c:6005 -+#: ../clients/cli/connections.c:6006 - #, c-format - msgid "" - "nmcli [ ] :: nmcli configuration\n" -@@ -1664,7 +1665,7 @@ msgstr "" - " nmcli> nmcli save-confirmation no\n" - " nmcli> nmcli prompt-color 3\n" - --#: ../clients/cli/connections.c:6027 ../clients/cli/connections.c:6164 -+#: ../clients/cli/connections.c:6028 ../clients/cli/connections.c:6165 - #, c-format - msgid "" - "quit :: exit nmcli\n" -@@ -1677,8 +1678,8 @@ msgstr "" - "Dieser Befehl beendet nmcli. Wenn die Verbindung in Bearbeitung nicht " - "gespeichert ist wird der Benutzer gefragt, die Aktion zu bestätigen.\n" - --#: ../clients/cli/connections.c:6032 ../clients/cli/connections.c:6169 --#: ../clients/cli/connections.c:6605 ../clients/cli/connections.c:7562 -+#: ../clients/cli/connections.c:6033 ../clients/cli/connections.c:6170 -+#: ../clients/cli/connections.c:6606 ../clients/cli/connections.c:7563 - #, c-format - msgid "Unknown command: '%s'\n" - msgstr "Unbekannter Befehl: »%s«\n" -@@ -1686,7 +1687,7 @@ msgstr "Unbekannter Befehl: »%s«\n" - #. TRANSLATORS: do not translate command names and keywords before :: - #. * However, you should translate terms enclosed in <>. - #. --#: ../clients/cli/connections.c:6098 -+#: ../clients/cli/connections.c:6099 - #, c-format - msgid "" - "---[ Property menu ]---\n" -@@ -1715,7 +1716,7 @@ msgstr "" - "ausgeben\n" - "quit :: nmcli beenden\n" - --#: ../clients/cli/connections.c:6123 -+#: ../clients/cli/connections.c:6124 - #, c-format - msgid "" - "set [] :: set new value\n" -@@ -1726,7 +1727,7 @@ msgstr "" - "\n" - "Dieser Befehl setzt den für die Eigenschaft\n" - --#: ../clients/cli/connections.c:6127 -+#: ../clients/cli/connections.c:6128 - #, c-format - msgid "" - "add [] :: append new value to the property\n" -@@ -1741,7 +1742,7 @@ msgstr "" - "die Eigenschaft ein Container-Typ ist. Für einwertige Eigenschaften wird der " - "Wert ersetzt (genau wie »set«).\n" - --#: ../clients/cli/connections.c:6133 -+#: ../clients/cli/connections.c:6134 - #, c-format - msgid "" - "change :: change current value\n" -@@ -1752,7 +1753,7 @@ msgstr "" - "\n" - "Zeigt den aktuellen Wert an und lässt ihn bearbeiten.\n" - --#: ../clients/cli/connections.c:6137 -+#: ../clients/cli/connections.c:6138 - #, c-format - msgid "" - "remove [||