Changed some variable names
Merged with idiomas