Update messages.po
Merge branch 'master' into patch-1

Conflicts:
	de/LC_MESSAGES/messages.po