diff --git a/config/locales/app.admin.de.yml b/config/locales/app.admin.de.yml
index 38f82e385..88345d80f 100644
--- a/config/locales/app.admin.de.yml
+++ b/config/locales/app.admin.de.yml
@@ -1902,7 +1902,7 @@ de:
         manage_the_store: "Manage the Store"
         settings: "Settings"
         all_products: "All products"
-        categories_of_store: "Store's categories"
+        categories_of_store: "Store categories"
         the_orders: "Orders"
         back_to_list: "Back to list"
         product_categories:
@@ -1917,7 +1917,7 @@ de:
           edit_product_category: "Modify a category"
         product_category_form:
           name: "Name of category"
-          slug: "Name of URL"
+          slug: "URL"
           select_parent_product_category: "Choose a parent category (N1)"
           no_parent: "No parent"
           create:
@@ -1991,8 +1991,8 @@ de:
           product_parameters: "Product parameters"
           stock_management: "Stock management"
           name: "Name of product"
-          sku: "Reference product (SKU)"
-          slug: "Name of URL"
+          sku: "Product reference (SKU)"
+          slug: "URL"
           is_show_in_store: "Available in the store"
           is_active_price: "Activate the price"
           active_price_info: "Is this product visible by the members on the store?"
@@ -2003,20 +2003,20 @@ de:
           assigning_category: "Assigning a category"
           assigning_category_info: "<strong>Information</strong></br>You can only declare one category per product. If you assign this product to a sub-category, it will automatically be assigned to its parent category as well."
           assigning_machines: "Assigning machines"
-          assigning_machines_info: "<strong>Information</strong></br>You can link one or more machines from your fablab to your product, this product will then be subject to the filters on the catalogue view.</br>The machines selected below will be linked to the product."
+          assigning_machines_info: "<strong>Information</strong></br>You can link one or more machines from your workshop to your product. This product will then be subject to the filters on the catalogue view.</br>The machines selected below will be linked to the product."
           product_description: "Product description"
-          product_description_info: "<strong>Information</strong></br>This product description will be present in the product sheet. You have a few editorial styles at your disposal to create the product sheet."
+          product_description_info: "<strong>Information</strong></br>This product description will be presented in the product sheet. You have a few editorial styles at your disposal to create the product sheet."
           product_files: "Document"
-          product_files_info: "<strong>Information</strong></br>Add documents related to this product, the uploaded documents will be presented in the product sheet, in a separate block. You can only upload pdf documents."
+          product_files_info: "<strong>Information</strong></br>Add documents related to this product. They will be presented in the product sheet, in a separate block. You can only upload pdf documents."
           add_product_file: "Add a document"
-          product_images: "Images of product"
-          product_images_info: "<strong>Advice</strong></br>We advise you to use a square format, jpg or png, for jpgs, please use white for the background colour. The main visual will be the visual presented first in the product sheet."
+          product_images: "Pictures of the product"
+          product_images_info: "<strong>Advice</strong></br>We advise you to use a square format, JPG or PNG. For JPG, please use white for the background colour. The main visual will be the first presented in the product sheet."
           add_product_image: "Add an image"
           save: "Save"
         product_stock_form:
           stock_up_to_date: "Stock up to date"
           date_time: "{DATE} - {TIME}"
-          ongoing_operations: "Ongoing stocks operations"
+          ongoing_operations: "Ongoing stock operations"
           save_reminder: "Don't forget to save your operations"
           low_stock_threshold: "Define a low stock threshold"
           stock_threshold_toggle: "Activate stock threshold"
@@ -2027,7 +2027,7 @@ de:
           events_history: "Events history"
           event_type: "Events:"
           reason: "Reason"
-          stocks: "Stocks:"
+          stocks: "Stock:"
           internal: "Private stock"
           external: "Public stock"
           all: "All types"
@@ -2044,7 +2044,7 @@ de:
           withdrawal: "Withdrawal"
           update_stock: "Update stock"
           reason_type: "Reason"
-          stocks: "Stocks:"
+          stocks: "Stock:"
           quantity: "Quantity"
         stock_movement_reason:
           inward_stock: "Inward stock"
diff --git a/config/locales/app.admin.es.yml b/config/locales/app.admin.es.yml
index 20a0909df..2e0838b37 100644
--- a/config/locales/app.admin.es.yml
+++ b/config/locales/app.admin.es.yml
@@ -1902,7 +1902,7 @@ es:
         manage_the_store: "Manage the Store"
         settings: "Settings"
         all_products: "All products"
-        categories_of_store: "Store's categories"
+        categories_of_store: "Store categories"
         the_orders: "Orders"
         back_to_list: "Back to list"
         product_categories:
@@ -1917,7 +1917,7 @@ es:
           edit_product_category: "Modify a category"
         product_category_form:
           name: "Name of category"
-          slug: "Name of URL"
+          slug: "URL"
           select_parent_product_category: "Choose a parent category (N1)"
           no_parent: "No parent"
           create:
@@ -1991,8 +1991,8 @@ es:
           product_parameters: "Product parameters"
           stock_management: "Stock management"
           name: "Name of product"
-          sku: "Reference product (SKU)"
-          slug: "Name of URL"
+          sku: "Product reference (SKU)"
+          slug: "URL"
           is_show_in_store: "Available in the store"
           is_active_price: "Activate the price"
           active_price_info: "Is this product visible by the members on the store?"
@@ -2003,20 +2003,20 @@ es:
           assigning_category: "Assigning a category"
           assigning_category_info: "<strong>Information</strong></br>You can only declare one category per product. If you assign this product to a sub-category, it will automatically be assigned to its parent category as well."
           assigning_machines: "Assigning machines"
-          assigning_machines_info: "<strong>Information</strong></br>You can link one or more machines from your fablab to your product, this product will then be subject to the filters on the catalogue view.</br>The machines selected below will be linked to the product."
+          assigning_machines_info: "<strong>Information</strong></br>You can link one or more machines from your workshop to your product. This product will then be subject to the filters on the catalogue view.</br>The machines selected below will be linked to the product."
           product_description: "Product description"
-          product_description_info: "<strong>Information</strong></br>This product description will be present in the product sheet. You have a few editorial styles at your disposal to create the product sheet."
+          product_description_info: "<strong>Information</strong></br>This product description will be presented in the product sheet. You have a few editorial styles at your disposal to create the product sheet."
           product_files: "Document"
-          product_files_info: "<strong>Information</strong></br>Add documents related to this product, the uploaded documents will be presented in the product sheet, in a separate block. You can only upload pdf documents."
+          product_files_info: "<strong>Information</strong></br>Add documents related to this product. They will be presented in the product sheet, in a separate block. You can only upload pdf documents."
           add_product_file: "Add a document"
-          product_images: "Images of product"
-          product_images_info: "<strong>Advice</strong></br>We advise you to use a square format, jpg or png, for jpgs, please use white for the background colour. The main visual will be the visual presented first in the product sheet."
+          product_images: "Pictures of the product"
+          product_images_info: "<strong>Advice</strong></br>We advise you to use a square format, JPG or PNG. For JPG, please use white for the background colour. The main visual will be the first presented in the product sheet."
           add_product_image: "Add an image"
           save: "Save"
         product_stock_form:
           stock_up_to_date: "Stock up to date"
           date_time: "{DATE} - {TIME}"
-          ongoing_operations: "Ongoing stocks operations"
+          ongoing_operations: "Ongoing stock operations"
           save_reminder: "Don't forget to save your operations"
           low_stock_threshold: "Define a low stock threshold"
           stock_threshold_toggle: "Activate stock threshold"
@@ -2027,7 +2027,7 @@ es:
           events_history: "Events history"
           event_type: "Events:"
           reason: "Reason"
-          stocks: "Stocks:"
+          stocks: "Stock:"
           internal: "Private stock"
           external: "Public stock"
           all: "All types"
@@ -2044,7 +2044,7 @@ es:
           withdrawal: "Withdrawal"
           update_stock: "Update stock"
           reason_type: "Reason"
-          stocks: "Stocks:"
+          stocks: "Stock:"
           quantity: "Quantity"
         stock_movement_reason:
           inward_stock: "Inward stock"
diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml
index 23551a772..0cc165cbd 100644
--- a/config/locales/app.admin.fr.yml
+++ b/config/locales/app.admin.fr.yml
@@ -1902,7 +1902,7 @@ fr:
         manage_the_store: "Gérer la boutique"
         settings: "Paramètres"
         all_products: "Tous les produits"
-        categories_of_store: "Store's categories"
+        categories_of_store: "Catégories de la boutique"
         the_orders: "Commandes"
         back_to_list: "Retour à la liste"
         product_categories:
@@ -1917,7 +1917,7 @@ fr:
           edit_product_category: "Modifier une catégorie"
         product_category_form:
           name: "Nom de la catégorie"
-          slug: "Name of URL"
+          slug: "URL"
           select_parent_product_category: "Choisissez une catégorie parent (N1)"
           no_parent: "Aucun parent"
           create:
@@ -1956,7 +1956,7 @@ fr:
           successfully_deleted: "Le produit a été supprimé avec succès"
           unable_to_delete: "Impossible de supprimer le produit : "
           filter: "Filter"
-          filter_clear: "Effacer tout"
+          filter_clear: "Tout effacer"
           filter_apply: "Appliquer"
           filter_categories: "Par catégories"
           filter_machines: "Par machines"
@@ -1991,8 +1991,8 @@ fr:
           product_parameters: "Paramètres du produit"
           stock_management: "Gestion des stocks"
           name: "Nom du produit"
-          sku: "Reference product (SKU)"
-          slug: "Name of URL"
+          sku: "Référence du produit (SKU)"
+          slug: "URL"
           is_show_in_store: "Disponible dans la boutique"
           is_active_price: "Activer le prix"
           active_price_info: "Ce produit est-il visible par les membres dans la boutique ?"
@@ -2003,20 +2003,20 @@ fr:
           assigning_category: "Affectation d'une catégorie"
           assigning_category_info: "<strong>Informations</strong></br>Vous ne pouvez déclarer qu'une seule catégorie par produit. Si vous assignez ce produit à une sous-catégorie, il sera automatiquement assigné à sa catégorie parente."
           assigning_machines: "Assigner des machines"
-          assigning_machines_info: "<strong>Information</strong></br>You can link one or more machines from your fablab to your product, this product will then be subject to the filters on the catalogue view.</br>The machines selected below will be linked to the product."
+          assigning_machines_info: "<strong>Informations</strong></br>Vous pouvez lier une ou plusieurs machines de votre atelier à votre produit. Ce produit sera alors soumis aux filtres de la vue catalogue.</br>Les machines sélectionnées ci-dessous seront liées au produit."
           product_description: "Description du produit"
-          product_description_info: "<strong>Informations</strong></br>Cette description de produit sera présente dans la fiche produit. Vous avez quelques styles éditoriaux à votre disposition pour créer la fiche produit."
+          product_description_info: "<strong>Informations</strong></br>Cette description de produit sera présentée dans la fiche produit. Vous avez quelques styles éditoriaux à votre disposition pour créer la fiche produit."
           product_files: "Document"
-          product_files_info: "<strong>Information</strong></br>Add documents related to this product, the uploaded documents will be presented in the product sheet, in a separate block. You can only upload pdf documents."
+          product_files_info: "<strong>Informations</strong></br>Ajouter des documents liés à ce produit. Ils seront présentés dans la fiche produit, dans un bloc séparé. Vous ne pouvez télécharger que des documents PDF."
           add_product_file: "Ajouter un document"
-          product_images: "Images of product"
-          product_images_info: "<strong>Advice</strong></br>We advise you to use a square format, jpg or png, for jpgs, please use white for the background colour. The main visual will be the visual presented first in the product sheet."
+          product_images: "Photos du produit"
+          product_images_info: "<strong>Conseil</strong></br>Nous vous conseillons d'utiliser un format carré, JPG ou PNG. Pour le JPG, veuillez utiliser le blanc pour la couleur de fond. Le visuel principal sera le premier présenté dans la fiche produit."
           add_product_image: "Ajouter une image"
           save: "Enregistrer"
         product_stock_form:
           stock_up_to_date: "Stock à jour"
           date_time: "{DATE} - {TIME}"
-          ongoing_operations: "Ongoing stocks operations"
+          ongoing_operations: "Opérations de stock en cours"
           save_reminder: "N'oubliez pas de sauvegarder vos opérations"
           low_stock_threshold: "Définir un seuil de stock bas"
           stock_threshold_toggle: "Activer le seuil de stock"
@@ -2060,7 +2060,7 @@ fr:
           heading: "Commandes"
           create_order: "Créer une commande"
           filter: "Filter"
-          filter_clear: "Effacer tout"
+          filter_clear: "Tout effacer"
           filter_apply: "Appliquer"
           filter_ref: "Par référence"
           filter_status: "Par statut"
diff --git a/config/locales/app.admin.no.yml b/config/locales/app.admin.no.yml
index 11b6f5617..4b808a6c9 100644
--- a/config/locales/app.admin.no.yml
+++ b/config/locales/app.admin.no.yml
@@ -1902,7 +1902,7 @@
         manage_the_store: "Manage the Store"
         settings: "Settings"
         all_products: "All products"
-        categories_of_store: "Store's categories"
+        categories_of_store: "Store categories"
         the_orders: "Orders"
         back_to_list: "Back to list"
         product_categories:
@@ -1917,7 +1917,7 @@
           edit_product_category: "Modify a category"
         product_category_form:
           name: "Name of category"
-          slug: "Name of URL"
+          slug: "URL"
           select_parent_product_category: "Choose a parent category (N1)"
           no_parent: "No parent"
           create:
@@ -1991,8 +1991,8 @@
           product_parameters: "Product parameters"
           stock_management: "Stock management"
           name: "Name of product"
-          sku: "Reference product (SKU)"
-          slug: "Name of URL"
+          sku: "Product reference (SKU)"
+          slug: "URL"
           is_show_in_store: "Available in the store"
           is_active_price: "Activate the price"
           active_price_info: "Is this product visible by the members on the store?"
@@ -2003,20 +2003,20 @@
           assigning_category: "Assigning a category"
           assigning_category_info: "<strong>Information</strong></br>You can only declare one category per product. If you assign this product to a sub-category, it will automatically be assigned to its parent category as well."
           assigning_machines: "Assigning machines"
-          assigning_machines_info: "<strong>Information</strong></br>You can link one or more machines from your fablab to your product, this product will then be subject to the filters on the catalogue view.</br>The machines selected below will be linked to the product."
+          assigning_machines_info: "<strong>Information</strong></br>You can link one or more machines from your workshop to your product. This product will then be subject to the filters on the catalogue view.</br>The machines selected below will be linked to the product."
           product_description: "Product description"
-          product_description_info: "<strong>Information</strong></br>This product description will be present in the product sheet. You have a few editorial styles at your disposal to create the product sheet."
+          product_description_info: "<strong>Information</strong></br>This product description will be presented in the product sheet. You have a few editorial styles at your disposal to create the product sheet."
           product_files: "Document"
-          product_files_info: "<strong>Information</strong></br>Add documents related to this product, the uploaded documents will be presented in the product sheet, in a separate block. You can only upload pdf documents."
+          product_files_info: "<strong>Information</strong></br>Add documents related to this product. They will be presented in the product sheet, in a separate block. You can only upload pdf documents."
           add_product_file: "Add a document"
-          product_images: "Images of product"
-          product_images_info: "<strong>Advice</strong></br>We advise you to use a square format, jpg or png, for jpgs, please use white for the background colour. The main visual will be the visual presented first in the product sheet."
+          product_images: "Pictures of the product"
+          product_images_info: "<strong>Advice</strong></br>We advise you to use a square format, JPG or PNG. For JPG, please use white for the background colour. The main visual will be the first presented in the product sheet."
           add_product_image: "Add an image"
           save: "Save"
         product_stock_form:
           stock_up_to_date: "Stock up to date"
           date_time: "{DATE} - {TIME}"
-          ongoing_operations: "Ongoing stocks operations"
+          ongoing_operations: "Ongoing stock operations"
           save_reminder: "Don't forget to save your operations"
           low_stock_threshold: "Define a low stock threshold"
           stock_threshold_toggle: "Activate stock threshold"
@@ -2027,7 +2027,7 @@
           events_history: "Events history"
           event_type: "Events:"
           reason: "Reason"
-          stocks: "Stocks:"
+          stocks: "Stock:"
           internal: "Private stock"
           external: "Public stock"
           all: "All types"
@@ -2044,7 +2044,7 @@
           withdrawal: "Withdrawal"
           update_stock: "Update stock"
           reason_type: "Reason"
-          stocks: "Stocks:"
+          stocks: "Stock:"
           quantity: "Quantity"
         stock_movement_reason:
           inward_stock: "Inward stock"
diff --git a/config/locales/app.admin.pt.yml b/config/locales/app.admin.pt.yml
index 4b91c615d..9144bda7b 100644
--- a/config/locales/app.admin.pt.yml
+++ b/config/locales/app.admin.pt.yml
@@ -1902,7 +1902,7 @@ pt:
         manage_the_store: "Manage the Store"
         settings: "Settings"
         all_products: "All products"
-        categories_of_store: "Store's categories"
+        categories_of_store: "Store categories"
         the_orders: "Orders"
         back_to_list: "Back to list"
         product_categories:
@@ -1917,7 +1917,7 @@ pt:
           edit_product_category: "Modify a category"
         product_category_form:
           name: "Name of category"
-          slug: "Name of URL"
+          slug: "URL"
           select_parent_product_category: "Choose a parent category (N1)"
           no_parent: "No parent"
           create:
@@ -1991,8 +1991,8 @@ pt:
           product_parameters: "Product parameters"
           stock_management: "Stock management"
           name: "Name of product"
-          sku: "Reference product (SKU)"
-          slug: "Name of URL"
+          sku: "Product reference (SKU)"
+          slug: "URL"
           is_show_in_store: "Available in the store"
           is_active_price: "Activate the price"
           active_price_info: "Is this product visible by the members on the store?"
@@ -2003,20 +2003,20 @@ pt:
           assigning_category: "Assigning a category"
           assigning_category_info: "<strong>Information</strong></br>You can only declare one category per product. If you assign this product to a sub-category, it will automatically be assigned to its parent category as well."
           assigning_machines: "Assigning machines"
-          assigning_machines_info: "<strong>Information</strong></br>You can link one or more machines from your fablab to your product, this product will then be subject to the filters on the catalogue view.</br>The machines selected below will be linked to the product."
+          assigning_machines_info: "<strong>Information</strong></br>You can link one or more machines from your workshop to your product. This product will then be subject to the filters on the catalogue view.</br>The machines selected below will be linked to the product."
           product_description: "Product description"
-          product_description_info: "<strong>Information</strong></br>This product description will be present in the product sheet. You have a few editorial styles at your disposal to create the product sheet."
+          product_description_info: "<strong>Information</strong></br>This product description will be presented in the product sheet. You have a few editorial styles at your disposal to create the product sheet."
           product_files: "Document"
-          product_files_info: "<strong>Information</strong></br>Add documents related to this product, the uploaded documents will be presented in the product sheet, in a separate block. You can only upload pdf documents."
+          product_files_info: "<strong>Information</strong></br>Add documents related to this product. They will be presented in the product sheet, in a separate block. You can only upload pdf documents."
           add_product_file: "Add a document"
-          product_images: "Images of product"
-          product_images_info: "<strong>Advice</strong></br>We advise you to use a square format, jpg or png, for jpgs, please use white for the background colour. The main visual will be the visual presented first in the product sheet."
+          product_images: "Pictures of the product"
+          product_images_info: "<strong>Advice</strong></br>We advise you to use a square format, JPG or PNG. For JPG, please use white for the background colour. The main visual will be the first presented in the product sheet."
           add_product_image: "Add an image"
           save: "Save"
         product_stock_form:
           stock_up_to_date: "Stock up to date"
           date_time: "{DATE} - {TIME}"
-          ongoing_operations: "Ongoing stocks operations"
+          ongoing_operations: "Ongoing stock operations"
           save_reminder: "Don't forget to save your operations"
           low_stock_threshold: "Define a low stock threshold"
           stock_threshold_toggle: "Activate stock threshold"
@@ -2027,7 +2027,7 @@ pt:
           events_history: "Events history"
           event_type: "Events:"
           reason: "Reason"
-          stocks: "Stocks:"
+          stocks: "Stock:"
           internal: "Private stock"
           external: "Public stock"
           all: "All types"
@@ -2044,7 +2044,7 @@ pt:
           withdrawal: "Withdrawal"
           update_stock: "Update stock"
           reason_type: "Reason"
-          stocks: "Stocks:"
+          stocks: "Stock:"
           quantity: "Quantity"
         stock_movement_reason:
           inward_stock: "Inward stock"
diff --git a/config/locales/app.admin.zu.yml b/config/locales/app.admin.zu.yml
index 0fb55a957..16df3aeb3 100644
--- a/config/locales/app.admin.zu.yml
+++ b/config/locales/app.admin.zu.yml
@@ -1902,7 +1902,7 @@ zu:
         manage_the_store: "crwdns29990:0crwdne29990:0"
         settings: "crwdns29992:0crwdne29992:0"
         all_products: "crwdns29994:0crwdne29994:0"
-        categories_of_store: "crwdns29996:0crwdne29996:0"
+        categories_of_store: "crwdns30588:0crwdne30588:0"
         the_orders: "crwdns29998:0crwdne29998:0"
         back_to_list: "crwdns30000:0crwdne30000:0"
         product_categories:
@@ -1917,7 +1917,7 @@ zu:
           edit_product_category: "crwdns30014:0crwdne30014:0"
         product_category_form:
           name: "crwdns30016:0crwdne30016:0"
-          slug: "crwdns30018:0crwdne30018:0"
+          slug: "crwdns30590:0crwdne30590:0"
           select_parent_product_category: "crwdns30020:0crwdne30020:0"
           no_parent: "crwdns30022:0crwdne30022:0"
           create:
@@ -1991,8 +1991,8 @@ zu:
           product_parameters: "crwdns30130:0crwdne30130:0"
           stock_management: "crwdns30132:0crwdne30132:0"
           name: "crwdns30134:0crwdne30134:0"
-          sku: "crwdns30136:0crwdne30136:0"
-          slug: "crwdns30138:0crwdne30138:0"
+          sku: "crwdns30592:0crwdne30592:0"
+          slug: "crwdns30594:0crwdne30594:0"
           is_show_in_store: "crwdns30140:0crwdne30140:0"
           is_active_price: "crwdns30142:0crwdne30142:0"
           active_price_info: "crwdns30144:0crwdne30144:0"
@@ -2003,20 +2003,20 @@ zu:
           assigning_category: "crwdns30154:0crwdne30154:0"
           assigning_category_info: "crwdns30156:0crwdne30156:0"
           assigning_machines: "crwdns30158:0crwdne30158:0"
-          assigning_machines_info: "crwdns30160:0crwdne30160:0"
+          assigning_machines_info: "crwdns30634:0crwdne30634:0"
           product_description: "crwdns30162:0crwdne30162:0"
-          product_description_info: "crwdns30164:0crwdne30164:0"
+          product_description_info: "crwdns30598:0crwdne30598:0"
           product_files: "crwdns30166:0crwdne30166:0"
-          product_files_info: "crwdns30168:0crwdne30168:0"
+          product_files_info: "crwdns30600:0crwdne30600:0"
           add_product_file: "crwdns30170:0crwdne30170:0"
-          product_images: "crwdns30172:0crwdne30172:0"
-          product_images_info: "crwdns30174:0crwdne30174:0"
+          product_images: "crwdns30602:0crwdne30602:0"
+          product_images_info: "crwdns30636:0crwdne30636:0"
           add_product_image: "crwdns30176:0crwdne30176:0"
           save: "crwdns30178:0crwdne30178:0"
         product_stock_form:
           stock_up_to_date: "crwdns30180:0crwdne30180:0"
           date_time: "crwdns30182:0{DATE}crwdnd30182:0{TIME}crwdne30182:0"
-          ongoing_operations: "crwdns30184:0crwdne30184:0"
+          ongoing_operations: "crwdns30606:0crwdne30606:0"
           save_reminder: "crwdns30186:0crwdne30186:0"
           low_stock_threshold: "crwdns30188:0crwdne30188:0"
           stock_threshold_toggle: "crwdns30190:0crwdne30190:0"
@@ -2027,7 +2027,7 @@ zu:
           events_history: "crwdns30200:0crwdne30200:0"
           event_type: "crwdns30202:0crwdne30202:0"
           reason: "crwdns30204:0crwdne30204:0"
-          stocks: "crwdns30206:0crwdne30206:0"
+          stocks: "crwdns30608:0crwdne30608:0"
           internal: "crwdns30208:0crwdne30208:0"
           external: "crwdns30210:0crwdne30210:0"
           all: "crwdns30212:0crwdne30212:0"
@@ -2044,7 +2044,7 @@ zu:
           withdrawal: "crwdns30232:0crwdne30232:0"
           update_stock: "crwdns30234:0crwdne30234:0"
           reason_type: "crwdns30236:0crwdne30236:0"
-          stocks: "crwdns30238:0crwdne30238:0"
+          stocks: "crwdns30610:0crwdne30610:0"
           quantity: "crwdns30240:0crwdne30240:0"
         stock_movement_reason:
           inward_stock: "crwdns30242:0crwdne30242:0"
diff --git a/config/locales/app.public.de.yml b/config/locales/app.public.de.yml
index d10033832..8f323e904 100644
--- a/config/locales/app.public.de.yml
+++ b/config/locales/app.public.de.yml
@@ -44,7 +44,7 @@ de:
         projects_gallery: "Projekt-Galerie"
         subscriptions: "Abonnements"
         public_calendar: "Kalender"
-        fablab_store: "Fablab Store"
+        fablab_store: "Store"
         #left menu (admin)
         trainings_monitoring: "Schulungen"
         manage_the_calendar: "Kalender"
@@ -382,7 +382,7 @@ de:
         projects_using_the_space: "Projekte, die den Raum nutzen"
       #public store
       store:
-        fablab_store: "FabLab Store"
+        fablab_store: "Store"
         unexpected_error_occurred: "An unexpected error occurred. Please try again later."
         add_to_cart_success: "Product added to the cart."
         products:
diff --git a/config/locales/app.public.es.yml b/config/locales/app.public.es.yml
index 636ba9422..f640ee52b 100644
--- a/config/locales/app.public.es.yml
+++ b/config/locales/app.public.es.yml
@@ -44,7 +44,7 @@ es:
         projects_gallery: "Galería de proyectos"
         subscriptions: "Suscripciones"
         public_calendar: "Agenda"
-        fablab_store: "Fablab Store"
+        fablab_store: "Store"
         #left menu (admin)
         trainings_monitoring: "Cursos"
         manage_the_calendar: "Agenda"
@@ -382,7 +382,7 @@ es:
         projects_using_the_space: "Proyectos que usan el espacio"
       #public store
       store:
-        fablab_store: "FabLab Store"
+        fablab_store: "Store"
         unexpected_error_occurred: "An unexpected error occurred. Please try again later."
         add_to_cart_success: "Product added to the cart."
         products:
diff --git a/config/locales/app.public.fr.yml b/config/locales/app.public.fr.yml
index fb9335fb7..3c5c55538 100644
--- a/config/locales/app.public.fr.yml
+++ b/config/locales/app.public.fr.yml
@@ -44,7 +44,7 @@ fr:
         projects_gallery: "Galerie de projets"
         subscriptions: "Abonnements"
         public_calendar: "Agenda"
-        fablab_store: "Fablab Store"
+        fablab_store: "Boutique"
         #left menu (admin)
         trainings_monitoring: "Formations"
         manage_the_calendar: "Agenda"
@@ -382,7 +382,7 @@ fr:
         projects_using_the_space: "Projets utilisant l'espace"
       #public store
       store:
-        fablab_store: "FabLab Store"
+        fablab_store: "Boutique"
         unexpected_error_occurred: "Une erreur inattendue s'est produite. Veuillez réessayer plus tard."
         add_to_cart_success: "Produit ajouté au panier."
         products:
diff --git a/config/locales/app.public.no.yml b/config/locales/app.public.no.yml
index 814e2d4fe..61550ec36 100644
--- a/config/locales/app.public.no.yml
+++ b/config/locales/app.public.no.yml
@@ -44,7 +44,7 @@
         projects_gallery: "Prosjektgalleri"
         subscriptions: "Medlemskap"
         public_calendar: "Kalender"
-        fablab_store: "Fablab Store"
+        fablab_store: "Store"
         #left menu (admin)
         trainings_monitoring: "Opplæringer/kurs"
         manage_the_calendar: "Kalender"
@@ -382,7 +382,7 @@
         projects_using_the_space: "Prosjekter som bruker plassen/rommet"
       #public store
       store:
-        fablab_store: "FabLab Store"
+        fablab_store: "Store"
         unexpected_error_occurred: "An unexpected error occurred. Please try again later."
         add_to_cart_success: "Product added to the cart."
         products:
diff --git a/config/locales/app.public.pt.yml b/config/locales/app.public.pt.yml
index ef7c54515..74253022b 100644
--- a/config/locales/app.public.pt.yml
+++ b/config/locales/app.public.pt.yml
@@ -44,7 +44,7 @@ pt:
         projects_gallery: "Galeria de Projetos"
         subscriptions: "Assinaturas"
         public_calendar: "Calendário"
-        fablab_store: "Fablab Store"
+        fablab_store: "Store"
         #left menu (admin)
         trainings_monitoring: "Treinamentos"
         manage_the_calendar: "Agenda"
@@ -382,7 +382,7 @@ pt:
         projects_using_the_space: "Projetos usando espaço"
       #public store
       store:
-        fablab_store: "FabLab Store"
+        fablab_store: "Store"
         unexpected_error_occurred: "An unexpected error occurred. Please try again later."
         add_to_cart_success: "Product added to the cart."
         products:
diff --git a/config/locales/app.public.zu.yml b/config/locales/app.public.zu.yml
index 53c1ed1a8..cf6190429 100644
--- a/config/locales/app.public.zu.yml
+++ b/config/locales/app.public.zu.yml
@@ -44,7 +44,7 @@ zu:
         projects_gallery: "crwdns27848:0crwdne27848:0"
         subscriptions: "crwdns27850:0crwdne27850:0"
         public_calendar: "crwdns27852:0crwdne27852:0"
-        fablab_store: "crwdns30312:0crwdne30312:0"
+        fablab_store: "crwdns30612:0crwdne30612:0"
         #left menu (admin)
         trainings_monitoring: "crwdns27854:0crwdne27854:0"
         manage_the_calendar: "crwdns27856:0crwdne27856:0"
@@ -382,7 +382,7 @@ zu:
         projects_using_the_space: "crwdns28422:0crwdne28422:0"
       #public store
       store:
-        fablab_store: "crwdns30324:0crwdne30324:0"
+        fablab_store: "crwdns30614:0crwdne30614:0"
         unexpected_error_occurred: "crwdns30326:0crwdne30326:0"
         add_to_cart_success: "crwdns30328:0crwdne30328:0"
         products:
diff --git a/config/locales/app.shared.de.yml b/config/locales/app.shared.de.yml
index 6a8af89ff..5918ac540 100644
--- a/config/locales/app.shared.de.yml
+++ b/config/locales/app.shared.de.yml
@@ -621,17 +621,17 @@ de:
             delivered: "Delivered"
           confirm: 'Confirm'
           confirmation_required: "Confirmation required"
-          confirm_order_in_progress: "This order is in the process of being prepared ?"
+          confirm_order_in_progress: "Is this order in the process of being prepared?"
           order_in_progress_success: "Order is under preparation"
-          confirm_order_ready: "This order is ready ?"
+          confirm_order_ready: "Is this order ready?"
           order_ready_note: 'Leave your message'
           order_ready_success: "Order is ready"
-          confirm_order_delivered: "This order is delivered ?"
-          order_delivered_success: "Order is delivered"
-          confirm_order_canceled: "Do you want to cancel this order ? You can modify product stock in stock manage."
-          order_canceled_success: "Order is canceled"
-          confirm_order_refunded: "Do you want to refund this order ? You can modify product stock in stock manage."
-          order_refunded_success: "Order is refunded"
+          confirm_order_delivered: "Is this order delivered?"
+          order_delivered_success: "Order was delivered"
+          confirm_order_canceled: "Do you want to cancel this order? You can modify product stock in stock manage."
+          order_canceled_success: "Order was canceled"
+          confirm_order_refunded: "Do you want to refund this order? You can modify product stock in stock manage."
+          order_refunded_success: "Order was refunded"
       unsaved_form_alert:
         modal_title: "You have some unsaved changes"
         confirmation_message: "If you leave this page, your changes will be lost. Are you sure you want to continue?"
diff --git a/config/locales/app.shared.es.yml b/config/locales/app.shared.es.yml
index 79588dfe3..c2ec93410 100644
--- a/config/locales/app.shared.es.yml
+++ b/config/locales/app.shared.es.yml
@@ -621,17 +621,17 @@ es:
             delivered: "Delivered"
           confirm: 'Confirm'
           confirmation_required: "Confirmation required"
-          confirm_order_in_progress: "This order is in the process of being prepared ?"
+          confirm_order_in_progress: "Is this order in the process of being prepared?"
           order_in_progress_success: "Order is under preparation"
-          confirm_order_ready: "This order is ready ?"
+          confirm_order_ready: "Is this order ready?"
           order_ready_note: 'Leave your message'
           order_ready_success: "Order is ready"
-          confirm_order_delivered: "This order is delivered ?"
-          order_delivered_success: "Order is delivered"
-          confirm_order_canceled: "Do you want to cancel this order ? You can modify product stock in stock manage."
-          order_canceled_success: "Order is canceled"
-          confirm_order_refunded: "Do you want to refund this order ? You can modify product stock in stock manage."
-          order_refunded_success: "Order is refunded"
+          confirm_order_delivered: "Is this order delivered?"
+          order_delivered_success: "Order was delivered"
+          confirm_order_canceled: "Do you want to cancel this order? You can modify product stock in stock manage."
+          order_canceled_success: "Order was canceled"
+          confirm_order_refunded: "Do you want to refund this order? You can modify product stock in stock manage."
+          order_refunded_success: "Order was refunded"
       unsaved_form_alert:
         modal_title: "You have some unsaved changes"
         confirmation_message: "If you leave this page, your changes will be lost. Are you sure you want to continue?"
diff --git a/config/locales/app.shared.fr.yml b/config/locales/app.shared.fr.yml
index 1c67c658e..e957ac231 100644
--- a/config/locales/app.shared.fr.yml
+++ b/config/locales/app.shared.fr.yml
@@ -621,17 +621,17 @@ fr:
             delivered: "Livrée"
           confirm: 'Confirmer'
           confirmation_required: "Confirmation requise"
-          confirm_order_in_progress: "This order is in the process of being prepared ?"
+          confirm_order_in_progress: "Cette commande est-elle en cours de préparation ?"
           order_in_progress_success: "La commande est en cours de préparation"
-          confirm_order_ready: "This order is ready ?"
+          confirm_order_ready: "Cette commande est-elle prête ?"
           order_ready_note: 'Laissez votre message'
           order_ready_success: "La commande est prête"
-          confirm_order_delivered: "This order is delivered ?"
-          order_delivered_success: "Order is delivered"
-          confirm_order_canceled: "Do you want to cancel this order ? You can modify product stock in stock manage."
-          order_canceled_success: "Order is canceled"
-          confirm_order_refunded: "Do you want to refund this order ? You can modify product stock in stock manage."
-          order_refunded_success: "Order is refunded"
+          confirm_order_delivered: "Cette commande a-t-elle été livrée ?"
+          order_delivered_success: "La commande a été livrée"
+          confirm_order_canceled: "Voulez-vous annuler cette commande ? Vous pouvez modifier le stock du produit dans la gestion du stock."
+          order_canceled_success: "La commande a été annulée"
+          confirm_order_refunded: "Voulez-vous rembourser cette commande ? Vous pouvez modifier le stock du produit dans la gestion du stock."
+          order_refunded_success: "La commande a été remboursée"
       unsaved_form_alert:
         modal_title: "Vous avez des modifications non enregistrées"
         confirmation_message: "Si vous quittez cette page, vos modifications seront perdues. Êtes-vous sûr(e) de vouloir continuer ?"
diff --git a/config/locales/app.shared.no.yml b/config/locales/app.shared.no.yml
index 1cf3aaf78..058f1388b 100644
--- a/config/locales/app.shared.no.yml
+++ b/config/locales/app.shared.no.yml
@@ -621,17 +621,17 @@
             delivered: "Delivered"
           confirm: 'Confirm'
           confirmation_required: "Confirmation required"
-          confirm_order_in_progress: "This order is in the process of being prepared ?"
+          confirm_order_in_progress: "Is this order in the process of being prepared?"
           order_in_progress_success: "Order is under preparation"
-          confirm_order_ready: "This order is ready ?"
+          confirm_order_ready: "Is this order ready?"
           order_ready_note: 'Leave your message'
           order_ready_success: "Order is ready"
-          confirm_order_delivered: "This order is delivered ?"
-          order_delivered_success: "Order is delivered"
-          confirm_order_canceled: "Do you want to cancel this order ? You can modify product stock in stock manage."
-          order_canceled_success: "Order is canceled"
-          confirm_order_refunded: "Do you want to refund this order ? You can modify product stock in stock manage."
-          order_refunded_success: "Order is refunded"
+          confirm_order_delivered: "Is this order delivered?"
+          order_delivered_success: "Order was delivered"
+          confirm_order_canceled: "Do you want to cancel this order? You can modify product stock in stock manage."
+          order_canceled_success: "Order was canceled"
+          confirm_order_refunded: "Do you want to refund this order? You can modify product stock in stock manage."
+          order_refunded_success: "Order was refunded"
       unsaved_form_alert:
         modal_title: "You have some unsaved changes"
         confirmation_message: "If you leave this page, your changes will be lost. Are you sure you want to continue?"
diff --git a/config/locales/app.shared.pt.yml b/config/locales/app.shared.pt.yml
index 8395d897c..40da66f58 100644
--- a/config/locales/app.shared.pt.yml
+++ b/config/locales/app.shared.pt.yml
@@ -621,17 +621,17 @@ pt:
             delivered: "Delivered"
           confirm: 'Confirm'
           confirmation_required: "Confirmation required"
-          confirm_order_in_progress: "This order is in the process of being prepared ?"
+          confirm_order_in_progress: "Is this order in the process of being prepared?"
           order_in_progress_success: "Order is under preparation"
-          confirm_order_ready: "This order is ready ?"
+          confirm_order_ready: "Is this order ready?"
           order_ready_note: 'Leave your message'
           order_ready_success: "Order is ready"
-          confirm_order_delivered: "This order is delivered ?"
-          order_delivered_success: "Order is delivered"
-          confirm_order_canceled: "Do you want to cancel this order ? You can modify product stock in stock manage."
-          order_canceled_success: "Order is canceled"
-          confirm_order_refunded: "Do you want to refund this order ? You can modify product stock in stock manage."
-          order_refunded_success: "Order is refunded"
+          confirm_order_delivered: "Is this order delivered?"
+          order_delivered_success: "Order was delivered"
+          confirm_order_canceled: "Do you want to cancel this order? You can modify product stock in stock manage."
+          order_canceled_success: "Order was canceled"
+          confirm_order_refunded: "Do you want to refund this order? You can modify product stock in stock manage."
+          order_refunded_success: "Order was refunded"
       unsaved_form_alert:
         modal_title: "You have some unsaved changes"
         confirmation_message: "If you leave this page, your changes will be lost. Are you sure you want to continue?"
diff --git a/config/locales/app.shared.zu.yml b/config/locales/app.shared.zu.yml
index b7fc187e5..93703b7f7 100644
--- a/config/locales/app.shared.zu.yml
+++ b/config/locales/app.shared.zu.yml
@@ -621,17 +621,17 @@ zu:
             delivered: "crwdns30530:0crwdne30530:0"
           confirm: 'crwdns30532:0crwdne30532:0'
           confirmation_required: "crwdns30534:0crwdne30534:0"
-          confirm_order_in_progress: "crwdns30536:0crwdne30536:0"
+          confirm_order_in_progress: "crwdns30616:0crwdne30616:0"
           order_in_progress_success: "crwdns30538:0crwdne30538:0"
-          confirm_order_ready: "crwdns30540:0crwdne30540:0"
+          confirm_order_ready: "crwdns30618:0crwdne30618:0"
           order_ready_note: 'crwdns30542:0crwdne30542:0'
           order_ready_success: "crwdns30544:0crwdne30544:0"
-          confirm_order_delivered: "crwdns30546:0crwdne30546:0"
-          order_delivered_success: "crwdns30548:0crwdne30548:0"
-          confirm_order_canceled: "crwdns30550:0crwdne30550:0"
-          order_canceled_success: "crwdns30552:0crwdne30552:0"
-          confirm_order_refunded: "crwdns30554:0crwdne30554:0"
-          order_refunded_success: "crwdns30556:0crwdne30556:0"
+          confirm_order_delivered: "crwdns30620:0crwdne30620:0"
+          order_delivered_success: "crwdns30622:0crwdne30622:0"
+          confirm_order_canceled: "crwdns30624:0crwdne30624:0"
+          order_canceled_success: "crwdns30626:0crwdne30626:0"
+          confirm_order_refunded: "crwdns30628:0crwdne30628:0"
+          order_refunded_success: "crwdns30630:0crwdne30630:0"
       unsaved_form_alert:
         modal_title: "crwdns30558:0crwdne30558:0"
         confirmation_message: "crwdns30560:0crwdne30560:0"
diff --git a/config/locales/de.yml b/config/locales/de.yml
index a8960ae58..c6f98c417 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -121,7 +121,7 @@ de:
     error_invoice: "Fehlerhafte Rechnung. Die folgenden Artikel sind nicht gebucht. Bitte kontaktieren Sie das FabLab für eine Rückerstattung."
     prepaid_pack: "Prepaid-Stundenpaket"
     pack_item: "Paket von %{COUNT} Stunden für %{ITEM}"
-    order: "Your order of the store"
+    order: "Your order on the store"
   #PDF payment schedule generation
   payment_schedules:
     schedule_reference: "Zahlungsplan Referenz: %{REF}"
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 8c623f26a..fcfb1044c 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -121,7 +121,7 @@ es:
     error_invoice: "Erroneous invoice. The items below ware not booked. Please contact the FabLab for a refund."
     prepaid_pack: "Prepaid pack of hours"
     pack_item: "Pack of %{COUNT} hours for the %{ITEM}"
-    order: "Your order of the store"
+    order: "Your order on the store"
   #PDF payment schedule generation
   payment_schedules:
     schedule_reference: "Payment schedule reference: %{REF}"
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 0555ee064..97340787e 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -121,7 +121,7 @@ fr:
     error_invoice: "Facture en erreur. Les éléments ci-dessous n'ont pas été réservés. Veuillez contacter le Fablab pour un remboursement."
     prepaid_pack: "Paquet d'heures prépayé"
     pack_item: "Pack de %{COUNT} heures pour la %{ITEM}"
-    order: "Your order of the store"
+    order: "Votre commande sur la boutique"
   #PDF payment schedule generation
   payment_schedules:
     schedule_reference: "Référence de l'échéancier : %{REF}"
diff --git a/config/locales/no.yml b/config/locales/no.yml
index be6710def..f772657e1 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -121,7 +121,7 @@
     error_invoice: "Feil i faktura. Elementene under varen som ikke er bestilt. Kontakt oss for refusjon."
     prepaid_pack: "Forhåndsbetalt pakke med timer"
     pack_item: "Pakke med %{COUNT} timer for %{ITEM}"
-    order: "Your order of the store"
+    order: "Your order on the store"
   #PDF payment schedule generation
   payment_schedules:
     schedule_reference: "Referanse til betalingsplanen: %{REF}"
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 861bfb00f..8d84488b7 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -121,7 +121,7 @@ pt:
     error_invoice: "Esta fatura está incorreta. Os itens abaixo que não foram reservados. Por favor contate o FabLab para um reembolso."
     prepaid_pack: "Pacote de horas pré-pago"
     pack_item: "Pacote de %{COUNT} horas para a %{ITEM}"
-    order: "Your order of the store"
+    order: "Your order on the store"
   #PDF payment schedule generation
   payment_schedules:
     schedule_reference: "Agendamento de pagamento: %{REF}"
diff --git a/config/locales/zu.yml b/config/locales/zu.yml
index fe90de509..ff74d4155 100644
--- a/config/locales/zu.yml
+++ b/config/locales/zu.yml
@@ -121,7 +121,7 @@ zu:
     error_invoice: "crwdns21480:0crwdne21480:0"
     prepaid_pack: "crwdns22022:0crwdne22022:0"
     pack_item: "crwdns22024:0%{COUNT}crwdnd22024:0%{ITEM}crwdne22024:0"
-    order: "crwdns30568:0crwdne30568:0"
+    order: "crwdns30632:0crwdne30632:0"
   #PDF payment schedule generation
   payment_schedules:
     schedule_reference: "crwdns21094:0%{REF}crwdne21094:0"