Add chinese/spanish support and simplify content fields

There is now just one!
Merge branch 'add-multi-lang-content-support'