fix some translation error and typo
improve
merge conflict from upstream
Merge pull request #12 from myst729/master

improve translation and fix some typo