From 25b4e1a015d5990b35c6d1ad7669800a0b9cfb09 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Sun, 5 Sep 2010 14:34:40 +0000 Subject: [PATCH] gettextize: git-revert literal "me" messages MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 --- builtin/revert.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/builtin/revert.c b/builtin/revert.c index 515fcf691..48b137357 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -347,7 +347,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) { @@ -454,7 +455,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) @@ -576,7 +579,8 @@ static int revert_or_cherry_pick(int argc, const char **argv) } if (read_cache() < 0) - die("git %s: failed to read the index", me); + /* TRANSLATORS: %s will be "revert" or "cherry-pick" */ + die(_("git %s: failed to read the index"), me); prepare_revs(&revs); -- 2.30.2