From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Sat, 21 May 2011 18:43:53 +0000 (+0000)
Subject: i18n: git-am printf(1) message to eval_gettext
X-Git-Tag: v1.7.7-rc0~116^2~36
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=39dc30dc1b4335083e322495567093d3886bc09b;p=git.git

i18n: git-am printf(1) message to eval_gettext

Convert a message that used printf(1) format to use eval_gettext. It's
easier for translators to handle the latter, since the eval format
automatically gives them context via variable names.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-am.sh b/git-am.sh
index 72d4c03b6..463c741df 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -797,7 +797,7 @@ did you forget to use 'git add'?"; echo
 	fi
 	if test $apply_status != 0
 	then
-		printf 'Patch failed at %s %s\n' "$msgnum" "$FIRSTLINE"
+		eval_gettext 'Patch failed at $msgnum $FIRSTLINE'; echo
 		stop_here_user_resolve $this
 	fi