Bug 984882 - 946874 l10n follow up.