fix CRM-12004
fix CRM-12005
Fix ts() usage in activityView() popup.
Merge pull request #28 from mlutfy/ts-fixes

Fix ts() usage in activityView() popup.
sync with upstream master
Merge pull request #14 from dlobo/CRM-12005

Fix for CRM-12005 and CRM-12004