German translation
Merge pull request #332 from mahet/master

German translation
Merge remote-tracking branch 'upstream/master'