kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Ævar Arnfjörð Bjarmason 2011-05-21 18:43:43 +00:00 committed by Junio C Hamano
parent b9a972691e
commit 81dd2fe542
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
git-am.sh
View File

@ -115,7 +115,7 @@ go_next () {


cannot_fallback () { cannot_fallback () {
echo "$1" echo "$1"
echo "Cannot fall back to three-way merge." gettext "Cannot fall back to three-way merge."; echo
exit 1 exit 1
} }


@ -645,7 +645,7 @@ do


if test -z "$GIT_AUTHOR_EMAIL" if test -z "$GIT_AUTHOR_EMAIL"
then 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 stop_here $this
fi fi


@ -696,7 +696,7 @@ do
action=again action=again
while test "$action" = again while test "$action" = again
do do
echo "Commit Body is:" gettext "Commit Body is:"; echo
echo "--------------------------" echo "--------------------------"
cat "$dotest/final-commit" cat "$dotest/final-commit"
echo "--------------------------" echo "--------------------------"