Translation correction
Merge branch 'dev_Manuel' into dev
Merge branch 'dev'