added German translations
added German translations and resoved conflicts