Made i18n changes requested in #987.
Merge pull request #1709 from pjackson28/master

Made i18n changes requested in #987