i18n: apply: 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
May 6, 2012 at 21:23 UTC
de37393344ddd4c3be5fbc1d9d168fba47165aa7
1 file changed
+31
-31
builtin/apply.c
+31
-31
@@ -50,7 +50,7 @@ static const char *fake_ancestor;
50
static int line_termination = '\n';
51
static unsigned int p_context = UINT_MAX;
52
static const char * const apply_usage[] = {
53
- "git apply [options] [<patch>...]",
53
+ N_("git apply [options] [<patch>...]"),
54
NULL
55
};
56
@@ -3952,66 +3952,66 @@ int cmd_apply(int argc, const char **argv, const char *prefix_)
3952
const char *whitespace_option = NULL;
3953
3954
struct option builtin_apply_options[] = {
3955
- { OPTION_CALLBACK, 0, "exclude", NULL, "path",
3956
- "don't apply changes matching the given path",
3955
+ { OPTION_CALLBACK, 0, "exclude", NULL, N_("path"),
3956
+ N_("don't apply changes matching the given path"),
3957
0, option_parse_exclude },
3958
- { OPTION_CALLBACK, 0, "include", NULL, "path",
3959
- "apply changes matching the given path",
3958
+ { OPTION_CALLBACK, 0, "include", NULL, N_("path"),
3959
+ N_("apply changes matching the given path"),
3960
0, option_parse_include },
3961
- { OPTION_CALLBACK, 'p', NULL, NULL, "num",
3962
- "remove <num> leading slashes from traditional diff paths",
3961
+ { OPTION_CALLBACK, 'p', NULL, NULL, N_("num"),
3962
+ N_("remove <num> leading slashes from traditional diff paths"),
3963
0, option_parse_p },
3964
OPT_BOOLEAN(0, "no-add", &no_add,
3965
- "ignore additions made by the patch"),
3965
+ N_("ignore additions made by the patch")),
3966
OPT_BOOLEAN(0, "stat", &diffstat,
3967
- "instead of applying the patch, output diffstat for the input"),
3967
+ N_("instead of applying the patch, output diffstat for the input")),
3968
OPT_NOOP_NOARG(0, "allow-binary-replacement"),
3969
OPT_NOOP_NOARG(0, "binary"),
3970
OPT_BOOLEAN(0, "numstat", &numstat,
3971
- "shows number of added and deleted lines in decimal notation"),
3971
+ N_("shows number of added and deleted lines in decimal notation")),
3972
OPT_BOOLEAN(0, "summary", &summary,
3973
- "instead of applying the patch, output a summary for the input"),
3973
+ N_("instead of applying the patch, output a summary for the input")),
3974
OPT_BOOLEAN(0, "check", &check,
3975
- "instead of applying the patch, see if the patch is applicable"),
3975
+ N_("instead of applying the patch, see if the patch is applicable")),
3976
OPT_BOOLEAN(0, "index", &check_index,
3977
- "make sure the patch is applicable to the current index"),
3977
+ N_("make sure the patch is applicable to the current index")),
3978
OPT_BOOLEAN(0, "cached", &cached,
3979
- "apply a patch without touching the working tree"),
3979
+ N_("apply a patch without touching the working tree")),
3980
OPT_BOOLEAN(0, "apply", &force_apply,
3981
- "also apply the patch (use with --stat/--summary/--check)"),
3981
+ N_("also apply the patch (use with --stat/--summary/--check)")),
3982
OPT_FILENAME(0, "build-fake-ancestor", &fake_ancestor,
3983
- "build a temporary index based on embedded index information"),
3983
+ N_("build a temporary index based on embedded index information")),
3984
{ OPTION_CALLBACK, 'z', NULL, NULL, NULL,
3985
- "paths are separated with NUL character",
3985
+ N_("paths are separated with NUL character"),
3986
PARSE_OPT_NOARG, option_parse_z },
3987
OPT_INTEGER('C', NULL, &p_context,
3988
- "ensure at least <n> lines of context match"),
3989
- { OPTION_CALLBACK, 0, "whitespace", &whitespace_option, "action",
3990
- "detect new or modified lines that have whitespace errors",
3988
+ N_("ensure at least <n> lines of context match")),
3989
+ { OPTION_CALLBACK, 0, "whitespace", &whitespace_option, N_("action"),
3990
+ N_("detect new or modified lines that have whitespace errors"),
3991
0, option_parse_whitespace },
3992
{ OPTION_CALLBACK, 0, "ignore-space-change", NULL, NULL,
3993
- "ignore changes in whitespace when finding context",
3993
+ N_("ignore changes in whitespace when finding context"),
3994
PARSE_OPT_NOARG, option_parse_space_change },
3995
{ OPTION_CALLBACK, 0, "ignore-whitespace", NULL, NULL,
3996
- "ignore changes in whitespace when finding context",
3996
+ N_("ignore changes in whitespace when finding context"),
3997
PARSE_OPT_NOARG, option_parse_space_change },
3998
OPT_BOOLEAN('R', "reverse", &apply_in_reverse,
3999
- "apply the patch in reverse"),
3999
+ N_("apply the patch in reverse")),
4000
OPT_BOOLEAN(0, "unidiff-zero", &unidiff_zero,
4001
- "don't expect at least one line of context"),
4001
+ N_("don't expect at least one line of context")),
4002
OPT_BOOLEAN(0, "reject", &apply_with_reject,
4003
- "leave the rejected hunks in corresponding *.rej files"),
4003
+ N_("leave the rejected hunks in corresponding *.rej files")),
4004
OPT_BOOLEAN(0, "allow-overlap", &allow_overlap,
4005
- "allow overlapping hunks"),
4006
- OPT__VERBOSE(&apply_verbosely, "be verbose"),
4005
+ N_("allow overlapping hunks")),
4006
+ OPT__VERBOSE(&apply_verbosely, N_("be verbose")),
4007
OPT_BIT(0, "inaccurate-eof", &options,
4008
- "tolerate incorrectly detected missing new-line at the end of file",
4008
+ N_("tolerate incorrectly detected missing new-line at the end of file"),
4009
INACCURATE_EOF),
4010
OPT_BIT(0, "recount", &options,
4011
- "do not trust the line counts in the hunk headers",
4011
+ N_("do not trust the line counts in the hunk headers"),
4012
RECOUNT),
4013
- { OPTION_CALLBACK, 0, "directory", NULL, "root",
4014
- "prepend <root> to all filenames",
4013
+ { OPTION_CALLBACK, 0, "directory", NULL, N_("root"),
4014
+ N_("prepend <root> to all filenames"),
4015
0, option_parse_directory },
4016
OPT_END()
4017
};