Merge pull request #1 from hrydgard/master

Update
Merge pull request #2 from hrydgard/master
Merge remote-tracking branch 'upstream/master'
more work on the german translation
Merge pull request #913 from Apology11/master

more work on the german translation