Update strings.xml
merge
Merge branch 'bittachi-master'