| commit | 5fe1484a9b89e22f14d94d5b050c39db7ad65c81 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 31 Jul 2012 16:41:51 +0000 (31 09:41 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 31 Jul 2012 16:41:52 +0000 (31 09:41 -0700) | ||
| tree | dc63d0ad35083533b24e889f99e4cfe13844e043 | treesnapshot (tar.gz zip) |
| parent | 3b2d763db07f251e424d7f940938d9df1e1d4d09 | commitdiff |
| parent | 55653a689e17cfa896aa0454e751a9002b519f4b | commitdiff |
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
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
| Makefile | diff1 | diff2 | blobhistory |
| git-am.sh | diff1 | diff2 | blobhistory |
| git-submodule.sh | diff1 | diff2 | blobhistory |
| t/t3404-rebase-interactive.sh | diff1 | diff2 | blobhistory |