From: Ævar Arnfjörð Bjarmason Date: Tue, 22 Feb 2011 23:42:31 +0000 (+0000) Subject: i18n: git-revert split up "could not revert/apply" message X-Git-Tag: v1.7.5-rc1~19^2~1 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=cb6aeb22ace0e20c19ba14fc4540e426a1a37880;p=git.git i18n: git-revert split up "could not revert/apply" message Split up the "could not %s %s... %s" message into "could not revert %s... %s" and "could not apply %s... %s". This makes it easier for translators to understand the message. Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano --- diff --git a/builtin/revert.c b/builtin/revert.c index b0a5ffb18..98dfd4d13 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -536,8 +536,9 @@ static int do_pick_commit(void) } if (res) { - error("could not %s %s... %s", - action == REVERT ? "revert" : "apply", + error(action == REVERT + ? _("could not revert %s... %s") + : _("could not apply %s... %s"), find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV), msg.subject); print_advice(); diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh index 607bf25d8..f7e407231 100755 --- a/t/t3507-cherry-pick-conflict.sh +++ b/t/t3507-cherry-pick-conflict.sh @@ -38,7 +38,7 @@ test_expect_success 'failed cherry-pick does not advance HEAD' ' test "$head" = "$newhead" ' -test_expect_success 'advice from failed cherry-pick' " +test_expect_success C_LOCALE_OUTPUT 'advice from failed cherry-pick' " git checkout -f initial^0 && git read-tree -u --reset HEAD && git clean -d -f -f -q -x &&