Update strings.xml
Merge remote-tracking branch 'origin/patch-5' into patch-6