diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2012-08-20 19:32:54 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-08-22 12:02:28 -0700 |
| commit | b0ff96547ec66979487707ad71f89c23f5e0669d (patch) | |
| tree | 9be9e0941ac3540cb177fdc5ec192f518cf87ef1 | |
| parent | b5625d072308d5f9f1bd9ea0d7124eaa172736f3 (diff) | |
| download | git-b0ff96547ec66979487707ad71f89c23f5e0669d.tar.gz | |
Reduce translations by using same terminologies
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | archive.c | 2 | ||||
| -rw-r--r-- | builtin/archive.c | 2 | ||||
| -rw-r--r-- | builtin/notes.c | 4 | ||||
| -rw-r--r-- | builtin/tag.c | 2 |
4 files changed, 5 insertions, 5 deletions
@@ -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 e7965bf157..9a1cfd3dac 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 423c6e8c51..554c80167c 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 c581e0af61..9c3e0673d5 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")), |