Merge remote-tracking branch 'origin/main' into feat/linear-ui-redesign

# Conflicts:
#	src/components/PromoDiscountBadge.tsx

src/locales/en.json

@@ -322,7 +322,7 @@
       "title": "Choose a plan to continue",
       "description": "Your trial period is ending soon. Select a plan to continue using VPN without restrictions."
     },
-    "expired": {
+    "expiredBanner": {
       "title": "Subscription expired",
       "selectTariff": "Your subscription has expired. Choose a plan below to restore access to VPN."
     },
@@ -2567,6 +2567,15 @@
       "activating": "Activating...",
       "activate": "Activate",
       "serverAccess": "Server access"
+    },
+    "deactivate": {
+      "button": "Cancel promo code",
+      "confirmTitle": "Cancel promo code?",
+      "confirmDescription": "Are you sure you want to cancel the {{percent}}% discount? After cancellation, you will be able to activate another promo code.",
+      "warning": "A cancelled promo code cannot be reused. The discount will stop working immediately.",
+      "confirm": "Cancel discount",
+      "deactivating": "Cancelling...",
+      "error": "Failed to cancel promo code. Please try again later."
     }
   },
   "telegramRedirect": {