summaryrefslogtreecommitdiff
path: root/git-submodule.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-submodule.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-submodule.sh')
-rwxr-xr-xgit-submodule.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-submodule.sh b/git-submodule.sh
index 5629d875e6..57f98945cd 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -746,7 +746,7 @@ cmd_summary() {
if [ -n "$files" ]
then
test -n "$cached" &&
- die "$(gettext -- "--cached cannot be used with --files")"
+ die "$(gettext "The --cached option cannot be used with the --files option")"
diff_cmd=diff-files
head=
fi