i18n: git-am cannot_fallback messages
Translate messages with gettext(1) before they're passed to the cannot_fallback function, just like we handle the die function. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ævar Arnfjörð Bjarmason committed
May 21, 2011 at 18:43 UTC
a424ca157fec59d0fd7f1fbd8c9b48059fa0b375
1 file changed
+3
-3
git-am.sh
+3
-3
@@ -133,7 +133,7 @@ fall_back_3way () {
133
"$dotest/patch" &&
134
GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \
135
git write-tree >"$dotest/patch-merge-base+" ||
136
- cannot_fallback "Repository lacks necessary blobs to fall back on 3-way merge."
136
+ cannot_fallback "$(gettext "Repository lacks necessary blobs to fall back on 3-way merge.")"
137
138
say Using index info to reconstruct a base tree...
139
if GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \
@@ -142,8 +142,8 @@ fall_back_3way () {
142
mv "$dotest/patch-merge-base+" "$dotest/patch-merge-base"
143
mv "$dotest/patch-merge-tmp-index" "$dotest/patch-merge-index"
144
else
145
- cannot_fallback "Did you hand edit your patch?
146
-It does not apply to blobs recorded in its index."
145
+ cannot_fallback "$(gettext "Did you hand edit your patch?
146
+It does not apply to blobs recorded in its index.")"
147
fi
148
149
test -f "$dotest/patch-merge-index" &&