fix translations
merge