Adjust some strings

Change-Id: I5a64f1aea30bcada93e1f8477d19c738760b1801

Conflicts:
	res/values/cr_strings.xml