Fix Spanish translation
fix the mergies