Merge branch 'l10n-thynson' of git://github.com/thynson/git-po-zh_CN into maint * 'l10n-thynson' of git://github.com/thynson/git-po-zh_CN: l10n: Improve many translation for zh_CN l10n: Unify the translation for '(un)expected'