i18n: git-pull die messages

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

diff --git a/git-pull.sh b/git-pull.sh
index 05011b1d8e02213e8f0fccf1d170c0c10112cc25..acb0c37731139778dcfaf85f69434a9c16d7bf8a 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -18,20 +18,20 @@ cd_to_toplevel
 die_conflict () {
     git diff-index --cached --name-status -r --ignore-submodules HEAD --
     if [ $(git config --bool --get advice.resolveConflict || echo true) = "true" ]; then
 die_conflict () {
     git diff-index --cached --name-status -r --ignore-submodules HEAD --
     if [ $(git config --bool --get advice.resolveConflict || echo true) = "true" ]; then

-       die "Pull is not possible because you have unmerged files.
+       die "$(gettext "Pull is not possible because you have unmerged files.

 Please, fix them up in the work tree, and then use 'git add/rm <file>'
 Please, fix them up in the work tree, and then use 'git add/rm <file>'

-as appropriate to mark resolution, or use 'git commit -a'."
+as appropriate to mark resolution, or use 'git commit -a'.")"

     else
     else

-       die "Pull is not possible because you have unmerged files."
+       die "$(gettext "Pull is not possible because you have unmerged files.")"

     fi
 }
 
 die_merge () {
     if [ $(git config --bool --get advice.resolveConflict || echo true) = "true" ]; then
     fi
 }
 
 die_merge () {
     if [ $(git config --bool --get advice.resolveConflict || echo true) = "true" ]; then

-       die "You have not concluded your merge (MERGE_HEAD exists).
-Please, commit your changes before you can merge."
+       die "$(gettext "You have not concluded your merge (MERGE_HEAD exists).
+Please, commit your changes before you can merge.")"

     else
     else

-       die "You have not concluded your merge (MERGE_HEAD exists)."
+       die "$(gettext "You have not concluded your merge (MERGE_HEAD exists).")"

     fi
 }
 
     fi
 }
 


@@ -186,7 +186,7 @@ test true = "$rebase" && {
                # On an unborn branch
                if test -f "$GIT_DIR/index"
                then
                # On an unborn branch
                if test -f "$GIT_DIR/index"
                then

-                       die "updating an unborn branch with changes added to the index"
+                       die "$(gettext "updating an unborn branch with changes added to the index")"

                fi
        else
                require_clean_work_tree "pull with rebase" "Please commit or stash them."
                fi
        else
                require_clean_work_tree "pull with rebase" "Please commit or stash them."


@@ -242,11 +242,11 @@ case "$merge_head" in
 ?*' '?*)
        if test -z "$orig_head"
        then
 ?*' '?*)
        if test -z "$orig_head"
        then

-               die "Cannot merge multiple branches into empty head"
+               die "$(gettext "Cannot merge multiple branches into empty head")"

        fi
        if test true = "$rebase"
        then
        fi
        if test true = "$rebase"
        then

-               die "Cannot rebase onto multiple branches"
+               die "$(gettext "Cannot rebase onto multiple branches")"

        fi
        ;;
 esac
        fi
        ;;
 esac