mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix typos in translatable strings for v2.21.0

Browse Source 
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jean-Noël Avila 2019-02-11 07:44:53 +01:00 committed by Junio C Hamano
parent 11ad41d4cb
commit 32ceace39f
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/bisect--helper.c
View File

@ -173,7 +173,7 @@ static int bisect_reset(const char *commit)
argv_array_clear(&argv); argv_array_clear(&argv);
return error(_("could not check out original" return error(_("could not check out original"
" HEAD '%s'. Try 'git bisect" " HEAD '%s'. Try 'git bisect"
"reset <commit>'."), branch.buf); " reset <commit>'."), branch.buf);
} }
argv_array_clear(&argv); argv_array_clear(&argv);
} }
@ -646,7 +646,7 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
OPT_BOOL(0, "no-checkout", &no_checkout, OPT_BOOL(0, "no-checkout", &no_checkout,
N_("update BISECT_HEAD instead of checking out the current commit")), N_("update BISECT_HEAD instead of checking out the current commit")),
OPT_BOOL(0, "no-log", &nolog, OPT_BOOL(0, "no-log", &nolog,
N_("no log for BISECT_WRITE ")), N_("no log for BISECT_WRITE")),
OPT_END() OPT_END()
}; };
struct bisect_terms terms = { .term_good = NULL, .term_bad = NULL }; struct bisect_terms terms = { .term_good = NULL, .term_bad = NULL };

2
builtin/fetch.c
View File

@ -1480,7 +1480,7 @@ static inline void fetch_one_setup_partial(struct remote *remote)
if (strcmp(remote->name, repository_format_partial_clone)) { if (strcmp(remote->name, repository_format_partial_clone)) {
if (filter_options.choice) if (filter_options.choice)
die(_("--filter can only be used with the remote " die(_("--filter can only be used with the remote "
"configured in extensions.partialclone")); "configured in extensions.partialClone"));
return; return;
} }

2
builtin/rebase.c
View File

@ -1434,7 +1434,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
} }
if (options.reschedule_failed_exec && !is_interactive(&options)) if (options.reschedule_failed_exec && !is_interactive(&options))
die(_("--reschedule-failed-exec requires an interactive rebase")); die(_("%s requires an interactive rebase"), "--reschedule-failed-exec");
if (options.git_am_opts.argc) { if (options.git_am_opts.argc) {
/* all am options except -q are compatible only with --am */ /* all am options except -q are compatible only with --am */