Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
add missing translation
Merge pull request #168 from ramabit/master

add missing translation (es)