From: Ævar Arnfjörð Bjarmason Date: Mon, 13 Sep 2010 18:53:21 +0000 (+0000) Subject: gettextize: git-pull split up "no candidate" message X-Git-Tag: ko-pu~10^2~37 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8b6cda76d32acf45a94e07f37f31402a2355ea87;p=git.git gettextize: git-pull split up "no candidate" message Signed-off-by: Ævar Arnfjörð Bjarmason --- diff --git a/git-pull.sh b/git-pull.sh index a509f86de..69281b04f 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -147,13 +147,14 @@ error_on_no_merge_candidates () { if [ $# -gt 1 ]; then if [ "$rebase" = true ]; then - printf "There is no candidate for rebasing against " + gettext "There is no candidate for rebasing against among the refs that you just fetched. +Generally this means that you provided a wildcard refspec which had no +matches on the remote end."; echo else - printf "There are no candidates for merging " + gettext "There are no candidates for merging against among the refs that you just fetched. +Generally this means that you provided a wildcard refspec which had no +matches on the remote end."; echo fi - echo "among the refs that you just fetched." - echo "Generally this means that you provided a wildcard refspec which had no" - echo "matches on the remote end." elif [ $# -gt 0 ] && [ "$1" != "$remote" ]; then echo "You asked to pull from the remote '$1', but did not specify" echo "a branch. Because this is not the default configured remote"