Merge pull request #6814 from KeerthiKumarR/fix-shortcuts-i18n