Fixed merge error (mainly new translation entity format in templates)

Merge error from 2a35f2f928059620aa55a41458af48c0effb8ced,
which was then further regressed by Sam running the text collector
on those faulty templates: 750b5b4079510ff1edc16dadf5a8b2a65258c072