fixes a i18n issues
Merge branch 'fix-1971' into fix-1976