updated i18n integration

This is i18n integration taking into account all the previous requested changes.