Added spanish translation
Testing locale setting for the translations
Fixing conflicts