adding translations
Merge branch 'devel' into translations
Merge branch 'translations' into devel