Update strings.xml
combat44's patch-7 branch
Merge remote-tracking branch 'origin/master'