Merge branch 'translation-DE'

Conflicts:
	src/i18n/lang_de_DE.properties