Merge branch 'va/i18n-even-more'