FIX for issue 994, Add html_safe and fix incorrect grammer in locale files
Merge pull request #995 from m-bodmer/issue-994

Issue 994 : Add html_safe and fix incorrect grammer in locale files
Closes #994