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>
Jiang Xin committed
May 12, 2012 at 15:01 UTC
b652ada42a76548569a0dc9c9cf356343f9e1c3a
No changes.