more translations
merge fixes