Update all locales with the latest Transifex translations

config/locales/ar.yml

@@ -680,12 +680,11 @@ ar:
           ofn_uid: شبكة الغذاء المفتوح UID
           ofn_uid_tip: المعرف الفريد المستخدم لتحديد الشركة على شبكة الغذاء المفتوح.
         shipping_methods:
-          name: اسم
-          applies: ينطبق؟
-          manage: إدارة طرق الشحن
-          create_button: إنشاء طريقة شحن جديدة
-          create_one_button: إنشاء واحدة الآن
-          no_method_yet: ليس لديك أي طرق شحن حتى الآن.
+          name: "اسم"
+          manage: "إدارة طرق الشحن"
+          create_button: "إنشاء طريقة شحن جديدة"
+          create_one_button: "إنشاء واحدة الآن"
+          no_method_yet: "ليس لديك أي طرق شحن حتى الآن."
         shop_preferences:
           shopfront_requires_login: "واجهة المتجر مرئية للعام؟"
           shopfront_requires_login_tip: "اختر ما إذا كان يجب على العملاء تسجيل الدخول لعرض واجهة المحل أو إذا كان مرئيًا للجميع."
@@ -3013,9 +3012,6 @@ ar:
           zone: "منطقة"
           calculator: "آلة حاسبة"
           display: "عرض"
-          both: "على حد سواء"
-          front_end: "الواجهة "
-          back_end: "عودة النهاية"
           no_shipping_methods_found: "لم يتم العثور على طرق الشحن"
         new:
           new_shipping_method: "طريقة الشحن الجديدة"
@@ -3027,9 +3023,6 @@ ar:
         form:
           categories: "التصنيفات"
           zones: "مناطق"
-          both: "على حد سواء"
-          front_end: "الواجهة "
-          back_end: "عودة النهاية"
       payment_methods:
         new:
           new_payment_method: "طريقة الدفع الجديدة"
@@ -3155,6 +3148,13 @@ ar:
       shared:
         sortable_header:
           name: "الاسم"
+          number: "رقم "
+          state: "ولاية"
+          payment_state: "حالة الدفعة"
+          shipment_state: "حالة الشحن"
+          email: "البريد الإلكتروني"
+          total: "المجموع"
+      general_settings:
         edit:
           legal_settings: "الإعدادات القانونية"
           cookies_consent_banner_toggle: "عرض راية موافقة ملفات تعريف الارتباط"
@@ -3180,7 +3180,6 @@ ar:
       format: '٪ س-٪ م-%d'
       js_format: 'يوم-شهر-سنة'
     orders:
-      error_flash_for_unavailable_items: "المادة في سلة التسوق غير متاح."
       edit:
         login_to_view_order: "يرجى تسجيل الدخول لعرض طلبك."
       bought:

config/locales/ca.yml

@@ -686,12 +686,11 @@ ca:
           ofn_uid: UID d'OFN
           ofn_uid_tip: L'identificador únic que s’utilitza per identificar l'organització a Open Food Network.
         shipping_methods:
-          name: Nom
-          applies: 'Aplicar? '
-          manage: Gestiona els mètodes d'enviament
-          create_button: Crea un nou mètode d'enviament
-          create_one_button: Crea'n un ara
-          no_method_yet: Encara no teniu cap mètode d'enviament.
+          name: "Nom"
+          manage: "Gestiona els mètodes d'enviament"
+          create_button: "Crea un nou mètode d'enviament"
+          create_one_button: "Crea'n un ara"
+          no_method_yet: "Encara no teniu cap mètode d'enviament."
         shop_preferences:
           shopfront_requires_login: "Botiga visible públicament?"
           shopfront_requires_login_tip: "Trieu si les consumidores han d'iniciar sessió per veure la botiga o si és visible per a tothom."
@@ -868,6 +867,7 @@ ca:
         incoming: "Entrant"
         supplier: "Proveïdora"
         products: "Productes "
+        receival_details: "Detalls de la recepció"
         fees: "Comissions"
         save: "Desa"
         save_and_next: "Desa i següent"
@@ -1177,7 +1177,11 @@ ca:
         signup: "registra't"
         contact: "contacta"
         require_customer_login: "Només els clients autoritzats poden accedir a aquesta botiga."
+        require_login_html: "Si ja sou una consumidora aprovat, %{login} o %{signup} podeu continuar."
+        require_login_2_html: "Voleu començar a comprar aquí? Per favor, %{contact} %{enterprise} i pregunteu com unir-vos."
         require_customer_html: "Si vols començar a comprar aquí, si us plau %{contact} %{enterprise} per unir-t'hi."
+      select_oc:
+        select_oc_html: "<span class='highlighted'>Trieu quan voleu la vostra comanda</span> per veure quins productes estan disponibles."
   card_could_not_be_updated: No s'ha pogut actualitzar la targeta
   card_could_not_be_saved: no s'ha pogut desar la targeta
   spree_gateway_error_flash_for_checkout: "Hi ha hagut un problema amb la vostra informació de pagament: %{error}"
@@ -1441,7 +1445,7 @@ ca:
   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>."
+  email_confirm_shop_order_html: "Que bé! Tens una nova comanda per <strong> %{distributor}</strong>! "
   email_confirm_shop_number_html: "Confirmació de la comanda <strong> # %{number}</strong>"
   email_order_summary_item: "Article"
   email_order_summary_quantity: "quant."
@@ -1454,23 +1458,23 @@ ca:
   email_payment_not_paid: 'NO PAGAT '
   email_payment_summary: Resum del pagament
   email_payment_method: "Pagament a través de:"
-  email_so_placement_intro_html: "Tens una nova comanda amb <strong> %{distributor} </ strong>"
+  email_so_placement_intro_html: "Tens una nova comanda amb <strong> %{distributor}</strong>"
   email_so_placement_details_html: "Aquests són els detalls de la comanda de <strong>%{distributor}</strong> :"
   email_so_placement_changes: "Malauradament, no tots els productes que has demanat estaven disponibles. Les quantitats originals que has sol·licitat apareixen ratllades a sota."
-  email_so_payment_success_intro_html: "S'ha processat un pagament automàtic per a la vostra comanda des de <strong> %{distributor} </ strong>."
+  email_so_payment_success_intro_html: "S'ha processat un pagament automàtic per a la vostra comanda des de <strong> %{distributor}</strong>."
   email_so_placement_explainer_html: "Aquesta comanda s'ha creat automàticament per tu."
   email_so_edit_true_html: "Pots <a href='%{order_url}'>fer canvis</a> fins que les comandes es tanquin el %{orders_close_at}."
   email_so_edit_false_html: "Pots <a href='%{order_url}'> veure detalls d'aquesta comanda </a> en qualsevol moment."
   email_so_contact_distributor_html: "Si tens alguna pregunta pots contactar amb <strong>%{distributor}</strong> a través d'%{email}."
-  email_so_contact_distributor_to_change_order_html: "Aquesta comanda s'ha creat automàticament per a vostè. Podeu fer canvis fins que les comandes es tanquin a %{orders_close_at} contactant a <strong> %{distributor} </ strong> a través d'%{email}."
+  email_so_contact_distributor_to_change_order_html: "Aquesta comanda s'ha creat automàticament per a vostè. Podeu fer canvis fins que les comandes es tanquin a %{orders_close_at} contactant a <strong> %{distributor} </strong> a través d'%{email}."
   email_so_confirmation_intro_html: "La teva comanda amb <strong>%{distributor}</strong> ja està confirmada"
   email_so_confirmation_explainer_html: "Vas realitzar aquesta comanda automàticament i ara s'ha finalitzat."
   email_so_confirmation_details_html: "A continuació trobareu tot el que necessiteu saber sobre la comanda de <strong>%{distributor}</strong> :"
-  email_so_empty_intro_html: "Hem intentat fer una nova comanda amb <strong> %{distributor} </ strong>, però hem tingut alguns problemes..."
+  email_so_empty_intro_html: "Hem intentat fer una nova comanda amb <strong> %{distributor} </strong>, però hem tingut alguns problemes..."
   email_so_empty_explainer_html: "Malauradament, cap dels productes que heu demanat estava disponible, de manera que no s'ha realitzat cap comanda. Les quantitats originals que heu sol·licitat apareixen ratllades a sota."
-  email_so_empty_details_html: "Aquests són els detalls de la comanda sense confirmar per <strong> %{distributor} </ strong>:"
+  email_so_empty_details_html: "Aquests són els detalls de la comanda sense confirmar per <strong> %{distributor} </strong>:"
   email_so_failed_payment_intro_html: "Hem intentat processar un pagament però hem tingut alguns problemes..."
-  email_so_failed_payment_explainer_html: "El pagament de la vostra subscripció amb <strong> %{distributor} </ strong> ha fallat a causa d'un problema amb la vostra targeta de crèdit. S'ha notificat a <strong> %{distributor} </ strong> d'aquest pagament fallit."
+  email_so_failed_payment_explainer_html: "El pagament de la vostra subscripció amb <strong> %{distributor} </strong> ha fallat a causa d'un problema amb la vostra targeta de crèdit. S'ha notificat a <strong> %{distributor} </strong> d'aquest pagament fallit."
   email_so_failed_payment_details_html: "Aquests són els detalls de l'error proporcionats per la passarel·la de pagament:"
   email_shipping_delivery_details: Detalls de lliurament
   email_shipping_delivery_time: "Lliurament a:"
@@ -1534,15 +1538,20 @@ ca:
   shop_changeable_orders_alert_html:
     one: El vostre ordre amb <a href='%{path}' target='_blank'> %{shop} / %{order} </ a> està obert per a la seva revisió. Podeu fer canvis fins %{oc_close}.
     other: Tens <a href='%{path}' target='_blank'> %{count} comandes amb %{shop} </a> actualment obertes per a la seva revisió. Pots fer canvis fins %{oc_close}.
-  orders_changeable_orders_alert_html: S'ha confirmat aquesta comanda però pots fer-hi canvis fins a <strong> %{oc_close} </ strong>.
+  orders_changeable_orders_alert_html: S'ha confirmat aquesta comanda però pots fer-hi canvis fins a <strong> %{oc_close} </strong>.
   products_clear: Netejar
   products_showing: "S'està mostrant:"
+  products_results_for: "Resultats"
   products_or: "o"
   products_and: "i"
+  products_filters_in: "a"
   products_with: amb
+  products_search: "Cerca..."
   products_filter_by: "Filtra per"
   products_filter_selected: "seleccionat"
+  products_filter_heading: "Filtres"
   products_filter_clear: "Netejar"
+  products_filter_done: "Fet"
   products_loading: "S'estan carregant els productes..."
   products_updating_cart: "Actualitzant la cistella..."
   products_cart_empty: "Cistella buida"
@@ -1553,6 +1562,8 @@ ca:
   products_update_error_msg: "S'ha produït un error en desar."
   products_update_error_data: "S'ha produït un error en desar a causa de dades no vàlides:"
   products_changes_saved: "S'han desat els canvis."
+  products_no_results_html: "Ho sentim, no s'ha trobat cap resultat per a %{query}"
+  products_clear_search: "Esborra la cerca"
   search_no_results_html: "Ho sentim, no s'ha trobat cap resultat per %{query}. Intentar una altra cerca?"
   components_profiles_popover: "Els perfils no tenen una botiga a l'OFN però poden tenir la seva pròpia botiga física o en línia en altres llocs"
   components_profiles_show: "Mostra els perfils"
@@ -1658,7 +1669,7 @@ ca:
   orders_form_total: Total
   orders_oc_expired_headline: S'han tancat les comandes per a aquest cicle de comanda
   orders_oc_expired_text: "Ho sentim, les comandes d'aquest cicle de comanda es van tancar fa %{time} ! Posa't en contacte amb el teu grup directament per veure si poden acceptar comandes fora de temps."
-  orders_oc_expired_text_others_html: "Ho sentim, les comandes d'aquest cicle de comanda es van tancar fa %{time} ! Posa't en contacte amb el teu grup directament per veure si poden acceptar comandes fora de temps<strong> %{link} </ strong>."
+  orders_oc_expired_text_others_html: "Ho sentim, les comandes d'aquest cicle de comanda es van tancar fa %{time} ! Posa't en contacte amb el teu grup directament per veure si poden acceptar comandes fora de temps<strong> %{link} </strong>."
   orders_oc_expired_text_link: "o consulta els altres cicles de comanda disponibles en aquest grup"
   orders_oc_expired_email: "Correu electrònic:"
   orders_oc_expired_phone: "Telèfon:"
@@ -1754,7 +1765,7 @@ ca:
         registration_promo_image: "Imatge promocional per al vostre perfil"
         registration_about_us: "Text \"Sobre nosaltres\""
         registration_outcome_headline: "Què aconsegueixo?"
-        registration_outcome1_html: "El vostre perfil ajuda els usuaris <strong> a trobar </ strong> i <strong> contactar </ strong> a l'Open Food Network."
+        registration_outcome1_html: "El vostre perfil ajuda els usuaris <strong> a trobar </strong> i <strong> contactar </strong> a l'Open Food Network."
         registration_outcome2: "Utilitzeu aquest espai per explicar la història de la vostra organització, per ajudar a connectar amb la vostra presència social i en línia."
         registration_outcome3: "També és el primer pas cap al comenrç a través d'Open Food Network o per obrir una botiga en línia."
         registration_action: "Comencem!"
@@ -2314,6 +2325,10 @@ ca:
     resolve_errors: Si us plau, resol els errors següents
     more_items: "+ %{count} Més"
     default_card_updated: Targeta predeterminada actualitzada
+    cart:
+      add_to_cart_failed: >
+          S'ha produït un problema en afegir aquest producte a la cistella. Potser
+          ha deixat d'estar disponible o la botiga a tancat.
     admin:
       enterprise_limit_reached: "Has assolit el límit estàndard d'organitzacions per compte. Escriu a %{contact_email} si necessites augmentar-lo."
       modals:
@@ -3056,9 +3071,6 @@ ca:
           zone: "Zona"
           calculator: "Calculadora"
           display: "Mostra"
-          both: "Ambdós"
-          front_end: "Front End"
-          back_end: "Back End"
           no_shipping_methods_found: "No s’han trobat mètodes d’enviament"
         new:
           new_shipping_method: "Nou mètode d'enviament"
@@ -3070,9 +3082,7 @@ ca:
         form:
           categories: "Categories"
           zones: "Zones"
-          both: "Ambdós"
-          front_end: "Front End"
-          back_end: "Back End"
+          both: "Comandes com administració"
       payment_methods:
         new:
           new_payment_method: "Nou mètode de pagament"
@@ -3192,12 +3202,21 @@ ca:
           price: "Preu"
           display_as: "Mostra com"
           display_name: "Nom de visualització"
+          display_as_placeholder: 'per exemple. 2 kg'
+          display_name_placeholder: 'per exemple. Tomàquets'
         autocomplete:
           producer_name: "Productor"
           unit: "Unitat"
       shared:
         sortable_header:
           name: "Nom"
+          number: "Número"
+          state: "Estat"
+          payment_state: "Estat del pagament"
+          shipment_state: "Estat de la Tramesa"
+          email: "Correu electrònic"
+          total: "Total"
+      general_settings:
         edit:
           legal_settings: "Paràmetres legals"
           cookies_consent_banner_toggle: "Mostra banner de consentiment de cookies"
@@ -3223,7 +3242,6 @@ ca:
       format: '%d-% m-% Y'
       js_format: 'dd-mm-yy'
     orders:
-      error_flash_for_unavailable_items: "Un article de la teva cistella ha deixat d'estar disponible."
       edit:
         login_to_view_order: "Si us plau inicia sessió per veure la teva comanda."
       bought:

config/locales/de_DE.yml

@@ -685,12 +685,11 @@ de_DE:
           ofn_uid: OFN UID
           ofn_uid_tip: Die eindeutige ID, mit der das Unternehmen in Open Food Network identifiziert wird.
         shipping_methods:
-          name: Name
-          applies: Gilt?
-          manage: Lieferarten verwalten
-          create_button: Neue Lieferart erstellen
-          create_one_button: Erstelle jetzt eine
-          no_method_yet: Sie haben noch keine Lieferarten.
+          name: "Name"
+          manage: "Lieferarten verwalten"
+          create_button: "Neue Lieferart erstellen"
+          create_one_button: "Erstelle jetzt eine"
+          no_method_yet: "Sie haben noch keine Lieferarten."
         shop_preferences:
           shopfront_requires_login: "Öffentlich sichtbarer Laden?"
           shopfront_requires_login_tip: "Wählen Sie aus, ob sich Kunden anmelden müssen, um den Laden zu sehen oder ob sie für alle sichtbar sind."
@@ -3046,9 +3045,6 @@ de_DE:
           zone: "Zone"
           calculator: "Rechner"
           display: "Anzeige"
-          both: "Beide"
-          front_end: "Vorderes Ende"
-          back_end: "Back End"
           no_shipping_methods_found: "Keine Versandmethoden gefunden"
         new:
           new_shipping_method: "Neue Versandart"
@@ -3060,9 +3056,6 @@ de_DE:
         form:
           categories: "Kategorien"
           zones: "Zonen"
-          both: "Beide"
-          front_end: "Vorderes Ende"
-          back_end: "Back End"
       payment_methods:
         new:
           new_payment_method: "Neue Zahlungsart"
@@ -3188,6 +3181,13 @@ de_DE:
       shared:
         sortable_header:
           name: "Name"
+          number: "Nummer"
+          state: "Status"
+          payment_state: "Zahlungsstatus"
+          shipment_state: "Lieferstatus"
+          email: "E-Mail"
+          total: "Gesamt"
+      general_settings:
         edit:
           enterprises_require_tos: "Unternehmen müssen die AGB akzeptieren"
           footer_tos_url: "AGB URL"
@@ -3209,7 +3209,6 @@ de_DE:
       format: '% Y-% m-%d'
       js_format: 'JJ-MM-TT'
     orders:
-      error_flash_for_unavailable_items: "Ein Artikel in Ihrem Warenkorb ist nicht mehr verfügbar."
       edit:
         login_to_view_order: "Bitte loggen Sie sich ein, um Ihre Bestellung anzuzeigen."
       bought:

config/locales/en_AU.yml

@@ -676,12 +676,11 @@ en_AU:
           ofn_uid: OFN UID
           ofn_uid_tip: The unique id used to identify the enterprise on Open Food Network.
         shipping_methods:
-          name: Name
-          applies: Applies?
-          manage: Manage Shipping Methods
-          create_button: Create New Shipping Method
-          create_one_button: Create One Now
-          no_method_yet: You don't have any shipping methods yet.
+          name: "Name"
+          manage: "Manage Shipping Methods"
+          create_button: "Create New Shipping Method"
+          create_one_button: "Create One Now"
+          no_method_yet: "You don't have any shipping methods yet."
         shop_preferences:
           shopfront_requires_login: "Publicly visible shopfront?"
           shopfront_requires_login_tip: "Choose whether customers must login to view the shopfront or if it's visible to everybody."
@@ -2959,9 +2958,6 @@ en_AU:
           zone: "Zone"
           calculator: "Calculator"
           display: "Display"
-          both: "Both"
-          front_end: "Front End"
-          back_end: "Back End"
           no_shipping_methods_found: "No shipping methods found"
         new:
           new_shipping_method: "New Shipping Method"
@@ -2973,9 +2969,6 @@ en_AU:
         form:
           categories: "Categories"
           zones: "Zones"
-          both: "Both"
-          front_end: "Front End"
-          back_end: "Back End"
       payment_methods:
         new:
           new_payment_method: "New Payment Method"
@@ -3101,6 +3094,13 @@ en_AU:
       shared:
         sortable_header:
           name: "Name"
+          number: "Number"
+          state: "State"
+          payment_state: "Payment State"
+          shipment_state: "Shipment State"
+          email: "Email"
+          total: "Total"
+      general_settings:
         edit:
           legal_settings: "Legal Settings"
           cookies_consent_banner_toggle: "Display cookies consent banner"
@@ -3126,7 +3126,6 @@ en_AU:
       format: '%Y-%m-%d'
       js_format: 'yy-mm-dd'
     orders:
-      error_flash_for_unavailable_items: "An item in your cart has become unavailable."
       edit:
         login_to_view_order: "Please log in to view your order."
       bought:

config/locales/en_BE.yml

@@ -665,12 +665,11 @@ en_BE:
           ofn_uid: OFN UID
           ofn_uid_tip: The unique id used to identify the enterprise on Open Food Network.
         shipping_methods:
-          name: Name
-          applies: Applies?
-          manage: Manage Shipping Methods
-          create_button: Create New Shipping Method
-          create_one_button: Create One Now
-          no_method_yet: You don't have any shipping methods yet.
+          name: "Name"
+          manage: "Manage Shipping Methods"
+          create_button: "Create New Shipping Method"
+          create_one_button: "Create One Now"
+          no_method_yet: "You don't have any shipping methods yet."
         shop_preferences:
           shopfront_requires_login: "Publicly visible shopfront?"
           shopfront_requires_login_tip: "Choose whether customers must login to view the shopfront or if it's visible to everybody."
@@ -2877,9 +2876,6 @@ en_BE:
           zone: "Zone"
           calculator: "Calculator"
           display: "Display"
-          both: "Both"
-          front_end: "Front End"
-          back_end: "Back End"
           no_shipping_methods_found: "No shipping methods found"
         new:
           new_shipping_method: "New Shipping Method"
@@ -2891,9 +2887,6 @@ en_BE:
         form:
           categories: "Categories"
           zones: "Zones"
-          both: "Both"
-          front_end: "Front End"
-          back_end: "Back End"
       payment_methods:
         new:
           new_payment_method: "New Payment Method"
@@ -3008,6 +3001,13 @@ en_BE:
       shared:
         sortable_header:
           name: "Name"
+          number: "Number"
+          state: "State"
+          payment_state: "Payment State"
+          shipment_state: "Shipment State"
+          email: "Email"
+          total: "Total"
+      general_settings:
         edit:
           legal_settings: "Legal Settings"
           cookies_consent_banner_toggle: "Display cookies consent banner"
@@ -3033,7 +3033,6 @@ en_BE:
       format: '%Y-%m-%d'
       js_format: 'yy-mm-dd'
     orders:
-      error_flash_for_unavailable_items: "An item in your cart has become unavailable."
       edit:
         login_to_view_order: "Please log in to view your order."
       bought:

config/locales/en_CA.yml

@@ -680,12 +680,11 @@ en_CA:
           ofn_uid: OFN UID
           ofn_uid_tip: The unique id used to identify the enterprise on Open Food Network
         shipping_methods:
-          name: Name
-          applies: Applies?
-          manage: Manage Shipping/Pick-Up Methods
-          create_button: Create New Shipping Method
-          create_one_button: Create One Now
-          no_method_yet: You don't have any shipping/pick-up methods yet.
+          name: "Name"
+          manage: "Manage Shipping/Pick-Up Methods"
+          create_button: "Create New Shipping Method"
+          create_one_button: "Create One Now"
+          no_method_yet: "You don't have any shipping/pick-up methods yet."
         shop_preferences:
           shopfront_requires_login: "Publicly visible shopfront?"
           shopfront_requires_login_tip: "Choose whether customers must login to view the shopfront or if it's visible to everybody."
@@ -3042,9 +3041,6 @@ en_CA:
           zone: "Zone"
           calculator: "Calculator"
           display: "Display"
-          both: "Both"
-          front_end: "Front End"
-          back_end: "Back End"
           no_shipping_methods_found: "No shipping methods found"
         new:
           new_shipping_method: "New Shipping Method"
@@ -3056,9 +3052,6 @@ en_CA:
         form:
           categories: "Categories"
           zones: "Zones"
-          both: "Both"
-          front_end: "Front End"
-          back_end: "Back End"
       payment_methods:
         new:
           new_payment_method: "New Payment Method"
@@ -3184,6 +3177,13 @@ en_CA:
       shared:
         sortable_header:
           name: "Name"
+          number: "Number"
+          state: "Province"
+          payment_state: "Payment State"
+          shipment_state: "Shipment State"
+          email: "Email"
+          total: "Total"
+      general_settings:
         edit:
           legal_settings: "Legal Settings"
           cookies_consent_banner_toggle: "Display cookies consent banner"
@@ -3209,7 +3209,6 @@ en_CA:
       format: '%Y-%m-%d'
       js_format: 'yy-mm-dd'
     orders:
-      error_flash_for_unavailable_items: "An item in your cart has become unavailable"
       edit:
         login_to_view_order: "Please log in to view your order."
       bought:

config/locales/en_DE.yml

@@ -673,12 +673,11 @@ en_DE:
           ofn_uid: OFN UID
           ofn_uid_tip: The unique id used to identify the enterprise on Open Food Network.
         shipping_methods:
-          name: Name
-          applies: Applies?
-          manage: Manage Shipping Methods
-          create_button: Create New Shipping Method
-          create_one_button: Create One Now
-          no_method_yet: You don't have any shipping methods yet.
+          name: "Name"
+          manage: "Manage Shipping Methods"
+          create_button: "Create New Shipping Method"
+          create_one_button: "Create One Now"
+          no_method_yet: "You don't have any shipping methods yet."
         shop_preferences:
           shopfront_requires_login: "Publicly visible shopfront?"
           shopfront_requires_login_tip: "Choose whether customers must login to view the shopfront or if it's visible to everybody."
@@ -2893,9 +2892,6 @@ en_DE:
           zone: "Zone"
           calculator: "Calculator"
           display: "Display"
-          both: "Both"
-          front_end: "Front End"
-          back_end: "Back End"
           no_shipping_methods_found: "No shipping methods found"
         new:
           new_shipping_method: "New Shipping Method"
@@ -2907,9 +2903,6 @@ en_DE:
         form:
           categories: "Categories"
           zones: "Zones"
-          both: "Both"
-          front_end: "Front End"
-          back_end: "Back End"
       payment_methods:
         new:
           new_payment_method: "New Payment Method"
@@ -3024,6 +3017,13 @@ en_DE:
       shared:
         sortable_header:
           name: "Name"
+          number: "Number"
+          state: "State"
+          payment_state: "Payment State"
+          shipment_state: "Shipment State"
+          email: "Email"
+          total: "Total"
+      general_settings:
         edit:
           legal_settings: "Legal Settings"
           cookies_consent_banner_toggle: "Display cookies consent banner"
@@ -3049,7 +3049,6 @@ en_DE:
       format: '%Y-%m-%d'
       js_format: 'yy-mm-dd'
     orders:
-      error_flash_for_unavailable_items: "An item in your cart has become unavailable."
       edit:
         login_to_view_order: "Please log in to view your order."
       bought:

config/locales/en_FR.yml

@@ -685,12 +685,11 @@ en_FR:
           ofn_uid: OFN UID
           ofn_uid_tip: The unique id used to identify the enterprise on Open Food Network.
         shipping_methods:
-          name: Name
-          applies: Applies?
-          manage: Manage Shipping Methods
-          create_button: Create New Shipping Method
-          create_one_button: Create One Now
-          no_method_yet: You don't have any shipping methods yet.
+          name: "Name"
+          manage: "Manage Shipping Methods"
+          create_button: "Create New Shipping Method"
+          create_one_button: "Create One Now"
+          no_method_yet: "You don't have any shipping methods yet."
         shop_preferences:
           shopfront_requires_login: "Publicly visible shopfront?"
           shopfront_requires_login_tip: "Choose whether customers must login to view the shopfront or if it's visible to everybody."
@@ -3240,7 +3239,6 @@ en_FR:
       format: '%Y-%m-%d'
       js_format: 'yy-mm-dd'
     orders:
-      error_flash_for_unavailable_items: "An item in your cart has become unavailable."
       edit:
         login_to_view_order: "Please log in to view your order."
       bought:

config/locales/en_GB.yml

@@ -685,12 +685,11 @@ en_GB:
           ofn_uid: OFN UID
           ofn_uid_tip: The unique id used to identify the enterprise on Open Food Network.
         shipping_methods:
-          name: Name
-          applies: Applies?
-          manage: Manage Shipping Methods
-          create_button: Create New Shipping Method
-          create_one_button: Create One Now
-          no_method_yet: You don't have any shipping methods yet.
+          name: "Name"
+          manage: "Manage Shipping Methods"
+          create_button: "Create New Shipping Method"
+          create_one_button: "Create One Now"
+          no_method_yet: "You don't have any shipping methods yet."
         shop_preferences:
           shopfront_requires_login: "Publicly visible shopfront?"
           shopfront_requires_login_tip: "Choose whether customers must login to view the shopfront or if it's visible to everybody."
@@ -3072,9 +3071,6 @@ en_GB:
           zone: "Zone"
           calculator: "Calculator"
           display: "Display"
-          both: "Both"
-          front_end: "Front End"
-          back_end: "Back End"
           no_shipping_methods_found: "No shipping methods found"
         new:
           new_shipping_method: "New Shipping Method"
@@ -3086,9 +3082,6 @@ en_GB:
         form:
           categories: "Categories"
           zones: "Zones"
-          both: "Both"
-          front_end: "Front End"
-          back_end: "Back End"
       payment_methods:
         new:
           new_payment_method: "New Payment Method"
@@ -3216,6 +3209,13 @@ en_GB:
       shared:
         sortable_header:
           name: "Name"
+          number: "Number"
+          state: "State"
+          payment_state: "Payment State"
+          shipment_state: "Shipment State"
+          email: "Email"
+          total: "Total"
+      general_settings:
         edit:
           legal_settings: "Legal Settings"
           cookies_consent_banner_toggle: "Display cookies consent banner"
@@ -3241,7 +3241,6 @@ en_GB:
       format: '%Y-%m-%d'
       js_format: 'yy-mm-dd'
     orders:
-      error_flash_for_unavailable_items: "An item in your cart has become unavailable."
       edit:
         login_to_view_order: "Please log in to view your order."
       bought:

config/locales/en_IE.yml

@@ -685,12 +685,11 @@ en_IE:
           ofn_uid: OFN UID
           ofn_uid_tip: The unique id used to identify the enterprise on Open Food Network.
         shipping_methods:
-          name: Name
-          applies: Applies?
-          manage: Manage Shipping Methods
-          create_button: Create New Shipping Method
-          create_one_button: Create One Now
-          no_method_yet: You don't have any shipping methods yet.
+          name: "Name"
+          manage: "Manage Shipping Methods"
+          create_button: "Create New Shipping Method"
+          create_one_button: "Create One Now"
+          no_method_yet: "You don't have any shipping methods yet."
         shop_preferences:
           shopfront_requires_login: "Publicly visible shopfront?"
           shopfront_requires_login_tip: "Choose whether customers must login to view the shopfront or if it's visible to everybody."
@@ -3072,9 +3071,6 @@ en_IE:
           zone: "Zone"
           calculator: "Calculator"
           display: "Display"
-          both: "Both"
-          front_end: "Front End"
-          back_end: "Back End"
           no_shipping_methods_found: "No shipping methods found"
         new:
           new_shipping_method: "New Shipping Method"
@@ -3086,9 +3082,6 @@ en_IE:
         form:
           categories: "Categories"
           zones: "Zones"
-          both: "Both"
-          front_end: "Front End"
-          back_end: "Back End"
       payment_methods:
         new:
           new_payment_method: "New Payment Method"
@@ -3216,6 +3209,13 @@ en_IE:
       shared:
         sortable_header:
           name: "Name"
+          number: "Number"
+          state: "County"
+          payment_state: "Payment County"
+          shipment_state: "Shipment County"
+          email: "Email"
+          total: "Total"
+      general_settings:
         edit:
           legal_settings: "Legal Settings"
           cookies_consent_banner_toggle: "Display cookies consent banner"
@@ -3241,7 +3241,6 @@ en_IE:
       format: '%Y-%m-%d'
       js_format: 'yy-mm-dd'
     orders:
-      error_flash_for_unavailable_items: "An item in your cart has become unavailable."
       edit:
         login_to_view_order: "Please log in to view your order."
       bought:

config/locales/en_NZ.yml

@@ -685,12 +685,11 @@ en_NZ:
           ofn_uid: OFN UID
           ofn_uid_tip: The unique id used to identify the enterprise on Open Food Network.
         shipping_methods:
-          name: Name
-          applies: Applies?
-          manage: Manage Shipping Methods
-          create_button: Create New Shipping Method
-          create_one_button: Create One Now
-          no_method_yet: You don't have any shipping methods yet.
+          name: "Name"
+          manage: "Manage Shipping Methods"
+          create_button: "Create New Shipping Method"
+          create_one_button: "Create One Now"
+          no_method_yet: "You don't have any shipping methods yet."
         shop_preferences:
           shopfront_requires_login: "Publicly visible shopfront?"
           shopfront_requires_login_tip: "Choose whether customers must login to view the shopfront or if it's visible to everybody."
@@ -3240,7 +3239,6 @@ en_NZ:
       format: '%Y-%m-%d'
       js_format: 'yy-mm-dd'
     orders:
-      error_flash_for_unavailable_items: "An item in your cart has become unavailable."
       edit:
         login_to_view_order: "Please log in to view your order."
       bought:

config/locales/en_PH.yml

@@ -684,12 +684,11 @@ en_PH:
           ofn_uid: OFN UID
           ofn_uid_tip: The unique id used to identify the enterprise on Open Food Network.
         shipping_methods:
-          name: Name
-          applies: Applies?
-          manage: Manage Shipping Methods
-          create_button: Create New Shipping Method
-          create_one_button: Create One Now
-          no_method_yet: You don't have any shipping methods yet.
+          name: "Name"
+          manage: "Manage Shipping Methods"
+          create_button: "Create New Shipping Method"
+          create_one_button: "Create One Now"
+          no_method_yet: "You don't have any shipping methods yet."
         shop_preferences:
           shopfront_requires_login: "Publicly visible shopfront?"
           shopfront_requires_login_tip: "Choose whether customers must login to view the shopfront or if it's visible to everybody."
@@ -3048,9 +3047,6 @@ en_PH:
           zone: "Zone"
           calculator: "Calculator"
           display: "Display"
-          both: "Both"
-          front_end: "Front End"
-          back_end: "Back End"
           no_shipping_methods_found: "No shipping methods found"
         new:
           new_shipping_method: "New Shipping Method"
@@ -3062,9 +3058,6 @@ en_PH:
         form:
           categories: "Categories"
           zones: "Zones"
-          both: "Both"
-          front_end: "Front End"
-          back_end: "Back End"
       payment_methods:
         new:
           new_payment_method: "New Payment Method"
@@ -3190,6 +3183,13 @@ en_PH:
       shared:
         sortable_header:
           name: "Name"
+          number: "Number"
+          state: "Province"
+          payment_state: "Payment State"
+          shipment_state: "Shipment State"
+          email: "Email"
+          total: "Total"
+      general_settings:
         edit:
           legal_settings: "Legal Settings"
           cookies_consent_banner_toggle: "Display cookies consent banner"
@@ -3215,7 +3215,6 @@ en_PH:
       format: '%Y-%m-%d'
       js_format: 'yy-mm-dd'
     orders:
-      error_flash_for_unavailable_items: "An item in your cart has become unavailable."
       edit:
         login_to_view_order: "Please log in to view your order."
       bought:

config/locales/en_US.yml

@@ -680,12 +680,11 @@ en_US:
           ofn_uid: OFN UID
           ofn_uid_tip: The unique id used to identify the enterprise on Open Food Network.
         shipping_methods:
-          name: Name
-          applies: Applies?
-          manage: Manage Shipping Methods
-          create_button: Create New Shipping Method
-          create_one_button: Create One Now
-          no_method_yet: You don't have any shipping methods yet.
+          name: "Name"
+          manage: "Manage Shipping Methods"
+          create_button: "Create New Shipping Method"
+          create_one_button: "Create One Now"
+          no_method_yet: "You don't have any shipping methods yet."
         shop_preferences:
           shopfront_requires_login: "Publicly visible shopfront?"
           shopfront_requires_login_tip: "Choose whether customers must login to view the shopfront or if it's visible to everybody."
@@ -3041,9 +3040,6 @@ en_US:
           zone: "Zone"
           calculator: "Calculator"
           display: "Display"
-          both: "Both"
-          front_end: "Front End"
-          back_end: "Back End"
           no_shipping_methods_found: "No shipping methods found"
         new:
           new_shipping_method: "New Shipping Method"
@@ -3055,9 +3051,6 @@ en_US:
         form:
           categories: "Categories"
           zones: "Zones"
-          both: "Both"
-          front_end: "Front End"
-          back_end: "Back End"
       payment_methods:
         new:
           new_payment_method: "New Payment Method"
@@ -3182,6 +3175,13 @@ en_US:
       shared:
         sortable_header:
           name: "Name"
+          number: "Number"
+          state: "State"
+          payment_state: "Payment State"
+          shipment_state: "Shipment State"
+          email: "Email"
+          total: "Total"
+      general_settings:
         edit:
           legal_settings: "Legal Settings"
           cookies_consent_banner_toggle: "Display cookies consent banner"
@@ -3207,7 +3207,6 @@ en_US:
       format: '%Y-%m-%d'
       js_format: 'yy-mm-dd'
     orders:
-      error_flash_for_unavailable_items: "An item in your cart has become unavailable."
       edit:
         login_to_view_order: "Please log in to view your order."
       bought:

config/locales/en_ZA.yml

@@ -31,6 +31,10 @@ en_ZA:
               taken: "There's already an account for this email. Please login or reset your password."
         spree/order:
           no_card: There are no authorised credit cards available to charge
+        spree/credit_card:
+          attributes:
+            base:
+              card_expired: "has expired"
         order_cycle:
           attributes:
             orders_close_at:
@@ -52,6 +56,8 @@ en_ZA:
         shipping_method_ids: "Shipping Methods"
         payment_method_ids: "Payment Methods"
     errors:
+      messages:
+        inclusion: "is not included in the list"
       models:
         order_management/subscriptions/validator:
           attributes:
@@ -118,7 +124,9 @@ en_ZA:
       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:
@@ -244,6 +252,8 @@ en_ZA:
   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
@@ -255,6 +265,7 @@ en_ZA:
   expired: has expired, please request a new one
   back_to_payments_list: "Back to Payments List"
   maestro_or_solo_cards: "Maestro/Solo cards"
+  backordered: "Backordered"
   on hand: "In Stock"
   ship: "Ship"
   actions:
@@ -312,6 +323,7 @@ en_ZA:
     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}"
@@ -435,9 +447,12 @@ en_ZA:
         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
@@ -540,6 +555,7 @@ en_ZA:
         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
@@ -669,12 +685,11 @@ en_ZA:
           ofn_uid: OFN UID
           ofn_uid_tip: The unique id used to identify the enterprise on Open Food Network.
         shipping_methods:
-          name: Name
-          applies: Applies?
-          manage: Manage Shipping Methods
-          create_button: Create New Shipping Method
-          create_one_button: Create One Now
-          no_method_yet: You don't have any shipping methods yet.
+          name: "Name"
+          manage: "Manage Shipping Methods"
+          create_button: "Create New Shipping Method"
+          create_one_button: "Create One Now"
+          no_method_yet: "You don't have any shipping methods yet."
         shop_preferences:
           shopfront_requires_login: "Publicly visible shopfront?"
           shopfront_requires_login_tip: "Choose whether customers must login to view the shopfront or if it's visible to everybody."
@@ -694,6 +709,10 @@ en_ZA:
           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. Any text entered here will be displayed 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"
@@ -831,29 +850,43 @@ en_ZA:
       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:
         incoming: "Incoming"
         supplier: "Supplier"
         products: "Products"
+        receival_details: "Receival Details"
         fees: "Fees"
         save: "Save"
+        save_and_next: "Save and Next"
         next: "Next"
         cancel: "Cancel"
+        back_to_list: "Back To List"
       outgoing:
         outgoing: "Outgoing"
         distributor: "Distributor"
         products: "Products"
         tags: "Tags"
+        delivery_details: "Delivery Details"
         fees: "Fees"
         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"
@@ -1091,10 +1124,13 @@ en_ZA:
       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"
@@ -1138,7 +1174,11 @@ en_ZA:
         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}"
@@ -1265,6 +1305,7 @@ en_ZA:
   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
@@ -1460,6 +1501,7 @@ en_ZA:
   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"
@@ -1496,11 +1538,17 @@ en_ZA:
   orders_changeable_orders_alert_html: This order has been confirmed, but you can make changes until <strong>%{oc_close}</strong>.
   products_clear: Clear
   products_showing: "Showing:"
+  products_results_for: "Results for"
   products_or: "or"
+  products_and: "and"
+  products_filters_in: "in"
   products_with: with
+  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"
@@ -1511,6 +1559,8 @@ en_ZA:
   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"
@@ -1819,6 +1869,7 @@ en_ZA:
         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"
@@ -1865,6 +1916,7 @@ en_ZA:
   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"
@@ -1904,6 +1956,7 @@ en_ZA:
   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)"
@@ -2234,6 +2287,7 @@ en_ZA:
   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.'
@@ -2268,6 +2322,10 @@ en_ZA:
     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:
@@ -2392,6 +2450,8 @@ en_ZA:
           severity: Severity
           description: Description
           resolve: Resolve
+        exchange_products:
+          load_more_variants: "Load More Variants"
       tag_rules:
         shipping_method_tagged_top: "Shipping methods tagged"
         shipping_method_tagged_bottom: "are:"
@@ -2891,9 +2951,6 @@ en_ZA:
           zone: "Zone"
           calculator: "Calculator"
           display: "Display"
-          both: "Both"
-          front_end: "Front End"
-          back_end: "Back End"
           no_shipping_methods_found: "No shipping methods found"
         new:
           new_shipping_method: "New Shipping Method"
@@ -2905,9 +2962,6 @@ en_ZA:
         form:
           categories: "Categories"
           zones: "Zones"
-          both: "Both"
-          front_end: "Front End"
-          back_end: "Back End"
       payment_methods:
         new:
           new_payment_method: "New Payment Method"
@@ -3012,6 +3066,7 @@ en_ZA:
           price: "Price"
           no_results: "No results"
           option_types: "Option Types"
+          and: "and"
         form:
           sku: "SKU"
           price: "Price"
@@ -3022,6 +3077,13 @@ en_ZA:
       shared:
         sortable_header:
           name: "Name"
+          number: "Number"
+          state: "Province"
+          payment_state: "Payment State"
+          shipment_state: "Shipment State"
+          email: "Email"
+          total: "Total"
+      general_settings:
         edit:
           legal_settings: "Legal Settings"
           cookies_consent_banner_toggle: "Display cookies consent banner"
@@ -3047,7 +3109,6 @@ en_ZA:
       format: '%Y-%m-%d'
       js_format: 'yy-mm-dd'
     orders:
-      error_flash_for_unavailable_items: "An item in your cart has become unavailable."
       edit:
         login_to_view_order: "Please log in to view your order."
       bought:
@@ -3162,3 +3223,6 @@ en_ZA:
         allow_charges?: "Allow Charges?"
     localized_number:
       invalid_format: has an invalid format. Please enter a number.
+    api:
+      key_generated: "Key generated"
+      key_cleared: "Key cleared"

config/locales/es.yml

@@ -685,12 +685,11 @@ es:
           ofn_uid: UID de OFN
           ofn_uid_tip: La identificación única utilizada para identificar la organización en Open Food Network.
         shipping_methods:
-          name: Nombre
-          applies: ¿Aplicar?
-          manage: Gestionar métodos de envío
-          create_button: Crear nuevo método de envío
-          create_one_button: Crear una ahora
-          no_method_yet: Todavía no tienes ningún método de envío.
+          name: "Nombre"
+          manage: "Gestionar métodos de envío"
+          create_button: "Crear nuevo método de envío"
+          create_one_button: "Crear una ahora"
+          no_method_yet: "Todavía no tienes ningún método de envío."
         shop_preferences:
           shopfront_requires_login: "¿Quieres que la tienda sea visible y pública?"
           shopfront_requires_login_tip: "Elije si los clientes deben iniciar sesión para ver la tienda o si es visible para todos."
@@ -3054,9 +3053,6 @@ es:
           zone: "Zona"
           calculator: "Calculadora"
           display: "Mostrar"
-          both: "Ambos"
-          front_end: "Front End"
-          back_end: "Back End"
           no_shipping_methods_found: "No se encontraron métodos de envío"
         new:
           new_shipping_method: "Nuevo método de envío"
@@ -3068,9 +3064,6 @@ es:
         form:
           categories: "Categorías"
           zones: "Zonas"
-          both: "Ambos"
-          front_end: "Front End"
-          back_end: "Back End"
       payment_methods:
         new:
           new_payment_method: "Nuevo método de pago"
@@ -3196,6 +3189,13 @@ es:
       shared:
         sortable_header:
           name: "Nombre"
+          number: "Número"
+          state: "Provincia"
+          payment_state: "Estado del pago"
+          shipment_state: "Estado del envío"
+          email: "Email"
+          total: "Total"
+      general_settings:
         edit:
           legal_settings: "Configuraciones legales"
           cookies_consent_banner_toggle: "Mostrar el banner de consentimiento de cookies"
@@ -3221,7 +3221,6 @@ es:
       format: '%Y-%m-%d'
       js_format: 'yy-mm-dd'
     orders:
-      error_flash_for_unavailable_items: "Un artículo de su carrito ya no está disponible."
       edit:
         login_to_view_order: "Por favor inicie sesión para ver su pedido."
       bought:

config/locales/es_CR.yml

@@ -686,12 +686,11 @@ es_CR:
           ofn_uid: UID de OFN
           ofn_uid_tip: La identificación única utilizada para identificar la organización en Open Food Network.
         shipping_methods:
-          name: Nombre
-          applies: ¿Aplicar?
-          manage: Gestionar métodos de envío
-          create_button: Crear nuevo método de envío
-          create_one_button: Crear una ahora
-          no_method_yet: Todavía no tienes ningún método de envío.
+          name: "Nombre"
+          manage: "Gestionar métodos de envío"
+          create_button: "Crear nuevo método de envío"
+          create_one_button: "Crear una ahora"
+          no_method_yet: "Todavía no tienes ningún método de envío."
         shop_preferences:
           shopfront_requires_login: "¿Quieres que la tienda sea visible y pública?"
           shopfront_requires_login_tip: "Elije si los clientes deben iniciar sesión para ver la tienda o si es visible para todos."
@@ -3056,9 +3055,6 @@ es_CR:
           zone: "Zona"
           calculator: "Calculadora"
           display: "Mostrar"
-          both: "Ambos"
-          front_end: "Front End"
-          back_end: "Back End"
           no_shipping_methods_found: "No se encontraron métodos de envío"
         new:
           new_shipping_method: "Nuevo método de envío"
@@ -3070,9 +3066,6 @@ es_CR:
         form:
           categories: "Categorías"
           zones: "Zonas"
-          both: "Ambos"
-          front_end: "Front End"
-          back_end: "Back End"
       payment_methods:
         new:
           new_payment_method: "Nuevo método de pago"
@@ -3198,6 +3191,13 @@ es_CR:
       shared:
         sortable_header:
           name: "Nombre"
+          number: "Número"
+          state: "Provincia"
+          payment_state: "Estado del pago"
+          shipment_state: "Estado del envío"
+          email: "Correo electrónico"
+          total: "Total"
+      general_settings:
         edit:
           legal_settings: "Configuraciones legales"
           cookies_consent_banner_toggle: "Mostrar el banner de consentimiento de cookies"
@@ -3223,7 +3223,6 @@ es_CR:
       format: '%Y-%m-%d'
       js_format: 'yy-mm-dd'
     orders:
-      error_flash_for_unavailable_items: "Un artículo de su carrito ya no está disponible."
       edit:
         login_to_view_order: "Por favor inicie sesión para ver su pedido."
       bought:

config/locales/fil_PH.yml

@@ -686,12 +686,11 @@ fil_PH:
           ofn_uid: UID sa OFN
           ofn_uid_tip: ang natatanging id na ito ay ginagamit para matukoy ang enterprise sa Open Food Network.
         shipping_methods:
-          name: pangalan
-          applies: naaangkop?
-          manage: pamahalaan ang mga paraan ng pagpapadala
-          create_button: lumikha ng bagong paraan ng pagpapadala
-          create_one_button: lumikha ng isa ngayon
-          no_method_yet: wala ka pang inilagay na paraan ng pagpapadala.
+          name: "pangalan"
+          manage: "pamahalaan ang mga paraan ng pagpapadala"
+          create_button: "lumikha ng bagong paraan ng pagpapadala"
+          create_one_button: "lumikha ng isa ngayon"
+          no_method_yet: "wala ka pang inilagay na paraan ng pagpapadala."
         shop_preferences:
           shopfront_requires_login: "nakikita sa publiko ang shopfront?"
           shopfront_requires_login_tip: "pumili kung nais na maglog-in muna ang customer bago makita ang shopfront o nakikita ito ng lahat."
@@ -1738,13 +1737,13 @@ fil_PH:
   action_signup: "magsign-up ngayon"
   forgot_password: "nakalimutan ang password?"
   password_reset_sent: "ang email na may panuto kung paano papalitan ang inyong password ay napadala na!"
-  reset_password: "palitan ang password"
+  reset_password: "i-reset ang password"
   update_and_recalculate_fees: "i-update at kuwentahin muli ang fees"
   registration:
     steps:
       introduction:
         registration_greeting: "Kumusta?"
-        registration_intro: "maaari ka ng gumawa ng profile para sa inyong Producer o Hub"
+        registration_intro: "maaari ka ng lumikha ng profile para sa inyong Producer o Hub"
         registration_checklist: "ano ang kailangan ko gawin?"
         registration_time: "5-10 minuto"
         registration_enterprise_address: "Address ng enterprise"
@@ -1754,24 +1753,24 @@ fil_PH:
         registration_about_us: "'Tungkol sa Amin' na teksto"
         registration_outcome_headline: "ano ang makukuha ko?"
         registration_outcome1_html: "ang iyong profile ang makakatulong sa mga tao<strong>na hanapin</strong>at<strong>kontakin</strong> ka sa Open Food Network."
-        registration_outcome2: "gamitin ang espasyo na ito upang ipakilala ang iyong enterprise, para na rin sa pagpapalawig ng iyong koneksyon sa internet."
-        registration_outcome3: "ito rin ay unang hakbang para makipagkalakalan sa Open Food Network, o pagbubukas ng sariling tindahan sa internet."
+        registration_outcome2: "gamitin ang espasyo na ito upang ipakilala ang inyong enterprise at upang palawigin na rin ang iyong koneksyon sa internet."
+        registration_outcome3: "ito rin ay unang hakbang para makipagkalakalan sa Open Food Network o pagbubukas ng sariling online store"
         registration_action: "Magsimula na tayo!"
       details:
-        title: "detalye"
+        title: "mga detalye"
         headline: "magsimula na tayo"
-        enterprise: "una sa lahat ay kailangan naming mas makilala ang iyong enterprise:"
-        producer: "una sa lahat ay kailangan naming mas makilala  ang iyong bukid:"
+        enterprise: "una ay kailangan naming makilala ang inyong enterprise:"
+        producer: "una ay kailangan naming makilala  ang inyong bukid:"
         enterprise_name_field: "pangalan ng enterprise:"
         producer_name_field: "pangalan ng bukid:"
-        producer_name_field_placeholder: "hal. Charlie's Awesome Farm"
+        producer_name_field_placeholder: "hal. Jose's Awesome Farm"
         producer_name_field_error: "pumili ng natatanging pangalan para sa inyong enterprise"
         address1_field: "linya ng address 1 :"
-        address1_field_placeholder: "hal. 123 Cranberry Drive"
+        address1_field_placeholder: "hal. 123 Kapayapaan St."
         address1_field_error: "isulat ang address"
         address2_field: "linya ng address 2 :"
         suburb_field: "lungsod:"
-        suburb_field_placeholder: "hal. Northcote"
+        suburb_field_placeholder: "hal. Mandaluyong"
         suburb_field_error: "isulat ang lungsod"
         postcode_field: "Postcode:"
         postcode_field_placeholder: "hal. 3070"
@@ -1790,14 +1789,14 @@ fil_PH:
         phone_field_placeholder: "hal. (03) 1234 5678"
       type:
         title: "uri"
-        headline: "huling hakbang para maidagdag ang%{enterprise}!"
+        headline: "huling hakbang upang maidagdag ang%{enterprise}!"
         question: "isa ka bang producer?"
         yes_producer: "oo, ako ay isang producer"
         no_producer: "hindi ako producer"
         producer_field_error: "pumili ng isa. ikaw ba ay isang producer?"
-        yes_producer_help: "Ang mga producer ay gumagawa ng masasarap na bagay na maaaring makain o mainom. Ikaw ay isang producer kung itinatanim mo ito, pinapalaki, binuburo, niluluto, hinuhurno, ginagatasan o hinuhulma."
-        no_producer_help: "kung hindi ka isang producer, malamang ikaw ay nagbebenta at namamahagi ng mga pagkain. maaaring ikaw ay isang Hub, coop, grupo ng mamimili, nagtitingi, namamakyaw o iba pa."
-        create_profile: "gumawa ng profile"
+        yes_producer_help: "Ang mga producer ay gumagawa ng masasarap na bagay na maaaring makain at/o mainom. Ikaw ay isang producer kung itinatanim mo ito, pinapalaki, binuburo, niluluto, hinuhurno, ginagatasan o hinuhulma."
+        no_producer_help: "kung hindi ka isang producer, malamang ikaw ay nagbebenta at namamahagi ng mga pagkain. maaaring ikaw ay isang Hub, coop, grupo ng mamimili, retailer, wholesaler o iba pa."
+        create_profile: "lumikha ng profile"
       about:
         title: "tungkol sa"
         headline: "binabati kita!"
@@ -3062,9 +3061,6 @@ fil_PH:
           zone: "sona"
           calculator: "calculator"
           display: "Ipakita"
-          both: "pareho"
-          front_end: "harapan"
-          back_end: "Likuran"
           no_shipping_methods_found: "walang mahanap na mga paraan ng pagpapadala"
         new:
           new_shipping_method: "bagong paraan ng pagpapadala"
@@ -3076,9 +3072,6 @@ fil_PH:
         form:
           categories: "mga kategorya"
           zones: "mga sona"
-          both: "pareho"
-          front_end: "harapan"
-          back_end: "Likuran"
       payment_methods:
         new:
           new_payment_method: "Bagong Paraan ng pagbabayad"
@@ -3204,6 +3197,13 @@ fil_PH:
       shared:
         sortable_header:
           name: "Pangalan"
+          number: "Bilang"
+          state: "province"
+          payment_state: "status ng pagbabayad"
+          shipment_state: "status ng kargamento"
+          email: "Email"
+          total: "kabuuan"
+      general_settings:
         edit:
           legal_settings: "Legal Settings"
           cookies_consent_banner_toggle: "ipakita ang banner ng pagpayag sa cookies"
@@ -3229,7 +3229,6 @@ fil_PH:
       format: '%Y-%m-%d'
       js_format: 'yy-mm-dd'
     orders:
-      error_flash_for_unavailable_items: "ang isang item sa inyong cart ay hindi na available."
       edit:
         login_to_view_order: "Maglog-in para makita ang inyong order."
       bought:

config/locales/fr.yml

@@ -686,12 +686,11 @@ fr:
           ofn_uid: ID OFN
           ofn_uid_tip: L'identifiant unique pour les comptes entreprises sur Open Food Network.
         shipping_methods:
-          name: Nom
-          applies: Active?
-          manage: Gérer les méthodes de livraison
-          create_button: Créer nouvelle méthode de livraison
-          create_one_button: En créer une maintenant
-          no_method_yet: Vous n'avez pas encore paramétré de méthode de livraison.
+          name: "Nom"
+          manage: "Gérer les méthodes de livraison"
+          create_button: "Créer nouvelle méthode de livraison"
+          create_one_button: "En créer une maintenant"
+          no_method_yet: "Vous n'avez pas encore paramétré de méthode de livraison."
         shop_preferences:
           shopfront_requires_login: "Boutique privée (accès contrôlé) ?"
           shopfront_requires_login_tip: "Choisissez si les acheteurs doivent être connectés pour voir la boutique ou si la boutique est visible par tout le monde."
@@ -3096,7 +3095,7 @@ fr:
           zone: "Zone"
           calculator: "Calculateur"
           display: "Afficher"
-          both: "Vu par l'acheteur sur la boutique"
+          both: "Visible par l'acheteur sur la boutique"
           back_end: "Visible pour l'administration uniquement"
           no_shipping_methods_found: "Aucune méthode de livraison trouvée"
         new:
@@ -3270,7 +3269,6 @@ fr:
       format: '%Y-%m-%d'
       js_format: 'yy-mm-dd'
     orders:
-      error_flash_for_unavailable_items: "Un produit de votre panier n'est plus disponible."
       edit:
         login_to_view_order: "Veuillez vous connecter pour voir votre commande."
       bought:

config/locales/fr_BE.yml

@@ -123,8 +123,8 @@ fr_BE:
       subject: "%{enterprise} est maintenant sur %{sitename}"
       email_welcome: "Bienvenue"
       email_registered: "fait maintenant partie de"
-      email_userguide_html: "Le Guide Utilisateur expliquant comment mettre en place son profil producteur ou son comptoir est accessible ici: %{link}"
-      userguide: "Guide de l'utilisateur Open Food Network"
+      email_userguide_html: "Le Guide d'utilisation expliquant comment mettre en place son profil producteur ou son comptoir est accessible ici: %{link}"
+      userguide: "Guide d'utilisation Open Food Network"
       email_admin_html: "Vous pouvez gérer votre compte en vous connectant ici %{link} ou en cliquant sur la roue en haut à droite de la page d'accueil et en sélectionnant Administration."
       admin_panel: "Panneau de l'administrateur"
       email_community_html: "Nous avons aussi un forum de discussion en ligne (en anglais) pour échanger avec la communauté sur des questions liées au logiciel OFN et aux défis de la gestion d'un food hub.  Nous vous invitons à y participer. Nous sommes en constante évolution et vos contributions à ce forum vont façonner les prochaines étapes. %{link}"
@@ -401,7 +401,7 @@ fr_BE:
         main_links: Liens du menu principal
         footer_and_external_links: Pied de page et Liens Externes
         your_content: Votre contenu
-        user_guide: Guide utilisateur
+        user_guide: Guide d'utilisation
     enterprise_fees:
       index:
         title: "Marges et Commissions"
@@ -685,12 +685,11 @@ fr_BE:
           ofn_uid: OFN UID
           ofn_uid_tip: L'identifiant unique utilisé pour identifier l'entreprise sur Open Food Network.
         shipping_methods:
-          name: Nom
-          applies: Active?
-          manage: Gérer les méthodes de livraison
-          create_button: Créer nouvelle méthode de livraison
-          create_one_button: En créer une maintenant
-          no_method_yet: Vous n'avez pas encore paramétré de méthode de livraison.
+          name: "Nom"
+          manage: "Gérer les méthodes de livraison"
+          create_button: "Créer nouvelle méthode de livraison"
+          create_one_button: "En créer une maintenant"
+          no_method_yet: "Vous n'avez pas encore paramétré de méthode de livraison."
         shop_preferences:
           shopfront_requires_login: "Comptoir visible par tous?"
           shopfront_requires_login_tip: "Choisissez si les acheteurs doivent être connectés pour voir le magasin ou si le comptoir est visible par tout le monde."
@@ -698,7 +697,7 @@ fr_BE:
           shopfront_requires_login_true: "Visible uniquement pour les acheteurs logués"
           recommend_require_login: "Nous recommandons de demander aux utilisateur·trice·s de se connecter si vous souhaitez leur permettre de modifier leur commande."
           allow_guest_orders: "Commandes des invité·e·s"
-          allow_guest_orders_tip: "Autoriser la commande en tant qu'invité-e ou demander que la personne qui achète soit logué."
+          allow_guest_orders_tip: "Autoriser la commande en tant qu'invité·e ou demander que la personne qui achète soit logué."
           allow_guest_orders_false: "Demander que la personne qui achète se logue pour pouvoir commander"
           allow_guest_orders_true: "Autoriser les commandes en mode invité·e"
           allow_order_changes: "Modifier la commande"
@@ -964,7 +963,7 @@ fr_BE:
         could_not_resume_the_order: La commande n'a pas pu être reprise
     shared:
       user_guide_link:
-        user_guide: Guide utilisateur
+        user_guide: Guide d'utilisation
       enterprises_hubs_tabs:
         has_no_payment_methods: "%{enterprise} n'a pas défini de méthode de paiement"
         has_no_shipping_methods: "%{enterprise} n'a pas défini de méthode de livraison"
@@ -1175,7 +1174,11 @@ fr_BE:
         signup: "s'inscrire"
         contact: "contacter"
         require_customer_login: "Seuls les clients approuvés peuvent accéder à ce comptoir."
-        require_customer_html: "Si vous souhaitez commencer à magasiner ici, veuillez %{contact}%{enterprise}demander si vous souhaitez vous inscrire."
+        require_login_html: "Si vous êtes déjà un client approuvé, %{login} ou %{signup} pour continuer."
+        require_login_2_html: "Vous voulez commencer à faire vos achats ici? Veuillez %{contact} %{enterprise} et demandez à vous inscrire."
+        require_customer_html: "Si vous souhaitez commencer à faire vos achats ici, veuillez %{contact}%{enterprise} et demandez pour vous inscrire."
+      select_oc:
+        select_oc_html: "Veuillez <span class='highlighted'>choisir quand vous voulez votre commande</span> , pour voir quels 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}"
@@ -1232,7 +1235,7 @@ fr_BE:
   footer_email: "Email"
   footer_links_md: "Liens"
   footer_about_url: "A propos de l'URL"
-  user_guide_link: "Lien vers le guide utilisateur"
+  user_guide_link: "Lien vers le guide d'utilisation"
   name: Nom
   first_name: Prénom
   last_name: Nom de famille
@@ -1356,7 +1359,7 @@ fr_BE:
   brandstory_part6: "Nous pouvons toutes et tous participer à la construction d’un système alimentaire plus juste, respectueux de l’Homme qui préserve la planète."
   learn_body: "Explorer les modèles, les histoires et les ressources disponibles pour vous aider à développer votre propre initiative de commerce/organisation oeuvrant pour un système alimentaire équitable et juste. Trouver des outils pour vous former, des événements et autres opportunités d'apprendre de vos pairs."
   learn_cta: "Découvrir "
-  connect_body: "Rechercher dans le répertoire des producteurs, des comptoirs et des groupes pour trouver des commerçants éthiques à côté de chez vous. Inscrivez votre commerce ou organisation sur OFFrance pour que les acheteurs puissent vous trouver. Rejoignez la communauté pour recevoir du soutien et résoudre ensemble les problèmes."
+  connect_body: "Rechercher dans le répertoire des producteurs, des comptoirs et des groupes pour trouver des commerçants éthiques à côté de chez vous. Inscrivez votre commerce ou organisation sur la plateforme OFN de votre pays/région pour que les acheteurs puissent vous trouver. Rejoignez la communauté pour recevoir du soutien et résoudre ensemble les problèmes."
   connect_cta: "Explorer"
   system_headline: "Faire mes courses - comment ça marche?"
   system_step1: "1. Recherche"
@@ -1551,6 +1554,7 @@ fr_BE:
   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: "Désolé, aucun résultat trouvé pour %{query}"
   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 Network mais ne vendent pas via la plateforme. Elles ont peut-être une comptoir physique, ou une comptoir en ligne sur une autre plateforme."
   components_profiles_show: "Afficher aussi les profils"
@@ -1628,9 +1632,9 @@ fr_BE:
   sell_hubs_detail: "Créer un profil pour votre activité sur OFN en quelques minutes. A tout moment vous pourrez créer un comptoir en ligne pour vendre vos produits en direct aux acheteurs."
   sell_groups_detail: "Créer un répertoire sur mesure (regroupant différents producteurs et comptoirs) pour votre région ou votre organisation."
   sell_user_guide: "En savoir plus en explorant le guide d'utilisation."
-  sell_listing_price: "L'inscription à l'OFN est libre de contribution. Ouvrir et utiliser un comptoir sur OFN vous permet de gagner jusqu'à 500 $ de ventes mensuelles. Si vous vendez plus, vous pouvez choisir votre contribution communautaire entre 1% et 3% des ventes. Pour plus de détails sur les prix, visitez la section Plateforme logicielle via le lien \"À propos\" de dans le menu supérieur."
-  sell_embed: "D’ici là, vous pouvez également participer au projet. Soit en co-créant la communauté belge, en contribuant à l’amélioration des fonctionnalités…  Soit en mettant à disposition : un local pour la démonstration de l’outil ou un point relais pour faciliter les livraisons… Soit en le finançant par un don (déductible fiscalement à partir de 40€) versé à Oxfam-Magasins du monde qui coordonne le projet :  BE41 0682 2264 2410 – com: Open Food Network Nous consulter sur les services des partenaires OFN."
-  sell_ask_services: "Nous consulter sur les services des partenaires OFN."
+  sell_listing_price: "L'inscription à l'OFN est libre de contribution. Ouvrir et utiliser un comptoir sur OFN vous permet de gagner jusqu'à 500 € de ventes mensuelles, le service est gratuit les 6 premiers mois. Ensuite, une contribution entre 1 à 3% de votre chiffre de vente est demandée."
+  sell_embed: "D’ici là, vous pouvez également participer au projet. \nSoit en co-créant la communauté belge et en contribuant à l’amélioration des fonctionnalité. Soit en mettant à disposition un local pour faciliter les livraisons ou un lieu pour former les utilisateurs·trices à la plateforme, etc. Soit en soutenant le projet par un don (déductible fiscalement à partir de 40€) à verser sur le compte d'Oxfam-Magasins du monde qui facilite la plateforme :  BE41 0682 2264 2410 – en communication Open Food Network Belgium."
+  sell_ask_services: "Contactez-nous pour en savoir plus."
   shops_title: Comptoirs
   shops_headline: Des achats qui transforment.
   shops_text: Les aliments poussent selon des cycles naturels, les fermiers récoltent selon les saisons. Alors ici, nous achetons aussi en suivant des cycles. Si un cycle de vente est terminé, attendez le suivant ou contactez votre comptoir favori !
@@ -1859,7 +1863,7 @@ fr_BE:
         headline: "C'est terminé!"
         thanks: "Merci d'avoir complété le profil de %{enterprise}"
         login: "Vous pouvez modifier ou mettre à jour les détails de votre entreprise à tout moment en vous connectant sur Open Food Network, rubrique Admin."
-        action: "Aller au tableau de bord des entreprises"
+        action: "Allez au tableau de bord des entreprises"
   back: "Retour"
   continue: "Suivant"
   action_or: "OU"
@@ -2031,7 +2035,7 @@ fr_BE:
   first_name_begins_with: "Début du prénom"
   last_name_begins_with: "Début du nom de famille"
   enterprise_tos_link: "Lien vers les Conditions Générales d'Utilisation"
-  enterprise_tos_message: "Nous soutenons la mise en place d'un système alimentaire résilient et durable, et souhaitons œuvrer avec des entreprises qui partagent nos valeurs et notre vision. Ainsi, nous demandons aux entreprises s'enregistrant sur Open Food Network de valider nos "
+  enterprise_tos_message: "Nous soutenons la mise en place d'un système alimentaire résilient et durable, et souhaitons œuvrer avec des acteurs et actrices qui partagent nos valeurs et notre vision. Ainsi, nous demandons aux acteurs s'enregistrant sur Open Food Network de valider nos "
   enterprise_tos_link_text: "Conditions d'utilisation"
   enterprise_tos_agree: "J'adhère aux valeurs d'Open Food Network et valide les Conditions Générales d'Utilisation."
   tax_settings: "Paramètres TVA"
@@ -2313,6 +2317,10 @@ fr_BE:
     resolve_errors: Veuillez corriger les erreurs suivantes
     more_items: "+ %{count} en plus"
     default_card_updated: La carte bancaire par défaut a été mise à jour
+    cart:
+      add_to_cart_failed: >
+          Il y a eu un problème pour ajouter ce produit au panier. Il est peut-être
+          devenu indisponible ou le magasin est en train de fermer.
     admin:
       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:
@@ -2695,7 +2703,7 @@ fr_BE:
     location: "Site"
     count_on_hand: "Compté à la main"
     quantity: "Nb commandé"
-    on_demand: "A volonté"
+    on_demand: "A la demande"
     on_hand: "En stock"
     package_from: "colis provenant de "
     item_description: "Description de l'article "
@@ -2855,7 +2863,7 @@ fr_BE:
       admin:
         login_nav:
           header:
-            store: Vue acheteur·euse
+            store: Aperçu
     admin:
       tab:
         dashboard: "Tableau de bord"
@@ -2990,9 +2998,6 @@ fr_BE:
           zone: "Zone"
           calculator: "Calculateur"
           display: "Ecran"
-          both: "Tou·te·s les deux"
-          front_end: "L'extrémité avant"
-          back_end: "Back End"
           no_shipping_methods_found: "Aucune méthode de livraison trouvée"
         new:
           new_shipping_method: "Nouvelle méthode de livraison"
@@ -3004,9 +3009,6 @@ fr_BE:
         form:
           categories: "Les catégories"
           zones: "Zones"
-          both: "Tous les deux"
-          front_end: "L'extrémité avant"
-          back_end: "Back End"
       payment_methods:
         new:
           new_payment_method: "Nouvelle méthode de paiement"
@@ -3132,6 +3134,13 @@ fr_BE:
       shared:
         sortable_header:
           name: "Nom"
+          number: "N° commande"
+          state: "Province"
+          payment_state: "Statut du Paiement"
+          shipment_state: "Statut livraison"
+          email: "Email"
+          total: "Total"
+      general_settings:
         edit:
           legal_settings: "Configuration légales"
           cookies_consent_banner_toggle: "Afficher la bannière de consentement à l'utilisation des cookies"
@@ -3157,7 +3166,6 @@ fr_BE:
       format: '%Y-%m-%d'
       js_format: 'yy-mm-dd'
     orders:
-      error_flash_for_unavailable_items: "Une donnée n'est plus disponible sur votre carte."
       edit:
         login_to_view_order: "Veuillez vous connecter pour voir votre commande."
       bought:

config/locales/fr_CA.yml

@@ -681,12 +681,11 @@ fr_CA:
           ofn_uid: ID OFN
           ofn_uid_tip: L'identifiant unique pour les comptes entreprises sur Open Food Network.
         shipping_methods:
-          name: Nom
-          applies: S'applique?
-          manage: Gérer les méthodes de livraison
-          create_button: Créer nouvelle méthode de livraison
-          create_one_button: En créer une maintenant
-          no_method_yet: Vous n'avez pas encore paramétré de méthode de livraison.
+          name: "Nom"
+          manage: "Gérer les méthodes de livraison"
+          create_button: "Créer nouvelle méthode de livraison"
+          create_one_button: "En créer une maintenant"
+          no_method_yet: "Vous n'avez pas encore paramétré de méthode de livraison."
         shop_preferences:
           shopfront_requires_login: "Boutique visible par tous?"
           shopfront_requires_login_tip: "Choisissez si les acheteurs doivent être logués pour voir la boutique ou si la boutique est visible par tout le monde."
@@ -3051,9 +3050,6 @@ fr_CA:
           zone: "Zone"
           calculator: "Calculateur"
           display: "Afficher"
-          both: "Les deux"
-          front_end: "Front End"
-          back_end: "Back End"
           no_shipping_methods_found: "Aucune méthode de livraison trouvée"
         new:
           new_shipping_method: "Nouvelle méthode de livraison"
@@ -3065,9 +3061,6 @@ fr_CA:
         form:
           categories: "Conditions de transport"
           zones: "Zones"
-          both: "Les deux"
-          front_end: "Front End"
-          back_end: "Back End"
       payment_methods:
         new:
           new_payment_method: "Nouvelle méthode de paiement"
@@ -3193,6 +3186,13 @@ fr_CA:
       shared:
         sortable_header:
           name: "Nom"
+          number: "N° commande"
+          state: "Département"
+          payment_state: "Statut du Paiement"
+          shipment_state: "Statut de la livraison"
+          email: "Email"
+          total: "Total"
+      general_settings:
         edit:
           legal_settings: "Configuration légales"
           cookies_consent_banner_toggle: "Afficher la bannière de consentement à l'utilisation des cookies"
@@ -3218,7 +3218,6 @@ fr_CA:
       format: '%Y-%m-%d'
       js_format: 'yy-mm-dd'
     orders:
-      error_flash_for_unavailable_items: "Un produit de votre panier n'est plus disponible."
       edit:
         login_to_view_order: "Veuillez vous connecter pour voir votre commande."
       bought:

config/locales/it.yml

@@ -681,12 +681,11 @@ it:
           ofn_uid: OFN UID
           ofn_uid_tip: Il codice univoco utilizzato per identificare l'azienda su OFN
         shipping_methods:
-          name: Nome
-          applies: Applica?
-          manage: Gestisci metodi di spedizione
-          create_button: Crea un nuovo metodo di consegna
-          create_one_button: Crea uno ora
-          no_method_yet: Non hai ancora un metodo di consegna
+          name: "Nome"
+          manage: "Gestisci metodi di spedizione"
+          create_button: "Crea un nuovo metodo di consegna"
+          create_one_button: "Crea uno ora"
+          no_method_yet: "Non hai ancora un metodo di consegna"
         shop_preferences:
           shopfront_requires_login: "Vetrina visibile pubblicamente?"
           shopfront_requires_login_tip: "Scegli se i consumatori devono essere registrati per poter vedere la vetrina o se è visibile a tutti"
@@ -698,7 +697,7 @@ it:
           allow_guest_orders_false: "Richiedi il login per ordinare"
           allow_guest_orders_true: "Permetti acquisto come ospite"
           allow_order_changes: "Modifica gentili richieste"
-          allow_order_changes_tip: "Permetti ai consumatori di modificare le proprie gentili richieste finché il ciclo di richieste è aperto."
+          allow_order_changes_tip: "Permetti ai consumatori di modificare le proprie richieste finché il ciclo di richieste è aperto."
           allow_order_changes_false: "Le gentili richieste confermate non possono essere modificate / annullate"
           allow_order_changes_true: "Gli utenti possono modificare / annullare le gentili richieste mentre il ciclo di richieste è aperto"
           enable_subscriptions: "Sottoscrizioni"
@@ -925,7 +924,7 @@ it:
         new_schedule: Nuovo programma
       name_and_timing_form:
         name: Nome
-        orders_open: Gentili richieste aperte a
+        orders_open: Richieste aperte a
         coordinator: Referente
         orders_close: Gentili richieste chiuse
       row:
@@ -1092,7 +1091,7 @@ it:
       cancel_failure_msg: "Ci dispiace, eliminazione non riuscita!"
       confirm_pause_msg: "Sei sicura/o di voler mettere in pausa questo abbonamento?"
       pause_failure_msg: "Spiacente, pausa fallita!"
-      confirm_unpause_msg: "If you have an open Order Cycle in this subscription's schedule, an order will be created for this customer. Are you sure you want to unpause this subscription?"
+      confirm_unpause_msg: "Se hai un ciclo di richieste aperto durante questa registrazione, sarà creato un ordine per l'utente registrato. Vuoi annullare la registrazione?"
       unpause_failure_msg: "Ci dispiace, ripresa non riuscita!"
       confirm_cancel_open_orders_msg: "Alcune di queste richieste sono attualmente attive. I consumatori sono già stati avvisati che le richieste verranno soddisfatte. Vuoi eliminare questa/e richiesta/e o mantenerla?"
       resume_canceled_orders_msg: "Alcuni ordini per questo abbonamento possono essere ripresi in questo momento. Puoi riprenderli dal menu a discesa degli ordini."
@@ -1152,7 +1151,7 @@ it:
       footer_contact_email: "Scrivici"
       footer_nav_headline: "Naviga"
       footer_join_headline: "Unisciti a noi"
-      footer_join_body: "Crea una lista, un negozio o un gruppo su Open Food Network."
+      footer_join_body: "Crea un catalogo, un negozio o un gruppo su Open Food Network."
       footer_join_cta: "Dimmi di più!"
       footer_legal_call: "Leggi i nostri"
       footer_legal_tos: "Termini e condizioni"
@@ -1340,7 +1339,7 @@ it:
       cookies_policy_link: "cookies policy"
       cookies_accept_button: "Accetta Cookies"
   home_shop: Compra ora
-  brandstory_headline: "Cibo, libero."
+  brandstory_headline: "Cibo sano, cibo locale!"
   brandstory_intro: "A volte il modo migliore di correggere il sistema è crearne uno nuovo..."
   brandstory_part1: "Cominciamo da zero. Con i produttori e gli allevatori pronti a raccontare le loro storie, sinceramente e orgogliosamente. Con i distributori pronti a connettere le persone con i prodotti in modo giusto ed equo. Con i compratori che credono che migliori decisioni per l'acquisto settimanale possano seriamente cambiare il mondo."
   brandstory_part2: "Poi abbiamo bisogno di un modo per renderlo reale. Un modo per dare più forza a chi coltiva, vende e acquista cibo. Un modo per raccontare tutte le storie, per gestire tutta la logistica. Un modo per cambiare la transazione in trasformazione ogni giorno."
@@ -1613,7 +1612,7 @@ it:
   name_or_sku: "NOME O SKU"
   register_title: Registra
   sell_title: "Registrati"
-  sell_headline: "Vieni su Open Food Network!"
+  sell_headline: "Entra nella rete OFN Italia!"
   sell_motivation: "Esponi i tuoi bellissimi prodotti."
   sell_producers: "Produttori"
   sell_hubs: "Distributori"
@@ -1629,7 +1628,7 @@ it:
   shops_headline: La spesa, ripensata.
   shops_text: Il cibo cresce in ciclo, gli agricoltori raccolgono in cicli, e noi ordiniamo il cibo in cicli. Se trovi un ciclo d'ordine chiuso, torna a controllare presto.
   shops_signup_title: Iscriviti come hub
-  shops_signup_headline: Hub di cibo, illimitati.
+  shops_signup_headline: Hub illimitati.
   shops_signup_motivation: Qualsiasi sia il tuo modello, noi ti supportiamo. Comunque tu cambi, noi siamo con te. Siamo no-profit, indipendenti e a codice aperto. Siamo i partner per il software che desideravi.
   shops_signup_action: Unisciti ora
   shops_signup_pricing: Account Azienda
@@ -1684,7 +1683,7 @@ it:
   password: Password
   remember_me: Ricordami
   are_you_sure: "Sei sicuro?"
-  orders_open: Ordini aperti
+  orders_open: Richieste aperte
   closing: "In chiusura"
   going_back_to_home_page: "Reindirizzamento alla homepage"
   creating: In creazione
@@ -1789,7 +1788,7 @@ it:
         no_producer: "No, non sono un produttore"
         producer_field_error: "Per favore scegline uno. Sei un produttore?"
         yes_producer_help: "I produttori fanno cose buone da mangiare e/o bere. Sei un produttore se le coltivi, le allevi, le infondi, le cucini, le fai fermentare, le mungi o le modelli."
-        no_producer_help: "Se non sei un produttore, probabilmente sei qualcuno che vende e distribuisce cibo. potresti essere un hub, una cooperativa, un gruppo d'acquisto, un rivenditore al dettaglio o all'ingrosso, o altro."
+        no_producer_help: "Se non sei un produttore, probabilmente sei qualcuno che vende e distribuisce. Potresti essere un hub, una cooperativa, un gruppo d'acquisto, un rivenditore al dettaglio o all'ingrosso, o altro."
         create_profile: "Crea profilo"
       about:
         title: "Descrizione"
@@ -1835,7 +1834,7 @@ it:
         enterprise_final_step: "Ultimo passo!"
         enterprise_social_text: "Come possono le persone trovare on-line %{enterprise}?"
         website: "Sito web"
-        website_placeholder: "p.es. openfoodnetwork.org.au"
+        website_placeholder: "p.es. openfoodnetwork.it"
         facebook: "Facebook"
         facebook_placeholder: "p.es. www.facebook.com/PageNameHere"
         linkedin: "LinkedIn"
@@ -3046,9 +3045,6 @@ it:
           zone: "Zone"
           calculator: "Calcolatrice"
           display: "Visualizza"
-          both: "Entrambi"
-          front_end: "Front End"
-          back_end: "Back End"
           no_shipping_methods_found: "Nessun metodo di spedizione trovato"
         new:
           new_shipping_method: "Nuovo metodo di spedizione"
@@ -3060,9 +3056,6 @@ it:
         form:
           categories: "categorie"
           zones: "Zone"
-          both: "Entrambi"
-          front_end: "Front End"
-          back_end: "Back End"
       payment_methods:
         new:
           new_payment_method: "Nuovo metodo di pagamento"
@@ -3188,6 +3181,13 @@ it:
       shared:
         sortable_header:
           name: "Nome"
+          number: "Numero"
+          state: "Stato"
+          payment_state: "Stato Pagamento"
+          shipment_state: "Stato della spedizione"
+          email: "Email"
+          total: "Totale"
+      general_settings:
         edit:
           legal_settings: "Impostazioni Legali"
           cookies_consent_banner_toggle: "Mostra banner di consenso per i cookie"
@@ -3213,7 +3213,6 @@ it:
       format: '%Y-%m-%d'
       js_format: 'aa-mm-gg'
     orders:
-      error_flash_for_unavailable_items: "Un articolo nel tuo carrello è diventato non disponibile."
       edit:
         login_to_view_order: "Effettua il login per visualizzare il tuo ordine."
       bought:
@@ -3294,7 +3293,7 @@ it:
           settings: Impostazioni account
         unconfirmed_email: "Email di conferma in sospeso per: %{unconfirmed_email}. Il tuo indirizzo email sarà aggiornato quando la nuova email sarà confermata. "
       orders:
-        open_orders: Gentili richieste aperte
+        open_orders: Richieste aperte
         past_orders: Gentili richieste passate
       transactions:
         transaction_history: Storico Transazioni

config/locales/nb.yml

@@ -685,12 +685,11 @@ nb:
           ofn_uid: OFN UID
           ofn_uid_tip: Den unike ID-en som brukes til å identifisere bedriften på Open Food Network.
         shipping_methods:
-          name: Navn
-          applies: Gjelder?
-          manage: Administrer Leveringsmetoder
-          create_button: Opprett Ny Leveringsmetode
-          create_one_button: Opprett en nå
-          no_method_yet: Du har ingen leveringsmetoder ennå.
+          name: "Navn"
+          manage: "Administrer Leveringsmetoder"
+          create_button: "Opprett Ny Leveringsmetode"
+          create_one_button: "Opprett en nå"
+          no_method_yet: "Du har ingen leveringsmetoder ennå."
         shop_preferences:
           shopfront_requires_login: "Offentlig synlig butikk?"
           shopfront_requires_login_tip: "Velg om kunder må logge inn for å se butikken eller om den er synlig for alle."
@@ -3049,9 +3048,6 @@ nb:
           zone: "Sone"
           calculator: "Kalkulator"
           display: "Visning"
-          both: "Begge"
-          front_end: "Frontend"
-          back_end: "Backend"
           no_shipping_methods_found: "Ingen leveringsmetoder funnet"
         new:
           new_shipping_method: "Ny Leveringsmetode"
@@ -3063,9 +3059,6 @@ nb:
         form:
           categories: "Kategorier"
           zones: "Soner"
-          both: "Begge"
-          front_end: "Frontend"
-          back_end: "Backend"
       payment_methods:
         new:
           new_payment_method: "Ny Betalingsmetode"
@@ -3193,6 +3186,13 @@ nb:
       shared:
         sortable_header:
           name: "Navn"
+          number: "Antall"
+          state: "Tilstand"
+          payment_state: "Betalingsstatus"
+          shipment_state: "Leveringsstatus"
+          email: "Epost"
+          total: "Total"
+      general_settings:
         edit:
           legal_settings: "Juridiske innstillinger"
           cookies_consent_banner_toggle: "Vis informasjonskapsler samtykkebanner"
@@ -3218,7 +3218,6 @@ nb:
       format: '%Y-%m-%d'
       js_format: 'yy-mm-dd'
     orders:
-      error_flash_for_unavailable_items: "Et element i handlekurven din er blitt utilgjengelig."
       edit:
         login_to_view_order: "Vennligst logg inn for å se bestillingen din."
       bought:

config/locales/nl_BE.yml

@@ -668,12 +668,11 @@ nl_BE:
           ofn_uid: OFN UID
           ofn_uid_tip: Het unieke ID dat wordt gebruikt om de onderneming in Open Food Network te identificeren.
         shipping_methods:
-          name: Naam
-          applies: Van toepassing?
-          manage: Beheer Verzendmethodes
-          create_button: Creëer Nieuwe Verzendmethodes
-          create_one_button: Creëer er nu één
-          no_method_yet: Je hebt nog geen verzendmethodes.
+          name: "Naam"
+          manage: "Beheer Verzendmethodes"
+          create_button: "Creëer Nieuwe Verzendmethodes"
+          create_one_button: "Creëer er nu één"
+          no_method_yet: "Je hebt nog geen verzendmethodes."
         shop_preferences:
           shopfront_requires_login: "Publiekelijk zichtbare etalage"
           shopfront_requires_login_tip: "Kies of je klanten ingelogd moeten zijn om je etalage te bekijken of kies om je etalage zichtbaar te maken voor iedereen."
@@ -2886,9 +2885,6 @@ nl_BE:
           zone: "Zone"
           calculator: "Rekenmachine"
           display: "Display"
-          both: "Beide"
-          front_end: "Voorkant"
-          back_end: "Back End"
           no_shipping_methods_found: "Geen verzendmethoden gevonden"
         new:
           new_shipping_method: "New Shipping Method"
@@ -2900,9 +2896,6 @@ nl_BE:
         form:
           categories: "Categorieën"
           zones: "Zones "
-          both: "Beide"
-          front_end: "Voorkant"
-          back_end: "Back End"
       payment_methods:
         new:
           new_payment_method: "Nieuwe betalingswijze"
@@ -3017,6 +3010,13 @@ nl_BE:
       shared:
         sortable_header:
           name: "Naam"
+          number: "Nummer"
+          state: "Staat"
+          payment_state: "Status Betaling"
+          shipment_state: "Status Verzending"
+          email: "E-mail"
+          total: "Totaal"
+      general_settings:
         edit:
           legal_settings: "De legale instelling"
           cookies_consent_banner_toggle: "Laat de strook met uw akkoord voor de cookies zien"
@@ -3042,7 +3042,6 @@ nl_BE:
       format: '%Y-%m-%d'
       js_format: 'yy-mm-dd'
     orders:
-      error_flash_for_unavailable_items: "Een gegeven op je kaart is onbereikbaar."
       edit:
         login_to_view_order: "Gelieve U te connecteren om uw bestelling te zien."
       bought:

config/locales/pt.yml

@@ -655,12 +655,11 @@ pt:
           link_to_front: Link para a loja
           link_to_front_tip: Um link direto para a sua loja no Open Food Network.
         shipping_methods:
-          name: Nome
-          applies: Aplicável?
-          manage: Gerir Métodos de Envio
-          create_button: Criar Nova Forma de Envio
-          create_one_button: Criar um agora
-          no_method_yet: Ainda não tem nenhuma forma de envio.
+          name: "Nome"
+          manage: "Gerir Métodos de Envio"
+          create_button: "Criar Nova Forma de Envio"
+          create_one_button: "Criar um agora"
+          no_method_yet: "Ainda não tem nenhuma forma de envio."
         shop_preferences:
           shopfront_requires_login: "Loja visível publicamente?"
           shopfront_requires_login_tip: "Escolha se os consumidores vão precisar de fazer login para ver a loja, ou se esta estará visível para toda a gente."
@@ -2949,6 +2948,13 @@ pt:
       shared:
         sortable_header:
           name: "Nome"
+          number: "Número"
+          state: "Estado"
+          payment_state: "Estado do Pagamento"
+          shipment_state: "Estado do envio"
+          email: "Email"
+          total: "Total"
+      general_settings:
         edit:
           legal_settings: "Configurações Legais"
           cookies_consent_banner_toggle: "Mostrar o Banner de consentimento de Cookies"
@@ -2974,7 +2980,6 @@ pt:
       format: '%Y-%m-%d'
       js_format: 'aa-mm-dd'
     orders:
-      error_flash_for_unavailable_items: "Um item do seu carrinho ficou indisponível."
       edit:
         login_to_view_order: "Por favor faça login para ver a sua encomenda."
       bought:

config/locales/pt_BR.yml

@@ -554,7 +554,7 @@ pt_BR:
       index:
         title: Inventário
         description: Utilize essa página para gerenciar inventários para suas iniciativas. Qualquer detalhe de produtos especificado aqui irá substituir o que foi especificado na página de 'Produtos'
-        enable_reset?: Ativar restauração de estoque?
+        enable_reset?: Ativar Restauração de Estoque?
         default_stock: "Estoque padrão"
         inherit?: Herdar?
         add: Adicionar
@@ -644,16 +644,15 @@ pt_BR:
           promo_image_note2: Qualquer imagem promocional carregada aqui será cortada para 1200 x 260.
           promo_image_note3: A imagem promocional é exibida no topo da página do perfil dos empreendimento e em pop-ups.
         inventory_settings:
-          text1: Você pode optar por gerenciar o seu nível de estoque e preços através de seu
-          inventory: inventório
+          text1: Você pode optar por modificar preços e nível de estoque através de seu
+          inventory: inventário
           text2: >
-              Se você está usando a ferramenta de inventário, você pode selecionar
-              se novos produtos adicionados pelos seus fornecedores precisam ser adicionados
-              ao seu inventário antes de serem estocados. Se você não está usando
-              o inventário para gerenciar os seus produtos, você deve selecionar a
-              opção 'recomendado' abaixo.
-          preferred_product_selection_from_inventory_only_yes: Novos produtos podem ser colocados na minha loja virtual (recomendado)
-          preferred_product_selection_from_inventory_only_no: Novos produtos devem ser adicionados no meu inventário antes de serem colocados na minha loja virtual
+              Utilizando a ferramenta Inventário, é possível permitir que apenas os
+              produtos do inventário possam ser disponibilizados na sua loja virtual.
+              Se você não está usando o inventário para gerenciar os seus produtos,
+              selecione a opção 'recomendado' abaixo.
+          preferred_product_selection_from_inventory_only_yes: Todos os produtos dos meus fornecedores podem ser disponibilizados na minha loja virtual (recomendado)
+          preferred_product_selection_from_inventory_only_no: Somente produtos que eu adicionar ao meu Inventário podem ser disponibilizados na minha loja virtual.
         payment_methods:
           name: Nome
           applies: Aplica?
@@ -686,12 +685,12 @@ pt_BR:
           ofn_uid: OFN UID
           ofn_uid_tip: O ID exclusivo usado para identificar a iniciativa na Open Food Brasil.
         shipping_methods:
-          name: Nome
-          applies: Aplica?
-          manage: Gerenciar formas de envio
-          create_button: Criar nova forma de envio
-          create_one_button: Criar um agora
-          no_method_yet: Você ainda não tem nenhuma forma de envio.
+          name: "Nome"
+          applies: "Ativo?"
+          manage: "Gerenciar formas de envio"
+          create_button: "Criar nova forma de envio"
+          create_one_button: "Criar um agora"
+          no_method_yet: "Você ainda não tem nenhuma forma de envio."
         shop_preferences:
           shopfront_requires_login: "Loja virtual visível publicamente?"
           shopfront_requires_login_tip: "Escolha se os clientes precisarão fazer o login para ver os produtos da loja virtual, ou se eles estarão visíveis para todos."
@@ -2558,7 +2557,7 @@ pt_BR:
       inventory_products: "Produtos de Inventário"
       hidden_products: "Produtos Ocultos"
       new_products: "Novos Produtos"
-      reset_stock_levels: Redefinir os Níveis de Estoque para os Padrões
+      reset_stock_levels: Restaurar os Níveis de Estoque para os Padrões
       changes_to: Muda para
       one_override: uma substituição
       overrides: substitui
@@ -2826,7 +2825,7 @@ pt_BR:
     currency_symbol_position: Coloque "símbolo de moeda antes ou depois do valor em dólar?"
     currency_thousands_separator: "Separador de milhares de moedas"
     hide_cents: "Ocultar centavos"
-    display_currency: "Moeda de exibição"
+    display_currency: "Mostrar moeda"
     choose_currency: "Escolha a Moeda"
     mail_method_settings: "Configurações do método de email"
     general: "Geral"
@@ -3070,9 +3069,6 @@ pt_BR:
           zone: "Zona"
           calculator: "Calculadora"
           display: "Exibição"
-          both: "Ambos"
-          front_end: "a parte dianteira"
-          back_end: "a parte traseira"
           no_shipping_methods_found: "Nenhum método de envio encontrado"
         new:
           new_shipping_method: "Novo método de envio"
@@ -3084,9 +3080,7 @@ pt_BR:
         form:
           categories: "Categorias"
           zones: "Zonas"
-          both: "Ambos"
-          front_end: "a parte dianteira"
-          back_end: "a parte traseira"
+          deactivation_warning: "Desativar um método de envio pode fazer com que ele desapareça da sua lista. Como alternativa, você pode esconder um método de envio da página de checkout s"
       payment_methods:
         new:
           new_payment_method: "Novo método de pagamento"
@@ -3214,6 +3208,13 @@ pt_BR:
       shared:
         sortable_header:
           name: "Nome"
+          number: "Número"
+          state: "Estado"
+          payment_state: "Estado de pagamento"
+          shipment_state: "Situação do Envio"
+          email: "E-mail"
+          total: "Total"
+      general_settings:
         edit:
           legal_settings: "Configurações de Legislação"
           cookies_consent_banner_toggle: "Mostrar banner sobre permissão para cookies"
@@ -3239,7 +3240,6 @@ pt_BR:
       format: '%A-%m-'
       js_format: 'aa-mm-dd'
     orders:
-      error_flash_for_unavailable_items: "Um item no seu carrinho ficou indisponível."
       edit:
         login_to_view_order: "Faça o login para visualizar seu pedido."
       bought:

config/locales/sv.yml

@@ -366,12 +366,11 @@ sv:
           link_to_front: Länk till sitt skyltfönster
           link_to_front_tip: En direkt länk till ditt skyltfönster på OFN
         shipping_methods:
-          name: Namn
-          applies: Gäller?
-          manage: Bestäm leversmetoder
-          create_button: Skapa ny leveransmetod
-          create_one_button: Skapa en nu
-          no_method_yet: Du har inte bestämt leveransmetod ännu.
+          name: "Namn"
+          manage: "Bestäm leversmetoder"
+          create_button: "Skapa ny leveransmetod"
+          create_one_button: "Skapa en nu"
+          no_method_yet: "Du har inte bestämt leveransmetod ännu."
         shop_preferences:
           shopfront_requires_login: "Offentligt visat skyltfönster?"
           shopfront_requires_login_tip: "Välj om kunderna måste logga in för att se skyltfönstret eller om det skall visas för alla."
@@ -2053,6 +2052,12 @@ sv:
       shared:
         sortable_header:
           name: "Namn"
+          state: "Region"
+          payment_state: "Betalningsstatus"
+          shipment_state: "Leveransstatus"
+          email: "E-post"
+          total: "Summa"
+      general_settings:
         edit:
           enterprises_require_tos: "Företag måste acceptera servicevillkoren"
           footer_tos_url: "Användarvillkor URL"

config/locales/tr.yml

@@ -685,12 +685,11 @@ tr:
           ofn_uid: AGA KN
           ofn_uid_tip: Açık Gıda Ağı'na kayıtlı işletmenize özel tanımlanan kimlik numarası
         shipping_methods:
-          name: Ad
-          applies: Uygulanma?
-          manage: Teslimat Yöntemlerini Yönet
-          create_button: Yeni Teslimat Yöntemi Oluştur
-          create_one_button: Şimdi Oluştur
-          no_method_yet: Henüz herhangi bir teslimat yönteminiz yok.
+          name: "Ad"
+          manage: "Teslimat Yöntemlerini Yönet"
+          create_button: "Yeni Teslimat Yöntemi Oluştur"
+          create_one_button: "Şimdi Oluştur"
+          no_method_yet: "Henüz herhangi bir teslimat yönteminiz yok."
         shop_preferences:
           shopfront_requires_login: "MAĞAZANIZ HARİTADA GÖRÜNÜR OLSUN MU?"
           shopfront_requires_login_tip: "Mağazanızın yalnızca üyelerinize mi yoksa herkese mi açık olduğunu seçin."
@@ -3068,9 +3067,6 @@ tr:
           zone: "bölge"
           calculator: "Hesaplama"
           display: "Görüntüle"
-          both: "Her ikisi de"
-          front_end: "ön yüz"
-          back_end: "Arka yüz"
           no_shipping_methods_found: "Hiçbir teslimat yöntemi bulunamadı"
         new:
           new_shipping_method: "Yeni Teslimat Yöntemi"
@@ -3082,9 +3078,6 @@ tr:
         form:
           categories: "Kategoriler"
           zones: "bölgeler"
-          both: "Her ikisi de"
-          front_end: "ön yüz"
-          back_end: "Arka yüz"
       payment_methods:
         new:
           new_payment_method: "Yeni Ödeme Yöntemi"
@@ -3212,6 +3205,13 @@ tr:
       shared:
         sortable_header:
           name: "Ad"
+          number: "Numara"
+          state: "Durum"
+          payment_state: "Ödeme Durumu"
+          shipment_state: "Teslimat Durumu"
+          email: "E-posta"
+          total: "Toplam"
+      general_settings:
         edit:
           legal_settings: "Yasal Ayarlar"
           cookies_consent_banner_toggle: "Çerezler onay başlığını göster"
@@ -3237,7 +3237,6 @@ tr:
       format: '% Y-% A-%d'
       js_format: 'yy-aa-gg'
     orders:
-      error_flash_for_unavailable_items: "Sepetinizdeki bir ürün mevcut değil olarak güncellendi."
       edit:
         login_to_view_order: "Siparişinizi görmek için lütfen giriş yapın."
       bought: