From: Vasco Almeida Date: Mon, 23 May 2016 19:27:24 GMT Subject: [PATCH v2 05/22] i18n: sequencer: mark entire sentences for translation Message-ID: <1464031661-18988-6-git-send-email-vascomalmeida@sapo.pt> In-Reply-To: <1464031661-18988-1-git-send-email-vascomalmeida@sapo.pt> Mark entire sentences of error message rather than assembling one using placeholders (e.g. "Cannot %s during a %s"). That would facilitate translation work because it is easier to translate a entire sentence than translating pieces. We would have better translations at the expense of source code verbosity. Moreover, translators can now 1) translate the terms "revert" and "cherry-pick" if they please 2) have more leeway to adapt their translations. Signed-off-by: Vasco Almeida --- Similarly to Patch 03/22, I've added more info to commit message, but haven't touched the messages this time. sequencer.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sequencer.c b/sequencer.c index 4687ad4..88a7c78 100644 --- a/sequencer.c +++ b/sequencer.c @@ -697,9 +697,14 @@ static struct commit *parse_insn_line(char *bol, char *eol, struct replay_opts * * opts; we don't support arbitrary instructions */ if (action != opts->action) { - const char *action_str; - action_str = action == REPLAY_REVERT ? "revert" : "cherry-pick"; - error(_("Cannot %s during a %s"), action_str, action_name(opts)); + if (action == REPLAY_REVERT) + error((opts->action == REPLAY_REVERT) + ? _("Cannot revert during a another revert.") + : _("Cannot revert during a cherry-pick.")); + else + error((opts->action == REPLAY_REVERT) + ? _("Cannot cherry-pick during a revert.") + : _("Cannot cherry-pick during another cherry-pick.")); return NULL; } -- 2.7.3