improve translations
Merge branch 'master' into feat/ember-cli