diff --git a/config/locales/en_FR.yml b/config/locales/en_FR.yml
index 8727a5d93e..304a9c7e89 100644
--- a/config/locales/en_FR.yml
+++ b/config/locales/en_FR.yml
@@ -865,6 +865,7 @@ en_FR:
         incoming: "Incoming"
         supplier: "Supplier"
         products: "Products"
+        receival_details: "Receival Details"
         fees: "Fees"
         save: "Save"
         save_and_next: "Save and Next"
@@ -1169,12 +1170,16 @@ en_FR:
       footer_data_cookies_policy: "cookies policy"
   shop:
     messages:
-      login: "login"
-      signup: "signup"
-      contact: "contact"
-      require_customer_login: "Only approved customers can access this shop."
-      require_login_html: "If you're already an approved customer, %{login} or %{signup} to proceed. Want to start shopping here? Please %{contact} %{enterprise} and ask about joining."
-      require_customer_html: "If you'd like to start shopping here, please %{contact} %{enterprise} to ask about joining."
+      customer_required:
+        login: "login"
+        signup: "signup"
+        contact: "contact"
+        require_customer_login: "Only approved customers can access this shop."
+        require_login_html: "If you're already an approved customer, %{login} or %{signup} to proceed."
+        require_login_2_html: "Want to start shopping here? Please %{contact} and %{enterprise} ask about joining."
+        require_customer_html: "If you'd like to start shopping here, please %{contact} %{enterprise} to ask about joining."
+      select_oc:
+        select_oc_html: "Please <span class='highlighted'>choose an option</span>, to see what products are available."
   card_could_not_be_updated: Card could not be updated
   card_could_not_be_saved: card could not be saved
   spree_gateway_error_flash_for_checkout: "There was a problem with your payment information: %{error}"
@@ -1509,7 +1514,7 @@ en_FR:
   shopping_producers_of_hub: "%{hub}'s producers:"
   enterprises_next_closing: "Next order closing"
   enterprises_ready_for: "Ready for"
-  enterprises_choose: "Choose when you want your order:"
+  enterprises_choose: "Choose an option:"
   maps_open: "Open"
   maps_closed: "Closed"
   hubs_buy: "Shop for:"
@@ -1532,11 +1537,19 @@ en_FR:
     one: Your order with <a href='%{path}' target='_blank'>%{shop} / %{order}</a> is open for review. You can make changes until %{oc_close}.
     other: You have <a href='%{path}' target='_blank'>%{count} orders with %{shop}</a> currently open for review. You can make changes until %{oc_close}.
   orders_changeable_orders_alert_html: This order has been confirmed, but you can make changes until <strong>%{oc_close}</strong>.
-  products_clear_all: Clear all
+  products_clear: Clear
   products_showing: "Showing:"
-  products_or: "OR"
+  products_results_for: "Results for"
+  products_or: "or"
+  products_and: "and"
+  products_filters_in: "in"
   products_with: with
-  products_search: "Search by product or producer"
+  products_search: "Search..."
+  products_filter_by: "Filter by"
+  products_filter_selected: "selected"
+  products_filter_heading: "Filters"
+  products_filter_clear: "Clear"
+  products_filter_done: "Done"
   products_loading: "Loading products..."
   products_updating_cart: "Updating cart..."
   products_cart_empty: "Cart empty"
@@ -1547,6 +1560,8 @@ en_FR:
   products_update_error_msg: "Saving failed."
   products_update_error_data: "Save failed due to invalid data:"
   products_changes_saved: "Changes saved."
+  products_no_results_html: "Sorry, no results found for %{query}"
+  products_clear_search: "Clear search"
   search_no_results_html: "Sorry, no results found for %{query}. Try another search?"
   components_profiles_popover: "Profiles do not have a shopfront on the Open Food Network, but may have their own physical or online shop elsewhere"
   components_profiles_show: "Show profiles"
diff --git a/config/locales/en_GB.yml b/config/locales/en_GB.yml
index 01cd7e148d..1060932f58 100644
--- a/config/locales/en_GB.yml
+++ b/config/locales/en_GB.yml
@@ -865,6 +865,7 @@ en_GB:
         incoming: "Incoming"
         supplier: "Supplier"
         products: "Products"
+        receival_details: "Receival Details"
         fees: "Fees"
         save: "Save"
         save_and_next: "Save and Next"
@@ -2308,6 +2309,10 @@ en_GB:
     resolve_errors: Please resolve the following errors
     more_items: "+ %{count} More"
     default_card_updated: Default Card Updated
+    cart:
+      add_to_cart_failed: >
+          There was a problem adding this product to your basket. Perhaps it has become
+          unavailable or the shop is closing.
     admin:
       enterprise_limit_reached: "You have reached the standard limit of enterprises per account. Write to %{contact_email} if you need to increase it."
       modals:
diff --git a/config/locales/en_NZ.yml b/config/locales/en_NZ.yml
index cf1a16dba6..bdf81ee716 100644
--- a/config/locales/en_NZ.yml
+++ b/config/locales/en_NZ.yml
@@ -323,6 +323,7 @@ en_NZ:
     show_n_more: Show %{num} more
     choose: "Choose..."
     please_select: Please select...
+    column_save_as_default: Save As Default
     columns: Columns
     actions: Actions
     viewing: "Viewing: %{current_view_name}"
@@ -864,6 +865,7 @@ en_NZ:
         incoming: "Incoming"
         supplier: "Supplier"
         products: "Products"
+        receival_details: "Receival Details"
         fees: "Fees"
         save: "Save"
         save_and_next: "Save and Next"
@@ -1168,12 +1170,16 @@ en_NZ:
       footer_data_cookies_policy: "cookies policy"
   shop:
     messages:
-      login: "login"
-      signup: "signup"
-      contact: "contact"
-      require_customer_login: "Only approved customers can access this shop."
-      require_login_html: "If you're already an approved customer, %{login} or %{signup} to proceed. Want to start shopping here? Please %{contact} %{enterprise} and ask about joining."
-      require_customer_html: "If you'd like to start shopping here, please %{contact} %{enterprise} to ask about joining."
+      customer_required:
+        login: "login"
+        signup: "signup"
+        contact: "contact"
+        require_customer_login: "Only approved customers can access this shop."
+        require_login_html: "If you're already an approved customer, %{login} or %{signup} to proceed."
+        require_login_2_html: "Want to start shopping here? Please %{contact} %{enterprise} and ask about joining."
+        require_customer_html: "If you'd like to start shopping here, please %{contact} %{enterprise} to ask about joining."
+      select_oc:
+        select_oc_html: "Please <span class='highlighted'>choose when you want your order</span>, to see what products are available."
   card_could_not_be_updated: Card could not be updated
   card_could_not_be_saved: card could not be saved
   spree_gateway_error_flash_for_checkout: "There was a problem with your payment information: %{error}"
@@ -1901,6 +1907,7 @@ en_NZ:
   admin_enterprise_relationships_permits: "permits"
   admin_enterprise_relationships_seach_placeholder: "Search"
   admin_enterprise_relationships_button_create: "Create"
+  admin_enterprise_relationships_to: "to"
   admin_enterprise_groups: "Enterprise Groups"
   admin_enterprise_groups_name: "Name"
   admin_enterprise_groups_owner: "Owner"
@@ -2306,6 +2313,10 @@ en_NZ:
     resolve_errors: Please resolve the following errors
     more_items: "+ %{count} More"
     default_card_updated: Default Card Updated
+    cart:
+      add_to_cart_failed: >
+          There was a problem adding this product to the cart. Perhaps it has become
+          unavailable or the shop is closing.
     admin:
       enterprise_limit_reached: "You have reached the standard limit of enterprises per account. Write to %{contact_email} if you need to increase it."
       modals:
@@ -3181,6 +3192,8 @@ en_NZ:
           price: "Price"
           display_as: "Display As"
           display_name: "Display Name"
+          display_as_placeholder: 'eg. 2 kg'
+          display_name_placeholder: 'eg. Tomatoes'
         autocomplete:
           producer_name: "Producer"
           unit: "Unit"
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index b5564a20f6..d23f514b76 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -867,6 +867,7 @@ fr:
         incoming: "Produits entrants (pouvant être mis en vente par les hubs)"
         supplier: "Fournisseur"
         products: "Produits"
+        receival_details: "Détails livraison"
         fees: "Commissions"
         save: "Sauvegarder"
         save_and_next: "Sauvegarder et suivant"
@@ -1171,12 +1172,16 @@ fr:
       footer_data_cookies_policy: "politique de cookies"
   shop:
     messages:
-      login: "Se connecter"
-      signup: "inscrivez-vous"
-      contact: "contacter"
-      require_customer_login: "Seul les acheteurs autorisés peuvent accéder à cette boutique."
-      require_login_html: "Si vous êtes déjà autorisé à accéder à la boutique, %{login}ou %{signup} pour continuer. Si vous voulez demander à y accéder, veuillez %{contact} %{enterprise}. "
-      require_customer_html: "Si vous voulez demander à y accéder, veuillez %{contact} %{enterprise}."
+      customer_required:
+        login: "Se connecter"
+        signup: "inscrivez-vous"
+        contact: "contacter"
+        require_customer_login: "Seul les acheteurs autorisés peuvent accéder à cette boutique."
+        require_login_html: "Si vous êtes déjà autorisé à accéder à la boutique, %{login}ou %{signup}pour continuer."
+        require_login_2_html: "Vous souhaitez réaliser vos courses ici? Merci de %{contact}%{enterprise} afin d'avoir l'autorisation d'accès à la boutique."
+        require_customer_html: "Si vous voulez demander à y accéder, veuillez %{contact} %{enterprise}."
+      select_oc:
+        select_oc_html: "Merci de <span class='highlighted'>sélectionner une option dans la liste déroulante</span>, afin de voir quel produits sont disponibles."
   card_could_not_be_updated: La carte bancaire n'a pas pu être mise à jour
   card_could_not_be_saved: la carte n'a pas pu être sauvegardée
   spree_gateway_error_flash_for_checkout: "Il y a eu un problème avec vos informations de paiement : %{error}"
@@ -1534,11 +1539,19 @@ fr:
     one: Votre commande chez <a href='%{path}' target='_blank'>%{shop} / %{order}</a> est ouverte pour vérification. Vous pouvez effectuer des modifications jusqu'au %{oc_close}.
     other: Vous avez <a href='%{path}' target='_blank'>%{count} commandes avec %{shop}</a> ouvertes à la vérification. Vous pouvez effectuer des modifications jusqu'au %{oc_close}.
   orders_changeable_orders_alert_html: Cette commande a été confirmée, mais vous pouvez effectuer des modifications jusqu'à <strong>%{oc_close}</strong>.
-  products_clear_all: Vider
+  products_clear: Annuler
   products_showing: "Afficher:"
-  products_or: "OU"
+  products_results_for: "Résultats pour"
+  products_or: "ou"
+  products_and: "et"
+  products_filters_in: "dans"
   products_with: avec
-  products_search: "Recherche par produit ou producteur"
+  products_search: "Rechercher..."
+  products_filter_by: "Filtrer par"
+  products_filter_selected: "sélectionné"
+  products_filter_heading: "Filtres"
+  products_filter_clear: "Annuler"
+  products_filter_done: "Fait"
   products_loading: "Produits en cours de chargement..."
   products_updating_cart: "Actualisation du panier..."
   products_cart_empty: "Panier vide"
@@ -1549,6 +1562,8 @@ fr:
   products_update_error_msg: "Échec de l'enregistrement."
   products_update_error_data: "Échec de l'enregistrement dû à des données non valides."
   products_changes_saved: "Modifications enregistrées."
+  products_no_results_html: "Nous sommes navrés, mais aucun résultat n'a été trouvé pour %{query}"
+  products_clear_search: "Annuler la recherche"
   search_no_results_html: "Désolé, aucun résultat pour %{query}. Autre recherche?"
   components_profiles_popover: "Certaines entreprises ont juste créé leur profil sur Open Food France mais ne vendent pas via la plateforme. Elles ont peut-être une boutique physique, ou une boutique en ligne sur une autre plateforme."
   components_profiles_show: "Afficher aussi les profils"