Code

Merge pull request from jiangxin/master
authorJiang Xin <worldhello.net@gmail.com>
Tue, 28 Feb 2012 16:40:07 +0000 (00:40 +0800)
committerJiang Xin <worldhello.net@gmail.com>
Tue, 28 Feb 2012 16:40:07 +0000 (00:40 +0800)
l10n: translation for Simplified Chinese.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

Trivial merge