Skip to content

Commit b9c993e

Browse files
avargitster
authored andcommitted
i18n: git-revert literal "me" messages
Translate messages that use the `me' variable. These are all error messages referencing the command name, so the name shouldn't be translated. Reported-by: Jonathan Nieder <[email protected]> Signed-off-by: Ævar Arnfjörð Bjarmason <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent d3ee177 commit b9c993e

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

builtin/revert.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,8 @@ static int do_recursive_merge(struct commit *base, struct commit *next,
362362
if (active_cache_changed &&
363363
(write_cache(index_fd, active_cache, active_nr) ||
364364
commit_locked_index(&index_lock)))
365-
die("%s: Unable to write new index file", me);
365+
/* TRANSLATORS: %s will be "revert" or "cherry-pick" */
366+
die(_("%s: Unable to write new index file"), me);
366367
rollback_lock_file(&index_lock);
367368

368369
if (!clean) {
@@ -469,7 +470,9 @@ static int do_pick_commit(void)
469470
return fast_forward_to(commit->object.sha1, head);
470471

471472
if (parent && parse_commit(parent) < 0)
472-
die("%s: cannot parse parent commit %s",
473+
/* TRANSLATORS: The first %s will be "revert" or
474+
"cherry-pick", the second %s a SHA1 */
475+
die(_("%s: cannot parse parent commit %s"),
473476
me, sha1_to_hex(parent->object.sha1));
474477

475478
if (get_message(commit->buffer, &msg) != 0)

0 commit comments

Comments
 (0)