Traducir content, blocks y pages
Merge branch 'base' into marcen