Add types translations
Resolve transalations conflicts