Merge branch 'develop' into 'develop'

fix scheduled post cancel button text

See merge request soapbox-pub/soapbox!2668

app/soapbox/features/scheduled-statuses/components/scheduled-status-action-bar.tsx

@@ -12,9 +12,9 @@ import type { Status as StatusEntity } from 'soapbox/types/entities';
 
 const messages = defineMessages({
   cancel: { id: 'scheduled_status.cancel', defaultMessage: 'Cancel' },
-  deleteConfirm: { id: 'confirmations.scheduled_status_delete.confirm', defaultMessage: 'Cancel' },
+  deleteConfirm: { id: 'confirmations.scheduled_status_delete.confirm', defaultMessage: 'Discard' },
   deleteHeading: { id: 'confirmations.scheduled_status_delete.heading', defaultMessage: 'Cancel scheduled post' },
-  deleteMessage: { id: 'confirmations.scheduled_status_delete.message', defaultMessage: 'Are you sure you want to cancel this scheduled post?' },
+  deleteMessage: { id: 'confirmations.scheduled_status_delete.message', defaultMessage: 'Are you sure you want to discard this scheduled post?' },
 });
 
 interface IScheduledStatusActionBar {

app/soapbox/locales/en.json

@@ -527,9 +527,9 @@
   "confirmations.revoke_session.confirm": "Revoke",
   "confirmations.revoke_session.heading": "Revoke current session",
   "confirmations.revoke_session.message": "You are about to revoke your current session. You will be signed out.",
-  "confirmations.scheduled_status_delete.confirm": "Cancel",
+  "confirmations.scheduled_status_delete.confirm": "Discard",
   "confirmations.scheduled_status_delete.heading": "Cancel scheduled post",
-  "confirmations.scheduled_status_delete.message": "Are you sure you want to cancel this scheduled post?",
+  "confirmations.scheduled_status_delete.message": "Are you sure you want to discard this scheduled post?",
   "confirmations.unfollow.confirm": "Unfollow",
   "copy.success": "Copied to clipboard!",
   "crypto_donate.explanation_box.message": "{siteTitle} accepts cryptocurrency donations. You may send a donation to any of the addresses below. Thank you for your support!",