Merge branch 'maint'

* maint:
  l10n: zh_CN.po: translate 1 new message

Conflicts:
	po/zh_CN.po

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
This commit is contained in:
Jiang Xin 2012-05-12 15:01:22 +08:00
commit b652ada42a

Diff Content Not Available