Makeover i18n

Let's start with this, and work our way forward :-)