From 8b6cda76d32acf45a94e07f37f31402a2355ea87 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Mon, 13 Sep 2010 18:53:21 +0000 Subject: [PATCH] gettextize: git-pull split up "no candidate" message MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Ævar Arnfjörð Bjarmason --- git-pull.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) 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" -- 2.30.2