Change some string values and add english translation
Merge remote-tracking branch 'origin/master'