i18n: sequencer: mark entire sentences for translation
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 <vascomalmeida@sapo.pt> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Vasco Almeida committed
Jun 17, 2016 at 20:20 UTC
9b0df093f6e9959bf8e788012d724a74f5f15a21
1 file changed
+8
-3
sequencer.c
+8
-3
@@ -697,9 +697,14 @@ static struct commit *parse_insn_line(char *bol, char *eol, struct replay_opts *
697
* opts; we don't support arbitrary instructions
698
*/
699
if (action != opts->action) {
700
- const char *action_str;
701
- action_str = action == REPLAY_REVERT ? "revert" : "cherry-pick";
702
- error(_("Cannot %s during a %s"), action_str, action_name(opts));
700
+ if (action == REPLAY_REVERT)
701
+ error((opts->action == REPLAY_REVERT)
702
+ ? _("Cannot revert during a another revert.")
703
+ : _("Cannot revert during a cherry-pick."));
704
+ else
705
+ error((opts->action == REPLAY_REVERT)
706
+ ? _("Cannot cherry-pick during a revert.")
707
+ : _("Cannot cherry-pick during another cherry-pick."));
708
return NULL;
709
}
710