More i18n, v1.0 ready