Merge branch 'maint'
authorJiang Xin <worldhello.net@gmail.com>
Sat, 12 May 2012 07:01:22 +0000 (15:01 +0800)
committerJiang Xin <worldhello.net@gmail.com>
Sat, 12 May 2012 07:01:22 +0000 (15:01 +0800)
* maint:
  l10n: zh_CN.po: translate 1 new message

Conflicts:
po/zh_CN.po

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

Trivial merge