undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sequencer.c: mark more strings for translation

Browse Source 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2018-07-21 09:49:38 +02:00 committed by Junio C Hamano
parent b73c6e3a0d
commit 02127c639b
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sequencer.c
View File

@ -716,7 +716,7 @@ static const char *read_author_ident(struct strbuf *buf)
/* dequote values and construct ident line in-place */ /* dequote values and construct ident line in-place */
for (in = out = buf->buf; i < 3 && in - buf->buf < buf->len; i++) { for (in = out = buf->buf; i < 3 && in - buf->buf < buf->len; i++) {
if (!skip_prefix(in, keys[i], (const char **)&in)) { if (!skip_prefix(in, keys[i], (const char **)&in)) {
warning("could not parse '%s' (looking for '%s'", warning(_("could not parse '%s' (looking for '%s'"),
rebase_path_author_script(), keys[i]); rebase_path_author_script(), keys[i]);
return NULL; return NULL;
} }
@ -738,7 +738,7 @@ static const char *read_author_ident(struct strbuf *buf)
} }
if (i < 3) { if (i < 3) {
warning("could not parse '%s' (looking for '%s')", warning(_("could not parse '%s' (looking for '%s')"),
rebase_path_author_script(), keys[i]); rebase_path_author_script(), keys[i]);
return NULL; return NULL;
} }
@ -1444,7 +1444,7 @@ static const char *command_to_string(const enum todo_command command)
{ {
if (command < TODO_COMMENT) if (command < TODO_COMMENT)
return todo_command_info[command].str; return todo_command_info[command].str;
die("unknown command: %d", command); die(_("unknown command: %d"), command);
} }
static char command_to_char(const enum todo_command command) static char command_to_char(const enum todo_command command)
@ -2600,15 +2600,17 @@ static int error_with_patch(struct commit *commit,
if (intend_to_amend()) if (intend_to_amend())
return -1; return -1;
fprintf(stderr, "You can amend the commit now, with\n" fprintf(stderr,
"\n" _("You can amend the commit now, with\n"
" git commit --amend %s\n" "\n"
"\n" " git commit --amend %s\n"
"Once you are satisfied with your changes, run\n" "\n"
"\n" "Once you are satisfied with your changes, run\n"
" git rebase --continue\n", gpg_sign_opt_quoted(opts)); "\n"
" git rebase --continue\n"),
gpg_sign_opt_quoted(opts));
} else if (exit_code) } else if (exit_code)
fprintf_ln(stderr, "Could not apply %s... %.*s", fprintf_ln(stderr, _("Could not apply %s... %.*s"),
short_commit_name(commit), subject_len, subject); short_commit_name(commit), subject_len, subject);
return exit_code; return exit_code;
@ -2719,7 +2721,7 @@ static int do_label(const char *name, int len)
struct object_id head_oid; struct object_id head_oid;
if (len == 1 && *name == '#') if (len == 1 && *name == '#')
return error("illegal label name: '%.*s'", len, name); return error(_("illegal label name: '%.*s'"), len, name);
strbuf_addf(&ref_name, "refs/rewritten/%.*s", len, name); strbuf_addf(&ref_name, "refs/rewritten/%.*s", len, name);
strbuf_addf(&msg, "rebase -i (label) '%.*s'", len, name); strbuf_addf(&msg, "rebase -i (label) '%.*s'", len, name);