Add translations and fix vocabularies