fix typo and do not translate an empty string
https://bugzilla.gnome.org/show_bug.cgi?id=748906
This commit is contained in:

committed by
Thomas Haller

parent
575d8186e4
commit
f851a741a6
@@ -3088,7 +3088,7 @@ nmc_property_bond_allowed_options (NMSetting *setting, const char *prop)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* --- NM_SETTING_INFINIBAND_SETTING_NAME property setter functions --- */
|
/* --- NM_SETTING_INFINIBAND_SETTING_NAME property setter functions --- */
|
||||||
/* 'mac-addresss' */
|
/* 'mac-address' */
|
||||||
static gboolean
|
static gboolean
|
||||||
nmc_property_ib_set_mac (NMSetting *setting, const char *prop, const char *val, GError **error)
|
nmc_property_ib_set_mac (NMSetting *setting, const char *prop, const char *val, GError **error)
|
||||||
{
|
{
|
||||||
|
@@ -166,7 +166,7 @@ build_address (KeyfileReaderInfo *info, int family, const char *address_str, gui
|
|||||||
addr = nm_ip_address_new (family, address_str, plen, &error);
|
addr = nm_ip_address_new (family, address_str, plen, &error);
|
||||||
if (!addr) {
|
if (!addr) {
|
||||||
handle_warn (info, property_name, NM_KEYFILE_WARN_SEVERITY_WARN,
|
handle_warn (info, property_name, NM_KEYFILE_WARN_SEVERITY_WARN,
|
||||||
_("ignoring invalid %s addresss: %s"),
|
_("ignoring invalid %s address: %s"),
|
||||||
family == AF_INET ? "IPv4" : "IPv6", error->message);
|
family == AF_INET ? "IPv4" : "IPv6", error->message);
|
||||||
g_error_free (error);
|
g_error_free (error);
|
||||||
}
|
}
|
||||||
|
@@ -293,7 +293,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") },
|
{ "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") },
|
{ "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") },
|
{ "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 */
|
/* Logging/debugging */
|
||||||
{ "version", 'V', 0, G_OPTION_ARG_NONE, &global_opt.show_version, N_("Print NetworkManager version and exit"), NULL },
|
{ "version", 'V', 0, G_OPTION_ARG_NONE, &global_opt.show_version, N_("Print NetworkManager version and exit"), NULL },
|
||||||
|
Reference in New Issue
Block a user