undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2012-08-20 19:32:10 +07:00 committed by Junio C Hamano
parent 719acedba4
commit 93eced6c1b
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
builtin/fmt-merge-msg.c
View File

@ -10,7 +10,7 @@
#include "gpg-interface.h" #include "gpg-interface.h"
static const char * const fmt_merge_msg_usage[] = { static const char * const fmt_merge_msg_usage[] = {
"git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]", N_("git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"),
NULL NULL
}; };
@ -650,16 +650,16 @@ int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)
const char *message = NULL; const char *message = NULL;
int shortlog_len = -1; int shortlog_len = -1;
struct option options[] = { struct option options[] = {
{ OPTION_INTEGER, 0, "log", &shortlog_len, "n", { OPTION_INTEGER, 0, "log", &shortlog_len, N_("n"),
"populate log with at most <n> entries from shortlog", N_("populate log with at most <n> entries from shortlog"),
PARSE_OPT_OPTARG, NULL, DEFAULT_MERGE_LOG_LEN }, PARSE_OPT_OPTARG, NULL, DEFAULT_MERGE_LOG_LEN },
{ OPTION_INTEGER, 0, "summary", &shortlog_len, "n", { OPTION_INTEGER, 0, "summary", &shortlog_len, N_("n"),
"alias for --log (deprecated)", N_("alias for --log (deprecated)"),
PARSE_OPT_OPTARG | PARSE_OPT_HIDDEN, NULL, PARSE_OPT_OPTARG | PARSE_OPT_HIDDEN, NULL,
DEFAULT_MERGE_LOG_LEN }, DEFAULT_MERGE_LOG_LEN },
OPT_STRING('m', "message", &message, "text", OPT_STRING('m', "message", &message, N_("text"),
"use <text> as start of message"), N_("use <text> as start of message")),
OPT_FILENAME('F', "file", &inpath, "file to read from"), OPT_FILENAME('F', "file", &inpath, N_("file to read from")),
OPT_END() OPT_END()
}; };