fix spanish translation
Merge remote-tracking branch 'upstream/master'
fix spanish translation
Merge pull request #189 from ramabit/master

fix spanish translation
Merge branch 'master' into gh-pages