moved strings inside of strings.xml to avoid conflict with merge (sometimes easier than solving conflict \!)