[PATCH 10/48] i18n: git-am "Falling back" say message

From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: May 8, 2011, 12:20 UTC
Message-ID: <1304857280-14773-11-git-send-email-avarab@gmail.com>
In-Reply-To: <1304857280-14773-1-git-send-email-avarab@gmail.com>

Make the "Falling back to patching base and 3-way merge..." message used by fall_back_3way() translatable.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 git-am.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/git-am.sh b/git-am.sh
index 2c8770b..903d1e3 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -148,7 +148,7 @@ It does not apply to blobs recorded in its index.")"
     orig_tree=$(cat "$dotest/patch-merge-base") &&
     rm -fr "$dotest"/patch-merge-* || exit 1
 
-    say Falling back to patching base and 3-way merge...
+    say "$(gettext "Falling back to patching base and 3-way merge...")"
 
     # This is not so wrong.  Depending on which base we picked,
     # orig_tree may be wildly different from ours, but his_tree

-- 
1.7.4.4