i18n: merge-recursive: mark strings for translation
authorJiang Xin <worldhello.net@gmail.com>
Wed, 25 Jul 2012 14:53:13 +0000 (22:53 +0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 27 Jul 2012 05:34:15 +0000 (22:34 -0700)
commit55653a689e17cfa896aa0454e751a9002b519f4b
tree8666b61b1ee3af4a938b49f6f1508fdc2bcce6ad
parent31023e0a9fdba7ed6458caf2082dd6d82df6a56c
i18n: merge-recursive: mark strings for translation

Mark strings in merge-recursive for translation.

Some tests would start to fail with GETTEXT_POISON turned on after
this update.  Use test_i18ncmp and test_i18ngrep where appropriate
to mark strings that should only be checked in the C locale output
to avoid such issues.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Reviewed-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-recursive.c
t/t6022-merge-rename.sh
t/t6042-merge-rename-corner-cases.sh