update text
add i18n
Merge branch 'develop' into feature/thaiinhk