[PATCH v3 25/25] sequencer: mark all error messages for translation
From: Johannes Schindelin <hidden>
Date: 2016-10-10 17:33:23
Subsystem:
the rest · Maintainer:
Linus Torvalds
There was actually only one error message that was not yet marked for translation. Signed-off-by: Johannes Schindelin <redacted> --- sequencer.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/sequencer.c b/sequencer.c
index 676f16c..86d86ce 100644
--- a/sequencer.c
+++ b/sequencer.c@@ -515,16 +515,19 @@ static int run_git_commit(const char *defmsg, struct replay_opts *opts, if (!env) { const char *gpg_opt = gpg_sign_opt_quoted(opts); - return error("you have staged changes in your working " - "tree. If these changes are meant to be\n" - "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); + return error(_("you have staged changes in your " + "working tree. If these changes are " + "meant to be\n" + "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); } }
--
2.10.0.windows.1.325.ge6089c1