diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 2ffb83cecc..df9c10bbf5 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -323,6 +323,7 @@ ca:
     show_n_more: Mostra %{num} més
     choose: "Tria ..."
     please_select: Seleccioneu ...
+    column_save_as_default: Per defecte
     columns: Columnes
     actions: Accions
     viewing: "Veient: %{current_view_name}"
@@ -663,7 +664,7 @@ ca:
         primary_details:
           name: Nom
           name_placeholder: p. ex. Horta Josep Ribes
-          groups: Grups
+          groups: Xarxes/Grups
           groups_tip: Seleccioneu grups o xarxes de la quals sou membres. Això ajudarà les consumidores a trobar la vostra organització o empresa.
           groups_placeholder: Comenceu a escriure per cercar xarxes disponibles...
           primary_producer: Productora principal?
@@ -1206,7 +1207,7 @@ ca:
   menu_2_url: "/map"
   menu_3_title: "Productors"
   menu_3_url: "/producers"
-  menu_4_title: "Grups"
+  menu_4_title: "Xarxes/Grups"
   menu_4_url: "/groups"
   menu_5_title: "Sobre"
   menu_5_url: "http://katuma.org/"
@@ -1262,7 +1263,7 @@ ca:
   label_map: "Mapa"
   label_producer: "Productora"
   label_producers: "Productors"
-  label_groups: "Grups"
+  label_groups: "Xarxes/Grups"
   label_about: "Sobre"
   label_connect: "Connecta"
   label_learn: "Aprèn"
@@ -1323,14 +1324,8 @@ ca:
       cookie_stripe_desc: "Dades recollides pel nostre processador de pagaments Stripe per a la detecció de frau https://stripe.com/cookies-policy/legal. No totes les botigues utilitzen Stripe com a mètode de pagament, però és una bona pràctica per evitar que el frau s'apliqui a totes les pàgines. Probablement Stripe construeixi una imatge de quines de les nostres pàgines solen interactuar amb la seva API i, a continuació, marca qualsevol cosa inusual. Així, configurar les cookies d'Stripe té una funció més àmplia que simplement proporcionar un mètode de pagament a un usuari. Eliminant-lo podria afectar la seguretat del propi servei. Pots obtenir més informació sobre Stripe i llegir la seva política de privadesa a https://stripe.com/privacy."
       statistics_cookies: "Cookies d'estadístiques"
       statistics_cookies_desc: "Les següents no són estrictament necessàries, però ajuden a proporcionar-vos la millor experiència d'usuari, permetent-nos analitzar el comportament de l'usuari, identificar quines funcions s'utilitzen més o quines no es fan servir, comprendre problemes d'experiència d'usuari, etc."
-      statistics_cookies_analytics_desc_html: "Per recopilar i analitzar les dades d'ús de la plataforma utilitzem Google Analytics ja que era el servei predeterminat connectat amb Spree (el programari de codi obert de comerç en línia que hem construït), però la nostra visió és canviar a <a href = 'https: / / /matomo.org/ 'target =' _ blank '> Matomo </ a> (ex Piwik, eina d'anàlisi de codi obert compatible amb GDPR i protegeix la vostra privadesa) tan aviat com puguem. "
       statistics_cookies_matomo_desc_html: "Per recopilar i analitzar les dades d'ús de la plataforma, utilitzem <a href='https://matomo.org/' target='_blank'> Matomo </ a> (ex Piwik), una eina d'anàlisi de codi obert que és compatible amb GDPR i protegeix la vostra privadesa."
       statistics_cookies_matomo_optout: "Vols desactivar l'anàlisi de dades de Matomo? No recopilem cap dada personal i Matomo ens ajuda a millorar el nostre servei però respectem la teva elecció :-)"
-      cookie_analytics_utma_desc: "S'utilitza per distingir usuaris i sessions. La cookie es crea quan s'executa la biblioteca javascript i no existeixen cookies __utma existents. La cookie s'actualitza cada cop que s'envien dades a Google Analytics."
-      cookie_analytics_utmt_desc: "S'utilitza per accelerar la quantitat de sol·licituds."
-      cookie_analytics_utmb_desc: "S'utilitza per determinar noves sessions / visites. La cookie es crea quan s'executa la biblioteca javascript i no existeixen cookies __utmb existents. La cookie s'actualitza cada cop que s'envien dades a Google Analytics."
-      cookie_analytics_utmc_desc: "No s'utilitza a ga.js. Estableix la interoperabilitat amb urchin.js. Històricament, aquesta cookie funcionava juntament amb la cookie __utmb per determinar si l'usuari estava en una nova sessió / visita."
-      cookie_analytics_utmz_desc: "Emmagatzema l'origen del codi o la campanya que explica com l'usuari ha arribat al vostre lloc. La cookie es crea quan s'executa i s'actualitza la biblioteca javascript cada vegada que s'envien dades a Google Analytics."
       cookie_matomo_basics_desc: "Les primeres cookies de Matomo per recollir estadístiques."
       cookie_matomo_heatmap_desc: "Galeta d'enregistrament de sessió i heatmap de Matomo"
       cookie_matomo_ignore_desc: "La cookie usada per excloure l'usuari de ser seguit."
@@ -1464,9 +1459,9 @@ ca:
   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_confirmation_intro_html: "La teva comanda amb <strong> %{distributor} </ strong> ja està confirmada"
+  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_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_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>:"
@@ -1556,8 +1551,8 @@ ca:
   components_profiles_show: "Mostra els perfils"
   components_filters_nofilters: "Sense filtres"
   components_filters_clearfilters: "Esborra tots els filtres"
-  groups_title: Grups
-  groups_headline: Xarxes / regions
+  groups_title: Xarxes/Grups
+  groups_headline: Xarxes /Grups
   groups_text: "Cada productora és única. Tots els negocis tenen alguna cosa diferent per oferir. Els nostres grups són col·lectius o xarxes de productores, grups de consum o distribuïdores que comparteixen alguna cosa comú com la ubicació, la parada en un mercat de pagès o la filosofia. Això fa que la teva experiència de compra sigui més fàcil. Explora els nostres grups."
   groups_search: "Cerca nom o paraula clau"
   groups_no_groups: "No s'ha trobat cap xarxa"
@@ -1593,7 +1588,7 @@ ca:
   modal_hubs_abstract: Els nostres grups són el punt de contacte entre tu i les persones que fan els teus aliments.
   modal_hubs_content1: Pots cercar un grup convenient per ubicació o nom. Alguns grups tenen diversos punts on pots recollir les vostres comandes i alguns també proporcionen opcions de lliurament. Cada grup és un punt de venda amb operacions comercials i logística independents, per la qual cosa és normal que existeixin variacions d'un grup a un altre.
   modal_hubs_content2: Només pots comprar en un grup de consum a la vegada.
-  modal_groups: "Xarxes / regions"
+  modal_groups: "Xarxes /Grups"
   modal_groups_content1: Aquestes són les organitzacions i les relacions entre els grups que conformen l'OFN
   modal_groups_content2: Alguns grups estan agrupats per localització o Ajuntament, altres per similituds no geogràfiques.
   modal_how: "Com funciona"
@@ -1922,6 +1917,7 @@ ca:
   admin_enterprise_relationships_permits: "Permet"
   admin_enterprise_relationships_seach_placeholder: "Cerca"
   admin_enterprise_relationships_button_create: "Crear"
+  admin_enterprise_relationships_to: "a"
   admin_enterprise_groups: "Grups d'organització"
   admin_enterprise_groups_name: "Nom"
   admin_enterprise_groups_owner: "Propietària"
@@ -2689,6 +2685,14 @@ ca:
       start_free_profile: "Comença amb un perfil gratuït i amplia'l quan estiguis preparada."
   order_management:
     reports:
+      enterprise_fee_summaries:
+        filters:
+          date_range: "Interval de dates"
+          report_format_csv: "Descarrega com a CSV"
+          generate_report: "Generar informe"
+        report:
+          none: "Cap"
+          select_and_search: "Seleccioneu els filtres i feu clic a GENERAR INFORME per accedir a les dades."
       enterprise_fee_summary:
         date_end_before_start_error: "ha de ser després de l'inici"
         parameter_not_allowed_error: "No esteu autoritzats a utilitzar un o més filtres seleccionats per a aquest informe."
@@ -2882,12 +2886,6 @@ ca:
     shipping_categories: "Tipus d'enviament"
     new_shipping_category: "Nova categoria d’enviament"
     back_to_shipping_categories: "Tornar a les categories d'enviament"
-    analytics_trackers: "Rastrejadors d'anàlisi"
-    no_trackers_found: "No s'ha trobat cap rastrejador"
-    new_tracker: "Nou rastrejador"
-    add_one: "Afegeix-ne un"
-    google_analytics_id: "ID d'Analytics"
-    back_to_trackers_list: "Torna a la llista de rastrejadors"
     name: "Nom"
     description: "Descripció"
     type: "Tipus"
@@ -3169,14 +3167,6 @@ ca:
           bulk_coop_allocation: 'Compra grupal - Assignació'
           bulk_coop_packing_sheets: 'Compra grupal - Fulls de preparació de cistelles'
           bulk_coop_customer_payments: 'Compra grupal - Pagaments de les consumidores'
-        enterprise_fee_summaries:
-          filters:
-            date_range: "Interval de dates"
-            report_format_csv: "Descarrega com a CSV"
-            generate_report: "Generar informe"
-          report:
-            none: "No productora"
-            select_and_search: "Seleccioneu els filtres i feu clic a GENERAR INFORME per accedir a les dades."
       users:
         index:
           listing_users: "Llistat d'usuàries"
@@ -3221,14 +3211,15 @@ ca:
         autocomplete:
           producer_name: "Productor"
           unit: "Unitat"
-      general_settings:
+      shared:
+        sortable_header:
+          name: "Nom"
         edit:
           legal_settings: "Paràmetres legals"
           cookies_consent_banner_toggle: "Mostra banner de consentiment de cookies"
           privacy_policy_url: "URL de la política de privacitat "
           enterprises_require_tos: "Les organitzacions han d'acceptar les condicions del servei"
           cookies_policy_matomo_section: "Mostra la secció de Matomo a la pàgina de política de cookies"
-          cookies_policy_ga_section: "Mostra la secció de Google Analytics a la pàgina de política de cookies"
           footer_tos_url: "URL de les condicions d'ús"
     checkout:
       payment:
diff --git a/config/locales/en_FR.yml b/config/locales/en_FR.yml
index c242e06622..6722c384b4 100644
--- a/config/locales/en_FR.yml
+++ b/config/locales/en_FR.yml
@@ -323,6 +323,7 @@ en_FR:
     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}"
@@ -1320,14 +1321,8 @@ en_FR:
       cookie_stripe_desc: "Data collected by our payment processor Stripe for fraud detection https://stripe.com/cookies-policy/legal. Not all shops use Stripe as a payment method but it is a good practice to prevent fraud to apply it to all pages. Stripe probably build a picture of which of our pages usually interact with their API and then flag anything unusual. So setting the Stripe cookie has a broader function than simply the provision of a payment method to a user. Removing it could affect the security of the service itself. You can learn more about Stripe and read its privacy policy at https://stripe.com/privacy."
       statistics_cookies: "Statistics Cookies"
       statistics_cookies_desc: "The following are not strictly necessary, but help to provide you with the best user experience by allowing us to analyse user behaviour, identify which features you use most, or don’t use, understand user experience issues, etc."
-      statistics_cookies_analytics_desc_html: "To collect and analyse platform usage data, we use Google Analytics, as it was the default service connected with Spree (the e-commerce open source software that we built on) but our vision is to switch to <a href='https://matomo.org/' target='_blank'>Matomo</a> (ex Piwik, open source analytics tool that is GDPR compliant and protects your privacy) as soon as we can."
       statistics_cookies_matomo_desc_html: "To collect and analyse platform usage data, we use <a href='https://matomo.org/' target='_blank'>Matomo</a> (ex Piwik), an open source analytics tool that is GDPR compliant and protects your privacy."
       statistics_cookies_matomo_optout: "Do you want to opt-out of Matomo analytics? We don’t collect any personal data, and Matomo helps us to improve our service, but we respect your choice :-)"
-      cookie_analytics_utma_desc: "Used to distinguish users and sessions. The cookie is created when the javascript library executes and no existing __utma cookies exists. The cookie is updated every time data is sent to Google Analytics."
-      cookie_analytics_utmt_desc: "Used to throttle request rate."
-      cookie_analytics_utmb_desc: "Used to determine new sessions/visits. The cookie is created when the javascript library executes and no existing __utmb cookies exists. The cookie is updated every time data is sent to Google Analytics."
-      cookie_analytics_utmc_desc: "Not used in ga.js. Set for interoperability with urchin.js. Historically, this cookie operated in conjunction with the __utmb cookie to determine whether the user was in a new session/visit."
-      cookie_analytics_utmz_desc: "Stores the traffic source or campaign that explains how the user reached your site. The cookie is created when the javascript library executes and is updated every time data is sent to Google Analytics."
       cookie_matomo_basics_desc: "Matomo first party cookies to collect statistics."
       cookie_matomo_heatmap_desc: "Matomo Heatmap & Session Recording cookie."
       cookie_matomo_ignore_desc: "Cookie used to exclude user from being tracked."
@@ -1586,22 +1581,6 @@ en_FR:
   groups_signup_contact_text: "Get in touch to discover what OFN can do for you:"
   groups_signup_detail: "Here's the detail."
   login_invalid: "Invalid email or password"
-  modal_hubs: "Food Hubs"
-  modal_hubs_abstract: Our food hubs are the point of contact between you and the people who make your food!
-  modal_hubs_content1: You can search for a convenient hub by location or name. Some hubs have multiple points where you can pick-up your purchases, and some will also provide delivery options. Each food hub is a sales point with independent business operations and logistics - so variations between hubs are to be expected.
-  modal_hubs_content2: You can only shop at one food hub at a time.
-  modal_groups: "Groups / Regions"
-  modal_groups_content1: These are the organisations and relationships between hubs which make up the Open Food Network.
-  modal_groups_content2: Some groups are clustered by location or council, others by non-geographic similarities.
-  modal_how: "How it works"
-  modal_how_shop: Shop the Open Food Network
-  modal_how_shop_explained: Search for a food hub near you to start shopping! You can expand each food hub to see what kinds of goodies are available, and click through to start shopping. (You can only shop one food hub at a time.)
-  modal_how_pickup: Pick-ups, delivery and shipping costs
-  modal_how_pickup_explained: Some food hubs deliver to your door, while others require you to pick-up your purchases. You can see which options are available on the homepage, and select which you'd like at the shopping and check-out pages. Delivery will cost more, and pricing differs from hub-to-hub. Each food hub is a sales point with independent business operations and logisitics - so variations between hubs are to be expected.
-  modal_how_more: Learn more
-  modal_how_more_explained: "If you want to learn more about the Open Food Network, how it works, and get involved, check out:"
-  modal_producers: "Producers"
-  modal_producers_explained: "Our producers make all the delicious food you can shop for on the Open Food Network."
   producers_about: About us
   producers_buy: Shop for
   producers_contact: Contact
@@ -2684,6 +2663,14 @@ en_FR:
       start_free_profile: "Start with a free profile, and expand when you're ready!"
   order_management:
     reports:
+      enterprise_fee_summaries:
+        filters:
+          date_range: "Date Range"
+          report_format_csv: "Download as CSV"
+          generate_report: "Generate Report"
+        report:
+          none: "None"
+          select_and_search: "Select filters and click on GENERATE REPORT to access your data."
       enterprise_fee_summary:
         date_end_before_start_error: "must be after start"
         parameter_not_allowed_error: "You are not authorized to use one or more selected filters for this report."
@@ -2823,14 +2810,6 @@ en_FR:
     smtp_send_copy_to_this_addresses: "Sends a copy of all outgoing mails to this address. For multiple addresses, separate with commas."
     intercept_email_address: "Intercept Email Address"
     intercept_email_instructions: "Override email recipient and replace with this address."
-    smtp: "SMTP"
-    smtp_domain: "SMTP Domain"
-    smtp_mail_host: "SMTP Mail Host"
-    smtp_port: "SMTP Port"
-    secure_connection_type: "Secure Connection Type"
-    smtp_authentication_type: "SMTP Authentication Type"
-    smtp_username: "SMTP Username"
-    smtp_password: "SMTP Password"
     image_settings: "Image Settings"
     image_settings_warning: "You will need to regenerate thumbnails if you update the paperclip styles. Use rake paperclip:refresh:thumbnails CLASS=Spree::Image to do this."
     attachment_default_style: Attachments Style
@@ -2877,12 +2856,6 @@ en_FR:
     shipping_categories: "Shipping Categories"
     new_shipping_category: "New Shipping Category"
     back_to_shipping_categories: "Back To Shipping Categories"
-    analytics_trackers: "Analytics Trackers"
-    no_trackers_found: "No Trackers Found"
-    new_tracker: "New Tracker"
-    add_one: "Add One"
-    google_analytics_id: "Analytics ID"
-    back_to_trackers_list: "Back to Trackers List"
     name: "Name"
     description: "Description"
     type: "Type"
@@ -3164,14 +3137,6 @@ en_FR:
           bulk_coop_allocation: 'Bulk Co-op - Allocation'
           bulk_coop_packing_sheets: 'Bulk Co-op - Packing Sheets'
           bulk_coop_customer_payments: 'Bulk Co-op - Customer Payments'
-        enterprise_fee_summaries:
-          filters:
-            date_range: "Date Range"
-            report_format_csv: "Download as CSV"
-            generate_report: "Generate Report"
-          report:
-            none: "None"
-            select_and_search: "Select filters and click on GENERATE REPORT to access your data."
       users:
         index:
           listing_users: "Listing Users"
@@ -3213,17 +3178,20 @@ en_FR:
           price: "Price"
           display_as: "Display As"
           display_name: "Display Name"
+          display_as_placeholder: 'eg. 2 kg'
+          display_name_placeholder: 'eg. Tomatoes'
         autocomplete:
           producer_name: "Producer"
           unit: "Unit"
-      general_settings:
+      shared:
+        sortable_header:
+          name: "Name"
         edit:
           legal_settings: "Legal Settings"
           cookies_consent_banner_toggle: "Display cookies consent banner"
           privacy_policy_url: "Privacy Policy URL"
           enterprises_require_tos: "Enterprises must accept Terms of Service"
           cookies_policy_matomo_section: "Display Matomo section on cookies policy page"
-          cookies_policy_ga_section: "Display Google Analytics section on cookies policy page"
           footer_tos_url: "Terms of Service URL"
     checkout:
       payment:
diff --git a/config/locales/en_GB.yml b/config/locales/en_GB.yml
index 3f69dae27f..43be091174 100644
--- a/config/locales/en_GB.yml
+++ b/config/locales/en_GB.yml
@@ -323,6 +323,7 @@ en_GB:
     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}"
@@ -1320,14 +1321,8 @@ en_GB:
       cookie_stripe_desc: "Data collected by our payment processor Stripe for fraud detection https://stripe.com/cookies-policy/legal. Not all shops use Stripe as a payment method but it is a good practice to prevent fraud to apply it to all pages. Stripe probably build a picture of which of our pages usually interact with their API and then flag anything unusual. So setting the Stripe cookie has a broader function than simply the provision of a payment method to a user. Removing it could affect the security of the service itself. You can learn more about Stripe and read its privacy policy at https://stripe.com/privacy."
       statistics_cookies: "Statistics Cookies"
       statistics_cookies_desc: "The following are not strictly necessary, but help to provide you with the best user experience by allowing us to analyse user behaviour, identify which features you use most, or don’t use, understand user experience issues, etc."
-      statistics_cookies_analytics_desc_html: "To collect and analyse platform usage data, we use Google Analytics."
       statistics_cookies_matomo_desc_html: "To collect and analyse platform usage data, we use <a href='https://matomo.org/' target='_blank'>Matomo</a> (ex Piwik), an open source analytics tool that is GDPR compliant and protects your privacy."
       statistics_cookies_matomo_optout: "Would you like to opt-out of Matomo analytics? We use Matomo to help us improve our service, but we don't collect any personal data."
-      cookie_analytics_utma_desc: "Used to distinguish users and sessions. The cookie is created when the javascript library executes and no existing __utma cookies exists. The cookie is updated every time data is sent to Google Analytics."
-      cookie_analytics_utmt_desc: "Used to throttle request rate."
-      cookie_analytics_utmb_desc: "Used to determine new sessions/visits. The cookie is created when the javascript library executes and no existing __utmb cookies exists. The cookie is updated every time data is sent to Google Analytics."
-      cookie_analytics_utmc_desc: "Not used in ga.js. Set for interoperability with urchin.js. Historically, this cookie operated in conjunction with the __utmb cookie to determine whether the user was in a new session/visit."
-      cookie_analytics_utmz_desc: "Stores the traffic source or campaign that explains how the user reached your site. The cookie is created when the javascript library executes and is updated every time data is sent to Google Analytics."
       cookie_matomo_basics_desc: "Matomo first party cookies to collect statistics."
       cookie_matomo_heatmap_desc: "Matomo Heatmap & Session Recording cookie."
       cookie_matomo_ignore_desc: "Cookie used to exclude user from being tracked."
@@ -1919,6 +1914,7 @@ en_GB:
   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"
@@ -2689,6 +2685,14 @@ en_GB:
       start_free_profile: "Start with a free profile, and expand when you're ready!"
   order_management:
     reports:
+      enterprise_fee_summaries:
+        filters:
+          date_range: "Date Range"
+          report_format_csv: "Download as CSV"
+          generate_report: "Generate Report"
+        report:
+          none: "None"
+          select_and_search: "Select filters and click on GENERATE REPORT to access your data."
       enterprise_fee_summary:
         date_end_before_start_error: "must be after start"
         parameter_not_allowed_error: "You are not authorised to use one or more selected filters for this report."
@@ -2882,12 +2886,6 @@ en_GB:
     shipping_categories: "Shipping Categories"
     new_shipping_category: "New Shipping Category"
     back_to_shipping_categories: "Back To Shipping Categories"
-    analytics_trackers: "Analytics Trackers"
-    no_trackers_found: "No Trackers Found"
-    new_tracker: "New Tracker"
-    add_one: "Add One"
-    google_analytics_id: "Analytics ID"
-    back_to_trackers_list: "Back to Trackers List"
     name: "Name"
     description: "Description"
     type: "Type"
@@ -3169,14 +3167,6 @@ en_GB:
           bulk_coop_allocation: 'Bulk Co-op - Allocation'
           bulk_coop_packing_sheets: 'Bulk Co-op - Packing Sheets'
           bulk_coop_customer_payments: 'Bulk Co-op - Customer Payments'
-        enterprise_fee_summaries:
-          filters:
-            date_range: "Date Range"
-            report_format_csv: "Download as CSV"
-            generate_report: "Generate Report"
-          report:
-            none: "None"
-            select_and_search: "Select filters and click on GENERATE REPORT to access your data."
       users:
         index:
           listing_users: "Listing Users"
@@ -3221,14 +3211,15 @@ en_GB:
         autocomplete:
           producer_name: "Producer"
           unit: "Unit"
-      general_settings:
+      shared:
+        sortable_header:
+          name: "Name"
         edit:
           legal_settings: "Legal Settings"
           cookies_consent_banner_toggle: "Display cookies consent banner"
           privacy_policy_url: "Privacy Policy URL"
           enterprises_require_tos: "Enterprises must accept Terms of Service"
           cookies_policy_matomo_section: "Display Matomo section on cookies policy page"
-          cookies_policy_ga_section: "Display Google Analytics section on cookies policy page"
           footer_tos_url: "Terms of Service URL"
     checkout:
       payment:
diff --git a/config/locales/es_CR.yml b/config/locales/es_CR.yml
index 151ed7be42..f04841c2da 100644
--- a/config/locales/es_CR.yml
+++ b/config/locales/es_CR.yml
@@ -323,6 +323,7 @@ es_CR:
     show_n_more: Mostrar %{num} más
     choose: "Escoger..."
     please_select: Por favor selecciona ...
+    column_save_as_default: Guardar por defecto
     columns: Columnas
     actions: Acciones
     viewing: "Viendo: %{current_view_name}"
@@ -2084,12 +2085,12 @@ es_CR:
   report_tax_rates: Porcentajes de los Impuestos
   report_tax_types: Tipos de Impuestos
   report_header_order_cycle: Ciclo de Pedido
-  report_header_user: Usuaria
-  report_header_email: Email
+  report_header_user: Usuario
+  report_header_email: Correo electrónico
   report_header_status: Estado
   report_header_comments: Comentarios
   report_header_first_name: Nombre
-  report_header_last_name: Apellido
+  report_header_last_name: Apellidos
   report_header_phone: Teléfono
   report_header_suburb: Barrio
   report_header_address: Dirección
@@ -2106,14 +2107,14 @@ es_CR:
   report_header_shipping_method: Método de envío
   report_header_shipping_instructions: Instrucciones de envío
   report_header_ship_street: Calle de envío
-  report_header_ship_street_2: Calle de envío 2
+  report_header_ship_street_2: 'Calle 2 de envío '
   report_header_ship_city: Ciudad de envío
   report_header_ship_postcode: Código postal de envío
   report_header_ship_state: Provincia de envío
   report_header_billing_street: Calle de facturación
-  report_header_billing_street_2: Calle de facturación 2
-  report_header_billing_street_3: Calle de facturación 3
-  report_header_billing_street_4: Calle de facturación 4
+  report_header_billing_street_2: 'Calle 2 de facturación '
+  report_header_billing_street_3: 'Calle 3 de facturación '
+  report_header_billing_street_4: 'Calle 4 de facturación '
   report_header_billing_city: Ciudad de facturación
   report_header_billing_postcode: Código postal de facturación
   report_header_billing_state: Provincia de facturación
@@ -2122,12 +2123,12 @@ es_CR:
   report_header_order_number: Número de pedido
   report_header_date: Fecha
   report_header_confirmation_date: Fecha de confirmación
-  report_header_tags: Tags
+  report_header_tags: Etiquetas
   report_header_items: Artículos
   report_header_items_total: "Artículos en total %{currency_symbol}"
-  report_header_taxable_items_total: "Artículos con Impuestos en Total (%{currency_symbol})"
-  report_header_sales_tax: "Impuesto sobre las Ventas (%{currency_symbol})"
-  report_header_delivery_charge: "Gastos de Envío (%{currency_symbol})"
+  report_header_taxable_items_total: "Total en artículos con impuestos (%{currency_symbol})"
+  report_header_sales_tax: "Impuesto sobre las ventas (%{currency_symbol})"
+  report_header_delivery_charge: "Cobros de Envío (%{currency_symbol})"
   report_header_tax_on_delivery: "Impuestos sobre la entrega (%{currency_symbol})"
   report_header_tax_on_fees: "Impuesto sobre las comisiones (%{currency_symbol})"
   report_header_total_tax: "Total Impuestos (%{currency_symbol})"
@@ -2144,22 +2145,22 @@ es_CR:
   report_header_total_available: Total disponible
   report_header_unallocated: Sin asignar
   report_header_max_quantity_excess: Cantidad máxima
-  report_header_taxons: Clasificación
+  report_header_taxons: Clasificaciones
   report_header_supplier: Proveedor
-  report_header_producer: Productora
+  report_header_producer: Productor
   report_header_producer_suburb: Barrio Productora
   report_header_unit: Unidad
   report_header_group_buy_unit_quantity: Agrupar por cantidad unidad
-  report_header_cost: Coste
-  report_header_shipping_cost: Coste del envío
-  report_header_curr_cost_per_unit: Coste por unidad actual
-  report_header_total_shipping_cost: Coste total del envío
+  report_header_cost: Costo
+  report_header_shipping_cost: Costo del envío
+  report_header_curr_cost_per_unit: Costo por unidad actual
+  report_header_total_shipping_cost: Costo total del envío
   report_header_payment_method: Método de pago
   report_header_sells: Vende
   report_header_visible: Visible
   report_header_price: Precio
-  report_header_unit_size: Unidad de medida
-  report_header_distributor: Distribuidora
+  report_header_unit_size: Tamaño de la unidad
+  report_header_distributor: Distribuidor
   report_header_distributor_address: Dirección del distribuidor
   report_header_distributor_city: Ciudad del distribuidor
   report_header_distributor_postcode: Código postal del distribuidor
@@ -2174,7 +2175,7 @@ es_CR:
   report_header_units_required: Unidades requeridas
   report_header_remainder: Recordatorio
   report_header_order_date: Fecha de pedido
-  report_header_order_id: ID de Pedido
+  report_header_order_id: ID de pedido
   report_header_item_name: Nombre del artículo
   report_header_temp_controlled_items: ¿Artículos de temperatura controlada?
   report_header_customer_name: Nombre del cliente
@@ -3222,7 +3223,9 @@ es_CR:
         autocomplete:
           producer_name: "Productor"
           unit: "Unidad"
-      general_settings:
+      shared:
+        sortable_header:
+          name: "Nombre"
         edit:
           legal_settings: "Configuraciones legales"
           cookies_consent_banner_toggle: "Mostrar el banner de consentimiento de cookies"
diff --git a/config/locales/fil_PH.yml b/config/locales/fil_PH.yml
index 0b3c2d1ce3..58985e59a1 100644
--- a/config/locales/fil_PH.yml
+++ b/config/locales/fil_PH.yml
@@ -63,7 +63,7 @@ fil_PH:
           attributes:
             subscription_line_items:
               at_least_one_product: "^Magdagdag ng kahit isang produkto"
-              not_available: "^%{name} ay hindi magagamit mula sa napiling iskedyul"
+              not_available: "^%{name} ay hindi available sa napiling iskedyul"
             ends_at:
               after_begins_at: "ay dapat pagkatapos ng nagsisimula sa"
             customer:
@@ -92,20 +92,20 @@ fil_PH:
     user_registrations:
       spree_user:
         signed_up_but_unconfirmed: "ang mensahe na may nakalakip na confirmation link ay napadala na sa inyong email address. Maaari lamang na buksan ang link para ma-activate ang inyong account."
-        unknown_error: "may maling nangyari habang ginagawa ang inyong account. I-check ang email address at subukang muli."
+        unknown_error: "may problemang kinaharap habang ginagawa ang inyong account. I-check ang inyong email address at subukang muli."
     failure:
       invalid: |
           hindi valid ang email o password.
-          isa ka bang Guest dati? marahil ay kailangang gumawa ng account o i-reset ang inyong password.
+          ikaw ba ay Guest noong bumisita dati? marahil ay kailangang gumawa ng sariling account o i-reset ang inyong password.
       unconfirmed: "Kailangang kumpirmahin ang inyong account bago magpatuloy."
       already_registered: "Ang email address na ito ay nakarehistro na. Maglog-in upang makapagpatuloy o bumalik at gumamit ng ibang email address."
     success:
       logged_in_succesfully: "Matagumpay na nakapaglog-in."
     user_passwords:
       spree_user:
-        updated_not_active: "ang inyong password ay na-reset na ngunit ang inyong email ay hindi pa nakumpirma."
+        updated_not_active: "ang inyong password ay na-reset na, ngunit ang inyong email ay hindi pa nakumpirma."
         updated: "Ang password ay matagumpay na napalitan. Ikaw ay nakasign-in na."
-        send_instructions: "Kayo ay makakatanggap ng email na may panuto kung paano kumpirmahin ang inyong account sa loob ng ilang minuto."
+        send_instructions: "Ikaw ay makakatanggap ng email na may panuto kung paano kumpirmahin ang inyong account, sa loob ng ilang minuto."
   models:
     order_cycle:
       cloned_order_cycle_name: "KOPYA NG%{order_cycle}"
@@ -118,14 +118,14 @@ fil_PH:
       invalid_element_error: "ay dapat naglalaman lamang ng valid na integers"
   enterprise_mailer:
     confirmation_instructions:
-      subject: "Pakikumpirma ang email address para sa %{enterprise}"
+      subject: "Kumpirmahin ang email address para sa %{enterprise}"
     welcome:
       subject: "%{enterprise}ay nasa %{sitename}na ngayon"
-      email_welcome: "Maligayang pagdating"
+      email_welcome: "Maligayang Pagdating"
       email_registered: "ay miyembro na ng"
       email_userguide_html: "Narito ang Gabay sa Paggamit na may detalyadong suporta para sa pagset-up ng iyong Producer o Hub: %{link}"
       userguide: "Gabay sa Paggamit ng Open Food Network"
-      email_admin_html: "maaaring pamahalaan ang iyong account sa pamamagitan ng paglog-in sa%{link}o sa pagpindot sa cog sa pinakataas na kanang bahagi ng homepage at pagpili sa Administration."
+      email_admin_html: "maaaring pamahalaan ang iyong account sa pamamagitan ng paglog-in sa%{link}o sa pagpindot sa cog sa pinakataas na kanang bahagi ng homepage, at piliin ang Administration."
       admin_panel: "Admin Panel"
       email_community_html: "Kami ay mayroon ding online forum para sa talakayang pangkomunidad na may kinalaman sa OFN software at sa mga natatanging hamon sa pagpapatakbo ng enterprise ng pagkain. Kayo ay hinihikayat namin na sumali rito. Kami ay patuloy na nagbabago para makapagbigay ng mas mabuting serbisyo, at ang inyong suhestiyon sa forum ay makakatulong para mga susunod na pagbabago.%{link}"
       join_community: "Sumali sa Komunidad"
@@ -177,17 +177,17 @@ fil_PH:
         explainer: ang awtomatikong pagproseso ng bayad para sa mga order na ito ay hindi nagtagumpay dahil sa isang error. ang error ay nailista upang mabusisi kung saan posibleng nagsimula.
       other:
         title: Iba Pang Dahilan ng Error (%{count}na order)
-        explainer: Hindi naging matagumpay ang awtomatikong pagproseso ng mga order na ito dahil sa hindi maipaliwanag na kadahilanan. Makipag-uganayan sa amin kung nakita ang mensaheng ito.
+        explainer: Hindi naging matagumpay ang awtomatikong pagproseso ng mga order na ito dahil sa hindi maipaliwanag na kadahilanan. Makipag-uganayan sa amin kung nakikita ang mensaheng ito.
   home: "OFN"
   title: Open Food Network
   welcome_to: 'Maligayang Pagdating sa'
   site_meta_description: "Kami ay nagsimula sa pinakaibaba pataas. Kasama ang mga magsasaka at tagatanim na handang ibahagi at ipagmalaki ang kanilang mga kuwento. May mga tapat at patas na Distributors na handang makipag-usap sa mga gumagawa ng produkto. At mga mamimili na naniniwala na ang mabusising lingguhang pamimili ay..."
   search_by_name: Hanapin gamit ang pangalan o lungsod...
   producers_join: Ang mga Pilipinong producers ay inaanyayahang naming sumali sa Open Food Network.
-  charges_sales_tax: Charges GST?
+  charges_sales_tax: naniningil ng GST?
   print_invoice: "i-print ang invoice"
   print_ticket: "i-print ang ticket"
-  select_ticket_printer: "pumili ng printer para sa tickets"
+  select_ticket_printer: "pumili ng printer para sa mga ticket"
   send_invoice: "ipadala ang invoice"
   resend_confirmation: "ipadala muli ang kumpirmasyon"
   view_order: "tignan ang order"
@@ -196,17 +196,17 @@ fil_PH:
   cancel_order: "i-cancel ang order"
   confirm_send_invoice: "ang invoice para sa order na ito ay ipapadala sa customer. nais mo bang magpatuloy?"
   confirm_resend_order_confirmation: "nais mo bang ipadala muli ang order confirmation email?"
-  must_have_valid_business_number: "%{enterprise_name}ay dapat may valid na ABN bago makapagpadala ng mga invoice"
+  must_have_valid_business_number: "%{enterprise_name}ay dapat may valid na TIN bago makapagpadala ng mga invoice"
   invoice: "invoice"
   more: "Karagdagang Impormasyon"
   say_no: "Hindi"
   say_yes: "Oo"
   ongoing: Nagaganap
   bill_address: Billing Address
-  ship_address: Address kung saan ipapadala
+  ship_address: Shipping Address
   sort_order_cycles_on_shopfront_by: "Uriin ang mga order cycle sa shopfront gamit ang"
-  required_fields: ang mga kailangang may sagot ay may nakalagay na asterisk
-  select_continue: pumili at magpatuloy
+  required_fields: ang mga kailangang sagutan ay may nakalagay na asterisk
+  select_continue: Pumili at Magpatuloy
   remove: Tanggalin
   or: o
   collapse_all: Itago lahat
@@ -217,14 +217,14 @@ fil_PH:
   show_all_with_more: "Ipakita lahat (%{num}pa)"
   cancel: i-cancel
   edit: i-edit
-  clone: Clone
+  clone: Gayahin
   distributors: Mga Distributor
   bulk_order_management: Pamamahala sa pangmaramihang order
   enterprises: Mga Enterprise
   enterprise_groups: Mga grupo
-  reports: mga ulat
+  reports: Mga Ulat
   variant_overrides: Imbentaryo
-  import: i-import
+  import: ilipat
   spree_products: mga produktong Spree
   all: Lahat
   current: kasalukuyan
@@ -256,14 +256,14 @@ fil_PH:
   invalid_payment_state: "hindi valid na status ng pagbabayad"
   filter_results: I-filter ang mga resulta
   quantity: Dami
-  pick_up: kunin
+  pick_up: Pick up
   copy: Kopyahin
   change_my_password: "Palitan ang aking password"
   update_password: "i-update ang password"
   password_confirmation: Kumpirmasyon ng password
   reset_password_token: i-reset ang password token
   expired: ay expired na, magrequest ng bago
-  back_to_payments_list: "ibalik sa listahan ng mga bayad"
+  back_to_payments_list: "bumalik sa listahan ng mga bayad"
   maestro_or_solo_cards: "Maestro/Solo cards"
   backordered: "na-backorder"
   on hand: "on hand"
@@ -309,7 +309,7 @@ fil_PH:
     volume: dami
     items: mga item
     select_all: piliin ang lahat
-    quick_search: mabilis na paghahanap
+    quick_search: madaliang paghahanap
     clear_all: alisin lahat
     start_date: "Petsa na nagsimula"
     end_date: "Petsa na natapos"
@@ -323,6 +323,7 @@ fil_PH:
     show_n_more: Ipakita%{num}pa
     choose: "pumili..."
     please_select: pumili
+    column_save_as_default: i-save bilang default
     columns: hanay
     actions: mga  kilos
     viewing: "Tinitignan: %{current_view_name}"
@@ -342,7 +343,7 @@ fil_PH:
       enable_localized_number: "gamitin ang international thousand/decimal separator logic"
     invoice_settings:
       edit:
-        title: "settings para sa invoice"
+        title: "settings ng invoice"
         enable_invoices?: "paganahin ang mga invoice?"
         invoice_style2?: "gamitin ang alternatibong modelo ng invoice na kinabibilangan ng kabuuang breakdown ng tax bawat rate at impormasyon ng rate ng tax kada item (hindi pa akma para sa mga bansang nagpapakita na presyo na hindi kasama ang tax)"
         enable_receipt_printing?: "ipakita ang mga pagpipilian sa pag-print ng mga resibo gamit ang thermal printers sa dropdown ng order."
@@ -375,14 +376,14 @@ fil_PH:
         code: Code
         duplicate_code: "ang code na ito ay nagamit na"
         bill_address: "Billing Address"
-        ship_address: "Address kung saan ipapadala"
+        ship_address: "Shipping Address"
         update_address_success: 'matagumpay na na-update ang address'
         update_address_error: 'pakisagutan lahat ng kailangang impormasyon'
         edit_bill_address: 'i-edit ang Billing Address'
-        edit_ship_address: 'i-edit ang address kung saan ipapadala'
+        edit_ship_address: 'i-edit ang shipping address'
         required_fileds: 'ang mga kailangang may sagot ay may nakalagay na asterisk'
         select_country: 'Piliin ang bansa'
-        select_state: 'pumili ng status'
+        select_state: 'pumili ng Lalawigan'
         edit: 'i-edit'
         update_address: 'i-update ang address'
         confirm_delete: 'siguradong tatanggalin?'
@@ -432,7 +433,7 @@ fil_PH:
         available_on: Magagamit Nakabukas
         av_on: "Av On"
         import_date: na-import
-        upload_an_image: maglagay ng larawan
+        upload_an_image: mag-upload ng larawan
       seo:
         product_search_keywords: "mga keyword sa paghahanap ng produkto"
         product_search_tip: "isulat ang mga salita para mahanap ang inyong produkto sa mga shop. gumamit ng laktaw upang paghiwalayin ang bawat keyword."
@@ -445,12 +446,12 @@ fil_PH:
       variants:
         infinity: "walang hanggan"
         to_order_tip: "ang mga item na made to order ay walang paraan ng pag-set ng lebel ng stock, tulad ng mga tinapay na ginagawa lamang kapag may order."
-      back_to_products_list: "bumalik sa listahan ng produkto"
+      back_to_products_list: "bumalik sa listahan ng mga produkto"
       editing_product: "ine-edit ang mga produkto"
       tabs:
-        product_details: "Detalye ng produkto"
+        product_details: "mga detalye ng produkto"
         group_buy_options: "pagpipilian para sa Grupong pagbili"
-        images: "larawan"
+        images: "mga larawan"
         variants: "mga uri"
         product_properties: "mga katangian ng produkto"
     product_import:
@@ -614,9 +615,9 @@ fil_PH:
           desc_long: tungkol sa amin
           desc_long_placeholder: magkuwento sa Customer tungkol sa inyong sarili. Ang impormasyon na ito ay makikita at lalabas sa inyong profile.
         business_details:
-          abn: ABN
+          abn: 'TIN:'
           abn_placeholder: hal. 99 123 456 789
-          acn: ACN
+          acn: Branch TIN
           acn_placeholder: hal. 123 456 789
           display_invoice_logo: ipakita ang Logo sa mga invoice
           invoice_text: magdagdag ng sariling mensahe sa dulo ng bawat invoice
@@ -1190,8 +1191,8 @@ fil_PH:
   tax_total: "Kabuuang Tax (%{rate}):"
   total_excl_tax: "Kabuuan (Hindi kasama ang tax):"
   total_incl_tax: "Kabuuan (Kasama ang tax):"
-  abn: "ABN:"
-  acn: "ACN:"
+  abn: "TIN:"
+  acn: "Branch TIN:"
   invoice_issued_on: "inilabas ang invoice noong:"
   order_number: "numero ng invoice"
   date_of_transaction: "Petsa ng Transaksiyon:"
@@ -1322,14 +1323,8 @@ fil_PH:
       cookie_stripe_desc: "Mga data na nakolekta ng Stripe, ang tagaproseso para sa bayad, upang magamit sa pag-detect ng fraud https://stripe.com/cookies-policy/legal. hindi lahat ng shop ay gumagamit ng Stripe bilang paraan ng pagbabayad ngunit iminumungkahi namin itong gamitin sa lahat ng pahina upang maiwasan ang fraud at ilegal na pagkuha ng iyong impormasyon."
       statistics_cookies: "katayuan ng cookies"
       statistics_cookies_desc: "ang mga sumusunod ay hindi mahigpit na kinakailangan, ngunit nakakatulong upang mabigyan namin kayo ng mga pinakamagandang serbisyo sa pamamagitan ng pagpayag na suriin namin ang kilos ng mga gumagamit, alamin ang mga features na madalas gamitin o hindi ginagamit, intindihin ang mga problemang kinaharap ng gumagamit, at iba pa."
-      statistics_cookies_analytics_desc_html: "upang kolektahin at suriin ang data sa paggamit ng platform, ginagamit namin ang Google Analytics, bilang ito ang default na serbisyo na ginagamit ng Spree (ang e-commerce open source software kung saan kami nagsimula) ngunit ang aming layunin ay makalipat sa <a href='https://matomo.org/' target='_blank'>Matomo</a>(halimbawa ay Piwik, open source analytics tool na sumusunod sa GDPR at pinangangalagaan ang inyong privacy) sa lalong madaling panahon."
       statistics_cookies_matomo_desc_html: "para makolekta at masuri ang mga data na ginagamit, gumagamit kami ng<a href='https://matomo.org/' target='_blank'>Matomo</a>(halimbawa ay Piwik), isang open source analytics na tool na sumusunod sa GDPR at pinangangalagaan ang inyong privacy."
       statistics_cookies_matomo_optout: "nais mo bang gamitin ang Matomo Analytics? hindi kami kumukolekta ng kahit anong personal na impormasyon, at tinutulungan kami ng Matomo na pag-igihin ang aming serbisyo, ngunit mas pinapahalagahan namin ang inyong desisyon :-)"
-      cookie_analytics_utma_desc: "ginagamit upang pag-ibahin ang mga gumagamit at mga sesyon. Ang cookie ay nabubuo kapag ang javascript library ay naisagawa at walang __utma cookies. ang cookie na ito ay ina-update sa tuwing may ipinapadala na data sa Google Analytics."
-      cookie_analytics_utmt_desc: "ginagamit upang makontrol ang bilis ng pagpasok ng mga request."
-      cookie_analytics_utmb_desc: "ginagamit upang matukoy ang mga bagong sesyon/bisita. ang cookie ay nabubuo kapag ang javascript library ay naisagawa at walang __utma cookies. ang cookie na ito ay ina-update sa tuwing may ipinapadala na data sa Google Analytics."
-      cookie_analytics_utmc_desc: "hindi ginagamit sa ga.js. i-set para sa interoperability sa urchin.js. Kahit sa nakaraan, ang cookie na ito ay ginagamit kasama ang the __utmb cookie para matukoy kung ang gumagamit ay nasa bagong sesyon/bisita."
-      cookie_analytics_utmz_desc: "sine-save ang traffic source o campaign na nagpapaliwanag kung paano napunta ang gumagamit sa inyong site. ang cookie ay nagagawa kapag ang javascript library ay nagamit at na-update sa tuwing may ipinapadalang data sa Google Analytics."
       cookie_matomo_basics_desc: "mga cookies ng Matomo first party para mangolekta ng istatistika."
       cookie_matomo_heatmap_desc: "cookies para sa Matomo Heatmap & Session Recording."
       cookie_matomo_ignore_desc: "Cookie na ginagamit upang hindi maisama ang gumagamit sa pag-track."
@@ -1790,8 +1785,8 @@ fil_PH:
         postcode_field: "Postcode:"
         postcode_field_placeholder: "hal. 3070"
         postcode_field_error: "kailangang ilagay ang postcode"
-        state_field: "Probinsiya:"
-        state_field_error: "Kailangang ang probinsiya"
+        state_field: "Lalawigan:"
+        state_field_error: "Kailangang isaad ang lalawigan"
         country_field: "Bansa:"
         country_field_error: "pumili ng bansa"
       contact:
@@ -1823,9 +1818,9 @@ fil_PH:
         enterprise_long_desc: "mahabang  paglalarawan"
         enterprise_long_desc_placeholder: "ito ang inyong pagkakataon upang ipakilala ang iyong enterprise-kung ano ang kaibahan mo sa iba at paano ka nakahihigit? iminumungkahi namin na gumamit ng 600 na letra o mas mababa pa o 150 salita sa pagbibigay ng paglalarawan."
         enterprise_long_desc_length: "%{num}na mga letra/ hanggang 600 ang iminumungkahi"
-        enterprise_abn: "ABN"
+        enterprise_abn: "TIN"
         enterprise_abn_placeholder: "hal. 99 123 456 789"
-        enterprise_acn: "ACN"
+        enterprise_acn: "Branch TIN"
         enterprise_acn_placeholder: "hal. 123 456 789"
         enterprise_tax_required: "kailangang gumawa ng pagpipilian."
       images:
@@ -1921,6 +1916,7 @@ fil_PH:
   admin_enterprise_relationships_permits: "mga permit"
   admin_enterprise_relationships_seach_placeholder: "hanapin"
   admin_enterprise_relationships_button_create: "gumawa"
+  admin_enterprise_relationships_to: "sa"
   admin_enterprise_groups: "mga grupo ng enterprise"
   admin_enterprise_groups_name: "pangalan"
   admin_enterprise_groups_owner: "may-ari"
@@ -1936,7 +1932,7 @@ fil_PH:
   admin_enterprise_groups_contact_city_placeholder: "hal. Northcote"
   admin_enterprise_groups_contact_zipcode: "Postcode"
   admin_enterprise_groups_contact_zipcode_placeholder: "hal. 3070"
-  admin_enterprise_groups_contact_state_id: "Probinsiya"
+  admin_enterprise_groups_contact_state_id: "Lalawigan"
   admin_enterprise_groups_contact_country_id: "Bansa"
   admin_enterprise_groups_web: "mga pinagkukuhanan ng Web"
   admin_enterprise_groups_web_twitter: "hal. @the_prof"
@@ -2006,7 +2002,7 @@ fil_PH:
   spree_admin_enterprises_create_new_product: "GUMAWA NG BAGONG PRODUKTO"
   spree_admin_single_enterprise_alert_mail_confirmation: "kumpirmahin ang email address para sa/kay"
   spree_admin_single_enterprise_alert_mail_sent: "naipadala na ang email sa"
-  spree_admin_overview_action_required: "kinakailangan ng aksyon"
+  spree_admin_overview_action_required: "kailangan ng aksyon"
   spree_admin_overview_check_your_inbox: "tignan ang iyong inbox para sa karagdagang panuto. maraming salamat!"
   spree_admin_unit_value: halaga kada yunit
   spree_admin_unit_description: paglalarawan sa bawat yunit
@@ -2695,6 +2691,14 @@ fil_PH:
       start_free_profile: "Magsimula sa libreng profile at palawakin kapag handa ka na!"
   order_management:
     reports:
+      enterprise_fee_summaries:
+        filters:
+          date_range: "saklaw na petsa"
+          report_format_csv: "i-download bilang CSV"
+          generate_report: "Bumuo ng ulat"
+        report:
+          none: "wala"
+          select_and_search: "pumili ng mga filter at pindutin ang GUMAWA NG REPORT para ma-access ang inyong data."
       enterprise_fee_summary:
         date_end_before_start_error: "ay dapat pagkatapos magsimula"
         parameter_not_allowed_error: "ikaw ay hindi awtorisadong gumamit ng isa o higit pa na mga filter para sa ulat na ito."
@@ -2868,16 +2872,16 @@ fil_PH:
     default_tax: "default na tax"
     default_tax_zone: "default na sona ng tax"
     country_based: "Country Based"
-    state_based: "Nakabase sa probinsiya"
+    state_based: "Nakabase sa Lalawigan"
     countries: "Mga Bansa"
     listing_countries: "Listahan ng mga Bansa"
     iso_name: "pangalan ng ISO"
-    states_required: "Kailangang may mga probinsiya"
+    states_required: "Kailangang nakasaad ang mga Lalawigan"
     editing_country: "pag-edit ng bansa"
     back_to_countries_list: "bumalik sa listahan ng mga bansa"
-    states: "Mga probinsiya"
+    states: "Mga Lalawigan"
     abbreviation: "Pinaikli"
-    new_state: "Bagong Probinsiya"
+    new_state: "Bagong Status"
     payment_methods: "Mga Paraan ng Pagbabayad"
     new_payment_method: "Bagong Paraan ng pagbabayad"
     provider: "tagapagbigay ng serbisyo"
@@ -2888,12 +2892,6 @@ fil_PH:
     shipping_categories: "mga kategorya ng pagpapadala"
     new_shipping_category: "bagong kategorya ng pagpapadala"
     back_to_shipping_categories: "bumalik sa kategorya ng pagpapadala"
-    analytics_trackers: "mga tracker ng analytic"
-    no_trackers_found: "walang natagpuang tracker"
-    new_tracker: "bagong tracker"
-    add_one: "Magdagdag ng isa"
-    google_analytics_id: "Analytics ID"
-    back_to_trackers_list: "bumalik sa listahan ng tracker"
     name: "pangalan"
     description: "paglalarawan"
     type: "uri"
@@ -3175,14 +3173,6 @@ fil_PH:
           bulk_coop_allocation: 'bultuhang Co-Op - Alokasyon'
           bulk_coop_packing_sheets: 'bultuhang Co-Op - piraso ng pagbabalot'
           bulk_coop_customer_payments: 'bultuhang Co-Op - mga bayad ng customer'
-        enterprise_fee_summaries:
-          filters:
-            date_range: "saklaw na petsa"
-            report_format_csv: "i-download bilang CSV"
-            generate_report: "Bumuo ng ulat"
-          report:
-            none: "wala"
-            select_and_search: "pumili ng mga filter at pindutin ang GUMAWA NG REPORT para ma-access ang inyong data."
       users:
         index:
           listing_users: "Nililista ang mga User"
@@ -3227,14 +3217,15 @@ fil_PH:
         autocomplete:
           producer_name: "Producer"
           unit: "yunit"
-      general_settings:
+      shared:
+        sortable_header:
+          name: "Pangalan"
         edit:
           legal_settings: "Legal Settings"
           cookies_consent_banner_toggle: "ipakita ang banner ng pagpayag sa cookies"
           privacy_policy_url: "Patakaran sa privacy URL"
           enterprises_require_tos: "ang mga enterprise ay dapat tanggapin ang Termino ng serbisyo."
           cookies_policy_matomo_section: "ipakita ang seksyon ng Matomo sa pahina ng patakaran sa cookies"
-          cookies_policy_ga_section: "ipakita ang seksyon ng Google Analytics sa pahina ng patakaran sa cookies"
           footer_tos_url: "URL ng Termino ng Serbisyo"
     checkout:
       payment:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 528c35b883..d8e71f3328 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -323,6 +323,7 @@ fr:
     show_n_more: Montrer + %{num}
     choose: "Choisir..."
     please_select: Veuillez choisir...
+    column_save_as_default: Par défaut
     columns: Colonnes
     actions: Actions
     viewing: "Vous regardez: %{current_view_name}"
@@ -1322,14 +1323,8 @@ fr:
       cookie_stripe_desc: "Utilisé par le terminal de payement en ligne Stripe (proposé aux utilisateurs d'Open Food France) https://stripe.com/fr/cookies-policy/legal. Même si toutes les boutiques n'utilisent pas Stripe, c'est une bonne pratique en matière de sécurité d'appliquer ce cookie sur toutes les pages vues. Stripe construit probablement une image des pages qui ont un quelconque lien avec l'API connectant Open Food France à leur système de paiement pour détecter les comportements anormaux pouvant suggérer un risque de fraude. Donc ce cookie a un rôle qui va au-delà de la simple fourniture d'un système de paiement. Le supprimer pourrait affecter la sécurité du service. Pour en savoir plus sur la politique de confidentialité de Stripe: https://stripe.com/fr/privacy."
       statistics_cookies: "Cookies d'analyse de navigation"
       statistics_cookies_desc: "Ces cookies ne sont pas obligatoires, mais nous permettent de mieux comprendre votre usage de la plateforme, les endroits où vous bloquez, les fonctionnalités qui semblent vous manquer, ou que vous n'utilisez jamais, afin de fournir le service le plus adapté possible aux besoins des utilisateurs."
-      statistics_cookies_analytics_desc_html: "Pour analyser les données concernant votre usage de la plateforme, nous utilisons Google Analytics, pas vraiment par choix, mais simplement parce que c'était l'outil d'analyse connecté par défaut via Spree, le logiciel e-commerce open source sur lequel nous avons construit. Mais nous espérons pouvoir rapidement migrer vers <a href='https://matomo.org/' target='_blank'>Matomo</a> (anciennement Piwik), outil d'analyse open source compatible RGPD et engagé sur le respect de la vie privée des utilisateurs."
       statistics_cookies_matomo_desc_html: "Pour analyser les données concernant votre usage de la plateforme, nous utilisons <a href='https://matomo.org/' target='_blank'>Matomo</a>(anciennement Piwik), outil d'analyse open source compatible RGPD et engagé sur le respect de la vie privée des utilisateurs."
       statistics_cookies_matomo_optout: "Vous ne voulez pas que vos données soient analysées par Matomo ? Nous ne collectons aucune donnée personnelle, et Matomo nous aide à améliorer le service que nous vous offrons, mais nous respectons votre choix :-)"
-      cookie_analytics_utma_desc: "Utilisé pour distinguer les utilisateurs et les sessions. Ce cookie est installé quand la librairie Javascript s'exécute et qu'aucun cookie __utma n'existe déjà. Le cookie est mis à jour à chaque fois que des données sont envoyées à Google Analytics."
-      cookie_analytics_utmt_desc: "Utilisé pour limiter le taux de requêtes."
-      cookie_analytics_utmb_desc: "Utilisé pour distinguer les nouvelles sessions/visites. Ce cookie est installé quand la librairie Javascript s'exécute et qu'aucun cookie __utmb n'existe déjà. Le cookie est mis à jour à chaque fois que des données sont envoyées à Google Analytics. "
-      cookie_analytics_utmc_desc: "Non utilisé dans ga.js. Utilisé pour l'interopérabilité avec urchin.js. Historiquement, ce cookie fonctionnait en conjonction avec le cookie __utmb pour déterminer si l'utilisateur était dans une nouvelle session/visite ou pas."
-      cookie_analytics_utmz_desc: "Ce cookie stocke les sources de trafic qui expliquent comment l'utilisateur est arrivé sur le site (via une campagne, une recherche sur un moteur de recherche, etc.). Ce cookie est installé quand la librairie Javascript s'exécute et mis à jour à chaque fois que des données sont envoyées à Google Analytics. "
       cookie_matomo_basics_desc: "Cookies déposés par Matomo pour collecter les statistiques de trafic."
       cookie_matomo_heatmap_desc: "Utilisé par Matomo pour enregistrer les sessions et \"cartes thermiques\" (représentations graphiques des données)"
       cookie_matomo_ignore_desc: "Cookie utilisé pour se souvenir qu'un utilisateur a souhaité explicitement que sa navigation ne soit pas analysée par Matomo, et exclure cet utilisateur du suivi du site."
@@ -1588,22 +1583,6 @@ fr:
   groups_signup_contact_text: "Prenez contact et découvrez ce qu'Open Food France peut faire pour vous:"
   groups_signup_detail: "Plus de précisions."
   login_invalid: "Email ou mot de passe erroné"
-  modal_hubs: "Food Hubs"
-  modal_hubs_abstract: Nos food hubs sont les points de contact entre vous et les personnes qui produisent votre nourriture!
-  modal_hubs_content1: Vous pouvez chercher le hub qui vous convient par localisation ou par nom. Certains hubs ont de multiples points de retrait de vos achats, et certains proposent également la livraison à domicile. Chaque food hub est un point de vente et gère de façon indépendante ses opérations et sa logistique - attendez-vous donc à des disparités de fonctionnement entre les hubs.
-  modal_hubs_content2: Vous pouvez uniquement faire vos courses dans un hub à la fois.
-  modal_groups: "Groupes / réseaux territoriaux"
-  modal_groups_content1: Voilà les organisations et les relations inter-hubs qui constituent l'Open Food Network.
-  modal_groups_content2: Certains groupes sont regroupés pas localisation ou région, d'autres sur des smilitudes non géographiques.
-  modal_how: "Comment ça marche"
-  modal_how_shop: Faire vos courses sur Open Food France
-  modal_how_shop_explained: Recherchez un food hub près de chez vous et commencez vos achats! Vous pouvez afficher plus d'infos sur chaque food hub pour voir le type de produits qu'il propose, et cliquer sur le hub pour commencer vos achats. (Vous ne pouvez faire vos courses que dans un food hub à la fois.)
-  modal_how_pickup: Frais de retrait, livraison et transport
-  modal_how_pickup_explained: Certains food hubs livrent à domicile, d'autres vous demandent de venir récupérer vos achats dans un point de retrait. Vous pouvez voir quelle options sont proposées sur la page d'accueil du hub, et sélectionner votre choix au moment de la validation de la commande. La livraison à domicile coûtera souvent plus cher, et les prix diffèrent selon le hub. Chaque food hub est un point de vente et gère de façon indépendante ses opérations et sa logistique - attendez-vous donc à des disparités de fonctionnement entre les hubs.
-  modal_how_more: En savoir plus
-  modal_how_more_explained: "Pour en savoir plus sur Open Food France, comment ça marche, et contribuer, allez voir:"
-  modal_producers: "Producteurs"
-  modal_producers_explained: "Nos producteurs font pousser et fabriquent tous les délicieux produits que vous pouvez acheter sur Open Food France."
   producers_about: A propos
   producers_buy: Acheter
   producers_contact: Contact
@@ -2714,6 +2693,14 @@ fr:
       start_free_profile: "Commencez par créer votre profil entreprise, et changez de formule quand vous êtes prêt !"
   order_management:
     reports:
+      enterprise_fee_summaries:
+        filters:
+          date_range: "Période"
+          report_format_csv: "Télécharger le CSV"
+          generate_report: "Générer le rapport"
+        report:
+          none: "Aucun"
+          select_and_search: "Sélectionnez les filtres et cliquez sur \"générer le rapport\" pour accéder aux données."
       enterprise_fee_summary:
         date_end_before_start_error: "doit être après date début"
         parameter_not_allowed_error: "Vous n'êtes pas authorisé.e à utiliser un ou plusieurs des filtres sélectionnés pour ce rapport."
@@ -2853,14 +2840,6 @@ fr:
     smtp_send_copy_to_this_addresses: "Envoyer une copie de tous les mails sortants à cette adresse. Si plusieurs adresses, les séparer par une virgule."
     intercept_email_address: "Adresse email d'interception"
     intercept_email_instructions: "Modifier l'email destinataire et le remplacer avec cette adresse."
-    smtp: "SMTP"
-    smtp_domain: "Domaine SMTP"
-    smtp_mail_host: "Hôte de messagerie SMTP"
-    smtp_port: "Port SMTP"
-    secure_connection_type: "Type de connexion sécurisée"
-    smtp_authentication_type: "Type d'authentification SMTP"
-    smtp_username: "Nom d'utilisateur SMTP"
-    smtp_password: "Mot de passe SMTP"
     image_settings: "Paramètres des images"
     image_settings_warning: "Vous devrez générer de nouvelles vignettes si vous mettez à jour les styles paperclip. Utilisez rake paperclip:refresh:thumbnails CLASS=Spree::Image pour le faire."
     attachment_default_style: Style des pièces jointes
@@ -2907,12 +2886,6 @@ fr:
     shipping_categories: "Conditions de transport"
     new_shipping_category: "Nouvelle condition de transport"
     back_to_shipping_categories: "Retour aux conditions de transport"
-    analytics_trackers: "Traqueurs analyse navigation"
-    no_trackers_found: "Pas de traqueur trouvé"
-    new_tracker: "Nouveau traqueur"
-    add_one: "En ajouter un"
-    google_analytics_id: "ID analytique"
-    back_to_trackers_list: "Retour à la liste des traqueurs"
     name: "Produit/Variante"
     description: "Description"
     type: "Catégorie"
@@ -3194,14 +3167,6 @@ fr:
           bulk_coop_allocation: 'Achats groupés - Allocation'
           bulk_coop_packing_sheets: 'Achats groupés - Feuilles de préparation des paniers'
           bulk_coop_customer_payments: 'Achats groupés - Paiement des acheteurs'
-        enterprise_fee_summaries:
-          filters:
-            date_range: "Période"
-            report_format_csv: "Télécharger le CSV"
-            generate_report: "Générer le rapport"
-          report:
-            none: "Aucun"
-            select_and_search: "Sélectionnez les filtres et cliquez sur \"générer le rapport\" pour accéder aux données."
       users:
         index:
           listing_users: "Liste des utilisateurs"
@@ -3243,17 +3208,20 @@ fr:
           price: "Prix"
           display_as: "Unité affichée"
           display_name: "Nom affiché"
+          display_as_placeholder: 'ex. 2 kg'
+          display_name_placeholder: 'ex. Tomates'
         autocomplete:
           producer_name: "Producteur"
           unit: "Unité"
-      general_settings:
+      shared:
+        sortable_header:
+          name: "Produit/Variante"
         edit:
           legal_settings: "Configuration légales"
           cookies_consent_banner_toggle: "Afficher la bannière de consentement à l'utilisation des cookies"
           privacy_policy_url: "URL de la politique de confidentialité"
           enterprises_require_tos: "Les entreprises doivent accepter les Conditions Générales d'Utilisation"
           cookies_policy_matomo_section: "Afficher la section Matomo sur la politique de cookies"
-          cookies_policy_ga_section: "Afficher la section Google Analytics sur la politique de cookies"
           footer_tos_url: "Conditions d'utilisation URL"
     checkout:
       payment:
diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index 9371908c59..bbf81c9384 100644
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -31,6 +31,10 @@ nb:
               taken: "Det finnes allerede en konto for denne eposten. Vennligst logg inn eller tilbakestill passordet ditt."
         spree/order:
           no_card: Det er ingen gyldige kredittkort tilgjengelig for å trekke
+        spree/credit_card:
+          attributes:
+            base:
+              card_expired: "har utgått"
         order_cycle:
           attributes:
             orders_close_at:
@@ -319,6 +323,7 @@ nb:
     show_n_more: Vis %{num} flere
     choose: "Velg..."
     please_select: Vennligst velg...
+    column_save_as_default: Lagre som Standard
     columns: Kolonner
     actions: Handlinger
     viewing: "Viser: %{current_view_name}"
@@ -867,6 +872,7 @@ nb:
         distributor: "Distributør"
         products: "Produkter"
         tags: "Merkelapper"
+        delivery_details: "Leveringsdetaljer"
         fees: "Avgifter"
         previous: "Tidligere"
         save: "Lagre"
@@ -1315,14 +1321,8 @@ nb:
       cookie_stripe_desc: "Data samlet inn av betalingsprosessoren vår Stripe for svindeloppdagelse https://stripe.com/cookies-policy/legal. Ikke alle butikker bruker Stripe som betalingsmetode, men det er en god praksis å forhindre at svindel gjelder for alle sider. Stripe bygger sannsynligvis et bilde av hvilke av våre sider som til vanlig samhandler med API-en og deretter flagge alt uvanlig. Så å sette Stripe-cookien har en bredere funksjon enn bare å levere en betalingsmetode til en bruker. Fjerning av det kan påvirke sikkerheten til selve tjenesten. Du kan lære mer om Stripe og lese retningslinjene for personvern på https://stripe.com/privacy."
       statistics_cookies: "Statistikkkapsler"
       statistics_cookies_desc: "Følgende er ikke strengt nødvendige, men hjelper deg med å gi deg den beste brukeropplevelsen ved å tillate oss å analysere brukeradferd, identifisere hvilke funksjoner du bruker mest, eller ikke bruker, forstå brukeropplevelsesproblemer osv."
-      statistics_cookies_analytics_desc_html: "For å samle og analysere plattformbruksdata bruker vi Google Analytics, da det var standardtjenesten som var koblet til Spree (ehandel open source programvare som vi bygde på), men visjonen vår er å bytte til <a href='https://matomo.org/' target='_blank'>Matomo</a> (ex Piwik, open source analyseverktøy som er GDPR-kompatibelt og beskytter ditt privatliv) så snart vi kan."
       statistics_cookies_matomo_desc_html: "For å samle og analysere plattformbruksdata bruker vi <a href='https://matomo.org/' target='_blank'> Matomo </a> (ex Piwik), et åpen kildekodeanalyseverktøy som er kompatibelt med GDPR og beskytter personvernet ditt."
       statistics_cookies_matomo_optout: "Ønsker du å melde deg av Matomo analytics? Vi samler ikke inn personlige data, og Matomo hjelper oss med å forbedre vår tjeneste, men vi respekterer ditt valg :-)"
-      cookie_analytics_utma_desc: "Brukes til å skille mellom brukere og økter. Kapselen er opprettet når javascriptbiblioteket utføres, og ingen eksisterende __utma-informasjonskapsler eksisterer. Cookien oppdateres hver gang data sendes til Google Analytics."
-      cookie_analytics_utmt_desc: "Brukes til pådragsforespørselsrate."
-      cookie_analytics_utmb_desc: "Brukes til å bestemme nye økter/besøk. Kapselen blir opprettet når javascriptbiblioteket kjøres, og ingen eksisterende __utmb-cookies eksisterer. Cookien oppdateres hver gang data sendes til Google Analytics."
-      cookie_analytics_utmc_desc: "Ikke brukt i ga.js. Satt for interoperabilitet med urchin.js. Historisk kjørte denne informasjonskapselen sammen med __utmb-cookien for å avgjøre om brukeren var i en ny økt/besøk."
-      cookie_analytics_utmz_desc: "Lagrer trafikkilden eller kampanjen som forklarer hvordan brukeren nådde nettstedet ditt. Kapselen blir opprettet når javascriptbiblioteket utføres og oppdateres hver gang data sendes til Google Analytics."
       cookie_matomo_basics_desc: "Matomo førstehånds kapsler for å samle statistikk."
       cookie_matomo_heatmap_desc: "Matomo Heatmap & Session opptakskapsel."
       cookie_matomo_ignore_desc: "Kapsel brukes til å utelukke at bruker blir sporet."
@@ -1914,6 +1914,7 @@ nb:
   admin_enterprise_relationships_permits: "tillater"
   admin_enterprise_relationships_seach_placeholder: "Søk"
   admin_enterprise_relationships_button_create: "Opprett"
+  admin_enterprise_relationships_to: "til"
   admin_enterprise_groups: "Bedriftsgrupper"
   admin_enterprise_groups_name: "Navn"
   admin_enterprise_groups_owner: "Eier"
@@ -2677,6 +2678,14 @@ nb:
       start_free_profile: "Start med en gratis profil, og utvid når du er klar!"
   order_management:
     reports:
+      enterprise_fee_summaries:
+        filters:
+          date_range: "Datointervall"
+          report_format_csv: "Last ned som CSV"
+          generate_report: "Generer rapport"
+        report:
+          none: "Ingen"
+          select_and_search: "Velg filtre og klikk på GENERER RAPPORT for å få tilgang til dataene dine."
       enterprise_fee_summary:
         date_end_before_start_error: "må være etter start"
         parameter_not_allowed_error: "Du er ikke autorisert til å bruke ett eller flere utvalgte filtre for denne rapporten."
@@ -2870,12 +2879,6 @@ nb:
     shipping_categories: "Fraktkategorier"
     new_shipping_category: "Ny Fraktkategori"
     back_to_shipping_categories: "Tilbake til Leveringskategorier"
-    analytics_trackers: "Analyseverktøy"
-    no_trackers_found: "Ingen sporingsverktøy funnet"
-    new_tracker: "Nytt Sporingsverktøy"
-    add_one: "Legg til en"
-    google_analytics_id: "Analytics ID"
-    back_to_trackers_list: "Tilbake til Liste over Sporingsverktøy"
     name: "Navn"
     description: "Beskrivelse"
     type: "Type"
@@ -3027,6 +3030,8 @@ nb:
           tax_invoice: "AVGIFTSFAKTURA"
           code: "Kode"
           from: "Fra"
+          to: "Fakturér til"
+          shipping: "Levering"
         form:
           distribution_fields:
             title: "Distribusjon"
@@ -3155,14 +3160,6 @@ nb:
           bulk_coop_allocation: 'Bulk Co-op - Allokering'
           bulk_coop_packing_sheets: 'Bulk Co-op - Pakkseddel'
           bulk_coop_customer_payments: 'Bulk Co-op - Kunde Betalinger'
-        enterprise_fee_summaries:
-          filters:
-            date_range: "Datointervall"
-            report_format_csv: "Last ned som CSV"
-            generate_report: "Generer rapport"
-          report:
-            none: "Ingen"
-            select_and_search: "Velg filtre og klikk på GENERER RAPPORT for å få tilgang til dataene dine."
       users:
         index:
           listing_users: "Lister opp brukere"
@@ -3207,14 +3204,15 @@ nb:
         autocomplete:
           producer_name: "Produsent"
           unit: "Enhet"
-      general_settings:
+      shared:
+        sortable_header:
+          name: "Navn"
         edit:
           legal_settings: "Juridiske innstillinger"
           cookies_consent_banner_toggle: "Vis informasjonskapsler samtykkebanner"
           privacy_policy_url: "Personvernspolicy URL"
           enterprises_require_tos: "Bedrifter må godta Tjenestevilkår"
           cookies_policy_matomo_section: "Vis Matomo-delen på informasjonskapsler-siden"
-          cookies_policy_ga_section: "Vis Google Analytics-delen om informasjonskapsler på policy-siden om informasjonskapsler"
           footer_tos_url: "Vilkår URL"
     checkout:
       payment:
diff --git a/config/locales/pt_BR.yml b/config/locales/pt_BR.yml
index 9966e927c8..819083e58a 100644
--- a/config/locales/pt_BR.yml
+++ b/config/locales/pt_BR.yml
@@ -323,6 +323,7 @@ pt_BR:
     show_n_more: 'Mostrar mais %{num} '
     choose: "Escolher..."
     please_select: Por favor selecione...
+    column_save_as_default: Salvar Como Padrão
     columns: Colunas
     actions: Ações
     viewing: "Visualizando: %{current_view_name}"
@@ -1319,14 +1320,8 @@ pt_BR:
       cookie_stripe_desc: "Dados coletados pelo nosso processador de pagamentos Stripe para detecção de fraude https://stripe.com/cookies-policy/legal. Nem todas as lojas usam o Stripe como método de pagamento, mas é uma boa prática para evitar fraudes aplicá-lo a todas as páginas. O Stripe provavelmente cria uma imagem de quais de nossas páginas geralmente interagem com a API e sinaliza algo incomum. Portanto, definir o cookie Stripe tem uma função mais ampla do que simplesmente fornecer um método de pagamento a um usuário. Removê-lo pode afetar a segurança do próprio serviço. Você pode aprender mais sobre o Stripe e ler sua política de privacidade em https://stripe.com/privacy."
       statistics_cookies: "Estatísticas de cookies"
       statistics_cookies_desc: "O seguinte não é estritamente necessário, mas ajuda a fornecer a melhor experiência do usuário, permitindo-nos analisar o comportamento do usuário, identificar quais recursos você mais usa ou não usar, entender problemas de experiência do usuário etc."
-      statistics_cookies_analytics_desc_html: "Para coletar e analisar dados de uso da plataforma, usamos o Google Analytics, pois era o serviço padrão conectado ao Spree (o software de código aberto de comércio eletrônico em que construímos), mas nossa visão é mudar para o <a href='https://matomo.org/' target='_blank'>Matomo</a> (ex Piwik, análise de código aberto) ferramenta compatível com GDPR e protege sua privacidade) assim que possível."
       statistics_cookies_matomo_desc_html: "Para coletar e analisar dados de uso da plataforma, usamos o <a href='https://matomo.org/' target='_blank'>Matomo</a> (ex Piwik), uma ferramenta de análise de código aberto compatível com o GDPR e que protege sua privacidade."
       statistics_cookies_matomo_optout: "Deseja desativar a análise da Matomo? Não coletamos dados pessoais, e o Matomo nos ajuda a melhorar nosso serviço, mas respeitamos sua escolha :-)"
-      cookie_analytics_utma_desc: "Usado para distinguir usuários e sessões. O cookie é criado quando a biblioteca javascript é executada e não existem cookies __utma existentes. O cookie é atualizado sempre que os dados são enviados para o Google Analytics."
-      cookie_analytics_utmt_desc: "Usado para acelerar a taxa de solicitação."
-      cookie_analytics_utmb_desc: "Usado para determinar novas sessões / visitas. O cookie é criado quando a biblioteca javascript é executada e nenhum cookie __utmb existente existe. O cookie é atualizado sempre que os dados são enviados para o Google Analytics."
-      cookie_analytics_utmc_desc: "Não usado em ga.js. Definido para interoperabilidade com o urchin.js. Historicamente, esse cookie operava em conjunto com o cookie __utmb para determinar se o usuário estava em uma nova sessão / visita."
-      cookie_analytics_utmz_desc: "Armazena a origem ou a campanha de tráfego que explica como o usuário chegou ao seu site. O cookie é criado quando a biblioteca javascript é executada e atualizada sempre que os dados são enviados ao Google Analytics."
       cookie_matomo_basics_desc: "Cookies primários Matomo para coletar estatísticas."
       cookie_matomo_heatmap_desc: "Cookie Matomo Heatmap e gravação de sessão."
       cookie_matomo_ignore_desc: "Cookie usado para excluir o usuário de ser rastreado."
@@ -1918,6 +1913,7 @@ pt_BR:
   admin_enterprise_relationships_permits: "permite"
   admin_enterprise_relationships_seach_placeholder: "Buscar"
   admin_enterprise_relationships_button_create: "Criar"
+  admin_enterprise_relationships_to: "para"
   admin_enterprise_groups: "Grupos de iniciativas"
   admin_enterprise_groups_name: "Nome"
   admin_enterprise_groups_owner: "Dono"
@@ -2687,6 +2683,14 @@ pt_BR:
       start_free_profile: "Comece com um perfil gratuito e expanda quando estiver pronto!"
   order_management:
     reports:
+      enterprise_fee_summaries:
+        filters:
+          date_range: "Período"
+          report_format_csv: "Baixar como CSV"
+          generate_report: "Gerar Relatório"
+        report:
+          none: "Nenhum"
+          select_and_search: "Selecione filtros e clique em GERAR RELATÓRIO para acessar seus dados"
       enterprise_fee_summary:
         date_end_before_start_error: "deve ser após o início"
         parameter_not_allowed_error: "Você não está autorizado a usar um ou mais filtros selecionados para este relatório."
@@ -2880,12 +2884,6 @@ pt_BR:
     shipping_categories: "Categorias de Remessa"
     new_shipping_category: "Nova categoria de frete"
     back_to_shipping_categories: "Voltar para categorias de remessa"
-    analytics_trackers: "Rastreadores de análise"
-    no_trackers_found: "Nenhum rastreador encontrado"
-    new_tracker: "Novo Rastreador"
-    add_one: "Adicione um"
-    google_analytics_id: "ID do Google Analytics"
-    back_to_trackers_list: "Voltar à lista de rastreadores"
     name: "Nome"
     description: "Descrição"
     type: "Tipo"
@@ -3167,14 +3165,6 @@ pt_BR:
           bulk_coop_allocation: 'Atacado Cooperativa - Alocação'
           bulk_coop_packing_sheets: 'Atacado Cooperativa - Folhas de Empacotamento'
           bulk_coop_customer_payments: 'Atacado Cooperativa - Pagamentos de Cliente'
-        enterprise_fee_summaries:
-          filters:
-            date_range: "Período"
-            report_format_csv: "Transferir como CSV"
-            generate_report: "Gerar relatório"
-          report:
-            none: "Nenhum"
-            select_and_search: "Selecione os filtros e clique em GERAR RELATÓRIO para acessar seus dados."
       users:
         index:
           listing_users: "Listando Usuários"
@@ -3219,14 +3209,15 @@ pt_BR:
         autocomplete:
           producer_name: "Produtor"
           unit: "Unidade"
-      general_settings:
+      shared:
+        sortable_header:
+          name: "Nome"
         edit:
-          legal_settings: "Configurações legais"
-          cookies_consent_banner_toggle: "Exibir banner de consentimento de cookies"
+          legal_settings: "Configurações de Legislação"
+          cookies_consent_banner_toggle: "Mostrar banner sobre permissão para cookies"
           privacy_policy_url: " Política de Privacidade URL"
           enterprises_require_tos: "As iniciativas devem aceitar os Termos de Serviço"
           cookies_policy_matomo_section: "Exibir a seção Matomo nos cookies da página de política"
-          cookies_policy_ga_section: "Exibir a seção do Google Analytics na página de política de cookies"
           footer_tos_url: "URL Termos de Serviço"
     checkout:
       payment: