i18n: merge: 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
962e629567464733dd43c60b6449a0ac26fc5c7a
1 file changed
+24
-24
builtin/merge.c
+24
-24
@@ -40,9 +40,9 @@ struct strategy {
40
};
41
42
static const char * const builtin_merge_usage[] = {
43
- "git merge [options] [<commit>...]",
44
- "git merge [options] <msg> HEAD <commit>",
45
- "git merge --abort",
43
+ N_("git merge [options] [<commit>...]"),
44
+ N_("git merge [options] <msg> HEAD <commit>"),
45
+ N_("git merge --abort"),
46
NULL
47
};
48
@@ -180,39 +180,39 @@ static int option_parse_n(const struct option *opt,
180
181
static struct option builtin_merge_options[] = {
182
{ OPTION_CALLBACK, 'n', NULL, NULL, NULL,
183
- "do not show a diffstat at the end of the merge",
183
+ N_("do not show a diffstat at the end of the merge"),
184
PARSE_OPT_NOARG, option_parse_n },
185
OPT_BOOLEAN(0, "stat", &show_diffstat,
186
- "show a diffstat at the end of the merge"),
187
- OPT_BOOLEAN(0, "summary", &show_diffstat, "(synonym to --stat)"),
188
- { OPTION_INTEGER, 0, "log", &shortlog_len, "n",
189
- "add (at most <n>) entries from shortlog to merge commit message",
186
+ N_("show a diffstat at the end of the merge")),
187
+ OPT_BOOLEAN(0, "summary", &show_diffstat, N_("(synonym to --stat)")),
188
+ { OPTION_INTEGER, 0, "log", &shortlog_len, N_("n"),
189
+ N_("add (at most <n>) entries from shortlog to merge commit message"),
190
PARSE_OPT_OPTARG, NULL, DEFAULT_MERGE_LOG_LEN },
191
OPT_BOOLEAN(0, "squash", &squash,
192
- "create a single commit instead of doing a merge"),
192
+ N_("create a single commit instead of doing a merge")),
193
OPT_BOOLEAN(0, "commit", &option_commit,
194
- "perform a commit if the merge succeeds (default)"),
194
+ N_("perform a commit if the merge succeeds (default)")),
195
OPT_BOOL('e', "edit", &option_edit,
196
- "edit message before committing"),
196
+ N_("edit message before committing")),
197
OPT_BOOLEAN(0, "ff", &allow_fast_forward,
198
- "allow fast-forward (default)"),
198
+ N_("allow fast-forward (default)")),
199
OPT_BOOLEAN(0, "ff-only", &fast_forward_only,
200
- "abort if fast-forward is not possible"),
200
+ N_("abort if fast-forward is not possible")),
201
OPT_RERERE_AUTOUPDATE(&allow_rerere_auto),
202
- OPT_CALLBACK('s', "strategy", &use_strategies, "strategy",
203
- "merge strategy to use", option_parse_strategy),
204
- OPT_CALLBACK('X', "strategy-option", &xopts, "option=value",
205
- "option for selected merge strategy", option_parse_x),
206
- OPT_CALLBACK('m', "message", &merge_msg, "message",
207
- "merge commit message (for a non-fast-forward merge)",
202
+ OPT_CALLBACK('s', "strategy", &use_strategies, N_("strategy"),
203
+ N_("merge strategy to use"), option_parse_strategy),
204
+ OPT_CALLBACK('X', "strategy-option", &xopts, N_("option=value"),
205
+ N_("option for selected merge strategy"), option_parse_x),
206
+ OPT_CALLBACK('m', "message", &merge_msg, N_("message"),
207
+ N_("merge commit message (for a non-fast-forward merge)"),
208
option_parse_message),
209
OPT__VERBOSITY(&verbosity),
210
OPT_BOOLEAN(0, "abort", &abort_current_merge,
211
- "abort the current in-progress merge"),
212
- OPT_SET_INT(0, "progress", &show_progress, "force progress reporting", 1),
213
- { OPTION_STRING, 'S', "gpg-sign", &sign_commit, "key id",
214
- "GPG sign commit", PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
215
- OPT_BOOLEAN(0, "overwrite-ignore", &overwrite_ignore, "update ignored files (default)"),
211
+ N_("abort the current in-progress merge")),
212
+ OPT_SET_INT(0, "progress", &show_progress, N_("force progress reporting"), 1),
213
+ { OPTION_STRING, 'S', "gpg-sign", &sign_commit, N_("key id"),
214
+ N_("GPG sign commit"), PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
215
+ OPT_BOOLEAN(0, "overwrite-ignore", &overwrite_ignore, N_("update ignored files (default)")),
216
OPT_END()
217
};
218