Merge robin0van0der0v's language diffs

Conflicts:
	res/values-pl/strings.xml