Merge pull request 'fix i18n missing' (#48) from fix-i18n into develop