i18n: fmt-merge-msg: mark parseopt strings for translation

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 93eced6c1b0d28ac7cc8a6003d1673573b412031
1 file changed +8 -8
builtin/fmt-merge-msg.c
+8 -8
@@ -10,7 +10,7 @@
10 #include "gpg-interface.h"
11
12 static const char * const fmt_merge_msg_usage[] = {
13 - "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]",
13 + N_("git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"),
14 NULL
15 };
16
@@ -650,16 +650,16 @@ int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)
650 const char *message = NULL;
651 int shortlog_len = -1;
652 struct option options[] = {
653 - { OPTION_INTEGER, 0, "log", &shortlog_len, "n",
654 - "populate log with at most <n> entries from shortlog",
653 + { OPTION_INTEGER, 0, "log", &shortlog_len, N_("n"),
654 + N_("populate log with at most <n> entries from shortlog"),
655 PARSE_OPT_OPTARG, NULL, DEFAULT_MERGE_LOG_LEN },
656 - { OPTION_INTEGER, 0, "summary", &shortlog_len, "n",
657 - "alias for --log (deprecated)",
656 + { OPTION_INTEGER, 0, "summary", &shortlog_len, N_("n"),
657 + N_("alias for --log (deprecated)"),
658 PARSE_OPT_OPTARG | PARSE_OPT_HIDDEN, NULL,
659 DEFAULT_MERGE_LOG_LEN },
660 - OPT_STRING('m', "message", &message, "text",
661 - "use <text> as start of message"),
662 - OPT_FILENAME('F', "file", &inpath, "file to read from"),
660 + OPT_STRING('m', "message", &message, N_("text"),
661 + N_("use <text> as start of message")),
662 + OPT_FILENAME('F', "file", &inpath, N_("file to read from")),
663 OPT_END()
664 };
665