diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 6ff3d4733c..3b2eb74b89 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -1575,7 +1575,9 @@ ca:
   shopping_tabs_home: "Inici"
   shopping_tabs_shop: "Botiga"
   shopping_tabs_about: "Sobre"
+  shopping_tabs_producers: "Productors"
   shopping_tabs_contact: "Contacte"
+  shopping_tabs_groups: "Xarxes/Grups"
   shopping_contact_address: "Adreça"
   shopping_contact_web: "Contacte"
   shopping_contact_social: "Segueix"
@@ -3165,6 +3167,8 @@ ca:
           received: "Rebut"
           canceled: "Cancel·lat"
       orders:
+        add_product:
+          cannot_add_item_to_canceled_order: "No es pot afegir l'article a la comanda cancel·lada"
         index:
           listing_orders: "Llistat comandes"
           new_order: "Nova comanda"
diff --git a/config/locales/de_DE.yml b/config/locales/de_DE.yml
index 24c536d116..8f2abf8456 100644
--- a/config/locales/de_DE.yml
+++ b/config/locales/de_DE.yml
@@ -1574,7 +1574,9 @@ de_DE:
   shopping_tabs_home: "Startseite"
   shopping_tabs_shop: "Produkte"
   shopping_tabs_about: "Über uns"
+  shopping_tabs_producers: "Produzenten"
   shopping_tabs_contact: "Kontakt"
+  shopping_tabs_groups: "Gruppen"
   shopping_contact_address: "Adresse"
   shopping_contact_web: "Kontakt"
   shopping_contact_social: "Folgen"
@@ -3170,6 +3172,8 @@ de_DE:
           received: "Empfangen"
           canceled: "abgebrochen"
       orders:
+        add_product:
+          cannot_add_item_to_canceled_order: "Artikel kann nicht zu stornierter Bestellung hinzugefügt werden"
         index:
           listing_orders: "Bestellungen verwalten"
           new_order: "Neue Bestellung"
diff --git a/config/locales/en_CA.yml b/config/locales/en_CA.yml
index 40f1c66d29..f4fc5efab6 100644
--- a/config/locales/en_CA.yml
+++ b/config/locales/en_CA.yml
@@ -264,7 +264,7 @@ en_CA:
   error: Error
   processing_payment: "Processing payment..."
   no_pending_payments: "No pending payments"
-  invalid_payment_state: "Invalid payment state"
+  invalid_payment_state: "Invalid payment state %{state}"
   filter_results: Filter Results
   quantity: Quantity
   pick_up: Pick up
@@ -1177,8 +1177,10 @@ en_CA:
       message_html: "I agree to the seller's %{terms_and_conditions_link}."
       link_text: "Terms and Conditions"
     platform_terms_of_service:
+      message_html: "I agree to the platform %{tos_link}"
       terms_of_service: "Terms of Service"
     all_terms_and_conditions:
+      message_html: "I agree to the seller's %{terms_and_conditions_link} and the platform %{tos_link}"
       terms_and_conditions: "Terms and Conditions"
       terms_of_service: "Terms of Service"
     failed: "The checkout failed. Please let us know so that we can process your order."
@@ -1570,7 +1572,9 @@ en_CA:
   shopping_tabs_home: "Home"
   shopping_tabs_shop: "Shop"
   shopping_tabs_about: "About"
+  shopping_tabs_producers: "Producers"
   shopping_tabs_contact: "Contact"
+  shopping_tabs_groups: "Markets"
   shopping_contact_address: "Address"
   shopping_contact_web: "Contact"
   shopping_contact_social: "Follow"
@@ -2413,6 +2417,7 @@ en_CA:
           There was a problem adding this product to the cart. Perhaps it has become
           unavailable or the shop is closing
     admin:
+      unit_price_tooltip: "The unit price increases transparency by allowing your customers to easily compare prices between different products and packaging sizes. Note, that the final unit price displayed in the shopfront might differ. For example, shopfront prices might include enterprise fees (mark-ups)  if you are using them."
       enterprise_limit_reached: "You have reached the standard limit of enterprises per account. Write to %{contact_email} if you need to increase it."
       modals:
         got_it: "Got it"
@@ -2656,8 +2661,7 @@ en_CA:
         min_quantity: "Min quantity"
         max_quantity: "Max quantity"
       price_breakdown: "Price breakdown"
-      unit_price_tooltip:
-        shopfront: "This is the unit price of this product. It allows you to compare the price of products independent of packaging sizes & weights."
+      unit_price_tooltip: "This is the unit price of this product. It allows you to compare the price of products independent of packaging sizes & weights."
     variants:
       on_demand:
         'yes': "On demand"
@@ -3089,6 +3093,7 @@ en_CA:
           header:
             store: Store
     admin:
+      unit_price_tooltip: "The unit price increases transparency by allowing your customers to easily compare prices between different products and packaging sizes. Note, that the final unit price displayed in the shopfront might differ. For example, shopfront prices might include enterprise fees (mark-ups)  if you are using them."
       tab:
         dashboard: "Dashboard"
         orders: "Orders"
@@ -3157,6 +3162,8 @@ en_CA:
           received: "Received"
           canceled: "Canceled"
       orders:
+        add_product:
+          cannot_add_item_to_canceled_order: "You cannot add an item to a cancelled order."
         index:
           listing_orders: "Listing Orders"
           new_order: "New Order"
@@ -3318,6 +3325,7 @@ en_CA:
           unit_name: "Unit Name"
           price: "Price"
           unit_price: "Unit Price"
+          unit_price_legend: "Calculated based on the item price."
           on_hand: "On Hand"
           on_demand: "On Demand"
           product_description: "Product Description"
@@ -3423,6 +3431,7 @@ en_CA:
           cookies_consent_banner_toggle: "Display cookies consent banner"
           privacy_policy_url: "Privacy Policy URL"
           enterprises_require_tos: "Enterprises must accept Terms of Service"
+          shoppers_require_tos: "Shoppers must accept Terms of Service"
           cookies_policy_matomo_section: "Display Matomo section on cookies policy page"
           footer_tos_url: "Terms of Service URL"
     checkout:
@@ -3635,3 +3644,42 @@ en_CA:
         spree/payment:
           one: Payment
           other: Payments
+  datetime:
+    distance_in_words:
+      about_x_hours:
+        one: about 1 hour
+        other: about %{count} hours
+      about_x_months:
+        one: about 1 month
+        other: about %{count} months
+      about_x_years:
+        one: about 1 year
+        other: about %{count} years
+      almost_x_years:
+        one: almost 1 year
+        other: almost %{count} years
+      half_a_minute: half a minute
+      less_than_x_seconds:
+        one: less than 1 second
+        other: less than %{count} seconds
+      less_than_x_minutes:
+        one: less than a minute
+        other: less than %{count} minutes
+      over_x_years:
+        one: over 1 year
+        other: over %{count} years
+      x_seconds:
+        one: "1 second"
+        other: "%{count} seconds"
+      x_minutes:
+        one: "1 minute"
+        other: "%{count} minutes"
+      x_days:
+        one: "1 day"
+        other: "%{count} days"
+      x_months:
+        one: "1 month"
+        other: "%{count} months"
+      x_years:
+        one: "1 year"
+        other: "%{count} years"
diff --git a/config/locales/en_FR.yml b/config/locales/en_FR.yml
index 9aa272b4c6..493f2302c7 100644
--- a/config/locales/en_FR.yml
+++ b/config/locales/en_FR.yml
@@ -1572,7 +1572,9 @@ en_FR:
   shopping_tabs_home: "Home"
   shopping_tabs_shop: "Shop"
   shopping_tabs_about: "About"
+  shopping_tabs_producers: "Producers"
   shopping_tabs_contact: "Contact"
+  shopping_tabs_groups: "Groups"
   shopping_contact_address: "Address"
   shopping_contact_web: "Contact"
   shopping_contact_social: "Follow"
@@ -3161,6 +3163,8 @@ en_FR:
           received: "Received"
           canceled: "Canceled"
       orders:
+        add_product:
+          cannot_add_item_to_canceled_order: "Cannot add item to canceled order"
         index:
           listing_orders: "Listing Orders"
           new_order: "New Order"
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 2c3a6d676a..2dd5cf32ba 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1574,7 +1574,9 @@ es:
   shopping_tabs_home: "Inicio"
   shopping_tabs_shop: "Tienda"
   shopping_tabs_about: "Acerca de"
+  shopping_tabs_producers: "Productoras"
   shopping_tabs_contact: "Contacto"
+  shopping_tabs_groups: "Redes"
   shopping_contact_address: "Dirección"
   shopping_contact_web: "Contacto"
   shopping_contact_social: "Seguir"
@@ -3165,6 +3167,8 @@ es:
           received: "recibido"
           canceled: "cancelado"
       orders:
+        add_product:
+          cannot_add_item_to_canceled_order: "No se puede agregar el artículo al pedido cancelado"
         index:
           listing_orders: "Pedidos de listado"
           new_order: "Nuevo pedido"
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 8311ed01a8..beadecc8c2 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -3190,6 +3190,8 @@ fr:
           received: "Reçu"
           canceled: "Annulé"
       orders:
+        add_product:
+          cannot_add_item_to_canceled_order: "Il n'est pas possible d'ajouter des produits sur une commande annulée"
         index:
           listing_orders: "Liste des commandes"
           new_order: "Nouvelle commande"
diff --git a/config/locales/fr_CA.yml b/config/locales/fr_CA.yml
index 4ebc189733..4533cf9a9e 100644
--- a/config/locales/fr_CA.yml
+++ b/config/locales/fr_CA.yml
@@ -265,7 +265,7 @@ fr_CA:
   error: Erreur
   processing_payment: "Paiement en cours..."
   no_pending_payments: "Aucun paiement en attente."
-  invalid_payment_state: "Statut de paiement invalide"
+  invalid_payment_state: "Statut de paiement invalide : %{state}"
   filter_results: Filtrer les résultats
   quantity: Quantité
   pick_up: Retrait
@@ -1179,8 +1179,10 @@ fr_CA:
       message_html: "J'accepte les %{terms_and_conditions_link}"
       link_text: "CGU & CGV"
     platform_terms_of_service:
+      message_html: "J'accepte les %{tos_link}"
       terms_of_service: "Conditions Générales d'Utilisation"
     all_terms_and_conditions:
+      message_html: "J'accepte les %{terms_and_conditions_link} de la boutique et les %{tos_link} de Open Food Network."
       terms_and_conditions: "CGU & CGV"
       terms_of_service: "Conditions Générales d'Utilisation"
     failed: "La validation du paiement a échoué. Contactez-nous afin de finaliser votre commande."
@@ -1572,7 +1574,9 @@ fr_CA:
   shopping_tabs_home: "Accueil"
   shopping_tabs_shop: "Boutique"
   shopping_tabs_about: "A propos"
+  shopping_tabs_producers: "Producteurs"
   shopping_tabs_contact: "Contact"
+  shopping_tabs_groups: "Groupes"
   shopping_contact_address: "Adresse"
   shopping_contact_web: "Contact"
   shopping_contact_social: "Suivre"
@@ -2417,6 +2421,7 @@ fr_CA:
           Il y a eu un problème lors de l'ajout de votre produit au panier. Peut-être
           qu'il n'est plus en stock ou que la boutique sur laquelle vous étiez a fermé.
     admin:
+      unit_price_tooltip: "Le prix unitaire permet aux acheteurs de comparer les prix entre les produits et/ou les conditionnements. Attention, le prix final observé par l'acheteur peut être différent si des marges et/ou commissions sont appliquées."
       enterprise_limit_reached: "Vous avez atteint le nombre limite d'entreprises autorisées par défaut. Ecrivez à %{contact_email}si vous avez besoin d'augmenter cette limite."
       modals:
         got_it: "J'ai compris"
@@ -2670,8 +2675,7 @@ fr_CA:
         min_quantity: "Quantité min"
         max_quantity: "Quantité max"
       price_breakdown: "Détail du prix"
-      unit_price_tooltip:
-        shopfront: "Il s'agit du prix unitaire de ce produit. Il permet à l'acheteur de comparer les prix quelque soit le conditionnement final du produit."
+      unit_price_tooltip: "Il s'agit du prix unitaire de ce produit. Il permet à l'acheteur de comparer les prix quelque soit le conditionnement final du produit."
     variants:
       on_demand:
         'yes': "A volonté"
@@ -3103,6 +3107,7 @@ fr_CA:
           header:
             store: Vue acheteur
     admin:
+      unit_price_tooltip: "Le prix unitaire permet aux acheteurs de comparer les prix entre les produits et/ou les conditionnements. Attention, le prix final observé par l'acheteur peut être différent si des marges et/ou commissions sont appliquées."
       tab:
         dashboard: "Tableau de bord"
         orders: "Commandes"
@@ -3171,6 +3176,8 @@ fr_CA:
           received: "Reçu"
           canceled: "Annulée"
       orders:
+        add_product:
+          cannot_add_item_to_canceled_order: "Il n'est pas possible d'ajouter des produits sur une commande annulée."
         index:
           listing_orders: "Liste des commandes"
           new_order: "Nouvelle commande"
@@ -3332,6 +3339,7 @@ fr_CA:
           unit_name: "Unité"
           price: "Prix"
           unit_price: "Prix unitaire"
+          unit_price_legend: "Calcul basé sur le prix à l'unité"
           on_hand: "En stock"
           on_demand: "A volonté"
           product_description: "Description du Produit"
@@ -3437,6 +3445,7 @@ fr_CA:
           cookies_consent_banner_toggle: "Afficher la bannière de consentement à l'utilisation des cookies"
           privacy_policy_url: "URL de la politique de confidentialité"
           enterprises_require_tos: "Les entreprises doivent accepter les Conditions Générales d'Utilisation"
+          shoppers_require_tos: "Les acheteurs doivent accepter les CGU."
           cookies_policy_matomo_section: "Afficher la section Matomo sur la politique de cookies"
           footer_tos_url: "Conditions d'utilisation URL"
     checkout:
@@ -3650,3 +3659,42 @@ fr_CA:
         spree/payment:
           one: Paiement
           other: Paiements
+  datetime:
+    distance_in_words:
+      about_x_hours:
+        one: environ 1 heure
+        other: environ %{count} heures
+      about_x_months:
+        one: environ 1 mois
+        other: environ %{count} mois
+      about_x_years:
+        one: environ 1 année
+        other: environ %{count} années
+      almost_x_years:
+        one: presque 1 année
+        other: presque%{count} années
+      half_a_minute: moins d'une minute
+      less_than_x_seconds:
+        one: moins d' 1 seconde
+        other: moins de %{count} secondes
+      less_than_x_minutes:
+        one: moins d'une minute
+        other: moins de %{count} minutes
+      over_x_years:
+        one: plus d' 1 an
+        other: plus de %{count} années
+      x_seconds:
+        one: "1 seconde"
+        other: "%{count} secondes"
+      x_minutes:
+        one: "1 minute"
+        other: "%{count} minutes"
+      x_days:
+        one: "1 jour"
+        other: "%{count}  jours"
+      x_months:
+        one: "1 mois"
+        other: "%{count}  mois"
+      x_years:
+        one: "1 an"
+        other: "%{count} ans"