[i18n] Fix messages + refacto + minor improvements