Merge branch 'ag/sequencer-i18n-messages'
Message fix. * ag/sequencer-i18n-messages: sequencer: mark messages for translationmaint
commit
3d6c56dd66
|
@ -3128,7 +3128,7 @@ static int do_exec(struct repository *r, const char *command_line)
|
|||
const char *child_argv[] = { NULL, NULL };
|
||||
int dirty, status;
|
||||
|
||||
fprintf(stderr, "Executing: %s\n", command_line);
|
||||
fprintf(stderr, _("Executing: %s\n"), command_line);
|
||||
child_argv[0] = command_line;
|
||||
argv_array_pushf(&child_env, "GIT_DIR=%s", absolute_path(get_git_dir()));
|
||||
argv_array_pushf(&child_env, "GIT_WORK_TREE=%s",
|
||||
|
@ -3841,7 +3841,7 @@ static int pick_commits(struct repository *r,
|
|||
fclose(f);
|
||||
}
|
||||
if (!opts->quiet)
|
||||
fprintf(stderr, "Rebasing (%d/%d)%s",
|
||||
fprintf(stderr, _("Rebasing (%d/%d)%s"),
|
||||
todo_list->done_nr,
|
||||
todo_list->total_nr,
|
||||
opts->verbose ? "\n" : "\r");
|
||||
|
@ -4093,7 +4093,7 @@ cleanup_head_ref:
|
|||
if (!opts->verbose)
|
||||
term_clear_line();
|
||||
fprintf(stderr,
|
||||
"Successfully rebased and updated %s.\n",
|
||||
_("Successfully rebased and updated %s.\n"),
|
||||
head_ref.buf);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue