From: Ævar Arnfjörð Bjarmason Date: Sat, 21 May 2011 18:43:43 GMT Subject: [PATCH v2 02/48] i18n: git-am one-line gettext $msg; echo Message-ID: <1306003469-22939-3-git-send-email-avarab@gmail.com> In-Reply-To: <1306003469-22939-1-git-send-email-avarab@gmail.com> One-line `gettext $msg; echo' messages are the simplest use case for gettext(1). Signed-off-by: Ævar Arnfjörð Bjarmason --- git-am.sh | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/git-am.sh b/git-am.sh index 79c5ea2..f54f13d 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 "--------------------------" -- 1.7.5.1