summaryrefslogtreecommitdiff
path: root/git-submodule.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-07-31 09:41:51 -0700
committerJunio C Hamano <gitster@pobox.com>2012-07-31 09:41:52 -0700
commit5fe1484a9b89e22f14d94d5b050c39db7ad65c81 (patch)
treedc63d0ad35083533b24e889f99e4cfe13844e043 /git-submodule.sh
parent3b2d763db07f251e424d7f940938d9df1e1d4d09 (diff)
parent55653a689e17cfa896aa0454e751a9002b519f4b (diff)
downloadgit-5fe1484a9b89e22f14d94d5b050c39db7ad65c81.tar.gz
Merge branch 'jx/i18n-1.7.11'
Add i18n support for scripted Porcelains, and mark strings in merge(-recursive), am, and rebase for i18n. * jx/i18n-1.7.11: i18n: merge-recursive: mark strings for translation Remove dead code which contains bad gettext block i18n: am: mark more strings for translation rebase: remove obsolete and unused LONG_USAGE which breaks xgettext i18n: Rewrite gettext messages start with dash i18n: rebase: mark messages for translation i18n: New keywords for xgettext extraction from sh
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 9210f3af56..aac575e74f 100755
--- 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