first try of translations
Merge branch 'master'
updated translations