fix text and template tags
Update PO/MO
Update PO/MO
Merge branch 'develop' into feature/agent-ui