i18n: git-am gettext + gettext to stderr message

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-am.sh b/git-am.sh
index 7c0273c9add34f823739d5f87d6fb9c5f2255120..d56c7e9df93b7680f6b5e4604f83199108977bc2 100755 (executable)
--- 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
 }