From: Ævar Arnfjörð Bjarmason Date: Mon, 13 Sep 2010 19:35:54 GMT Subject: [PATCH/RFC 4/8] gettextize: git-pull eval_gettext + warning message Message-ID: <1284406558-23684-5-git-send-email-avarab@gmail.com> In-Reply-To: <1284406558-23684-1-git-send-email-avarab@gmail.com> Signed-off-by: Ævar Arnfjörð Bjarmason --- git-pull.sh | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/git-pull.sh b/git-pull.sh index 99837dd..f42d3e3 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. -- 1.7.3.rc1.110.g6776a.dirty