diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index f5885b6d48..6538efbddf 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -23,6 +23,10 @@ ar:
         variant_unit_name: "اسم وحدة النوع"
       spree/credit_card:
         base: "بطاقة ائتمان"
+        number: "رقم "
+        month: "شهر"
+        verification_value: "قيمة التحقق"
+        year: "عام"
       order_cycle:
         orders_close_at: تاريخ الاغلاق
       variant_override:
@@ -2002,6 +2006,7 @@ ar:
   calculator: "آلة حاسبة"
   calculator_values: "القيم المحوسبة"
   calculator_settings_warning: "إذا كنت تقوم بتغيير نوع الحاسبة ، فيجب عليك الحفظ أولاً قبل أن تتمكن من تحرير إعدادات الحاسبة"
+  calculator_preferred_unit_error: "يجب أن تكون كجم أو رطل"
   flat_percent_per_item: "نسبة ثابتة (لكل بند)"
   flat_rate_per_item: "سعر ثابت (لكل بند)"
   flat_rate_per_order: "تسعيرة ثابته (لكل طلب)"
@@ -3078,11 +3083,18 @@ ar:
     inventory_error_flash_for_insufficient_quantity: "المواد في سلة التسوق غير متاح."
     inventory: المخزون
     zipcode: الرمز البريدي
-    weight: الوزن (لكل كجم)
+    weight: الوزن (لكل كجم أو رطل)
     error_user_destroy_with_orders: "لا يمكن حذف المستخدمين الذين لديهم طلبات مكتملة"
     cannot_create_payment_without_payment_methods: "لا يمكنك إنشاء دفعة لطلب بدون تحديد طرقة الدفع."
     please_define_payment_methods: "يرجى تحديد بعض طرق الدفع أولاً."
     options: "خيارات"
+    has_no_shipped_units: "لا يوجد لديه طلبات مشحونة"
+    successfully_created: '%{resource} تم إنشاؤه بنجاح!'
+    successfully_updated: 'تم تحديث %{resource} بنجاح!'
+    payment_processing_failed: "لا يمكن معالجة الدفع ، يرجى التحقق من التفاصيل التي أدخلتها"
+    not_available: "غير متاح"
+    order_populator:
+      out_of_stock: '%{item} غير متوفر.'
     actions:
       update: "تحديث"
     shared:
diff --git a/config/locales/en_FR.yml b/config/locales/en_FR.yml
index adec8aaa58..c5b8d68344 100644
--- a/config/locales/en_FR.yml
+++ b/config/locales/en_FR.yml
@@ -23,6 +23,10 @@ en_FR:
         variant_unit_name: "Variant Unit Name"
       spree/credit_card:
         base: "Credit Card"
+        number: "Number"
+        month: "Month"
+        verification_value: "Verification Value"
+        year: "Year"
       order_cycle:
         orders_close_at: Close date
       variant_override:
@@ -1995,6 +1999,7 @@ en_FR:
   calculator: "Calculator"
   calculator_values: "Calculator values"
   calculator_settings_warning: "If you are changing the calculator type, you must save first before you can edit the calculator settings"
+  calculator_preferred_unit_error: "must be kg or lb"
   flat_percent_per_item: "Flat Percent (per item)"
   flat_rate_per_item: "Flat Rate (per item)"
   flat_rate_per_order: "Flat Rate (per order)"
@@ -2982,11 +2987,18 @@ en_FR:
     inventory_error_flash_for_insufficient_quantity: "An item in your cart has become unavailable."
     inventory: Inventory
     zipcode: Postcode
-    weight: Weight (per kg)
+    weight: Weight (per kg or lb)
     error_user_destroy_with_orders: "Users with completed orders may not be deleted"
     cannot_create_payment_without_payment_methods: "You cannot create a payment for an order without any payment methods defined."
     please_define_payment_methods: "Please define some payment methods first."
     options: "Options"
+    has_no_shipped_units: "has no shipped units"
+    successfully_created: '%{resource} has been successfully created!'
+    successfully_updated: '%{resource} has been successfully updated!'
+    payment_processing_failed: "Payment could not be processed, please check the details you entered"
+    not_available: "N/A"
+    order_populator:
+      out_of_stock: '%{item} is out of stock.'
     actions:
       update: "Update"
     shared:
diff --git a/config/locales/en_US.yml b/config/locales/en_US.yml
index 98b943d6be..4078ae9e4b 100644
--- a/config/locales/en_US.yml
+++ b/config/locales/en_US.yml
@@ -1995,6 +1995,7 @@ en_US:
   calculator: "Calculator"
   calculator_values: "Calculator values"
   calculator_settings_warning: "If you are changing the calculator type, you must save first before you can edit the calculator settings"
+  calculator_preferred_unit_error: "must be kg or lb"
   flat_percent_per_item: "Flat Percent (per item)"
   flat_rate_per_item: "Flat Rate (per item)"
   flat_rate_per_order: "Flat Rate (per order)"
@@ -2982,7 +2983,7 @@ en_US:
     inventory_error_flash_for_insufficient_quantity: "An item in your cart has become unavailable."
     inventory: Inventory
     zipcode: Zipcode
-    weight: Weight (per lb)
+    weight: Weight (per kg or lb)
     error_user_destroy_with_orders: "Users with completed orders may not be deleted"
     cannot_create_payment_without_payment_methods: "You cannot create a payment for an order without any payment methods defined."
     please_define_payment_methods: "Please define some payment methods first."
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index ddfe9df194..c382671b4d 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -23,6 +23,10 @@ fr:
         variant_unit_name: "Unité de la variante"
       spree/credit_card:
         base: "Carte de crédit"
+        number: "N° commande"
+        month: "Mois"
+        verification_value: "Valeur de vérification"
+        year: "Année"
       order_cycle:
         orders_close_at: Date de fermeture
       variant_override:
@@ -1387,7 +1391,7 @@ fr:
       cookies_policy_link: "politique de cookies"
       cookies_accept_button: "Accepter les cookies"
   home_shop: Faire mes courses
-  brandstory_headline: "NOUVEAU : on change de nom !"
+  brandstory_headline: "On change de nom !"
   brandstory_intro: "Votre plateforme Open Food France change de nom et devient CoopCircuits, une plateforme libre, cogérée et accessible à tous."
   brandstory_part1: "Le service proposé est basé sur le logiciel libre Open Food Network. Les organisateurs de circuits courts qui utilisent la plateforme décident ensemble des évolutions à apporter au logiciel, et gèrent conjointement l’activité de la coopérative CoopCircuits. Ils décident notamment du prix qu’ils paieront pour utiliser cette plateforme."
   brandstory_part2: "Afin de permettre à tout type d’initiative de circuit court de fonctionner efficacement, les offres proposées s’adaptent à la diversité des modèles économiques : que vous gériez un groupement d’achat bénévolement, ou pilotiez une entreprise familiale de distribution, CoopCircuits vous accompagne :-)"
@@ -1997,6 +2001,7 @@ fr:
   calculator: "Calculateur"
   calculator_values: "Valeurs applicables"
   calculator_settings_warning: "Si vous modifiez le type de calculateur, vous devez sauvegarder avant de modifier les paramètres du calculateur."
+  calculator_preferred_unit_error: "doit être kg ou lb"
   flat_percent_per_item: "Pourcentage net"
   flat_rate_per_item: "Montant fixe par article"
   flat_rate_per_order: "Montant fixe par commande"
@@ -3011,11 +3016,18 @@ fr:
     inventory_error_flash_for_insufficient_quantity: "Un produit de votre panier n'est plus disponible."
     inventory: Catalogue boutique
     zipcode: Code postal
-    weight: Poids (au kg)
+    weight: Poids (par kg ou lb)
     error_user_destroy_with_orders: "Les utilisateurs avec des commandes finalisées pourraient ne pas être supprimés"
     cannot_create_payment_without_payment_methods: "Vous ne pouvez pas ajouter un paiement pour une commande sans avoir défini de méthode de paiement au préalable."
     please_define_payment_methods: "Il faut que vous définissiez une méthode de paiement avant tout !"
     options: "Options"
+    has_no_shipped_units: "n'a pas d'éléments envoyés"
+    successfully_created: '%{resource} a été créé avec succès !'
+    successfully_updated: '%{resource} a été mis à jour avec succès !'
+    payment_processing_failed: "Le paiement n'a pas pu être traité, veuillez vérifier les informations saisies"
+    not_available: "N/A"
+    order_populator:
+      out_of_stock: '%{item}est en rupture de stock.'
     actions:
       update: "Mettre à jour"
     shared:
diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index 17708c3523..9ba2d2c5f6 100644
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -23,6 +23,10 @@ nb:
         variant_unit_name: "Enhetsnavn Variant"
       spree/credit_card:
         base: "Kredittkort"
+        number: "Antall"
+        month: "Måned"
+        verification_value: "Verifiseringsverdi"
+        year: "År"
       order_cycle:
         orders_close_at: Lukkedato
       variant_override:
@@ -1995,6 +1999,7 @@ nb:
   calculator: "Kalkulator"
   calculator_values: "Kalkulatorverdier"
   calculator_settings_warning: "Hvis du endrer kalkulatortypen, må du lagre først før du kan redigere kalkulatorinnstillingene"
+  calculator_preferred_unit_error: "må være kg eller lb."
   flat_percent_per_item: "Flat prosent (per stk)"
   flat_rate_per_item: "Flat rate (per vare)"
   flat_rate_per_order: "Flat Rate (per bestilling)"
@@ -2979,11 +2984,18 @@ nb:
     inventory_error_flash_for_insufficient_quantity: "Et element i handlekurven din er blitt utilgjengelig."
     inventory: Varelager
     zipcode: Postnummer
-    weight: Vekt (per kg)
+    weight: Vekt (per kg eller lb)
     error_user_destroy_with_orders: "Brukere med fullførte ordrer kan ikke slettes"
     cannot_create_payment_without_payment_methods: "Du kan ikke opprette en betaling for en bestilling uten at det er definert noen betalingsmetoder."
     please_define_payment_methods: "Vennligst angi noen betalingsmetoder først."
     options: "Valg"
+    has_no_shipped_units: "har ingen sendte enheter"
+    successfully_created: 'Opprettelsen av %{resource} var vellykket!'
+    successfully_updated: 'Oppdatering av%{resource} var vellykket!'
+    payment_processing_failed: "Betalingen kunne ikke behandles, vennligst sjekk detaljene du skrev inn"
+    not_available: "Ikke relevant"
+    order_populator:
+      out_of_stock: '%{item} er utsolgt.'
     actions:
       update: "Oppdater"
     shared:
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index b2f7f09cdf..065b3b411b 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -23,6 +23,10 @@ ru:
         variant_unit_name: "Название Единицы Варианта"
       spree/credit_card:
         base: "Кредитная Карта"
+        number: "Номер"
+        month: "Месяц"
+        verification_value: "Значение Проверки"
+        year: "Год"
       order_cycle:
         orders_close_at: Время Закрытия
       variant_override:
@@ -2002,6 +2006,7 @@ ru:
   calculator: "Калькулятор"
   calculator_values: "Значения"
   calculator_settings_warning: "Если Вы меняете тип калькулятора, то должны сначала сохранить его, прежде чем редактировать настройки калькулятора."
+  calculator_preferred_unit_error: "должно быть кг или фунт"
   flat_percent_per_item: "Процент (с единицы товара)"
   flat_rate_per_item: "Ставка (с единицы товара)"
   flat_rate_per_order: "Ставка (с заказа)"
@@ -3042,11 +3047,18 @@ ru:
     inventory_error_flash_for_insufficient_quantity: "Один из товаров вашей корзины стал недоступен."
     inventory: Товарная Номенклатура
     zipcode: Почтовый индекс
-    weight: Вес (за кг)
+    weight: Вес (на кг или фунт)
     error_user_destroy_with_orders: "Пользователи с выполненными заказами не могут быть удалены"
     cannot_create_payment_without_payment_methods: "Нельзя создать платеж для заказа, если не настроен ни один из способов оплаты."
     please_define_payment_methods: "Сначала определите способ оплаты."
     options: "Опции"
+    has_no_shipped_units: "не имеет отгруженных единиц"
+    successfully_created: '%{resource} был успешно создан!'
+    successfully_updated: '%{resource} был успешно обновлён!'
+    payment_processing_failed: "Платеж не может быть обработан, пожалуйста, проверьте введенные данные"
+    not_available: "Нет данных"
+    order_populator:
+      out_of_stock: '%{item} отсутствует в наличии.'
     actions:
       update: "Обновить"
     shared: