i18n: git-am die messages

The die messages in git-am need to use:

die "$(gettext "string")"

Since gettext(1) emits the message instead of returning it like the C
equivalent, and our die() function in git-sh-setup needs to get a
string as an argument.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-am.sh b/git-am.sh
index d56c7e9df93b7680f6b5e4604f83199108977bc2..b9ec69e31b023a908cdfb13f027cfb3fd1f83b6c 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -44,7 +44,7 @@ require_work_tree
 cd_to_toplevel
 
 git var GIT_COMMITTER_IDENT >/dev/null ||
 cd_to_toplevel
 
 git var GIT_COMMITTER_IDENT >/dev/null ||

-       die "You need to set your committer info first"
+       die "$(gettext "You need to set your committer info first")"

 
 if git rev-parse --verify -q HEAD >/dev/null
 then
 
 if git rev-parse --verify -q HEAD >/dev/null
 then


@@ -362,7 +362,7 @@ do
        --rebasing)
                rebasing=t threeway=t keep=t scissors=f no_inbody_headers=t ;;
        -d|--dotest)
        --rebasing)
                rebasing=t threeway=t keep=t scissors=f no_inbody_headers=t ;;
        -d|--dotest)

-               die "-d option is no longer supported.  Do not use."
+               die "$(gettext "-d option is no longer supported.  Do not use.")"

                ;;
        --resolvemsg)
                shift; resolvemsg=$1 ;;
                ;;
        --resolvemsg)
                shift; resolvemsg=$1 ;;


@@ -425,12 +425,12 @@ then
                false
                ;;
        esac ||
                false
                ;;
        esac ||

-       die "previous rebase directory $dotest still exists but mbox given."
+       die "$(eval_gettext "previous rebase directory \$dotest still exists but mbox given.")"

        resume=yes
 
        case "$skip,$abort" in
        t,t)
        resume=yes
 
        case "$skip,$abort" in
        t,t)

-               die "Please make up your mind. --skip or --abort?"
+               die "$(gettext "Please make up your mind. --skip or --abort?")"

                ;;
        t,)
                git rerere clear
                ;;
        t,)
                git rerere clear


@@ -457,7 +457,7 @@ then
 else
        # Make sure we are not given --skip, --resolved, nor --abort
        test "$skip$resolved$abort" = "" ||
 else
        # Make sure we are not given --skip, --resolved, nor --abort
        test "$skip$resolved$abort" = "" ||

-               die "Resolve operation not in progress, we are not resuming."
+               die "$(gettext "Resolve operation not in progress, we are not resuming.")"

 
        # Start afresh.
        mkdir -p "$dotest" || exit
 
        # Start afresh.
        mkdir -p "$dotest" || exit


@@ -522,7 +522,7 @@ case "$resolved" in
        if test "$files"
        then
                test -n "$HAS_HEAD" && : >"$dotest/dirtyindex"
        if test "$files"
        then
                test -n "$HAS_HEAD" && : >"$dotest/dirtyindex"

-               die "Dirty index: cannot apply patches (dirty: $files)"
+               die "$(eval_gettext "Dirty index: cannot apply patches (dirty: \$files)")"

        fi
 esac
 
        fi
 esac
 


@@ -695,7 +695,7 @@ To restore the original branch and stop patching run \"\$cmdline --abort\"."; ec
        if test "$interactive" = t
        then
            test -t 0 ||
        if test "$interactive" = t
        then
            test -t 0 ||

-           die "cannot be interactive without stdin connected to a terminal."
+           die "$(gettext "cannot be interactive without stdin connected to a terminal.")"

            action=again
            while test "$action" = again
            do
            action=again
            while test "$action" = again
            do