fixing string.xml screwup due to my improper merge