#2915: German translation of warning
Merge branch 'release' into upstream

Conflicts:
	main/res/values-de/strings.xml