Skip to content

Commit

Permalink
i18n: git-revert literal "me" messages
Browse files Browse the repository at this point in the history
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 <jrnieder@gmail.com>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Ævar Arnfjörð Bjarmason authored and Junio C Hamano committed Mar 10, 2011
1 parent d3ee177 commit b9c993e
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions builtin/revert.c
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,8 @@ static int do_recursive_merge(struct commit *base, struct commit *next,
if (active_cache_changed &&
(write_cache(index_fd, active_cache, active_nr) ||
commit_locked_index(&index_lock)))
die("%s: Unable to write new index file", me);
/* TRANSLATORS: %s will be "revert" or "cherry-pick" */
die(_("%s: Unable to write new index file"), me);
rollback_lock_file(&index_lock);

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

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

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

0 comments on commit b9c993e

Please sign in to comment.