Re Update string.xml, base_activity.xml

Re Update string.xml, base_activity.xml