Update and improve translation
Merge pull request #663 from ngonchan/master

Update and improve translation