Markup fix.
[zh] Sync with English version.
Merge pull request #771 from xfq/zh-translation

[zh] Sync with English version.
Merge branch 'progit/master' into ja