Merge fixes

Thanks for your attention. I revised the merge and made some improvements thanks to alternate version for the spanish locale.