Moving some strings to strings.xml