Feature/translations 25 7