Merge branch 'l10n-thynson' of git://github.com/thynson/git-po-zh_CN into maint