diff --git a/config/locales/de_DE.yml b/config/locales/de_DE.yml
index 883cda0537..ee8453f96a 100644
--- a/config/locales/de_DE.yml
+++ b/config/locales/de_DE.yml
@@ -238,6 +238,7 @@ de_DE:
   search_by_name: Suche nach Ort oder Name des Ladens/Produzents ...
   producers_join: 'Wir laden Produzenten ein, jetzt dem Open Food Network beizutreten. '
   charges_sales_tax: Berechnen Sie Steuern?
+  business_address: "Unternehmensadresse"
   print_invoice: "Rechnung drucken"
   print_ticket: "Beleg drucken"
   select_ticket_printer: "Wählen Sie einen Drucker für die Belege."
@@ -717,6 +718,15 @@ de_DE:
           terms_and_conditions: "Allgemeine Geschäftsbedingungen"
           remove_terms_and_conditions: "Datei löschen"
           uploaded_on: "hochgeladen am"
+          reset_form: "zurücksetzen"
+        business_address:
+          company_legal_name: Unternehmensname
+          company_placeholder: z. B. Charlies großartige Farm
+          address1: Straße + Hausnummer
+          address1_placeholder: z. B. Gartenstraße 123
+          address2: Adresszusatz (optional)
+          legal_phone_number: Telefonnummer
+          phone_placeholder: "z. B. +49 40 123 456"
         contact:
           name: Name
           name_placeholder: z. B. Gustav Pflaume
@@ -724,7 +734,7 @@ de_DE:
           email_address_placeholder: z. B. anfragen@fresh-food.com
           email_address_tip: "Diese E-Mail-Adresse wird in Ihrem öffentlichen Profil angezeigt."
           phone: Telefonnummer
-          phone_placeholder: z. B. 98 7654 3210
+          phone_placeholder: z. B. +49 40 123 456
           website: Homepage
           website_placeholder: z. B. www.truffles.com
         enterprise_fees:
@@ -1539,6 +1549,7 @@ de_DE:
   split_checkout:
     your_details_without_number: Ihre Daten
     payment_method_without_number: Zahlungsart
+    order_summary_without_number: Bestellübersicht
     step1:
       your_details:
         title: Ihre Daten
@@ -1553,7 +1564,7 @@ de_DE:
           placeholder: z. B. Max.Mustermann@beispiel.com
         phone:
           label: Telefonnummer
-          placeholder: z. B. 016012345678
+          placeholder: z. B. +49 40 123 456
       billing_address:
         title: Rechnungsadresse
       address:
@@ -1995,13 +2006,13 @@ de_DE:
         headline: "Ihr Unternehmen"
         enterprise: "Nennen Sie uns zunächst bitte den Namen und die Adresse Ihres Unternehmens."
         producer: "Nennen Sie uns zunächst bitte den Namen und die Adresse Ihres Betriebs."
-        enterprise_name_field: "Name des Unternehmens:"
+        enterprise_name_field: "Unternehmensname:"
         producer_name_field: "Name des Betriebs:"
         producer_name_field_placeholder: "z. B. Charlies großartige Farm"
         producer_name_field_error: "Bitte wählen Sie einen eindeutigen Namen für Ihr Unternehmen."
-        address1_field: "Adresse:"
+        address1_field: "Straße + Hausnummer:"
         address1_field_placeholder: "z. B. Gartenstraße 123"
-        address1_field_error: "Bitte geben Sie eine Adresse ein."
+        address1_field_error: "Bitte geben Sie eine Straße und Hausnummer ein."
         address2_field: "Adresszusatz (optional):"
         suburb_field: "Ort:"
         suburb_field_placeholder: "z. B. Nordwestheim"
@@ -2025,7 +2036,7 @@ de_DE:
         contact_field_placeholder: "Vorname Nachname"
         contact_field_required: "Bitte geben Sie einen Hauptansprechpartner ein."
         phone_field: "Telefonnummer (optional)"
-        phone_field_placeholder: "z. B. 030 1234 5678"
+        phone_field_placeholder: "z. B. +49 40 123 456"
       type:
         title: "Art des Profils"
         headline: "Wählen Sie bitte die Profilart für %{enterprise} aus!"
@@ -2156,7 +2167,7 @@ de_DE:
   admin_enterprise_groups_data_powertip_logo: "Dies ist das Logo für die Gruppe."
   admin_enterprise_groups_data_powertip_promo_image: "Dieses Bild wird oben im Gruppenprofil angezeigt."
   admin_enterprise_groups_contact: "Kontakt"
-  admin_enterprise_groups_contact_phone_placeholder: "z. B. 98 7654 3210"
+  admin_enterprise_groups_contact_phone_placeholder: "z. B. +40 40 123456"
   admin_enterprise_groups_contact_address1_placeholder: "z. B. Gartenstraße 123"
   admin_enterprise_groups_contact_city: "Ort"
   admin_enterprise_groups_contact_city_placeholder: "z. B. Nordwestheim"
@@ -2607,6 +2618,8 @@ de_DE:
           title: "Allgemeine Geschäftsbedingungen hochladen"
           message_1: "Alle Ihre Käufer müssen ihnen einmal an der Kasse zustimmen. Wenn Sie die Datei aktualisieren, müssen alle Ihre Käufer an der Kasse erneut zustimmen."
           message_2: "Zu beachten bei Abonnements: Bitte senden Sie Käufern von Abonnements vorerst die Allgemeinen Geschäftsbedingungen (oder die Änderungen dieser) direkt per E-Mail zu. Sie werden nicht automatisch über diese Änderungen informiert."
+        business_address_info:
+          message: "Möchten Sie auf Rechnungen Ihren Unternehmensnamen sowie die zugehörige Adresse und Telefonnummer abweichend von den bei Ihrer Registrierung hinterlegten Daten angeben, tragen Sie diese hier ein. Diese Daten werden NUR auf Rechnungen verwendet. Wenn diese Felder leer sind, werden Ihre unter \"Adresse\" und \"Kontakt\" angegebenen Daten zu Name, Adresse und Telefonnummer verwendet."
       panels:
         save: SPEICHERN
         saved: GESPEICHERT
@@ -3046,7 +3059,7 @@ de_DE:
   shipment: "Lieferung"
   shipment_inc_vat: "Liefergebühr inkl. Mehrwertsteuer"
   shipping_tax_rate: "Steuersatz der Liefergebühr"
-  category: "Produktkategorie"
+  category: "Kategorie"
   import_date: "Importdatum"
   delivery: "Lieferung"
   temperature_controlled: "Temperaturüberwacht"
@@ -3483,12 +3496,12 @@ de_DE:
           new: "Neu"
           back_to_shipping_methods_list: "Zurück zur Liste der Lieferoptionen"
         form:
-          categories: "Kategorien"
+          categories: "Lieferkategorien"
           tax_category: "Steuerkategorie"
           zones: "Zonen"
           both: "Sowohl an der Kasse als auch im Backoffice"
           back_end: "Nur im Backoffice"
-          deactivation_warning: "Durch Deaktivieren einer Lieferoption wird die Lieferoption Ihren Kunden nicht mehr zur Verfügung stehen. Alternativ können Sie eine Lieferoption an der Kasse ausblenden, indem Sie die Option \"Anzeige\" auf \"Nur Backoffice\" setzen."
+          deactivation_warning: "Durch Deaktivieren einer Lieferoption wird die Lieferoption Ihren Kunden nicht mehr zur Verfügung stehen. Alternativ können Sie eine Lieferoption an der Kasse ausblenden, indem Sie die Option \"Anzeige\" auf \"Nur im Backoffice\" setzen."
       payment_methods:
         index:
           payment_methods: "Zahlungsarten"
@@ -3537,7 +3550,7 @@ de_DE:
           front_end: "Nur an der Kasse"
           back_end: "Nur im Backoffice"
           tags: "Stichwörter"
-          deactivation_warning: "Durch Deaktivieren einer Zahlungsart wird die Zahlungsart Ihren Kunden nicht mehr zur Verfügung stehen. Alternativ können Sie eine Zahlungsart an der Kasse ausblenden, indem Sie die Option \"Anzeige\" auf \"Nur Backoffice\" setzen."
+          deactivation_warning: "Durch Deaktivieren einer Zahlungsart wird die Zahlungsart Ihren Kunden nicht mehr zur Verfügung stehen. Alternativ können Sie eine Zahlungsart an der Kasse ausblenden, indem Sie die Option \"Anzeige\" auf \"Nur im Backoffice\" setzen."
         providers:
           provider: "Anbieter"
           check: "Bargeld, EC etc. (Zahlungen, für die keine automatische Validierung erforderlich ist)"
diff --git a/config/locales/en_DE.yml b/config/locales/en_DE.yml
index 5de85f7387..971dbc00fb 100644
--- a/config/locales/en_DE.yml
+++ b/config/locales/en_DE.yml
@@ -621,6 +621,8 @@ en_DE:
           acn_placeholder: eg. 123 456 789
           display_invoice_logo: Display logo in invoices
           invoice_text: Add customized text at the end of invoices
+        business_address:
+          address2: Address (contd.)
         contact:
           name: Name
           name_placeholder: eg. Gustav Plum
diff --git a/config/locales/en_GB.yml b/config/locales/en_GB.yml
index 7bff58a492..dc03dd1c68 100644
--- a/config/locales/en_GB.yml
+++ b/config/locales/en_GB.yml
@@ -41,6 +41,8 @@ en_GB:
           attributes:
             email:
               taken: "There's already an account for this email. Please login or reset your password."
+            reset_password_token:
+              invalid: is invalid
         spree/order:
           no_card: There are no authorised credit cards available to charge
         spree/credit_card:
@@ -95,6 +97,9 @@ en_GB:
   community_forum_url: "Community forum URL"
   customer_instructions: "Customer instructions"
   devise:
+    passwords:
+      spree_user:
+        cannot_be_blank: "User password cannot be blank. Please enter a password."
     confirmations:
       send_instructions: "You will receive an email with instructions about how to confirm your account in a few minutes."
       failed_to_send: "An error occurred whilst sending your confirmation email."
@@ -233,6 +238,7 @@ en_GB:
   search_by_name: Search by name, town, county or postcode...
   producers_join: UK producers are now welcome to join Open Food Network UK.
   charges_sales_tax: Charges VAT?
+  business_address: "Business Address"
   print_invoice: "Print Invoice"
   print_ticket: "Print Ticket"
   select_ticket_printer: "Select printer for tickets"
@@ -712,6 +718,15 @@ en_GB:
           terms_and_conditions: "Terms and Conditions"
           remove_terms_and_conditions: "Remove File"
           uploaded_on: "uploaded on"
+          reset_form: "Reset Form"
+        business_address:
+          company_legal_name: Company Legal Name
+          company_placeholder: Example.
+          address1: Legal address
+          address1_placeholder: 123 High Street
+          address2: Address (contd.)
+          legal_phone_number: Legal phone number
+          phone_placeholder: "01632 123 456"
         contact:
           name: Name
           name_placeholder: eg. Amanda Plum
@@ -1025,6 +1040,7 @@ en_GB:
         schedule: Schedule
         schedules: Schedules
         new_schedule: New Schedule
+        new_schedule_tooltip: The frequency with which a subscription order is placed
       name_and_timing_form:
         name: Name
         orders_open: Orders open at
@@ -1530,40 +1546,81 @@ en_GB:
   cost_currency: "Cost Currency"
   split_checkout:
     your_details_without_number: Your details
+    payment_method_without_number: Payment method
+    order_summary_without_number: Order summary
     step1:
       your_details:
         title: Your details
         first_name:
           label: First Name
+          placeholder: e.g. Jane
         last_name:
           label: Last Name
+          placeholder: e.g. Doe
         email:
           label: Email
+          placeholder: e.g. Janedoe@email.com
         phone:
           label: Phone number
+          placeholder: e.g. 07987654321
       billing_address:
         title: Billing address
       address:
+        address1:
+          label: Address (House Number + Street)
+          placeholder: e.g. Flat 1 Elm Apartments
+        address2:
+          label: Additional address info (optional)
+          placeholder: Flat Number 3
         city:
           label: City
+          placeholder: e.g. London
         state_id:
           label: County
         zipcode:
           label: Postcode
+          placeholder: e.g. SW11 3QN
         country_id:
           label: Country
       delivery_address:
         title: Delivery address
+      submit: Next - Payment method
+      cancel: Back to Edit basket
+    step2:
+      payment_method:
+        title: Payment method
+      explaination: You can review and confirm your order in the next step which includes the final costs.
+      submit: Next - Order summary
+      cancel: Back to Your details
     step3:
       your_details:
         title: Your details
+        edit: Edit your details
       billing_address:
         title: Billing address
+      shipping_address:
+        title: Shipping address
+      delivery_info:
+        title: Delivery info
+      payment_method:
+        title: Payment method
+        edit: Edit payment method
+      order:
+        title: Order total
       terms_and_conditions:
         message_html: "I agree to the seller's %{terms_and_conditions_link}."
         link_text: "Terms and Conditions"
+      agree: By clicking 'Complete order' you agree to your order being processed.
+      submit: Complete order
+      cancel: Back to Payment method
     errors:
+      global: "Saving failed, please update the highlighted fields."
+      terms_not_accepted: Please accept Terms and Conditions
+      required: Field cannot be blank
+      invalid_number: "Please enter a valid phone number"
       invalid_email: "Please enter a valid email address"
+      select_a_shipping_method: Select a shipping method
+      select_a_payment_method: Select a payment method
   order_paid: PAID
   order_not_paid: NOT PAID
   order_total: Total order
@@ -1663,6 +1720,7 @@ en_GB:
   producer_mail_order_text: "Here is a summary of the orders for your products:"
   producer_mail_delivery_instructions: "Stock pickup/delivery instructions:"
   producer_mail_signoff: "Thanks and best wishes"
+  producer_mail_order_customer_text: "Here is a summary of the orders grouped by customers"
   shopping_oc_closed: Orders are closed
   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"
@@ -2071,6 +2129,8 @@ en_GB:
   fundraising_fee: "Fundraising fee"
   price_graph: "Price graph"
   included_tax: "Included tax"
+  tax: "Tax"
+  tax_amount_included: "%{amount} (included)"
   balance: "Balance"
   transaction: "Transaction"
   transaction_date: "Date"
@@ -2142,6 +2202,7 @@ en_GB:
   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"
   calculator_preferred_unit_error: "must be kg or lb"
+  calculator_preferred_value_error: "Invalid input. Please use only numbers. For example: 10, 5.5, -20"
   flat_percent_per_item: "Flat Percent (per item)"
   flat_rate_per_item: "Flat Rate (per item)"
   flat_rate_per_order: "Flat Rate (per order)"
@@ -2149,6 +2210,7 @@ en_GB:
   price_sack: "Price Sack"
   new_order_cycles: "New Order Cycles"
   new_order_cycle: "New Order Cycle"
+  new_order_cycle_tooltip: "Open shop for a certain time period"
   select_a_coordinator_for_your_order_cycle: "Select a coordinator for your order cycle"
   notify_producers: 'Notify producers'
   edit_order_cycle: "Edit Order Cycle"
@@ -2515,6 +2577,7 @@ en_GB:
     resolve_errors: Please resolve the following errors
     more_items: "+ %{count} More"
     default_card_updated: Default Card Updated
+    default_card_voids_auth: Changing your default card will remove the shop's existing authorisations to charge it. You can re-authorise shops after updating the default card. Do you wish to change the default card?
     cart:
       add_to_cart_failed: >
           There was a problem adding this product to your basket. Perhaps it has become
@@ -2553,6 +2616,8 @@ en_GB:
           title: "Uploading Terms and Conditions"
           message_1: "All your buyers will have to agree to them once at checkout. If you update the file, all your buyers will have to agree to them again at checkout."
           message_2: "For buyers with subscriptions, you need to email them the Terms and Conditions (or the changes to them) for now, nothing will notify them about these new Terms and Conditions."
+        business_address_info:
+          message: "Company Legal Name, Legal Address and Legal Phone Number are used for businesses that invoice from a legal entity registered with different details to their public trading information. These details will ONLY be used on invoices. If these details are blank your Public Name, Address and Phone Number will be used on invoices."
       panels:
         save: SAVE
         saved: SAVED
@@ -2716,6 +2781,7 @@ en_GB:
           invalid: "invalid"
         quantity_adjusted: "Insufficient stock available. Line item updated to maximum available quantity."
         quantity_unchanged: "Quantity unchanged from previous amount."
+        cannot_remove_last_item: "Cannot remove last item from order. Please cancel order instead."
       resend_user_email_confirmation:
         resend: "Resend"
         sending: "Resend..."
@@ -3732,6 +3798,7 @@ en_GB:
       awaiting_return: awaiting return
       canceled: cancelled
       cart: cart
+      confirmation: "confirmation"
       complete: complete
       confirm: confirm
       delivery: delivery
diff --git a/config/locales/en_US.yml b/config/locales/en_US.yml
index 96e17b886a..f56a13a498 100644
--- a/config/locales/en_US.yml
+++ b/config/locales/en_US.yml
@@ -1547,6 +1547,7 @@ en_US:
   split_checkout:
     your_details_without_number: Your details
     payment_method_without_number: Payment method
+    order_summary_without_number: Order summary
     step1:
       your_details:
         title: Your details
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 68b14e2f4e..f3c4e27778 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -3617,7 +3617,7 @@ ru:
             no_payment_via_admin_backend: Платежи Paypal не могут быть зарегистрированы в Бэк-офисе
       products:
         image_upload_error: "Изображение товара не было распознано. Пожалуйста, загрузите изображение в формате PNG или JPG."
-        paperclip_image_error: "Скрепка вернула ошибки для файла '%{attachment_file_name}' - проверьте установку ImageMagick или исходный файл изображения."
+        paperclip_image_error: "Скрепка вернула ошибки для файла '%{attachment_file_name}' - проверьте установку ImageMagick или исходный файл изображения."
         new:
           title: "Новый Товар"
           new_product: "Новый Товар"