merge String.xml

merge String.xml