Changes by Dennis-Spanish Translation:
fix merge