fix some translations
remove debugs
Merge branch 'master' into release