tree 8666b61b1ee3af4a938b49f6f1508fdc2bcce6ad
parent 31023e0a9fdba7ed6458caf2082dd6d82df6a56c
author Jiang Xin <worldhello.net@gmail.com> 1343227993 +0800
committer Junio C Hamano <gitster@pobox.com> 1343367255 -0700

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>