Update strings.xml

Merging