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>
Nguyễn Thái Ngọc Duy committed
Aug 20, 2012 at 19:32 UTC
b0ff96547ec66979487707ad71f89c23f5e0669d
4 files changed
+5
-5
archive.c
+1
-1
@@ -343,7 +343,7 @@ static int parse_archive_args(int argc, const char **argv,
343
OPT_GROUP(""),
344
OPT_STRING(0, "remote", &remote, N_("repo"),
345
N_("retrieve the archive from remote repository <repo>")),
346
- OPT_STRING(0, "exec", &exec, N_("cmd"),
346
+ OPT_STRING(0, "exec", &exec, N_("command"),
347
N_("path to the remote git-upload-archive command")),
348
OPT_END()
349
};
builtin/archive.c
+1
-1
@@ -92,7 +92,7 @@ int cmd_archive(int argc, const char **argv, const char *prefix)
92
N_("write the archive to this file")),
93
OPT_STRING(0, "remote", &remote, N_("repo"),
94
N_("retrieve the archive from remote repository <repo>")),
95
- OPT_STRING(0, "exec", &exec, N_("cmd"),
95
+ OPT_STRING(0, "exec", &exec, N_("command"),
96
N_("path to the remote git-upload-archive command")),
97
OPT_END()
98
};
builtin/notes.c
+2
-2
@@ -531,7 +531,7 @@ static int add(int argc, const char **argv, const char *prefix)
531
const unsigned char *note;
532
struct msg_arg msg = { 0, 0, STRBUF_INIT };
533
struct option options[] = {
534
- { OPTION_CALLBACK, 'm', "message", &msg, N_("msg"),
534
+ { OPTION_CALLBACK, 'm', "message", &msg, N_("message"),
535
N_("note contents as a string"), PARSE_OPT_NONEG,
536
parse_msg_arg},
537
{ OPTION_CALLBACK, 'F', "file", &msg, N_("file"),
@@ -688,7 +688,7 @@ static int append_edit(int argc, const char **argv, const char *prefix)
688
const char * const *usage;
689
struct msg_arg msg = { 0, 0, STRBUF_INIT };
690
struct option options[] = {
691
- { OPTION_CALLBACK, 'm', "message", &msg, N_("msg"),
691
+ { OPTION_CALLBACK, 'm', "message", &msg, N_("message"),
692
N_("note contents as a string"), PARSE_OPT_NONEG,
693
parse_msg_arg},
694
{ OPTION_CALLBACK, 'F', "file", &msg, N_("file"),
builtin/tag.c
+1
-1
@@ -460,7 +460,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
460
OPT_BOOLEAN('s', "sign", &opt.sign, N_("annotated and GPG-signed tag")),
461
OPT_STRING(0, "cleanup", &cleanup_arg, N_("mode"),
462
N_("how to strip spaces and #comments from message")),
463
- OPT_STRING('u', "local-user", &keyid, N_("key-id"),
463
+ OPT_STRING('u', "local-user", &keyid, N_("key id"),
464
N_("use another key to sign the tag")),
465
OPT__FORCE(&force, N_("replace the tag if exists")),
466
OPT_COLUMN(0, "column", &colopts, N_("show tag list in columns")),