Organize and clean up internationalization file keys (#2741)

Organize and clean up internationalization file keys (#2741) #5958