diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index d11e100468..56fac2a708 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -246,6 +246,8 @@ ar:
   notes: ملاحظات
   error: خطأ
   processing_payment: "معالجة الدفع..."
+  no_pending_payments: "لا توجد دفعات معلقة"
+  invalid_payment_state: "حالة الدفع غير صالحة"
   filter_results: تصفية النتائج
   quantity: الكمية
   pick_up: النقل
@@ -1483,6 +1485,7 @@ ar:
   shopping_oc_closed_description: "يرجى الانتظار حتى تفتح الدورة التالية (أو اتصل بنا مباشرة لمعرفة ما إذا كان يمكننا قبول أي طلبات متأخرة)"
   shopping_oc_last_closed: "آخر دورة تم إغلاق %{distance_of_time} منذ"
   shopping_oc_next_open: "تفتح الدورة التالية في %{distance_of_time}"
+  shopping_oc_select: "اختيار..."
   shopping_tabs_home: "الصفحة الرئيسية"
   shopping_tabs_shop: "المتجر"
   shopping_tabs_about: "حول"
@@ -1864,6 +1867,7 @@ ar:
         headline: "تم الانتهاء !"
         thanks: "شكرًا لملء تفاصيل %{enterprise}."
         login: "يمكنك تغيير أو تحديث شركتك في أي مرحلة من خلال تسجيل الدخول إلى شبكة الغذاء المفتوح والذهاب إلى المسؤول."
+        action: "انتقل إلى واجهة الشركة"
   back: "عودة"
   continue: "استمر"
   action_or: "أو"
@@ -2278,6 +2282,7 @@ ar:
   enterprise_register_success_notice: "تهانينا! اكتمل التسجيل لـ %{enterprise}!"
   enterprise_bulk_update_success_notice: "تم تحديث المؤسسات بنجاح"
   enterprise_bulk_update_error: 'فشل التحديث'
+  enterprise_shop_show_error: "المتجر الذي تبحث عنه غير موجود أو غير نشط . يرجى التحقق من المحلات التجارية الأخرى."
   order_cycles_create_notice: 'تم إنشاء دورة الطلب الخاصة بك.'
   order_cycles_update_notice: 'تم تحديث دورة الطلب.'
   order_cycles_bulk_update_notice: 'تم تحديث دورات الطلب.'
@@ -2603,6 +2608,34 @@ ar:
       few: "حزم"
       many: "حزم"
       other: "حزم"
+    bottle:
+      zero: "زجاجات"
+      one: "زجاجة"
+      two: "زجاجات"
+      few: "زجاجات"
+      many: "زجاجات"
+      other: "زجاجات"
+    item:
+      zero: "العناصر"
+      one: "بند"
+      two: "العناصر"
+      few: "العناصر"
+      many: "العناصر"
+      other: "المواد"
+    dozen:
+      zero: "العشرات"
+      one: "دزينة"
+      two: "العشرات"
+      few: "العشرات"
+      many: "العشرات"
+      other: "العشرات"
+    unit:
+      zero: "الوحدات"
+      one: "وحدة"
+      two: "الوحدات"
+      few: "الوحدات"
+      many: "الوحدات"
+      other: "الوحدات"
   producers:
     signup:
       start_free_profile: "ابدأ بملف تعريف مجاني ، وتوسع عندما تكون جاهزًا!"
@@ -2956,7 +2989,8 @@ ar:
           tax_invoice: "فاتورة ضريبية"
           code: "الشفرة"
           from: "من "
-          to: "إلى"
+          to: "فاتورة الى"
+          shipping: "الشحن"
         form:
           distribution_fields:
             title: "توزيع"
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 7f7f1f9476..8033d2018f 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -1425,7 +1425,7 @@ ca:
   email_confirm_customer_greeting: "Hola %{name},"
   email_confirm_customer_intro_html: "Gràcies per comprar a <strong> %{distributor}</strong>."
   email_confirm_customer_number_html: "Confirmació de la comanda <strong> # %{number} </strong>"
-  email_confirm_customer_details_html: "Aquests són els detalls de la teva comanda de <strong> %{distributor} </ strong>:"
+  email_confirm_customer_details_html: "Aquests són els detalls de la teva comanda de<strong>%{distributor}</strong>:"
   email_confirm_customer_signoff: "Salutacions cordials,"
   email_confirm_shop_greeting: "Hola %{name},"
   email_confirm_shop_order_html: "Que bé! Tens una nova comanda per <strong> %{distributor} </ strong>."
@@ -3015,7 +3015,6 @@ ca:
           tax_invoice: "FACTURA D'IMPOSTOS"
           code: "Codi"
           from: "De"
-          to: "Per a"
         form:
           distribution_fields:
             title: "Distribució"
diff --git a/config/locales/de_DE.yml b/config/locales/de_DE.yml
index 9025b190f1..589dd9bb33 100644
--- a/config/locales/de_DE.yml
+++ b/config/locales/de_DE.yml
@@ -2927,7 +2927,6 @@ de_DE:
           tax_invoice: "Steuerrechnung"
           code: "Code"
           from: "Von"
-          to: "Zu"
         form:
           distribution_fields:
             title: "Verteilung"
diff --git a/config/locales/en_AU.yml b/config/locales/en_AU.yml
index 2e6b6d1121..741661f508 100644
--- a/config/locales/en_AU.yml
+++ b/config/locales/en_AU.yml
@@ -2927,7 +2927,6 @@ en_AU:
           tax_invoice: "TAX INVOICE"
           code: "Code"
           from: "From"
-          to: "To"
         form:
           distribution_fields:
             title: "Distribution"
diff --git a/config/locales/en_BE.yml b/config/locales/en_BE.yml
index 1e1c139a46..51cf1d2479 100644
--- a/config/locales/en_BE.yml
+++ b/config/locales/en_BE.yml
@@ -2856,7 +2856,6 @@ en_BE:
           tax_invoice: "TAX INVOICE"
           code: "Code"
           from: "From"
-          to: "To"
         form:
           distribution_fields:
             title: "Distribution"
diff --git a/config/locales/en_DE.yml b/config/locales/en_DE.yml
index 5d71e42c64..462ab3502f 100644
--- a/config/locales/en_DE.yml
+++ b/config/locales/en_DE.yml
@@ -2872,7 +2872,6 @@ en_DE:
           tax_invoice: "TAX INVOICE"
           code: "Code"
           from: "From"
-          to: "To"
         form:
           distribution_fields:
             title: "Distribution"
diff --git a/config/locales/en_FR.yml b/config/locales/en_FR.yml
index 03dbc99fcf..f34151ad66 100644
--- a/config/locales/en_FR.yml
+++ b/config/locales/en_FR.yml
@@ -3019,7 +3019,6 @@ en_FR:
           tax_invoice: "TAX INVOICE"
           code: "Code"
           from: "From"
-          to: "To"
         form:
           distribution_fields:
             title: "Distribution"
diff --git a/config/locales/en_GB.yml b/config/locales/en_GB.yml
index ff495627d6..7f12eb59bf 100644
--- a/config/locales/en_GB.yml
+++ b/config/locales/en_GB.yml
@@ -3025,7 +3025,6 @@ en_GB:
           tax_invoice: "TAX INVOICE"
           code: "Code"
           from: "From"
-          to: "To"
         form:
           distribution_fields:
             title: "Distribution"
diff --git a/config/locales/en_US.yml b/config/locales/en_US.yml
index 03a8308f2a..1cb6cfdcb4 100644
--- a/config/locales/en_US.yml
+++ b/config/locales/en_US.yml
@@ -50,6 +50,8 @@ en_US:
         shipping_method_ids: "Shipping Methods"
         payment_method_ids: "Payment Methods"
     errors:
+      messages:
+        inclusion: "is not included in the list"
       models:
         subscription_validator:
           attributes:
@@ -116,7 +118,9 @@ en_US:
       email_welcome: "Welcome"
       email_registered: "is now part of"
       email_userguide_html: "The User Guide with detailed support for setting up your Producer or Hub is here: %{link}"
+      userguide: "Open Food Network User Guide"
       email_admin_html: "You can manage your account by logging into the %{link} or by clicking on the cog in the top right hand side of the homepage, and selecting Administration."
+      admin_panel: "Admin Panel"
       email_community_html: "We also have an online forum for community discussion related to OFN software and the unique challenges of running a food enterprise. You are encouraged to join in. We are constantly evolving and your input into this forum will shape what happens next. %{link}"
       join_community: "Join the community"
     invite_manager:
@@ -242,6 +246,8 @@ en_US:
   notes: Notes
   error: Error
   processing_payment: "Processing payment..."
+  no_pending_payments: "No pending payments"
+  invalid_payment_state: "Invalid payment state"
   filter_results: Filter Results
   quantity: Quantity
   pick_up: Pick up
@@ -434,9 +440,12 @@ en_US:
         infinity: "Infinity"
         to_order_tip: "Items made to order do not have a set stock level, such as loaves of bread made fresh to order."
       back_to_products_list: "Back to products list"
+      editing_product: "Editing Product"
       tabs:
+        product_details: "Product Details"
         group_buy_options: "Group Buy Options"
         images: "Images"
+        variants: "Variants"
         product_properties: "Product Properties"
     product_import:
       title: Product Import
@@ -539,6 +548,7 @@ en_US:
         title: Inventory
         description: Use this page to manage inventories for your enterprises. Any product details set here will override those set on the 'Products' page
         enable_reset?: Enable Stock Reset?
+        default_stock: "Default stock"
         inherit?: Inherit?
         add: Add
         hide: Hide
@@ -693,6 +703,10 @@ en_US:
           enable_subscriptions_false: "Disabled"
           enable_subscriptions_true: "Enabled"
           shopfront_message: "Shopfront Message"
+          shopfront_message_placeholder: >
+              An optional message to welcome customers and explain how to shop with
+              you. If text is entered here it will be displayed in a home tab when
+              customers first arrive at your shopfront.
           shopfront_message_link_tooltip: "Insert / edit link"
           shopfront_message_link_prompt: "Please enter a URL to insert"
           shopfront_closed_message: "Shopfront Closed Message"
@@ -830,20 +844,32 @@ en_US:
       new:
         create: "Create"
         cancel: "Cancel"
+        back_to_list: "Back To List"
       edit:
         advanced_settings: "Advanced Settings"
         save: "Save"
+        save_and_next: "Save and Next"
         next: "Next"
         cancel: "Cancel"
+        back_to_list: "Back To List"
+        save_and_back_to_list: "Save and Back to List"
         choose_products_from: "Choose Products From:"
       incoming:
         save: "Save"
+        save_and_next: "Save and Next"
         next: "Next"
         cancel: "Cancel"
+        back_to_list: "Back To List"
       outgoing:
         previous: "Previous"
         save: "Save"
+        save_and_back_to_list: "Save and Back to List"
         cancel: "Cancel"
+        back_to_list: "Back To List"
+      wizard_progress:
+        edit: "1. General Settings"
+        incoming: "2. Incoming Products"
+        outgoing: "3. Outgoing Products"
       exchange_form:
         pickup_time_tip: When orders from this OC will be ready for the customer
         pickup_instructions_placeholder: "Pick-up instructions"
@@ -1081,10 +1107,13 @@ en_US:
       destroy_attachment_does_not_exist: "Logo does not exist"
     enterprise_promo_image:
       destroy_attachment_does_not_exist: "Promo image does not exist"
+    orders:
+      failed_to_update: "Failed to update order"
   checkout:
     already_ordered:
       cart: "cart"
       message_html: "You have an order for this order cycle already. Check the %{cart} to see the items you ordered before. You can also cancel items as long as the order cycle is open."
+    failed: "The checkout failed. Please let us know so that we can process your order."
   shops:
     hubs:
       show_closed_shops: "Show closed shops"
@@ -1255,6 +1284,7 @@ en_US:
   saving_credit_card: Saving credit card...
   card_has_been_removed: "Your card has been removed (number: %{number})"
   card_could_not_be_removed: Sorry, the card could not be removed
+  invalid_credit_card: "Invalid credit card"
   ie_warning_headline: "Your browser is out of date :-("
   ie_warning_text: "For the best Open Food Network experience, we strongly recommend upgrading your browser:"
   ie_warning_chrome: Download Chrome
@@ -1456,6 +1486,7 @@ en_US:
   shopping_oc_closed_description: "Please wait until the next cycle opens (or contact us directly to see if we can accept any late orders)"
   shopping_oc_last_closed: "The last cycle closed %{distance_of_time} ago"
   shopping_oc_next_open: "The next cycle opens in %{distance_of_time}"
+  shopping_oc_select: "Select..."
   shopping_tabs_home: "Home"
   shopping_tabs_shop: "Shop"
   shopping_tabs_about: "About"
@@ -1829,6 +1860,7 @@ en_US:
         headline: "Finished!"
         thanks: "Thanks for filling out the details for %{enterprise}."
         login: "You can change or update your enterprise at any stage by logging into Open Food Network and going to Admin."
+        action: "Go to Enterprise Dashboard"
   back: "Back"
   continue: "Continue"
   action_or: "OR"
@@ -1914,6 +1946,7 @@ en_US:
   tax_category: "Tax Category"
   calculator: "Calculator"
   calculator_values: "Calculator values"
+  calculator_settings_warning: "If you are changing the calculator type, you must save first before you can edit the calculator settings"
   flat_percent_per_item: "Flat Percent (per item)"
   flat_rate_per_item: "Flat Rate (per item)"
   flat_rate_per_order: "Flat Rate (per order)"
@@ -2244,6 +2277,7 @@ en_US:
   enterprise_register_success_notice: "Congratulations! Registration for %{enterprise} is complete!"
   enterprise_bulk_update_success_notice: "Enterprises updated successfully"
   enterprise_bulk_update_error: 'Update failed'
+  enterprise_shop_show_error: "The shop you are looking for doesn't exist or is inactive on OFN. Please check other shops."
   order_cycles_create_notice: 'Your order cycle has been created.'
   order_cycles_update_notice: 'Your order cycle has been updated.'
   order_cycles_bulk_update_notice: 'Order cycles have been updated.'
@@ -2395,6 +2429,12 @@ en_US:
           severity: Severity
           description: Description
           resolve: Resolve
+        exchange_products:
+          load_more_variants: "Load More Variants"
+          load_all_variants: "Load All Variants"
+          select_all_variants: "Select All %{total_number_of_variants} Variants"
+          variants_loaded: "%{num_of_variants_loaded} of %{total_number_of_variants} Variants Loaded"
+          loading_variants: "Loading Variants"
       tag_rules:
         shipping_method_tagged_top: "Shipping methods tagged"
         shipping_method_tagged_bottom: "are:"
@@ -2477,6 +2517,7 @@ en_US:
           customer_placeholder: "customer@example.org"
           valid_email_error: "Please enter a valid email address"
       subscriptions:
+        error_saving: "Error saving subscription"
         new:
           please_select_a_shop: "Please select a shop"
     insufficient_stock: "Insufficient stock available, only %{on_hand} remaining"
@@ -2552,6 +2593,76 @@ en_US:
       signup_or_login: "Start By signing up (or logging in)"
       have_an_account: "Already have an account?"
       action_login: "Log in now."
+  inflections:
+    each:
+      one: "each"
+      other: "each"
+    bunch:
+      one: "bunch"
+      other: "bunches"
+    pack:
+      one: "pack"
+      other: "packs"
+    box:
+      one: "box"
+      other: "boxes"
+    bottle:
+      one: "bottle"
+      other: "bottles"
+    jar:
+      one: "jar"
+      other: "jars"
+    head:
+      one: "head"
+      other: "heads"
+    bag:
+      one: "bag"
+      other: "bags"
+    loaf:
+      one: "loaf"
+      other: "loaves"
+    single:
+      one: "single"
+      other: "singles"
+    tub:
+      one: "tub"
+      other: "tubs"
+    packet:
+      one: "packet"
+      other: "packets"
+    item:
+      one: "item"
+      other: "items"
+    dozen:
+      one: "dozen"
+      other: "dozens"
+    unit:
+      one: "unit"
+      other: "units"
+    serve:
+      one: "serve"
+      other: "serves"
+    tray:
+      one: "tray"
+      other: "trays"
+    piece:
+      one: "piece"
+      other: "pieces"
+    pot:
+      one: "pot"
+      other: "pots"
+    bundle:
+      one: "bundle"
+      other: "bundles"
+    flask:
+      one: "flask"
+      other: "flasks"
+    basket:
+      one: "basket"
+      other: "baskets"
+    sack:
+      one: "sack"
+      other: "sacks"
   producers:
     signup:
       start_free_profile: "Start with a free profile, and expand when you're ready!"
@@ -2869,7 +2980,6 @@ en_US:
           tax_invoice: "TAX INVOICE"
           code: "Code"
           from: "From"
-          to: "To"
         form:
           distribution_fields:
             title: "Distribution"
diff --git a/config/locales/en_ZA.yml b/config/locales/en_ZA.yml
index 8db0c3d44f..95a6626d62 100644
--- a/config/locales/en_ZA.yml
+++ b/config/locales/en_ZA.yml
@@ -2870,7 +2870,6 @@ en_ZA:
           tax_invoice: "TAX INVOICE"
           code: "Code"
           from: "From"
-          to: "To"
         form:
           distribution_fields:
             title: "Distribution"
diff --git a/config/locales/es.yml b/config/locales/es.yml
index ca35023d67..d7cfd0eef1 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -2877,7 +2877,6 @@ es:
           tax_invoice: "FACTURA DE IMPUESTOS"
           code: "Código"
           from: "De"
-          to: "A"
         form:
           distribution_fields:
             title: "Distribución"
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 695d8126b1..105a648466 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -3049,7 +3049,6 @@ fr:
           tax_invoice: "FACTURE"
           code: "Code"
           from: "De"
-          to: "A"
         form:
           distribution_fields:
             title: "Distribution"
diff --git a/config/locales/fr_BE.yml b/config/locales/fr_BE.yml
index b780477f15..cebb76a300 100644
--- a/config/locales/fr_BE.yml
+++ b/config/locales/fr_BE.yml
@@ -2949,7 +2949,6 @@ fr_BE:
           tax_invoice: "FACTURE"
           code: "Code"
           from: "De"
-          to: "A"
         form:
           distribution_fields:
             title: "Distribution"
diff --git a/config/locales/fr_CA.yml b/config/locales/fr_CA.yml
index eed14f17d6..c9c76894c2 100644
--- a/config/locales/fr_CA.yml
+++ b/config/locales/fr_CA.yml
@@ -3029,7 +3029,6 @@ fr_CA:
           tax_invoice: "FACTURE"
           code: "Code"
           from: "De"
-          to: "A"
         form:
           distribution_fields:
             title: "Distribution"
diff --git a/config/locales/it.yml b/config/locales/it.yml
index cb576b0cb1..a0f7731518 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -1394,7 +1394,7 @@ it:
   order_delivery_address: Indirizzo di consegna
   order_delivery_time: Tempo di consegna
   order_special_instructions: "Tue note:"
-  order_pickup_time: Pronto per la raccolta
+  order_pickup_time: Pronto per il ritiro
   order_pickup_instructions: Istruzioni per la raccolta
   order_produce: Produrre
   order_total_price: Totale
@@ -1463,7 +1463,7 @@ it:
   email_shipping_delivery_time: "Consegna il"
   email_shipping_delivery_address: "Indirizzo di consegna"
   email_shipping_collection_details: Dettagli della raccolta
-  email_shipping_collection_time: "Pronto per la raccolta:"
+  email_shipping_collection_time: "Pronto per il ritiro:"
   email_shipping_collection_instructions: "Istruzioni per la raccolta:"
   email_special_instructions: "Tue note:"
   email_signup_greeting: Ciao!
@@ -3023,7 +3023,6 @@ it:
           tax_invoice: "FATTURA DELLE TASSE"
           code: "Codice"
           from: "Da"
-          to: "A"
         form:
           distribution_fields:
             title: "Distribuzione"
diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index d5849fe3ab..e7d33d52a0 100644
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -3018,7 +3018,6 @@ nb:
           tax_invoice: "AVGIFTSFAKTURA"
           code: "Kode"
           from: "Fra"
-          to: "Til"
         form:
           distribution_fields:
             title: "Distribusjon"
diff --git a/config/locales/nl_BE.yml b/config/locales/nl_BE.yml
index 7ac172e701..1ea003122e 100644
--- a/config/locales/nl_BE.yml
+++ b/config/locales/nl_BE.yml
@@ -2865,7 +2865,6 @@ nl_BE:
           tax_invoice: "FACTUUR"
           code: "Code"
           from: "Van"
-          to: "tot"
         form:
           distribution_fields:
             title: "Distributie"
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 40e8f28f91..b9035d7f10 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -2811,7 +2811,6 @@ pt:
           tax_invoice: "FACTURA FISCAL"
           code: "Código"
           from: "De"
-          to: "Para"
         form:
           distribution_fields:
             title: "Distribuição"
diff --git a/config/locales/pt_BR.yml b/config/locales/pt_BR.yml
index 7bb6d77399..04c707defb 100644
--- a/config/locales/pt_BR.yml
+++ b/config/locales/pt_BR.yml
@@ -1345,16 +1345,16 @@ pt_BR:
   learn_cta: "Inspire-se"
   connect_body: "Procure em nossa lista de produtores, distribuidores e cooperativas para encontrar um comércio justo perto de você. Registre seu negócio ou organização na Open Food Brasil para que os consumidores possam te encontrar. Junte-se à comunidade para trocar experiências e resolver problemas."
   connect_cta: "Explore"
-  system_headline: "Compras - é assim que funciona:"
+  system_headline: "Como comprar:"
   system_step1: "1. Busca"
   system_step1_text: "Dentre os diversos mercados independentes, escolha o de sua preferência. Procure por região, tipo de alimentos, alimentos locais e sazonais e escolha o método de recebimento que pode ser receber em casa ou retirar no local. "
   system_step2: "2. Compra"
-  system_step2_text: "Conheça as histórias por trás da sua comida e as pessoas que as produzem! Transforme suas compras com alimentos locais acessíveis."
+  system_step2_text: "Conheça as pessoas e as histórias por trás da sua comida. Transforme sua relação com o alimento!"
   system_step3: "3. Retirada / Entrega"
-  system_step3_text: "Você escolhe a melhor forma de receber o seu alimentar, aguarde pela sua entrega, ou visite seus produtores ou centrais para uma conexão mais pessoal com seus alimentos."
+  system_step3_text: "Escolha a forma de recebimento do seu pedido: você pode receber em casa ou retirar no local, assim pode encontrar e conhecer as pessoas envolvidas e estreitar sua relação com as/os agricultoras/es ou as/os mediadoras/es da circulação de produtos. "
   cta_headline: "Compras que fazem do mundo um lugar melhor."
   cta_label: "Estou pronto"
-  stats_headline: "Estamos criando um novo sistema alimentar"
+  stats_headline: "Estamos trabalhando para relocalizar os sistemas agroalimentares"
   stats_producers: "produtores de alimentos"
   stats_shops: "lojas de alimentos"
   stats_shoppers: "consumidores de alimentos"
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index f129bac722..ae32c53f2e 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -1972,7 +1972,6 @@ sv:
           tax_invoice: "FAKTURA"
           code: "Kod"
           from: "Från"
-          to: "Till"
         form:
           distribution_fields:
             title: "Distribution"
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index bd09046967..8260ea4341 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -3010,7 +3010,6 @@ tr:
           tax_invoice: "VERGİ FATURASI"
           code: "Kod"
           from: "İtibaren"
-          to: "Şu vakte kadar"
         form:
           distribution_fields:
             title: "Dağıtım"