preventpower

merge new code

 Changes to be committed:
	modified:   core/res/res/values/strings.xml