Merge branch 'va/i18n-even-more'
More markings of messages for i18n, with updates to various tests to pass GETTEXT_POISON tests. One patch from the original submission dropped due to conflicts with jk/upload-pack-hook, which is still in flux. * va/i18n-even-more: (38 commits) t5541: become resilient to GETTEXT_POISON i18n: branch: mark comment when editing branch description for translation i18n: unmark die messages for translation i18n: submodule: escape shell variables inside eval_gettext i18n: submodule: join strings marked for translation i18n: init-db: join message pieces i18n: remote: allow translations to reorder message i18n: remote: mark URL fallback text for translation i18n: standardise messages i18n: sequencer: add period to error message i18n: merge: change command option help to lowercase i18n: merge: mark messages for translation i18n: notes: mark options for translation i18n: notes: mark strings for translation i18n: transport-helper.c: change N_() call to _() i18n: bisect: mark strings for translation t5523: use test_i18ngrep for negation t4153: fix negated test_i18ngrep call t9003: become resilient to GETTEXT_POISON tests: unpack-trees: update to use test_i18n* functions ...
This commit is contained in:
15
sequencer.c
15
sequencer.c
@ -190,7 +190,7 @@ static void write_message(struct strbuf *msgbuf, const char *filename)
|
||||
die_errno(_("Could not write to %s"), filename);
|
||||
strbuf_release(msgbuf);
|
||||
if (commit_lock_file(&msg_file) < 0)
|
||||
die(_("Error wrapping up %s"), filename);
|
||||
die(_("Error wrapping up %s."), filename);
|
||||
}
|
||||
|
||||
static struct tree *empty_tree(void)
|
||||
@ -225,7 +225,7 @@ static int fast_forward_to(const unsigned char *to, const unsigned char *from,
|
||||
if (checkout_fast_forward(from, to, 1))
|
||||
exit(128); /* the callee should have complained already */
|
||||
|
||||
strbuf_addf(&sb, "%s: fast-forward", action_name(opts));
|
||||
strbuf_addf(&sb, _("%s: fast-forward"), action_name(opts));
|
||||
|
||||
transaction = ref_transaction_begin(&err);
|
||||
if (!transaction ||
|
||||
@ -695,9 +695,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;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user