Updated Translation
Merge branch 'master' of https://github.com/mothergarage/Elementary into mothergarage

Conflicts:
	@Resources/Languages/de.txt