summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2011-02-22 23:42:31 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-03-10 07:52:57 (GMT)
commitcb6aeb22ace0e20c19ba14fc4540e426a1a37880 (patch)
tree0813d8bb9fb04e33386c6430d0b669031c54082d
parentb9c993e017715e07615df30091b0fe5f556df13d (diff)
downloadgit-cb6aeb22ace0e20c19ba14fc4540e426a1a37880.zip
git-cb6aeb22ace0e20c19ba14fc4540e426a1a37880.tar.gz
git-cb6aeb22ace0e20c19ba14fc4540e426a1a37880.tar.bz2
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 <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin/revert.c5
-rwxr-xr-xt/t3507-cherry-pick-conflict.sh2
2 files changed, 4 insertions, 3 deletions
diff --git a/builtin/revert.c b/builtin/revert.c
index b0a5ffb..98dfd4d 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 607bf25..f7e4072 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 &&