Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
add missing translation
review German
Merge pull request #169 from MichaelKohler/germanreview1

review German
Merge pull request #168 from ramabit/master

add missing translation (es)
Merge branch 'master' into gh-pages