Merge branch 'va/i18n'