Merge pull request #3259 from capilkey/cc-combined-messages

bigbluebutton-client/locale/en_US/bbbResources.properties

bigbluebutton-client/resources/config.xml.template

bigbluebutton-client/resources/prod/layout.xml

.../src/org/bigbluebutton/main/views/ShortcutHelpWindow.mxml

...org/bigbluebutton/modules/caption/model/CaptionOptions.as

...rc/org/bigbluebutton/modules/caption/model/Transcripts.as

...rg/bigbluebutton/modules/caption/views/CaptionWindow.mxml

...c/org/bigbluebutton/modules/caption/views/OptionsTab.mxml

...nt/src/org/bigbluebutton/modules/caption/views/TextTab.as