Improving handling of l10n files