Bug 967237 - Shorten the Zh layout labels
Merge pull request #15969 from timdream/zh-layout-rename

Bug 967237 - Shorten the Zh layout labels, r=rudyl