added translations
fixed merge