From: Ævar Arnfjörð Bjarmason Date: Sun, 08 May 2011 12:20:48 GMT Subject: [PATCH 16/48] i18n: git-pull eval_gettext + warning message Message-ID: <1304857280-14773-17-git-send-email-avarab@gmail.com> In-Reply-To: <1304857280-14773-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 06dcd81..79ba9ab 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -217,9 +217,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.4.4