Merge pull request #1 from Uriziel/master

Merge upstream
translated some strings to German
translated some more strings into German!
Merge pull request #48 from nilsding/master

Translated some strings into German