CRM-12594 more text fixes
Merge pull request #1027 from kurund/CRM-12594

CRM-12594 more text fixes