Skip to content
Browse files

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>
  • Loading branch information...
1 parent b5625d0 commit b0ff96547ec66979487707ad71f89c23f5e0669d @pclouds pclouds committed with gitster Aug 20, 2012
Showing with 5 additions and 5 deletions.
  1. +1 −1 archive.c
  2. +1 −1 builtin/archive.c
  3. +2 −2 builtin/notes.c
  4. +1 −1 builtin/tag.c
View
2 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()
};
View
2 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()
};
View
4 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"),
View
2 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")),

0 comments on commit b0ff965

Please sign in to comment.
Something went wrong with that request. Please try again.