More changes to strings.xml to fix some merge conflicts