diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-04-19 18:55:18 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-04-20 14:40:25 +0200 |
| commit | 78e839ebd44e0bcfe3dd33626f61084061fbf8bf (patch) | |
| tree | 069ebe0303da6c9ac1cfea4ffef834578868a157 | |
| parent | 0e9542cf575e03e85b08a159e971faeb1eb2348b (diff) | |
| download | NetworkManager-78e839ebd44e0bcfe3dd33626f61084061fbf8bf.tar.gz | |
cli: don't use #define for translation texts
Text for translation cannot contain defines (or variables).
| -rw-r--r-- | clients/common/nm-meta-setting-desc.c | 16 | ||||
| -rw-r--r-- | clients/common/nm-meta-setting-desc.h | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c index 1d0ea6dba5..68c12935ad 100644 --- a/clients/common/nm-meta-setting-desc.c +++ b/clients/common/nm-meta-setting-desc.c @@ -4963,12 +4963,12 @@ static const NMMetaPropertyType _pt_gobject_devices = { ((guint32 (*) (NMSetting *)) ((sizeof (func == ((guint32 (*) (type *)) func))) ? func : func) ) #define TEAM_DESCRIBE_MESSAGE \ - "nmcli can accepts both direct JSON configuration data and a file name containing " \ - "the configuration. In the latter case the file is read and the contents is put " \ - "into this property.\n\n" \ - "Examples: set team.config " \ - "{ \"device\": \"team0\", \"runner\": {\"name\": \"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n" \ - " set team.config /etc/my-team.conf\n" + N_("nmcli can accepts both direct JSON configuration data and a file name containing " \ + "the configuration. In the latter case the file is read and the contents is put " \ + "into this property.\n\n" \ + "Examples: set team.config " \ + "{ \"device\": \"team0\", \"runner\": {\"name\": \"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n" \ + " set team.config /etc/my-team.conf\n") #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_802_1X static const NMMetaPropertyInfo *const property_infos_802_1X[] = { @@ -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 = 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 = TEAM_DESCRIBE_MESSAGE, .property_type = DEFINE_PROPERTY_TYPE ( .get_fcn = _get_fcn_gobject, .set_fcn = _set_fcn_team_config, diff --git a/clients/common/nm-meta-setting-desc.h b/clients/common/nm-meta-setting-desc.h index 38aa50f95f..e0b440fd52 100644 --- a/clients/common/nm-meta-setting-desc.h +++ b/clients/common/nm-meta-setting-desc.h @@ -24,7 +24,7 @@ struct _NMDevice; -#define NM_META_TEXT_HIDDEN "<hidden>" +#define NM_META_TEXT_HIDDEN N_("<hidden>") #define NM_META_TEXT_PROMPT_ADSL_PROTO N_("Protocol") #define NM_META_TEXT_PROMPT_ADSL_PROTO_CHOICES "(" NM_SETTING_ADSL_PROTOCOL_PPPOA "/" NM_SETTING_ADSL_PROTOCOL_PPPOE "/" NM_SETTING_ADSL_PROTOCOL_IPOATM ")" |