Merge pull request #321 from HeikoAdams/master

Updated german translation
Merge remote-tracking branch 'upstream/master'