From: Jiang Xin <worldhello.net@gmail.com>
Date: Wed, 25 Jul 2012 14:53:13 +0000 (+0800)
Subject: i18n: merge-recursive: mark strings for translation
X-Git-Tag: v1.7.12-rc2~10^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/55653a689e17cfa896aa0454e751a9002b519f4b?hp=55653a689e17cfa896aa0454e751a9002b519f4b

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>
---