mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-29 12:06:14 +02:00
Code

Merge branch 'ag/sequencer-i18n-messages' 

Message fix.

* ag/sequencer-i18n-messages:
  sequencer: mark messages for translation
This commit is contained in:
Junio C Hamano 2020-04-22 13:42:45 -07:00
parent 9f471e4b95 4d55d63bde
commit 3d6c56dd66
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sequencer.c
View File

@ -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 @@ static int pick_commits(struct repository *r,
if (!opts->verbose)
term_clear_line();
fprintf(stderr,
"Successfully rebased and updated %s.\n",
_("Successfully rebased and updated %s.\n"),
head_ref.buf);
}