translation update
Merge remote-tracking branch 'origin/pr/6'

Conflicts:
	lang/de/settings.php