Merge branch 'master' of github.com:mattermost/mattermost-server into MM-51692-delete-reason-feedback-is-sending-notifications-with-translated-text

webapp/channels/src/components/admin_console/billing/delete_workspace/delete_workspace_cta.tsx

@@ -15,8 +15,6 @@ import {isCloudLicense} from 'utils/license_utils';
 
 import {getCloudSubscription, getSubscriptionProduct} from 'mattermost-redux/selectors/entities/cloud';
 
-import ExternalLink from 'components/external_link';
-
 import DeleteWorkspaceModal from './delete_workspace_modal';
 
 export default function DeleteWorkspaceCTA() {
@@ -80,17 +78,15 @@ export default function DeleteWorkspaceCTA() {
                         }}
                     />
                 </div>
-                <ExternalLink
-                    href=''
-                    location='delete_workspace_cta'
-                    className='cancelSubscriptionSection__contactUs'
+                <button
+                    className='btn cancelSubscriptionSection__contactUs'
                     onClick={handleOnClickDelete}
                 >
                     <FormattedMessage
                         id='admin.billing.subscription.deleteWorkspaceSection.delete'
                         defaultMessage='Delete Workspace'
                     />
-                </ExternalLink>
+                </button>
             </div>
         </div>
     );

webapp/channels/src/i18n/en.json

@@ -4167,11 +4167,11 @@
   "more_channels.join": "Join",
   "more_channels.joining": "Joining...",
   "more_channels.next": "Next",
-  "more_channels.noMore": "No results for \"{text}\"",
+  "more_channels.noMore": "No more channels to join",
   "more_channels.prev": "Previous",
   "more_channels.show_archived_channels": "Channel Type: Archived",
   "more_channels.show_public_channels": "Channel Type: Public",
-  "more_channels.title": "Browse Channels",
+  "more_channels.title": "More Channels",
   "more_channels.view": "View",
   "more_direct_channels.directchannel.deactivated": "{displayname} - Deactivated",
   "more_direct_channels.directchannel.you": "{displayname} (you)",