[Sorry, bad patch series number, resend again. I'm sleepy.] Marked messages for translation in git-am, git-rebase, and git-merge. Also fixed suffered tests when turning GETTEXT_POISON switch on. Jiang Xin (7): i18n: New keywords for xgettext extraction from sh i18n: rebase: mark messages for translation i18n: Rewrite gettext messages start with dash Remove obsolete LONG_USAGE which breaks xgettext i18n: am: mark more strings for translation Remove dead code which contains bad gettext block i18n: merge-recursive: mark strings for translation Makefile | 3 +- git-am.sh | 20 ++--- git-rebase.sh | 89 ++++++++------------- git-submodule.sh | 2 +- merge-recursive.c | 148 +++++++++++++++++++---------------- t/t0201-gettext-fallbacks.sh | 8 +- t/t3400-rebase.sh | 8 +- t/t3404-rebase-interactive.sh | 2 +- t/t3406-rebase-message.sh | 9 ++- t/t6022-merge-rename.sh | 16 ++-- t/t6042-merge-rename-corner-cases.sh | 2 +- 11 files changed, 150 insertions(+), 157 deletions(-) -- 1.7.12.rc0.16.gf4916ac -- 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