correcting translations
merge