fix chinese translation
Merge branch 'master' of github.com:collective/plone.app.locales

Conflicts:
	plone/app/locales/locales-addons/zh_CN/LC_MESSAGES/plone.app.caching.po
	plone/app/locales/locales-addons/zh_CN/LC_MESSAGES/plone.app.ldap.po
Merge branch 'master' of github.com:collective/plone.app.locales
fix Chinese translation