Revise changes of battery

Conflicts:
	res/values/strings.xml