diff --git a/src/i18n/messages/ar.json b/src/i18n/messages/ar.json
index f98a13c0..50860452 100644
--- a/src/i18n/messages/ar.json
+++ b/src/i18n/messages/ar.json
@@ -1,13 +1,31 @@
 {
+  "ecommerce.order.history.basic.alert.title": "Something went wrong.",
+  "ecommerce.order.history.basic.alert.body": "Refresh this page and try again. If this problem persists, {supportLink}.",
+  "ecommerce.order.history.basic.alert.button": "Dismiss",
   "error.notfound.message": "الصفحة التي تبحث عنها غير متوفرة أو هناك خطأ في العنوان. رجاءً تحقق من العنوان و حاول مجددًا.",
+  "ecommerce.order.history.support.fragment": "contact support",
   "ecommerce.order.history.page.heading": "سجل الطلبيات",
   "ecommerce.order.history.no.orders": "ستظهر هنا طلبياتك التي تقوم بها عند {siteName}",
   "ecommerce.order.history.loading.orders": "تحميل الطلبيات جارٍ...",
-  "ecommerce.order.history.loading.error": "خطأ: {error}",
   "ecommerce.order.history.view.order.detail": "عرض تفاصيل الطلبية",
   "ecommerce.order.history.table.column.items": "العناصر",
   "ecommerce.order.history.table.column.date.placed": "تاريخ الطلبية",
   "ecommerce.order.history.table.column.total.cost": "التكلفة الإجمالية",
   "ecommerce.order.history.table.column.order.number": "رقم الطلبية",
-  "ecommerce.order.history.table.column.order.details": "تفاصيل الطلبية"
+  "ecommerce.order.history.table.column.order.details": "تفاصيل الطلبية",
+  "ecommerce.order.history.main.heading": "My orders and subscriptions",
+  "ecommerce.order.history.main.subtitle": "Manage your program subscriptions and view your order history.",
+  "ecommerce.order.history.manage.subscriptions.error.heading": "Something went wrong",
+  "ecommerce.order.history.manage.subscriptions.error.body": "The page you’re looking for is unavailable or there was an error. Visit the {buttonLabel} page to manage your subscription.",
+  "ecommerce.order.history.manage.subscriptions.error.support": "If this problem persists, {supportLink}.",
+  "ecommerce.order.history.subscriptions.subtitle.empty": "You do not have any active or previous subscriptions.",
+  "ecommerce.order.history.subscriptions.heading": "Subscriptions",
+  "ecommerce.order.history.subscriptions.subtitle.zero": "You do not have an active subscription. To view your past receipts, click {buttonLabel}.",
+  "ecommerce.order.history.subscriptions.subtitle.one": "You have {activeCount} active subscription. To view your receipts, change your payment method or cancel your subscription, click {buttonLabel}.",
+  "ecommerce.order.history.subscriptions.subtitle.multiple": "You have {activeCount} active subscriptions. To view your receipts, change your payment method or cancel your subscription, click {buttonLabel}.",
+  "ecommerce.order.history.subscriptions.manage.button": "Manage my subscriptions",
+  "ecommerce.order.history.subscription.upsell.button": "Explore subscription options",
+  "ecommerce.order.history.subscription.upsell.badge": "New",
+  "ecommerce.order.history.subscription.upsell.heading": "Monthly program subscriptions {emDash} more flexible, more affordable",
+  "ecommerce.order.history.subscription.upsell.message": "Now available for many popular programs, affordable monthly subscription pricing can help you manage your budget more effectively. Subscriptions start at {minSubscriptionPrice}/month USD per program, after a {trialLength}-day full access free trial. Cancel at any time."
 }
\ No newline at end of file
diff --git a/src/i18n/messages/de.json b/src/i18n/messages/de.json
index 02d94d81..08c5fe06 100644
--- a/src/i18n/messages/de.json
+++ b/src/i18n/messages/de.json
@@ -1,13 +1,31 @@
 {
+  "ecommerce.order.history.basic.alert.title": "Something went wrong.",
+  "ecommerce.order.history.basic.alert.body": "Refresh this page and try again. If this problem persists, {supportLink}.",
+  "ecommerce.order.history.basic.alert.button": "Dismiss",
   "error.notfound.message": "The page you're looking for is unavailable or there's an error in the URL. Please check the URL and try again.",
+  "ecommerce.order.history.support.fragment": "contact support",
   "ecommerce.order.history.page.heading": "Order History",
   "ecommerce.order.history.no.orders": "Orders you place with {siteName} will appear here.",
   "ecommerce.order.history.loading.orders": "Loading orders...",
-  "ecommerce.order.history.loading.error": "Error: {error}",
   "ecommerce.order.history.view.order.detail": "View Order Details",
   "ecommerce.order.history.table.column.items": "Items",
   "ecommerce.order.history.table.column.date.placed": "Date placed",
   "ecommerce.order.history.table.column.total.cost": "Total cost",
   "ecommerce.order.history.table.column.order.number": "Order number",
-  "ecommerce.order.history.table.column.order.details": "Order details"
+  "ecommerce.order.history.table.column.order.details": "Order details",
+  "ecommerce.order.history.main.heading": "My orders and subscriptions",
+  "ecommerce.order.history.main.subtitle": "Manage your program subscriptions and view your order history.",
+  "ecommerce.order.history.manage.subscriptions.error.heading": "Something went wrong",
+  "ecommerce.order.history.manage.subscriptions.error.body": "The page you’re looking for is unavailable or there was an error. Visit the {buttonLabel} page to manage your subscription.",
+  "ecommerce.order.history.manage.subscriptions.error.support": "If this problem persists, {supportLink}.",
+  "ecommerce.order.history.subscriptions.subtitle.empty": "You do not have any active or previous subscriptions.",
+  "ecommerce.order.history.subscriptions.heading": "Subscriptions",
+  "ecommerce.order.history.subscriptions.subtitle.zero": "You do not have an active subscription. To view your past receipts, click {buttonLabel}.",
+  "ecommerce.order.history.subscriptions.subtitle.one": "You have {activeCount} active subscription. To view your receipts, change your payment method or cancel your subscription, click {buttonLabel}.",
+  "ecommerce.order.history.subscriptions.subtitle.multiple": "You have {activeCount} active subscriptions. To view your receipts, change your payment method or cancel your subscription, click {buttonLabel}.",
+  "ecommerce.order.history.subscriptions.manage.button": "Manage my subscriptions",
+  "ecommerce.order.history.subscription.upsell.button": "Explore subscription options",
+  "ecommerce.order.history.subscription.upsell.badge": "New",
+  "ecommerce.order.history.subscription.upsell.heading": "Monthly program subscriptions {emDash} more flexible, more affordable",
+  "ecommerce.order.history.subscription.upsell.message": "Now available for many popular programs, affordable monthly subscription pricing can help you manage your budget more effectively. Subscriptions start at {minSubscriptionPrice}/month USD per program, after a {trialLength}-day full access free trial. Cancel at any time."
 }
\ No newline at end of file
diff --git a/src/i18n/messages/de_DE.json b/src/i18n/messages/de_DE.json
index 6761eeea..c2102221 100644
--- a/src/i18n/messages/de_DE.json
+++ b/src/i18n/messages/de_DE.json
@@ -1,13 +1,31 @@
 {
+  "ecommerce.order.history.basic.alert.title": "Something went wrong.",
+  "ecommerce.order.history.basic.alert.body": "Refresh this page and try again. If this problem persists, {supportLink}.",
+  "ecommerce.order.history.basic.alert.button": "Dismiss",
   "error.notfound.message": "Die gesuchte Seite ist nicht verfügbar oder es liegt ein Fehler in der URL vor. Bitte überprüfen Sie die URL und versuchen Sie es erneut.",
+  "ecommerce.order.history.support.fragment": "contact support",
   "ecommerce.order.history.page.heading": "Bestellverlauf",
   "ecommerce.order.history.no.orders": "Ihre Bestellungen bei {siteName}, werden hier angezeigt.",
   "ecommerce.order.history.loading.orders": "Bestelldaten werden geladen...",
-  "ecommerce.order.history.loading.error": "Fehler: {error}",
   "ecommerce.order.history.view.order.detail": "Bestelldetails anzeigen",
   "ecommerce.order.history.table.column.items": "Auswahlmöglichkeit/en",
   "ecommerce.order.history.table.column.date.placed": "Eingestellt am",
   "ecommerce.order.history.table.column.total.cost": "Gesamtpreis",
   "ecommerce.order.history.table.column.order.number": "Bestellnummer",
-  "ecommerce.order.history.table.column.order.details": "Bestelldetails"
+  "ecommerce.order.history.table.column.order.details": "Bestelldetails",
+  "ecommerce.order.history.main.heading": "My orders and subscriptions",
+  "ecommerce.order.history.main.subtitle": "Manage your program subscriptions and view your order history.",
+  "ecommerce.order.history.manage.subscriptions.error.heading": "Something went wrong",
+  "ecommerce.order.history.manage.subscriptions.error.body": "The page you’re looking for is unavailable or there was an error. Visit the {buttonLabel} page to manage your subscription.",
+  "ecommerce.order.history.manage.subscriptions.error.support": "If this problem persists, {supportLink}.",
+  "ecommerce.order.history.subscriptions.subtitle.empty": "You do not have any active or previous subscriptions.",
+  "ecommerce.order.history.subscriptions.heading": "Subscriptions",
+  "ecommerce.order.history.subscriptions.subtitle.zero": "You do not have an active subscription. To view your past receipts, click {buttonLabel}.",
+  "ecommerce.order.history.subscriptions.subtitle.one": "You have {activeCount} active subscription. To view your receipts, change your payment method or cancel your subscription, click {buttonLabel}.",
+  "ecommerce.order.history.subscriptions.subtitle.multiple": "You have {activeCount} active subscriptions. To view your receipts, change your payment method or cancel your subscription, click {buttonLabel}.",
+  "ecommerce.order.history.subscriptions.manage.button": "Manage my subscriptions",
+  "ecommerce.order.history.subscription.upsell.button": "Explore subscription options",
+  "ecommerce.order.history.subscription.upsell.badge": "New",
+  "ecommerce.order.history.subscription.upsell.heading": "Monthly program subscriptions {emDash} more flexible, more affordable",
+  "ecommerce.order.history.subscription.upsell.message": "Now available for many popular programs, affordable monthly subscription pricing can help you manage your budget more effectively. Subscriptions start at {minSubscriptionPrice}/month USD per program, after a {trialLength}-day full access free trial. Cancel at any time."
 }
\ No newline at end of file
diff --git a/src/i18n/messages/es_419.json b/src/i18n/messages/es_419.json
index 5e8356b9..3a46b9c5 100644
--- a/src/i18n/messages/es_419.json
+++ b/src/i18n/messages/es_419.json
@@ -1,13 +1,31 @@
 {
+  "ecommerce.order.history.basic.alert.title": "Algo salió mal.",
+  "ecommerce.order.history.basic.alert.body": "Actualice esta página y vuelva a intentarlo. Si este problema persiste, {supportLink}.",
+  "ecommerce.order.history.basic.alert.button": "Despedir",
   "error.notfound.message": "La página que estas buscando no está disponible o hay un error en la URL. Por favor, comprueba la URL y vuelve a intentarlo.",
+  "ecommerce.order.history.support.fragment": "contacta al equipo de soporte",
   "ecommerce.order.history.page.heading": "Historial de órdenes",
   "ecommerce.order.history.no.orders": "Los pedidos que realices con {siteName} aparecerán aquí.",
   "ecommerce.order.history.loading.orders": "Cargando datos del pedido...",
-  "ecommerce.order.history.loading.error": "Error: {error}",
   "ecommerce.order.history.view.order.detail": "Ver detalles del pedido",
   "ecommerce.order.history.table.column.items": "Items",
   "ecommerce.order.history.table.column.date.placed": "Fecha de la orden",
   "ecommerce.order.history.table.column.total.cost": "Costo total",
   "ecommerce.order.history.table.column.order.number": "Número de orden",
-  "ecommerce.order.history.table.column.order.details": "Detalles de la orden"
+  "ecommerce.order.history.table.column.order.details": "Detalles de la orden",
+  "ecommerce.order.history.main.heading": "Mis pedidos y suscripciones",
+  "ecommerce.order.history.main.subtitle": "Gestiona tus suscripciones a programas y consulta tu historial de pedidos.",
+  "ecommerce.order.history.manage.subscriptions.error.heading": "Algo salió mal",
+  "ecommerce.order.history.manage.subscriptions.error.body": "La página que estás buscando no está disponible o hubo un error. Visite la página {buttonLabel} para administrar su suscripción.",
+  "ecommerce.order.history.manage.subscriptions.error.support": "Si este problema persiste, {supportLink}.",
+  "ecommerce.order.history.subscriptions.subtitle.empty": "No tienes suscripciones activas o anteriores.",
+  "ecommerce.order.history.subscriptions.heading": "Suscripciones",
+  "ecommerce.order.history.subscriptions.subtitle.zero": "No tienes ninguna suscripción activa. Si deseas consultar tus recibos anteriores, haz clic en {buttonLabel}.",
+  "ecommerce.order.history.subscriptions.subtitle.one": "Tienes {activeCount} suscripción activa. Si deseas consultar tus recibos, cambiar la forma de pago o cancelar la suscripción, haz clic en {buttonLabel}.",
+  "ecommerce.order.history.subscriptions.subtitle.multiple": "Tienes {activeCount} suscripciones activas. Si deseas consultar tus recibos, cambiar la forma de pago o cancelar la suscripción, haz clic en {buttonLabel}.",
+  "ecommerce.order.history.subscriptions.manage.button": "Administrar mis suscripciones",
+  "ecommerce.order.history.subscription.upsell.button": "Explora las opciones de suscripción",
+  "ecommerce.order.history.subscription.upsell.badge": "Nuevo",
+  "ecommerce.order.history.subscription.upsell.heading": "Suscripciones mensuales al programa {emDash} más flexibles, más asequibles",
+  "ecommerce.order.history.subscription.upsell.message": "Ahora disponible para muchos programas populares, el precio de suscripción mensual asequible puede ayudarlo a administrar su presupuesto de manera más efectiva. Las suscripciones comienzan en {minSubscriptionPrice}/mes USD por programa, después de una prueba gratuita de acceso completo de {trialLength} días. Cancelar en cualquier momento."
 }
\ No newline at end of file
diff --git a/src/i18n/messages/fr.json b/src/i18n/messages/fr.json
index 0d9b1640..866df1fc 100644
--- a/src/i18n/messages/fr.json
+++ b/src/i18n/messages/fr.json
@@ -1,13 +1,31 @@
 {
+  "ecommerce.order.history.basic.alert.title": "Something went wrong.",
+  "ecommerce.order.history.basic.alert.body": "Refresh this page and try again. If this problem persists, {supportLink}.",
+  "ecommerce.order.history.basic.alert.button": "Dismiss",
   "error.notfound.message": "La page que vous recherchez n'est pas disponible ou il y a une erreur dans l'URL. Veuillez vérifier l'URL et réessayer.",
+  "ecommerce.order.history.support.fragment": "contact support",
   "ecommerce.order.history.page.heading": "Historique des commandes",
   "ecommerce.order.history.no.orders": "Les commandes que vous passez avec {siteName} apparaîtront ici.",
   "ecommerce.order.history.loading.orders": "Chargement des données de la commande...",
-  "ecommerce.order.history.loading.error": "Erreur : {error}",
   "ecommerce.order.history.view.order.detail": "Voir les détails de la commande",
   "ecommerce.order.history.table.column.items": "Éléments",
   "ecommerce.order.history.table.column.date.placed": "Date d'émission",
   "ecommerce.order.history.table.column.total.cost": "Coût total",
   "ecommerce.order.history.table.column.order.number": "Numéro de commande",
-  "ecommerce.order.history.table.column.order.details": "Détails des commandes"
+  "ecommerce.order.history.table.column.order.details": "Détails des commandes",
+  "ecommerce.order.history.main.heading": "My orders and subscriptions",
+  "ecommerce.order.history.main.subtitle": "Manage your program subscriptions and view your order history.",
+  "ecommerce.order.history.manage.subscriptions.error.heading": "Something went wrong",
+  "ecommerce.order.history.manage.subscriptions.error.body": "The page you’re looking for is unavailable or there was an error. Visit the {buttonLabel} page to manage your subscription.",
+  "ecommerce.order.history.manage.subscriptions.error.support": "If this problem persists, {supportLink}.",
+  "ecommerce.order.history.subscriptions.subtitle.empty": "You do not have any active or previous subscriptions.",
+  "ecommerce.order.history.subscriptions.heading": "Subscriptions",
+  "ecommerce.order.history.subscriptions.subtitle.zero": "You do not have an active subscription. To view your past receipts, click {buttonLabel}.",
+  "ecommerce.order.history.subscriptions.subtitle.one": "You have {activeCount} active subscription. To view your receipts, change your payment method or cancel your subscription, click {buttonLabel}.",
+  "ecommerce.order.history.subscriptions.subtitle.multiple": "You have {activeCount} active subscriptions. To view your receipts, change your payment method or cancel your subscription, click {buttonLabel}.",
+  "ecommerce.order.history.subscriptions.manage.button": "Manage my subscriptions",
+  "ecommerce.order.history.subscription.upsell.button": "Explore subscription options",
+  "ecommerce.order.history.subscription.upsell.badge": "New",
+  "ecommerce.order.history.subscription.upsell.heading": "Monthly program subscriptions {emDash} more flexible, more affordable",
+  "ecommerce.order.history.subscription.upsell.message": "Now available for many popular programs, affordable monthly subscription pricing can help you manage your budget more effectively. Subscriptions start at {minSubscriptionPrice}/month USD per program, after a {trialLength}-day full access free trial. Cancel at any time."
 }
\ No newline at end of file
diff --git a/src/i18n/messages/fr_CA.json b/src/i18n/messages/fr_CA.json
index 20b01eb2..42654f28 100644
--- a/src/i18n/messages/fr_CA.json
+++ b/src/i18n/messages/fr_CA.json
@@ -1,13 +1,31 @@
 {
+  "ecommerce.order.history.basic.alert.title": "Quelque chose s'est mal passé.",
+  "ecommerce.order.history.basic.alert.body": "Actualisez cette page et réessayez. Si ce problème persiste, {supportLink}.",
+  "ecommerce.order.history.basic.alert.button": "Rejeter",
   "error.notfound.message": "La page que vous recherchez n'est pas disponible ou il y a une erreur dans l'URL. Veuillez vérifier l'URL et réessayer.",
+  "ecommerce.order.history.support.fragment": "contacter le support",
   "ecommerce.order.history.page.heading": "Historique des commandes",
   "ecommerce.order.history.no.orders": "Les commandes que vous passez avec {siteName} apparaîtront ici.",
   "ecommerce.order.history.loading.orders": "Chargement des commandes...",
-  "ecommerce.order.history.loading.error": "Erreur : {error}",
   "ecommerce.order.history.view.order.detail": "Voir les détails de la commande",
   "ecommerce.order.history.table.column.items": "Éléments",
   "ecommerce.order.history.table.column.date.placed": "Date commandée",
   "ecommerce.order.history.table.column.total.cost": "Coût total",
   "ecommerce.order.history.table.column.order.number": "Numéro de la commande",
-  "ecommerce.order.history.table.column.order.details": "Détails de la commande"
+  "ecommerce.order.history.table.column.order.details": "Détails de la commande",
+  "ecommerce.order.history.main.heading": "Mes commandes et abonnements",
+  "ecommerce.order.history.main.subtitle": "Gérez vos abonnements aux programmes et consultez l'historique de vos commandes.",
+  "ecommerce.order.history.manage.subscriptions.error.heading": "Quelque chose s'est mal passé",
+  "ecommerce.order.history.manage.subscriptions.error.body": "La page que vous recherchez n'est pas disponible ou une erreur s'est produite. Visitez la page {buttonLabel} pour gérer votre abonnement.",
+  "ecommerce.order.history.manage.subscriptions.error.support": "Si ce problème persiste, {supportLink}.",
+  "ecommerce.order.history.subscriptions.subtitle.empty": "Vous n'avez aucun abonnement actif ou antérieur.",
+  "ecommerce.order.history.subscriptions.heading": "Abonnements",
+  "ecommerce.order.history.subscriptions.subtitle.zero": "Vous n'avez pas d'abonnement actif. Pour afficher vos anciens reçus, cliquez sur {buttonLabel}.",
+  "ecommerce.order.history.subscriptions.subtitle.one": "Vous avez {activeCount} abonnement actif. Pour afficher vos reçus, modifier votre mode de paiement ou annuler votre abonnement, cliquez sur {buttonLabel}.",
+  "ecommerce.order.history.subscriptions.subtitle.multiple": "Vous avez {activeCount} abonnements actifs. Pour afficher vos reçus, modifier votre mode de paiement ou annuler votre abonnement, cliquez sur {buttonLabel}.",
+  "ecommerce.order.history.subscriptions.manage.button": "Gérer mes abonnements",
+  "ecommerce.order.history.subscription.upsell.button": "Explorer les options d'abonnement",
+  "ecommerce.order.history.subscription.upsell.badge": "Nouveau",
+  "ecommerce.order.history.subscription.upsell.heading": "Abonnements mensuels aux programmes {emDash} plus flexibles, plus abordables",
+  "ecommerce.order.history.subscription.upsell.message": "Désormais disponible pour de nombreux programmes populaires, des tarifs d'abonnement mensuels abordables peuvent vous aider à gérer votre budget plus efficacement. Les abonnements commencent à {minSubscriptionPrice}/mois USD par programme, après un essai gratuit d'accès complet de {trialLength} jours. Annulez à tout moment."
 }
\ No newline at end of file
diff --git a/src/i18n/messages/hi.json b/src/i18n/messages/hi.json
index 02d94d81..08c5fe06 100644
--- a/src/i18n/messages/hi.json
+++ b/src/i18n/messages/hi.json
@@ -1,13 +1,31 @@
 {
+  "ecommerce.order.history.basic.alert.title": "Something went wrong.",
+  "ecommerce.order.history.basic.alert.body": "Refresh this page and try again. If this problem persists, {supportLink}.",
+  "ecommerce.order.history.basic.alert.button": "Dismiss",
   "error.notfound.message": "The page you're looking for is unavailable or there's an error in the URL. Please check the URL and try again.",
+  "ecommerce.order.history.support.fragment": "contact support",
   "ecommerce.order.history.page.heading": "Order History",
   "ecommerce.order.history.no.orders": "Orders you place with {siteName} will appear here.",
   "ecommerce.order.history.loading.orders": "Loading orders...",
-  "ecommerce.order.history.loading.error": "Error: {error}",
   "ecommerce.order.history.view.order.detail": "View Order Details",
   "ecommerce.order.history.table.column.items": "Items",
   "ecommerce.order.history.table.column.date.placed": "Date placed",
   "ecommerce.order.history.table.column.total.cost": "Total cost",
   "ecommerce.order.history.table.column.order.number": "Order number",
-  "ecommerce.order.history.table.column.order.details": "Order details"
+  "ecommerce.order.history.table.column.order.details": "Order details",
+  "ecommerce.order.history.main.heading": "My orders and subscriptions",
+  "ecommerce.order.history.main.subtitle": "Manage your program subscriptions and view your order history.",
+  "ecommerce.order.history.manage.subscriptions.error.heading": "Something went wrong",
+  "ecommerce.order.history.manage.subscriptions.error.body": "The page you’re looking for is unavailable or there was an error. Visit the {buttonLabel} page to manage your subscription.",
+  "ecommerce.order.history.manage.subscriptions.error.support": "If this problem persists, {supportLink}.",
+  "ecommerce.order.history.subscriptions.subtitle.empty": "You do not have any active or previous subscriptions.",
+  "ecommerce.order.history.subscriptions.heading": "Subscriptions",
+  "ecommerce.order.history.subscriptions.subtitle.zero": "You do not have an active subscription. To view your past receipts, click {buttonLabel}.",
+  "ecommerce.order.history.subscriptions.subtitle.one": "You have {activeCount} active subscription. To view your receipts, change your payment method or cancel your subscription, click {buttonLabel}.",
+  "ecommerce.order.history.subscriptions.subtitle.multiple": "You have {activeCount} active subscriptions. To view your receipts, change your payment method or cancel your subscription, click {buttonLabel}.",
+  "ecommerce.order.history.subscriptions.manage.button": "Manage my subscriptions",
+  "ecommerce.order.history.subscription.upsell.button": "Explore subscription options",
+  "ecommerce.order.history.subscription.upsell.badge": "New",
+  "ecommerce.order.history.subscription.upsell.heading": "Monthly program subscriptions {emDash} more flexible, more affordable",
+  "ecommerce.order.history.subscription.upsell.message": "Now available for many popular programs, affordable monthly subscription pricing can help you manage your budget more effectively. Subscriptions start at {minSubscriptionPrice}/month USD per program, after a {trialLength}-day full access free trial. Cancel at any time."
 }
\ No newline at end of file
diff --git a/src/i18n/messages/it.json b/src/i18n/messages/it.json
index 02d94d81..08c5fe06 100644
--- a/src/i18n/messages/it.json
+++ b/src/i18n/messages/it.json
@@ -1,13 +1,31 @@
 {
+  "ecommerce.order.history.basic.alert.title": "Something went wrong.",
+  "ecommerce.order.history.basic.alert.body": "Refresh this page and try again. If this problem persists, {supportLink}.",
+  "ecommerce.order.history.basic.alert.button": "Dismiss",
   "error.notfound.message": "The page you're looking for is unavailable or there's an error in the URL. Please check the URL and try again.",
+  "ecommerce.order.history.support.fragment": "contact support",
   "ecommerce.order.history.page.heading": "Order History",
   "ecommerce.order.history.no.orders": "Orders you place with {siteName} will appear here.",
   "ecommerce.order.history.loading.orders": "Loading orders...",
-  "ecommerce.order.history.loading.error": "Error: {error}",
   "ecommerce.order.history.view.order.detail": "View Order Details",
   "ecommerce.order.history.table.column.items": "Items",
   "ecommerce.order.history.table.column.date.placed": "Date placed",
   "ecommerce.order.history.table.column.total.cost": "Total cost",
   "ecommerce.order.history.table.column.order.number": "Order number",
-  "ecommerce.order.history.table.column.order.details": "Order details"
+  "ecommerce.order.history.table.column.order.details": "Order details",
+  "ecommerce.order.history.main.heading": "My orders and subscriptions",
+  "ecommerce.order.history.main.subtitle": "Manage your program subscriptions and view your order history.",
+  "ecommerce.order.history.manage.subscriptions.error.heading": "Something went wrong",
+  "ecommerce.order.history.manage.subscriptions.error.body": "The page you’re looking for is unavailable or there was an error. Visit the {buttonLabel} page to manage your subscription.",
+  "ecommerce.order.history.manage.subscriptions.error.support": "If this problem persists, {supportLink}.",
+  "ecommerce.order.history.subscriptions.subtitle.empty": "You do not have any active or previous subscriptions.",
+  "ecommerce.order.history.subscriptions.heading": "Subscriptions",
+  "ecommerce.order.history.subscriptions.subtitle.zero": "You do not have an active subscription. To view your past receipts, click {buttonLabel}.",
+  "ecommerce.order.history.subscriptions.subtitle.one": "You have {activeCount} active subscription. To view your receipts, change your payment method or cancel your subscription, click {buttonLabel}.",
+  "ecommerce.order.history.subscriptions.subtitle.multiple": "You have {activeCount} active subscriptions. To view your receipts, change your payment method or cancel your subscription, click {buttonLabel}.",
+  "ecommerce.order.history.subscriptions.manage.button": "Manage my subscriptions",
+  "ecommerce.order.history.subscription.upsell.button": "Explore subscription options",
+  "ecommerce.order.history.subscription.upsell.badge": "New",
+  "ecommerce.order.history.subscription.upsell.heading": "Monthly program subscriptions {emDash} more flexible, more affordable",
+  "ecommerce.order.history.subscription.upsell.message": "Now available for many popular programs, affordable monthly subscription pricing can help you manage your budget more effectively. Subscriptions start at {minSubscriptionPrice}/month USD per program, after a {trialLength}-day full access free trial. Cancel at any time."
 }
\ No newline at end of file
diff --git a/src/i18n/messages/it_IT.json b/src/i18n/messages/it_IT.json
index 77b872ee..a8f7c195 100644
--- a/src/i18n/messages/it_IT.json
+++ b/src/i18n/messages/it_IT.json
@@ -1,13 +1,31 @@
 {
+  "ecommerce.order.history.basic.alert.title": "Something went wrong.",
+  "ecommerce.order.history.basic.alert.body": "Refresh this page and try again. If this problem persists, {supportLink}.",
+  "ecommerce.order.history.basic.alert.button": "Dismiss",
   "error.notfound.message": "La pagina ricercata non è disponibile oppure è presente un errore nell'URL. Controllare l'URL e riprovare. ",
+  "ecommerce.order.history.support.fragment": "contact support",
   "ecommerce.order.history.page.heading": "Cronologia Ordini",
   "ecommerce.order.history.no.orders": "Gli ordini che effettui con {siteName} verranno visualizzati qui.",
   "ecommerce.order.history.loading.orders": "Caricamento degli ordini...",
-  "ecommerce.order.history.loading.error": "Errore: {error}",
   "ecommerce.order.history.view.order.detail": "Visualizza dettagli ordine",
   "ecommerce.order.history.table.column.items": "Oggetti",
   "ecommerce.order.history.table.column.date.placed": "Data di emissione",
   "ecommerce.order.history.table.column.total.cost": "Costo totale ",
   "ecommerce.order.history.table.column.order.number": "Numero ordine",
-  "ecommerce.order.history.table.column.order.details": "Dettagli ordine"
+  "ecommerce.order.history.table.column.order.details": "Dettagli ordine",
+  "ecommerce.order.history.main.heading": "My orders and subscriptions",
+  "ecommerce.order.history.main.subtitle": "Manage your program subscriptions and view your order history.",
+  "ecommerce.order.history.manage.subscriptions.error.heading": "Something went wrong",
+  "ecommerce.order.history.manage.subscriptions.error.body": "The page you’re looking for is unavailable or there was an error. Visit the {buttonLabel} page to manage your subscription.",
+  "ecommerce.order.history.manage.subscriptions.error.support": "If this problem persists, {supportLink}.",
+  "ecommerce.order.history.subscriptions.subtitle.empty": "You do not have any active or previous subscriptions.",
+  "ecommerce.order.history.subscriptions.heading": "Subscriptions",
+  "ecommerce.order.history.subscriptions.subtitle.zero": "You do not have an active subscription. To view your past receipts, click {buttonLabel}.",
+  "ecommerce.order.history.subscriptions.subtitle.one": "You have {activeCount} active subscription. To view your receipts, change your payment method or cancel your subscription, click {buttonLabel}.",
+  "ecommerce.order.history.subscriptions.subtitle.multiple": "You have {activeCount} active subscriptions. To view your receipts, change your payment method or cancel your subscription, click {buttonLabel}.",
+  "ecommerce.order.history.subscriptions.manage.button": "Manage my subscriptions",
+  "ecommerce.order.history.subscription.upsell.button": "Explore subscription options",
+  "ecommerce.order.history.subscription.upsell.badge": "New",
+  "ecommerce.order.history.subscription.upsell.heading": "Monthly program subscriptions {emDash} more flexible, more affordable",
+  "ecommerce.order.history.subscription.upsell.message": "Now available for many popular programs, affordable monthly subscription pricing can help you manage your budget more effectively. Subscriptions start at {minSubscriptionPrice}/month USD per program, after a {trialLength}-day full access free trial. Cancel at any time."
 }
\ No newline at end of file
diff --git a/src/i18n/messages/pt.json b/src/i18n/messages/pt.json
index 02d94d81..08c5fe06 100644
--- a/src/i18n/messages/pt.json
+++ b/src/i18n/messages/pt.json
@@ -1,13 +1,31 @@
 {
+  "ecommerce.order.history.basic.alert.title": "Something went wrong.",
+  "ecommerce.order.history.basic.alert.body": "Refresh this page and try again. If this problem persists, {supportLink}.",
+  "ecommerce.order.history.basic.alert.button": "Dismiss",
   "error.notfound.message": "The page you're looking for is unavailable or there's an error in the URL. Please check the URL and try again.",
+  "ecommerce.order.history.support.fragment": "contact support",
   "ecommerce.order.history.page.heading": "Order History",
   "ecommerce.order.history.no.orders": "Orders you place with {siteName} will appear here.",
   "ecommerce.order.history.loading.orders": "Loading orders...",
-  "ecommerce.order.history.loading.error": "Error: {error}",
   "ecommerce.order.history.view.order.detail": "View Order Details",
   "ecommerce.order.history.table.column.items": "Items",
   "ecommerce.order.history.table.column.date.placed": "Date placed",
   "ecommerce.order.history.table.column.total.cost": "Total cost",
   "ecommerce.order.history.table.column.order.number": "Order number",
-  "ecommerce.order.history.table.column.order.details": "Order details"
+  "ecommerce.order.history.table.column.order.details": "Order details",
+  "ecommerce.order.history.main.heading": "My orders and subscriptions",
+  "ecommerce.order.history.main.subtitle": "Manage your program subscriptions and view your order history.",
+  "ecommerce.order.history.manage.subscriptions.error.heading": "Something went wrong",
+  "ecommerce.order.history.manage.subscriptions.error.body": "The page you’re looking for is unavailable or there was an error. Visit the {buttonLabel} page to manage your subscription.",
+  "ecommerce.order.history.manage.subscriptions.error.support": "If this problem persists, {supportLink}.",
+  "ecommerce.order.history.subscriptions.subtitle.empty": "You do not have any active or previous subscriptions.",
+  "ecommerce.order.history.subscriptions.heading": "Subscriptions",
+  "ecommerce.order.history.subscriptions.subtitle.zero": "You do not have an active subscription. To view your past receipts, click {buttonLabel}.",
+  "ecommerce.order.history.subscriptions.subtitle.one": "You have {activeCount} active subscription. To view your receipts, change your payment method or cancel your subscription, click {buttonLabel}.",
+  "ecommerce.order.history.subscriptions.subtitle.multiple": "You have {activeCount} active subscriptions. To view your receipts, change your payment method or cancel your subscription, click {buttonLabel}.",
+  "ecommerce.order.history.subscriptions.manage.button": "Manage my subscriptions",
+  "ecommerce.order.history.subscription.upsell.button": "Explore subscription options",
+  "ecommerce.order.history.subscription.upsell.badge": "New",
+  "ecommerce.order.history.subscription.upsell.heading": "Monthly program subscriptions {emDash} more flexible, more affordable",
+  "ecommerce.order.history.subscription.upsell.message": "Now available for many popular programs, affordable monthly subscription pricing can help you manage your budget more effectively. Subscriptions start at {minSubscriptionPrice}/month USD per program, after a {trialLength}-day full access free trial. Cancel at any time."
 }
\ No newline at end of file
diff --git a/src/i18n/messages/pt_PT.json b/src/i18n/messages/pt_PT.json
index 5e07efcc..af9fff1d 100644
--- a/src/i18n/messages/pt_PT.json
+++ b/src/i18n/messages/pt_PT.json
@@ -1,13 +1,31 @@
 {
+  "ecommerce.order.history.basic.alert.title": "Something went wrong.",
+  "ecommerce.order.history.basic.alert.body": "Refresh this page and try again. If this problem persists, {supportLink}.",
+  "ecommerce.order.history.basic.alert.button": "Dismiss",
   "error.notfound.message": "A página não foi encontrada ou o URL está errado. Por favor, verifique o URL e tente novamente,",
+  "ecommerce.order.history.support.fragment": "contact support",
   "ecommerce.order.history.page.heading": "Histórico de encomendas",
-  "ecommerce.order.history.no.orders": "Orders you place with {siteName} will appear here.",
+  "ecommerce.order.history.no.orders": "As encomendas que fizer no {siteName} irão aparecer aqui.",
   "ecommerce.order.history.loading.orders": "A carregar encomendas...",
-  "ecommerce.order.history.loading.error": "Erro: {error}",
   "ecommerce.order.history.view.order.detail": "Ver Detalhes do Pedido",
   "ecommerce.order.history.table.column.items": "Itens",
   "ecommerce.order.history.table.column.date.placed": "Data colocada",
   "ecommerce.order.history.table.column.total.cost": "Custo total",
   "ecommerce.order.history.table.column.order.number": "Número do Registo de Contas",
-  "ecommerce.order.history.table.column.order.details": "Detalhes do pedido"
+  "ecommerce.order.history.table.column.order.details": "Detalhes do pedido",
+  "ecommerce.order.history.main.heading": "My orders and subscriptions",
+  "ecommerce.order.history.main.subtitle": "Manage your program subscriptions and view your order history.",
+  "ecommerce.order.history.manage.subscriptions.error.heading": "Something went wrong",
+  "ecommerce.order.history.manage.subscriptions.error.body": "The page you’re looking for is unavailable or there was an error. Visit the {buttonLabel} page to manage your subscription.",
+  "ecommerce.order.history.manage.subscriptions.error.support": "If this problem persists, {supportLink}.",
+  "ecommerce.order.history.subscriptions.subtitle.empty": "You do not have any active or previous subscriptions.",
+  "ecommerce.order.history.subscriptions.heading": "Subscriptions",
+  "ecommerce.order.history.subscriptions.subtitle.zero": "You do not have an active subscription. To view your past receipts, click {buttonLabel}.",
+  "ecommerce.order.history.subscriptions.subtitle.one": "You have {activeCount} active subscription. To view your receipts, change your payment method or cancel your subscription, click {buttonLabel}.",
+  "ecommerce.order.history.subscriptions.subtitle.multiple": "You have {activeCount} active subscriptions. To view your receipts, change your payment method or cancel your subscription, click {buttonLabel}.",
+  "ecommerce.order.history.subscriptions.manage.button": "Manage my subscriptions",
+  "ecommerce.order.history.subscription.upsell.button": "Explore subscription options",
+  "ecommerce.order.history.subscription.upsell.badge": "New",
+  "ecommerce.order.history.subscription.upsell.heading": "Monthly program subscriptions {emDash} more flexible, more affordable",
+  "ecommerce.order.history.subscription.upsell.message": "Now available for many popular programs, affordable monthly subscription pricing can help you manage your budget more effectively. Subscriptions start at {minSubscriptionPrice}/month USD per program, after a {trialLength}-day full access free trial. Cancel at any time."
 }
\ No newline at end of file
diff --git a/src/i18n/messages/ru.json b/src/i18n/messages/ru.json
index 02d94d81..08c5fe06 100644
--- a/src/i18n/messages/ru.json
+++ b/src/i18n/messages/ru.json
@@ -1,13 +1,31 @@
 {
+  "ecommerce.order.history.basic.alert.title": "Something went wrong.",
+  "ecommerce.order.history.basic.alert.body": "Refresh this page and try again. If this problem persists, {supportLink}.",
+  "ecommerce.order.history.basic.alert.button": "Dismiss",
   "error.notfound.message": "The page you're looking for is unavailable or there's an error in the URL. Please check the URL and try again.",
+  "ecommerce.order.history.support.fragment": "contact support",
   "ecommerce.order.history.page.heading": "Order History",
   "ecommerce.order.history.no.orders": "Orders you place with {siteName} will appear here.",
   "ecommerce.order.history.loading.orders": "Loading orders...",
-  "ecommerce.order.history.loading.error": "Error: {error}",
   "ecommerce.order.history.view.order.detail": "View Order Details",
   "ecommerce.order.history.table.column.items": "Items",
   "ecommerce.order.history.table.column.date.placed": "Date placed",
   "ecommerce.order.history.table.column.total.cost": "Total cost",
   "ecommerce.order.history.table.column.order.number": "Order number",
-  "ecommerce.order.history.table.column.order.details": "Order details"
+  "ecommerce.order.history.table.column.order.details": "Order details",
+  "ecommerce.order.history.main.heading": "My orders and subscriptions",
+  "ecommerce.order.history.main.subtitle": "Manage your program subscriptions and view your order history.",
+  "ecommerce.order.history.manage.subscriptions.error.heading": "Something went wrong",
+  "ecommerce.order.history.manage.subscriptions.error.body": "The page you’re looking for is unavailable or there was an error. Visit the {buttonLabel} page to manage your subscription.",
+  "ecommerce.order.history.manage.subscriptions.error.support": "If this problem persists, {supportLink}.",
+  "ecommerce.order.history.subscriptions.subtitle.empty": "You do not have any active or previous subscriptions.",
+  "ecommerce.order.history.subscriptions.heading": "Subscriptions",
+  "ecommerce.order.history.subscriptions.subtitle.zero": "You do not have an active subscription. To view your past receipts, click {buttonLabel}.",
+  "ecommerce.order.history.subscriptions.subtitle.one": "You have {activeCount} active subscription. To view your receipts, change your payment method or cancel your subscription, click {buttonLabel}.",
+  "ecommerce.order.history.subscriptions.subtitle.multiple": "You have {activeCount} active subscriptions. To view your receipts, change your payment method or cancel your subscription, click {buttonLabel}.",
+  "ecommerce.order.history.subscriptions.manage.button": "Manage my subscriptions",
+  "ecommerce.order.history.subscription.upsell.button": "Explore subscription options",
+  "ecommerce.order.history.subscription.upsell.badge": "New",
+  "ecommerce.order.history.subscription.upsell.heading": "Monthly program subscriptions {emDash} more flexible, more affordable",
+  "ecommerce.order.history.subscription.upsell.message": "Now available for many popular programs, affordable monthly subscription pricing can help you manage your budget more effectively. Subscriptions start at {minSubscriptionPrice}/month USD per program, after a {trialLength}-day full access free trial. Cancel at any time."
 }
\ No newline at end of file
diff --git a/src/i18n/messages/uk.json b/src/i18n/messages/uk.json
index 02d94d81..08c5fe06 100644
--- a/src/i18n/messages/uk.json
+++ b/src/i18n/messages/uk.json
@@ -1,13 +1,31 @@
 {
+  "ecommerce.order.history.basic.alert.title": "Something went wrong.",
+  "ecommerce.order.history.basic.alert.body": "Refresh this page and try again. If this problem persists, {supportLink}.",
+  "ecommerce.order.history.basic.alert.button": "Dismiss",
   "error.notfound.message": "The page you're looking for is unavailable or there's an error in the URL. Please check the URL and try again.",
+  "ecommerce.order.history.support.fragment": "contact support",
   "ecommerce.order.history.page.heading": "Order History",
   "ecommerce.order.history.no.orders": "Orders you place with {siteName} will appear here.",
   "ecommerce.order.history.loading.orders": "Loading orders...",
-  "ecommerce.order.history.loading.error": "Error: {error}",
   "ecommerce.order.history.view.order.detail": "View Order Details",
   "ecommerce.order.history.table.column.items": "Items",
   "ecommerce.order.history.table.column.date.placed": "Date placed",
   "ecommerce.order.history.table.column.total.cost": "Total cost",
   "ecommerce.order.history.table.column.order.number": "Order number",
-  "ecommerce.order.history.table.column.order.details": "Order details"
+  "ecommerce.order.history.table.column.order.details": "Order details",
+  "ecommerce.order.history.main.heading": "My orders and subscriptions",
+  "ecommerce.order.history.main.subtitle": "Manage your program subscriptions and view your order history.",
+  "ecommerce.order.history.manage.subscriptions.error.heading": "Something went wrong",
+  "ecommerce.order.history.manage.subscriptions.error.body": "The page you’re looking for is unavailable or there was an error. Visit the {buttonLabel} page to manage your subscription.",
+  "ecommerce.order.history.manage.subscriptions.error.support": "If this problem persists, {supportLink}.",
+  "ecommerce.order.history.subscriptions.subtitle.empty": "You do not have any active or previous subscriptions.",
+  "ecommerce.order.history.subscriptions.heading": "Subscriptions",
+  "ecommerce.order.history.subscriptions.subtitle.zero": "You do not have an active subscription. To view your past receipts, click {buttonLabel}.",
+  "ecommerce.order.history.subscriptions.subtitle.one": "You have {activeCount} active subscription. To view your receipts, change your payment method or cancel your subscription, click {buttonLabel}.",
+  "ecommerce.order.history.subscriptions.subtitle.multiple": "You have {activeCount} active subscriptions. To view your receipts, change your payment method or cancel your subscription, click {buttonLabel}.",
+  "ecommerce.order.history.subscriptions.manage.button": "Manage my subscriptions",
+  "ecommerce.order.history.subscription.upsell.button": "Explore subscription options",
+  "ecommerce.order.history.subscription.upsell.badge": "New",
+  "ecommerce.order.history.subscription.upsell.heading": "Monthly program subscriptions {emDash} more flexible, more affordable",
+  "ecommerce.order.history.subscription.upsell.message": "Now available for many popular programs, affordable monthly subscription pricing can help you manage your budget more effectively. Subscriptions start at {minSubscriptionPrice}/month USD per program, after a {trialLength}-day full access free trial. Cancel at any time."
 }
\ No newline at end of file
diff --git a/src/i18n/messages/zh_CN.json b/src/i18n/messages/zh_CN.json
index 02d94d81..08c5fe06 100644
--- a/src/i18n/messages/zh_CN.json
+++ b/src/i18n/messages/zh_CN.json
@@ -1,13 +1,31 @@
 {
+  "ecommerce.order.history.basic.alert.title": "Something went wrong.",
+  "ecommerce.order.history.basic.alert.body": "Refresh this page and try again. If this problem persists, {supportLink}.",
+  "ecommerce.order.history.basic.alert.button": "Dismiss",
   "error.notfound.message": "The page you're looking for is unavailable or there's an error in the URL. Please check the URL and try again.",
+  "ecommerce.order.history.support.fragment": "contact support",
   "ecommerce.order.history.page.heading": "Order History",
   "ecommerce.order.history.no.orders": "Orders you place with {siteName} will appear here.",
   "ecommerce.order.history.loading.orders": "Loading orders...",
-  "ecommerce.order.history.loading.error": "Error: {error}",
   "ecommerce.order.history.view.order.detail": "View Order Details",
   "ecommerce.order.history.table.column.items": "Items",
   "ecommerce.order.history.table.column.date.placed": "Date placed",
   "ecommerce.order.history.table.column.total.cost": "Total cost",
   "ecommerce.order.history.table.column.order.number": "Order number",
-  "ecommerce.order.history.table.column.order.details": "Order details"
+  "ecommerce.order.history.table.column.order.details": "Order details",
+  "ecommerce.order.history.main.heading": "My orders and subscriptions",
+  "ecommerce.order.history.main.subtitle": "Manage your program subscriptions and view your order history.",
+  "ecommerce.order.history.manage.subscriptions.error.heading": "Something went wrong",
+  "ecommerce.order.history.manage.subscriptions.error.body": "The page you’re looking for is unavailable or there was an error. Visit the {buttonLabel} page to manage your subscription.",
+  "ecommerce.order.history.manage.subscriptions.error.support": "If this problem persists, {supportLink}.",
+  "ecommerce.order.history.subscriptions.subtitle.empty": "You do not have any active or previous subscriptions.",
+  "ecommerce.order.history.subscriptions.heading": "Subscriptions",
+  "ecommerce.order.history.subscriptions.subtitle.zero": "You do not have an active subscription. To view your past receipts, click {buttonLabel}.",
+  "ecommerce.order.history.subscriptions.subtitle.one": "You have {activeCount} active subscription. To view your receipts, change your payment method or cancel your subscription, click {buttonLabel}.",
+  "ecommerce.order.history.subscriptions.subtitle.multiple": "You have {activeCount} active subscriptions. To view your receipts, change your payment method or cancel your subscription, click {buttonLabel}.",
+  "ecommerce.order.history.subscriptions.manage.button": "Manage my subscriptions",
+  "ecommerce.order.history.subscription.upsell.button": "Explore subscription options",
+  "ecommerce.order.history.subscription.upsell.badge": "New",
+  "ecommerce.order.history.subscription.upsell.heading": "Monthly program subscriptions {emDash} more flexible, more affordable",
+  "ecommerce.order.history.subscription.upsell.message": "Now available for many popular programs, affordable monthly subscription pricing can help you manage your budget more effectively. Subscriptions start at {minSubscriptionPrice}/month USD per program, after a {trialLength}-day full access free trial. Cancel at any time."
 }
\ No newline at end of file