i18n fixes
Merge branch 'master' into combi-form