Feature/translations 25 7 2