зеркало из https://github.com/microsoft/git.git
sequencer: mark all error messages for translation
There was actually only one error message that was not yet marked for translation. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
93b3df6f14
Коммит
791eb8708f
26
sequencer.c
26
sequencer.c
|
@ -479,6 +479,20 @@ static char **read_author_script(void)
|
||||||
return env;
|
return env;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static const char staged_changes_advice[] =
|
||||||
|
N_("you have staged changes in your working tree\n"
|
||||||
|
"If these changes are meant to be squashed into the previous commit, run:\n"
|
||||||
|
"\n"
|
||||||
|
" git commit --amend %s\n"
|
||||||
|
"\n"
|
||||||
|
"If they are meant to go into a new commit, run:\n"
|
||||||
|
"\n"
|
||||||
|
" git commit %s\n"
|
||||||
|
"\n"
|
||||||
|
"In both cases, once you're done, continue with:\n"
|
||||||
|
"\n"
|
||||||
|
" git rebase --continue\n");
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* If we are cherry-pick, and if the merge did not result in
|
* If we are cherry-pick, and if the merge did not result in
|
||||||
* hand-editing, we will hit this commit and inherit the original
|
* hand-editing, we will hit this commit and inherit the original
|
||||||
|
@ -505,16 +519,8 @@ static int run_git_commit(const char *defmsg, struct replay_opts *opts,
|
||||||
if (!env) {
|
if (!env) {
|
||||||
const char *gpg_opt = gpg_sign_opt_quoted(opts);
|
const char *gpg_opt = gpg_sign_opt_quoted(opts);
|
||||||
|
|
||||||
return error("you have staged changes in your working "
|
return error(_(staged_changes_advice),
|
||||||
"tree. If these changes are meant to be\n"
|
gpg_opt, gpg_opt);
|
||||||
"squashed into the previous commit, run:\n\n"
|
|
||||||
" git commit --amend %s\n\n"
|
|
||||||
"If they are meant to go into a new commit, "
|
|
||||||
"run:\n\n"
|
|
||||||
" git commit %s\n\n"
|
|
||||||
"In both cases, once you're done, continue "
|
|
||||||
"with:\n\n"
|
|
||||||
" git rebase --continue\n", gpg_opt, gpg_opt);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче