Re-commit of previous commit

Move strings to strings.xml