Fix english version and add more translations
Merge branch 'master' into staging