mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
Fix typos in translatable strings for v2.21.0
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:
parent
11ad41d4cb
commit
32ceace39f
|
@ -173,7 +173,7 @@ static int bisect_reset(const char *commit)
|
|||
argv_array_clear(&argv);
|
||||
return error(_("could not check out original"
|
||||
" HEAD '%s'. Try 'git bisect"
|
||||
"reset <commit>'."), branch.buf);
|
||||
" reset <commit>'."), branch.buf);
|
||||
}
|
||||
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,
|
||||
N_("update BISECT_HEAD instead of checking out the current commit")),
|
||||
OPT_BOOL(0, "no-log", &nolog,
|
||||
N_("no log for BISECT_WRITE ")),
|
||||
N_("no log for BISECT_WRITE")),
|
||||
OPT_END()
|
||||
};
|
||||
struct bisect_terms terms = { .term_good = NULL, .term_bad = NULL };
|
||||
|
|
|
@ -1480,7 +1480,7 @@ static inline void fetch_one_setup_partial(struct remote *remote)
|
|||
if (strcmp(remote->name, repository_format_partial_clone)) {
|
||||
if (filter_options.choice)
|
||||
die(_("--filter can only be used with the remote "
|
||||
"configured in extensions.partialclone"));
|
||||
"configured in extensions.partialClone"));
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
@ -1434,7 +1434,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
|
|||
}
|
||||
|
||||
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) {
|
||||
/* all am options except -q are compatible only with --am */
|
||||
|
|
Loading…
Reference in a new issue