Update strings_activity_settings.xml

Cleaned up merge junk.