FL-1470"clean-up gettext masks