Shortened keys that are used in the i18n JS files
Merge pull request #3364 from pjackson28/shortenv40i18n

i18n: Shortened keys that are used in the JS files
Cleanup