Mark strings in git-am, git-rebase, and git-merge for translation. And contain fixes for shell gettext extraction and xgettext workaround. Jiang Xin (7): i18n: New keywords for xgettext extraction from sh i18n: rebase: mark strings for translation i18n: Rewrite gettext messages start with dash Remove obsolete LONG_USAGE which breaks xgettext i18n: am: mark more strings for translation Remove unused and bad gettext block from git-am i18n: merge-recursive: mark strings for translation Makefile | 3 +- git-am.sh | 14 ++-- git-rebase.sh | 83 +++++++++-------------- git-submodule.sh | 2 +- merge-recursive.c | 152 ++++++++++++++++++++++-------------------- t/t3404-rebase-interactive.sh | 2 +- 6 files changed, 120 insertions(+), 136 deletions(-) -- 1.7.11.2.259.g37fc0e1 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html