Merge branch 'maint'

By Jiang Xin * maint: l10n: Update Simplified Chinese translation l10n: Update git.pot (2 new messages)

Jiang Xin committed Apr 28, 2012 at 23:26 UTC fac15bc683b227c0da0114aefd73df3b445f0b62

No changes.