fix broken lines from reset and re-merge

...

 On branch jb422
 Changes to be committed:

	modified:   res/values/arrays.xml
	modified:   res/values/strings.xml