Further localization work
Merge branch 'localization'

Conflicts:
	locale/de-DE.properties