summaryrefslogtreecommitdiff
path: root/git-rebase.sh
diff options
context:
space:
mode:
authorJiang Xin <worldhello.net@gmail.com>2012-07-25 22:53:09 +0800
committerJunio C Hamano <gitster@pobox.com>2012-07-26 22:33:37 -0700
commit465d6a00e9bae9786d2b12cfda4fd80d937cad9b (patch)
tree44739ba0d3680d5179d4d1535cdfa86ff8830c8a /git-rebase.sh
parentc7108bf9ed72403bdf6274bf46263731590bffcf (diff)
downloadgit-465d6a00e9bae9786d2b12cfda4fd80d937cad9b.tar.gz
i18n: Rewrite gettext messages start with dash
Gettext message in a shell script should not start with '-', one workaround is adding '--' between gettext and the message, like: gettext -- "--exec option ..." But due to a bug in the xgettext extraction, xgettext can not extract the actual message for this case. Rewriting the message is a simpler and better solution. Reported-by: Vincent van Ravesteijn <vfr@lyx.org> Signed-off-by: Jiang Xin <worldhello.net@gmail.com> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Reviewed-by: Stefano Lattarini <stefano.lattarini@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase.sh')
-rwxr-xr-xgit-rebase.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase.sh b/git-rebase.sh
index 8710d35ab3..705bd89c67 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -317,7 +317,7 @@ test $# -gt 2 && usage
if test -n "$cmd" &&
test "$interactive_rebase" != explicit
then
- die "$(gettext -- "--exec option must be used with --interactive option")"
+ die "$(gettext "The --exec option must be used with the --interactive option")"
fi
if test -n "$action"