gettextize: git-pull eval_gettext + die message

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>

diff --git a/git-pull.sh b/git-pull.sh
index 324ac95267bb5d21ce2cfd5282560cefc71be316..8c0ea23ac13bdabf978cedfc089545b0231e682c 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -238,12 +238,12 @@ then
        echo >&2 "Warning: commit $orig_head."
        git update-index -q --refresh
        git read-tree -u -m "$orig_head" "$curr_head" ||
-               die 'Cannot fast-forward your working tree.
+               die "$(eval_gettext "Cannot fast-forward your working tree.
 After making sure that you saved anything precious from
-$ git diff '$orig_head'
+$ git diff \$orig_head
 output, run
 $ git reset --hard
-to recover.'
+to recover.")"
 
 fi