i18n: git-am one-line gettext $msg; echo
One-line `gettext $msg; echo' messages are the simplest use case for gettext(1). 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
81dd2fe542f68d1f4c286806ce1560b269c79275
1 file changed
+3
-3
git-am.sh
+3
-3
@@ -115,7 +115,7 @@ go_next () {
115
116
cannot_fallback () {
117
echo "$1"
118
- echo "Cannot fall back to three-way merge."
118
+ gettext "Cannot fall back to three-way merge."; echo
119
exit 1
120
}
121
@@ -645,7 +645,7 @@ do
645
646
if test -z "$GIT_AUTHOR_EMAIL"
647
then
648
- echo "Patch does not have a valid e-mail address."
648
+ gettext "Patch does not have a valid e-mail address."; echo
649
stop_here $this
650
fi
651
@@ -696,7 +696,7 @@ do
696
action=again
697
while test "$action" = again
698
do
699
- echo "Commit Body is:"
699
+ gettext "Commit Body is:"; echo
700
echo "--------------------------"
701
cat "$dotest/final-commit"
702
echo "--------------------------"