diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 5ef913f787..cf1162ffba 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -1344,6 +1344,11 @@ ar:
       stripe_connect_settings:
         resource: تهيئة ربط Strip
   api:
+    unknown_error: "هناك خطأ ما. تم إخطار فريقنا."
+    invalid_api_key: "مفتاح API المحدد غير صالح (%{key})."
+    unauthorized: "غير مصرح لك بتنفيذ هذا الإجراء."
+    invalid_resource: "مورد غير صالح. يرجى إصلاح الأخطاء والمحاولة مرة أخرى."
+    resource_not_found: "لا يمكن العثور على الموارد الذي تبحث عنه."
     enterprise_logo:
       destroy_attachment_does_not_exist: "الشعار غير موجود"
     enterprise_promo_image:
@@ -1417,6 +1422,7 @@ ar:
         login: "تسجيل الدخول"
         contact: "اتصل"
         require_customer_login: "يمكن للعملاء المعتمدين فقط الوصول إلى هذا المتجر."
+        require_login_link_html: "إذا كنت عميلاً معتمدًا بالفعل ، %{login} للمتابعة."
         require_login_2_html: "تريد أن تبدأ التسوق هنا؟ من فضلك %{contact} %{enterprise} واسأل عن الانضمام."
         require_customer_html: "إذا كنت ترغب في بدء التسوق هنا ، فيرجى %{contact} %{enterprise} أن تسأل عن الانضمام."
       select_oc:
@@ -2705,6 +2711,7 @@ ar:
     admin:
       unit_price_tooltip: "يزيد سعر الوحدة من الشفافية من خلال السماح لعملائك بمقارنة الأسعار بسهولة بين المنتجات المختلفة وأحجام العبوات. لاحظ أن سعر الوحدة النهائي المعروض في واجهة المحل قد يختلف لأنه يشمل الضرائب والرسوم."
       enterprise_limit_reached: "لقد وصلت إلى الحد القياسي للمؤسسات لكل حساب. اكتب %{contact_email} إذا كنت بحاجة إلى زيادته."
+      deleting_item_will_cancel_order: "ستؤدي هذه العملية إلى أمر واحد أو أكثر من الطلبات الفارغة ، والتي سيتم إلغاؤها. هل ترغب في المتابعة؟"
       modals:
         got_it: "فهمتك"
         close: "إغلاق"
@@ -2890,7 +2897,8 @@ ar:
           invalid: "غير صالحة"
         quantity_adjusted: "مخزون غير كافٍ. تم تحديث البند إلى الكمية القصوى المتاحة."
         quantity_unchanged: "الكمية لم تتغير عن المبلغ السابق."
-        cannot_remove_last_item: "لا يمكن إزالة المادة الأخير من الطلب. الرجاء إلغاء الطلب بدلا من ذلك."
+        cancel_the_order_html: "سيؤدي هذا إلى إلغاء الطلب الحالي.<br /> هل انت متأكد انك تريد المتابعة؟"
+        cancel_the_order_send_cancelation_email: "إرسال بريد إلكتروني للإلغاء إلى العميل"
       resend_user_email_confirmation:
         resend: "إعادة إرسال"
         sending: "إعادة إرسال..."
@@ -3353,6 +3361,7 @@ ar:
     tracking: "تتبع"
     tracking_number: "أرقام التتبع"
     order_total: "مجموع الطلب "
+    order_updated: "تم تحديث الطلب"
     customer_details: "تفاصيل العميل"
     customer_details_updated: "تم تحديث تفاصيل العميل"
     customer_search: "بحث العملاء"
diff --git a/config/locales/de_DE.yml b/config/locales/de_DE.yml
index 5a03c7d30b..10e6b40753 100644
--- a/config/locales/de_DE.yml
+++ b/config/locales/de_DE.yml
@@ -1347,6 +1347,11 @@ de_DE:
       stripe_connect_settings:
         resource: Konfiguration für Stripe Connect
   api:
+    unknown_error: "Etwas ist schief gelaufen. Unser Team wurde benachrichtigt."
+    invalid_api_key: "Ungültiger API-Schlüssel (%{key}) angegeben."
+    unauthorized: "Sie sind nicht berechtigt, diese Aktion auszuführen."
+    invalid_resource: "Ungültige Ressource. Bitte beheben Sie die Fehler und versuchen Sie es erneut."
+    resource_not_found: "Die gesuchte Ressource wurde nicht gefunden."
     enterprise_logo:
       destroy_attachment_does_not_exist: "Logo existiert nicht"
     enterprise_promo_image:
@@ -1756,7 +1761,7 @@ de_DE:
   order_delivery_address: Lieferadresse
   order_delivery_time: Lieferzeit
   order_special_instructions: "Ihre Notizen:"
-  order_pickup_time: 'Bereit zu Abholung:'
+  order_pickup_time: 'Bereit zu Abholung am:'
   order_pickup_instructions: Informationen zur Abholung
   order_produce: Produkte
   order_total_price: Summe
@@ -1826,7 +1831,7 @@ de_DE:
   email_shipping_delivery_time: "Lieferung am:"
   email_shipping_delivery_address: "Lieferadresse:"
   email_shipping_collection_details: Details zur Abholung
-  email_shipping_collection_time: "Bereit zur Abholung:"
+  email_shipping_collection_time: "Bereit zur Abholung am:"
   email_shipping_collection_instructions: "Informationen zur Abholung:"
   email_special_instructions: "Ihre Notizen:"
   email_signup_greeting: Hallo!
@@ -2400,14 +2405,14 @@ de_DE:
   your_profil_live: "Ihr öffentlicher Auftritt im Open Food Network"
   see: " "
   live: "ansehen"
-  manage: "Verwalten"
+  manage: "Verwalten Sie"
   resend: "Erneut senden"
   add_and_manage_products: "Produkte hinzufügen und verwalten"
   add_and_manage_order_cycles: "Bestellzyklen hinzufügen und verwalten"
   manage_order_cycles: "Bestellzyklen verwalten"
   manage_products: "Produkte verwalten"
-  edit_profile_details: "Unternehmensdetails bearbeiten"
-  edit_profile_details_etc: "Ändern Sie Ihre Unternehmensbeschreibung, Bilder usw."
+  edit_profile_details: "Details und Einstellungen bearbeiten"
+  edit_profile_details_etc: "Ändern Sie Ihre Unternehmensbeschreibung, Bilder, Zahlungsarten, Lieferoptionen und weitere Einstellungen."
   order_cycle: "Bestellzyklus"
   order_cycles: "Bestellzyklen"
   enterprise_relationships: "Unternehmensberechtigungen"
diff --git a/config/locales/en_CA.yml b/config/locales/en_CA.yml
index 0189ab18be..074363b71c 100644
--- a/config/locales/en_CA.yml
+++ b/config/locales/en_CA.yml
@@ -1345,6 +1345,11 @@ en_CA:
       stripe_connect_settings:
         resource: Stripe Connect configuration
   api:
+    unknown_error: "Something went wrong. Our team has been notified."
+    invalid_api_key: "Invalid API key (%{key}) specified."
+    unauthorized: "You are not authorized to perform that action."
+    invalid_resource: "Invalid resource. Please fix errors and try again."
+    resource_not_found: "The resource you were looking for could not be found."
     enterprise_logo:
       destroy_attachment_does_not_exist: "Logo does not exist"
     enterprise_promo_image:
@@ -1418,6 +1423,7 @@ en_CA:
         login: "login"
         contact: "contact"
         require_customer_login: "Only approved customers can access this shop"
+        require_login_link_html: "If you're already an approved customer, %{login} 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:
@@ -2708,6 +2714,7 @@ en_CA:
     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."
+      deleting_item_will_cancel_order: "This operation will result in one or more empty orders, which will be cancelled. Do you wish to proceed?"
       modals:
         got_it: "Got it"
         close: "Close"
@@ -2897,7 +2904,8 @@ en_CA:
           invalid: "invalid"
         quantity_adjusted: "Insufficient stock available. Your item updated to the maximum available quantity."
         quantity_unchanged: "Quantity unchanged from previous amount."
-        cannot_remove_last_item: "Cannot remove last item from order. Please cancel order instead."
+        cancel_the_order_html: "This will cancel the current order.<br />Are you sure you want to proceed?"
+        cancel_the_order_send_cancelation_email: "Send a cancellation email to the customer."
       resend_user_email_confirmation:
         resend: "Resend"
         sending: "Resend..."
@@ -3264,6 +3272,7 @@ en_CA:
     tracking: "Tracking"
     tracking_number: "Tracking Number"
     order_total: "Order Total"
+    order_updated: "Order updated"
     customer_details: "Customer Details"
     customer_details_updated: "Customer Details updated"
     customer_search: "Customer Search"
diff --git a/config/locales/en_FR.yml b/config/locales/en_FR.yml
index aab5a0d6e9..8f989c888d 100644
--- a/config/locales/en_FR.yml
+++ b/config/locales/en_FR.yml
@@ -1345,6 +1345,11 @@ en_FR:
       stripe_connect_settings:
         resource: Stripe Connect configuration
   api:
+    unknown_error: "Something went wrong. Our team has been notified."
+    invalid_api_key: "Invalid API key (%{key}) specified."
+    unauthorized: "You are not authorized to perform that action."
+    invalid_resource: "Invalid resource. Please fix errors and try again."
+    resource_not_found: "The resource you were looking for could not be found."
     enterprise_logo:
       destroy_attachment_does_not_exist: "Logo does not exist"
     enterprise_promo_image:
diff --git a/config/locales/en_GB.yml b/config/locales/en_GB.yml
index 58d588bb10..25e62b2b79 100644
--- a/config/locales/en_GB.yml
+++ b/config/locales/en_GB.yml
@@ -2709,6 +2709,7 @@ en_GB:
     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 as it is includes taxes & fees."
       enterprise_limit_reached: "You have reached the standard limit of enterprises per account. Write to %{contact_email} if you need to increase it."
+      deleting_item_will_cancel_order: "This operation will result in one or more empty orders, which will be cancelled. Do you wish to proceed?"
       modals:
         got_it: "Got it"
         close: "Close"
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 79b5b4f0a0..7f678733d7 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -1347,6 +1347,11 @@ fr:
       stripe_connect_settings:
         resource: Configuration de Stripe Connect
   api:
+    unknown_error: "Quelque chose n'a pas fonctionné. Notre équipe a été notifiée."
+    invalid_api_key: "La clé API (%{key}) n'est pas valide."
+    unauthorized: "Vous n'êtes pas autorisé à réaliser cette action."
+    invalid_resource: "La resource est invalide. Veuillez corriger les erreurs et recommencer."
+    resource_not_found: "La ressource recherchée n'a pas été trouvée."
     enterprise_logo:
       destroy_attachment_does_not_exist: "Aucun logo trouvé :-("
     enterprise_promo_image:
diff --git a/config/locales/fr_CA.yml b/config/locales/fr_CA.yml
index 69c89b36c4..205ee098b1 100644
--- a/config/locales/fr_CA.yml
+++ b/config/locales/fr_CA.yml
@@ -1347,6 +1347,11 @@ fr_CA:
       stripe_connect_settings:
         resource: Configuration de Stripe Connect
   api:
+    unknown_error: "Quelque chose n'a pas fonctionné. Notre équipe a été notifiée."
+    invalid_api_key: " La clé API (%{key}) n'est pas valide."
+    unauthorized: "Vous n'êtes pas autorisé à réaliser cette action."
+    invalid_resource: "La resource est invalide. Veuillez corriger les erreurs et recommencer."
+    resource_not_found: "La ressource recherchée n'a pas été trouvée."
     enterprise_logo:
       destroy_attachment_does_not_exist: "Aucun logo trouvé "
     enterprise_promo_image:
@@ -1420,6 +1425,7 @@ fr_CA:
         login: "se connecter"
         contact: "contact"
         require_customer_login: "Seul les acheteurs autorisés peuvent accéder à cette boutique."
+        require_login_link_html: "Quelque chose n'a pas fonctionné. Notre équipe a été notifiée.%{login}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:
@@ -2712,6 +2718,7 @@ fr_CA:
     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."
+      deleting_item_will_cancel_order: "Cette opération va rendre une ou plusieurs commandes vides, sans aucun produit. Elles vont ainsi être annulées. Souhaitez-vous continuer ?"
       modals:
         got_it: "J'ai compris"
         close: "Fermer"
@@ -2910,7 +2917,8 @@ fr_CA:
           invalid: "invalide"
         quantity_adjusted: "Le stock disponible est insuffisant. La quantité a été mise à jour en fonction du stock restant."
         quantity_unchanged: "La quantité n'a pas été modifiée."
-        cannot_remove_last_item: "Vous ne pouvez pas supprimer le dernier produit d'une commande, veuillez annuler la commande si aucun produit ne doit y être ajouté."
+        cancel_the_order_html: "Cette action va annuler la commande.<br />Etes-vous sûr de vouloir continuer ?"
+        cancel_the_order_send_cancelation_email: "Envoyer un email d'annulation à l'acheteur"
       resend_user_email_confirmation:
         resend: "Renvoyer"
         sending: "Renvoyer"
@@ -3278,6 +3286,7 @@ fr_CA:
     tracking: "Suivi"
     tracking_number: "Numéro de suivi"
     order_total: "Total Commande:"
+    order_updated: "Quelque chose n'a pas fonctionné. Notre équipe a été notifiée."
     customer_details: "Informations acheteur"
     customer_details_updated: "Détails de l'acheteur mis à jour"
     customer_search: "Recherche Acheteur"