bug 962187 - stop l10n conversions during merge; r=rail