Merge pull request #1 from GermainZ/master

Rebase
Translated some new strings
Merge pull request #2 from Sanguinus112/master

Updated German translation