properly escapes the translated strings in html entities
Merge branch 'dev' into dotcom