Merge branch 'maint' into master

By Ralf Thielow(1) and Jiang Xin(1) * maint: l10n: de.po: translate 3 new messages l10n: zh_CN.po: translate 3 new messages

Jiang Xin committed May 16, 2012 at 07:32 UTC 154ca11d4b6b17fd03d0f70cb71e437708753261

No changes.