Skip to content

Commit 791eb87

Browse files
dschogitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 93b3df6 commit 791eb87

File tree

1 file changed

+16
-10
lines changed

1 file changed

+16
-10
lines changed

sequencer.c

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -479,6 +479,20 @@ static char **read_author_script(void)
479479
return env;
480480
}
481481

482+
static const char staged_changes_advice[] =
483+
N_("you have staged changes in your working tree\n"
484+
"If these changes are meant to be squashed into the previous commit, run:\n"
485+
"\n"
486+
" git commit --amend %s\n"
487+
"\n"
488+
"If they are meant to go into a new commit, run:\n"
489+
"\n"
490+
" git commit %s\n"
491+
"\n"
492+
"In both cases, once you're done, continue with:\n"
493+
"\n"
494+
" git rebase --continue\n");
495+
482496
/*
483497
* If we are cherry-pick, and if the merge did not result in
484498
* 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,
505519
if (!env) {
506520
const char *gpg_opt = gpg_sign_opt_quoted(opts);
507521

508-
return error("you have staged changes in your working "
509-
"tree. If these changes are meant to be\n"
510-
"squashed into the previous commit, run:\n\n"
511-
" git commit --amend %s\n\n"
512-
"If they are meant to go into a new commit, "
513-
"run:\n\n"
514-
" git commit %s\n\n"
515-
"In both cases, once you're done, continue "
516-
"with:\n\n"
517-
" git rebase --continue\n", gpg_opt, gpg_opt);
522+
return error(_(staged_changes_advice),
523+
gpg_opt, gpg_opt);
518524
}
519525
}
520526

0 commit comments

Comments
 (0)