Fixes for Spanish translation (thanks, ugo-h!)
Merge remote-tracking branch 'pms/master'