Update all locales with the latest Transifex translations

Transifex

.gitignore

@@ -31,6 +31,7 @@ public/system
 public/stylesheets
 public/images
 public/spree
+public/assets
 config/abr.yml
 config/initializers/feature_toggle.rb
 NERD_tree*

.rubocop_manual_todo.yml

@@ -88,7 +88,6 @@ Layout/LineLength:
   - app/models/spree/tax_rate_decorator.rb
   - app/models/spree/taxon_decorator.rb
   - app/models/spree/user.rb
-  - app/models/spree/variant_decorator.rb
   - app/models/subscription.rb
   - app/models/variant_override.rb
   - app/models/variant_override_set.rb
@@ -156,7 +155,6 @@ Layout/LineLength:
   - spec/controllers/spree/admin/orders/customer_details_controller_spec.rb
   - spec/controllers/spree/admin/orders_controller_spec.rb
   - spec/controllers/spree/admin/payment_methods_controller_spec.rb
-  - spec/controllers/spree/admin/payments_controller_spec.rb
   - spec/controllers/spree/admin/products_controller_spec.rb
   - spec/controllers/spree/admin/reports_controller_spec.rb
   - spec/controllers/spree/admin/variants_controller_spec.rb
@@ -181,7 +179,6 @@ Layout/LineLength:
   - spec/features/admin/image_settings_spec.rb
   - spec/features/admin/multilingual_spec.rb
   - spec/features/admin/order_cycles_spec.rb
-  - spec/features/admin/orders_spec.rb
   - spec/features/admin/overview_spec.rb
   - spec/features/admin/payment_method_spec.rb
   - spec/features/admin/product_import_spec.rb
@@ -377,7 +374,6 @@ Metrics/AbcSize:
   - app/helpers/spree/admin/base_helper.rb
   - app/helpers/spree/admin/zones_helper.rb
   - app/helpers/spree/orders_helper.rb
-  - app/mailers/producer_mailer.rb
   - app/models/calculator/flat_percent_per_item.rb
   - app/models/column_preference.rb
   - app/models/enterprise.rb
@@ -468,7 +464,6 @@ Metrics/BlockLength:
   - spec/factories/shipping_method_factory.rb
   - spec/factories/subscription_factory.rb
   - spec/factories/variant_factory.rb
-  - spec/features/admin/orders_spec.rb
   - spec/features/consumer/shopping/embedded_shopfronts_spec.rb
   - spec/lib/open_food_network/group_buy_report_spec.rb
   - spec/models/tag_rule/discount_order_spec.rb
@@ -574,7 +569,6 @@ Metrics/MethodLength:
   - app/helpers/spree/admin/navigation_helper.rb
   - app/helpers/spree/admin/base_helper.rb
   - app/jobs/subscription_placement_job.rb
-  - app/mailers/producer_mailer.rb
   - app/models/column_preference.rb
   - app/models/enterprise.rb
   - app/models/enterprise_relationship.rb
@@ -680,7 +674,6 @@ Metrics/ModuleLength:
   - engines/order_management/spec/services/order_management/subscriptions/estimator_spec.rb
   - engines/order_management/spec/services/order_management/subscriptions/form_spec.rb
   - engines/order_management/spec/services/order_management/subscriptions/proxy_order_syncer_spec.rb
-  - engines/order_management/spec/services/order_management/subscriptions/payment_setup_spec.rb
   - engines/order_management/spec/services/order_management/subscriptions/summarizer_spec.rb
   - engines/order_management/spec/services/order_management/subscriptions/validator_spec.rb
   - engines/order_management/spec/services/order_management/subscriptions/variants_list_spec.rb

.rubocop_todo.yml

@@ -173,7 +173,6 @@ Naming/MethodParameterName:
 Naming/PredicateName:
   Exclude:
     - 'spec/**/*'
-    - 'app/mailers/producer_mailer.rb'
     - 'app/models/enterprise.rb'
     - 'app/models/enterprise_relationship.rb'
     - 'app/models/order_cycle.rb'
@@ -630,7 +629,6 @@ Style/FrozenStringLiteralComment:
     - 'app/jobs/subscription_placement_job.rb'
     - 'app/jobs/welcome_enterprise_job.rb'
     - 'app/mailers/enterprise_mailer.rb'
-    - 'app/mailers/producer_mailer.rb'
     - 'app/mailers/spree/base_mailer_decorator.rb'
     - 'app/mailers/spree/order_mailer_decorator.rb'
     - 'app/mailers/spree/user_mailer.rb'
@@ -855,7 +853,6 @@ Style/FrozenStringLiteralComment:
     - 'app/validators/date_time_string_validator.rb'
     - 'app/validators/distributors_validator.rb'
     - 'app/validators/integer_array_validator.rb'
-    - 'app/views/spree/admin/taxons/search.rabl'
     - 'config.ru'
     - 'engines/order_management/app/controllers/order_management/application_controller.rb'
     - 'engines/order_management/app/services/order_management/reports/enterprise_fee_summary/authorizer.rb'

GETTING_STARTED.md

@@ -118,7 +118,7 @@ $ createdb open_food_network_test --owner=ofn
 If these commands succeed, you should be able to [continue the setup process](#get-it-running).
 
 [developer-wiki]: https://github.com/openfoodfoundation/openfoodnetwork/wiki
-[sierra]: https://github.com/openfoodfoundation/openfoodnetwork/wiki/Development-Environment-Setup%3A-macOS-%28Sierra%2C-HighSierra-and-Mojave%29
+[sierra]: https://github.com/openfoodfoundation/openfoodnetwork/wiki/Development-Environment-Setup%3A-macOS-%28Sierra%2C-HighSierra%2C-Mojave-and-Catalina%29
 [el-capitan]: https://github.com/openfoodfoundation/openfoodnetwork/wiki/Development-Environment-Setup:-OS-X-(El-Capitan)
 [ubuntu]: https://github.com/openfoodfoundation/openfoodnetwork/wiki/Development-Environment-Setup:-Ubuntu
 [wiki]: https://github.com/openfoodfoundation/openfoodnetwork/wiki

Gemfile

@@ -9,8 +9,6 @@ gem 'rails-i18n', '~> 3.0.0'
 gem 'rails_safe_tasks', '~> 1.0'
 
 gem "activerecord-import"
-# Patched version. See http://rubysec.com/advisories/CVE-2015-5312/.
-gem 'nokogiri', '>= 1.6.7.1'
 
 gem "catalog", path: "./engines/catalog"
 gem "order_management", path: "./engines/order_management"
@@ -55,7 +53,6 @@ gem 'aws-sdk'
 gem 'bugsnag'
 gem 'db2fog'
 gem 'haml'
-gem 'rabl'
 gem 'redcarpet'
 gem 'sass', "~> 3.3"
 gem 'sass-rails', '~> 3.2.3'
@@ -70,7 +67,6 @@ gem 'angularjs-file-upload-rails', '~> 2.4.1'
 gem 'blockenspiel'
 gem 'custom_error_message', github: 'jeremydurham/custom-err-msg'
 gem 'dalli'
-gem 'deface', '1.0.2'
 gem 'diffy'
 gem 'figaro'
 gem 'geocoder'
@@ -98,7 +94,7 @@ gem 'test-unit', '~> 3.3'
 gem 'coffee-rails', '~> 3.2.1'
 gem 'compass-rails'
 
-gem 'mini_racer', '0.2.9'
+gem 'mini_racer', '0.2.10'
 
 gem 'uglifier', '>= 1.0.3'
 
@@ -125,7 +121,7 @@ group :test, :development do
   # Pretty printed test output
   gem 'atomic'
   gem 'awesome_print'
-  gem 'capybara', '>= 2.18.0' # 3.0 requires nokogiri 1.8
+  gem 'capybara', '>= 2.18.0' # 3.0 requires rack 1.6 that only works with Rails 4.2
   gem 'database_cleaner', '0.7.1', require: false
   gem "factory_bot_rails", require: false
   gem 'fuubar', '~> 2.5.0'

Gemfile.lock

@@ -23,7 +23,7 @@ GIT
 
 GIT
   remote: https://github.com/openfoodfoundation/spree.git
-  revision: 8a8585a43cd04d1a50dc65227f337a91b18d66d5
+  revision: e10ca1f689b1658040b081939b7523f6fb68895a
   branch: 2-0-4-stable
   specs:
     spree_core (2.0.4)
@@ -32,14 +32,13 @@ GIT
       awesome_nested_set (= 2.1.5)
       aws-sdk (~> 1.11.1)
       cancan (~> 1.6.10)
-      deface (>= 0.9.1)
       ffaker (~> 1.16)
       highline (= 1.6.18)
       httparty (~> 0.11)
       json (>= 1.7.7)
       kaminari (~> 0.14.1)
       money (= 5.1.1)
-      paperclip (~> 3.0)
+      paperclip (~> 3.4.1)
       paranoia (~> 1.3)
       rails (~> 3.2.14)
       ransack (= 0.7.2)
@@ -167,7 +166,6 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.10.0)
-    colorize (0.8.1)
     combine_pdf (1.0.16)
       ruby-rc4 (>= 0.1.5)
     compass (1.0.3)
@@ -198,14 +196,9 @@ GEM
       activerecord (>= 3.2.0, < 5.0)
       fog (~> 1.0)
       rails (>= 3.2.0, < 5.0)
-    ddtrace (0.34.1)
+    ddtrace (0.34.2)
       msgpack
     debugger-linecache (1.2.0)
-    deface (1.0.2)
-      colorize (>= 0.5.8)
-      nokogiri (~> 1.6.0)
-      polyglot
-      rails (>= 3.1)
     delayed_job (4.1.8)
       activesupport (>= 3.0, < 6.1)
     delayed_job_active_record (4.1.4)
@@ -238,7 +231,7 @@ GEM
       railties (>= 3.0.0)
     faraday (1.0.0)
       multipart-post (>= 1.2, < 3)
-    ffaker (1.22.1)
+    ffaker (1.32.1)
     ffi (1.12.2)
     figaro (1.1.1)
       thor (~> 0.14)
@@ -449,9 +442,9 @@ GEM
     method_source (0.9.2)
     mime-types (1.25.1)
     mini_mime (1.0.1)
-    mini_portile2 (2.1.0)
-    mini_racer (0.2.9)
-      libv8 (>= 6.9.411)
+    mini_portile2 (2.4.0)
+    mini_racer (0.2.10)
+      libv8 (> 7.3)
     momentjs-rails (2.20.1)
       railties (>= 3.1)
     money (5.1.1)
@@ -461,8 +454,8 @@ GEM
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     newrelic_rpm (3.18.1.330)
-    nokogiri (1.6.8.1)
-      mini_portile2 (~> 2.1.0)
+    nokogiri (1.10.9)
+      mini_portile2 (~> 2.4.0)
     oauth2 (1.4.4)
       faraday (>= 0.8, < 2.0)
       jwt (>= 1.0, < 3.0)
@@ -483,7 +476,7 @@ GEM
     parallel (1.19.1)
     paranoia (1.3.4)
       activerecord (~> 3.1)
-    parser (2.7.0.5)
+    parser (2.7.1.0)
       ast (~> 2.4.0)
     paypal-sdk-core (0.2.10)
       multi_json (~> 1.0)
@@ -502,8 +495,6 @@ GEM
       byebug (>= 9.0, < 9.1)
       pry (~> 0.10)
     public_suffix (4.0.3)
-    rabl (0.8.4)
-      activesupport (>= 2.3.14)
     rack (1.4.7)
     rack-cache (1.11.0)
       rack (>= 0.4)
@@ -596,7 +587,7 @@ GEM
       rexml
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-rails (2.5.1)
+    rubocop-rails (2.5.2)
       activesupport
       rack (>= 1.1)
       rubocop (>= 0.72.0)
@@ -715,7 +706,6 @@ DEPENDENCIES
   db2fog
   ddtrace
   debugger-linecache
-  deface (= 1.0.2)
   delayed_job_active_record
   delayed_job_web
   devise (~> 2.2.5)
@@ -742,10 +732,9 @@ DEPENDENCIES
   kaminari (~> 0.14.1)
   knapsack
   letter_opener (>= 1.4.1)
-  mini_racer (= 0.2.9)
+  mini_racer (= 0.2.10)
   momentjs-rails
   newrelic_rpm (~> 3.0)
-  nokogiri (>= 1.6.7.1)
   oauth2 (~> 1.4.4)
   ofn-qz!
   oj
@@ -754,7 +743,6 @@ DEPENDENCIES
   paperclip (~> 3.4.1)
   pg (~> 0.21.0)
   pry-byebug (>= 3.4.3)
-  rabl
   rack-mini-profiler (< 3.0.0)
   rack-rewrite
   rack-ssl

app/assets/javascripts/admin/orders/controllers/orders_controller.js.coffee

@@ -67,7 +67,7 @@ angular.module("admin.orders").controller "ordersCtrl", ($scope, $timeout, Reque
     return unless sort && sort.predicate != ""
 
     $scope.sorting = sort.getSortingExpr()
-    $scope.fetchProducts()
+    $scope.fetchResults()
   , true
 
   $scope.capturePayment = (order) ->

app/assets/javascripts/darkswarm/directives/shop_variant.js.coffee

@@ -5,5 +5,9 @@ Darkswarm.directive "shopVariant", ->
   scope:
     variant: '='
   controller: ($scope, Cart) ->
-    $scope.$watchGroup ['variant.line_item.quantity', 'variant.line_item.max_quantity'], ->
+    $scope.$watchGroup [
+      'variant.line_item.quantity',
+      'variant.line_item.max_quantity'
+    ], (new_value, old_value) ->
+      return if old_value[0] == null && new_value[0] == null
       Cart.adjust($scope.variant.line_item)

app/assets/javascripts/darkswarm/services/checkout.js.coffee

@@ -14,15 +14,28 @@ Darkswarm.factory 'Checkout', ($injector, CurrentOrder, ShippingMethods, StripeE
 
     submit: =>
       Loading.message = t 'submitting_order'
-      $http.put('/checkout.json', {order: @preprocess()}).success (data, status)=>
-        Navigation.go data.path
-      .error (response, status)=>
-        if response.path
-          Navigation.go response.path
-        else
-          Loading.clear()
-          @errors = response.errors
-          RailsFlashLoader.loadFlash(response.flash)
+      $http.put('/checkout.json', {order: @preprocess()})
+      .then (response) =>
+        Navigation.go response.data.path
+      .catch (response) =>
+        try
+          @handle_checkout_error_response(response)
+        catch error
+          @loadFlash(error: t("checkout.failed")) # inform the user about the unexpected error
+          throw error # generate a BugsnagJS alert
+
+    handle_checkout_error_response: (response) =>
+      if response.data.path
+        Navigation.go response.data.path
+      else
+        throw response unless response.data.flash
+
+        @errors = response.data.errors
+        @loadFlash(response.data.flash)
+
+    loadFlash: (flash) =>
+      Loading.clear()
+      RailsFlashLoader.loadFlash(flash)
 
     # Rails wants our Spree::Address data to be provided with _attributes
     preprocess: ->

app/assets/javascripts/darkswarm/services/order_cycle.js.coffee

@@ -1,6 +1,6 @@
 Darkswarm.factory 'OrderCycle', ($resource, orderCycleData) ->
   class OrderCycle
-    @order_cycle = orderCycleData # Object or {} due to RABL 
+    @order_cycle = orderCycleData # Object or {}
     @push_order_cycle: (callback) ->
       new $resource("/shop/order_cycle").save {order_cycle_id: @order_cycle.order_cycle_id}, (order_data)->
         OrderCycle.order_cycle.orders_close_at = order_data.orders_close_at

app/assets/javascripts/templates/admin/columns_dropdown.html.haml

@@ -8,4 +8,4 @@
     %hr
     %div.menu_item.text-center
       %input.fullwidth.orange{ type: "button", ng: { value: "saved() ? 'Saved': 'Saving'", show: "saved() || saving", disabled: "saved()" } }
-      %input.fullwidth.red{ type: "button", value: 'Save As Default', ng: { show: "!saved() && !saving", click: "saveColumnPreferences(action)"} }
+      %input.fullwidth.red{ type: "button", :value => t('admin.column_save_as_default').html_safe, ng: { show: "!saved() && !saving", click: "saveColumnPreferences(action)"} }

app/assets/stylesheets/darkswarm/_shop-inputs.css.scss

@@ -9,6 +9,9 @@
 
   input#search {
     @include medium-input(rgba(0, 0, 0, 0.3), #777, $clr-brick);
+
+    // avoid zoom on iphone, see issue #4535
+    font-size: 1rem;
   }
 
   // ordering

app/assets/stylesheets/darkswarm/branding.css.scss

@@ -54,6 +54,7 @@ $teal-400: #4cb5c5;
 $teal-500: #0096ad;
 
 $orange-400: #ff9466;
+$orange-450: #f4704c;
 $orange-500: #f27052;
 $orange-600: #d7583a;
 

app/assets/stylesheets/darkswarm/shopping-cart.css.scss

@@ -115,3 +115,14 @@
     height: 36px;
   }
 }
+
+.links {
+  .button {
+    padding: 1.125rem 0 1.1875rem;
+    width: 210px;
+
+    @media all and (max-width: 480px) {
+      width: 100%;
+    }
+  }
+}

app/assets/stylesheets/darkswarm/ui.css.scss

@@ -64,13 +64,13 @@
 
 .button.primary, button.primary {
   font-family: $body-font;
-  background: $clr-brick;
+  background: $orange-450;
   color: white;
 }
 
 .button.primary:hover, .button.primary:active, .button.primary:focus, button.primary:hover, button.primary:active, button.primary:focus {
-  background: $clr-brick-bright;
-  text-shadow: 0 1px 0 $clr-brick;
+  background: $orange-400;
+  text-shadow: 0 1px 0 $orange-450;
 }
 
 button.success, .button.success {

app/assets/stylesheets/mail/email.css.scss

@@ -138,6 +138,10 @@ a {
   &.ms {
     background-color: #000 !important;
   }
+
+  &.ig {
+    background-color: #fb3958 !important;
+  }
 }
 
 .sidebar .soc-btn {

app/controllers/admin/customers_controller.rb

@@ -17,8 +17,9 @@ module Admin
       respond_to do |format|
         format.html
         format.json do
-          tag_rule_mapping = TagRule.mapping_for(Enterprise.where(id: params[:enterprise_id]))
-          render_as_json @collection, tag_rule_mapping: tag_rule_mapping
+          render_as_json @collection,
+                         tag_rule_mapping: tag_rule_mapping,
+                         customer_tags: customer_tags_by_id
         end
       end
     end
@@ -64,8 +65,13 @@ module Admin
     def collection
       return Customer.where("1=0") unless json_request? && params[:enterprise_id].present?
 
-      enterprise = Enterprise.managed_by(spree_current_user).find_by_id(params[:enterprise_id])
-      Customer.of(enterprise)
+      Customer.of(managed_enterprise_id).
+        includes(:bill_address, :ship_address, user: :credit_cards)
+    end
+
+    def managed_enterprise_id
+      @managed_enterprise_id ||= Enterprise.managed_by(spree_current_user).
+        select('enterprises.id').find_by_id(params[:enterprise_id])
     end
 
     def load_managed_shops
@@ -80,5 +86,28 @@ module Admin
     def ams_prefix_whitelist
       [:subscription]
     end
+
+    def tag_rule_mapping
+      TagRule.mapping_for(Enterprise.where(id: managed_enterprise_id))
+    end
+
+    # Fetches tags for all customers of the enterprise and returns a hash indexed by customer_id
+    def customer_tags_by_id
+      customer_tags = ::ActsAsTaggableOn::Tag.
+        joins(:taggings).
+        includes(:taggings).
+        where(taggings:
+                { taggable_type: 'Customer',
+                  taggable_id: Customer.of(managed_enterprise_id),
+                  context: 'tags' })
+
+      customer_tags.each_with_object({}) do |tag, indexed_hash|
+        tag.taggings.each do |tagging|
+          customer_id = tagging.taggable_id
+          indexed_hash[customer_id] ||= []
+          indexed_hash[customer_id] << tag.name
+        end
+      end
+    end
   end
 end

app/controllers/admin/enterprise_relationships_controller.rb

@@ -1,9 +1,13 @@
 module Admin
   class EnterpriseRelationshipsController < ResourceController
     def index
-      @my_enterprises = Enterprise.managed_by(spree_current_user).by_name
-      @all_enterprises = Enterprise.by_name
-      @enterprise_relationships = EnterpriseRelationship.by_name.involving_enterprises @my_enterprises
+      @my_enterprises = Enterprise.
+        includes(:shipping_methods, :payment_methods).
+        managed_by(spree_current_user).by_name
+      @all_enterprises = Enterprise.includes(:shipping_methods, :payment_methods).by_name
+      @enterprise_relationships = EnterpriseRelationship.
+        includes(:parent, :child).
+        by_name.involving_enterprises @my_enterprises
     end
 
     def create

app/controllers/api/order_cycles_controller.rb

@@ -4,8 +4,11 @@ module Api
     respond_to :json
 
     skip_authorization_check
+    skip_before_filter :authenticate_user, :ensure_api_key, only: [:taxons, :properties]
 
     def products
+      render_no_products unless order_cycle.open?
+
       products = ProductsRenderer.new(
         distributor,
         order_cycle,
@@ -15,7 +18,7 @@ module Api
 
       render json: products
     rescue ProductsRenderer::NoProducts
-      render status: :not_found, json: ''
+      render_no_products
     end
 
     def taxons
@@ -35,6 +38,10 @@ module Api
 
     private
 
+    def render_no_products
+      render status: :not_found, json: ''
+    end
+
     def product_properties
       Spree::Property.
         joins(:products).
@@ -70,11 +77,11 @@ module Api
     end
 
     def distributor
-      Enterprise.find_by_id(params[:distributor])
+      @distributor ||= Enterprise.find_by_id(params[:distributor])
     end
 
     def order_cycle
-      OrderCycle.find_by_id(params[:id])
+      @order_cycle ||= OrderCycle.find_by_id(params[:id])
     end
 
     def customer

app/controllers/base_controller.rb

@@ -14,10 +14,6 @@ class BaseController < ApplicationController
 
   helper 'spree/base'
 
-  # Spree::Core::ControllerHelpers declares helper_method get_taxonomies, so we need to
-  # include Spree::ProductsHelper so that method is available on the controller
-  include Spree::ProductsHelper
-
   before_filter :set_locale
   before_filter :check_order_cycle_expiry
 

app/controllers/checkout_controller.rb

@@ -133,13 +133,6 @@ class CheckoutController < Spree::StoreController
     @order.ship_address = finder.ship_address
   end
 
-  def before_delivery
-    return if params[:order].present?
-
-    packages = @order.shipments.map(&:to_package)
-    @differentiator = Spree::Stock::Differentiator.new(@order, packages)
-  end
-
   def before_payment
     current_order.payments.destroy_all if request.put?
   end
@@ -153,10 +146,12 @@ class CheckoutController < Spree::StoreController
   end
 
   def valid_payment_intent_provided?
-    params["payment_intent"]&.starts_with?("pi_") &&
-      @order.state == "payment" &&
-      @order.payments.last.state == "pending" &&
-      @order.payments.last.response_code == params["payment_intent"]
+    return false unless params["payment_intent"]&.starts_with?("pi_")
+
+    last_payment = OrderPaymentFinder.new(@order).last_payment
+    @order.state == "payment" &&
+      last_payment&.state == "pending" &&
+      last_payment&.response_code == params["payment_intent"]
   end
 
   def handle_redirect_from_stripe

app/controllers/spree/admin/mail_methods_controller.rb

@@ -4,10 +4,6 @@ module Spree
       after_filter :initialize_mail_settings
 
       def update
-        if params[:smtp_password].blank?
-          params.delete(:smtp_password)
-        end
-
         params.each do |name, value|
           next unless Spree::Config.has_preference? name
 

app/controllers/spree/admin/payments_controller.rb

@@ -29,6 +29,8 @@ module Spree
             return
           end
 
+          authorize_stripe_sca_payment
+
           if @order.completed?
             @payment.process!
             flash[:success] = flash_message_for(@payment, :successfully_created)
@@ -93,7 +95,7 @@ module Spree
           available(:back_end).
           select{ |pm| pm.has_distributor? @order.distributor }
 
-        @payment_method = if @payment && @payment.payment_method
+        @payment_method = if @payment&.payment_method
                             @payment.payment_method
                           else
                             @payment_methods.first
@@ -124,6 +126,13 @@ module Spree
       def load_payment
         @payment = Payment.find(params[:id])
       end
+
+      def authorize_stripe_sca_payment
+        return unless @payment.payment_method.class == Spree::Gateway::StripeSCA
+
+        @payment.authorize!
+        raise Spree::Core::GatewayError, I18n.t('authorization_failure') unless @payment.pending?
+      end
     end
   end
 end

app/controllers/spree/admin/reports/enterprise_fee_summaries_controller.rb

@@ -1,66 +0,0 @@
-module Spree
-  module Admin
-    module Reports
-      class EnterpriseFeeSummariesController < BaseController
-        before_filter :load_report_parameters
-        before_filter :load_permissions
-
-        def new; end
-
-        def create
-          return respond_to_invalid_parameters unless @report_parameters.valid?
-
-          @report_parameters.authorize!(@permissions)
-
-          @report = report_klass::ReportService.new(@permissions, @report_parameters)
-          renderer.render(self)
-        rescue ::Reports::Authorizer::ParameterNotAllowedError => e
-          flash[:error] = e.message
-          render_report_form
-        end
-
-        private
-
-        def respond_to_invalid_parameters
-          flash[:error] = I18n.t("invalid_filter_parameters", scope: i18n_scope)
-          render_report_form
-        end
-
-        def i18n_scope
-          "order_management.reports.enterprise_fee_summary"
-        end
-
-        def render_report_form
-          render action: :new
-        end
-
-        def report_klass
-          OrderManagement::Reports::EnterpriseFeeSummary
-        end
-
-        def load_report_parameters
-          @report_parameters = report_klass::Parameters.new(params[:report] || {})
-        end
-
-        def load_permissions
-          @permissions = report_klass::Permissions.new(spree_current_user)
-        end
-
-        def report_renderer_klass
-          case params[:report_format]
-          when "csv"
-            report_klass::Renderers::CsvRenderer
-          when nil, "", "html"
-            report_klass::Renderers::HtmlRenderer
-          else
-            raise Reports::UnsupportedReportFormatException
-          end
-        end
-
-        def renderer
-          @renderer ||= report_renderer_klass.new(@report)
-        end
-      end
-    end
-  end
-end

app/controllers/spree/admin/reports_controller.rb

@@ -298,11 +298,20 @@ module Spree
       end
 
       def url_for_report(report)
-        public_send("#{report}_admin_reports_url".to_sym)
+        if report_in_order_management_engine?(report)
+          main_app.public_send("new_order_management_reports_#{report}_url".to_sym)
+        else
+          public_send("#{report}_admin_reports_url".to_sym)
+        end
       rescue NoMethodError
         url_for([:new, :admin, :reports, report.to_s.singularize])
       end
 
+      # List of reports that have been moved to the Order Management engine
+      def report_in_order_management_engine?(report)
+        report == :enterprise_fee_summary
+      end
+
       def timestamp
         Time.zone.now.strftime("%Y%m%d")
       end

app/controllers/spree/admin/taxons_controller.rb

@@ -3,14 +3,6 @@ module Spree
     class TaxonsController < Spree::Admin::BaseController
       respond_to :html, :json, :js
 
-      def search
-        @taxons = if params[:ids]
-                    Spree::Taxon.where(id: params[:ids].split(','))
-                  else
-                    Spree::Taxon.limit(20).search(name_cont: params[:q]).result
-                  end
-      end
-
       def create
         @taxonomy = Taxonomy.find(params[:taxonomy_id])
         @taxon = @taxonomy.taxons.build(params[:taxon])

app/helpers/injection_helper.rb

@@ -47,7 +47,7 @@ module InjectionHelper
     enterprises_and_relatives = current_distributor.
       relatives_including_self.
       activated.
-      includes(address: [:state, :country]).
+      includes(:properties, address: [:state, :country], supplied_products: :properties).
       all
 
     inject_json_ams "enterprises",

app/helpers/order_helper.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module OrderHelper
+  def last_payment_method(order)
+    OrderPaymentFinder.new(order).last_payment&.payment_method
+  end
+end

app/helpers/spree/products_helper.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Spree
+  module ProductsHelper
+    def product_has_variant_unit_option_type?(product)
+      product.option_types.any? { |option_type| variant_unit_option_type? option_type }
+    end
+
+    def variant_unit_option_type?(option_type)
+      Spree::Product.all_variant_unit_option_types.include? option_type
+    end
+  end
+end

app/helpers/spree/products_helper_decorator.rb

@@ -1,23 +0,0 @@
-module Spree
-  ProductsHelper.class_eval do
-    # Return the price of the variant, overriding sprees price diff capability.
-    # This will allways return the variant price as if the show_variant_full_price is set.
-    def variant_price_diff(variant)
-      "(#{Spree::Money.new(variant.price)})"
-    end
-
-    def product_has_variant_unit_option_type?(product)
-      product.option_types.any? { |option_type| variant_unit_option_type? option_type }
-    end
-
-    def variant_unit_option_type?(option_type)
-      Spree::Product.all_variant_unit_option_types.include? option_type
-    end
-
-    def product_variant_unit_options
-      [[I18n.t(:weight), 'weight'],
-       [I18n.t(:volume), 'volume'],
-       [I18n.t(:items), 'items']]
-    end
-  end
-end

app/jobs/subscription_confirm_job.rb

@@ -57,16 +57,28 @@ class SubscriptionConfirmJob
     return true unless order.payment_required?
 
     setup_payment!(order)
-    return false if order.errors.present?
+    return false if order.errors.any?
+
+    authorize_payment!(order)
+    return false if order.errors.any?
 
     order.process_payments!
-    return false if order.errors.present?
+    return false if order.errors.any?
 
     true
   end
 
   def setup_payment!(order)
     OrderManagement::Subscriptions::PaymentSetup.new(order).call!
+    return if order.errors.any?
+
+    OrderManagement::Subscriptions::StripePaymentSetup.new(order).call!
+  end
+
+  def authorize_payment!(order)
+    return if order.subscription.payment_method.class != Spree::Gateway::StripeSCA
+
+    OrderManagement::Subscriptions::StripeScaPaymentAuthorize.new(order).call!
   end
 
   def send_confirmation_email(order)

app/mailers/producer_mailer.rb

@@ -1,41 +1,58 @@
+# frozen_string_literal: true
+
 class ProducerMailer < Spree::BaseMailer
   include I18nHelper
 
   def order_cycle_report(producer, order_cycle)
     @producer = producer
-    @coordinator = order_cycle.coordinator
     @order_cycle = order_cycle
-    line_items = line_items_from(@order_cycle, @producer)
-    @grouped_line_items = line_items.group_by(&:product_and_full_name)
-    @receival_instructions = @order_cycle.receival_instructions_for @producer
-    @total = total_from_line_items(line_items)
-    @tax_total = tax_total_from_line_items(line_items)
 
-    I18n.with_locale valid_locale(@producer.owner) do
-      order_cycle_subject = I18n.t('producer_mailer.order_cycle.subject', producer: producer.name)
-      subject = "[#{Spree::Config.site_name}] #{order_cycle_subject}"
+    with_unscoped_products_and_variants do
+      load_data
 
-      return unless has_orders?(order_cycle, producer)
+      I18n.with_locale(owner_locale) do
+        return unless orders?(order_cycle, producer)
 
-      mail(
-        to: @producer.contact.email,
-        from: from_address,
-        subject: subject,
-        reply_to: @coordinator.contact.email,
-        cc: @coordinator.contact.email
-      )
+        mail(
+          to: @producer.contact.email,
+          from: from_address,
+          subject: subject,
+          reply_to: @coordinator.contact.email,
+          cc: @coordinator.contact.email
+        )
+      end
     end
   end
 
   private
 
-  def has_orders?(order_cycle, producer)
+  def owner_locale
+    valid_locale(@producer.owner)
+  end
+
+  def load_data
+    @coordinator = @order_cycle.coordinator
+
+    line_items = line_items_from(@order_cycle, @producer)
+
+    @grouped_line_items = line_items.group_by(&:product_and_full_name)
+    @receival_instructions = @order_cycle.receival_instructions_for(@producer)
+    @total = total_from_line_items(line_items)
+    @tax_total = tax_total_from_line_items(line_items)
+  end
+
+  def subject
+    order_cycle_subject = I18n.t('producer_mailer.order_cycle.subject', producer: @producer.name)
+    "[#{Spree::Config.site_name}] #{order_cycle_subject}"
+  end
+
+  def orders?(order_cycle, producer)
     line_items_from(order_cycle, producer).any?
   end
 
   def line_items_from(order_cycle, producer)
-    Spree::LineItem.
-      includes(variant: { option_values: :option_type }).
+    @line_items ||= Spree::LineItem.
+      includes(:option_values, variant: [:product, { option_values: :option_type }]).
       from_order_cycle(order_cycle).
       sorted_by_name_and_unit_value.
       merge(Spree::Product.in_supplier(producer)).
@@ -49,4 +66,22 @@ class ProducerMailer < Spree::BaseMailer
   def tax_total_from_line_items(line_items)
     Spree::Money.new line_items.sum(&:included_tax)
   end
+
+  # This hack makes ActiveRecord skip the default_scope (deleted_at IS NULL)
+  # when eager loading associations. Further details:
+  # https://github.com/rails/rails/issues/11036
+  def with_unscoped_products_and_variants
+    variant_default_scopes = Spree::Variant.default_scopes
+    product_default_scopes = Spree::Product.default_scopes
+
+    Spree::Variant.default_scopes = []
+    Spree::Product.default_scopes = []
+
+    return_value = yield
+
+    Spree::Variant.default_scopes = variant_default_scopes
+    Spree::Product.default_scopes = product_default_scopes
+
+    return_value
+  end
 end

app/mailers/spree/order_mailer_decorator.rb

@@ -2,6 +2,7 @@ Spree::OrderMailer.class_eval do
   helper HtmlHelper
   helper CheckoutHelper
   helper SpreeCurrencyHelper
+  helper OrderHelper
   include I18nHelper
 
   def cancel_email(order_or_order_id, resend = false)

app/mailers/subscription_mailer.rb

@@ -1,6 +1,7 @@
 class SubscriptionMailer < Spree::BaseMailer
   helper CheckoutHelper
   helper ShopMailHelper
+  helper OrderHelper
   include I18nHelper
 
   def confirmation_email(order)

app/models/content_configuration.rb

@@ -57,8 +57,8 @@ class ContentConfiguration < Spree::Preferences::FileConfiguration
   # Other
   preference :footer_facebook_url, :string, default: "https://www.facebook.com/OpenFoodNet"
   preference :footer_twitter_url, :string, default: "https://twitter.com/OpenFoodNet"
-  preference :footer_instagram_url, :string, default: ""
-  preference :footer_linkedin_url, :string, default: "http://www.linkedin.com/groups/Open-Food-Foundation-4743336"
+  preference :footer_instagram_url, :string, default: "https://www.instagram.com/openfoodnetworkuk/"
+  preference :footer_linkedin_url, :string, default: "https://www.linkedin.com/company/openfoodnetwork/"
   preference :footer_googleplus_url, :string, default: ""
   preference :footer_pinterest_url, :string, default: ""
   preference :footer_email, :string, default: "hello@openfoodnetwork.org"

app/models/producer_property.rb

@@ -4,18 +4,6 @@ class ProducerProperty < ActiveRecord::Base
 
   default_scope { order("#{table_name}.position") }
 
-  scope :ever_sold_by, ->(shop) {
-    joins(producer: { supplied_products: { variants: { exchanges: :order_cycle } } }).
-      merge(Exchange.outgoing).
-      merge(Exchange.to_enterprise(shop)).
-      select('DISTINCT producer_properties.*')
-  }
-
-  scope :currently_sold_by, ->(shop) {
-    ever_sold_by(shop).
-      merge(OrderCycle.active)
-  }
-
   def property_name
     property.name if property
   end

app/models/spree/app_configuration_decorator.rb

@@ -14,7 +14,6 @@ Spree::AppConfiguration.class_eval do
   preference :privacy_policy_url, :string, default: nil
   preference :cookies_consent_banner_toggle, :boolean, default: false
   preference :cookies_policy_matomo_section, :boolean, default: false
-  preference :cookies_policy_ga_section, :boolean, default: false
 
   # Tax Preferences
   preference :products_require_tax_category, :boolean, default: false

app/models/spree/calculator/price_sack_decorator.rb

@@ -17,9 +17,9 @@ module Spree
       order_amount = line_items_for(object).map { |x| x.price * x.quantity }.sum
 
       if order_amount < min
-        cost = preferred_normal_amount.to_i
+        cost = preferred_normal_amount.to_f
       elsif order_amount >= min
-        cost = preferred_discount_amount.to_i
+        cost = preferred_discount_amount.to_f
       end
 
       cost

app/models/spree/money_decorator.rb

@@ -1,6 +0,0 @@
-Spree::Money.class_eval do
-  # return the currency symbol (on it's own) for the current default currency
-  def self.currency_symbol
-    Money.new(0, Spree::Config[:currency]).symbol
-  end
-end

app/models/spree/order_decorator.rb

@@ -263,7 +263,11 @@ Spree::Order.class_eval do
   end
 
   def line_item_variants
-    line_items.map(&:variant)
+    if line_items.loaded?
+      line_items.map(&:variant)
+    else
+      line_items.includes(:variant).map(&:variant)
+    end
   end
 
   # Show already bought line items of this order cycle

app/models/spree/property.rb

@@ -2,11 +2,16 @@ module Spree
   class Property < ActiveRecord::Base
     has_many :product_properties, dependent: :destroy
     has_many :products, through: :product_properties
+    has_many :producer_properties
 
     attr_accessible :name, :presentation
 
     validates :name, :presentation, presence: true
 
     scope :sorted, -> { order(:name) }
+
+    def property
+      self
+    end
   end
 end

app/models/spree/property_decorator.rb

@@ -1,27 +0,0 @@
-module Spree
-  Property.class_eval do
-    has_many :producer_properties
-
-    scope :applied_by, ->(enterprise) {
-      select('DISTINCT spree_properties.*').
-        joins(:product_properties).
-        where('spree_product_properties.product_id IN (?)', enterprise.supplied_product_ids)
-    }
-
-    scope :ever_sold_by, ->(shop) {
-      joins(products: { variants: { exchanges: :order_cycle } }).
-        merge(Exchange.outgoing).
-        merge(Exchange.to_enterprise(shop)).
-        select('DISTINCT spree_properties.*')
-    }
-
-    scope :currently_sold_by, ->(shop) {
-      ever_sold_by(shop).
-        merge(OrderCycle.active)
-    }
-
-    def property
-      self
-    end
-  end
-end

app/models/spree/user.rb

@@ -125,7 +125,12 @@ module Spree
     end
 
     def default_card
-      credit_cards.where(is_default: true).first
+      # Don't re-fetch associated cards from the DB if they're already eager-loaded
+      if credit_cards.loaded?
+        credit_cards.to_a.find(&:is_default)
+      else
+        credit_cards.where(is_default: true).first
+      end
     end
 
     # Checks whether the specified user is a superadmin, with full control of the

app/models/spree/variant_decorator.rb

@@ -16,7 +16,8 @@ Spree::Variant.class_eval do
   has_many :variant_overrides
   has_many :inventory_items
 
-  attr_accessible :unit_value, :unit_description, :images_attributes, :display_as, :display_name, :import_date
+  attr_accessible :unit_value, :unit_description, :images_attributes,
+                  :display_as, :display_name, :import_date
   accepts_nested_attributes_for :images
 
   validates :unit_value, presence: true, if: ->(variant) {
@@ -53,13 +54,23 @@ Spree::Variant.class_eval do
   }
 
   scope :visible_for, lambda { |enterprise|
-    joins(:inventory_items).where('inventory_items.enterprise_id = (?) AND inventory_items.visible = (?)', enterprise, true)
+    joins(:inventory_items).
+      where(
+        'inventory_items.enterprise_id = (?) AND inventory_items.visible = (?)',
+        enterprise,
+        true
+      )
   }
 
   scope :not_hidden_for, lambda { |enterprise|
     return where("1=0") if enterprise.blank?
 
-    joins("LEFT OUTER JOIN (SELECT * from inventory_items WHERE enterprise_id = #{sanitize enterprise.andand.id}) AS o_inventory_items ON o_inventory_items.variant_id = spree_variants.id")
+    joins("
+      LEFT OUTER JOIN (SELECT *
+                         FROM inventory_items
+                         WHERE enterprise_id = #{sanitize enterprise.andand.id})
+        AS o_inventory_items
+        ON o_inventory_items.variant_id = spree_variants.id")
       .where("o_inventory_items.id IS NULL OR o_inventory_items.visible = (?)", true)
   }
 
@@ -68,7 +79,8 @@ Spree::Variant.class_eval do
   scope :stockable_by, lambda { |enterprise|
     return where("1=0") if enterprise.blank?
 
-    joins(:product).where(spree_products: { id: Spree::Product.stockable_by(enterprise).pluck(:id) })
+    joins(:product).
+      where(spree_products: { id: Spree::Product.stockable_by(enterprise).pluck(:id) })
   }
 
   # Define sope as class method to allow chaining with other scopes filtering id.
@@ -85,7 +97,19 @@ Spree::Variant.class_eval do
     ]
   end
 
-  # We override in_stock? to avoid depending on the non-overridable method Spree::Stock::Quantifier.can_supply?
+  def self.active(currency = nil)
+    # "where(id:" is necessary so that the returned relation has no includes
+    # The relation without includes will not be readonly and allow updates on it
+    where("spree_variants.id in (?)", joins(:prices).
+                                        where(deleted_at: nil).
+                                        where('spree_prices.currency' =>
+                                          currency || Spree::Config[:currency]).
+                                        where('spree_prices.amount IS NOT NULL').
+                                        select("spree_variants.id"))
+  end
+
+  # We override in_stock? to avoid depending
+  #   on the non-overridable method Spree::Stock::Quantifier.can_supply?
   #   VariantStock implements can_supply? itself which depends on overridable methods
   def in_stock?(quantity = 1)
     can_supply?(quantity)

app/serializers/api/admin/basic_enterprise_serializer.rb

@@ -1,4 +1,12 @@
 class Api::Admin::BasicEnterpriseSerializer < ActiveModel::Serializer
   attributes :name, :id, :is_primary_producer, :is_distributor, :sells, :category,
              :payment_method_ids, :shipping_method_ids, :producer_profile_only, :permalink
+
+  def payment_method_ids
+    object.payment_methods.map(&:id)
+  end
+
+  def shipping_method_ids
+    object.shipping_methods.map(&:id)
+  end
 end

app/serializers/api/admin/customer_serializer.rb

@@ -6,7 +6,7 @@ class Api::Admin::CustomerSerializer < ActiveModel::Serializer
   has_one :bill_address, serializer: Api::AddressSerializer
 
   def tag_list
-    object.tag_list.join(",")
+    customer_tag_list.join(",")
   end
 
   def name
@@ -14,7 +14,7 @@ class Api::Admin::CustomerSerializer < ActiveModel::Serializer
   end
 
   def tags
-    object.tag_list.map do |tag|
+    customer_tag_list.map do |tag|
       tag_rule_map = options[:tag_rule_mapping].andand[tag]
       tag_rule_map || { text: tag, rules: nil }
     end
@@ -25,4 +25,12 @@ class Api::Admin::CustomerSerializer < ActiveModel::Serializer
 
     object.user.default_card.present?
   end
+
+  private
+
+  def customer_tag_list
+    return object.tag_list unless options[:customer_tags]
+
+    options[:customer_tags].andand[object.id] || []
+  end
 end

app/services/checkout/stripe_redirect.rb

@@ -12,11 +12,8 @@ module Checkout
     def path
       return unless stripe_payment_method?
 
-      payment = @order.pending_payments.last
-      return unless payment&.checkout?
-
-      payment.authorize!
-      raise unless payment.pending?
+      payment = OrderManagement::Subscriptions::StripeScaPaymentAuthorize.new(@order).call!
+      raise if @order.errors.any?
 
       field_with_url(payment) if url?(field_with_url(payment))
     end

app/services/order_payment_finder.rb

@@ -1,14 +1,28 @@
 # frozen_string_literal: true
 
-module OrderPaymentFinder
-  def self.last_payment_method(order)
-    # `max_by` avoids additional database queries when payments are loaded
-    # already. There is usually only one payment and this shouldn't cause
-    # any overhead compared to `order(:created_at).last`. Using `last`
-    # without order is not deterministic.
-    #
-    # We are not using `updated_at` because all payments are touched when the
-    # order is updated and then all payments have the same `updated_at` value.
-    order.payments.max_by(&:created_at)&.payment_method
+class OrderPaymentFinder
+  def initialize(order)
+    @order = order
+  end
+
+  def last_payment
+    last(@order.payments)
+  end
+
+  def last_pending_payment
+    last(@order.pending_payments)
+  end
+
+  private
+
+  # `max_by` avoids additional database queries when payments are loaded
+  # already. There is usually only one payment and this shouldn't cause
+  # any overhead compared to `order(:created_at).last`. Using `last`
+  # without order is not deterministic.
+  #
+  # We are not using `updated_at` because all payments are touched when the
+  # order is updated and then all payments have the same `updated_at` value.
+  def last(payments)
+    payments.max_by(&:created_at)
   end
 end

app/services/variant_overrides_indexed.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+# Produces mappings of variant overrides by distributor id and variant id
+# The primary use case for data structured in this way is for injection into
+# the initializer of the OpenFoodNetwork::ScopeVariantToHub class
+
+class VariantOverridesIndexed
+  def initialize(variant_ids, distributor_ids)
+    @variant_ids = variant_ids
+    @distributor_ids = distributor_ids
+  end
+
+  def indexed
+    scoped_variant_overrides.each_with_object(hash_of_hashes) do |variant_override, indexed|
+      indexed[variant_override.hub_id][variant_override.variant] = variant_override
+    end
+  end
+
+  private
+
+  attr_reader :variant_ids, :distributor_ids
+
+  def scoped_variant_overrides
+    VariantOverride
+      .joins(:variant)
+      .preload(:variant)
+      .where(
+        hub_id: distributor_ids,
+        variant_id: variant_ids,
+      )
+  end
+
+  def hash_of_hashes
+    Hash.new { |hash, key| hash[key] = {} }
+  end
+end

app/views/admin/enterprise_relationships/_enterprise_relationship.html.haml

@@ -6,6 +6,7 @@
   %td
     %ul
       %li{"ng-repeat" => "permission in enterprise_relationship.permissions"}
-        to {{ EnterpriseRelationships.permission_presentation(permission.name) }}
+        = t 'admin_enterprise_relationships_to'
+        {{ EnterpriseRelationships.permission_presentation(permission.name) }}
   %td.actions
     %a.delete-enterprise-relationship.icon-trash.no-text{'ng-click' => 'delete(enterprise_relationship)'}

app/views/admin/enterprise_relationships/_form.html.haml

@@ -13,7 +13,8 @@
     %div{"ng-repeat" => "permission in EnterpriseRelationships.all_permissions"}
       %label
         %input{type: "checkbox", "ng-model" => "permissions[permission]"}
-        to {{ EnterpriseRelationships.permission_presentation(permission) }}
+        = t 'admin_enterprise_relationships_to'
+        {{ EnterpriseRelationships.permission_presentation(permission) }}
   %td.actions
     %input{type: "button", value: t(:admin_enterprise_relationships_button_create), "ng-click" => "create()"}
     .errors {{ EnterpriseRelationships.create_errors }}

app/views/checkout/_summary.html.haml

@@ -31,5 +31,4 @@
 
       //= f.submit "Purchase", class: "button", "ofn-focus" => "accordion['payment']"
       %a.button.secondary{href: main_app.cart_url}
-        %i.ofn-i_008-caret-left
         = t :checkout_back_to_cart

app/views/layouts/darkswarm.html.haml

@@ -56,4 +56,3 @@
 
     = render "layouts/bugherd_script"
     = render "layouts/matomo_tag"
-    = render 'spree/shared/google_analytics'

app/views/modals/_food_hub.html.haml

@@ -1,11 +0,0 @@
-%h2
-  %i.ofn-i_040-hub>
-  = t :modal_hubs
-%h5
-  = t :modal_hubs_abstract
-%p
-  = t :modal_hubs_content1
-%p
-  = t :modal_hubs_content2
-%a.close-reveal-modal{"ng-click" => "$close()"} 
-  %i.ofn-i_009-close

app/views/modals/_groups.html.haml

@@ -1,9 +0,0 @@
-%h2 
-  %i.ofn-i_035-groups
-  = t :modal_groups
-%p
-  = t :modal_groups
-%p
-  = t :modal_groups
-%a.close-reveal-modal{"ng-click" => "$close()"}
-  %i.ofn-i_009-close

app/views/modals/_learn_more.html.haml

@@ -1,17 +0,0 @@
-%h2
-  = t :modal_how
-%h5
-  = t :modal_how_shop
-%p
-  = t :modal_how_shop_explained
-%h5
-  = t :modal_how_pickup
-%p
-  = t :modal_how_pickup_explained
-%h5
-  = t :modal_how
-%p
-  = t :modal_how
-%a.button.neutral-btn.dark{:href => "http://www.openfoodnetwork.org" , :target => "_blank" } Open Food Network
-%a.close-reveal-modal{"ng-click" => "$close()"}
-  %i.ofn-i_009-close

app/views/modals/_producers.html.haml

@@ -1,7 +0,0 @@
-%h2 
-  %i.ofn-i_036-producers
-  = t :modal_producers
-%p
-  = t :modal_producers_explained
-%a.close-reveal-modal{"ng-click" => "$close()"}
-  %i.ofn-i_009-close

app/views/shared/mailers/_social_and_contact.html.haml

@@ -18,7 +18,7 @@
                 %a.soc-btn.li{href: ContentConfig.footer_linkedin_url}
                   LinkedIn
               -if ContentConfig.footer_instagram_url.present?
-                %a.soc-btn.tw{href: ContentConfig.footer_instagram_url}
+                %a.soc-btn.ig{href: ContentConfig.footer_instagram_url}
                   Instagram
       %table.column{:align => "left"}
         %tr

app/views/spree/admin/general_settings/edit.html.haml

@@ -38,9 +38,6 @@
             .field
               = preference_field_tag(:cookies_policy_matomo_section, Spree::Config[:cookies_policy_matomo_section], :type => Spree::Config.preference_type(:cookies_policy_matomo_section))
               = label_tag(:cookies_policy_matomo_section, t('.cookies_policy_matomo_section')) + tag(:br)
-            .field
-              = preference_field_tag(:cookies_policy_ga_section, Spree::Config[:cookies_policy_ga_section], :type => Spree::Config.preference_type(:cookies_policy_ga_section))
-              = label_tag(:cookies_policy_ga_section, t('.cookies_policy_ga_section')) + tag(:br)
             .field
               = label_tag(:privacy_policy_url, t('.privacy_policy_url')) + tag(:br)
               = preference_field_tag(:privacy_policy_url, Spree::Config[:privacy_policy_url], type: Spree::Config.preference_type(:privacy_policy_url))

app/views/spree/admin/mail_methods/_form.html.haml

@@ -1,60 +1,28 @@
 %div
   .row
-    .alpha.six.columns
-      %fieldset.no-border-bottom
-        %legend{align: "center"}= t("spree.general")
-        .field
-          = preference_field_tag("enable_mail_delivery", Spree::Config[:enable_mail_delivery], type: :boolean)
-          = label_tag :enable_mail_delivery, t("spree.enable_mail_delivery")
-        .field
-          = label_tag :mails_from, t("spree.send_mails_as")
-          %br/
-          = text_field_tag :mails_from, Spree::Config[:mails_from], maxlength: 256, class: 'fullwidth'
-          %br/
-          %span.info
-            = t("spree.smtp_send_all_emails_as_from_following_address")
-        .field
-          = label_tag :mail_bcc, t("spree.send_copy_of_all_mails_to")
-          %br/
-          = text_field_tag :mail_bcc, Spree::Config[:mail_bcc], maxlength: 256, class: 'fullwidth'
-          %br/
-          %span.info
-            = t("spree.smtp_send_copy_to_this_addresses")
-        .field
-          = label_tag :intercept_email, t("spree.intercept_email_address")
-          %br/
-          = text_field_tag :intercept_email, Spree::Config[:intercept_email], maxlength: 256, class: 'fullwidth'
-          %br/
-          %span.info
-            = t("spree.intercept_email_instructions")
-    .six.columns.omega
-      %fieldset.no-border-bottom
-        %legend{align: "center"}= t("spree.smtp")
-        .field
-          = label_tag :mail_domain, t("spree.smtp_domain")
-          %br/
-          = text_field_tag :mail_domain, Spree::Config[:mail_domain], class: 'fullwidth'
-        .field
-          = label_tag :mail_host, t("spree.smtp_mail_host")
-          %br/
-          = text_field_tag :mail_host, Spree::Config[:mail_host], class: 'fullwidth'
-        .field
-          = label_tag :mail_port, t("spree.smtp_port")
-          %br/
-          = text_field_tag :mail_port, Spree::Config[:mail_port], class: 'fullwidth'
-        .field
-          = label_tag :secure_connection_type, t("spree.secure_connection_type")
-          %br/
-          = select_tag(:secure_connection_type, options_from_collection_for_select(Spree::Core::MailSettings::SECURE_CONNECTION_TYPES.map{|w| Spree.t(w.downcase.to_sym, default: w)}, :to_s, :to_s, Spree::Config[:secure_connection_type]), class: 'select2 fullwidth')
-        .field
-          = label_tag :mail_auth_type, t("spree.smtp_authentication_type")
-          %br/
-          = select_tag(:mail_auth_type, options_from_collection_for_select(Spree::Core::MailSettings::MAIL_AUTH.map{|w| Spree.t(w.downcase.to_sym, default: w)}, :to_s, :to_s, Spree::Config[:mail_auth_type]), class: 'select2 fullwidth')
-        .field
-          = label_tag :smtp_username, t("spree.smtp_username")
-          %br/
-          = text_field_tag :smtp_username, Spree::Config[:smtp_username], class: 'fullwidth'
-        .field
-          = label_tag :preferred_smtp_password, t("spree.smtp_password")
-          %br/
-          = password_field_tag :smtp_password, Spree::Config[:smtp_password], class: 'fullwidth'
+    %fieldset.no-border-bottom
+      %legend{align: "center"}= t("spree.general")
+      .field
+        = preference_field_tag("enable_mail_delivery", Spree::Config[:enable_mail_delivery], type: :boolean)
+        = label_tag :enable_mail_delivery, t("spree.enable_mail_delivery")
+      .field
+        = label_tag :mails_from, t("spree.send_mails_as")
+        %br/
+        = text_field_tag :mails_from, Spree::Config[:mails_from], maxlength: 256, class: 'fullwidth'
+        %br/
+        %span.info
+          = t("spree.smtp_send_all_emails_as_from_following_address")
+      .field
+        = label_tag :mail_bcc, t("spree.send_copy_of_all_mails_to")
+        %br/
+        = text_field_tag :mail_bcc, Spree::Config[:mail_bcc], maxlength: 256, class: 'fullwidth'
+        %br/
+        %span.info
+          = t("spree.smtp_send_copy_to_this_addresses")
+      .field
+        = label_tag :intercept_email, t("spree.intercept_email_address")
+        %br/
+        = text_field_tag :intercept_email, Spree::Config[:intercept_email], maxlength: 256, class: 'fullwidth'
+        %br/
+        %span.info
+          = t("spree.intercept_email_instructions")

app/views/spree/admin/orders/_shipment_manifest.html.haml

@@ -1,5 +1,6 @@
 - shipment.manifest.each do |item|
   - line_item = order.find_line_item_by_variant(item.variant)
+  - break if line_item.blank?
 
   %tr.stock-item{ "data-item-quantity" => "#{item.quantity}" }
     %td.item-image

app/views/spree/admin/products/_display_as.html.haml

@@ -1,4 +1,5 @@
 .three.columns.omega{ "ng-if" => "product.variant_unit_with_scale != 'items'" }
   = f.field_container :display_as do
     = f.label :product_display_as, t('.display_as')
+    %span.required *
     %input#product_display_as.fullwidth{name: "product[display_as]", placeholder: "{{ placeholder_text }}", type: "text"}

app/views/spree/admin/products/_form.html.haml

@@ -16,11 +16,6 @@
         = sanitize(@product.description)
       = f.error_message_on :description
 
-    = f.field_container :taxons do
-      = f.label :taxon_ids, t(:taxons)
-      %br
-      = f.hidden_field :taxon_ids, :value => @product.taxon_ids.join(',')
-
   .right.four.columns.omega
     .variant_units_form{ 'ng-app' => 'admin.products', 'ng-controller' => 'editUnitsCtrl' }
 

app/views/spree/admin/products/new.html.haml

@@ -38,6 +38,7 @@
         .three.columns.omega{ 'ng-show' => "product.variant_unit_with_scale == 'items'" }
           = f.field_container :unit_name do
             = f.label :product_variant_unit_name, t(".unit_name")
+            %span.required *
             %input.fullwidth{ id: 'product_variant_unit_name','ng-model' => 'product.variant_unit_name', :name => 'product[variant_unit_name]', :placeholder => t('admin.products.unit_name_placeholder'), :type => 'text' }
       .twelve.columns.alpha
         .six.columns.alpha

app/views/spree/admin/shared/_configuration_menu.html.haml

@@ -20,7 +20,6 @@
       = configurations_sidebar_menu_item Spree.t(:shipping_methods), admin_shipping_methods_path
       = configurations_sidebar_menu_item Spree.t(:shipping_categories), admin_shipping_categories_path
       = configurations_sidebar_menu_item t(:enterprise_fees), main_app.admin_enterprise_fees_path
-      = configurations_sidebar_menu_item Spree.t(:analytics_trackers), admin_trackers_path
       = configurations_sidebar_menu_item t('admin.contents.edit.title'), main_app.edit_admin_contents_path
       = configurations_sidebar_menu_item t('admin.invoice_settings.edit.title'), main_app.edit_admin_invoice_settings_path
       = configurations_sidebar_menu_item t('admin.matomo_settings.edit.title'), main_app.edit_admin_matomo_settings_path

app/views/spree/admin/shared/_tabs.html.haml

@@ -3,7 +3,7 @@
 = tab :order_cycles, url: main_app.admin_order_cycles_path, icon: 'icon-refresh'
 = tab :orders, :subscriptions, :customer_details, :adjustments, :payments, :return_authorizations, url: admin_orders_path('q[s]' => 'completed_at desc'), icon: 'icon-shopping-cart'
 = tab :reports, icon: 'icon-file'
-= tab :general_settings, :mail_method, :image_settings, :tax_categories, :tax_rates, :tax_settings, :zones, :countries, :states, :payment_methods, :taxonomies, :shipping_methods, :shipping_categories, :enterprise_fees, :trackers, :contents, :invoice_settings, :matomo_settings, :stripe_connect_settings, label: 'configuration', icon: 'icon-wrench', url: edit_admin_general_settings_path
+= tab :general_settings, :mail_method, :image_settings, :tax_categories, :tax_rates, :tax_settings, :zones, :countries, :states, :payment_methods, :taxonomies, :shipping_methods, :shipping_categories, :enterprise_fees, :contents, :invoice_settings, :matomo_settings, :stripe_connect_settings, label: 'configuration', icon: 'icon-wrench', url: edit_admin_general_settings_path
 = tab :enterprises, :enterprise_relationships, url: main_app.admin_enterprises_path
 = tab :customers, url: main_app.admin_customers_path
 = tab :enterprise_groups, url: main_app.admin_enterprise_groups_path, label: 'groups'

app/views/spree/admin/taxons/search.rabl

@@ -1,4 +0,0 @@
-object false
-child(@taxons => :taxons) do
-  attributes :name, :pretty_name, :id
-end

app/views/spree/admin/variants/_form.html.haml

@@ -1,10 +1,10 @@
 .label-block.left.six.columns.alpha{'ng-app' => 'admin.products'}
   .field
     = f.label :display_name, t('.display_name')
-    = f.text_field :display_name, class: "fullwidth"
+    = f.text_field :display_name, class: "fullwidth", placeholder: t('.display_name_placeholder')
   .field
     = f.label :display_as, t('.display_as')
-    = f.text_field :display_as, class: "fullwidth"
+    = f.text_field :display_as, class: "fullwidth", placeholder: t('.display_as_placeholder')
 
   - if product_has_variant_unit_option_type?(@product)
     - if @product.variant_unit != 'items'

app/views/spree/layouts/_admin_body.html.haml

@@ -70,7 +70,5 @@
 
 %div{"data-hook" => "admin_footer_scripts"}
 
-= render 'spree/shared/google_analytics'
-
 %script
   = raw "Spree.api_key = \"#{try_spree_current_user.try(:spree_api_key).to_s}\";"

app/views/spree/order_mailer/_payment.html.haml

@@ -8,7 +8,7 @@
     = t :email_payment_summary
 %h4
   = t :email_payment_method
-  %strong=  OrderPaymentFinder.last_payment_method(@order)&.name
+  %strong=  last_payment_method(@order)&.name
 %p
-  %em= OrderPaymentFinder.last_payment_method(@order)&.description
+  %em= last_payment_method(@order)&.description
 %p  

app/views/spree/order_mailer/confirm_email_for_customer.html.haml

@@ -25,3 +25,4 @@
 = render 'shipping'
 = render 'special_instructions'
 = render 'signoff'
+= render 'shared/mailers/social_and_contact'

app/views/spree/orders/form/_cart_links.html.haml

@@ -1,9 +1,5 @@
 .row.links{'data-hook' => "cart_buttons"}
-  .columns.large-8{"data-hook" => ""}
-    %a.button.large.secondary{href: current_shop_products_path}
-      %i.ofn-i_008-caret-left
-      = t :orders_edit_continue
-  .columns.large-4.text-right
-    %a#checkout-link.button.large.primary{href: main_app.checkout_path}
-      = t :orders_edit_checkout
-      %i.ofn-i_007-caret-right
+  %a.button.large.secondary{href: current_shop_products_path}
+    = t :orders_edit_continue
+  %a#checkout-link.button.large.primary.right{href: main_app.checkout_path}
+    = t :orders_edit_checkout

app/views/spree/orders/form/_update_buttons.html.haml

@@ -3,11 +3,9 @@
     - if current_order.nil? || current_order.distributor.nil? || current_order.distributor == @order.distributor
       - if current_order&.line_items.present?
         = link_to main_app.cart_path, :class => "button expand" do
-          %i.ofn-i_008-caret-left
           = t(:order_back_to_cart)
       - else
         = link_to "#{main_app.enterprise_shop_path(@order.distributor)}#/shop", class: "button expand" do
-          %i.ofn-i_008-caret-left
           = t(:order_back_to_store)
     - else
        

app/views/spree/shared/_google_analytics.html.erb

@@ -1,39 +0,0 @@
-<% if tracker = Spree::Tracker.current %>
-
-  <%= javascript_tag do %>
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', '<%= tracker.analytics_id %>']);
-    _gaq.push(['_trackPageview']);
-
-    <% if flash[:commerce_tracking] && @order.present? %>
-      <%# more info: https://developers.google.com/analytics/devguides/collection/gajs/methods/gaJSApiEcommerce %>
-      _gaq.push(['_addTrans',
-        "<%= j @order.number %>",
-        "",
-        "<%= @order.total %>",
-        "<%= @order.adjustments.tax.sum(:amount) %>",
-        "<%= @order.adjustments.shipping.sum(:amount) %>",
-        "<%= j @order.bill_address.city %>",
-        "<%= j @order.bill_address.state_text %>",
-        "<%= j @order.bill_address.country.name %>"
-      ]);
-      <% @order.line_items.each do |line_item| %>
-        _gaq.push(['_addItem',
-          "<%= j @order.number %>",
-          "<%= j line_item.variant.sku %>",
-          "<%= j line_item.variant.product.name %>",
-          "",
-          "<%= line_item.price %>",
-          "<%= line_item.quantity %>"
-        ]);
-      <% end %>
-      _gaq.push(['_trackTrans']);
-    <% end %>
-
-    (function() {
-      var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-      ga.src = '//google-analytics.com/ga.js';
-      var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-    })();
-  <% end %>
-<% end %>

app/views/spree/shared/_order_details.html.haml

@@ -13,9 +13,9 @@
     .pad
       .text-big
         = t :order_payment
-        %strong=  OrderPaymentFinder.last_payment_method(order)&.name
+        %strong=  last_payment_method(order)&.name
       %p.text-small.text-skinny.pre-line
-        %em= OrderPaymentFinder.last_payment_method(order)&.description
+        %em= last_payment_method(order)&.description
 
     .order-summary.text-small
       %strong

config/environments/development.rb

@@ -1,20 +1,24 @@
 Openfoodnetwork::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
+  #
+  # PROFILE switches several settings to a more "production-like" value
+  # for profiling and benchmarking the application locally. All changes you
+  # make to the app will require restart.
 
   # In the development environment your application's code is reloaded on
   # every request.  This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.
-  config.cache_classes = false
+  config.cache_classes = !!ENV["PROFILE"]
 
   # :file_store is used by default when no cache store is specifically configured.
-  # config.cache_store = :file_store
+  config.cache_store = :memory_store if !!ENV["PROFILE"]
 
   # Log error messages when you accidentally call methods on nil.
   config.whiny_nils = true
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
-  config.action_controller.perform_caching = false
+  config.action_controller.perform_caching = !!ENV["PROFILE"]
 
   # Don't care if the mailer can't send
   config.action_mailer.raise_delivery_errors = false
@@ -28,8 +32,25 @@ Openfoodnetwork::Application.configure do
   # Do not compress assets
   config.assets.compress = false
 
+  # Generate digests for assets URLs.
+  #
+  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
+  # yet still be able to expire them through the digest params.
+  config.assets.digest = !!ENV["PROFILE"]
+
   # Expands the lines which load the assets
-  config.assets.debug = false
+  #
+  # Setting this to false makes Rails bundle assets into all.js and all.css.
+  #
+  # Disabling asset debugging still requires that assets be compiled for each
+  # request. You can avoid that by precompiling the assets as in production:
+  #
+  #   $ bundle exec rake assets:precompile:primary assets:precompile:nondigest
+  #
+  # You can remove them by simply running:
+  #
+  #   $ bundle exec rake assets:clean
+  config.assets.debug = !!ENV["DEBUG_ASSETS"]
 
   # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
   # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.

config/locales/ar.yml

@@ -1314,14 +1314,8 @@ ar:
       cookie_stripe_desc: "البيانات التي يتم جمعها بواسطة معالج الدفع لدينا Stripe للكشف عن الاحتيال https://stripe.com/cookies-policy/legal. لا تستخدم جميع المتاجر Stripe كوسيلة للدفع ، ولكن من الممارسات الجيدة منع الاحتيال لتطبيقه على جميع الصفحات. من المحتمل أن يقوم Stripe بإنشاء صورة لصفحاتنا التي تتفاعل عادةً مع واجهة برمجة التطبيقات الخاصة بهم ومن ثم وضع علامة على أي شيء غير عادي. لذلك فإن إعداد ملف تعريف الارتباط للشريط له وظيفة أوسع من مجرد توفير طريقة الدفع للمستخدم. يمكن أن تؤثر إزالتها على أمان الخدمة نفسها. يمكنك معرفة المزيد حول الشريط وقراءة سياسة الخصوصية الخاصة به على https://stripe.com/privacy."
       statistics_cookies: "إحصائيات ملفات تعريف الارتباط"
       statistics_cookies_desc: "ما يلي ليس ضروريًا تمامًا ، ولكنه يساعد في تزويدك بأفضل تجربة للمستخدم من خلال السماح لنا بتحليل سلوك المستخدم ، وتحديد الميزات التي تستخدمها أكثر من غيرها ، أو عدم استخدامها ، وفهم مشكلات تجربة المستخدم ، إلخ."
-      statistics_cookies_analytics_desc_html: "لجمع وتحليل بيانات استخدام النظام الأساسي ، نستخدم Google Analytics ، لأنها كانت الخدمة الافتراضية المرتبطة بـ Spree (برمجيات المصدر المفتوح للتجارة الإلكترونية التي بنينا عليها) ولكن رؤيتنا هي التحول إلى <a href='https://matomo.org/' target='_blank'>Matomo</a> (على سبيل المثال Piwik ، تحليلات مفتوحة المصدر أداة متوافقة مع الناتج المحلي الإجمالي وتحمي خصوصيتك) في أسرع وقت ممكن."
       statistics_cookies_matomo_desc_html: "لجمع وتحليل بيانات استخدام النظام الأساسي ، نستخدم <a href='https://matomo.org/' target='_blank'>Matomo</a> (ex Piwik) ، وهي أداة تحليل مفتوحة المصدر متوافقة مع إجمالي الناتج المحلي وتحمي خصوصيتك."
       statistics_cookies_matomo_optout: "هل تريد إلغاء الاشتراك في تحليلات Matomo؟ نحن لا نجمع أي بيانات شخصية ، ويساعدنا Matomo على تحسين خدماتنا ، لكننا نحترم اختيارك :-)"
-      cookie_analytics_utma_desc: "تستخدم لتمييز المستخدمين والجلسات. يتم إنشاء ملف تعريف الارتباط عندما تنفذ مكتبة جافا سكريبت ولا توجد ملفات تعريف الارتباط __utma الموجودة. يتم تحديث ملف تعريف الارتباط في كل مرة يتم فيها إرسال البيانات إلى Google Analytics."
-      cookie_analytics_utmt_desc: "تستخدم لرفع معدل الطلب."
-      cookie_analytics_utmb_desc: "يستخدم لتحديد جلسات / زيارات جديدة. يتم إنشاء ملف تعريف الارتباط عندما تنفذ مكتبة جافا سكريبت ولا توجد ملفات تعريف الارتباط الموجودة. يتم تحديث ملف تعريف الارتباط في كل مرة يتم فيها إرسال البيانات إلى Google Analytics."
-      cookie_analytics_utmc_desc: "غير مستخدم في ga.js. تعيين إمكانية التشغيل المتداخل مع urchin.js. تاريخياً ، يتم تشغيل ملف تعريف الارتباط هذا بالتزامن مع ملف تعريف الارتباط __utmb لتحديد ما إذا كان المستخدم في جلسة / زيارة جديدة."
-      cookie_analytics_utmz_desc: "يخزن مصدر حركة المرور أو الحملة التي تشرح كيف وصل المستخدم إلى موقعك. يتم إنشاء ملف تعريف الارتباط عندما تنفذ مكتبة جافا سكريبت ويتم تحديثها في كل مرة يتم فيها إرسال البيانات إلى Google Analytics."
       cookie_matomo_basics_desc: "ملفات تعريف الارتباط الطرف الأول Matomo لجمع الإحصاءات."
       cookie_matomo_heatmap_desc: "ملف تعريف الارتباط Matmo Heatmap وتسجيل الجلسة."
       cookie_matomo_ignore_desc: "يستخدم ملف تعريف الارتباط لاستبعاد المستخدم من التعقب."
@@ -1584,22 +1578,6 @@ ar:
   groups_signup_contact_text: "تواصل لتكتشف ما يمكن أن تفعله شبكة الغذاء المفتوح لك:"
   groups_signup_detail: "هنا التفاصيل."
   login_invalid: "البريد الإلكتروني أو كلمة السر خاطئة"
-  modal_hubs: "نقطة بيع الطعام"
-  modal_hubs_abstract: مراكز الغذاء لدينا هي نقطة الاتصال بينك وبين الأشخاص الذين يصنعون طعامك!
-  modal_hubs_content1: يمكنك البحث عن مركز مناسب حسب الموقع أو الاسم. تحتوي بعض لوحات الوصل على نقاط متعددة حيث يمكنك التقاط مشترياتك ، وسيوفر بعضها أيضًا خيارات التسليم. كل مركز غذاء هو نقطة مبيعات لها عمليات أعمال ولوجستيات مستقلة - لذلك من المتوقع حدوث تباينات بين المراكز.
-  modal_hubs_content2: يمكنك التسوق فقط في مركز طعام واحد في وقت واحد.
-  modal_groups: "المجموعات / المناطق"
-  modal_groups_content1: هذه هي المنظمات والعلاقات بين المحاور التي تشكل شبكة الغذاء المفتوح.
-  modal_groups_content2: يتم تجميع بعض المجموعات حسب الموقع أو المجلس ، والبعض الآخر حسب أوجه التشابه غير الجغرافية.
-  modal_how: "كيف تعمل"
-  modal_how_shop: تسوق في شبكة الغذاء المفتوح
-  modal_how_shop_explained: ابحث عن مركز طعام بالقرب منك لبدء التسوق! يمكنك توسيع كل مركز طعام لمعرفة أنواع الأشياء الجيدة المتاحة ، والنقر من خلاله البدء للتسوق. (يمكنك فقط الشراء من مركز طعام واحد في كل مرة.)
-  modal_how_pickup: الاستلام ، تكاليف التوصيل والشحن
-  modal_how_pickup_explained: تقوم بعض مراكز الطعام بالتوصيل إلى باب منزلك ، بينما يطلب منك البعض الآخر شراء مشترياتك. يمكنك معرفة الخيارات المتاحة على الصفحة الرئيسية ، وتحديد الخيارات التي تريدها في صفحات التسوق وتسجيل المغادرة. سيكلف التسليم أكثر ، ويختلف السعر من مركز الى اخر . كل مركز غذاء هو نقطة مبيعات مع عمليات تجارية مستقلة ولوجستية - لذلك من المتوقع حدوث اختلافات بين المراكز.
-  modal_how_more: أعرف أكثر
-  modal_how_more_explained: "إذا كنت تريد معرفة المزيد عن شبكة الغذاء المفتوح ، وكيف تعمل ، والمشاركة ، تحقق من:"
-  modal_producers: "المنتجين"
-  modal_producers_explained: "ينتج المنتجون لدينا جميع الأطعمة اللذيذة التي يمكنك تسوقها على شبكة الغذاء المفتوح."
   producers_about: معلومات عنا
   producers_buy: متجر لل
   producers_contact: اتصل
@@ -2648,6 +2626,14 @@ ar:
       start_free_profile: "ابدأ بملف تعريف مجاني ، وتوسع عندما تكون جاهزًا!"
   order_management:
     reports:
+      enterprise_fee_summaries:
+        filters:
+          date_range: "نطاق الموعد"
+          report_format_csv: "تنزيل بتنسيق CSV"
+          generate_report: "توليد تقرير"
+        report:
+          none: "لا شيء"
+          select_and_search: "حدد المرشحات وانقر على GENERATE REPORT للوصول إلى بياناتك."
       enterprise_fee_summary:
         date_end_before_start_error: "يجب أن يكون بعد البداية"
         parameter_not_allowed_error: "غير مصرح لك باستخدام عامل تصفية واحد أو أكثر لهذا التقرير."
@@ -2725,6 +2711,8 @@ ar:
     location: "الموقع"
     count_on_hand: "الاعتماد على المتوفر"
     quantity: "الكمية"
+    on_demand: "على الطلب"
+    on_hand: "متوفر"
     package_from: "التعبئة من"
     item_description: "وصف السلعة"
     price: "السعر"
@@ -2785,14 +2773,6 @@ ar:
     smtp_send_copy_to_this_addresses: "يرسل نسخة من جميع الرسائل الصادرة إلى هذا العنوان. لعناوين متعددة ، افصل بينها بفواصل."
     intercept_email_address: "اعتراض عنوان البريد الإلكتروني"
     intercept_email_instructions: "تجاوز مستلم البريد الإلكتروني واستبداله بهذا العنوان."
-    smtp: "SMTP"
-    smtp_domain: "مجال SMTP"
-    smtp_mail_host: "مضيف بريد SMTP"
-    smtp_port: "منفذ SMTP"
-    secure_connection_type: "نوع اتصال آمن"
-    smtp_authentication_type: "نوع مصادقة SMTP"
-    smtp_username: "اسم مستخدم SMTP"
-    smtp_password: "كلمة مرور SMTP"
     image_settings: "إعدادات الصورة"
     image_settings_warning: "ستحتاج إلى تجديد الصور المصغرة إذا قمت بتحديث أنماط مشبك الورق. استخدم rap paperclip: refresh: الصور المصغرة CLASS = Spree :: Image للقيام بذلك."
     attachment_default_style: نمط المرفقات
@@ -2839,12 +2819,6 @@ ar:
     shipping_categories: "فئات الشحن"
     new_shipping_category: "فئة الشحن الجديدة"
     back_to_shipping_categories: "العودة إلى فئات الشحن"
-    analytics_trackers: "تحليلات التتبع"
-    no_trackers_found: "لم يتم العثور على متتبعين"
-    new_tracker: "متتبع جديد"
-    add_one: "أضف واحدا"
-    google_analytics_id: "معرف التحليلات"
-    back_to_trackers_list: "العودة إلى قائمة التتبعات"
     name: "اسم"
     description: "وصف"
     type: "نوع"
@@ -3126,14 +3100,6 @@ ar:
           bulk_coop_allocation: 'معظم التعاونية - تخصيص'
           bulk_coop_packing_sheets: 'معظم التعاونية - صحائف التعبئة'
           bulk_coop_customer_payments: ' الجمعية التعاونية - مدفوعات العملاء بالجملة'
-        enterprise_fee_summaries:
-          filters:
-            date_range: "نطاق الموعد"
-            report_format_csv: "تنزيل بتنسيق CSV"
-            generate_report: "توليد تقرير"
-          report:
-            none: "لا شيء"
-            select_and_search: "حدد المرشحات وانقر على GENERATE REPORT للوصول إلى بياناتك."
       users:
         index:
           listing_users: "قائمة المستخدمين"
@@ -3178,14 +3144,15 @@ ar:
         autocomplete:
           producer_name: "المنتج"
           unit: "وحدة"
-      general_settings:
+      shared:
+        sortable_header:
+          name: "الاسم"
         edit:
           legal_settings: "الإعدادات القانونية"
           cookies_consent_banner_toggle: "عرض راية موافقة ملفات تعريف الارتباط"
           privacy_policy_url: "URL سياسة الخصوصية"
           enterprises_require_tos: "يجب على المؤسسات قبول شروط الخدمة"
           cookies_policy_matomo_section: "عرض قسم Matomo في صفحة سياسة ملفات تعريف الارتباط"
-          cookies_policy_ga_section: "عرض قسم Google Analytics في صفحة سياسة ملفات تعريف الارتباط"
           footer_tos_url: "شروط الخدمة URL"
     checkout:
       payment:

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,15 +664,15 @@ 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?
           primary_producer_tip: Selecciona "Productora" si ets productora principal d'aliments.
           producer: Productora
-          any: Cap
-          none: No productora
-          own: Propi
+          any: Qualsevol
+          none: Cap
+          own: Propis
           sells: Ven
           sells_tip: "Cap: l'organització no ven als clients directament. <br /> Propietari: l'organització ven productes propis als clients. <br /> Qualsevol: l'organització pot vendre productes propis o d'altres empreses. <br />"
           visible_in_search: Visible a la cerca?
@@ -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."
@@ -1456,17 +1451,17 @@ ca:
   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_details_html: "Aquests són els detalls de la comanda de <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_placement_explainer_html: "Aquesta comanda s'ha creat automàticament per tu."
-  email_so_edit_true_html: "Potd <a href='%{order_url}'> fer canvis </ a> fins que les comandes es tanquin el %{orders_close_at}."
+  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_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"
@@ -1589,22 +1584,6 @@ ca:
   groups_signup_contact_text: "Posa't en contacte per descobrir què pot fer OFN per tu:"
   groups_signup_detail: "Aquest és el detall."
   login_invalid: "Correu electrònic o contrasenya no vàlids"
-  modal_hubs: "Grups"
-  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_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"
-  modal_how_shop: Compreu a Open Food Network
-  modal_how_shop_explained: Cerca un grup de consum a prop teu per començar a comprar. Pots expandir cada grup per veure quins tipus de productes estan disponibles i fer clic per començar a comprar. (Només pots comprar en un grup alhora).
-  modal_how_pickup: Costes de recollida, lliurament i enviament
-  modal_how_pickup_explained: Algunes organitzacións o grups lliuren a la vostra porta, mentre que altres requereixen que aneu a buscar les vostres comandes. Podeu veure quines opcions hi ha disponibles a la pàgina d'inici i seleccionar el que vulgueu a les pàgines de confirmació de la compra. L'enviament costarà més, i els preus difereixen de l'organització. Cada grup és un punt de venda amb operacions comercials i logística independents, per la qual cosa es existeixen  variacions entre grups.
-  modal_how_more: Aprèn-ne més
-  modal_how_more_explained: "Si vols saber-ne més sobre l'Open Food Network, com funciona i participar-hi, consulta:"
-  modal_producers: "Productors"
-  modal_producers_explained: "Les nostres productores elaboren tot el menjar deliciós que pots adquirir a l'Open Food Network."
   producers_about: Sobre nosaltres
   producers_buy: 'Compreu '
   producers_contact: Contacte
@@ -1922,6 +1901,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 +2669,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."
@@ -2766,6 +2754,8 @@ ca:
     location: "Ubicació"
     count_on_hand: "Compte disponible"
     quantity: "Quantitat"
+    on_demand: "Sota demanda"
+    on_hand: "Disponibles"
     package_from: "perfil de"
     item_description: "Descripció de l'article"
     price: "Preu"
@@ -2826,14 +2816,6 @@ ca:
     smtp_send_copy_to_this_addresses: "Envia una còpia de tots els correus sortints a aquesta adreça. Per a diverses adreces, separeu amb comes."
     intercept_email_address: "Intercepta adreça de correu"
     intercept_email_instructions: "Invalida el destinatari de correu electrònic i reemplaça amb aquesta adreça."
-    smtp: "SMTP"
-    smtp_domain: "Domini SMTP"
-    smtp_mail_host: "Servidor de correu SMTP"
-    smtp_port: "Port SMTP"
-    secure_connection_type: "Tipus de connexió segura"
-    smtp_authentication_type: "Tipus d'autenticació SMTP"
-    smtp_username: "Nom d'usuari SMTP"
-    smtp_password: "Contrasenya SMTP"
     image_settings: "Configuració de la imatge"
     image_settings_warning: "Haureu de regenerar thumbnails si actualitzeu els estils de paperclip. Feu servir rake paperclip:refresh:thumbnails CLASS=Spree::Image per fer-ho."
     attachment_default_style: Estil de fitxers adjunts
@@ -2880,12 +2862,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"
@@ -3167,14 +3143,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"
@@ -3219,14 +3187,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:

config/locales/de_DE.yml

@@ -1322,14 +1322,8 @@ de_DE:
       cookie_stripe_desc: "Daten gesammelt von unserem Zahlungsabwickler Stripe für die Betrugserkennung https://stripe.com/cookies-policy/legal. Nicht alle Geschäfte verwenden Stripe als Zahlungsmethode, aber es ist eine gute Vorgehensweise, sie auf alle Seiten anzuwenden. Stripe erstellt wahrscheinlich ein Bild davon, welche unserer Seiten normalerweise mit ihrer API interagieren und merkt, wenn etwas Ungewöhnliches passiert. Das Festlegen des Stripe-Cookies hat also eine breitere Funktion als die Bereitstellung einer Zahlungsmethode für einen Benutzer. Das Entfernen könnte die Sicherheit des Dienstes selbst beeinträchtigen. Sie können mehr über Stripe erfahren und dessen Datenschutzrichtlinie unter https://stripe.com/privacy lesen."
       statistics_cookies: "Statistik-Cookies"
       statistics_cookies_desc: "Die folgenden Punkte sind nicht unbedingt erforderlich, helfen Ihnen jedoch, die beste Benutzererfahrung zu bieten, indem wir das Benutzerverhalten analysieren, die am häufigsten verwendeten Funktionen identifizieren oder nicht verwenden, Probleme mit der Benutzerfreundlichkeit verstehen usw."
-      statistics_cookies_analytics_desc_html: "Zur Erfassung und Analyse von Daten zur Nutzung der Plattform verwenden wir Google Analytics, da es sich um den Standarddienst handelt, der mit Spree (der E-Commerce-Open-Source-Software, auf der wir aufgebaut haben) verbunden ist. Unsere Vision ist jedoch der Wechsel zu <a href = 'https: / /matomo.org/ 'target =' _ blank '> Matomo </a> (ex Piwik, ein Open-Source-Analysetool, das der DSGVO entspricht und Ihre Privatsphäre schützt), sobald wir können."
       statistics_cookies_matomo_desc_html: "Um Daten zur Nutzung der Plattform zu erfassen und zu analysieren, verwenden wir <a href='https://matomo.org/ 'target='_blank'> Matomo </a> (ex Piwik), ein Open-Source-Analysetool, das der DSGVO-Richtlinie entspricht schützt Ihre Privatsphäre."
       statistics_cookies_matomo_optout: "Möchten Sie Matomo Analytics deaktivieren? Wir sammeln keine persönlichen Daten und Matomo hilft uns, unseren Service zu verbessern, aber wir respektieren Ihre Wahl :-)"
-      cookie_analytics_utma_desc: "Wird zur Unterscheidung von Benutzern und Sitzungen verwendet. Der Cookie wird erstellt, wenn die JavaScript-Bibliothek ausgeführt wird und keine vorhandenen __utma-Cookies vorhanden sind. Der Cookie wird jedes Mal aktualisiert, wenn Daten an Google Analytics gesendet werden."
-      cookie_analytics_utmt_desc: "Wird zum Drosseln der Anforderungsrate verwendet."
-      cookie_analytics_utmb_desc: "Wird verwendet, um neue Sitzungen / Besuche zu bestimmen. Der Cookie wird erstellt, wenn die JavaScript-Bibliothek ausgeführt wird und keine vorhandenen __utmb-Cookies vorhanden sind. Der Cookie wird jedes Mal aktualisiert, wenn Daten an Google Analytics gesendet werden."
-      cookie_analytics_utmc_desc: "Wird nicht in ga.js verwendet Stellen Sie die Interoperabilität mit urchin.js ein. In der Vergangenheit wurde dieser Cookie in Verbindung mit dem __utmb-Cookie verwendet, um festzustellen, ob sich der Benutzer in einer neuen Sitzung / einem neuen Besuch befand."
-      cookie_analytics_utmz_desc: "Speichert die Zugriffsquelle oder Kampagne, die erläutert, wie der Nutzer Ihre Website erreicht hat. Der Cookie wird erstellt, wenn die JavaScript-Bibliothek ausgeführt wird, und wird jedes Mal aktualisiert, wenn Daten an Google Analytics gesendet werden."
       cookie_matomo_basics_desc: "Matomo First Party Cookies zum Sammeln von Statistiken."
       cookie_matomo_heatmap_desc: "Matomo Heatmap & Session Aufnahme-Cookie."
       cookie_matomo_ignore_desc: "Cookie verwendet, um Benutzer von der Verfolgung auszuschließen."
@@ -1588,22 +1582,6 @@ de_DE:
   groups_signup_contact_text: "Kontaktieren Sie uns, um herauszufinden, was OFN für Sie tun kann:"
   groups_signup_detail: "Hier ist das Detail."
   login_invalid: "Ungültige E-Mail-Adresse oder ungültiges Passwort"
-  modal_hubs: "Lebensmittel-Hubs"
-  modal_hubs_abstract: Unsere Hubs sind der Kontaktpunkt zwischen Ihnen und den Menschen, die Ihre Lebensmittel herstellen!
-  modal_hubs_content1: Sie können nach einem geeigneten Hub nach Standort oder Namen suchen. Einige Hubs haben mehrere Punkte, an denen Sie Ihre Einkäufe abholen können, und einige bieten auch Lieferoptionen. Jeder Food-Hub ist eine Verkaufsstelle mit eigenständigem Geschäftsbetrieb und Logistik - so sind Unterschiede zwischen den Hubs zu erwarten.
-  modal_hubs_content2: Sie können nicht bei mehr als einem Hub gleichzeitig einkaufen.
-  modal_groups: "Gruppen / Regionen"
-  modal_groups_content1: Dies sind die Organisationen und Beziehungen zwischen Hubs, aus denen das Open Food Network besteht.
-  modal_groups_content2: Einige Gruppen sind nach Standort oder Rat gruppiert, andere nach nichtgeographischen Ähnlichkeiten.
-  modal_how: "Wie es funktioniert"
-  modal_how_shop: Einkaufen im Open Food Network
-  modal_how_shop_explained: Suchen Sie nach einem Hub in Ihrer Nähe, um mit dem Einkauf zu beginnen! Sie können ein Hub erweitern, um zu sehen, welche Arten von Produkten verfügbar sind. Klicken Sie durch, um dort einzukaufen. (Sie können jeweils nur bei einem Hub gleichzeitig einkaufen.)
-  modal_how_pickup: Abhol-, Liefer- und Versandkosten
-  modal_how_pickup_explained: Manche Hubs liefern an, bei anderen müssen Sie abholen. Sie können auf der Startseite sehen, welche Optionen verfügbar sind, und und diese dann an der Kasse wählen. Lieferungen kosten mehr und die Preise unterscheiden sich von Hub zu Hub. Jedes Hub ist eine Verkaufsstelle mit eigenständigem Geschäftsbetrieb und Logistik - so sind Schwankungen zwischen den Hubs zu erwarten.
-  modal_how_more: Mehr erfahren
-  modal_how_more_explained: "Wenn Sie mehr über das Open Food Network erfahren wollen, wie es funktioniert und sich einbringen, schauen Sie nach:"
-  modal_producers: "Produzenten"
-  modal_producers_explained: "Unsere Produzenten stellen all das leckere Essen her, das Sie im Open Food Network kaufen können."
   producers_about: Über uns
   producers_buy: Suchen
   producers_contact: Kontakt
@@ -2688,6 +2666,11 @@ de_DE:
       start_free_profile: "Beginnen Sie mit einem kostenlosen Profil und erweitern Sie es, wenn Sie fertig sind!"
   order_management:
     reports:
+      enterprise_fee_summaries:
+        filters:
+          date_range: "Datumsbereich"
+        report:
+          none: "Keine"
       enterprise_fee_summary:
         date_end_before_start_error: "muss nach dem start sein"
         parameter_not_allowed_error: "Sie sind nicht berechtigt, einen oder mehrere ausgewählte Filter für diesen Bericht zu verwenden."
@@ -2765,6 +2748,8 @@ de_DE:
     location: "Ort"
     count_on_hand: "Zählen Sie zur Hand"
     quantity: "Menge"
+    on_demand: "Unbegrenzt"
+    on_hand: "Verfügbar"
     package_from: "Paket von"
     item_description: "Artikelbeschreibung"
     price: "Preis"
@@ -2825,14 +2810,6 @@ de_DE:
     smtp_send_copy_to_this_addresses: "Sendet eine Kopie aller ausgehenden Mails an diese Adresse. Bei mehreren Adressen trennen Sie diese durch Kommas."
     intercept_email_address: "E-Mail-Adresse abfangen"
     intercept_email_instructions: "Überschreiben Sie den E-Mail-Empfänger und ersetzen Sie ihn mit dieser Adresse."
-    smtp: "SMTP"
-    smtp_domain: "SMTP-Domäne"
-    smtp_mail_host: "SMTP-Mail-Host"
-    smtp_port: "SMTP-Port"
-    secure_connection_type: "Sicherer Verbindungstyp"
-    smtp_authentication_type: "SMTP-Authentifizierungstyp"
-    smtp_username: "SMTP-Benutzername"
-    smtp_password: "SMTP-Passwort"
     image_settings: "Bildeinstellungen"
     image_settings_warning: "Sie müssen die Miniaturbilder neu erstellen, wenn Sie die Büroklammerformate aktualisieren. Verwenden Sie dazu die Rake-Büroklammer: Refresh: thumbnails CLASS = Spree :: Image."
     attachment_default_style: Anhänge-Stil
@@ -2879,12 +2856,6 @@ de_DE:
     shipping_categories: "Versandkategorien"
     new_shipping_category: "Neue Versandkategorie"
     back_to_shipping_categories: "Zurück zu den Versandkategorien"
-    analytics_trackers: "Analytics-Tracker"
-    no_trackers_found: "Keine Tracker gefunden"
-    new_tracker: "Neuer Tracker"
-    add_one: "Füge eins hinzu"
-    google_analytics_id: "Analytics-ID"
-    back_to_trackers_list: "Zurück zur Trackers-Liste"
     name: "Name"
     description: "Beschreibung"
     type: "Art"
@@ -3166,14 +3137,6 @@ de_DE:
           bulk_coop_allocation: 'Massenkoop - Zuteilung'
           bulk_coop_packing_sheets: 'Massenkoop - Verpackungsblätter'
           bulk_coop_customer_payments: 'Massenkoop - Kundenzahlungen'
-        enterprise_fee_summaries:
-          filters:
-            date_range: "Datumsbereich"
-            report_format_csv: "Als CSV herunterladen"
-            generate_report: "Bericht generieren"
-          report:
-            none: "Keine"
-            select_and_search: "Wählen Sie Filter aus und klicken Sie auf GENERATE REPORT, um auf Ihre Daten zuzugreifen."
       users:
         index:
           listing_users: "Benutzer auflisten"
@@ -3218,14 +3181,11 @@ de_DE:
         autocomplete:
           producer_name: "Produzent"
           unit: "Einheit"
-      general_settings:
+      shared:
+        sortable_header:
+          name: "Name"
         edit:
-          legal_settings: "Rechtliche Einstellungen"
-          cookies_consent_banner_toggle: "Zeigen Sie das Zustimmungsbanner für Cookies"
-          privacy_policy_url: "Datenschutz URL"
           enterprises_require_tos: "Unternehmen müssen die AGB akzeptieren"
-          cookies_policy_matomo_section: "Zeigen Sie den Matomo-Abschnitt auf der Cookie-Richtlinienseite an"
-          cookies_policy_ga_section: "Google Analytics-Abschnitt auf der Cookie-Richtlinienseite anzeigen"
           footer_tos_url: "AGB URL"
     checkout:
       payment:

config/locales/en.yml

@@ -362,6 +362,7 @@ en:
     choose: "Choose..."
     please_select: Please select...
 
+    column_save_as_default: Save As Default
     columns: Columns
     actions: Actions
     viewing: "Viewing: %{current_view_name}"
@@ -1403,14 +1404,8 @@ en:
       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."
@@ -1703,26 +1698,6 @@ See the %{link} to find out more about %{sitename}'s features and to start using
 
   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
@@ -2053,6 +2028,7 @@ See the %{link} to find out more about %{sitename}'s features and to start using
   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"
@@ -2828,6 +2804,14 @@ See the %{link} to find out more about %{sitename}'s features and to start using
 
   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."
@@ -2910,6 +2894,8 @@ See the %{link} to find out more about %{sitename}'s features and to start using
     location: "Location"
     count_on_hand: "Count On Hand"
     quantity: "Quantity"
+    on_demand: "On Demand"
+    on_hand: "On Hand"
     package_from: "package from"
     item_description: "Item Description"
     price: "Price"
@@ -2972,14 +2958,6 @@ See the %{link} to find out more about %{sitename}'s features and to start using
     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."
@@ -3037,13 +3015,6 @@ See the %{link} to find out more about %{sitename}'s features and to start using
     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"
@@ -3331,14 +3302,6 @@ See the %{link} to find out more about %{sitename}'s features and to start using
           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"
@@ -3380,17 +3343,29 @@ See the %{link} to find out more about %{sitename}'s features and to start using
           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"
+      shared:
+        sortable_header:
+          number: "Number"
+          state: "State"
+          payment_state: "Payment State"
+          shipment_state: "Shipment State"
+          email: "Email"
+          total: "Total"
       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:

config/locales/en_AU.yml

@@ -1320,14 +1320,8 @@ en_AU:
       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."
@@ -1585,22 +1579,6 @@ en_AU:
   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
@@ -2599,6 +2577,14 @@ en_AU:
       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."
@@ -2676,6 +2662,8 @@ en_AU:
     location: "Location"
     count_on_hand: "Count On Hand"
     quantity: "Quantity"
+    on_demand: "On Demand"
+    on_hand: "On Hand"
     package_from: "package from"
     item_description: "Item Description"
     price: "Price"
@@ -2736,14 +2724,6 @@ en_AU:
     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
@@ -2790,12 +2770,6 @@ en_AU:
     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"
@@ -3072,14 +3046,6 @@ en_AU:
           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"
@@ -3124,14 +3090,15 @@ en_AU:
         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:

config/locales/en_BE.yml

@@ -1278,14 +1278,8 @@ en_BE:
       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."
@@ -1543,22 +1537,6 @@ en_BE:
   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
@@ -2557,6 +2535,14 @@ en_BE:
       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."
@@ -2632,6 +2618,8 @@ en_BE:
     location: "Location"
     count_on_hand: "Count On Hand"
     quantity: "Quantity"
+    on_demand: "On Demand"
+    on_hand: "On Hand"
     package_from: "package from"
     item_description: "Item Description"
     price: "Price"
@@ -2692,14 +2680,6 @@ en_BE:
     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
@@ -2746,12 +2726,6 @@ en_BE:
     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"
@@ -2991,14 +2965,6 @@ en_BE:
           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"
@@ -3032,14 +2998,15 @@ en_BE:
         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:

config/locales/en_CA.yml

@@ -1315,14 +1315,8 @@ en_CA:
       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."
@@ -1581,22 +1575,6 @@ en_CA:
   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: "Hubs"
-  modal_hubs_abstract: Our  hubs are the point of contact between you and the people who grow & make local sustainable things!
-  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 fhub is a sales/distribution point with independent operations and logistics - so variations between hubs are to be expected.
-  modal_hubs_content2: You can only shop at one 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  hub near you to start shopping! You can expand each hub to see what kinds of products are available, and click through to start. (You can only shop one hub at a time.)
-  modal_how_pickup: Pick-ups, delivery and shipping costs
-  modal_how_pickup_explained: Some  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 hub is a sales point with independent  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 things you can shop for on the Open Food Network."
   producers_about: About us
   producers_buy: Shop for
   producers_contact: Contact
@@ -2677,6 +2655,14 @@ en_CA:
       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."
@@ -2754,6 +2740,8 @@ en_CA:
     location: "Location"
     count_on_hand: "Count On Hand"
     quantity: "Quantity"
+    on_demand: "On Demand"
+    on_hand: "On Hand"
     package_from: "package from"
     item_description: "Item Description"
     price: "Price"
@@ -2814,14 +2802,6 @@ en_CA:
     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
@@ -2868,12 +2848,6 @@ en_CA:
     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"
@@ -3155,14 +3129,6 @@ en_CA:
           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"
@@ -3207,14 +3173,15 @@ en_CA:
         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:

config/locales/en_DE.yml

@@ -1288,14 +1288,8 @@ en_DE:
       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."
@@ -1553,22 +1547,6 @@ en_DE:
   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
@@ -2567,6 +2545,14 @@ en_DE:
       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."
@@ -2644,6 +2630,8 @@ en_DE:
     location: "Location"
     count_on_hand: "Count On Hand"
     quantity: "Quantity"
+    on_demand: "On Demand"
+    on_hand: "On Hand"
     package_from: "package from"
     item_description: "Item Description"
     price: "Price"
@@ -2704,14 +2692,6 @@ en_DE:
     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
@@ -2758,12 +2738,6 @@ en_DE:
     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"
@@ -3007,14 +2981,6 @@ en_DE:
           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"
@@ -3048,14 +3014,15 @@ en_DE:
         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:

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
@@ -1919,6 +1898,7 @@ en_FR:
   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"
@@ -2683,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."
@@ -2760,6 +2748,8 @@ en_FR:
     location: "Location"
     count_on_hand: "Count On Hand"
     quantity: "Quantity"
+    on_demand: "On Demand"
+    on_hand: "On Hand"
     package_from: "package from"
     item_description: "Item Description"
     price: "Price"
@@ -2820,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
@@ -2874,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"
@@ -3161,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"
@@ -3210,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:

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."
@@ -1586,22 +1581,6 @@ en_GB:
   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
@@ -1919,6 +1898,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 +2669,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."
@@ -2766,6 +2754,8 @@ en_GB:
     location: "Location"
     count_on_hand: "Count In Stock"
     quantity: "Quantity"
+    on_demand: "Unlimited"
+    on_hand: "In Stock"
     package_from: "package from"
     item_description: "Item Description"
     price: "Price"
@@ -2826,14 +2816,6 @@ en_GB:
     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
@@ -2880,12 +2862,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"
@@ -3167,14 +3143,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"
@@ -3219,14 +3187,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:

config/locales/en_NZ.yml

@@ -1320,14 +1320,8 @@ en_NZ:
       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 +1580,6 @@ en_NZ:
   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
@@ -2683,6 +2661,14 @@ en_NZ:
       start_free_profile: "Start with a basic 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."
@@ -2760,6 +2746,8 @@ en_NZ:
     location: "Location"
     count_on_hand: "Count On Hand"
     quantity: "Quantity"
+    on_demand: "On Demand"
+    on_hand: "On Hand"
     package_from: "package from"
     item_description: "Item Description"
     price: "Price"
@@ -2820,14 +2808,6 @@ en_NZ:
     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
@@ -2874,12 +2854,6 @@ en_NZ:
     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"
@@ -3161,14 +3135,6 @@ en_NZ:
           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,14 +3179,15 @@ en_NZ:
         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:

config/locales/en_PH.yml

@@ -1320,14 +1320,8 @@ en_PH:
       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 +1580,6 @@ en_PH:
   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
@@ -2683,6 +2661,14 @@ en_PH:
       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."
@@ -2760,6 +2746,8 @@ en_PH:
     location: "Location"
     count_on_hand: "Count On Hand"
     quantity: "Quantity"
+    on_demand: "On Demand"
+    on_hand: "On Hand"
     package_from: "package from"
     item_description: "Item Description"
     price: "Price"
@@ -2820,14 +2808,6 @@ en_PH:
     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
@@ -2874,12 +2854,6 @@ en_PH:
     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"
@@ -3161,14 +3135,6 @@ en_PH:
           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,14 +3179,15 @@ en_PH:
         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:

config/locales/en_US.yml

@@ -1316,14 +1316,8 @@ en_US:
       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 behavior, identify which features you use most, or don’t use, understand user experience issues, etc."
-      statistics_cookies_analytics_desc_html: "To collect and analyze 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 analyze 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."
@@ -1582,22 +1576,6 @@ en_US:
   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 organizations and relationships between hubs which make up the Open Food Network.
-  modal_groups_content2: Some groups are clustered by location, 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
@@ -2676,6 +2654,14 @@ en_US:
       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."
@@ -2753,6 +2739,8 @@ en_US:
     location: "Location"
     count_on_hand: "Count On Hand"
     quantity: "Quantity"
+    on_demand: "On Demand"
+    on_hand: "On Hand"
     package_from: "package from"
     item_description: "Item Description"
     price: "Price"
@@ -2813,14 +2801,6 @@ en_US:
     smtp_send_copy_to_this_addresses: "Sends a copy of all outgoing mail 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
@@ -2867,12 +2847,6 @@ en_US:
     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"
@@ -3154,14 +3128,6 @@ en_US:
           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"
@@ -3205,14 +3171,15 @@ en_US:
         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:

config/locales/en_ZA.yml

@@ -1284,14 +1284,8 @@ en_ZA:
       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."
@@ -1549,22 +1543,6 @@ en_ZA:
   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
@@ -2570,6 +2548,14 @@ en_ZA:
       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."
@@ -2645,6 +2631,8 @@ en_ZA:
     location: "Location"
     count_on_hand: "Count On Hand"
     quantity: "Quantity"
+    on_demand: "Unlimited"
+    on_hand: "In Stock"
     package_from: "package from"
     item_description: "Item Description"
     price: "Price"
@@ -2705,14 +2693,6 @@ en_ZA:
     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
@@ -2759,12 +2739,6 @@ en_ZA:
     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"
@@ -3005,14 +2979,6 @@ en_ZA:
           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"
@@ -3046,14 +3012,15 @@ en_ZA:
         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:

config/locales/es.yml

@@ -31,6 +31,10 @@ es:
               taken: "Ya existe una cuenta con este email. Inicie sesión o restablezca tu contraseña."
         spree/order:
           no_card: No hay tarjetas de crédito autorizadas disponibles para cargar
+        spree/credit_card:
+          attributes:
+            base:
+              card_expired: "ha expirado"
         order_cycle:
           attributes:
             orders_close_at:
@@ -52,6 +56,8 @@ es:
         shipping_method_ids: "Métodos de envío"
         payment_method_ids: "Métodos de Pago"
     errors:
+      messages:
+        inclusion: "no está incluido en la lista"
       models:
         order_management/subscriptions/validator:
           attributes:
@@ -246,6 +252,8 @@ es:
   notes: Notas
   error: Error
   processing_payment: "Procesando el pago..."
+  no_pending_payments: "No tiene pagos pendientes"
+  invalid_payment_state: "Estado de pago no válido"
   filter_results: Filtrar resultados
   quantity: Cantidad
   pick_up: Recogida
@@ -438,9 +446,12 @@ es:
         infinity: "infinito"
         to_order_tip: "Los artículos hechos según demanda no tienen un nivel de stock, como por ejemplo panes hechos según demanda."
       back_to_products_list: "Volver a la lista de productos"
+      editing_product: "Editando producto"
       tabs:
+        product_details: "Detalles del Producto"
         group_buy_options: "Opciones de compra grupales"
         images: "Imágenes"
+        variants: "variaciones"
         product_properties: "Propiedades del producto"
     product_import:
       title: Importación de productos
@@ -699,6 +710,11 @@ es:
           enable_subscriptions_false: "Deshabilitado"
           enable_subscriptions_true: "Habilitado"
           shopfront_message: "Mensaje de la Tienda"
+          shopfront_message_placeholder: >
+              Mensaje de bienvenida opcional para compradores, explica como comprar
+              en el sitio. si el texto se agrega en este campo, va a ser mostrado
+              en la pestaña de inicio cuando los clientes ingresen por primera vez
+              a la tienda.
           shopfront_message_link_tooltip: "Insertar / editar enlace"
           shopfront_message_link_prompt: "Por favor introduzca una URL para insertar"
           shopfront_closed_message: "Mensaje de tienda cerrada"
@@ -836,25 +852,38 @@ es:
       new:
         create: "Crear"
         cancel: "Cancelar"
+        back_to_list: "Regresar a la lista"
       edit:
         advanced_settings: "Configuración Avanzada"
         save: "Guardar"
+        save_and_next: "Salvar y continuar"
         next: "Siguiente"
         cancel: "Cancelar"
+        back_to_list: "Regresar a la lista"
+        save_and_back_to_list: "Salvar y volver a lista"
         choose_products_from: "Escoger Productos desde:"
       incoming:
         save: "Guardar"
+        save_and_next: "Salvar y continuar"
         next: "Siguiente"
         cancel: "Cancelar"
+        back_to_list: "Regresar a la lista"
       outgoing:
         outgoing: "Saliente"
         distributor: "Distribuidora"
         products: "Productos"
         tags: "Tags"
+        delivery_details: "Detalles de entrega"
         fees: "Comisiones"
         previous: "Anterior"
         save: "Guardar"
+        save_and_back_to_list: "Salvar y volver a lista"
         cancel: "Cancelar"
+        back_to_list: "Regresar a la lista"
+      wizard_progress:
+        edit: "1. Configuración general"
+        incoming: "2. Productos entrantes"
+        outgoing: "3. Productos salientes"
       exchange_form:
         pickup_time_tip: Cuando los pedidos de este ciclo de pedido estarán listos para la consumidora
         pickup_instructions_placeholder: "Instrucciones de recogida"
@@ -1092,10 +1121,13 @@ es:
       destroy_attachment_does_not_exist: "El logotipo no existe"
     enterprise_promo_image:
       destroy_attachment_does_not_exist: "La imagen promocional no existe"
+    orders:
+      failed_to_update: "Error al actualizar pedido"
   checkout:
     already_ordered:
       cart: "carrito"
       message_html: "Ya realizó un pedido para este ciclo de pedido. Compruebe el %{cart}para ver los artículos que pidió. También puede cancelar artículos mientras el ciclo de pedido siga abierto."
+    failed: "La finalización de compra falló, por favor comunicate con nosotros para procesar la orden."
   shops:
     hubs:
       show_closed_shops: "Mostrar tiendas cerradas"
@@ -1266,6 +1298,7 @@ es:
   saving_credit_card: Guardando tarjeta de crédito...
   card_has_been_removed: "Su tarjeta ha sido eliminada (número: %{number})"
   card_could_not_be_removed: Lo sentimos, la tarjeta no se pudo quitar
+  invalid_credit_card: "Tarjeta de crédito inválida"
   ie_warning_headline: "Su navegador está desactualizado :-("
   ie_warning_text: "Para la mejor esperiencia de Open Food Network, recomendamos actualizar su navegador:"
   ie_warning_chrome: Descargar Chrome
@@ -1289,14 +1322,8 @@ es:
       cookie_stripe_desc: "Datos recopilados por nuestro procesador de pagos Stripe para detectar fraudes https://stripe.com/cookies-policy/legal. No todas las tiendas usan Stripe como método de pago pero es una buena práctica evitar fraude aplicarlo a todas las páginas. Stripe probablemente crea una imagen de cuáles de nuestras páginas generalmente interactúan con su API y luego marca cualquier cosa inusual. Por lo tanto configurar la cookie Stripe tiene una función más amplia que la simple provisión de un método de pago a un usuario. Eliminarla podría afectar la seguridad del servicio en sí. Puede obtener más información acerca de Stripe y leer su política de privacidad en https://stripe.com/privacy."
       statistics_cookies: "Cookies de estadísticas"
       statistics_cookies_desc: "Las siguientes no son estrictamente necesarias, pero ayudan a proporcionarle una mejor experiencia de usuario al permitirnos analizar el comportamiento del usuario, identificar qué funciones usa más o no, comprender los problemas de la experiencia del usuario, etc."
-      statistics_cookies_analytics_desc_html: "Para recopilar y analizar los datos de uso de la plataforma utilizamos Google Analytics, ya que era el servicio predeterminado conectado con Spree (el software de código abierto de comercio electrónico en el que creamos) pero nuestra visión es cambiar a <a href = 'https: / /matomo.org/ 'target =' _ blank '> Matomo </a> (ex Piwik, herramienta analítica de código abierto que cumple con GDPR y protege tu privacidad) tan pronto como podamos."
       statistics_cookies_matomo_desc_html: "Para recopilar y analizar los datos de uso de la plataforma, utilizamos <a href='https://matomo.org/' target='_blank'> Matomo </a> (ex Piwik), una herramienta analítica de código abierto que cumple con GDPR y protege tu privacidad"
       statistics_cookies_matomo_optout: "¿Deseas excluirte de Matomo Analytics? No recopilamos ningún dato personal y Matomo nos ayuda a mejorar nuestro servicio, pero respetamos tu elección :-)"
-      cookie_analytics_utma_desc: "Se usa para distinguir usuarios y sesiones. La cookie se crea cuando la biblioteca javascript se ejecuta y no existe ninguna cookie __utma existente. La cookie se actualiza cada vez que se envían datos a Google Analytics."
-      cookie_analytics_utmt_desc: "Se usa para acelerar la tasa de solicitud."
-      cookie_analytics_utmb_desc: "Se utiliza para determinar nuevas sesiones / visitas. La cookie se crea cuando la librería javascript se ejecuta y no existe ninguna cookie __utmb existente. La cookie se actualiza cada vez que los datos se envían a Google Analytics."
-      cookie_analytics_utmc_desc: "No utilizado en ga.js. Establecer para la interoperabilidad con urchin.js. Históricamente, esta cookie funcionó junto con la cookie __utmb para determinar si el usuario estaba en una nueva sesión / visita."
-      cookie_analytics_utmz_desc: "Almacena la fuente de tráfico o la campaña que explica cómo el usuario llegó a su sitio. La cookie se crea cuando se ejecuta la librería javascript y se actualiza cada vez que se envían datos a Google Analytics."
       cookie_matomo_basics_desc: "Matomo cookies de origen para recopilar estadísticas."
       cookie_matomo_heatmap_desc: "Matomo Heatmap y sesión de grabación de cookies."
       cookie_matomo_ignore_desc: "Cookie utilizada para excluir al usuario de ser rastreado."
@@ -1467,6 +1494,7 @@ es:
   shopping_oc_closed_description: "Por favor espere hasta que el próximo ciclo abra (o contactanos de forma directa para ver si podemos aceptar algunos pedidos tardíos)"
   shopping_oc_last_closed: "El último ciclo cerró hace %{distance_of_time}"
   shopping_oc_next_open: "El próximo ciclo abrirá en %{distance_of_time}"
+  shopping_oc_select: "Seleccionar"
   shopping_tabs_home: "Inicio"
   shopping_tabs_shop: "Tienda"
   shopping_tabs_about: "Acerca de"
@@ -1554,22 +1582,6 @@ es:
   groups_signup_contact_text: "Póngase en conta para descubrir qué puede hacer OFN por usted:"
   groups_signup_detail: "Aquí está el detalle."
   login_invalid: "Correo electrónico o contraseña inválidos"
-  modal_hubs: "Hubs"
-  modal_hubs_abstract: ¡Nuestros Grupos de Consumo son el punto de contacto entre usted y la gente que hace su comida!
-  modal_hubs_content1: Puede buscar un grupo de consumo conveniente por ubicación o nombre. Algunos grupos de consumo tienen múltiples puntos en loa que puede recoger las compras, y algunos también brindan opciones de entrega a domicilio. Cada Grupo de Consumo es un punto de venta con operaciones de negocio y logística independientes, entonces puede esperar diferencias entre Grupos de Consumo.
-  modal_hubs_content2: Sólo puedes comprar en un grupo de consumo a la vez.
-  modal_groups: "Redes / Regiones"
-  modal_groups_content1: Estas son las organizaciones y relaciones entre grupos de consumo que conforman el Open Food Network.
-  modal_groups_content2: Algunas redes están organizadas por ubicación, otros por afinidades no geográficas.
-  modal_how: "Cómo funciona"
-  modal_how_shop: Comprar en Open Food Network
-  modal_how_shop_explained: ¡Buscar un grupo de consumo cerca de ti para empezar a comprar! Puedes expandir cada grupo de consumo para ver qué tipos de productos están disponibles, y hacer clic para empezar a comprar. (Sólo puedes comprar en un grupo de consumo a la vez.)
-  modal_how_pickup: Recogida, entrega y gastos de envío
-  modal_how_pickup_explained: Algunos grupos de consumo hacen entregas hasta su puerta, mientras otros requieren que recojas las compras. Puedes ver que opciones están disponibles en su página de inicio, y seleccionar cuál te gustaría en las páginas de compras y revisión. Las entregas costarán más, y el precio cambia entre grupos de consumo. Cada grupo es un punto de venta con operaciones y logística independientes, las diferencias son normales y deseables.
-  modal_how_more: Aprender más
-  modal_how_more_explained: "Si quieres saber más acerca de Open Food Network, cómo trabajamos y nos organizamos, visita:"
-  modal_producers: "Productoras"
-  modal_producers_explained: "Nuestras productoras hacen todos los deliciosos alimentos que puedes comprar en Open Food Network."
   producers_about: Acerca de nosotras
   producers_buy: Comprar
   producers_contact: Contacto
@@ -1840,6 +1852,7 @@ es:
         headline: "¡Terminado!"
         thanks: "Gracias por llenar los detalles de %{enterprise}."
         login: "Puede cambiar o actualizar su negocio en cualquier etapa iniciando sesión en Open Food Network y yendo a Admin."
+        action: "Ir al Panel de Organización"
   back: "Atrás"
   continue: "Continuar"
   action_or: "Ó"
@@ -1925,6 +1938,7 @@ es:
   tax_category: "Categoría del impuesto"
   calculator: "Calculadora"
   calculator_values: "Calculadora de valores"
+  calculator_settings_warning: "Si está cambiando el tipo de calculadora, debe de salvar primero antes de editar las configuraciones de la calculadora"
   flat_percent_per_item: "Porcentaje fijo (por artículo)"
   flat_rate_per_item: "Tarifa plana (por artículo)"
   flat_rate_per_order: "Tarifa plana (por pedido)"
@@ -2255,6 +2269,7 @@ es:
   enterprise_register_success_notice: "¡Felicidades! ¡Se ha completado el registro de %{enterprise}!"
   enterprise_bulk_update_success_notice: "Organizaciones actualizadas con éxito"
   enterprise_bulk_update_error: 'Error en la actualización'
+  enterprise_shop_show_error: "La tienda que busca no existe o esta inactiva en OFN. por favor visita otras tiendas."
   order_cycles_create_notice: 'Se ha creado el ciclo de pedido.'
   order_cycles_update_notice: 'Se ha actualizado su ciclo de pedido.'
   order_cycles_bulk_update_notice: 'Los ciclos de pedido han sido actualizados.'
@@ -2410,6 +2425,12 @@ es:
           severity: Gravedad
           description: Descripción
           resolve: Resolver
+        exchange_products:
+          load_more_variants: "Cargar mas variantes"
+          load_all_variants: "cargar todas las variantes"
+          select_all_variants: "Seleccionar todo"
+          variants_loaded: "%{num_of_variants_loaded} de %{total_number_of_variants} variantes cargadas"
+          loading_variants: "Cargando variantes"
       tag_rules:
         shipping_method_tagged_top: "Métodos de envío etiquetados"
         shipping_method_tagged_bottom: "son:"
@@ -2492,6 +2513,7 @@ es:
           customer_placeholder: "customer@example.org"
           valid_email_error: "Introduce un email válido"
       subscriptions:
+        error_saving: "Error al salvar suscripción "
         new:
           please_select_a_shop: "Por favor seleccione una tienda"
     insufficient_stock: "Stock insuficiente disponible, solo quedan %{on_hand}"
@@ -2567,11 +2589,92 @@ es:
       signup_or_login: "Empieza registrándose (o iniciando sesión)"
       have_an_account: "¿Ya tiene una cuenta?"
       action_login: "Inicie sesión ahora."
+  inflections:
+    each:
+      one: "each"
+      other: "cada"
+    bunch:
+      one: "manojo"
+      other: "manojos"
+    pack:
+      one: "paquete"
+      other: "paquetes"
+    box:
+      one: "caja"
+      other: "cajas"
+    bottle:
+      one: "botella"
+      other: "botellas"
+    jar:
+      one: "frasco"
+      other: "frascos"
+    head:
+      one: "cabeza"
+      other: "cabezas"
+    bag:
+      one: "bolsa"
+      other: "bolsas"
+    loaf:
+      one: "hogaza"
+      other: "hogazas"
+    single:
+      one: "single"
+      other: "individuales"
+    tub:
+      one: "tub"
+      other: "recipientes"
+    punnet:
+      one: "canastilla"
+      other: "canastillas"
+    packet:
+      one: "paquete"
+      other: "paquetes"
+    item:
+      one: "elemento"
+      other: "elementos"
+    dozen:
+      one: "docena"
+      other: "docenas"
+    unit:
+      one: "unidad"
+      other: "unidades"
+    serve:
+      one: "serve"
+      other: "porción"
+    tray:
+      one: "bandeja"
+      other: "bandejas"
+    piece:
+      one: "pieza"
+      other: "piezas"
+    pot:
+      one: "maceta"
+      other: "contenedores"
+    bundle:
+      one: "haz"
+      other: "paquetes"
+    flask:
+      one: "flask"
+      other: "frascos"
+    basket:
+      one: "canasta"
+      other: "canastas"
+    sack:
+      one: "sacos"
+      other: "sacos"
   producers:
     signup:
       start_free_profile: "Empieze con un perfil gratuito, y amplíelo cuando esté preparado!"
   order_management:
     reports:
+      enterprise_fee_summaries:
+        filters:
+          date_range: "Rango de fechas"
+          report_format_csv: "Descargar como CSV"
+          generate_report: "Generar informe"
+        report:
+          none: "Ninguno"
+          select_and_search: "Seleccione los filtros y haga clic en GENERAR INFORME para acceder a sus datos."
       enterprise_fee_summary:
         date_end_before_start_error: "debe ser después del comienzo"
         parameter_not_allowed_error: "No está autorizado a usar uno o más filtros seleccionados para este informe."
@@ -2649,6 +2752,8 @@ es:
     location: "Ubicación"
     count_on_hand: "Cuenta de disponibilidad"
     quantity: "Cantidad"
+    on_demand: "Bajo demanda"
+    on_hand: "Disponibles"
     package_from: "perfil de"
     item_description: "Descripción del artículo"
     price: "Precio"
@@ -2709,14 +2814,6 @@ es:
     smtp_send_copy_to_this_addresses: "Envía una copia de todos los correos salientes a esta dirección. Para direcciones múltiples, sepárelas con comas."
     intercept_email_address: "Interceptar la dirección de correo electrónico"
     intercept_email_instructions: "Anular destinatario de correo electrónico y reemplazar con esta dirección."
-    smtp: "SMTP"
-    smtp_domain: "Dominio SMTP"
-    smtp_mail_host: "Alojamiento de correo SMTP"
-    smtp_port: "Puerto SMTP"
-    secure_connection_type: "Tipo de conexión segura"
-    smtp_authentication_type: "Tipo de autenticación SMTP"
-    smtp_username: "Nombre de usuario SMTP"
-    smtp_password: "Contraseña SMTP"
     image_settings: "Ajustes de imagen"
     image_settings_warning: "Deberá regenerar las miniaturas si actualiza los estilos de paperclip. Utilize rake paperclip:refresh:thumbnails CLASS=Spree::Image para hacer esto."
     attachment_default_style: Estilo de los archivos adjuntos
@@ -2763,12 +2860,6 @@ es:
     shipping_categories: "Categorías de envío"
     new_shipping_category: "Nueva categoría de envío"
     back_to_shipping_categories: "Volver a las categorías de envío"
-    analytics_trackers: "Analizadores de seguimiento"
-    no_trackers_found: "No se encontraron rastreadores"
-    new_tracker: "Nuevo rastreador"
-    add_one: "Agrega uno"
-    google_analytics_id: "ID d'Analytics"
-    back_to_trackers_list: "Volver a la lista de rastreadores"
     name: "Nombre"
     description: "Descripción"
     type: "Tipo"
@@ -2792,6 +2883,12 @@ es:
     minimal_amount: "Cantidad mínima"
     normal_amount: "Cantidad normal"
     discount_amount: "Importe de descuento"
+    no_images_found: "No se encontraron imágenes "
+    new_image: "Nueva Imagen"
+    filename: "Nombre de archivo"
+    alt_text: "Texto Alternativo"
+    thumbnail: "Miniatura"
+    back_to_images_list: "Volver a lista de imágenes "
     email: Email
     account_updated: "Cuenta actualizada!"
     email_updated: "La cuenta se actualizará una vez que se confirme el nuevo correo electrónico."
@@ -2803,6 +2900,9 @@ es:
     zipcode: Código Postal
     weight: Peso (en kg)
     error_user_destroy_with_orders: "Los usuarios con pedidos completados no pueden ser eliminados"
+    cannot_create_payment_without_payment_methods: "No se puede crear un pago para una orden sin un medio de pago definido"
+    please_define_payment_methods: "por favor definir métodos de pago"
+    options: "Opciones"
     actions:
       update: "Actualizar"
     errors:
@@ -2834,27 +2934,53 @@ es:
       product_properties:
         index:
           inherits_properties_checkbox_hint: "¿Heredar propiedades desde %{supplier}? (a menos que sea anulado arriba)"
+          add_product_properties: "Agregar Propiedades del producto"
+          select_from_prototype: "seleccionar de prototipo"
       properties:
         index:
           properties: "Propiedades"
+          new_property: "Nueva propiedad"
           name: "Nombre"
+          presentation: "presentación"
+        new:
+          new_property: "Nueva propiedad"
+        edit:
+          editing_property: "Editar Propiedad"
+          back_to_properties_list: "volver a lista de propiedades"
         form:
           name: "Nombre"
+          presentation: "presentación"
       return_authorizations:
         index:
+          new_return_authorization: "Nueva autorización de devolución"
           return_authorizations: "Autorizaciones de devolución"
           back_to_orders_list: "Volver a la lista de pedidos"
+          rma_number: "número RMA"
           status: "Estado"
           amount: "Cantidad"
           cannot_create_returns: "No se pueden crear devoluciones ya que este pedido no tiene unidades enviadas."
           continue: "Continuar"
         new:
+          new_return_authorization: "Nueva autorización de devolución"
+          back_to_return_authorizations_list: "Back To Return Authorization List"
           continue: "Continuar"
         edit:
+          receive: "recibir"
           are_you_sure: "¿Está seguro?"
+          return_authorization: "volver a autorización"
         form:
           product: "Producto"
+          quantity_shipped: "cantidad enviada"
+          quantity_returned: "Cantidad devuelta"
+          return_quantity: "cantidad a devolver"
           amount: "Cantidad"
+          rma_value: "Valor RMA"
+          reason: "razón"
+          stock_location: "localización de inventario"
+        states:
+          authorized: "autorizado"
+          received: "recibido"
+          canceled: "cancelado"
       orders:
         index:
           listing_orders: "Pedidos de listado"
@@ -2862,6 +2988,7 @@ es:
           capture: "Captura"
           ship: "Envío"
           edit: "Editar"
+          order_not_updated: "El pedido no se pudo actualizar"
           note: "Nota"
           first: "primero"
           last: "Último"
@@ -2884,6 +3011,8 @@ es:
           tax_invoice: "FACTURA DE IMPUESTOS"
           code: "Código"
           from: "De"
+          to: "Facturar a"
+          shipping: "envío"
         form:
           distribution_fields:
             title: "Distribución"
@@ -3012,14 +3141,6 @@ es:
           bulk_coop_allocation: 'Bulk Co-op - Asignación'
           bulk_coop_packing_sheets: 'Bulk Co-op - Hojas de Empaquetado'
           bulk_coop_customer_payments: 'Bulk Co-op - Pagos de las Consumidoras'
-        enterprise_fee_summaries:
-          filters:
-            date_range: "Rango de fechas"
-            report_format_csv: "Descargar como CSV"
-            generate_report: "Generar informe"
-          report:
-            none: "Ninguno"
-            select_and_search: "Seleccione los filtros y haga clic en GENERAR INFORME para acceder a sus datos."
       users:
         index:
           listing_users: "Listado de Usuarias"
@@ -3044,23 +3165,35 @@ es:
         index:
           sku: "SKU"
           price: "Precio"
+          options: "Opciones"
           no_results: "No hay resultados"
+          to_add_variants_you_must_first_define: "para agregar variantes, se debe primero definir"
           option_types: "Tipos de opciones"
+          option_values: "valores de opción"
+          and: "y"
+          new_variant: "Nueva Variante"
+          show_active: "mostrar activo"
+          show_deleted: "Mostrar eliminados"
+        new:
+          new_variant: "Nueva Variante"
         form:
+          cost_price: "Precio de costo"
           sku: "SKU"
           price: "Precio"
           display_as: "Mostrar como"
+          display_name: "Nombre para mostrar"
         autocomplete:
           producer_name: "Productora"
           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"
           privacy_policy_url: "Vínculo con la Política de privacidad"
           enterprises_require_tos: "Las organizaciones deben aceptar los Términos del Servicio"
           cookies_policy_matomo_section: "Mostrar la sección de Matomo en la página de política de cookies"
-          cookies_policy_ga_section: "Mostrar la sección de Google Analytics en la página de la política de cookies"
           footer_tos_url: "URL de términos y servicios"
     checkout:
       payment:
@@ -3195,3 +3328,19 @@ es:
         allow_charges?: "¿Permitir cargos?"
     localized_number:
       invalid_format: tiene un formato invalido. Por favor introduzca un numero.
+    api:
+      invalid_api_key: "La llave de API especificada (%{key}) es inválida."
+      unauthorized: "No tiene autorización para realizar esta acción."
+      invalid_resource: "Recurso inválido. Por favor corrija los errores e intente nuevamente."
+      resource_not_found: "El recurso que buscaba no puede ser encontrado."
+      access: "acceso al API"
+      key: "Llave"
+      clear_key: "valor vacío"
+      regenerate_key: "Regenerar llave"
+      no_key: "sin valor"
+      generate_key: "Generar llave de API"
+      key_generated: "Llave generada"
+      key_cleared: "valor borrado"
+      shipment:
+        cannot_ready: "No se puede completar envío"
+      invalid_taxonomy_id: "El identificador de taxonomía es inválido."

config/locales/fil_PH.yml

@@ -47,12 +47,12 @@ fil_PH:
   activemodel:
     attributes:
       order_management/reports/enterprise_fee_summary/parameters:
-        start_at: "Simula"
-        end_at: "Hanggang"
+        start_at: "Magsisimula"
+        end_at: "Matatapos"
         distributor_ids: "Hubs"
         producer_ids: "Producers"
         order_cycle_ids: "Order Cycles"
-        enterprise_fee_ids: "pangalan ng mga bayarin"
+        enterprise_fee_ids: "pangalan ng mga Fees"
         shipping_method_ids: "Mga Paraan ng Pagpapadala"
         payment_method_ids: "Mga Paraan ng Pagbabayad"
     errors:
@@ -63,9 +63,9 @@ 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"
+              after_begins_at: "ay dapat pagkatapos ng magsisimula ng"
             customer:
               does_not_belong_to_shop: "ay hindi nabibilang sa%{shop}"
             schedule:
@@ -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"
@@ -151,7 +151,7 @@ fil_PH:
     confirmation_summary_email:
       subject: Buod ng mga bagong kumpirmadong subscription orders
       greeting: "Magandang araw%{name},"
-      intro: "sa ilalim ay ang buod ng mga subscription order na na-finalize para sa%{shop}."
+      intro: "sa ilalim ay ang buod ng mga nauulit na order na na-finalize para sa%{shop}."
     summary_overview:
       total: may kabuuuan na %{count}subscriptions ang minarkahan para sa awtomatikong pagproseso.
       success_zero: sa lahat ng ito, walang matagumpay na naproseso
@@ -168,7 +168,7 @@ fil_PH:
         explainer: ang mga order na ito ay hindi naproseso sapagkat walang stock  ng mga ni-request na item.
       complete:
         title: Naproseso Na (%{count}na order)
-        explainer: ang mga order na ito ay namarkahan na kumpleto at hindi na babaguhin
+        explainer: ang mga order na ito ay Kumpleto na at hindi na maaaring babaguhin
       processing:
         title: May Error na Kinaharap (%{count}na order)
         explainer: ang awtomatikong pagproseso ng mga order na ito ay hindi nagtagumpay dahil sa isang error. ang error ay nailista na upang mabusisi kung saan posibleng nagsimula.
@@ -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
+  bulk_order_management: Pamamahala sa mga Bulk 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,10 +309,10 @@ 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"
+    start_date: "Petsa ng Pagsimula"
+    end_date: "Petsa ng Pagtatapos"
     form_invalid: "ang form ay may nawawala o hindi valid na sagot sa mga patlang"
     clear_filters: alisin ang mga filter
     clear: alisin
@@ -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,10 +343,10 @@ 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."
+        enable_receipt_printing?: "ipakita ang mga pagpipilian sa pag-print ng mga resibo gamit ang thermal printers sa dropdown ng order?"
     stripe_connect_settings:
       edit:
         title: "Stripe Connect"
@@ -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'
+        update_address_error: 'Paunawa! Sagutan lahat ng mga 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?'
@@ -404,7 +405,7 @@ fil_PH:
         user_guide: gabay sa gumagamit
     enterprise_fees:
       index:
-        title: "bayad para sa enterprise"
+        title: "fees para sa Enterprise"
         enterprise: "Enterprise"
         fee_type: "uri ng bayad"
         name: "pangalan"
@@ -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:
@@ -563,10 +564,10 @@ fil_PH:
         review_now: tignan ngayon
         new_products_alert_message: mayroong%{new_product_count}bagong mga produkto na maaaring idagdag sa inyong imbentaryo
         currently_empty: ang iyong imbentaryo ay kasalukuyang walang laman
-        no_matching_products: Walang nahanap na katumbas na produkto sa inyong imbentaryo
-        no_hidden_products: Walang produkto na nakatago mula sa imbentaryong ito
+        no_matching_products: Walang nahanap na parehong produkto sa inyong imbentaryo
+        no_hidden_products: Walang produkto na itinago sa imbentaryong ito
         no_matching_hidden_products: walang nakatagong produkto na tugma sa inyong hinahanap na pamantayan
-        no_new_products: walang bagong produkto na maaaring idagdag sa inyong imbentaryo
+        no_new_products: walang bagong produkto na maaaring idagdag sa imbentaryong ito
         no_matching_new_products: walang bagong mga produkto na tugma sa inyong hinahanap na pamantayan
         inventory_powertip: Ito ang imbentaryo ng inyong mga produkto. Upang magdagdag ng produkto sa inyong imbentaryo, piliin ang "Bagong Produkto" sa viewing dropdown.
         hidden_powertip: ang mga produktong ito ay nakatago sa inyong imbentaryo at hindi maaaring idagdag sa inyong shop. maaaring pindutin ang "Idagdag" para madagdag ang produkto sa inyong imbentaryo.
@@ -575,13 +576,13 @@ fil_PH:
         back_to_my_inventory: bumalik sa aking imbentaryo
     orders:
       invoice_email_sent: 'ang invoice email ay naipadala na'
-      order_email_resent: 'ang email ng order ay napadala na muli'
+      order_email_resent: 'ang email ng order ay naipadala na muli'
       bulk_management:
         tip: "gamitin ang pahina na ito para baguhin ang dami ng mga produkto sa maramihang mga order. maaari ding magtanggal ng mga produkto mula sa order kung kinakailangan."
         shared: "ibinahaging pinagkuhanan?"
         order_no: "Order No."
         order_date: "nakumpleto sa"
-        max: "Labis"
+        max: "Max"
         product_unit: "Produkto: Yunit"
         weight_volume: "Timbang/Dami"
         ask: "itanong?"
@@ -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
@@ -633,8 +634,8 @@ fil_PH:
         enterprise_fees:
           name: pangalan
           fee_type: uri ng kabayaran
-          manage_fees: pamahalaan ang mga bayarin para sa enterprise
-          no_fees_yet: wala ka pang kahit anong bayaring pang-enterprise
+          manage_fees: pamahalaan ang fees para sa enterprise
+          no_fees_yet: wala ka pang kahit anong fees para sa enterprise
           create_button: gumawa ng isa ngayon
         images:
           logo: Logo
@@ -740,7 +741,7 @@ fil_PH:
             title: Kumonekta sa Stripe
             part1: ang Stripe ay isang serbisyong nagpoproseso ng mga bayad na ginagawang posible para sa mga shop sa OFN na tumanggap ng bayad gamit ang mga credit card mula sa mga customer.
             part2: para magamit ito, kailangang ikonekta ang iyong Stripe account sa OFN. ang pagpindot ng "pumapayag ako" sa ibaba ay ididirekta ka sa Stripe website kung saan mo maaaring ikonek ang iyong Stripe account o gumawa ng bago kung wala ka pa nito.
-            part3: pinapayagan nito ang Open Food Network na tumanggap para sa iyo ng bayad gamit ang mga credit card mula sa mga customer. tandaan na kailangan mong pangalagaan ang sarili mong Stripe Account, bayaran ang serbisyo ng Stripe, isaayos ang mga paniningil at gawin ang serbisyo sa customer sa sarili mong paraan.
+            part3: pinapayagan nito ang Open Food Network na tumanggap para sa iyo ng bayad gamit ang mga credit card mula sa mga customer. tandaan na kailangan mong pangalagaan ang sarili mong Stripe Account, bayaran ang serbisyo ng Stripe, asikasuhin ang mga chargebacks at Customer service sa sarili mong paraan.
             i_agree: pumapayag ako
             cancel: i-cancel
         tag_rules:
@@ -778,8 +779,8 @@ fil_PH:
         payment_methods_tip: ang enterprise na ito ay walang mga paraan ng pagbabayad
         shipping_methods: mga paraan ng pagpapadala
         shipping_methods_tip: ang enterprise na ito ay may mga paraan ng pagpapadala
-        enterprise_fees: bayad para sa enterprise
-        enterprise_fees_tip: ang enterprise na ito  walang mga bayarin
+        enterprise_fees: fees para sa enterprise
+        enterprise_fees_tip: ang enterprise na ito ay walang fees
       admin_index:
         name: Pangalan
         role: papel na gagampanan
@@ -874,7 +875,7 @@ fil_PH:
         products: "mga produkto"
         tags: "tags"
         delivery_details: "detalye ng pag-deliver"
-        fees: "mga bayarin"
+        fees: "Fees"
         previous: "nauna"
         save: "i-save"
         save_and_back_to_list: "i-save at bumalik sa listahan"
@@ -914,7 +915,7 @@ fil_PH:
         incoming: papasok
         supplier: Supplier
         receival_details: detalye ng pagtanggap
-        fees: mga bayarin
+        fees: Fees
         outgoing: papalabas
         distributor: Distributor
         products: mga produkto
@@ -940,7 +941,7 @@ fil_PH:
         customer_instructions: panuto ng Customer
         customer_instructions_placeholder: tala para sa pag-pick-up o pagdeliver
         products: mga produkto
-        fees: mga bayarin
+        fees: Fees
       destroy_errors:
         orders_present: ang order cycle na ito ay napili na ng isang customer at hindi na maaaring tanggalin. upang maiwasan na ma-access muli, isarado muna ito.
         schedule_present: ang order cycle na ito ay naka-link sa isang iskedyul at hindi maaaring tanggalin. maaaring tanggalin muna ang link o tanggalin muna ang iskedyul.
@@ -964,7 +965,7 @@ fil_PH:
       enterprises_hubs_tabs:
         has_no_payment_methods: "%{enterprise}ay walang paraan ng pagbabayad"
         has_no_shipping_methods: "%{enterprise}ay walang paraan ng pagpapadala"
-        has_no_enterprise_fees: "%{enterprise}ay walang mga bayarin sa enterpise"
+        has_no_enterprise_fees: "%{enterprise}ay walang fees para sa enterpise"
     enterprise_issues:
       create_new: gumawa ng bago
       resend_email: ipadala muli ang email
@@ -1021,7 +1022,7 @@ fil_PH:
         name: ulat sa pagbabalot
       enterprise_fee_summary:
         name: "buod ng bayad sa enterprise"
-        description: "buod ng mga nakolektang bayad sa enterprise"
+        description: "buod ng mga nakolektang fees para sa enterprise"
     subscriptions:
       subscriptions: mga subscription
       new: bagong subscription
@@ -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."
@@ -1588,22 +1583,6 @@ fil_PH:
   groups_signup_contact_text: "Makipag-ugnayan upang malaman kung paano ka matutulungan ng OFN:"
   groups_signup_detail: "ito ang mga detalye:"
   login_invalid: "hindi valid ang email o password"
-  modal_hubs: "Mga Hub ng pagkain"
-  modal_hubs_abstract: ang mga Hub ng pagkain ang namamagitan sa iyo at sa mga gumagawa ng inyong pagkain!
-  modal_hubs_content1: maaari kang humanap ng pinakamalapit na Hub gamit ang lokasyon o pangalan. Ang ibang Hub ay may maraming mga lugar kung saan maaari mong kunin ang iyong pinamili habang ang  iba ay bibigyan ka rin ng iba pang opsyon kung paano mo makukuha ang iyong order. Bawat Food Hub ay may iba ibang paraan ng operasyon at proseso kaya asahan ang kaibahan sa mga binibigay na serbisyo.
-  modal_hubs_content2: Maaari ka lamang mamili sa isang hub ng pagkain sa bawat pagkakataon.
-  modal_groups: "Mga Grupo / Mga Rehiyon"
-  modal_groups_content1: ito ang mga organisasyon at mga relasyon na namamagitan sa mga Hub na bumubuo sa Open Food Network.
-  modal_groups_content2: ang ibang grupo ay pinagsasama sama depende sa lokasyon o lupon, at ang iba ay sa hindi pangheograpiyang pagkakapareho.
-  modal_how: "Paano it gumagana"
-  modal_how_shop: Mamili sa Open Food Network
-  modal_how_shop_explained: maghanap ng hub ng pagkain na pinakamalapit sa iyo para makapagsimulang makapamili. maaring palawakin ng bawat hub upang makita kung anong uri ng pagkain ang inaalok nila at pindutin ng tuluyan para magsimula mamili. (maaari lamang mamili sa isang hub sa isang pagkakataon.)
-  modal_how_pickup: Singil sa Pick-up, pag-deliver at pagpapadala
-  modal_how_pickup_explained: ang ibang food hub ay magde-deliver mismo sa inyong tirahan, habang ang iba ay kakailanganin kang kunin ng personal sa kanila ang inyong mga order. Mababasa sa homepage ang mga opsyon, at piliin ang mga produkto na nais sa pahina ng pamimili at checkout. Ang pagpapa-deliver ay mas mahal at ang halagang babayaran ay nakadepende sa iba't ibang food hub. Bawat Food Hub ay may iba't ibang paraan ng operasyon at proseso kaya dapat asahan ang kaibahan sa mga binibigay na serbisyo.
-  modal_how_more: dagdagan ang kaalaman
-  modal_how_more_explained: "kung nais mong mas maintindihan ang Open Food Network, kung paano ito gumagana at paano makasali dito, tignan ito:"
-  modal_producers: "Producers"
-  modal_producers_explained: "ang aming mga producer ay gumagawa ng masasarap na pagkain na maaari mong mabili sa Open Food Network."
   producers_about: Tungkol sa amin
   producers_buy: 'mamili para sa '
   producers_contact: Makipag-ugnayan
@@ -1729,7 +1708,7 @@ fil_PH:
   error_not_found_in_database: "%{name}ay hindi mahanap sa database"
   error_not_primary_producer: "%{name}ay hindi isang producer"
   error_no_permission_for_enterprise: "\"%{name}\": wala kang permiso para pamahalaan ang mga produkto ng enterprise na ito."
-  item_handling_fees: "bayad sa paghawak ng item (kasama sa kabuuan ng item)"
+  item_handling_fees: "Fee para sa paghawak ng item (kasama sa kabuuan ng item)"
   january: "Enero"
   february: "Pebrero"
   march: "Marso"
@@ -1753,7 +1732,7 @@ fil_PH:
   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"
-  update_and_recalculate_fees: "i-update at kwentahin muli ang mga bayarin"
+  update_and_recalculate_fees: "i-update at kuwentahin muli ang fees"
   registration:
     steps:
       introduction:
@@ -1790,8 +1769,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 +1802,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:
@@ -1880,7 +1859,7 @@ fil_PH:
   action_or: "O"
   enterprise_limit: Limitasyon ng enterprise
   shipping_method_destroy_error: "ang paraan ng pagpapadala ay hindi maaaring burahin sapagkat ito ay nakasangguni na sa isang order:%{number}."
-  fees: "mga bayarin"
+  fees: "fees"
   item_cost: "halaga ng item"
   bulk: "Bulto"
   shop_variant_quantity_min: "pinakakaunti"
@@ -1921,6 +1900,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 +1916,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 +1986,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
@@ -2128,7 +2108,7 @@ fil_PH:
   report_header_sales_tax: "tax sa mga nabenta (%{currency_symbol})"
   report_header_delivery_charge: "bayad sa pag-deliver(%{currency_symbol})"
   report_header_tax_on_delivery: "tax sa pagdeliver (%{currency_symbol})"
-  report_header_tax_on_fees: "tax sa mga bayarin (%{currency_symbol})"
+  report_header_tax_on_fees: "Buwis sa Fees (%{currency_symbol})"
   report_header_total_tax: "kabuuang tax(%{currency_symbol})"
   report_header_enterprise: Enterprise
   report_header_customer: customer
@@ -2183,7 +2163,7 @@ fil_PH:
   report_header_payment_state: status ng pagbabayad
   report_header_payment_type: uri ng pagbabayad
   report_header_item_price: "item(%{currency})"
-  report_header_item_fees_price: "item + bayad (%{currency})"
+  report_header_item_fees_price: "item + fees (%{currency})"
   report_header_admin_handling_fees: "Admin at paghawak (%{currency})"
   report_header_ship_price: "pagdala (%{currency})"
   report_header_pay_fee_price: "Bayad sa pagbabayad (%{currency})"
@@ -2210,8 +2190,8 @@ fil_PH:
   report_header_gst_free_income: GST sa Libreng Kinikita
   report_header_total_untaxable_produce: kabuuang produkto na untaxable (walang tax)
   report_header_total_taxable_produce: kabuuang produkto na taxable (may kasamang tax)
-  report_header_total_untaxable_fees: kabuuang bayarin na untaxable (walang tax)
-  report_header_total_taxable_fees: kabuuang bayarin na taxable (may kasamang tax)
+  report_header_total_untaxable_fees: kabuuang fees na untaxable (walang tax)
+  report_header_total_taxable_fees: kabuuang fees na taxable (may kasamang tax)
   report_header_delivery_shipping_cost: Singil sa pagdeliver ng pinapadala (kasama ang tax)
   report_header_transaction_fee: Bayad sa Transaksyon (walang tax)
   report_header_total_untaxable_admin: kabuuang untaxable na pagsasaayos ng admin (walang tax)
@@ -2287,7 +2267,7 @@ fil_PH:
       cycle ngunit walang valid na paraan ng pagpapadala at pagbabayad. Hanggang hindi
       pa naisasaayos ang pagset-up, hindi makakapamili ang mga customer sa mga hub
       na ito.
-  enterprise_fees_update_notice: ang mga bayarin ng inyong enterprise ay na-update na
+  enterprise_fees_update_notice: ang fees ng inyong enterprise ay na-update na.
   enterprise_register_package_error: "pumili ng package"
   enterprise_register_error: "hindi makumpleto ang rehistrasyon para sa%{enterprise}"
   enterprise_register_success_notice: "maligayang pagbati! ang rehistrasyon para sa%{enterprise}ay kumpleto na!"
@@ -2695,6 +2675,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."
@@ -2772,6 +2760,8 @@ fil_PH:
     location: "Lokasyon"
     count_on_hand: "bilangin ang on hand"
     quantity: "dami"
+    on_demand: "on demand"
+    on_hand: "on hand"
     package_from: "package mula sa"
     item_description: "Paglalarawan ng item"
     price: "presyo"
@@ -2832,14 +2822,6 @@ fil_PH:
     smtp_send_copy_to_this_addresses: "nagpapadala ng kopya ng lahat ng lumalabas na mga sulat sa address na ito, para sa maraming address, paghiwalayin gamit ang kuwit."
     intercept_email_address: "harangin ang email address"
     intercept_email_instructions: "pawalang halaga ang tatanggap ng email at palitan ng address na ito"
-    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: "mga setting ng larawan"
     image_settings_warning: "kinakailangang gumawa muli ng mga thumbnail kung ia-update ang mga estilo ng paperclip. gumamit ng rake paperclip:refresh:thumbnails CLASS=Spree::Image para gawin ito."
     attachment_default_style: estilo ng mga attachment
@@ -2866,16 +2848,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"
@@ -2886,12 +2868,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"
@@ -3173,14 +3149,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"
@@ -3225,14 +3193,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:

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}"
@@ -596,7 +597,7 @@ fr:
         max_fulfilled_units: "Nombre max d'unités commandées"
         order_error: "Des erreurs doivent être résolues avant de pouvoir mettre à jour les commandes.\nLes champs entourés en rouge contiennent des erreurs."
         variants_without_unit_value: "ATTENTION: certaines variantes n'ont pas de nombre d'unités"
-      select_variant: "Choisir une variante"
+      select_variant: "Rechercher un produit et sélectionner une variante"
     enterprise:
       select_outgoing_oc_products_from: Sélectionner les produits sortants pour le cycle de vente parmi
     enterprises:
@@ -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."
@@ -1543,7 +1538,7 @@ fr:
   products_loading: "Produits en cours de chargement..."
   products_updating_cart: "Actualisation du panier..."
   products_cart_empty: "Panier vide"
-  products_edit_cart: "Valider votre panier"
+  products_edit_cart: "Poursuivre"
   products_from: de
   products_change: "Aucun changement à sauvegarder."
   products_update_error: "Échec de l'enregistrement dû à:"
@@ -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
@@ -1921,6 +1900,7 @@ fr:
   admin_enterprise_relationships_permits: "autorise"
   admin_enterprise_relationships_seach_placeholder: "Rechercher"
   admin_enterprise_relationships_button_create: "Créer"
+  admin_enterprise_relationships_to: "à"
   admin_enterprise_groups: "Groupes d'entreprises"
   admin_enterprise_groups_name: "Produit/Variante"
   admin_enterprise_groups_owner: "Gestionnaire principal"
@@ -2713,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."
@@ -2790,6 +2778,8 @@ fr:
     location: "Localisation"
     count_on_hand: "Quantité en stock"
     quantity: "Quantité"
+    on_demand: "A volonté"
+    on_hand: "En stock"
     package_from: "conditionnement par"
     item_description: "Description de la pièce"
     price: "Prix"
@@ -2850,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
@@ -2904,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"
@@ -3191,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"
@@ -3240,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:

config/locales/fr_BE.yml

@@ -31,6 +31,10 @@ fr_BE:
               taken: "Un compte existe déjà pour cette adresse électronique. Connectez-vous ou demandez un nouveau mot de passe."
         spree/order:
           no_card: Aucune carte de paiement autorisée disponible
+        spree/credit_card:
+          attributes:
+            base:
+              card_expired: "a expiré"
         order_cycle:
           attributes:
             orders_close_at:
@@ -248,6 +252,8 @@ fr_BE:
   notes: Commentaires
   error: Erreur
   processing_payment: "Paiement en cours..."
+  no_pending_payments: "Aucun paiement en attente"
+  invalid_payment_state: "État de paiement invalide"
   filter_results: Filtrer les résultats
   quantity: Quantité
   pick_up: Retrait
@@ -867,6 +873,7 @@ fr_BE:
         distributor: "Distributeur·trice"
         products: "Produits"
         tags: "Tags"
+        delivery_details: "Détails de la livraison"
         fees: "Commission"
         previous: "Précédent"
         save: "Sauvergarder"
@@ -1129,11 +1136,11 @@ fr_BE:
   shared:
     menu:
       cart:
-        cart: "Cart"
+        cart: "Panier"
       signed_in:
         profile: "Profil"
       mobile_menu:
-        cart: "Carte"
+        cart: "Panier"
       joyride:
         checkout: "Passer la commande"
         already_ordered_products: "Déjà commandé dans ce cycle de vente"
@@ -1291,6 +1298,7 @@ fr_BE:
   saving_credit_card: Enregistrement de la carte de crédit...
   card_has_been_removed: "Votre carte a été supprimée (numéro : %{number})"
   card_could_not_be_removed: Désolée, la carte n'a pas pu être supprimée :-(
+  invalid_credit_card: "Carte de crédit non valable"
   ie_warning_headline: "Votre navigateur n'est pas à jour :-("
   ie_warning_text: "Pour une expérience optimale sur Open Food Network, nous vous recommandons fortement de mettre à jour votre navigateur:"
   ie_warning_chrome: Télécharger Chrome
@@ -1314,14 +1322,8 @@ fr_BE:
       cookie_stripe_desc: "Données collectées par notre processeur de paiement Stripe proposé aux utilisateurs d'Open Food Network https://stripe.com/fr/cookies-policy/legal. Même si toutes les comptoirs 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 Network à 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."
@@ -1492,6 +1494,7 @@ fr_BE:
   shopping_oc_closed_description: "Veuillez attendre l'ouverture du prochain cycle de vente (ou contactez directement le comptoir pour voir si nous pouvons accepter une commande tardive)."
   shopping_oc_last_closed: "Le dernier cycle de vente s'est terminé il y a %{distance_of_time}"
   shopping_oc_next_open: "Le prochain cycle de vente ouvrira dans %{distance_of_time}"
+  shopping_oc_select: "Sélectionnez..."
   shopping_tabs_home: "Accueil"
   shopping_tabs_shop: "Comptoir"
   shopping_tabs_about: "A propos"
@@ -1579,22 +1582,6 @@ fr_BE:
   groups_signup_contact_text: "Prenez contact et découvrez ce qu'Open Food France peut faire pour vous:"
   groups_signup_detail: "Comment ça marche"
   login_invalid: "Email ou mot de passe erroné"
-  modal_hubs: "Comptoirs"
-  modal_hubs_abstract: Nos comptoirs sont les points de contact entre vous et les personnes qui produisent votre nourriture!
-  modal_hubs_content1: Vous pouvez chercher le comptoir qui vous convient par localisation ou par nom. Certains comptoirs ont de multiples points de retrait de vos achats, et certains proposent également la livraison à domicile. Chaque comptoir 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 comptoir à la fois.
-  modal_groups: "Groupes"
-  modal_groups_content1: Voilà les organisations et les relations inter-comptoirs 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 Network
-  modal_how_shop_explained: Recherchez un comptoir près de chez vous et commencez vos achats! Vous pouvez afficher plus d'infos sur chaque comptoir pour voir le type de produits qu'il propose, et cliquer sur le comptoir 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 comptoirs 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 comptoir. Chaque comptoir 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 comptoirs.
-  modal_how_more: En savoir plus
-  modal_how_more_explained: "Pour en savoir plus sur Open Food Network, 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 Network."
   producers_about: A propos
   producers_buy: Acheter
   producers_contact: Contact
@@ -1865,6 +1852,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"
   back: "Retour"
   continue: "Suivant"
   action_or: "OU"
@@ -2283,6 +2271,7 @@ fr_BE:
   enterprise_register_success_notice: "Bravo ! L'entreprise %{enterprise} est maintenant inscrite sur Open Food Network :-)"
   enterprise_bulk_update_success_notice: "Entreprises mises à jour avec succès"
   enterprise_bulk_update_error: 'Echec dans la mise à jour'
+  enterprise_shop_show_error: "Le comptoir que vous recherchez n'existe pas ou est inactif sur OFN. Veuillez vérifier les autres comptoirs."
   order_cycles_create_notice: 'Votre cycle de vente a été créé.'
   order_cycles_update_notice: 'Votre cycle de vente a été mis à jour.'
   order_cycles_bulk_update_notice: 'Des cycles de vente ont été mis à jour.'
@@ -2444,6 +2433,12 @@ fr_BE:
           severity: Rigueur
           description: Description
           resolve: Résoudre
+        exchange_products:
+          load_more_variants: "Charger plus de variantes"
+          load_all_variants: "Charger toutes les variantes"
+          select_all_variants: "Sélectionner toutes %{total_number_of_variants}les variantes"
+          variants_loaded: " %{num_of_variants_loaded}de %{total_number_of_variants}variantes chargées"
+          loading_variants: "Chargement des variantes"
       tag_rules:
         shipping_method_tagged_top: "Méthodes d'expédition étiquetées"
         shipping_method_tagged_bottom: "sont:"
@@ -2608,6 +2603,14 @@ fr_BE:
       start_free_profile: "Commencez par créer votre profil entreprise, et présentez votre formule quand vous êtes prêt !"
   order_management:
     reports:
+      enterprise_fee_summaries:
+        filters:
+          date_range: "Plage de dates"
+          report_format_csv: "Télécharger comme valeur décimale "
+          generate_report: "Générer un rapport"
+        report:
+          none: "Aucun"
+          select_and_search: "Sélectionner les filtres et cliquer sur GENERER RAPPORT pour accéder à vos données."
       enterprise_fee_summary:
         date_end_before_start_error: "Doit être après le départ"
         parameter_not_allowed_error: "Vous n'êtes pas autorisé à employer un ou plusieurs filtres de ce rapport."
@@ -2685,6 +2688,8 @@ fr_BE:
     location: "Site"
     count_on_hand: "Compté à la main"
     quantity: "Nb commandé"
+    on_demand: "A volonté"
+    on_hand: "En stock"
     package_from: "colis provenant de "
     item_description: "Description de l'article "
     price: "Prix"
@@ -2745,14 +2750,6 @@ fr_BE:
     smtp_send_copy_to_this_addresses: "Envoit une copie de tous les mails sortants vers cette adresse. En cas de plusieurs adresses, séparer par une virgule."
     intercept_email_address: "Intercepter les adresses mail"
     intercept_email_instructions: "Ignorer le destinataire et le remplacer par cette adresse."
-    smtp: "SMTP"
-    smtp_domain: "Domaine SMPT"
-    smtp_mail_host: "SMPT Serveur mail"
-    smtp_port: "SMTP Port"
-    secure_connection_type: "Type de connexion sécurisée"
-    smtp_authentication_type: "Type d'authentification SMTP"
-    smtp_username: "  SMPT Nom d’utilisateur·trice"
-    smtp_password: "SMPT Mot de passe"
     image_settings: "Paramètres image"
     image_settings_warning: "Il est nécessaire de régénérer des logos lors de la mise à jour des styles de trombones . Utiliser ratisser trombone:rafraîchir:logos CLASS=Spree::Image pour faire ceci. "
     attachment_default_style: Style Pièces  jointes
@@ -2799,12 +2796,6 @@ fr_BE:
     shipping_categories: "Condition de transport"
     new_shipping_category: "Nouvelle catégorie d'expédition "
     back_to_shipping_categories: "Retour vers les catégories d'expédition"
-    analytics_trackers: "Analyse trackers"
-    no_trackers_found: "Aucun tracker trouvé"
-    new_tracker: "Nouveau tracker"
-    add_one: "Ajoutez un"
-    google_analytics_id: "Analyse ID"
-    back_to_trackers_list: "Retour à la liste des trackers "
     name: "Nom"
     description: "Description"
     type: "Catégorie"
@@ -2956,6 +2947,8 @@ fr_BE:
           tax_invoice: "FACTURE"
           code: "Code"
           from: "De"
+          to: "Facture à"
+          shipping: "Expédition"
         form:
           distribution_fields:
             title: "Distribution"
@@ -3084,14 +3077,6 @@ fr_BE:
           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 acheteur·euse·s'
-        enterprise_fee_summaries:
-          filters:
-            date_range: "Plage de dates"
-            report_format_csv: "Télécharger comme valeur décimale "
-            generate_report: "Générer un rapport"
-          report:
-            none: "Aucun"
-            select_and_search: "Sélectionner les filtres et cliquer sur GENERER RAPPORT pour accéder à vos données."
       users:
         index:
           listing_users: "Utilisateur·trice d'annonces"
@@ -3136,14 +3121,15 @@ fr_BE:
         autocomplete:
           producer_name: "Producteur·trice"
           unit: "Unité"
-      general_settings:
+      shared:
+        sortable_header:
+          name: "Nom"
         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:

config/locales/fr_CA.yml

@@ -1316,14 +1316,8 @@ fr_CA:
       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> (ex 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."
@@ -1581,22 +1575,6 @@ fr_CA:
   groups_signup_contact_text: "Prenez contact et découvrez ce qu'Open Food Network 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 Network
-  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 Network, 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 Network."
   producers_about: A propos
   producers_buy: Acheter
   producers_contact: Contact
@@ -2688,6 +2666,14 @@ fr_CA:
       start_free_profile: "Commencez par créer votre profil entreprise, c'est gratuit, 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 en 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."
@@ -2765,6 +2751,8 @@ fr_CA:
     location: "Localisation"
     count_on_hand: "Quantité en stock"
     quantity: "Quantité"
+    on_demand: "A volonté"
+    on_hand: "En stock"
     package_from: "conditionnement par"
     item_description: "Description de la pièce"
     price: "Prix"
@@ -2825,14 +2813,6 @@ fr_CA:
     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
@@ -2879,12 +2859,6 @@ fr_CA:
     shipping_categories: "Condition de transport"
     new_shipping_category: "Créer nouvelle méthode de livraison"
     back_to_shipping_categories: "Retour aux catégories d'expédition"
-    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: "Nom"
     description: "Description"
     type: "Catégorie"
@@ -3164,14 +3138,6 @@ fr_CA:
           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 en 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"
@@ -3216,14 +3182,15 @@ fr_CA:
         autocomplete:
           producer_name: "Producteur"
           unit: "Unité"
-      general_settings:
+      shared:
+        sortable_header:
+          name: "Nom"
         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:

config/locales/it.yml

@@ -1316,14 +1316,8 @@ it:
       cookie_stripe_desc: "Dati raccolti dal nostro processore di pagamento Stripe per il rilevamento di frodi https://stripe.com/cookies-policy/legal. Non tutti i negozi usano Stripe come metodo di pagamento, ma è una buona pratica evitare che le frodi lo applichino a tutte le pagine. Stripe probabilmente costruisce un'immagine di quali delle nostre pagine di solito interagiscono con le loro API e quindi segnala qualcosa di insolito. Pertanto, l'impostazione del cookie Stripe ha una funzione più ampia rispetto alla semplice fornitura di un metodo di pagamento a un utente. La sua rimozione potrebbe influire sulla sicurezza del servizio stesso. Puoi saperne di più su Stripe e leggere la sua informativa sulla privacy all'indirizzo https://stripe.com/privacy."
       statistics_cookies: "Cookies di statistica"
       statistics_cookies_desc: "Ciò che segue non è strettamente necessario, ma aiuta a fornirti la migliore esperienza utente, permettendoci di analizzare il comportamento degli utenti, identificare le funzionalità che usi di più, o non usi mai, capire i problemi dell'esperienza utente, ecc."
-      statistics_cookies_analytics_desc_html: "Per raccogliere e analizzare i dati di utilizzo della piattaforma, utilizziamo Google Analytics, in quanto era il servizio predefinito connesso a Spree (il software di e-commerce open source su cui abbiamo costruito), ma la nostra visione è passare a <a href='https://matomo.org/' target='_blank'>Matomo</a> (ex Piwik, uno strumento di analisi open source che è conforme a GDPR e protegge la tua privacy) non appena possibile."
       statistics_cookies_matomo_desc_html: "Per raccogliere e analizzare i dati di utilizzo della piattaforma, utilizziamo <a href='https://matomo.org/' target='_blank'>Matomo</a>(ex Piwik), uno strumento di analisi open source che è conforme al GDPR e protegge la tua privacy."
       statistics_cookies_matomo_optout: "Vuoi rinunciare a Matomo analytics? Noi non raccogliamo nessun dato personale e Matomo ci aiuta a migliorare il nostro servizio, ma rispettiamo la tua scelta :-)"
-      cookie_analytics_utma_desc: "Utilizzato per distinguere utenti e sessioni. Il cookie viene creato quando viene eseguita la libreria javascript e non esistono cookie __utma. Il cookie viene aggiornato ogni volta che i dati vengono inviati a Google Analytics."
-      cookie_analytics_utmt_desc: "Utilizzato per limitare la velocità di richiesta."
-      cookie_analytics_utmb_desc: "Utilizzato per determinare nuove sessioni / visite. Il cookie viene creato quando viene eseguita la libreria javascript e non esistono cookie __utmb. Il cookie viene aggiornato ogni volta che i dati vengono inviati a Google Analytics."
-      cookie_analytics_utmc_desc: "Non utilizzato in ga.js. Impostato per l'interoperabilità con urchin.js. Storicamente, questo cookie operava in combinazione con il cookie __utmb per determinare se l'utente si trovava in una nuova sessione / visita."
-      cookie_analytics_utmz_desc: "Memorizza la fonte di traffico o la campagna che spiega come l'utente ha raggiunto il tuo sito. Il cookie viene creato quando la libreria javascript viene eseguita e viene aggiornato ogni volta che i dati vengono inviati a Google Analytics."
       cookie_matomo_basics_desc: "Cookie di prima parte di Matomo per raccogliere statistiche."
       cookie_matomo_heatmap_desc: "Matomo Heatmap e cookie di registrazione sessione."
       cookie_matomo_ignore_desc: "Cookie utilizzato per escludere l'utente dal tracciamento."
@@ -1582,22 +1576,6 @@ it:
   groups_signup_contact_text: "Mettiti in contatto per scoprire cosa ha da offrire OFN per te:"
   groups_signup_detail: "Ecco il dettaglio."
   login_invalid: "Email o password invalida"
-  modal_hubs: "Hub di cibo"
-  modal_hubs_abstract: I nostri hub del cibo sono il punto di contatto tra te e le persone che fanno il tuo cibo!
-  modal_hubs_content1: Puoi cercare l'hub più adatto per località o nome. Alcuni hub hanno più punti dove puoi ritirare i tuoi ordini, e alcuni hanno anche la possibilità di consegna. Ogni hub di cibo è un punt vendita con operazioni commerciali e logistiche indipendenti - così sono da aspettarsi variazioni tra hub.
-  modal_hubs_content2: Puoi comprare solo in un hub alla volta.
-  modal_groups: "Gruppi / regioni"
-  modal_groups_content1: Queste sono le organizzazioni e le relazioni tra hub che compongono l'Open Food Network.
-  modal_groups_content2: Alcuni gruppi sono riuniti per località o zona, altri per somiglianze non geografiche.
-  modal_how: "Come funziona"
-  modal_how_shop: Fai la spesa con Open Food Network
-  modal_how_shop_explained: Cerca un hub vicino a te per iniziare a fare la spesa! Puoi espandere ogni hub di cibo pe vedere quali tipi di prodotti sono disponibili, e cliccarce per iniziare la spesa. (Puoi comprare su un solo hub alla volta.)
-  modal_how_pickup: Costi di ritiro, consegna e spedizione
-  modal_how_pickup_explained: Alcuni hub di cibo consegnano a casa, mentre altri richiedono che te vada a ritirare il tuo ordine. Puoi vedere quali opzioni sono disponibili sulla homepage, e selezionare l'opzione preferita nella pagine della spesa e del pagamento. La consegna costerà di più e i costi variano da hub a hub. Ogni hub di cibo è un punto vendita con operazioni commerciali e logistiche indipendenti - così sono da aspettarsi variazioni tra hub.
-  modal_how_more: Apprendi di più
-  modal_how_more_explained: "Se vuoi saperne di più su Open Food Network, come funziona, e partecipare, guarda:"
-  modal_producers: "Produttori"
-  modal_producers_explained: "I nostri produttori fanno tutto il cibo delizioso che puoi comprare su Open Food Network."
   producers_about: Su di noi
   producers_buy: Acquista per
   producers_contact: Contatta
@@ -2682,6 +2660,14 @@ it:
       start_free_profile: "Inizia con un profilo gratuito e migliora quando sei pronto!"
   order_management:
     reports:
+      enterprise_fee_summaries:
+        filters:
+          date_range: "Intervallo di date"
+          report_format_csv: "Scarica come CSV"
+          generate_report: "Genera report"
+        report:
+          none: "Nessuno"
+          select_and_search: "Seleziona i filtri e fai clic su GENERA REPORT per accedere ai tuoi dati."
       enterprise_fee_summary:
         date_end_before_start_error: "deve essere dopo l'inizio"
         parameter_not_allowed_error: "Non sei autorizzato a utilizzare uno o più filtri selezionati per questo rapporto."
@@ -2759,6 +2745,8 @@ it:
     location: "Posizione"
     count_on_hand: "Conta a mente"
     quantity: "Quantità"
+    on_demand: "A richiesta"
+    on_hand: "Disponibile"
     package_from: "pacchetto da"
     item_description: "descrizione dell'articolo"
     price: "Prezzo"
@@ -2819,14 +2807,6 @@ it:
     smtp_send_copy_to_this_addresses: "Invia una copia di tutti i messaggi in uscita a questo indirizzo. Per più indirizzi, separare con virgole."
     intercept_email_address: "Intercettare l'indirizzo email"
     intercept_email_instructions: "Sostituire il destinatario della posta elettronica con questo indirizzo."
-    smtp: "SMTP"
-    smtp_domain: "Dominio SMTP"
-    smtp_mail_host: "Host di posta SMTP"
-    smtp_port: "Porta SMTP"
-    secure_connection_type: "Tipo di connessione sicura"
-    smtp_authentication_type: "Tipo di autenticazione SMTP"
-    smtp_username: "Nome utente SMTP"
-    smtp_password: "Password SMTP"
     image_settings: "Impostazioni immagine"
     image_settings_warning: "Avrai bisogno di rigenerare le miniature se aggiorni gli stili di graffetta. Usa rake paperclip: refresh: miniature CLASS = Spree :: Immagine per farlo."
     attachment_default_style: Stile allegati
@@ -2873,12 +2853,6 @@ it:
     shipping_categories: "Categorie Spedizioni"
     new_shipping_category: "Nuova categoria di spedizione"
     back_to_shipping_categories: "Torna alle categorie di spedizione"
-    analytics_trackers: "Tracker di Analytics"
-    no_trackers_found: "Nessun tracker trovato"
-    new_tracker: "Nuovo tracker"
-    add_one: "Aggiungi uno"
-    google_analytics_id: "ID Analytics"
-    back_to_trackers_list: "Torna all'elenco dei tracker"
     name: "Nome"
     description: "Descrizione"
     type: "Tipo"
@@ -3030,6 +3004,7 @@ it:
           tax_invoice: "FATTURA DELLE TASSE"
           code: "Codice"
           from: "Da"
+          shipping: "Spedizione"
         form:
           distribution_fields:
             title: "Distribuzione"
@@ -3158,14 +3133,6 @@ it:
           bulk_coop_allocation: 'Assegnazione - tabella'
           bulk_coop_packing_sheets: 'Imballaggio - tabella'
           bulk_coop_customer_payments: 'Pagamenti clienti - tabella'
-        enterprise_fee_summaries:
-          filters:
-            date_range: "Intervallo di date"
-            report_format_csv: "Scarica come CSV"
-            generate_report: "Genera report"
-          report:
-            none: "Nessuno"
-            select_and_search: "Seleziona i filtri e fai clic su GENERA REPORT per accedere ai tuoi dati."
       users:
         index:
           listing_users: "Elenco Utenti"
@@ -3210,14 +3177,15 @@ it:
         autocomplete:
           producer_name: "Produttore"
           unit: "Unità"
-      general_settings:
+      shared:
+        sortable_header:
+          name: "Nome"
         edit:
           legal_settings: "Impostazioni Legali"
           cookies_consent_banner_toggle: "Mostra banner di consenso per i cookie"
           privacy_policy_url: "Privacy Policy URL"
           enterprises_require_tos: "Le aziende devono accettare i Termini di Servizio"
           cookies_policy_matomo_section: "Visualizza la sezione di Matomo nella pagina della cookie policy"
-          cookies_policy_ga_section: "Visualizza la sezione di Google Analytics nella pagina della cookie policy"
           footer_tos_url: "URL Termini di Servizio"
     checkout:
       payment:

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."
@@ -1581,22 +1581,6 @@ nb:
   groups_signup_contact_text: "Ta kontakt for å oppdage hva OFN kan gjøre for deg:"
   groups_signup_detail: "Her er detaljene."
   login_invalid: "Ugyldig epost eller passord"
-  modal_hubs: "Mathubs"
-  modal_hubs_abstract: Våre hubs er kontaktpunkt mellom deg og menneskene som lager maten din!
-  modal_hubs_content1: Du kan søke etter en passende hub på lokasjon eller navn. Noen hubs har flere hentepunkt hvor du kan plukke opp det du har kjøpt, og noen tilbyr også levering. Hver mathub er en butikk med uavhengig drift og logistikk - så det vil være forskjeller mellom huber.
-  modal_hubs_content2: Du kan kun handle hos en hub om gangen.
-  modal_groups: "Grupper / Regioner"
-  modal_groups_content1: Dette er organisasjonene og hub-koblingene som utgjør Open Food Network.
-  modal_groups_content2: Noen grupper er klynger basert på lokalnivå eller regionnivå, andre har ingen geografiske likheter.
-  modal_how: "Slik fungerer det"
-  modal_how_shop: Handle på Open Food Network
-  modal_how_shop_explained: Søk etter en mathub nær deg for å begynne å handle! Du kan se detaljer for hver mathub for å se hvilke godbiter som finnes, og klikk deg videre for å handle. (Du kan kun handle hos en mathub om gangen).
-  modal_how_pickup: Henting, levering og fraktkostnader
-  modal_how_pickup_explained: Noen mathubs leverer på døren, mens andre krever at du henter varene du har kjøpt. Du kan se hvilke alternativ som er tilgjengelige på hjemmesiden, og velge hvilket du ønsker på handle- og betalingssidene. Levering koster mer, og prisene varierer fra hub til hub. Hver mathub er en forretning med uavhengig drift og logistikk - så variasjoner mellom hubs er naturlig.
-  modal_how_more: Finn ut mer
-  modal_how_more_explained: "Hvis du ønsker å lære mer om Open Food Network, hvordan det fungerer og ta del, sjekk ut:"
-  modal_producers: "Produsenter"
-  modal_producers_explained: "Våre produsenter lager all den herlige maten du kan handle på Open Food Network."
   producers_about: Om oss
   producers_buy: Handle
   producers_contact: Kontakt
@@ -1914,6 +1898,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 +2662,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."
@@ -2754,6 +2747,8 @@ nb:
     location: "Plassering"
     count_on_hand: "Antall På Lager"
     quantity: "Mengde"
+    on_demand: "Ved forespørsel"
+    on_hand: "Tilgjengelig"
     package_from: "pakke fra"
     item_description: "Beskrivelse Element"
     price: "Pris"
@@ -2814,14 +2809,6 @@ nb:
     smtp_send_copy_to_this_addresses: "Sender en kopi av alle utgående eposter til denne adressen. For flere adresser, skill med komma."
     intercept_email_address: "Avskjær epostadresse"
     intercept_email_instructions: "Overstyr epost mottaker og erstatt med denne adressen."
-    smtp: "SMTP"
-    smtp_domain: "SMTP-domene"
-    smtp_mail_host: "SMTP epost-vert"
-    smtp_port: "SMTP-port"
-    secure_connection_type: "Sikker tilkoblingstype"
-    smtp_authentication_type: "SMTP-godkjenningstype"
-    smtp_username: "SMTP Brukernavn"
-    smtp_password: "SMTP-passord"
     image_settings: "Bildeinnstillinger"
     image_settings_warning: "Du må regenerere miniatyrbilder hvis du oppdaterer paperclip-stiler. Bruk rake paperclip:refresh:thumbnails CLASS=Spree::Image for å gjøre dette"
     attachment_default_style: Vedlegg Stil
@@ -2868,12 +2855,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"
@@ -3025,6 +3006,8 @@ nb:
           tax_invoice: "AVGIFTSFAKTURA"
           code: "Kode"
           from: "Fra"
+          to: "Fakturér til"
+          shipping: "Levering"
         form:
           distribution_fields:
             title: "Distribusjon"
@@ -3153,14 +3136,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"
@@ -3205,14 +3180,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:

config/locales/nl_BE.yml

@@ -1281,14 +1281,8 @@ nl_BE:
       cookie_stripe_desc: "Gegevens verzamelt door onze betalingsverwerker Stripe voor fraudedetectie https://stripe.com/cookies-policy/legal. Niet alle winkels gebruiken Stripe als een betaalmethode maar het is een goede manier om te verhinderen dat er gefraudeerd wordt op alle webpagina's. Waarschijnlijk heeft Stripe een idee welke van onze pagina's vaak met hun API interageren en signaleren dan zo ongebruikelijke activiteit. Dus het instellen van de Stripe cookie heeft een ruimer nut dan enkel het voorzien van een betaalmethode naar een gebruiker. De cookie verwijderen kan dus een invloed hebben op de veiligheid van de dienst zelf. Je kan meer te weten komen over Stripe en hun privacy beleid op https://stripe.com/privacy."
       statistics_cookies: "Statistiek Cookies"
       statistics_cookies_desc: "Het volgende is niet strikt noodzakelijk, maar helpt om je te voorzien met de beste gebruikerservaring door toe te staan om gebruikersgedrag te analyseren, te identificeren welke functionaliteiten je het meest gebruikt, of juist niet, te begrijpen welke gebruikerservaring problemen er zich voordoen, enzovoort ..."
-      statistics_cookies_analytics_desc_html: "Om platform-gebruikersgegevens te verzamelen en te analyseren, gebruiken we Google Analytics, aangezien het de standaard dienst was gekoppeld met Spree (de opensource e-commerce software waarop we hebben verder gebouwd) maar onze visie is om zo snel mogelijk over te schakelen naar <a href='https://matomo.org/' target='_blank'>Matomo</a>(ex Piwik, een opensource analytics tool die GDPR-compliant is en je privacy beschermt). "
       statistics_cookies_matomo_desc_html: "Om platform gebruikersgegevens te verzamelen en te analyseren, gebruiken we <a href='https://matomo.org/' target='_blank'>Matomo </a>(ex Piwik, een opensource analytics tool die GDPR-compliant is en je privacy beschermt). "
       statistics_cookies_matomo_optout: "Wil je je uitschrijven uit Matomo analytics? We verzamelen geen persoonlijke gegevens, en Matomo helpt ons om onze diensten te verbeteren, maar we respecteren je keuze :-)"
-      cookie_analytics_utma_desc: "Gebruikt om gebruikers en sessies te onderscheiden. De cookies worden aangemaakt wanneer de javascript bibliotheek uitvoert en er nog geen bestaande __utma cookie bestaat. Deze cookie wordt geüpdatet elke keer gegevens worden verstuurd naar Google Analytics."
-      cookie_analytics_utmt_desc: "Gebruikt om request rate in te perken"
-      cookie_analytics_utmb_desc: "Gebruikt om nieuwe sessies/ bezoeken vast te stellen. De cookie worden aangemaakt wanneer de javascript bibliotheek uitvoert en er nog geen bestaande __utma cookie bestaat. Deze cookie wordt geüpdatet elke keer gegevens worden verstuurd naar Google Analytics."
-      cookie_analytics_utmc_desc: "Niet gebruikt in ga.js. Ingesteld voor compatibiliteit met urchin.js. Historisch gezien, wordt deze cookie gebruikt in relatie met de __utmb cookie om vast te stellen welke gebruiker in een nieuwe sessie / bezoek was."
-      cookie_analytics_utmz_desc: "Bewaart de trafiek bron of de route die verklaart hoe de gebruiker je website bereikte. Deze cookie wordt aangemaakt wanneer de javascript bibliotheek wordt geraadpleegd en wordt geüpdatet elke keer gegevens verzonden worden naar Google Analytics."
       cookie_matomo_basics_desc: "First party cookies van Matomo om statistieken te verzamelen."
       cookie_matomo_heatmap_desc: "Heatmap & Sessie Recording cookie van Matomo."
       cookie_matomo_ignore_desc: "Cookie gebruikt om de gebruiker te verhinderen gevolgd te worden."
@@ -1546,22 +1540,6 @@ nl_BE:
   groups_signup_contact_text: "Contacteer ons om te ontdekken wat OFN voor jou kan betekenen:"
   groups_signup_detail: "Hier het gedetailleerder."
   login_invalid: "Ongeldige E-mail of wachtwoord"
-  modal_hubs: "VoedselHubs"
-  modal_hubs_abstract: Onze voedselhubs zijn het contactpunt tussen jou en de mensen die het eten maken!
-  modal_hubs_content1: Je kan kiezen voor geschikte hub op basis van locatie of naam. Sommige hubs hebben meerdere punten waar je je aankopen kan ophalen, en sommige zullen leveringsopties ter beschikking stellen. Elke voedselhub is een verkoopspunt met een onafhankelijk zakelijke werking en logistiek - dus variatie tussen hubs is te verwachten.
-  modal_hubs_content2: Je kan slechts winkelen bij één voedselhub tergelijkertijd.
-  modal_groups: "Groepen / Regio's"
-  modal_groups_content1: Dit zijn de organisaties en connecties tussen hubs die het Open Food Network vormen.
-  modal_groups_content2: Deze groepen zijn geclusterd per locatie of provincie, andere per niet-geografische gelijkenissen.
-  modal_how: "Hoe het werkt"
-  modal_how_shop: Winkel in het Open Food Network
-  modal_how_shop_explained: Zoek voor een voedselhub bij jou in de buurt en start met shoppen! Je kan elke voedselhub uitvergroten om te zien welke soort producten er beschikbaar zijn, en klik via begin met winkelen. (Je kan enkel bij één voedselhub tergelijkertijd winkelen.)
-  modal_how_pickup: Ophaal-, levering-en-verzendskosten
-  modal_how_pickup_explained: Sommige voedselhubs leveren aan de deur, terwijl andere vereisen dat je je aankopen komt ophalen. Je kan zien welke mogelijkheden beschikbaar zijn op de startpagina, en selecteren welke je graag wil hebben op de winkel-en-betaalpagina's. Elke voedselhub is een verkoopspunt met onafhankelijke werking en logistiek - dus variaties tussen hubs zijn te verwachten.
-  modal_how_more: Ontdek
-  modal_how_more_explained: "Als je meer wil te weten komen over het Open Food Network, hoe het werkt en hoe je betrokken kan raken, kijk eens naar:"
-  modal_producers: "Producenten"
-  modal_producers_explained: "Onze producent maken al het héérlijke eten dat je kan winkelen in ons Open Food Network."
   producers_about: Over ons
   producers_buy: op Zoek naar
   producers_contact: Contact
@@ -2566,6 +2544,14 @@ nl_BE:
       start_free_profile: "Eerst uw bedrijfsprofiel maken en wijzig de formule als U klaar bent !"
   order_management:
     reports:
+      enterprise_fee_summaries:
+        filters:
+          date_range: "Datumbereik"
+          report_format_csv: "Opladen als CSV"
+          generate_report: "Ontwikkel verslag"
+        report:
+          none: "Geen enkele"
+          select_and_search: "Selecteer filters en klik op 'ONTWIKKEL VERSLAG' om toegang te krijgen tot je gegevens."
       enterprise_fee_summary:
         date_end_before_start_error: "moet zijn na het starten "
         parameter_not_allowed_error: "Je hebt geen machtiging om één of meerdere geselecteerde filters toe te passen op dit verslag."
@@ -2641,6 +2627,8 @@ nl_BE:
     location: "Locatie"
     count_on_hand: "Count On Hand"
     quantity: "Kwantiteit"
+    on_demand: "Op Aanvraag"
+    on_hand: "Bij de Hand"
     package_from: "pakje van "
     item_description: "Artikelbeschrijving"
     price: "Prijs"
@@ -2701,14 +2689,6 @@ nl_BE:
     smtp_send_copy_to_this_addresses: "Stuurt een kopie van alle uitgaande mails naar dit adres. In geval van meerdere adressen, die met een comma scheiden."
     intercept_email_address: "Email adres onderscheppen"
     intercept_email_instructions: "De mailontvanger omzeilen en door dit adres vervangen. "
-    smtp: "SMTP"
-    smtp_domain: "SMTP Domein"
-    smtp_mail_host: "SMPT Mail Host"
-    smtp_port: "SMTP Port"
-    secure_connection_type: "Secure Connection Type"
-    smtp_authentication_type: "SMTP Authentication Type"
-    smtp_username: "SMPT Gebruikersnaam"
-    smtp_password: "SMPT Wachtwoord"
     image_settings: "Beeldinstellingen "
     image_settings_warning: "Logos regeneren als de paperclips stylen bijgewerkt worden. Paperclip harken gebruiken :opfrissen:logos CLASS=Spree::Image om het doen. "
     attachment_default_style: Bijlagestijl
@@ -2755,12 +2735,6 @@ nl_BE:
     shipping_categories: "Verzendingscategorieën"
     new_shipping_category: "Nieuwe verzendingscategorie"
     back_to_shipping_categories: "Terug naar verzendingscategoriëen"
-    analytics_trackers: "Analyse van Trackers"
-    no_trackers_found: "Geen Trackers gevonden"
-    new_tracker: "Nieuwe Tracker"
-    add_one: "Eén toevoegen"
-    google_analytics_id: "ID analyse "
-    back_to_trackers_list: "Terug naar de Trackerslijst"
     name: "Naam"
     description: "Beschrijving"
     type: "Type"
@@ -3000,14 +2974,6 @@ nl_BE:
           bulk_coop_allocation: 'Groepsaankoop-Toelage'
           bulk_coop_packing_sheets: 'Groepsaankoop- voorbereidingsdokumenten voor de manden'
           bulk_coop_customer_payments: 'Groepsaankoop-betalingen van de klanten'
-        enterprise_fee_summaries:
-          filters:
-            date_range: "Datumbereik"
-            report_format_csv: "Opladen als CSV"
-            generate_report: "Ontwikkel verslag"
-          report:
-            none: "Geen enkele"
-            select_and_search: "Selecteer filters en klik op 'ONTWIKKEL VERSLAG' om toegang te krijgen tot je gegevens."
       users:
         index:
           listing_users: "Advertentiegebruikers"
@@ -3041,14 +3007,15 @@ nl_BE:
         autocomplete:
           producer_name: "Producent"
           unit: "Unit"
-      general_settings:
+      shared:
+        sortable_header:
+          name: "Naam"
         edit:
           legal_settings: "De legale instelling"
           cookies_consent_banner_toggle: "Laat de strook met uw akkoord voor de cookies zien"
           privacy_policy_url: "Privacybeleid URL"
           enterprises_require_tos: "Debedrijven moeten de Algemene gebruiksvoorwaarden aanvaarden"
           cookies_policy_matomo_section: "Geef Matomosectie weer op cookiesprivacypagina"
-          cookies_policy_ga_section: "Geef Google Analytics-sectie weer op cookiesprivacypagina"
           footer_tos_url: "Gebruiksvoorwaarden URL"
     checkout:
       payment:

config/locales/pt.yml

@@ -1255,14 +1255,8 @@ pt:
       cookie_stripe_desc: "Cookie definida pelo nosso fornecedor de serviços de pagamento Stripe. Para mais informações veja https://stripe.com/cookies-policy/legal e https://stripe.com/privacy."
       statistics_cookies: "Cookies de Estatísticas"
       statistics_cookies_desc: "As seguintes cookies não são estritamente necessárias mas ajudam a uma melhor experiência do/a utilizador/a."
-      statistics_cookies_analytics_desc_html: "Para coletar e analisar dados de utilização da plataforma nós usamos Google Analytics e <a href='https://matomo.org/' target='_blank'>Matomo</a> (ex Piwik, uma ferramenta de analytics de código aberto que está confirme do RGPD e protege a sua privacidade)."
       statistics_cookies_matomo_desc_html: "Para coletar e analisar dados de utilização da plataforma nós usamos <a href='https://matomo.org/' target='_blank'>Matomo</a> (ex Piwik, uma ferramenta de analytics de código aberto que está confirme do RGPD e protege a sua privacidade)."
       statistics_cookies_matomo_optout: "Quer optar por não usar a cookie Matomo?"
-      cookie_analytics_utma_desc: "Usado para distinguir utilizadores e sessões."
-      cookie_analytics_utmt_desc: "Usado para evitar demasiados pedidos aos servidores."
-      cookie_analytics_utmb_desc: "Usado para determinar novas visitas/sessões."
-      cookie_analytics_utmc_desc: "Versão anterior usada para determinar novas visitas/sessões."
-      cookie_analytics_utmz_desc: "Usado para guarda a origem do trafego."
       cookie_matomo_basics_desc: "Cookies Matomo para recolher estatísticas."
       cookie_matomo_heatmap_desc: "Cookie Matomo para registo de sessões."
       cookie_matomo_ignore_desc: "Cookie Matomo para registar opt-out de utilizadores."
@@ -1520,22 +1514,6 @@ pt:
   groups_signup_contact_text: "Entre em contato para descobrir o que a OFN pode fazer por si:"
   groups_signup_detail: "Aqui está o detalhe. "
   login_invalid: "Email ou palavra-passe inválidos"
-  modal_hubs: "Centrais de Alimentos"
-  modal_hubs_abstract: As nossas centrais de alimentos são o ponto de contato entre si e as pessoas que produzem a sua comida!
-  modal_hubs_content1: 'Pode procurar por uma central conveniente por localização ou por nome. Algumas centrais têm múltiplos pontos de entrega, onde pode levantar as suas compras, e outros ainda entregam na sua casa. Cada central é um ponto de venda independente, e por isso as ofertas e maneira de operar podem variar de um para outro. '
-  modal_hubs_content2: Só pode comprar numa central de alimentos de cada vez.
-  modal_groups: "Grupos / Regiões"
-  modal_groups_content1: Estas são as organizações e relações entre as centrais que constroem a Open Food Network
-  modal_groups_content2: Alguns grupos estão organizados por localização, outros por similaridades não geográficas.
-  modal_how: "Como funciona"
-  modal_how_shop: Compre na Open Food Network
-  modal_how_shop_explained: Procure por um mercado próximo e comece as suas compras! Em cada mercado pode ver, em detalhe, quais os produtos que são oferecidos (só pode comprar num mercado de cada vez).
-  modal_how_pickup: 'Custos de levantamento e entrega. '
-  modal_how_pickup_explained: Alguns mercados entregam em sua casa, outros oferecem um local para que levante os produtos. É possível ver quais as opções que estão disponíveis no perfil individual de cada um, e fazer a sua escolha no momento do checkout. Provavelmente será cobrada uma taxa de entrega, que pode variar de mercado para mercado.
-  modal_how_more: Saiba mais
-  modal_how_more_explained: "Para saber mais sobre a Open Food Network, como funciona, e participar, visite:"
-  modal_producers: "Produtores"
-  modal_producers_explained: "Os nosso produtores são quem disponibilizam toda a comida que pode comprar na Open Food Network."
   producers_about: Sobre nós
   producers_buy: Comprar
   producers_contact: Contacto
@@ -2522,6 +2500,14 @@ pt:
       start_free_profile: "Comece com um perfil gratuito e expanda quando estivere pronto/a!"
   order_management:
     reports:
+      enterprise_fee_summaries:
+        filters:
+          date_range: "Intervalo de Datas"
+          report_format_csv: "Descarregar como csv"
+          generate_report: "Gerar Relatório"
+        report:
+          none: "Nenhum"
+          select_and_search: "Selecione filtros e carregue em Gerar Relatório para ver os seus dados."
       enterprise_fee_summary:
         date_end_before_start_error: "deve ser depois do início"
         parameter_not_allowed_error: "Não está autorizado a usar um ou mais filtros selecionados neste relatório."
@@ -2597,6 +2583,8 @@ pt:
     location: "Localização"
     count_on_hand: "Disponível"
     quantity: "Quantidade"
+    on_demand: "Sob Encomenda"
+    on_hand: "Disponível"
     package_from: "Embalagem de"
     item_description: "Descrição do Item"
     price: "Preço"
@@ -2656,14 +2644,6 @@ pt:
     smtp_send_copy_to_this_addresses: "Envia uma cópia de todos os email enviados para este endereço. Para múltiplos endereços, separar por vírgulas."
     intercept_email_address: "Interceptar Endereço de Email"
     intercept_email_instructions: "Substituir destinatário de todos os email por este endereço."
-    smtp: "SMTP"
-    smtp_domain: "Domínio SMTP"
-    smtp_mail_host: "Servidor de Email SMTP"
-    smtp_port: "Porta SMTP"
-    secure_connection_type: "Tipo de Ligação Segura"
-    smtp_authentication_type: "Tipo de Autenticação SMTP"
-    smtp_username: "Utilizador SMTP"
-    smtp_password: "Password SMTP"
     image_settings: "Configurações de Imagens"
     image_settings_warning: "Terá de regenerar os ícones se alterar is estilos. Para tal execute rake paperclip:refresh:thumbnails CLASS=Spree::Image"
     attachment_default_style: Estilo dos Anexos
@@ -2710,12 +2690,6 @@ pt:
     shipping_categories: "Categorias de Envio"
     new_shipping_category: "Nova Categoria de Envio"
     back_to_shipping_categories: "Voltar à Lista de Categorias de Envio"
-    analytics_trackers: "Trackers do Analytics"
-    no_trackers_found: "Nenhum Tracker encontrado"
-    new_tracker: "Novo Tracker"
-    add_one: "Adicionar um"
-    google_analytics_id: "ID do Analytics"
-    back_to_trackers_list: "Voltar à Lista de Trackers"
     name: "Nome"
     description: "Descrição"
     type: "Tipo"
@@ -2931,14 +2905,6 @@ pt:
           bulk_coop_allocation: 'Compra em Grupo - Alocação'
           bulk_coop_packing_sheets: 'Compra em Grupo - Folhas de Empacotamento'
           bulk_coop_customer_payments: 'Compra em Grupo - Pagamentos do Consumidor'
-        enterprise_fee_summaries:
-          filters:
-            date_range: "Intervalo de Datas"
-            report_format_csv: "Descarregar como csv"
-            generate_report: "Gerar Relatório"
-          report:
-            none: "Nenhum"
-            select_and_search: "Selecione filtros e carregue em Gerar Relatório para ver os seus dados."
       users:
         index:
           listing_users: "Lista de Utilizadores"
@@ -2972,14 +2938,15 @@ pt:
         autocomplete:
           producer_name: "Produtor"
           unit: "Unidade"
-      general_settings:
+      shared:
+        sortable_header:
+          name: "Nome"
         edit:
           legal_settings: "Configurações Legais"
           cookies_consent_banner_toggle: "Mostrar o Banner de consentimento de Cookies"
           privacy_policy_url: "URL da Politíca de Privacidade"
           enterprises_require_tos: "As organizações têm de aceitar os Termos de Serviço"
           cookies_policy_matomo_section: "Mostrar a secção do Matomo na página da política de Cookies"
-          cookies_policy_ga_section: "Mostrar a secção do Google Analytics na página de política de Cookies"
           footer_tos_url: "URL dos Termos de Serviço"
     checkout:
       payment: