summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2011-05-21 18:43:43 +0000
committerJunio C Hamano <gitster@pobox.com>2011-05-21 11:57:13 -0700
commit81dd2fe542f68d1f4c286806ce1560b269c79275 (patch)
treecbee689edcfac85950e088ce4be3862bea562a76 /git-am.sh
parentb9a972691e3967166e642bd91ea229087a6b4874 (diff)
downloadgit-81dd2fe542f68d1f4c286806ce1560b269c79275.tar.gz
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>
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/git-am.sh b/git-am.sh
index 79c5ea2a57..f54f13d984 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -115,7 +115,7 @@ go_next () {
cannot_fallback () {
echo "$1"
- echo "Cannot fall back to three-way merge."
+ gettext "Cannot fall back to three-way merge."; echo
exit 1
}
@@ -645,7 +645,7 @@ do
if test -z "$GIT_AUTHOR_EMAIL"
then
- echo "Patch does not have a valid e-mail address."
+ gettext "Patch does not have a valid e-mail address."; echo
stop_here $this
fi
@@ -696,7 +696,7 @@ do
action=again
while test "$action" = again
do
- echo "Commit Body is:"
+ gettext "Commit Body is:"; echo
echo "--------------------------"
cat "$dotest/final-commit"
echo "--------------------------"