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