Merge branch 'maint'
authorJiang Xin <worldhello.net@gmail.com>
Sat, 28 Apr 2012 15:26:36 +0000 (23:26 +0800)
committerJiang Xin <worldhello.net@gmail.com>
Sat, 28 Apr 2012 15:26:36 +0000 (23:26 +0800)
By Jiang Xin
* maint:
  l10n: Update Simplified Chinese translation
  l10n: Update git.pot (2 new messages)


Trivial merge