[PATCH 65/66] Reduce translations by using same terminologies
- From
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
- Date
- Aug 20, 2012, 12:32 UTC
- Message-ID
- <1345465975-16927-66-git-send-email-pclouds@gmail.com>
- In-Reply-To
- <1345465975-16927-1-git-send-email-pclouds@gmail.com>
Somewhere in help usage, we use both "message" and "msg", "command" and "cmd", "key id" and "key-id". This patch makes all help text from parseopt use the first form. Clearer and 3 fewer strings for translators.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> --- archive.c | 2 +- builtin/archive.c | 2 +- builtin/notes.c | 4 ++-- builtin/tag.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/archive.c b/archive.c index 2584324..4666404 100644 --- a/archive.c +++ b/archive.c @@ -343,7 +343,7 @@ static int parse_archive_args(int argc, const char **argv, OPT_GROUP(""), OPT_STRING(0, "remote", &remote, N_("repo"), N_("retrieve the archive from remote repository <repo>")), - OPT_STRING(0, "exec", &exec, N_("cmd"), + OPT_STRING(0, "exec", &exec, N_("command"), N_("path to the remote git-upload-archive command")), OPT_END() }; diff --git a/builtin/archive.c b/builtin/archive.c index e7965bf..9a1cfd3 100644 --- a/builtin/archive.c +++ b/builtin/archive.c @@ -92,7 +92,7 @@ int cmd_archive(int argc, const char **argv, const char *prefix) N_("write the archive to this file")), OPT_STRING(0, "remote", &remote, N_("repo"), N_("retrieve the archive from remote repository <repo>")), - OPT_STRING(0, "exec", &exec, N_("cmd"), + OPT_STRING(0, "exec", &exec, N_("command"), N_("path to the remote git-upload-archive command")), OPT_END() }; diff --git a/builtin/notes.c b/builtin/notes.c index 423c6e8..554c801 100644 --- a/builtin/notes.c +++ b/builtin/notes.c @@ -531,7 +531,7 @@ static int add(int argc, const char **argv, const char *prefix) const unsigned char *note; struct msg_arg msg = { 0, 0, STRBUF_INIT }; struct option options[] = { - { OPTION_CALLBACK, 'm', "message", &msg, N_("msg"), + { OPTION_CALLBACK, 'm', "message", &msg, N_("message"), N_("note contents as a string"), PARSE_OPT_NONEG, parse_msg_arg}, { OPTION_CALLBACK, 'F', "file", &msg, N_("file"), @@ -688,7 +688,7 @@ static int append_edit(int argc, const char **argv, const char *prefix) const char * const *usage; struct msg_arg msg = { 0, 0, STRBUF_INIT }; struct option options[] = { - { OPTION_CALLBACK, 'm', "message", &msg, N_("msg"), + { OPTION_CALLBACK, 'm', "message", &msg, N_("message"), N_("note contents as a string"), PARSE_OPT_NONEG, parse_msg_arg}, { OPTION_CALLBACK, 'F', "file", &msg, N_("file"), diff --git a/builtin/tag.c b/builtin/tag.c index c581e0a..9c3e067 100644 --- a/builtin/tag.c +++ b/builtin/tag.c @@ -460,7 +460,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix) OPT_BOOLEAN('s', "sign", &opt.sign, N_("annotated and GPG-signed tag")), OPT_STRING(0, "cleanup", &cleanup_arg, N_("mode"), N_("how to strip spaces and #comments from message")), - OPT_STRING('u', "local-user", &keyid, N_("key-id"), + OPT_STRING('u', "local-user", &keyid, N_("key id"), N_("use another key to sign the tag")), OPT__FORCE(&force, N_("replace the tag if exists")), OPT_COLUMN(0, "column", &colopts, N_("show tag list in columns")),
-- 1.7.12.rc2.18.g61b472e