complete translation
Merge pull request #2 from will928/master

complete translation