From 2fd34e1dec0ca4f9cad960f6bdc29d0da1391304 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Georg=20M=C3=BCller?= Date: Fri, 24 Jan 2025 13:41:36 +0100 Subject: [PATCH] libnm-core: fix error message if address-data parsing fails The code checks for presence of 'address' and 'prefix', so these fields should be part of the error message. https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/2118 --- po/de.po | 2 +- po/ru.po | 4 ++-- po/sl.po | 4 ++-- po/sv.po | 4 ++-- po/tr.po | 2 +- src/libnm-core-impl/nm-utils.c | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/po/de.po b/po/de.po index ae46d60e3..a2179089a 100644 --- a/po/de.po +++ b/po/de.po @@ -3588,7 +3588,7 @@ msgstr "Ein Wert wurde für »%s« erwartet\n" #: src/libnm-core-impl/nm-utils.c:2361 #, c-format -msgid "IP address requires fields \"dest\" and \"prefix\" (idx=%u)" +msgid "IP address requires fields \"address\" and \"prefix\" (idx=%u)" msgstr "" #: src/libnm-core-impl/nm-utils.c:2540 diff --git a/po/ru.po b/po/ru.po index 403541bd2..beac01bf9 100644 --- a/po/ru.po +++ b/po/ru.po @@ -3478,8 +3478,8 @@ msgstr "Ожидалось значение типа \"aa{sv}\"" #: src/libnm-core-impl/nm-utils.c:2361 #, c-format -msgid "IP address requires fields \"dest\" and \"prefix\" (idx=%u)" -msgstr "Для адреса IP необходимы поля \"dest\" и \"prefix\" (idx=%u)" +msgid "IP address requires fields \"address\" and \"prefix\" (idx=%u)" +msgstr "Для адреса IP необходимы поля \"address\" и \"prefix\" (idx=%u)" #: src/libnm-core-impl/nm-utils.c:2540 #, c-format diff --git a/po/sl.po b/po/sl.po index 7faeb539b..61f5b6edd 100644 --- a/po/sl.po +++ b/po/sl.po @@ -3662,8 +3662,8 @@ msgstr "Napaka: '%s' ni veljaven argument za možnost '%s'." #: src/libnm-core-impl/nm-utils.c:2361 #, fuzzy, c-format -msgid "IP address requires fields \"dest\" and \"prefix\" (idx=%u)" -msgstr "Naslov IP zahteva polja »dest« in »prefix« (idx=%u)" +msgid "IP address requires fields \"address\" and \"prefix\" (idx=%u)" +msgstr "Naslov IP zahteva polja »address« in »prefix« (idx=%u)" #: src/libnm-core-impl/nm-utils.c:2540 #, fuzzy, c-format diff --git a/po/sv.po b/po/sv.po index ea74c7b47..2119c897a 100644 --- a/po/sv.po +++ b/po/sv.po @@ -3341,8 +3341,8 @@ msgstr "Förväntat värde av typen \"aa{sv}\"" #: src/libnm-core-impl/nm-utils.c:2359 #, c-format -msgid "IP address requires fields \"dest\" and \"prefix\" (idx=%u)" -msgstr "IP-adressen kräver fälten \"dest\" och \"prefix\" (idx=%u)" +msgid "IP address requires fields \"address\" and \"prefix\" (idx=%u)" +msgstr "IP-adressen kräver fälten \"address\" och \"prefix\" (idx=%u)" #: src/libnm-core-impl/nm-utils.c:2538 #, c-format diff --git a/po/tr.po b/po/tr.po index 603bd35ca..194519266 100644 --- a/po/tr.po +++ b/po/tr.po @@ -3428,7 +3428,7 @@ msgstr "'%s', '%s' için geçerli bir değer değil" #: src/libnm-core-impl/nm-utils.c:2359 #, c-format -msgid "IP address requires fields \"dest\" and \"prefix\" (idx=%u)" +msgid "IP address requires fields \"address\" and \"prefix\" (idx=%u)" msgstr "" #: src/libnm-core-impl/nm-utils.c:2538 diff --git a/src/libnm-core-impl/nm-utils.c b/src/libnm-core-impl/nm-utils.c index 13ff0a5be..6528b5fbf 100644 --- a/src/libnm-core-impl/nm-utils.c +++ b/src/libnm-core-impl/nm-utils.c @@ -2358,7 +2358,7 @@ _nm_utils_ip_addresses_from_variant(GVariant *value, int family, bool strict, GE g_set_error(error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, - _("IP address requires fields \"dest\" and \"prefix\" (idx=%u)"), + _("IP address requires fields \"address\" and \"prefix\" (idx=%u)"), i); return NULL; }