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>

diff --git a/archive.c b/archive.c
index 2584324f52fc059b29d4d233734a230efc4a3f49..466640479ecb332d8d06f6f26254023eb6e22c85 100644 (file)
--- 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_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()
        };
                        N_("path to the remote git-upload-archive command")),
                OPT_END()
        };

diff --git a/builtin/archive.c b/builtin/archive.c
index e7965bf1573890b7881ba6043e2bc7bf6c5eb72e..9a1cfd3dac0123cb65d3db7597221a29e9010bd9 100644 (file)
--- 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>")),
                        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()
        };
                        N_("path to the remote git-upload-archive command")),
                OPT_END()
        };

diff --git a/builtin/notes.c b/builtin/notes.c
index 423c6e8c51d04885bb6249ecef96aa69c936e273..554c80167c31d4d42aefe2f02feacffef9424844 100644 (file)
--- 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[] = {
        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"),
                        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[] = {
        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"),
                        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 c581e0af615e682e3a2947d74b3d355c0dad477d..9c3e0673d5bd4e011c877c4d3a17975498265e22 100644 (file)
--- 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_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")),
                                        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")),