traductions
fixing merge traductions