Proofread strings.xml for American English

Updated main/res/values/strings.xml, fixed errors in English
spelling/grammar/phrasing.

This commit should contain no other code. I'm bad at git, sorry about that
:p
fix conflict from manual merge in strings.xml