Fixed merge problems. Added new translations.