From b1dffe1391c3fa9b09cc41c452e5d2cbc343b941 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= Date: Fri, 25 Sep 2015 16:11:24 +0200 Subject: [PATCH] libnm-core/libnm-util: fix an erroneous error message ipv6.dns: 'this property is not allowed for '%s=%s'' not allowed for method=ignore (cherry picked from commit 12e6cf1f2053f92dee227fc2ce9ea625fed9917e) --- libnm-core/nm-setting-ip6-config.c | 1 - libnm-util/nm-setting-ip6-config.c | 1 - 2 files changed, 2 deletions(-) diff --git a/libnm-core/nm-setting-ip6-config.c b/libnm-core/nm-setting-ip6-config.c index 7e3ae4d4da..619e002ca8 100644 --- a/libnm-core/nm-setting-ip6-config.c +++ b/libnm-core/nm-setting-ip6-config.c @@ -130,7 +130,6 @@ verify (NMSetting *setting, NMConnection *connection, GError **error) g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, - _("'%s' not allowed for %s=%s"), _("this property is not allowed for '%s=%s'"), NM_SETTING_IP_CONFIG_METHOD, method); g_prefix_error (error, "%s.%s: ", NM_SETTING_IP6_CONFIG_SETTING_NAME, NM_SETTING_IP_CONFIG_DNS); diff --git a/libnm-util/nm-setting-ip6-config.c b/libnm-util/nm-setting-ip6-config.c index 4e69a0727c..b929ebace1 100644 --- a/libnm-util/nm-setting-ip6-config.c +++ b/libnm-util/nm-setting-ip6-config.c @@ -854,7 +854,6 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) g_set_error (error, NM_SETTING_IP6_CONFIG_ERROR, NM_SETTING_IP6_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD, - _("'%s' not allowed for %s=%s"), _("this property is not allowed for '%s=%s'"), NM_SETTING_IP6_CONFIG_METHOD, priv->method); g_prefix_error (error, "%s.%s: ", NM_SETTING_IP6_CONFIG_SETTING_NAME, NM_SETTING_IP6_CONFIG_DNS);