Feature/translations 2