Fix derp

Change-Id: Ic1ec7b4cca82a52db0f874d855a3b61c7b6e7348

Conflicts:

	res/values/strings.xml
fix up some strings