Tiny spelling correction
[zh-tw] Synchronize with En version
Merge pull request #653 from YueLinHo/master

[zh-tw] Synchronize with En version
Merge pull request #652 from kaliczp/patch-1

Tiny spelling correction
Merge branch 'progit/master' into ja