From: Vasco Almeida <vascomalmeida@sapo.pt>
Date: Fri, 17 Jun 2016 20:20:59 +0000 (+0000)
Subject: i18n: rebase: mark placeholder for translation
X-Git-Tag: v2.10.0-rc0~45^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c36d8eee49cdf9c12ef66cfc3a780d3a1de3edd2;p=thirdparty%2Fgit.git

i18n: rebase: mark placeholder for translation

Mark placeholder "<branch>" in git-rebase.sh for translation. The string
containing the named placeholder is passed to shell function
error_on_missing_default_upstream in git-parse-remote.sh which uses it
to display a command hint for the user.

Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-rebase.sh b/git-rebase.sh
index 1fadc04164..9ba21ab6a1 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -449,7 +449,7 @@ then
 		then
 			. git-parse-remote
 			error_on_missing_default_upstream "rebase" "rebase" \
-				"against" "git rebase <branch>"
+				"against" "git rebase $(gettext '<branch>')"
 		fi
 
 		test "$fork_point" = auto && fork_point=t