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>
Ævar Arnfjörð Bjarmason committed
Feb 22, 2011 at 23:42 UTC
cb6aeb22ace0e20c19ba14fc4540e426a1a37880
2 files changed
+4
-3
builtin/revert.c
+3
-2
@@ -536,8 +536,9 @@ static int do_pick_commit(void)
536
}
537
538
if (res) {
539
- error("could not %s %s... %s",
540
- action == REVERT ? "revert" : "apply",
539
+ error(action == REVERT
540
+ ? _("could not revert %s... %s")
541
+ : _("could not apply %s... %s"),
542
find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV),
543
msg.subject);
544
print_advice();
t/t3507-cherry-pick-conflict.sh
+1
-1
@@ -38,7 +38,7 @@ test_expect_success 'failed cherry-pick does not advance HEAD' '
38
test "$head" = "$newhead"
39
'
40
41
-test_expect_success 'advice from failed cherry-pick' "
41
+test_expect_success C_LOCALE_OUTPUT 'advice from failed cherry-pick' "
42
git checkout -f initial^0 &&
43
git read-tree -u --reset HEAD &&
44
git clean -d -f -f -q -x &&