Translated the UI
Merge branch 'develop' into feature/Danny_1