From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Mon, 13 Sep 2010 18:49:29 +0000 (+0000)
Subject: gettextize: git-pull eval_gettext + warning message
X-Git-Tag: ko-pu~10^2~38
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=62d5559e7189f3b570fa699eea4d7189e9381ca9;p=git.git

gettextize: git-pull eval_gettext + warning message

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

diff --git a/git-pull.sh b/git-pull.sh
index 8c0ea23ac..a509f86de 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -233,9 +233,9 @@ then
 	# $orig_head commit, but we are merging into $curr_head.
 	# First update the working tree to match $curr_head.
 
-	echo >&2 "Warning: fetch updated the current branch head."
-	echo >&2 "Warning: fast-forwarding your working tree from"
-	echo >&2 "Warning: commit $orig_head."
+	echo >&2 "$(eval_gettext "Warning: fetch updated the current branch head.
+Warning: fast-forwarding your working tree from
+Warning: commit \$orig_head.")"
 	git update-index -q --refresh
 	git read-tree -u -m "$orig_head" "$curr_head" ||
 		die "$(eval_gettext "Cannot fast-forward your working tree.