Update & improve string translation
Merge pull request #549 from ngonchan/master

Update & improve string translation