Added german strings
manual merge
Merge branch 'nic547-germanstrings'