CRM-15233 - Fixes for i18n popups
Merge pull request #4067 from colemanw/CRM-15233

CRM-15233 - Fixes for i18n popups