i18n improvements for ja-jp and es-eu