cli/trivial: remove whitespace between N_ macro and parenthesis

For _() and N_() we don't have a space before the parenthesis.
Be consistent about that.

3 files changed, 129 insertions, 129 deletions

diff --git a/clients/cli/utils.h b/clients/cli/utils.h
index 996531bbf3..aacc1e3a04 100644
--- a/clients/cli/utils.h
+++ b/clients/cli/utils.h
@@ -145,7 +145,7 @@ struct _NmcMetaGenericInfo {
 #define NMC_META_GENERIC(n, ...) \
 	(&((NmcMetaGenericInfo) { \
 		.meta_type =                        &nmc_meta_type_generic_info, \
-		.name =                             N_ (n), \
+		.name =                             N_(n), \
 		__VA_ARGS__ \
 	}))
 
diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c
index 31d71f169a..1d0ea6dba5 100644
--- a/clients/common/nm-meta-setting-desc.c
+++ b/clients/common/nm-meta-setting-desc.c
@@ -955,7 +955,7 @@ _set_fcn_gobject_secret_flags (ARGS_SET_FCN)
 		flags = ALL_SECRET_FLAGS;
 		_env_warn_fcn (environment, environment_user_data,
 		               NM_META_ENV_WARN_LEVEL_WARN,
-		               N_ ("'%s' sum is higher than all flags => all flags set"),
+		               N_("'%s' sum is higher than all flags => all flags set"),
 		               value);
 	}
 
@@ -2797,7 +2797,7 @@ dcb_check_feature_enabled (const NMMetaEnvironment *environment, gpointer *envir
 	if (!(flags & NM_SETTING_DCB_FLAG_ENABLE)) {
 		_env_warn_fcn (environment, environment_user_data,
 		               NM_META_ENV_WARN_LEVEL_WARN,
-		               N_ ("changes will have no effect until '%s' includes 1 (enabled)"),
+		               N_("changes will have no effect until '%s' includes 1 (enabled)"),
 		               flags_prop);
 	}
 }
@@ -4106,7 +4106,7 @@ _remove_vlan_xgress_priority_map (const NMMetaEnvironment *environment,
 		if (prio_map[1]) {
 			_env_warn_fcn (environment, environment_user_data,
 			               NM_META_ENV_WARN_LEVEL_WARN,
-			               N_ ("only one mapping at a time is supported; taking the first one (%s)"),
+			               N_("only one mapping at a time is supported; taking the first one (%s)"),
 			               prio_map[0]);
 		}
 		ret = nm_setting_vlan_remove_priority_str_by_value (NM_SETTING_VLAN (setting),
@@ -4685,12 +4685,12 @@ _set_fcn_wireless_wep_key (ARGS_SET_FCN)
 	idx = property_info->property_name[strlen (property_info->property_name) - 1] - '0';
 	_env_warn_fcn (environment, environment_user_data,
 	               NM_META_ENV_WARN_LEVEL_INFO,
-	               N_ ("WEP key is guessed to be of '%s'"),
+	               N_("WEP key is guessed to be of '%s'"),
 	               wep_key_type_to_string (guessed_type));
 	if (idx != prev_idx) {
 		_env_warn_fcn (environment, environment_user_data,
 		               NM_META_ENV_WARN_LEVEL_INFO,
-		               N_ ("WEP key index set to '%d'"),
+		               N_("WEP key index set to '%d'"),
 		               idx);
 	}
 
@@ -4739,7 +4739,7 @@ _set_fcn_wireless_security_wep_key_type (ARGS_SET_FCN)
 			if (key && !nm_utils_wep_key_valid (key, type)) {
 				_env_warn_fcn (environment, environment_user_data,
 				               NM_META_ENV_WARN_LEVEL_WARN,
-				               N_ ("'%s' is not compatible with '%s' type, please change or delete the key."),
+				               N_("'%s' is not compatible with '%s' type, please change or delete the key."),
 				               keynames[i], wep_key_type_to_string (type));
 			}
 		}
@@ -4937,8 +4937,8 @@ static const NMMetaPropertyType _pt_gobject_devices = {
 	{ \
 		.meta_type =                    &nm_meta_type_property_info, \
 		.setting_info =                 &nm_meta_setting_infos_editor[_CURRENT_NM_META_SETTING_TYPE], \
-		.property_name =                N_ (name), \
-		.describe_doc =                 N_ (doc), \
+		.property_name =                N_(name), \
+		.describe_doc =                 N_(doc), \
 		__VA_ARGS__ \
 	}
 
@@ -4993,10 +4993,10 @@ static const NMMetaPropertyInfo *const property_infos_802_1X[] = {
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_CA_CERT,
 		.describe_message =
-		    N_ ("Enter file path to CA certificate (optionally prefixed with file://).\n"
-		        "  [file://]<file path>\n"
-		        "Note that nmcli does not support specifying certificates as raw blob data.\n"
-		        "Example: /home/cimrman/cacert.crt\n"),
+		    N_("Enter file path to CA certificate (optionally prefixed with file://).\n"
+		       "  [file://]<file path>\n"
+		       "Note that nmcli does not support specifying certificates as raw blob data.\n"
+		       "Example: /home/cimrman/cacert.crt\n"),
 		.property_type = DEFINE_PROPERTY_TYPE (
 			.get_fcn =                  _get_fcn_802_1x_ca_cert,
 			.set_fcn =                  _set_fcn_802_1x_ca_cert,
@@ -5027,10 +5027,10 @@ static const NMMetaPropertyInfo *const property_infos_802_1X[] = {
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_CLIENT_CERT,
 		.describe_message =
-		    N_ ("Enter file path to client certificate (optionally prefixed with file://).\n"
-		         "  [file://]<file path>\n"
-		         "Note that nmcli does not support specifying certificates as raw blob data.\n"
-		         "Example: /home/cimrman/jara.crt\n"),
+		    N_("Enter file path to client certificate (optionally prefixed with file://).\n"
+		       "  [file://]<file path>\n"
+		       "Note that nmcli does not support specifying certificates as raw blob data.\n"
+		       "Example: /home/cimrman/jara.crt\n"),
 		.property_type = DEFINE_PROPERTY_TYPE (
 			.get_fcn =                  _get_fcn_802_1x_client_cert,
 			.set_fcn =                  _set_fcn_802_1x_client_cert,
@@ -5084,11 +5084,11 @@ static const NMMetaPropertyInfo *const property_infos_802_1X[] = {
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_PHASE2_CA_CERT,
 		.describe_message =
-		    N_ ("Enter file path to CA certificate for inner authentication (optionally prefixed\n"
-		        "with file://).\n"
-		        "  [file://]<file path>\n"
-		        "Note that nmcli does not support specifying certificates as raw blob data.\n"
-		        "Example: /home/cimrman/ca-zweite-phase.crt\n"),
+		    N_("Enter file path to CA certificate for inner authentication (optionally prefixed\n"
+		       "with file://).\n"
+		       "  [file://]<file path>\n"
+		       "Note that nmcli does not support specifying certificates as raw blob data.\n"
+		       "Example: /home/cimrman/ca-zweite-phase.crt\n"),
 		.property_type = DEFINE_PROPERTY_TYPE (
 			.get_fcn =                  _get_fcn_802_1x_phase2_ca_cert,
 			.set_fcn =                  _set_fcn_802_1x_phase2_ca_cert,
@@ -5119,11 +5119,11 @@ static const NMMetaPropertyInfo *const property_infos_802_1X[] = {
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_PHASE2_CLIENT_CERT,
 		.describe_message =
-		    N_ ("Enter file path to client certificate for inner authentication (optionally prefixed\n"
-		        "with file://).\n"
-		        "  [file://]<file path>\n"
-		        "Note that nmcli does not support specifying certificates as raw blob data.\n"
-		        "Example: /home/cimrman/jara-zweite-phase.crt\n"),
+		    N_("Enter file path to client certificate for inner authentication (optionally prefixed\n"
+		       "with file://).\n"
+		       "  [file://]<file path>\n"
+		       "Note that nmcli does not support specifying certificates as raw blob data.\n"
+		       "Example: /home/cimrman/jara-zweite-phase.crt\n"),
 		.property_type = DEFINE_PROPERTY_TYPE (
 			.get_fcn =                  _get_fcn_802_1x_phase2_client_cert,
 			.set_fcn =                  _set_fcn_802_1x_phase2_client_cert,
@@ -5146,13 +5146,13 @@ static const NMMetaPropertyInfo *const property_infos_802_1X[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_PASSWORD_RAW,
 		.is_secret =                    TRUE,
 		.describe_message =
-		    N_ ("Enter bytes as a list of hexadecimal values.\n"
-		        "Two formats are accepted:\n"
-		        "(a) a string of hexadecimal digits, where each two digits represent one byte\n"
-		        "(b) space-separated list of bytes written as hexadecimal digits "
-		        "(with optional 0x/0X prefix, and optional leading 0).\n\n"
-		        "Examples: ab0455a6ea3a74C2\n"
-		        "          ab 4 55 0xa6 ea 3a 74 C2\n"),
+		    N_("Enter bytes as a list of hexadecimal values.\n"
+		       "Two formats are accepted:\n"
+		       "(a) a string of hexadecimal digits, where each two digits represent one byte\n"
+		       "(b) space-separated list of bytes written as hexadecimal digits "
+		       "(with optional 0x/0X prefix, and optional leading 0).\n\n"
+		       "Examples: ab0455a6ea3a74C2\n"
+		       "          ab 4 55 0xa6 ea 3a 74 C2\n"),
 		.property_type = DEFINE_PROPERTY_TYPE (
 			.get_fcn =                  _get_fcn_802_1x_password_raw,
 			.set_fcn =                  _set_fcn_802_1x_password_raw,
@@ -5163,10 +5163,10 @@ static const NMMetaPropertyInfo *const property_infos_802_1X[] = {
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_PRIVATE_KEY,
 		.describe_message =
-		    N_ ("Enter path to a private key and the key password (if not set yet):\n"
-		        "  [file://]<file path> [<password>]\n"
-		        "Note that nmcli does not support specifying private key as raw blob data.\n"
-		        "Example: /home/cimrman/jara-priv-key Dardanely\n"),
+		    N_("Enter path to a private key and the key password (if not set yet):\n"
+		       "  [file://]<file path> [<password>]\n"
+		       "Note that nmcli does not support specifying private key as raw blob data.\n"
+		       "Example: /home/cimrman/jara-priv-key Dardanely\n"),
 		.property_type = DEFINE_PROPERTY_TYPE (
 			.get_fcn =                  _get_fcn_802_1x_private_key,
 			.set_fcn =                  _set_fcn_802_1x_private_key,
@@ -5181,10 +5181,10 @@ static const NMMetaPropertyInfo *const property_infos_802_1X[] = {
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_PHASE2_PRIVATE_KEY,
 		.describe_message =
-		    N_ ("Enter path to a private key and the key password (if not set yet):\n"
-		        "  [file://]<file path> [<password>]\n"
-		        "Note that nmcli does not support specifying private key as raw blob data.\n"
-		        "Example: /home/cimrman/jara-priv-key Dardanely\n"),
+		    N_("Enter path to a private key and the key password (if not set yet):\n"
+		       "  [file://]<file path> [<password>]\n"
+		       "Note that nmcli does not support specifying private key as raw blob data.\n"
+		       "Example: /home/cimrman/jara-priv-key Dardanely\n"),
 		.property_type = DEFINE_PROPERTY_TYPE (
 			.get_fcn =                  _get_fcn_802_1x_phase2_private_key,
 			.set_fcn =                  _set_fcn_802_1x_phase2_private_key,
@@ -5481,10 +5481,10 @@ static const NMMetaPropertyInfo *const property_infos_CONNECTION[] = {
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_CONNECTION_PERMISSIONS,
 		.describe_message =
-		     N_ ("Enter a list of user permissions. This is a list of user names formatted as:\n"
-		         "  [user:]<user name 1>, [user:]<user name 2>,...\n"
-		         "The items can be separated by commas or spaces.\n\n"
-		         "Example: alice bob charlie\n"),
+		     N_("Enter a list of user permissions. This is a list of user names formatted as:\n"
+		        "  [user:]<user name 1>, [user:]<user name 2>,...\n"
+		        "The items can be separated by commas or spaces.\n\n"
+		        "Example: alice bob charlie\n"),
 		.property_type = DEFINE_PROPERTY_TYPE (
 			.get_fcn =                  _get_fcn_connection_permissions,
 			.set_fcn =                  _set_fcn_connection_permissions,
@@ -5524,12 +5524,12 @@ static const NMMetaPropertyInfo *const property_infos_CONNECTION[] = {
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_CONNECTION_SECONDARIES,
 		.describe_message =
-		    N_ ("Enter secondary connections that should be activated when this connection is\n"
-		         "activated. Connections can be specified either by UUID or ID (name). nmcli\n"
-		         "transparently translates names to UUIDs. Note that NetworkManager only supports\n"
-		         "VPNs as secondary connections at the moment.\n"
-		         "The items can be separated by commas or spaces.\n\n"
-		         "Example: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"),
+		    N_("Enter secondary connections that should be activated when this connection is\n"
+		       "activated. Connections can be specified either by UUID or ID (name). nmcli\n"
+		       "transparently translates names to UUIDs. Note that NetworkManager only supports\n"
+		       "VPNs as secondary connections at the moment.\n"
+		       "The items can be separated by commas or spaces.\n\n"
+		       "Example: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"),
 		.property_type = DEFINE_PROPERTY_TYPE (
 			.get_fcn =                  _get_fcn_gobject,
 			.set_fcn =                  _set_fcn_connection_secondaries,
@@ -5541,11 +5541,11 @@ static const NMMetaPropertyInfo *const property_infos_CONNECTION[] = {
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_CONNECTION_METERED,
 		.describe_message =
-		    N_ ("Enter a value which indicates whether the connection is subject to a data\n"
-		        "quota, usage costs or other limitations. Accepted options are:\n"
-		        "'true','yes','on' to set the connection as metered\n"
-		        "'false','no','off' to set the connection as not metered\n"
-		        "'unknown' to let NetworkManager choose a value using some heuristics\n"),
+		    N_("Enter a value which indicates whether the connection is subject to a data\n"
+		       "quota, usage costs or other limitations. Accepted options are:\n"
+		       "'true','yes','on' to set the connection as metered\n"
+		       "'false','no','off' to set the connection as not metered\n"
+		       "'unknown' to let NetworkManager choose a value using some heuristics\n"),
 		.property_type = DEFINE_PROPERTY_TYPE (
 			.get_fcn =                  _get_fcn_connection_metered,
 			.set_fcn =                  _set_fcn_connection_metered,
@@ -5799,8 +5799,8 @@ static const NMMetaPropertyInfo *const property_infos_IP4_CONFIG[] = {
 	),
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_DNS, DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS,
 		.describe_message =
-		    N_ ("Enter a list of IPv4 addresses of DNS servers.\n\n"
-		        "Example: 8.8.8.8, 8.8.4.4\n"),
+		    N_("Enter a list of IPv4 addresses of DNS servers.\n\n"
+		       "Example: 8.8.8.8, 8.8.4.4\n"),
 		.property_type = DEFINE_PROPERTY_TYPE (
 			.get_fcn =                  _get_fcn_gobject,
 			.set_fcn =                  _set_fcn_ip4_config_dns,
@@ -5833,10 +5833,10 @@ static const NMMetaPropertyInfo *const property_infos_IP4_CONFIG[] = {
 		.inf_flags =                    NM_META_PROPERTY_INF_FLAG_MULTI,
 		.prompt =                       N_("IPv4 address (IP[/plen]) [none]"),
 		.describe_message =
-		    N_ ("Enter a list of IPv4 addresses formatted as:\n"
-		        "  ip[/prefix], ip[/prefix],...\n"
-		        "Missing prefix is regarded as prefix of 32.\n\n"
-		        "Example: 192.168.1.5/24, 10.0.0.11/24\n"),
+		    N_("Enter a list of IPv4 addresses formatted as:\n"
+		       "  ip[/prefix], ip[/prefix],...\n"
+		       "Missing prefix is regarded as prefix of 32.\n\n"
+		       "Example: 192.168.1.5/24, 10.0.0.11/24\n"),
 		.property_type = DEFINE_PROPERTY_TYPE (
 			.get_fcn =                  _get_fcn_ip_config_addresses,
 			.set_fcn =                  _set_fcn_ip4_config_addresses,
@@ -5854,13 +5854,13 @@ static const NMMetaPropertyInfo *const property_infos_IP4_CONFIG[] = {
 	),
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_ROUTES, DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_ROUTES,
 		.describe_message =
-		    N_ ("Enter a list of IPv4 routes formatted as:\n"
-		         "  ip[/prefix] [next-hop] [metric],...\n\n"
-		         "Missing prefix is regarded as a prefix of 32.\n"
-		         "Missing next-hop is regarded as 0.0.0.0.\n"
-		         "Missing metric means default (NM/kernel will set a default value).\n\n"
-		         "Examples: 192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n"
-		         "          10.1.2.0/24\n"),
+		    N_("Enter a list of IPv4 routes formatted as:\n"
+		       "  ip[/prefix] [next-hop] [metric],...\n\n"
+		       "Missing prefix is regarded as a prefix of 32.\n"
+		       "Missing next-hop is regarded as 0.0.0.0.\n"
+		       "Missing metric means default (NM/kernel will set a default value).\n\n"
+		       "Examples: 192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n"
+		       "          10.1.2.0/24\n"),
 		.property_type = DEFINE_PROPERTY_TYPE (
 			.get_fcn =                  _get_fcn_ip_config_routes,
 			.set_fcn =                  _set_fcn_ip4_config_routes,
@@ -5920,14 +5920,14 @@ static const NMMetaPropertyInfo *const property_infos_IP6_CONFIG[] = {
 	),
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_DNS, DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS,
 		.describe_message =
-		    N_ ("Enter a list of IPv6 addresses of DNS servers.  If the IPv6 "
-		        "configuration method is 'auto' these DNS servers are appended "
-		        "to those (if any) returned by automatic configuration.  DNS "
-		        "servers cannot be used with the 'shared' or 'link-local' IPv6 "
-		        "configuration methods, as there is no upstream network. In "
-		        "all other IPv6 configuration methods, these DNS "
-		        "servers are used as the only DNS servers for this connection.\n\n"
-		        "Example: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"),
+		    N_("Enter a list of IPv6 addresses of DNS servers.  If the IPv6 "
+		       "configuration method is 'auto' these DNS servers are appended "
+		       "to those (if any) returned by automatic configuration.  DNS "
+		       "servers cannot be used with the 'shared' or 'link-local' IPv6 "
+		       "configuration methods, as there is no upstream network. In "
+		       "all other IPv6 configuration methods, these DNS "
+		       "servers are used as the only DNS servers for this connection.\n\n"
+		       "Example: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"),
 		.property_type = DEFINE_PROPERTY_TYPE (
 			.get_fcn =                  _get_fcn_gobject,
 			.set_fcn =                  _set_fcn_ip6_config_dns,
@@ -5960,10 +5960,10 @@ static const NMMetaPropertyInfo *const property_infos_IP6_CONFIG[] = {
 		.inf_flags =                    NM_META_PROPERTY_INF_FLAG_MULTI,
 		.prompt =                       N_("IPv6 address (IP[/plen]) [none]"),
 		.describe_message =
-		    N_ ("Enter a list of IPv6 addresses formatted as:\n"
-		        "  ip[/prefix], ip[/prefix],...\n"
-		        "Missing prefix is regarded as prefix of 128.\n\n"
-		        "Example: 2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"),
+		    N_("Enter a list of IPv6 addresses formatted as:\n"
+		       "  ip[/prefix], ip[/prefix],...\n"
+		       "Missing prefix is regarded as prefix of 128.\n\n"
+		       "Example: 2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"),
 		.property_type = DEFINE_PROPERTY_TYPE (
 			.get_fcn =                  _get_fcn_ip_config_addresses,
 			.set_fcn =                  _set_fcn_ip6_config_addresses,
@@ -5981,13 +5981,13 @@ static const NMMetaPropertyInfo *const property_infos_IP6_CONFIG[] = {
 	),
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_ROUTES, DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_ROUTES,
 		.describe_message =
-		    N_ ("Enter a list of IPv6 routes formatted as:\n"
-		        "  ip[/prefix] [next-hop] [metric],...\n\n"
-		        "Missing prefix is regarded as a prefix of 128.\n"
-		        "Missing next-hop is regarded as \"::\".\n"
-		        "Missing metric means default (NM/kernel will set a default value).\n\n"
-		         "Examples: 2001:db8:beef:2::/64 2001:db8:beef::2, 2001:db8:beef:3::/64 2001:db8:beef::3 2\n"
-		        "          abbe::/64 55\n"),
+		    N_("Enter a list of IPv6 routes formatted as:\n"
+		       "  ip[/prefix] [next-hop] [metric],...\n\n"
+		       "Missing prefix is regarded as a prefix of 128.\n"
+		       "Missing next-hop is regarded as \"::\".\n"
+		       "Missing metric means default (NM/kernel will set a default value).\n\n"
+		       "Examples: 2001:db8:beef:2::/64 2001:db8:beef::2, 2001:db8:beef:3::/64 2001:db8:beef::3 2\n"
+		       "          abbe::/64 55\n"),
 		.property_type = DEFINE_PROPERTY_TYPE (
 			.get_fcn =                  _get_fcn_ip_config_routes,
 			.set_fcn =                  _set_fcn_ip6_config_routes,
@@ -6379,7 +6379,7 @@ static const NMMetaPropertyInfo *const property_infos_TEAM[] = {
 		.is_cli_option =                TRUE,
 		.property_alias =               "config",
 		.prompt =                       N_("Team JSON configuration [none]"),
-		.describe_message =             N_ (TEAM_DESCRIBE_MESSAGE),
+		.describe_message =             N_(TEAM_DESCRIBE_MESSAGE),
 		.property_type = DEFINE_PROPERTY_TYPE (
 			.get_fcn =                  _get_fcn_gobject,
 			.set_fcn =                  _set_fcn_team_config,
@@ -6395,7 +6395,7 @@ static const NMMetaPropertyInfo *const property_infos_TEAM_PORT[] = {
 		.is_cli_option =                TRUE,
 		.property_alias =               "config",
 		.prompt =                       N_("Team JSON configuration [none]"),
-		.describe_message =             N_ (TEAM_DESCRIBE_MESSAGE),
+		.describe_message =             N_(TEAM_DESCRIBE_MESSAGE),
 		.property_type = DEFINE_PROPERTY_TYPE (
 			.get_fcn =                  _get_fcn_gobject,
 			.set_fcn =                  _set_fcn_team_config,
@@ -6725,8 +6725,8 @@ static const NMMetaPropertyInfo *const property_infos_WIRED[] = {
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRED_S390_SUBCHANNELS,
 		.describe_message =
-		    N_ ("Enter a list of subchannels (comma or space separated).\n\n"
-		        "Example: 0.0.0e20 0.0.0e21 0.0.0e22\n"),
+		    N_("Enter a list of subchannels (comma or space separated).\n\n"
+		       "Example: 0.0.0e20 0.0.0e21 0.0.0e22\n"),
 		.property_type = DEFINE_PROPERTY_TYPE (
 			.get_fcn =                  _get_fcn_gobject,
 			.set_fcn =                  _set_fcn_wired_s390_subchannels,
@@ -6949,8 +6949,8 @@ static const NMMetaPropertyInfo *const property_infos_WIRELESS_SECURITY[] = {
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE,
 		.describe_message =
-		    N_ ("Enter the type of WEP keys. The accepted values are: "
-		        "0 or unknown, 1 or key, and 2 or passphrase.\n"),
+		    N_("Enter the type of WEP keys. The accepted values are: "
+		       "0 or unknown, 1 or key, and 2 or passphrase.\n"),
 		.property_type = DEFINE_PROPERTY_TYPE (
 			.get_fcn =                  _get_fcn_wireless_security_wep_key_type,
 			.set_fcn =                  _set_fcn_wireless_security_wep_key_type,
diff --git a/shared/nm-meta-setting.c b/shared/nm-meta-setting.c
index 1294a24d98..8ab4e7a2fd 100644
--- a/shared/nm-meta-setting.c
+++ b/shared/nm-meta-setting.c
@@ -142,172 +142,172 @@ const NMSetting8021xSchemeVtable nm_setting_8021x_scheme_vtable[] = {
 const NMMetaSettingInfo nm_meta_setting_infos[] = {
 	[NM_META_SETTING_TYPE_802_1X] = {
 		.meta_type =                NM_META_SETTING_TYPE_802_1X,
-		.setting_name =             N_ (NM_SETTING_802_1X_SETTING_NAME),
+		.setting_name =             N_(NM_SETTING_802_1X_SETTING_NAME),
 		.get_setting_gtype =        nm_setting_802_1x_get_type,
 	},
 	[NM_META_SETTING_TYPE_ADSL] = {
 		.meta_type =                NM_META_SETTING_TYPE_ADSL,
-		.setting_name =             N_ (NM_SETTING_ADSL_SETTING_NAME),
+		.setting_name =             N_(NM_SETTING_ADSL_SETTING_NAME),
 		.get_setting_gtype =        nm_setting_adsl_get_type,
 	},
 	[NM_META_SETTING_TYPE_BLUETOOTH] = {
 		.meta_type =                NM_META_SETTING_TYPE_BLUETOOTH,
-		.setting_name =             N_ (NM_SETTING_BLUETOOTH_SETTING_NAME),
+		.setting_name =             N_(NM_SETTING_BLUETOOTH_SETTING_NAME),
 		.get_setting_gtype =        nm_setting_bluetooth_get_type,
 	},
 	[NM_META_SETTING_TYPE_BOND] = {
 		.meta_type =                NM_META_SETTING_TYPE_BOND,
-		.setting_name =             N_ (NM_SETTING_BOND_SETTING_NAME),
+		.setting_name =             N_(NM_SETTING_BOND_SETTING_NAME),
 		.get_setting_gtype =        nm_setting_bond_get_type,
 	},
 	[NM_META_SETTING_TYPE_BRIDGE] = {
 		.meta_type =                NM_META_SETTING_TYPE_BRIDGE,
-		.setting_name =             N_ (NM_SETTING_BRIDGE_SETTING_NAME),
+		.setting_name =             N_(NM_SETTING_BRIDGE_SETTING_NAME),
 		.get_setting_gtype =        nm_setting_bridge_get_type,
 	},
 	[NM_META_SETTING_TYPE_BRIDGE_PORT] = {
 		.meta_type =                NM_META_SETTING_TYPE_BRIDGE_PORT,
-		.setting_name =             N_ (NM_SETTING_BRIDGE_PORT_SETTING_NAME),
+		.setting_name =             N_(NM_SETTING_BRIDGE_PORT_SETTING_NAME),
 		.get_setting_gtype =        nm_setting_bridge_port_get_type,
 	},
 	[NM_META_SETTING_TYPE_CDMA] = {
 		.meta_type =                NM_META_SETTING_TYPE_CDMA,
-		.setting_name =             N_ (NM_SETTING_CDMA_SETTING_NAME),
+		.setting_name =             N_(NM_SETTING_CDMA_SETTING_NAME),
 		.get_setting_gtype =        nm_setting_cdma_get_type,
 	},
 	[NM_META_SETTING_TYPE_CONNECTION] = {
 		.meta_type =                NM_META_SETTING_TYPE_CONNECTION,
-		.setting_name =             N_ (NM_SETTING_CONNECTION_SETTING_NAME),
+		.setting_name =             N_(NM_SETTING_CONNECTION_SETTING_NAME),
 		.get_setting_gtype =        nm_setting_connection_get_type,
 	},
 	[NM_META_SETTING_TYPE_DCB] = {
 		.meta_type =                NM_META_SETTING_TYPE_DCB,
-		.setting_name =             N_ (NM_SETTING_DCB_SETTING_NAME),
+		.setting_name =             N_(NM_SETTING_DCB_SETTING_NAME),
 		.get_setting_gtype =        nm_setting_dcb_get_type,
 	},
 	[NM_META_SETTING_TYPE_DUMMY] = {
 		.meta_type =                NM_META_SETTING_TYPE_DUMMY,
-		.setting_name =             N_ (NM_SETTING_DUMMY_SETTING_NAME),
+		.setting_name =             N_(NM_SETTING_DUMMY_SETTING_NAME),
 		.get_setting_gtype =        nm_setting_dummy_get_type,
 	},
 	[NM_META_SETTING_TYPE_GENERIC] = {
 		.meta_type =                NM_META_SETTING_TYPE_GENERIC,
-		.setting_name =             N_ (NM_SETTING_GENERIC_SETTING_NAME),
+		.setting_name =             N_(NM_SETTING_GENERIC_SETTING_NAME),
 		.get_setting_gtype =        nm_setting_generic_get_type,
 	},
 	[NM_META_SETTING_TYPE_GSM] = {
 		.meta_type =                NM_META_SETTING_TYPE_GSM,
-		.setting_name =             N_ (NM_SETTING_GSM_SETTING_NAME),
+		.setting_name =             N_(NM_SETTING_GSM_SETTING_NAME),
 		.get_setting_gtype =        nm_setting_gsm_get_type,
 	},
 	[NM_META_SETTING_TYPE_INFINIBAND] = {
 		.meta_type =                NM_META_SETTING_TYPE_INFINIBAND,
-		.setting_name =             N_ (NM_SETTING_INFINIBAND_SETTING_NAME),
+		.setting_name =             N_(NM_SETTING_INFINIBAND_SETTING_NAME),
 		.get_setting_gtype =        nm_setting_infiniband_get_type,
 	},
 	[NM_META_SETTING_TYPE_IP4_CONFIG] = {
 		.meta_type =                NM_META_SETTING_TYPE_IP4_CONFIG,
-		.setting_name =             N_ (NM_SETTING_IP4_CONFIG_SETTING_NAME),
+		.setting_name =             N_(NM_SETTING_IP4_CONFIG_SETTING_NAME),
 		.get_setting_gtype =        nm_setting_ip4_config_get_type,
 	},
 	[NM_META_SETTING_TYPE_IP6_CONFIG] = {
 		.meta_type =                NM_META_SETTING_TYPE_IP6_CONFIG,
-		.setting_name =             N_ (NM_SETTING_IP6_CONFIG_SETTING_NAME),
+		.setting_name =             N_(NM_SETTING_IP6_CONFIG_SETTING_NAME),
 		.get_setting_gtype =        nm_setting_ip6_config_get_type,
 	},
 	[NM_META_SETTING_TYPE_IP_TUNNEL] = {
 		.meta_type =                NM_META_SETTING_TYPE_IP_TUNNEL,
-		.setting_name =             N_ (NM_SETTING_IP_TUNNEL_SETTING_NAME),
+		.setting_name =             N_(NM_SETTING_IP_TUNNEL_SETTING_NAME),
 		.get_setting_gtype =        nm_setting_ip_tunnel_get_type,
 	},
 	[NM_META_SETTING_TYPE_MACSEC] = {
 		.meta_type =                NM_META_SETTING_TYPE_MACSEC,
-		.setting_name =             N_ (NM_SETTING_MACSEC_SETTING_NAME),
+		.setting_name =             N_(NM_SETTING_MACSEC_SETTING_NAME),
 		.get_setting_gtype =        nm_setting_macsec_get_type,
 	},
 	[NM_META_SETTING_TYPE_MACVLAN] = {
 		.meta_type =                NM_META_SETTING_TYPE_MACVLAN,
-		.setting_name =             N_ (NM_SETTING_MACVLAN_SETTING_NAME),
+		.setting_name =             N_(NM_SETTING_MACVLAN_SETTING_NAME),
 		.get_setting_gtype =        nm_setting_macvlan_get_type,
 	},
 	[NM_META_SETTING_TYPE_OLPC_MESH] = {
 		.meta_type =                NM_META_SETTING_TYPE_OLPC_MESH,
-		.setting_name =             N_ (NM_SETTING_OLPC_MESH_SETTING_NAME),
+		.setting_name =             N_(NM_SETTING_OLPC_MESH_SETTING_NAME),
 		.get_setting_gtype =        nm_setting_olpc_mesh_get_type,
 	},
 	[NM_META_SETTING_TYPE_PPPOE] = {
 		.meta_type =                NM_META_SETTING_TYPE_PPPOE,
-		.setting_name =             N_ (NM_SETTING_PPPOE_SETTING_NAME),
+		.setting_name =             N_(NM_SETTING_PPPOE_SETTING_NAME),
 		.get_setting_gtype =        nm_setting_pppoe_get_type,
 	},
 	[NM_META_SETTING_TYPE_PPP] = {
 		.meta_type =                NM_META_SETTING_TYPE_PPP,
-		.setting_name =             N_ (NM_SETTING_PPP_SETTING_NAME),
+		.setting_name =             N_(NM_SETTING_PPP_SETTING_NAME),
 		.get_setting_gtype =        nm_setting_ppp_get_type,
 	},
 	[NM_META_SETTING_TYPE_PROXY] = {
 		.meta_type =                NM_META_SETTING_TYPE_PROXY,
-		.setting_name =             N_ (NM_SETTING_PROXY_SETTING_NAME),
+		.setting_name =             N_(NM_SETTING_PROXY_SETTING_NAME),
 		.get_setting_gtype =        nm_setting_proxy_get_type,
 	},
 	[NM_META_SETTING_TYPE_SERIAL] = {
 		.meta_type =                NM_META_SETTING_TYPE_SERIAL,
-		.setting_name =             N_ (NM_SETTING_SERIAL_SETTING_NAME),
+		.setting_name =             N_(NM_SETTING_SERIAL_SETTING_NAME),
 		.get_setting_gtype =        nm_setting_serial_get_type,
 	},
 	[NM_META_SETTING_TYPE_TEAM] = {
 		.meta_type =                NM_META_SETTING_TYPE_TEAM,
-		.setting_name =             N_ (NM_SETTING_TEAM_SETTING_NAME),
+		.setting_name =             N_(NM_SETTING_TEAM_SETTING_NAME),
 		.get_setting_gtype =        nm_setting_team_get_type,
 	},
 	[NM_META_SETTING_TYPE_TEAM_PORT] = {
 		.meta_type =                NM_META_SETTING_TYPE_TEAM_PORT,
-		.setting_name =             N_ (NM_SETTING_TEAM_PORT_SETTING_NAME),
+		.setting_name =             N_(NM_SETTING_TEAM_PORT_SETTING_NAME),
 		.get_setting_gtype =        nm_setting_team_port_get_type,
 	},
 	[NM_META_SETTING_TYPE_TUN] = {
 		.meta_type =                NM_META_SETTING_TYPE_TUN,
-		.setting_name =             N_ (NM_SETTING_TUN_SETTING_NAME),
+		.setting_name =             N_(NM_SETTING_TUN_SETTING_NAME),
 		.get_setting_gtype =        nm_setting_tun_get_type,
 	},
 	[NM_META_SETTING_TYPE_USER] = {
 		.meta_type =                NM_META_SETTING_TYPE_USER,
-		.setting_name =             N_ (NM_SETTING_USER_SETTING_NAME),
+		.setting_name =             N_(NM_SETTING_USER_SETTING_NAME),
 		.get_setting_gtype =        nm_setting_user_get_type,
 	},
 	[NM_META_SETTING_TYPE_VLAN] = {
 		.meta_type =                NM_META_SETTING_TYPE_VLAN,
-		.setting_name =             N_ (NM_SETTING_VLAN_SETTING_NAME),
+		.setting_name =             N_(NM_SETTING_VLAN_SETTING_NAME),
 		.get_setting_gtype =        nm_setting_vlan_get_type,
 	},
 	[NM_META_SETTING_TYPE_VPN] = {
 		.meta_type =                NM_META_SETTING_TYPE_VPN,
-		.setting_name =             N_ (NM_SETTING_VPN_SETTING_NAME),
+		.setting_name =             N_(NM_SETTING_VPN_SETTING_NAME),
 		.get_setting_gtype =        nm_setting_vpn_get_type,
 	},
 	[NM_META_SETTING_TYPE_VXLAN] = {
 		.meta_type =                NM_META_SETTING_TYPE_VXLAN,
-		.setting_name =             N_ (NM_SETTING_VXLAN_SETTING_NAME),
+		.setting_name =             N_(NM_SETTING_VXLAN_SETTING_NAME),
 		.get_setting_gtype =        nm_setting_vxlan_get_type,
 	},
 	[NM_META_SETTING_TYPE_WIMAX] = {
 		.meta_type =                NM_META_SETTING_TYPE_WIMAX,
-		.setting_name =             N_ (NM_SETTING_WIMAX_SETTING_NAME),
+		.setting_name =             N_(NM_SETTING_WIMAX_SETTING_NAME),
 		.get_setting_gtype =        nm_setting_wimax_get_type,
 	},
 	[NM_META_SETTING_TYPE_WIRED] = {
 		.meta_type =                NM_META_SETTING_TYPE_WIRED,
-		.setting_name =             N_ (NM_SETTING_WIRED_SETTING_NAME),
+		.setting_name =             N_(NM_SETTING_WIRED_SETTING_NAME),
 		.get_setting_gtype =        nm_setting_wired_get_type,
 	},
 	[NM_META_SETTING_TYPE_WIRELESS] = {
 		.meta_type =                NM_META_SETTING_TYPE_WIRELESS,
-		.setting_name =             N_ (NM_SETTING_WIRELESS_SETTING_NAME),
+		.setting_name =             N_(NM_SETTING_WIRELESS_SETTING_NAME),
 		.get_setting_gtype =        nm_setting_wireless_get_type,
 	},
 	[NM_META_SETTING_TYPE_WIRELESS_SECURITY] = {
 		.meta_type =                NM_META_SETTING_TYPE_WIRELESS_SECURITY,
-		.setting_name =             N_ (NM_SETTING_WIRELESS_SECURITY_SETTING_NAME),
+		.setting_name =             N_(NM_SETTING_WIRELESS_SECURITY_SETTING_NAME),
 		.get_setting_gtype =        nm_setting_wireless_security_get_type,
 	},