From aad9a69cfe6a2ffdc54459da2be5e8ca5c2be98a Mon Sep 17 00:00:00 2001
From: Transifex-Openfoodnetwork <transifex@openfoodnetwork.org>
Date: Fri, 26 Mar 2021 06:17:20 +1100
Subject: [PATCH 01/17] Updating translations for config/locales/fr.yml

---
 config/locales/fr.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 4ae866d54e..7cf593e360 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -2690,6 +2690,7 @@ fr:
       price_breakdown: "Détail du prix"
       unit_price_tooltip:
         shopfront: "Il s'agit du prix unitaire de ce produit. Il permet à l'acheteur de comparer les prix quelque soit le conditionnement final du produit."
+        admin: "Le prix unitaire permet aux acheteurs de comparer les prix entre les produits et/ou les conditionnements. Attention, le prix final observé par l'acheteur peut être différent si des marges et/ou commissions sont appliquées."
     variants:
       on_demand:
         'yes': "A volonté"
@@ -3350,6 +3351,7 @@ fr:
           unit_name: "Unité"
           price: "Prix"
           unit_price: "Prix unitaire"
+          unit_price_legend: "Calcul basé sur le prix à l'unité"
           on_hand: "En stock"
           on_demand: "A volonté"
           product_description: "Description du Produit"

From 76214e7733d9fc0c84ab634785b82288aca1f44b Mon Sep 17 00:00:00 2001
From: Transifex-Openfoodnetwork <transifex@openfoodnetwork.org>
Date: Fri, 26 Mar 2021 06:17:27 +1100
Subject: [PATCH 02/17] Updating translations for config/locales/en_FR.yml

---
 config/locales/en_FR.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config/locales/en_FR.yml b/config/locales/en_FR.yml
index de9a472dac..5c1da0847b 100644
--- a/config/locales/en_FR.yml
+++ b/config/locales/en_FR.yml
@@ -2661,6 +2661,7 @@ en_FR:
       price_breakdown: "Price breakdown"
       unit_price_tooltip:
         shopfront: "This is the unit price of this product. It allows you to compare the price of products independent of packaging sizes & weights."
+        admin: "The unit price increases transparency by allowing your customers to easily compare prices between different products and packaging sizes. Note, that the final unit price displayed in the shopfront might differ as it is includes taxes & fees."
     variants:
       on_demand:
         'yes': "On demand"
@@ -3321,6 +3322,7 @@ en_FR:
           unit_name: "Unit name"
           price: "Price"
           unit_price: "Unit Price"
+          unit_price_legend: "Calculated based on the item price"
           on_hand: "On Hand"
           on_demand: "On Demand"
           product_description: "Product Description"

From bc191ab9bb1ceda7a5a42ec920c17292a12fd4fe Mon Sep 17 00:00:00 2001
From: Transifex-Openfoodnetwork <transifex@openfoodnetwork.org>
Date: Fri, 26 Mar 2021 10:50:19 +1100
Subject: [PATCH 04/17] Updating translations for config/locales/de_DE.yml

---
 config/locales/de_DE.yml | 45 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 43 insertions(+), 2 deletions(-)

diff --git a/config/locales/de_DE.yml b/config/locales/de_DE.yml
index 01a105c37b..f7b59a4409 100644
--- a/config/locales/de_DE.yml
+++ b/config/locales/de_DE.yml
@@ -2417,6 +2417,7 @@ de_DE:
           Beim Hinzufügen dieses Produkts zum Warenkorb ist ein Fehler aufgetreten.
           Möglicherweise ist es nicht mehr verfügbar oder der Laden schließt gerade.
     admin:
+      unit_price_tooltip: "Grundpreis: Er ermöglicht einen einfachen Preisvergleich von Produkten, unabhängig von Packungsgröße und -gewicht. Der im Online-Shop angezeigte Grundpreis kann ggf. aufgrund hinzukommender Gebühren abweichen."
       enterprise_limit_reached: "Sie haben die maximale Anzahl der Unternehmen pro Konto erreicht. Schreiben Sie an %{contact_email}, wenn Sie das Limit erhöhen möchten."
       modals:
         got_it: "Verstanden"
@@ -2669,8 +2670,7 @@ de_DE:
         min_quantity: "Minimale Menge"
         max_quantity: "Maximale Menge"
       price_breakdown: "Preisaufschlüsselung"
-      unit_price_tooltip:
-        shopfront: "Grundpreis: Er ermöglicht einen einfachen Preisvergleich von Produkten, unabhängig von Verpackungsgröße und -gewicht."
+      unit_price_tooltip: "Grundpreis: Er ermöglicht einen einfachen Preisvergleich von Produkten, unabhängig von Packungsgröße und -gewicht."
     variants:
       on_demand:
         'yes': "Auf Anfrage"
@@ -3101,6 +3101,7 @@ de_DE:
           header:
             store: openfoodnetwork.de
     admin:
+      unit_price_tooltip: "Grundpreis: Er ermöglicht einen einfachen Preisvergleich von Produkten, unabhängig von Packungsgröße und -gewicht. Der im Online-Shop angezeigte Grundpreis kann ggf. aufgrund hinzukommender Gebühren abweichen."
       tab:
         dashboard: "Übersicht"
         orders: "Bestellungen"
@@ -3330,6 +3331,7 @@ de_DE:
           unit_name: "Einheitenname"
           price: "Preis"
           unit_price: "Stückpreis"
+          unit_price_legend: "Berechnet aus Preis und Menge."
           on_hand: "Verfügbar"
           on_demand: "Unbegrenzt"
           product_description: "Produktbeschreibung"
@@ -3647,3 +3649,42 @@ de_DE:
         spree/payment:
           one: Zahlung
           other: Zahlungen
+  datetime:
+    distance_in_words:
+      about_x_hours:
+        one: etwa 1 Stunde
+        other: etwa %{count} Stunden
+      about_x_months:
+        one: etwa 1 Monat
+        other: etwa %{count} Monaten
+      about_x_years:
+        one: etwa 1 Jahr
+        other: etwa %{count} Jahren
+      almost_x_years:
+        one: fast 1 Jahr
+        other: fast %{count} Jahren
+      half_a_minute: 30 Sekunden
+      less_than_x_seconds:
+        one: weniger als 1 Sekunde
+        other: weniger als %{count} Sekunden
+      less_than_x_minutes:
+        one: weniger als einer Minute
+        other: weniger als %{count} Minuten
+      over_x_years:
+        one: über 1 Jahr
+        other: über %{count} Jahren
+      x_seconds:
+        one: "1 Sekunde"
+        other: "%{count} Sekunden"
+      x_minutes:
+        one: "1 Minute"
+        other: "%{count} Minuten"
+      x_days:
+        one: "1 Tag"
+        other: "%{count} Tagen"
+      x_months:
+        one: "1 Monat"
+        other: "%{count} Monaten"
+      x_years:
+        one: "1 Jahr"
+        other: "%{count} Jahren"

From 96bb26ad45ab1dd3e32990f706fe4598b96ec5d2 Mon Sep 17 00:00:00 2001
From: Transifex-Openfoodnetwork <transifex@openfoodnetwork.org>
Date: Fri, 26 Mar 2021 18:37:20 +1100
Subject: [PATCH 05/17] Updating translations for config/locales/ca.yml

---
 config/locales/ca.yml | 45 +++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 43 insertions(+), 2 deletions(-)

diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index fd9c92e216..1702601fdd 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -2418,6 +2418,7 @@ ca:
           S'ha produït un problema en afegir aquest producte a la cistella. Potser
           ha deixat d'estar disponible o la botiga a tancat.
     admin:
+      unit_price_tooltip: "El preu unitari augmenta la transparència, ja que permet als vostres clients comparar fàcilment preus entre diferents productes i mides d’envàs. Tingueu en compte que el preu unitari final que es mostra a l’aparador pot variar ja que inclou impostos i taxes."
       enterprise_limit_reached: "Has assolit el límit estàndard d'organitzacions per compte. Escriu a %{contact_email} si necessites augmentar-lo."
       modals:
         got_it: "Ho tinc"
@@ -2665,8 +2666,7 @@ ca:
         min_quantity: "Quantitat mínima"
         max_quantity: "Quantitat màxima"
       price_breakdown: "Desglossament del preu"
-      unit_price_tooltip:
-        shopfront: "Aquest és el preu unitari d’aquest producte. Us permet comparar el preu dels productes independentment de les mides i els pesos dels envasos."
+      unit_price_tooltip: "Aquest és el preu unitari d’aquest producte. Us permet comparar el preu dels productes independentment de les mides i els pesos dels envasos."
     variants:
       on_demand:
         'yes': "Sota demanda"
@@ -3096,6 +3096,7 @@ ca:
           header:
             store: Botiga
     admin:
+      unit_price_tooltip: "El preu unitari augmenta la transparència, ja que permet als vostres clients comparar fàcilment preus entre diferents productes i mides d’envàs. Tingueu en compte que el preu unitari final que es mostra a l’aparador pot variar ja que inclou impostos i taxes."
       tab:
         dashboard: "Panell"
         orders: "Comandes"
@@ -3325,6 +3326,7 @@ ca:
           unit_name: "Nom de la unitat"
           price: "Preu"
           unit_price: "Preu unitari"
+          unit_price_legend: "Calculat en funció del preu de l'article"
           on_hand: "Disponibles"
           on_demand: "Sota demanda"
           product_description: "Descripció del producte"
@@ -3643,3 +3645,42 @@ ca:
         spree/payment:
           one: Pagament
           other: Pagaments
+  datetime:
+    distance_in_words:
+      about_x_hours:
+        one: aproximadament 1 hora
+        other: aprox. %{count} hores
+      about_x_months:
+        one: aproximadament 1 mes
+        other: aprox. %{count} mesos
+      about_x_years:
+        one: aproximadament 1 any
+        other: aprox. %{count} anys
+      almost_x_years:
+        one: gairebé 1 any
+        other: gairebé %{count} anys
+      half_a_minute: mig minut
+      less_than_x_seconds:
+        one: menys d&#39;1 segon
+        other: menys de %{count} segons
+      less_than_x_minutes:
+        one: menys d’un minut
+        other: menys de %{count} minuts
+      over_x_years:
+        one: més d’un any
+        other: més de %{count} anys
+      x_seconds:
+        one: "1 segon"
+        other: "%{count} segons"
+      x_minutes:
+        one: "1 minut"
+        other: "%{count} minuts"
+      x_days:
+        one: "1 dia"
+        other: "%{count} dies"
+      x_months:
+        one: "1 mes"
+        other: "%{count} mesos"
+      x_years:
+        one: "1 any"
+        other: "%{count} anys"

From 2e8178a33f8a16c8d8f98a1d010fa4a0a295f9c2 Mon Sep 17 00:00:00 2001
From: Transifex-Openfoodnetwork <transifex@openfoodnetwork.org>
Date: Fri, 26 Mar 2021 18:42:11 +1100
Subject: [PATCH 06/17] Updating translations for config/locales/es.yml

---
 config/locales/es.yml | 45 +++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 43 insertions(+), 2 deletions(-)

diff --git a/config/locales/es.yml b/config/locales/es.yml
index 7e63d65fe9..59794ace4a 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -2417,6 +2417,7 @@ es:
           Ha habido un problema al añadir este producto en el carrito. Puede que haya
           dejado de estar disponible o que la tinda haya cerrado.
     admin:
+      unit_price_tooltip: "El precio unitario aumenta la transparencia al permitir a sus clientes comparar fácilmente los precios entre diferentes productos y tamaños de envase. Tenga en cuenta que el precio unitario final que se muestra en el escaparate puede diferir, ya que incluye impuestos y tarifas."
       enterprise_limit_reached: "Has alcanzado el límite estándar de organizaciones por cuenta. Escriba a %{contact_email} si necesita aumentarlo."
       modals:
         got_it: "Lo entiendo"
@@ -2665,8 +2666,7 @@ es:
         min_quantity: "Cantidad mínima"
         max_quantity: "Cantidad máxima"
       price_breakdown: "Desglose de el precio"
-      unit_price_tooltip:
-        shopfront: "Este es el precio unitario de este producto. Le permite comparar el precio de los productos independientemente de los tamaños y pesos de los envases."
+      unit_price_tooltip: "Este es el precio unitario de este producto. Le permite comparar el precio de los productos independientemente de los tamaños y pesos de los envases."
     variants:
       on_demand:
         'yes': "Bajo demanda"
@@ -3096,6 +3096,7 @@ es:
           header:
             store: Tienda
     admin:
+      unit_price_tooltip: "El precio unitario aumenta la transparencia al permitir a sus clientes comparar fácilmente los precios entre diferentes productos y tamaños de envase. Tenga en cuenta que el precio unitario final que se muestra en el escaparate puede diferir, ya que incluye impuestos y tarifas."
       tab:
         dashboard: "Panel de inicio"
         orders: "Pedidos"
@@ -3325,6 +3326,7 @@ es:
           unit_name: "Nombre de la unidad"
           price: "Precio"
           unit_price: "Precio por unidad"
+          unit_price_legend: "Calculado en base al precio del artículo"
           on_hand: "Disponibles"
           on_demand: "Bajo demanda"
           product_description: "Descripción del producto"
@@ -3643,3 +3645,42 @@ es:
         spree/payment:
           one: Pago
           other: Pagos
+  datetime:
+    distance_in_words:
+      about_x_hours:
+        one: alrededor de 1 hora
+        other: aprox. %{count} horas
+      about_x_months:
+        one: alrededor de 1 mes
+        other: aprox. %{count} meses
+      about_x_years:
+        one: alrededor de 1 año
+        other: aprox. %{count} años
+      almost_x_years:
+        one: casi 1 año
+        other: casi %{count} años
+      half_a_minute: medio minuto
+      less_than_x_seconds:
+        one: menos de 1 segundo
+        other: menos de %{count} segundos
+      less_than_x_minutes:
+        one: menos de un minuto
+        other: menos de %{count} minutos
+      over_x_years:
+        one: más de 1 año
+        other: más de %{count} años
+      x_seconds:
+        one: "1 segundo"
+        other: "%{count} segundos"
+      x_minutes:
+        one: "1 minuto"
+        other: "%{count} minutos"
+      x_days:
+        one: "1 día"
+        other: "%{count} días"
+      x_months:
+        one: "1 mes"
+        other: "%{count} meses"
+      x_years:
+        one: "1 año"
+        other: "%{count} años"

From 59cf5aa3eceb58a78dd46fa26eed672236a598c8 Mon Sep 17 00:00:00 2001
From: Transifex-Openfoodnetwork <transifex@openfoodnetwork.org>
Date: Fri, 26 Mar 2021 21:31:08 +1100
Subject: [PATCH 07/17] Updating translations for config/locales/ru.yml

---
 config/locales/ru.yml | 72 +++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 70 insertions(+), 2 deletions(-)

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 9fd28cb7c9..7e76656990 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -1180,8 +1180,10 @@ ru:
       message_html: "Согласен на %{terms_and_conditions_link} продавца."
       link_text: "Условия и Положения"
     platform_terms_of_service:
+      message_html: "Я согласен c условиями платформы %{tos_link}."
       terms_of_service: "Условия Сервиса"
     all_terms_and_conditions:
+      message_html: "Я согласен с условиями %{terms_and_conditions_link} продавца и платформы %{tos_link}."
       terms_and_conditions: "Условия и Положения"
       terms_of_service: "Условия Сервиса"
     failed: "Оформить заказ не удалось. Сообщите нам, чтобы мы могли обработать ваш заказ."
@@ -2416,6 +2418,7 @@ ru:
           При добавлении этого товара в корзину возникла проблема. Возможно, он стал
           недоступен или магазин закрывается.
     admin:
+      unit_price_tooltip: "Цена за единицу увеличивает прозрачность, позволяя вашим клиентам легко сравнивать цены на разные продукты и размеры упаковки. Обратите внимание, что окончательная цена за единицу, отображаемая на витрине, может отличаться, поскольку она включает налоги и сборы."
       enterprise_limit_reached: "Вы достигли стандартного лимита количества предприятий на один аккаунт. Напишите на %{contact_email}, если Вам нужно увеличить его."
       modals:
         got_it: "Понятно"
@@ -2665,8 +2668,7 @@ ru:
         min_quantity: "Мин. количество"
         max_quantity: "Макс количество"
       price_breakdown: "Разбивка цен"
-      unit_price_tooltip:
-        shopfront: "Это цена за единицу этого продукта. Это позволяет сравнивать цены на товары независимо от размера и веса упаковки."
+      unit_price_tooltip: "Это цена за единицу этого продукта. Это позволяет сравнивать цены на товары независимо от размера и веса упаковки."
     variants:
       on_demand:
         'yes': "По Запросу"
@@ -3146,6 +3148,7 @@ ru:
           header:
             store: Магазин
     admin:
+      unit_price_tooltip: "Цена за единицу увеличивает прозрачность, позволяя вашим клиентам легко сравнивать цены на разные продукты и размеры упаковки. Обратите внимание, что окончательная цена за единицу, отображаемая на витрине, может отличаться, поскольку она включает налоги и сборы."
       tab:
         dashboard: "Панель"
         orders: "Заказы"
@@ -3375,6 +3378,7 @@ ru:
           unit_name: "Название единицы"
           price: "Цена"
           unit_price: "Цена за единицу"
+          unit_price_legend: "Рассчитывается исходя из стоимости товара"
           on_hand: "В наличии"
           on_demand: "По Запросу"
           product_description: "Описание Товара"
@@ -3480,6 +3484,7 @@ ru:
           cookies_consent_banner_toggle: "Показывать баннер на согласие использования файлов cookie"
           privacy_policy_url: "URL политики конфиденциальности"
           enterprises_require_tos: "Предприятия должны принять Условия сервиса"
+          shoppers_require_tos: "Покупатели должны принять Условия Сервиса."
           cookies_policy_matomo_section: "Показать раздел Matomo на странице политики использования файлов cookie"
           footer_tos_url: "URL Условий сервиса"
     checkout:
@@ -3695,3 +3700,66 @@ ru:
           few: Платежи
           many: Платежи
           other: Платежи
+  datetime:
+    distance_in_words:
+      about_x_hours:
+        one: около 1 часа
+        few: около %{count} часов
+        many: около %{count} часов
+        other: около %{count} часов
+      about_x_months:
+        one: около 1 месяца
+        few: около %{count} месяцев
+        many: около %{count} месяцев
+        other: около %{count} месяцев
+      about_x_years:
+        one: около 1 года
+        few: около %{count} лет
+        many: около %{count} лет
+        other: около %{count} лет
+      almost_x_years:
+        one: почти 1 год
+        few: почти %{count} лет
+        many: почти %{count} лет
+        other: почти %{count} лет
+      half_a_minute: полминуты
+      less_than_x_seconds:
+        one: менее 1 секунды
+        few: менее %{count} секунд
+        many: менее %{count} секунд
+        other: менее %{count} секунд
+      less_than_x_minutes:
+        one: меньше минуты
+        few: менее %{count} минут
+        many: менее %{count} минут
+        other: менее %{count} минут
+      over_x_years:
+        one: более 1 года
+        few: более %{count} лет
+        many: более %{count} лет
+        other: более %{count} лет
+      x_seconds:
+        one: "1 секунда"
+        few: "%{count} секунд"
+        many: "%{count} секунд"
+        other: "%{count} секунд"
+      x_minutes:
+        one: "1 минута"
+        few: "%{count} минут"
+        many: "%{count} минут"
+        other: "%{count} минут"
+      x_days:
+        one: "1 день"
+        few: "%{count} дней"
+        many: "%{count} дней"
+        other: "%{count} дней"
+      x_months:
+        one: "1 месяц"
+        few: "%{count} месяцев"
+        many: "%{count} месяцев"
+        other: "%{count} месяцев"
+      x_years:
+        one: "1 год"
+        few: "%{count} лет"
+        many: "%{count} лет"
+        other: "%{count} лет"

From 09e047406966613cfc5abe478760567a7023cc76 Mon Sep 17 00:00:00 2001
From: Transifex-Openfoodnetwork <transifex@openfoodnetwork.org>
Date: Fri, 26 Mar 2021 21:57:16 +1100
Subject: [PATCH 08/17] Updating translations for config/locales/fr.yml

---
 config/locales/fr.yml | 45 ++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 42 insertions(+), 3 deletions(-)

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 7cf593e360..44b64dd4b6 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -2419,6 +2419,7 @@ fr:
           Il y a eu un problème lors de l'ajout de votre produit au panier. Peut-être
           qu'il n'est plus en stock ou que la boutique sur laquelle vous étiez a fermé.
     admin:
+      unit_price_tooltip: "Le prix unitaire permet aux acheteurs de comparer les prix entre les produits et/ou les conditionnements. Attention, le prix final observé par l'acheteur peut être différent si des marges et/ou commissions sont appliquées."
       enterprise_limit_reached: "Vous avez atteint le nombre limite d'entreprises autorisées par défaut. Ecrivez à %{contact_email}si vous avez besoin d'augmenter cette limite."
       modals:
         got_it: "J'ai compris"
@@ -2688,9 +2689,7 @@ fr:
         min_quantity: "Quantité min"
         max_quantity: "Quantité max"
       price_breakdown: "Détail du prix"
-      unit_price_tooltip:
-        shopfront: "Il s'agit du prix unitaire de ce produit. Il permet à l'acheteur de comparer les prix quelque soit le conditionnement final du produit."
-        admin: "Le prix unitaire permet aux acheteurs de comparer les prix entre les produits et/ou les conditionnements. Attention, le prix final observé par l'acheteur peut être différent si des marges et/ou commissions sont appliquées."
+      unit_price_tooltip: "Il s'agit du prix unitaire de ce produit. Il permet à l'acheteur de comparer les prix quelque soit le conditionnement final du produit."
     variants:
       on_demand:
         'yes': "A volonté"
@@ -3122,6 +3121,7 @@ fr:
           header:
             store: Vue acheteur
     admin:
+      unit_price_tooltip: "Le prix unitaire permet aux acheteurs de comparer les prix entre les produits et/ou les conditionnements. Attention, le prix final observé par l'acheteur peut être différent si des marges et/ou commissions sont appliquées."
       tab:
         dashboard: "Tableau de bord"
         orders: "Commandes"
@@ -3671,3 +3671,42 @@ fr:
         spree/payment:
           one: Paiement
           other: Paiements
+  datetime:
+    distance_in_words:
+      about_x_hours:
+        one: environ 1 heure
+        other: environ %{count}heures
+      about_x_months:
+        one: environ 1 mois
+        other: environ %{count} mois
+      about_x_years:
+        one: environ 1 année
+        other: environ %{count} années
+      almost_x_years:
+        one: presque 1 année
+        other: presque %{count} années
+      half_a_minute: moins d'une minute
+      less_than_x_seconds:
+        one: moins d' 1 seconde
+        other: moins de %{count} secondes
+      less_than_x_minutes:
+        one: moins d'une minute
+        other: moins de %{count} minutes
+      over_x_years:
+        one: plus d' 1 an
+        other: plus de %{count} années
+      x_seconds:
+        one: "1 seconde"
+        other: "%{count} secondes"
+      x_minutes:
+        one: "1 minute"
+        other: "%{count} minutes"
+      x_days:
+        one: "1 jour"
+        other: "%{count} jours"
+      x_months:
+        one: "1 mois"
+        other: "%{count} mois"
+      x_years:
+        one: "1 an"
+        other: "%{count} ans"

From ad14a91eb2b079374220df43fa5bd321f3ab8d16 Mon Sep 17 00:00:00 2001
From: Transifex-Openfoodnetwork <transifex@openfoodnetwork.org>
Date: Fri, 26 Mar 2021 22:00:33 +1100
Subject: [PATCH 09/17] Updating translations for config/locales/en_FR.yml

---
 config/locales/en_FR.yml | 45 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 42 insertions(+), 3 deletions(-)

diff --git a/config/locales/en_FR.yml b/config/locales/en_FR.yml
index 5c1da0847b..5eb8bf977a 100644
--- a/config/locales/en_FR.yml
+++ b/config/locales/en_FR.yml
@@ -2415,6 +2415,7 @@ en_FR:
           There was a problem adding this product to the cart. Perhaps it has become
           unavailable or the shop is closing.
     admin:
+      unit_price_tooltip: "The unit price increases transparency by allowing your customers to easily compare prices between different products and packaging sizes. Note, that the final unit price displayed in the shopfront might differ as it is includes taxes & fees."
       enterprise_limit_reached: "You have reached the standard limit of enterprises per account. Write to %{contact_email} if you need to increase it."
       modals:
         got_it: "Got it"
@@ -2659,9 +2660,7 @@ en_FR:
         min_quantity: "Min quantity"
         max_quantity: "Max quantity"
       price_breakdown: "Price breakdown"
-      unit_price_tooltip:
-        shopfront: "This is the unit price of this product. It allows you to compare the price of products independent of packaging sizes & weights."
-        admin: "The unit price increases transparency by allowing your customers to easily compare prices between different products and packaging sizes. Note, that the final unit price displayed in the shopfront might differ as it is includes taxes & fees."
+      unit_price_tooltip: "This is the unit price of this product. It allows you to compare the price of products independent of packaging sizes & weights."
     variants:
       on_demand:
         'yes': "On demand"
@@ -3093,6 +3092,7 @@ en_FR:
           header:
             store: Store
     admin:
+      unit_price_tooltip: "The unit price increases transparency by allowing your customers to easily compare prices between different products and packaging sizes. Note, that the final unit price displayed in the shopfront might differ as it is includes taxes & fees."
       tab:
         dashboard: "Dashboard"
         orders: "Orders"
@@ -3641,3 +3641,42 @@ en_FR:
         spree/payment:
           one: Payments
           other: Payments
+  datetime:
+    distance_in_words:
+      about_x_hours:
+        one: about 1 hour
+        other: about %{count} hours
+      about_x_months:
+        one: about 1 month
+        other: about %{count} months
+      about_x_years:
+        one: about 1 year
+        other: about %{count} years
+      almost_x_years:
+        one: almost 1 year
+        other: almost %{count} years
+      half_a_minute: half a minute
+      less_than_x_seconds:
+        one: less than 1 second
+        other: less than %{count} seconds
+      less_than_x_minutes:
+        one: less than a minute
+        other: less than %{count} minutes
+      over_x_years:
+        one: over 1 year
+        other: over %{count} years
+      x_seconds:
+        one: "1 second"
+        other: "%{count} seconds"
+      x_minutes:
+        one: "1 minute"
+        other: "%{count} minutes"
+      x_days:
+        one: "1 day"
+        other: "%{count} days"
+      x_months:
+        one: "1 month"
+        other: "%{count} months"
+      x_years:
+        one: "1 year"
+        other: "%{count} years"

From 8072aeda9d79056aa50896d9229aa25c33786203 Mon Sep 17 00:00:00 2001
From: Transifex-Openfoodnetwork <transifex@openfoodnetwork.org>
Date: Mon, 29 Mar 2021 10:28:26 +1100
Subject: [PATCH 10/17] Updating translations for config/locales/de_DE.yml

---
 config/locales/de_DE.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/config/locales/de_DE.yml b/config/locales/de_DE.yml
index f7b59a4409..24c536d116 100644
--- a/config/locales/de_DE.yml
+++ b/config/locales/de_DE.yml
@@ -264,7 +264,7 @@ de_DE:
   error: Fehler
   processing_payment: "Bezahlung wird verarbeitet ..."
   no_pending_payments: "Keine ausstehenden Zahlungen."
-  invalid_payment_state: "Ungültiger Zahlungsstatus"
+  invalid_payment_state: "Ungültiger Zahlungsstatus: %{state}"
   filter_results: Suchen
   quantity: Menge
   pick_up: Abholen
@@ -1242,7 +1242,7 @@ de_DE:
         require_login_2_html: "Möchten Sie hier einkaufen? Bitte %{contact} %{enterprise} und fragen Sie nach dem Beitritt."
         require_customer_html: "Wenn Sie hier einkaufen möchten, fragen Sie bitte %{contact} %{enterprise} nach dem Beitritt."
       select_oc:
-        select_oc_html: "Bitte wählen Sie, <span class='highlighted'>wann Sie Ihre Bestellung wünschen</span>, um zu sehen, welche Produkte verfügbar sind."
+        select_oc_html: "Bitte wählen Sie zunächst oben aus, <span class='highlighted'>wann Sie Ihre Bestellung erhalten möchten</span>, um die verfügbaren Produkte anzuzeigen."
     products:
       summary:
         bulk: "Gruppenkauf"
@@ -1414,7 +1414,7 @@ de_DE:
       cookies_usage: "Diese Website verwendet Cookies, um Ihr Kauferlebnis reibungslos und sicher zu gestalten und um darüber hinaus zu verstehen, wie Sie die Website verwenden, um die von uns angebotenen Funktionen zu verbessern."
       cookies_definition: "Cookies sind sehr kleine Textdateien, die beim Besuch einiger Websites auf Ihrem Computer gespeichert werden."
       cookies_desc: "Wir verwenden nur die Cookies, die notwendig sind, um Ihnen den Service des Online-Kaufs/-Verkaufs von Lebensmitteln zu bieten. Wir verkaufen keine Ihrer Daten. Wir verwenden Cookies hauptsächlich, um uns daran zu erinnern, wer Sie sind, wenn Sie sich bei unserem Dienst einloggen, oder um uns die Artikel merken zu können, die Sie in Ihren Warenkorb legen, auch wenn Sie nicht eingeloggt sind. Wenn Sie die Weite nutzen, ohne auf \"Cookies akzeptieren\" zu klicken, nehmen wir an, dass Sie uns die Speicherung von Cookies erlauben, die für das Funktionieren der Website notwendig sind."
-      cookies_policy_link_desc: "Wenn Sie mehr erfahren möchten, besuchen Sie unsere"
+      cookies_policy_link_desc: "Wenn Sie mehr erfahren möchten, lesen Sie unsere"
       cookies_policy_link: "Hinweise zu Cookies"
       cookies_accept_button: "Cookies akzeptieren"
   home_shop: Jetzt regional einkaufen
@@ -1481,7 +1481,7 @@ de_DE:
   order_pickup_instructions: Informationen zur Abholung
   order_produce: Produkte
   order_total_price: Summe
-  order_includes_tax: (inkl. Steuern)
+  order_includes_tax: (enthaltene Steuern)
   order_payment_paypal_successful: Ihre Zahlung mit PayPal wurde erfolgreich abgewickelt.
   order_hub_info: Informationen über den Laden
   order_back_to_store: Zurück zum Laden
@@ -1599,8 +1599,8 @@ de_DE:
   hubs_filter_type: "Kategorie"
   hubs_filter_delivery: "Lieferoptionen"
   hubs_filter_property: "Eigenschaften"
-  hubs_matches: "Meinten Sie?"
-  hubs_intro: Regional einkaufen
+  hubs_matches: "Ergebnisse für"
+  hubs_intro: Wo möchten Sie regional einkaufen?
   hubs_distance: In der Nähe von
   hubs_distance_filter: "Läden in der Nähe von %{location} suchen"
   shop_changeable_orders_alert_html:
@@ -1715,8 +1715,8 @@ de_DE:
   sell_embed: "Wir bieten noch weitere Dienste rund um Ihr Unternehmen an."
   sell_ask_services: "Fragen Sie uns nach OFN-Dienstleistungen."
   shops_title: Regional Einkaufen
-  shops_headline: Einkaufen, neu gedacht.
-  shops_text: Pflanzen wachsen in Zyklen, Landwirte ernten in Zyklen und wir bestellen Lebensmittel in Zyklen. Ist ein Bestellzyklus gerade geschlossen, schauen Sie bald wieder vorbei.
+  shops_headline: Wählen Sie einen Laden aus der Liste.
+  shops_text: Pflanzen wachsen in Zyklen, Landwirte ernten in Zyklen und bei uns bestellen Sie Lebensmittel in Zyklen. Ist ein Bestellzyklus gerade geschlossen, wählen Sie einen anderen Laden oder schauen Sie später wieder vorbei.
   shops_signup_title: Laden registrieren
   shops_signup_headline: Lebensmittel-Hubs, unbegrenzt.
   shops_signup_motivation: Was auch immer Ihr Modell ist, wir unterstützen Sie. Wie auch immer Sie sich ändern, wir sind bei Ihnen. Wir sind gemeinnützig, unabhängig und Open-Source. Wir sind die Software-Partner, von denen Sie schon immer geträumt haben.
@@ -3330,7 +3330,7 @@ de_DE:
           value: "Menge"
           unit_name: "Einheitenname"
           price: "Preis"
-          unit_price: "Stückpreis"
+          unit_price: "Grundpreis"
           unit_price_legend: "Berechnet aus Preis und Menge."
           on_hand: "Verfügbar"
           on_demand: "Unbegrenzt"

From 13668628c463b922ac224ba703b44ca8b3321243 Mon Sep 17 00:00:00 2001
From: Transifex-Openfoodnetwork <transifex@openfoodnetwork.org>
Date: Mon, 29 Mar 2021 15:45:09 +1100
Subject: [PATCH 11/17] Updating translations for config/locales/en_US.yml

---
 config/locales/en_US.yml | 47 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 44 insertions(+), 3 deletions(-)

diff --git a/config/locales/en_US.yml b/config/locales/en_US.yml
index 9edd802e00..2b2fc479b4 100644
--- a/config/locales/en_US.yml
+++ b/config/locales/en_US.yml
@@ -264,7 +264,7 @@ en_US:
   error: Error
   processing_payment: "Processing payment..."
   no_pending_payments: "No pending payments"
-  invalid_payment_state: "Invalid payment state"
+  invalid_payment_state: "Invalid payment state: %{state}"
   filter_results: Filter Results
   quantity: Quantity
   pick_up: Pick up
@@ -2415,6 +2415,7 @@ en_US:
           There was a problem adding this product to the cart. Perhaps it has become
           unavailable or the shop is closing.
     admin:
+      unit_price_tooltip: "The unit price increases transparency by allowing your customers to easily compare prices between different products and packaging sizes. Note, that the final unit price displayed in the shopfront might differ if it includes taxes & fees."
       enterprise_limit_reached: "You have reached the standard limit of enterprises per account. Write to %{contact_email} if you need to increase it."
       modals:
         got_it: "Got it"
@@ -2659,8 +2660,7 @@ en_US:
         min_quantity: "Min quantity"
         max_quantity: "Max quantity"
       price_breakdown: "Price breakdown"
-      unit_price_tooltip:
-        shopfront: "This is the unit price of this product. It allows you to compare the price of products independent of packaging sizes & weights."
+      unit_price_tooltip: "This is the unit price of this product. It allows you to compare the price of products independent of packaging sizes & weights."
     variants:
       on_demand:
         'yes': "On demand"
@@ -3092,6 +3092,7 @@ en_US:
           header:
             store: Store
     admin:
+      unit_price_tooltip: "The unit price increases transparency by allowing your customers to easily compare prices between different products and packaging sizes. Note, that the final unit price displayed in the shopfront might differ if it includes taxes & fees."
       tab:
         dashboard: "Dashboard"
         orders: "Orders"
@@ -3321,6 +3322,7 @@ en_US:
           unit_name: "Unit name"
           price: "Price"
           unit_price: "Unit Price"
+          unit_price_legend: "Calculated based on the item price"
           on_hand: "On Hand"
           on_demand: "On Demand"
           product_description: "Product Description"
@@ -3639,3 +3641,42 @@ en_US:
         spree/payment:
           one: Payment
           other: Payments
+  datetime:
+    distance_in_words:
+      about_x_hours:
+        one: about 1 hour
+        other: about %{count} hours
+      about_x_months:
+        one: about 1 month
+        other: about %{count} months
+      about_x_years:
+        one: about 1 year
+        other: about %{count} years
+      almost_x_years:
+        one: almost 1 year
+        other: almost %{count} years
+      half_a_minute: half a minute
+      less_than_x_seconds:
+        one: less than 1 second
+        other: less than %{count} seconds
+      less_than_x_minutes:
+        one: less than a minute
+        other: less than %{count} minutes
+      over_x_years:
+        one: over 1 year
+        other: over %{count} years
+      x_seconds:
+        one: "1 second"
+        other: "%{count} seconds"
+      x_minutes:
+        one: "1 minute"
+        other: "%{count} minutes"
+      x_days:
+        one: "1 day"
+        other: "%{count} days"
+      x_months:
+        one: "1 month"
+        other: "%{count} months"
+      x_years:
+        one: "1 year"
+        other: "%{count} years"

From 7be7fb3ddc6d5401a6727f3431a7729457baafee Mon Sep 17 00:00:00 2001
From: Transifex-Openfoodnetwork <transifex@openfoodnetwork.org>
Date: Mon, 29 Mar 2021 18:59:29 +1100
Subject: [PATCH 13/17] Updating translations for config/locales/fr.yml

---
 config/locales/fr.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 44b64dd4b6..8311ed01a8 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -264,7 +264,7 @@ fr:
   error: Erreur
   processing_payment: "Paiement en cours..."
   no_pending_payments: "Aucun paiement en attente."
-  invalid_payment_state: "Statut de paiement invalide"
+  invalid_payment_state: "Statut de paiement invalide : %{state}"
   filter_results: Filtrer les résultats
   quantity: Quantité
   pick_up: Retrait

From 42147e13eb820b54fb6a5f61f922531ffd7be805 Mon Sep 17 00:00:00 2001
From: Transifex-Openfoodnetwork <transifex@openfoodnetwork.org>
Date: Mon, 29 Mar 2021 18:59:40 +1100
Subject: [PATCH 14/17] Updating translations for config/locales/en_FR.yml

---
 config/locales/en_FR.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/en_FR.yml b/config/locales/en_FR.yml
index 5eb8bf977a..9aa272b4c6 100644
--- a/config/locales/en_FR.yml
+++ b/config/locales/en_FR.yml
@@ -264,7 +264,7 @@ en_FR:
   error: Error
   processing_payment: "Processing payment..."
   no_pending_payments: "No pending payments"
-  invalid_payment_state: "Invalid payment state"
+  invalid_payment_state: "Invalid payment state: %{state}"
   filter_results: Filter Results
   quantity: Quantity
   pick_up: Pick up

From fa95334229b4ee04bc6b6d8c8dc5660270e698e1 Mon Sep 17 00:00:00 2001
From: Transifex-Openfoodnetwork <transifex@openfoodnetwork.org>
Date: Mon, 29 Mar 2021 19:12:58 +1100
Subject: [PATCH 15/17] Updating translations for config/locales/en_GB.yml

---
 config/locales/en_GB.yml | 47 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 44 insertions(+), 3 deletions(-)

diff --git a/config/locales/en_GB.yml b/config/locales/en_GB.yml
index 64a20b39a5..c57ec16cd4 100644
--- a/config/locales/en_GB.yml
+++ b/config/locales/en_GB.yml
@@ -264,7 +264,7 @@ en_GB:
   error: Error
   processing_payment: "Processing payment..."
   no_pending_payments: "No pending payments"
-  invalid_payment_state: "Invalid payment state"
+  invalid_payment_state: "Invalid payment state: %{state}"
   filter_results: Filter Results
   quantity: Quantity
   pick_up: Pick up
@@ -2415,6 +2415,7 @@ en_GB:
           There was a problem adding this product to your basket. Perhaps it has become
           unavailable or the shop is closing.
     admin:
+      unit_price_tooltip: "The unit price increases transparency by allowing your customers to easily compare prices between different products and packaging sizes. Note, that the final unit price displayed in the shopfront might differ as it is includes taxes & fees."
       enterprise_limit_reached: "You have reached the standard limit of enterprises per account. Write to %{contact_email} if you need to increase it."
       modals:
         got_it: "Got it"
@@ -2665,8 +2666,7 @@ en_GB:
         min_quantity: "Min quantity"
         max_quantity: "Max quantity"
       price_breakdown: "Price breakdown"
-      unit_price_tooltip:
-        shopfront: "This is the unit price of this product. It allows you to compare the price of products independent of packaging sizes & weights."
+      unit_price_tooltip: "This is the unit price of this product. It allows you to compare the price of products independent of packaging sizes & weights."
     variants:
       on_demand:
         'yes': "Unlimited"
@@ -3098,6 +3098,7 @@ en_GB:
           header:
             store: Store
     admin:
+      unit_price_tooltip: "The unit price increases transparency by allowing your customers to easily compare prices between different products and packaging sizes. Note, that the final unit price displayed in the shopfront might differ as it is includes taxes & fees."
       tab:
         dashboard: "Dashboard"
         orders: "Orders"
@@ -3327,6 +3328,7 @@ en_GB:
           unit_name: "Unit name"
           price: "Price"
           unit_price: "Unit Price"
+          unit_price_legend: "Calculated based on the item price"
           on_hand: "In Stock"
           on_demand: "Unlimited"
           product_description: "Product Description"
@@ -3645,3 +3647,42 @@ en_GB:
         spree/payment:
           one: Payment
           other: Payments
+  datetime:
+    distance_in_words:
+      about_x_hours:
+        one: about 1 hour
+        other: about %{count} hours
+      about_x_months:
+        one: about 1 month
+        other: about %{count} months
+      about_x_years:
+        one: about 1 year
+        other: about %{count} years
+      almost_x_years:
+        one: almost 1 year
+        other: almost %{count} years
+      half_a_minute: half a minute
+      less_than_x_seconds:
+        one: less than 1 second
+        other: less than %{count} seconds
+      less_than_x_minutes:
+        one: less than a minute
+        other: less than %{count} minutes
+      over_x_years:
+        one: over 1 year
+        other: over %{count} years
+      x_seconds:
+        one: "1 second"
+        other: "%{count} seconds"
+      x_minutes:
+        one: "1 minute"
+        other: "%{count} minutes"
+      x_days:
+        one: "1 day"
+        other: "%{count} days"
+      x_months:
+        one: "1 month"
+        other: "%{count} months"
+      x_years:
+        one: "1 year"
+        other: "%{count} years"

From 56c2caf422805aebae12956ff15b61a888073ae5 Mon Sep 17 00:00:00 2001
From: Transifex-Openfoodnetwork <transifex@openfoodnetwork.org>
Date: Mon, 29 Mar 2021 21:25:49 +1100
Subject: [PATCH 16/17] Updating translations for config/locales/ca.yml

---
 config/locales/ca.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 1702601fdd..6ff3d4733c 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -264,7 +264,7 @@ ca:
   error: Error
   processing_payment: "S'està processant el pagament..."
   no_pending_payments: "No hi ha pagaments pendents"
-  invalid_payment_state: "Estat de pagament no vàlid"
+  invalid_payment_state: "Estat de pagament invàlid: %{state}"
   filter_results: Aplicar filtre
   quantity: Quantitat
   pick_up: Recollida

From 5fc0b8d724d91a1488007fd6c6b352cf18727363 Mon Sep 17 00:00:00 2001
From: Transifex-Openfoodnetwork <transifex@openfoodnetwork.org>
Date: Mon, 29 Mar 2021 21:26:13 +1100
Subject: [PATCH 17/17] Updating translations for config/locales/es.yml

---
 config/locales/es.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/es.yml b/config/locales/es.yml
index 59794ace4a..2c3a6d676a 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -264,7 +264,7 @@ es:
   error: Error
   processing_payment: "Procesando el pago..."
   no_pending_payments: "No tiene pagos pendientes"
-  invalid_payment_state: "Estado de pago no válido"
+  invalid_payment_state: "Estado de pago inválido: %{state}"
   filter_results: Filtrar resultados
   quantity: Cantidad
   pick_up: Recogida