From: Ævar Arnfjörð Bjarmason Date: Tue, 07 Sep 2010 16:47:43 GMT Subject: [PATCH 07/20] gettextize: git-revert "Your local changes" message Message-ID: <1283878065-19349-4-git-send-email-avarab@gmail.com> In-Reply-To: <1283877955-19105-1-git-send-email-avarab@gmail.com> Translate the "Your local changes [...]" message without using the `me' variable, instead split up the two messages so translators can translate the whole messages as-is. Reported-by: Jonathan Nieder Signed-off-by: Ævar Arnfjörð Bjarmason --- builtin/revert.c | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/builtin/revert.c b/builtin/revert.c index a93a5ba..ad2c76a 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -285,11 +285,19 @@ static NORETURN void die_dirty_index(const char *me) if (read_cache_unmerged()) { die_resolve_conflict(me); } else { - if (advice_commit_before_merge) - die(_("Your local changes would be overwritten by %s.\n" - "Please, commit your changes or stash them to proceed."), _(me)); - else - die(_("Your local changes would be overwritten by %s.\n"), _(me)); + if (advice_commit_before_merge) { + if (action == REVERT) + die(_("Your local changes would be overwritten by revert.\n" + "Please, commit your changes or stash them to proceed.")); + else + die(_("Your local changes would be overwritten by cherry-pick.\n" + "Please, commit your changes or stash them to proceed.")); + } else { + if (action == REVERT) + die("Your local changes would be overwritten by revert.\n"); + else + die("Your local changes would be overwritten by cherry-pick.\n"); + } } } -- 1.7.2.3.313.gcd15