CS-4766 Fix several issues with translation of support settings
Merge pull request #906 from danielhjames/CS-4766

CS-4766 Fix several issues with translation of support settings