Merge branch 'maint-1.7.11' into maint

diff --git a/git-submodule.sh b/git-submodule.sh
index 9210f3af564356be7cccf02307b2045084b4357a..aac575e74f833c9bce28b779733b28a7611246b2 100755 (executable)
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -751,7 +751,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