Huge fix for translation file
Merge branch 'master' into stable