Langauge/locale overhaul