L10N Part 7 - more fixes and conversions