[PATCH v2 05/48] i18n: git-am gettext + gettext to stderr message

From

Ævar Arnfjörð Bjarmason <avarab@gmail.com>

Date

May 21, 2011, 18:43 UTC

Message-ID

<1306003469-22939-6-git-send-email-avarab@gmail.com>

In-Reply-To

<1306003469-22939-1-git-send-email-avarab@gmail.com>

---
 git-am.sh |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/git-am.sh b/git-am.sh
index 7c0273c..d56c7e9 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -89,8 +89,11 @@ safe_to_abort () {
 	then
 		return 0
 	fi
-	echo >&2 "You seem to have moved HEAD since the last 'am' failure."
-	echo >&2 "Not rewinding to ORIG_HEAD"
+	(
+		gettext "You seem to have moved HEAD since the last 'am' failure.
+Not rewinding to ORIG_HEAD" &&
+		echo
+	) >&2
 	return 1
 }
 

-- 
1.7.5.1