merge fixes from l10n wiki