From 1588a14a8bfd72350390da6f836e37502ad29925 Mon Sep 17 00:00:00 2001 From: Yuri Chornoivan Date: Mon, 4 May 2015 19:10:29 +0300 Subject: [PATCH] fix typo and do not translate an empty string https://bugzilla.gnome.org/show_bug.cgi?id=748906 (cherry picked from commit f851a741a6657732e08d51ec7539a82605acfbab) Conflicts: libnm-core/nm-keyfile-reader.c --- clients/cli/settings.c | 2 +- src/nm-iface-helper.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/clients/cli/settings.c b/clients/cli/settings.c index 3ad703bd98..09916954aa 100644 --- a/clients/cli/settings.c +++ b/clients/cli/settings.c @@ -3070,7 +3070,7 @@ nmc_property_bond_allowed_options (NMSetting *setting, const char *prop) } /* --- NM_SETTING_INFINIBAND_SETTING_NAME property setter functions --- */ -/* 'mac-addresss' */ +/* 'mac-address' */ static gboolean nmc_property_ib_set_mac (NMSetting *setting, const char *prop, const char *val, GError **error) { diff --git a/src/nm-iface-helper.c b/src/nm-iface-helper.c index 46a615f095..97e1708e3c 100644 --- a/src/nm-iface-helper.c +++ b/src/nm-iface-helper.c @@ -301,7 +301,7 @@ do_early_setup (int *argc, char **argv[]) { "dhcp4-hostname", 'h', 0, G_OPTION_ARG_STRING, &global_opt.dhcp4_hostname, N_("Hostname to send to DHCP server"), N_("barbar") }, { "priority4", '\0', 0, G_OPTION_ARG_INT64, &priority64_v4, N_("Route priority for IPv4"), N_("0") }, { "priority6", '\0', 0, G_OPTION_ARG_INT64, &priority64_v6, N_("Route priority for IPv6"), N_("1024") }, - { "iid", 'e', 0, G_OPTION_ARG_STRING, &global_opt.iid_str, N_("Hex-encoded Interface Identifier"), N_("") }, + { "iid", 'e', 0, G_OPTION_ARG_STRING, &global_opt.iid_str, N_("Hex-encoded Interface Identifier"), "" }, /* Logging/debugging */ { "version", 'V', 0, G_OPTION_ARG_NONE, &global_opt.show_version, N_("Print NetworkManager version and exit"), NULL },