From: Ævar Arnfjörð Bjarmason Date: Tue, 22 Feb 2011 23:42:30 +0000 (+0000) Subject: i18n: git-revert literal "me" messages X-Git-Tag: v1.7.5-rc1~19^2~2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b9c993e017715e07615df30091b0fe5f556df13d;p=git.git 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 Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano --- diff --git a/builtin/revert.c b/builtin/revert.c index 02c23c957..b0a5ffb18 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -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) { @@ -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)