зеркало из https://github.com/microsoft/git.git
Merge branch 'ja/diff-opt-typofix'
Typofix. * ja/diff-opt-typofix: diff: fix mistake in translatable strings
This commit is contained in:
Коммит
936dce6f93
4
diff.c
4
diff.c
|
@ -5455,13 +5455,13 @@ static void prep_parse_options(struct diff_options *options)
|
||||||
N_("equivalent to --word-diff=color --word-diff-regex=<regex>"),
|
N_("equivalent to --word-diff=color --word-diff-regex=<regex>"),
|
||||||
PARSE_OPT_NONEG | PARSE_OPT_OPTARG, diff_opt_color_words),
|
PARSE_OPT_NONEG | PARSE_OPT_OPTARG, diff_opt_color_words),
|
||||||
OPT_CALLBACK_F(0, "color-moved", options, N_("<mode>"),
|
OPT_CALLBACK_F(0, "color-moved", options, N_("<mode>"),
|
||||||
N_("move lines of code are colored differently"),
|
N_("moved lines of code are colored differently"),
|
||||||
PARSE_OPT_OPTARG, diff_opt_color_moved),
|
PARSE_OPT_OPTARG, diff_opt_color_moved),
|
||||||
OPT_CALLBACK_F(0, "color-moved-ws", options, N_("<mode>"),
|
OPT_CALLBACK_F(0, "color-moved-ws", options, N_("<mode>"),
|
||||||
N_("how white spaces are ignored in --color-moved"),
|
N_("how white spaces are ignored in --color-moved"),
|
||||||
0, diff_opt_color_moved_ws),
|
0, diff_opt_color_moved_ws),
|
||||||
|
|
||||||
OPT_GROUP(N_("Diff other options")),
|
OPT_GROUP(N_("Other diff options")),
|
||||||
OPT_CALLBACK_F(0, "relative", options, N_("<prefix>"),
|
OPT_CALLBACK_F(0, "relative", options, N_("<prefix>"),
|
||||||
N_("when run from subdir, exclude changes outside and show relative paths"),
|
N_("when run from subdir, exclude changes outside and show relative paths"),
|
||||||
PARSE_OPT_NONEG | PARSE_OPT_OPTARG,
|
PARSE_OPT_NONEG | PARSE_OPT_OPTARG,
|
||||||
|
|
Загрузка…
Ссылка в новой задаче