New i18n strategy
New i18n solution done