Merge "Settings: Move strings to cm_strings.xml or cm_arrays.xml" into cm-11.0

Conflicts:
	res/values/arrays.xml
	res/values/cm_strings.xml
	res/values/strings.xml