Skip to content

Commit 02127c6

Browse files
pcloudsgitster
authored andcommitted
sequencer.c: mark more strings for translation
Signed-off-by: Nguyễn Thái Ngọc Duy <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent b73c6e3 commit 02127c6

File tree

1 file changed

+14
-12
lines changed

1 file changed

+14
-12
lines changed

sequencer.c

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -716,7 +716,7 @@ static const char *read_author_ident(struct strbuf *buf)
716716
/* dequote values and construct ident line in-place */
717717
for (in = out = buf->buf; i < 3 && in - buf->buf < buf->len; i++) {
718718
if (!skip_prefix(in, keys[i], (const char **)&in)) {
719-
warning("could not parse '%s' (looking for '%s'",
719+
warning(_("could not parse '%s' (looking for '%s'"),
720720
rebase_path_author_script(), keys[i]);
721721
return NULL;
722722
}
@@ -738,7 +738,7 @@ static const char *read_author_ident(struct strbuf *buf)
738738
}
739739

740740
if (i < 3) {
741-
warning("could not parse '%s' (looking for '%s')",
741+
warning(_("could not parse '%s' (looking for '%s')"),
742742
rebase_path_author_script(), keys[i]);
743743
return NULL;
744744
}
@@ -1444,7 +1444,7 @@ static const char *command_to_string(const enum todo_command command)
14441444
{
14451445
if (command < TODO_COMMENT)
14461446
return todo_command_info[command].str;
1447-
die("unknown command: %d", command);
1447+
die(_("unknown command: %d"), command);
14481448
}
14491449

14501450
static char command_to_char(const enum todo_command command)
@@ -2600,15 +2600,17 @@ static int error_with_patch(struct commit *commit,
26002600
if (intend_to_amend())
26012601
return -1;
26022602

2603-
fprintf(stderr, "You can amend the commit now, with\n"
2604-
"\n"
2605-
" git commit --amend %s\n"
2606-
"\n"
2607-
"Once you are satisfied with your changes, run\n"
2608-
"\n"
2609-
" git rebase --continue\n", gpg_sign_opt_quoted(opts));
2603+
fprintf(stderr,
2604+
_("You can amend the commit now, with\n"
2605+
"\n"
2606+
" git commit --amend %s\n"
2607+
"\n"
2608+
"Once you are satisfied with your changes, run\n"
2609+
"\n"
2610+
" git rebase --continue\n"),
2611+
gpg_sign_opt_quoted(opts));
26102612
} else if (exit_code)
2611-
fprintf_ln(stderr, "Could not apply %s... %.*s",
2613+
fprintf_ln(stderr, _("Could not apply %s... %.*s"),
26122614
short_commit_name(commit), subject_len, subject);
26132615

26142616
return exit_code;
@@ -2719,7 +2721,7 @@ static int do_label(const char *name, int len)
27192721
struct object_id head_oid;
27202722

27212723
if (len == 1 && *name == '#')
2722-
return error("illegal label name: '%.*s'", len, name);
2724+
return error(_("illegal label name: '%.*s'"), len, name);
27232725

27242726
strbuf_addf(&ref_name, "refs/rewritten/%.*s", len, name);
27252727
strbuf_addf(&msg, "rebase -i (label) '%.*s'", len, name);

0 commit comments

Comments
 (0)