From: Ævar Arnfjörð Bjarmason Date: Mon, 13 Sep 2010 19:03:26 +0000 (+0000) Subject: gettextize: git-pull "[...] not currently on a branch" message X-Git-Tag: ko-pu~10^2~35 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e13a8efbcc2ec93071fd164aaf142f79374438b8;p=git.git gettextize: git-pull "[...] not currently on a branch" message Signed-off-by: Ævar Arnfjörð Bjarmason --- diff --git a/git-pull.sh b/git-pull.sh index 4c08623b9..380137b0a 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -163,11 +163,11 @@ matches on the remote end."; echo a branch. Because this is not the default configured remote for your current branch, you must specify a branch on the command line."; echo elif [ -z "$curr_branch" ]; then - echo "You are not currently on a branch, so I cannot use any" - echo "'branch..merge' in your configuration file." - echo "Please specify which remote branch you want to use on the command" - echo "line and try again (e.g. 'git pull ')." - echo "See git-pull(1) for details." + gettext "You are not currently on a branch, so I cannot use any +'branch..merge' in your configuration file. +Please specify which remote branch you want to use on the command +line and try again (e.g. 'git pull '). +See git-pull(1) for details."; echo elif [ -z "$upstream" ]; then echo "You asked me to pull without telling me which branch you" echo "want to $op_type $op_prep, and 'branch.${curr_branch}.merge' in"