From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Sun, 5 Sep 2010 14:54:15 +0000 (+0000)
Subject: gettextize: git-revert split up "could not revert/apply" message
X-Git-Tag: ko-pu~10^2~69
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=72f5487af018b318647b234af6bbee4189990f03;p=git.git

gettextize: 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 <avarab@gmail.com>
---

diff --git a/builtin/revert.c b/builtin/revert.c
index 48b137357..c8463d23c 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -521,8 +521,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..bf664ece0 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 NO_GETTEXT_POISON 'advice from failed cherry-pick' "
 	git checkout -f initial^0 &&
 	git read-tree -u --reset HEAD &&
 	git clean -d -f -f -q -x &&