Update strings.xml

Conflicts:
	res/values/strings.xml