String Changes

Conflicts:
	res/values/cr_strings.xml