i18n: git-am gettext + gettext to stderr message

Signed-off-by: Junio C Hamano <[email protected]>
huyle · May 21, 2011 · 22fdd11 · 22fdd11
1 parent a4372c3
commit 22fdd11
Showing 1 changed file with 5 additions and 2 deletions.
diff --git 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
 }