diff --git a/app/assets/javascripts/app.js b/app/assets/javascripts/app.js
index f932fd84f..134f71ab6 100644
--- a/app/assets/javascripts/app.js
+++ b/app/assets/javascripts/app.js
@@ -90,6 +90,8 @@ angular.module('application', ['ngCookies', 'ngResource', 'ngSanitize', 'ui.rout
       $rootScope.phoneRequired = Fablab.phoneRequired;
       // Global config: if true, the events are shown in the admin calendar
       $rootScope.eventsInCalendar = Fablab.eventsInCalendar;
+      // Global config: machine/space slot duration
+      $rootScope.slotDuration = Fablab.slotDuration;
 
       // Global function to allow the user to navigate to the previous screen (ie. $state).
       // If no previous $state were recorded, navigate to the home page
diff --git a/app/assets/templates/admin/pricing/credits.html.erb b/app/assets/templates/admin/pricing/credits.html.erb
index 07c23d359..0dfd69f79 100644
--- a/app/assets/templates/admin/pricing/credits.html.erb
+++ b/app/assets/templates/admin/pricing/credits.html.erb
@@ -52,7 +52,7 @@
   <thead>
   <tr>
     <th style="width:20%" translate>{{ 'pricing.machine' }}</th>
-    <th style="width:10%" translate>{{ 'pricing.hours' }}</th>
+    <th style="width:10%">{{ 'pricing.hours' | translate:{DURATION:slotDuration} }}</th>
     <th style="width:50%" translate>{{ 'pricing.related_subscriptions' }}</th>
     <th style="width:20%"></th>
   </tr>
@@ -104,7 +104,7 @@
   <thead>
   <tr>
     <th style="width:20%" translate>{{ 'pricing.space' }}</th>
-    <th style="width:10%" translate>{{ 'pricing.hours' }}</th>
+    <th style="width:10%">{{ 'pricing.hours' | translate:{DURATION:slotDuration} }}</th>
     <th style="width:50%" translate>{{ 'pricing.related_subscriptions' }}</th>
     <th style="width:20%"></th>
   </tr>
@@ -146,4 +146,4 @@
     </td>
   </tr>
   </tbody>
-</table>
\ No newline at end of file
+</table>
diff --git a/app/assets/templates/admin/pricing/machine_hours.html.erb b/app/assets/templates/admin/pricing/machine_hours.html.erb
index 636219c63..3823e42cc 100644
--- a/app/assets/templates/admin/pricing/machine_hours.html.erb
+++ b/app/assets/templates/admin/pricing/machine_hours.html.erb
@@ -1,5 +1,5 @@
 <div class="alert alert-warning m-t">
-  {{ 'pricing.these_prices_match_machine_hours_rates_' | translate }} <span class="font-bold" translate>{{ 'pricing._without_subscriptions' }}</span>.
+  {{ 'pricing.these_prices_match_machine_hours_rates_' | translate:{DURATION:slotDuration} }} <span class="font-bold" translate>{{ 'pricing._without_subscriptions' }}</span>.
 </div>
 <table class="table">
   <thead>
@@ -24,4 +24,4 @@
     </td>
   </tr>
   </tbody>
-</table>
\ No newline at end of file
+</table>
diff --git a/app/assets/templates/admin/pricing/spaces.html.erb b/app/assets/templates/admin/pricing/spaces.html.erb
index 25417cb6e..1395f3f83 100644
--- a/app/assets/templates/admin/pricing/spaces.html.erb
+++ b/app/assets/templates/admin/pricing/spaces.html.erb
@@ -1,5 +1,5 @@
 <div class="alert alert-warning m-t">
-  {{ 'pricing.these_prices_match_space_hours_rates_' | translate }} <span class="font-bold" translate>{{ 'pricing._without_subscriptions' }}</span>.
+  {{ 'pricing.these_prices_match_space_hours_rates_' | translate:{DURATION:slotDuration} }} <span class="font-bold" translate>{{ 'pricing._without_subscriptions' }}</span>.
 </div>
 <table class="table">
   <thead>
@@ -24,4 +24,4 @@
     </td>
   </tr>
   </tbody>
-</table>
\ No newline at end of file
+</table>
diff --git a/config/locales/app.admin.en.yml b/config/locales/app.admin.en.yml
index 261408460..fa2dc79f3 100644
--- a/config/locales/app.admin.en.yml
+++ b/config/locales/app.admin.en.yml
@@ -242,8 +242,8 @@ en:
           group: "Group"
           prominence: "Prominence"
           price: "Price"
-          machine_hours: "Machine hours"
-          these_prices_match_machine_hours_rates_: "These prices match machine hours rates"
+          machine_hours: "Machine slots"
+          these_prices_match_machine_hours_rates_: "These prices match {{DURATION}} minutes of machine usage, "
           _without_subscriptions: "without subscriptions"
           machines: "Machines"
           credits: "Credits"
@@ -251,7 +251,7 @@ en:
           related_trainings: "Related trainings"
           add_a_machine_credit: "Add a machine credit"
           machine: "Machine"
-          hours: "Hours"
+          hours: "Slots of {{DURATION}} minutes"
           related_subscriptions: "Related subscriptions"
           please_specify_a_number: "Please specify a number."
           none: "None"  # grammar note: concordance with "training".
@@ -296,7 +296,7 @@ en:
           forever: "Each use"
           valid_until: "Valid until (included)"
           spaces: "Spaces"
-          these_prices_match_space_hours_rates_: "These prices match space hours rates"
+          these_prices_match_space_hours_rates_: "These prices match {{DURATION}} minutes of space usage, "
           add_a_space_credit: "Add a Space credit"
           space: "Espace"
           error_a_credit_linking_this_space_with_that_subscription_already_exists: "Error : a credit linking this space with that subscription already exists."
@@ -322,14 +322,14 @@ en:
             successfully_created_subscriptions_dont_forget_to_redefine_prices: "Subscription(s) successfully created. Don't forget to redefine prices."
             unable_to_save_this_user_check_that_there_isnt_an_already_a_user_with_the_same_name: "Unable to save this user. Check that there isn't an already defined user with the same name."
         edit:
-          # edit a subscription plan / machine hours prices
+          # edit a subscription plan / machine slots prices
           edit_plan:
             subscription_plan: "Subscription plan:"
             prices: "Prices"
             copy_prices_from: "Copy prices from"
             machines: "Machines"
             machine: "Machine"
-            hourly_rate: "Hourly rate"
+            hourly_rate: "Price by slot"
             spaces: "Spaces"
             space: "Space"
             unable_to_save_subscription_changes_please_try_again: "Unable to save subscription changes. Please try again."
diff --git a/config/locales/app.admin.es.yml b/config/locales/app.admin.es.yml
index fb62110e7..6f9521cc1 100644
--- a/config/locales/app.admin.es.yml
+++ b/config/locales/app.admin.es.yml
@@ -242,8 +242,8 @@ es:
           group: "Grupo"
           prominence: "Prominencia"
           price: "Precio"
-          machine_hours: "Horas de la máquina"
-          these_prices_match_machine_hours_rates_: "Estos precios se ajustan a la tarifas de máquina por horas"
+          machine_hours: "Machine slots"                                                          # translation_missing
+          these_prices_match_machine_hours_rates_: "Estos precios se ajustan a la tarifas de máquina por {{DURATION}} minutas"
           _without_subscriptions: "Sin suscripciones"
           machines: "Máquinas"
           credits: "Créditos"
@@ -251,7 +251,7 @@ es:
           related_trainings: "Formación relacionada"
           add_a_machine_credit: "Agregar un crédito de máquina"
           machine: "Máquina"
-          hours: "Horas"
+          hours: "Slots of {{DURATION}} minutes"                                                   # translation_missing
           related_subscriptions: "Suscripciónes relacionada"
           please_specify_a_number: "Por favor, especifique un número."
           none: "Nada"  # nota gramatical: concordancia con "formación".
@@ -296,7 +296,7 @@ es:
           forever: "Cada uso"
           valid_until: "Válido hasta (incluido)"
           spaces: "Espacios"
-          these_prices_match_space_hours_rates_: "Estos precios coinciden con las tarifas de espacio por horas"
+          these_prices_match_space_hours_rates_: "Estos precios coinciden con las tarifas de espacio por {{DURATION}} minutas"
           add_a_space_credit: "Añadir un crédito de espacio"
           space: "Espacio"
           error_a_credit_linking_this_space_with_that_subscription_already_exists: "Error: un crédito que vincula este espacio con esa suscripción ya existe."
@@ -322,14 +322,14 @@ es:
             successfully_created_subscriptions_dont_forget_to_redefine_prices: "Suscripción(es) creada correctamente. No olvide redefinir los precios."
             unable_to_save_this_user_check_that_there_isnt_an_already_a_user_with_the_same_name: "No se puede guardar este usuario. Compruebe que no hay un usuario ya definido con el mismo nombre."
         edit:
-          # edit a subscription plan / machine hours prices
+          # edit a subscription plan / machine slot prices
           edit_plan:
             subscription_plan: "Plan de suscripción:"
             prices: "Precios"
             copy_prices_from: "Copia los precios desde"
             machines: "Máquinas"
             machine: "Máquina"
-            hourly_rate: "Tarifa por hora"
+            hourly_rate: "Tarifa por slot"                                                            # translation_missing
             spaces: "Espacios"
             space: "Espacio"
             unable_to_save_subscription_changes_please_try_again: "No se pueden guardar los cambios de suscripción. Por favor, inténtelo de nuevo."
diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml
index 4a5108f15..0a9cc3791 100644
--- a/config/locales/app.admin.fr.yml
+++ b/config/locales/app.admin.fr.yml
@@ -242,8 +242,8 @@ fr:
           group: "Groupe"
           prominence: "Importance"
           price: "Prix"
-          machine_hours: "Heures machines"
-          these_prices_match_machine_hours_rates_: "Ces tarifs correspondent au prix d'une heure machine"
+          machine_hours: "Créneaux machines"
+          these_prices_match_machine_hours_rates_: "Ces tarifs correspondent au prix de {{DURATION}} minutes d'utilisation d'une machine, "  # angular interpolation
           _without_subscriptions: "sans abonnement"
           machines: "Machines"
           credits: "Crédits"
@@ -251,7 +251,7 @@ fr:
           related_trainings: "Formations associées"
           add_a_machine_credit: "Ajouter un crédit Machine"
           machine: "Machine"
-          hours: "Heures"
+          hours: "Créneaux de {{DURATION}} minutes"
           related_subscriptions: "Abonnements associés"
           please_specify_a_number: "Veuillez spécifier un nombre."
           none: "Aucune"  # grammar note: concordance with "training".
@@ -296,7 +296,7 @@ fr:
           forever: "À chaque utilisation"
           valid_until: "Valable jusqu'au (inclus)"
           spaces: "Espaces"
-          these_prices_match_space_hours_rates_: "Ces tarifs correspondent au prix d'une heure espace"
+          these_prices_match_space_hours_rates_: "Ces tarifs correspondent au prix de {{DURATION}} minutes d'utilisation d'un espace, "
           add_a_space_credit: "Ajouter un crédit Espace"
           space: "Espace"
           error_a_credit_linking_this_space_with_that_subscription_already_exists: "Erreur : un crédit associant cet espace et cet abonnement existe déjà."
@@ -322,14 +322,14 @@ fr:
             successfully_created_subscriptions_dont_forget_to_redefine_prices: "Création du/des abonnement(s) réussie. N'oubliez pas de redéfinir les tarifs."
             unable_to_save_this_user_check_that_there_isnt_an_already_a_user_with_the_same_name: "Impossible d'enregistrer cet utilisateur. Vérifiez qu'il n'existe pas déjà un utilisateur du même nom."
         edit:
-          # modifier une formule d'abonnement / les prix des heures machines
+          # modifier une formule d'abonnement / les prix des créneaux machines
           edit_plan:
             subscription_plan: "Formule d'abonnement :"
             prices: "Tarifs"
             copy_prices_from: "Copier les prix depuis"
             machines: "Machines"
             machine: "Machine"
-            hourly_rate: "Tarif horaire"
+            hourly_rate: "Tarif par créneau"
             spaces: "Espaces"
             space: "Espace"
             unable_to_save_subscription_changes_please_try_again: "Les modifications de l'abonnement n'ont pas pu être enregistrées. Veuillez réessayer."
diff --git a/config/locales/app.admin.pt.yml b/config/locales/app.admin.pt.yml
index a908d7da0..fd2409743 100755
--- a/config/locales/app.admin.pt.yml
+++ b/config/locales/app.admin.pt.yml
@@ -242,8 +242,8 @@ pt:
           group: "Grupo"
           prominence: "Relevância"
           price: "Preço"
-          machine_hours: "Horas máquina"
-          these_prices_match_machine_hours_rates_: "Estes preços correspondem às horas de trabalho"
+          machine_hours: "Machine slots"                                                             # translation_missing
+          these_prices_match_machine_hours_rates_: "Estes preços correspondem às {{DURATION}} minutos de trabalho"
           _without_subscriptions: "sem assinaturas"
           machines: "Máquinas"
           credits: "Créditos"
@@ -251,7 +251,7 @@ pt:
           related_trainings: "Treinamentos relacionados"
           add_a_machine_credit: "Adicionar crédito de máquina"
           machine: "Máquina"
-          hours: "Horas"
+          hours: "Slots of {{DURATION}} minutes"                                                     # translation_missing
           related_subscriptions: "Assinaturas relacionadas"
           please_specify_a_number: "Por favor especifique um número."
           none: "Vazio"  # grammar note: concordance with "training".
@@ -296,7 +296,7 @@ pt:
           forever: "Cada uso"
           valid_until: "Válido até (incluindo)"
           spaces: "Espaços"
-          these_prices_match_space_hours_rates_: "Estes preços correspondem às taxas de horários de espaço"
+          these_prices_match_space_hours_rates_: "Estes preços correspondem às {{DURATION}} minutos de espaço"
           add_a_space_credit: "Adicionar espaço de crédito"
           space: "Espaço"
           error_a_credit_linking_this_space_with_that_subscription_already_exists: "Erro: um crédito que vincula esse espaço com essa assinatura já existe."
@@ -322,14 +322,14 @@ pt:
             successfully_created_subscriptions_dont_forget_to_redefine_prices: "Assinaturas criadas com sucesso. Não se esqueça de redefinir os preços."
             unable_to_save_this_user_check_that_there_isnt_an_already_a_user_with_the_same_name: "Impossível salvar este usuário. Certifique-se que ele não possui o mesmo nome de outro usuário."
         edit:
-          # edit a subscription plan / machine hours prices
+          # edit a subscription plan / machine slot prices
           edit_plan:
             subscription_plan: "Plano de assinatura:"
             prices: "Preços"
             copy_prices_from: "Copiar preços de"
             machines: "Máquinas"
             machine: "Máquina"
-            hourly_rate: "Taxa horária"
+            hourly_rate: "Price by slot"                                                            # translation_missing
             spaces: "Espaços"
             space: "Espaço"
             unable_to_save_subscription_changes_please_try_again: "Impossível salvar mudanças da assinatura. Por favor tente novamente."
@@ -339,7 +339,7 @@ pt:
         invoices:
           # list of all invoices & invoicing parameters
           invoices: "Faturas"
-          accounting_periods: "Accounting periods"       # missing translation
+          accounting_periods: "Accounting periods"                                                    # missing translation
           invoices_list: "Lista de faturas"
           filter_invoices: "Filtrar faturas"
           invoice_num_: "Fatura #:"
diff --git a/config/locales/app.shared.en.yml b/config/locales/app.shared.en.yml
index efd840816..45c24864a 100644
--- a/config/locales/app.shared.en.yml
+++ b/config/locales/app.shared.en.yml
@@ -443,7 +443,7 @@ en:
           _subscription: "subscription"
           cost_of_the_subscription: "Cost of the subscription"
           confirm_and_pay: "Confirm and pay"
-          you_have_settled_the_following_TYPE: "You have settled the following {TYPE, select, Machine{machine hours} Training{training} other{elements}}:"  # messageFormat interpolation
+          you_have_settled_the_following_TYPE: "You have settled the following {TYPE, select, Machine{machine slots} Training{training} other{elements}}:"  # messageFormat interpolation
           you_have_settled_a_: "You have settled a"
           total_: "TOTAL :"
           thank_you_your_payment_has_been_successfully_registered: "Thank you. Your payment has been successfully registered !"
diff --git a/config/locales/app.shared.es.yml b/config/locales/app.shared.es.yml
index 4f3bbb25a..108a25acf 100644
--- a/config/locales/app.shared.es.yml
+++ b/config/locales/app.shared.es.yml
@@ -443,7 +443,7 @@ es:
           _subscription: "suscripción"
           cost_of_the_subscription: "Coste de la suscripción"
           confirm_and_pay: "Confirmar y pagar"
-          you_have_settled_the_following_TYPE: "Acaba de seleccionar {TYPE, select, Machine{machine hours} Training{training} other{elements}}:"  # messageFormat interpolation
+          you_have_settled_the_following_TYPE: "Acaba de seleccionar {TYPE, select, Machine{machine slots} Training{training} other{elements}}:"  # messageFormat interpolation           #translation_missing
           you_have_settled_a_: "Ha establecido una"
           total_: "TOTAL :"
           thank_you_your_payment_has_been_successfully_registered: "Gracias. Su pago se ha registrado con éxito."
diff --git a/config/locales/app.shared.fr.yml b/config/locales/app.shared.fr.yml
index 9116b6daf..fb67ea2df 100644
--- a/config/locales/app.shared.fr.yml
+++ b/config/locales/app.shared.fr.yml
@@ -443,7 +443,7 @@ fr:
           _subscription: "abonnement"
           cost_of_the_subscription: "Coût de l'abonnement"
           confirm_and_pay: "Valider et payer"
-          you_have_settled_the_following_TYPE: "Vous avez réglé {TYPE, select, Machine{les heures machines suivantes} Training{la formation suivante} other{les éléments suivants}} :"  # messageFormat interpolation
+          you_have_settled_the_following_TYPE: "Vous avez réglé {TYPE, select, Machine{les créneaux machines suivants} Training{la formation suivante} other{les éléments suivants}} :"  # messageFormat interpolation
           you_have_settled_a_: "Vous avez réglé un"
           total_: "TOTAL :"
           thank_you_your_payment_has_been_successfully_registered: "Merci. Votre paiement a bien été pris en compte !"
diff --git a/config/locales/app.shared.pt.yml b/config/locales/app.shared.pt.yml
index 725f06c58..0316392c5 100755
--- a/config/locales/app.shared.pt.yml
+++ b/config/locales/app.shared.pt.yml
@@ -443,7 +443,7 @@ pt:
           _subscription: "inscrição"
           cost_of_the_subscription: "Custo da inscrição"
           confirm_and_pay: "Confirmar e pagar"
-          you_have_settled_the_following_TYPE: "Você liquidou o seguinte {TYPE, select, Machine{horas máquina} Training{training} other{elements}}:"  # messageFormat interpolation
+          you_have_settled_the_following_TYPE: "Você liquidou o seguinte {TYPE, select, Machine{slots de máquina} Training{training} other{elements}}:"  # messageFormat interpolation
           you_have_settled_a_: "Você tem liquidado:"
           total_: "TOTAL :"
           thank_you_your_payment_has_been_successfully_registered: "Obrigado. Seu pagamento foi registrado com sucesso !"
diff --git a/config/locales/en.yml b/config/locales/en.yml
index ab0e1d645..3868fd2c0 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -322,7 +322,7 @@ en:
         statistics_global: "of all the statistics"
         statistics_account: "of the registration statistics"
         statistics_event: "of statistics about events"
-        statistics_machine: "of statistics about machine hours"
+        statistics_machine: "of statistics about machine slots"
         statistics_project: "of statistics about projects"
         statistics_subscription: "of subscription statistics"
         statistics_training: "of statistics about trainings"
@@ -354,7 +354,7 @@ en:
   statistics:
     # statistics tools for admins
     subscriptions: "Subscriptions"
-    machines_hours: "Machines hours"
+    machines_hours: "Machines slots"
     spaces: "Spaces"
     trainings: "Trainings"
     events: "Events"
diff --git a/config/locales/es.yml b/config/locales/es.yml
index a117f19a0..d6eac0d60 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -322,7 +322,7 @@ es:
         statistics_global: "de todas las estadísticas"
         statistics_account: "de las estadísticas de registro"
         statistics_event: "de estadísticas sobre eventos"
-        statistics_machine: "de estadísticas sobre horas de máquina"
+        statistics_machine: "de estadísticas sobre slots de máquina"   # missing translation
         statistics_project: "de estadísticas sobre proyectos"
         statistics_subscription: "de estadísticas de suscripción"
         statistics_training: "de estadísticas de cursos"
@@ -354,7 +354,7 @@ es:
   statistics:
     # statistics tools for admins
     subscriptions: "Suscripciones"
-    machines_hours: "Horario de máquinas"
+    machines_hours: "Machine slots"                                    # missing translation
     spaces: "Espacios"
     trainings: "Cursos"
     events: "Eventos"
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 6a71f1e2c..fef290c6d 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -322,7 +322,7 @@ fr:
         statistics_global: "de toutes les statistiques"
         statistics_account: "des statistiques d'inscriptions"
         statistics_event: "des statistiques sur les évènements"
-        statistics_machine: "des statistiques d'heures machines"
+        statistics_machine: "des statistiques de créneaux machines"
         statistics_project: "des statistiques sur les projets"
         statistics_subscription: "des statistiques d'abonnements"
         statistics_training: "des statistiques sur les formations"
@@ -355,7 +355,7 @@ fr:
   statistics:
     # outil de statistiques pour les administrateurs
     subscriptions: "Abonnements"
-    machines_hours: "Heures machines"
+    machines_hours: "Créneaux machines"
     spaces: "Espaces"
     trainings: "Formations"
     events: "Évènements"
diff --git a/config/locales/mails.en.yml b/config/locales/mails.en.yml
index e50ef8934..a97595db0 100644
--- a/config/locales/mails.en.yml
+++ b/config/locales/mails.en.yml
@@ -259,7 +259,7 @@ en:
         statistics_global: "of all the statistics"
         statistics_account: "of the registration statistics"
         statistics_event: "of statistics about events"
-        statistics_machine: "of statistics about machine hours"
+        statistics_machine: "of statistics about machine slots"
         statistics_project: "of statistics about projects"
         statistics_subscription: "of subscription statistics"
         statistics_training: "of statistics about trainings"
diff --git a/config/locales/mails.es.yml b/config/locales/mails.es.yml
index 0341c8b66..edf65a3c0 100644
--- a/config/locales/mails.es.yml
+++ b/config/locales/mails.es.yml
@@ -229,6 +229,7 @@ es:
       subject: "Una cuenta importada ha completado su perfil"
       body:
         account_completed: "Una cuenta de usuario importada previamente %{PROVIDER} ha completado su perfil:"
+        imported_account_completed: "An user account previously imported through %{PROVIDER} has just completed his/her profile data:"      # translation missing
         provider_id: "su ID de proveedor es:"
 
     notify_admin_abuse_reported:
@@ -239,10 +240,10 @@ es:
         signaled_by: "marcado por:"
         signaled_on: "marcado el:"
         message: "Mensaje:"
-        visit_management_interface: "Refer to the Reporting Management Interface for more information."  # missing translation
+        visit_management_interface: "Refer to the Reporting Management Interface for more information."                                     # missing translation
 
     notify_user_wallet_is_credited:
-      subject: ""                                                                                   # translation_missing
+      subject: "Your wallet has been credited"                                                                                              # translation missing
       body:
         wallet_credit_html: "Se han ingresado %{AMOUNT} por el administrador."
 
@@ -258,7 +259,7 @@ es:
         statistics_global: "de todas las estadísticas"
         statistics_account: "de las estadísticas de registro"
         statistics_event: "de estadísticas sobre eventos"
-        statistics_machine: "de estadísticas sobre horas de máquina"
+        statistics_machine: "de estadísticas sobre slots de máquina"                                                                        # translation missing
         statistics_project: "de estadísticas sobre proyectos"
         statistics_subscription: "de estadísticas de suscripción"
         statistics_training: "de estadísticas sobre entrenamientos"
diff --git a/config/locales/mails.fr.yml b/config/locales/mails.fr.yml
index 5f1601c6a..e4d0c2d1b 100644
--- a/config/locales/mails.fr.yml
+++ b/config/locales/mails.fr.yml
@@ -259,7 +259,7 @@ fr:
         statistics_global: "de toutes les statistiques"
         statistics_account: "des statistiques d'inscriptions"
         statistics_event: "des statistiques sur les évènements"
-        statistics_machine: "des statistiques d'heures machines"
+        statistics_machine: "des statistiques de créneaux machines"
         statistics_project: "des statistiques sur les projets"
         statistics_subscription: "des statistiques d'abonnements"
         statistics_training: "des statistiques sur les formations"
diff --git a/config/locales/mails.pt.yml b/config/locales/mails.pt.yml
index ae2c14662..fee5cf5e6 100755
--- a/config/locales/mails.pt.yml
+++ b/config/locales/mails.pt.yml
@@ -259,7 +259,7 @@ pt:
         statistics_global: "de todas as estatísticas"
         statistics_account: "das estatísticas de registro"
         statistics_event: "das estatísticas sobre eventos"
-        statistics_machine: "das estatísticas de hora máquina"
+        statistics_machine: "das estatísticas de slot máquina"                                     #translation_missing
         statistics_project: "das estatísticas de projetos"
         statistics_subscription: "das estatísticas de assinaturas"
         statistics_training: "das estatísticas de treinamento"
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 6230f49a0..4e71e1dde 100755
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -322,7 +322,7 @@ pt:
         statistics_global: "de todas as estatísticas"
         statistics_account: "das estatísticas de registro"
         statistics_event: "de estatísticas sobre eventos"
-        statistics_machine: "de estatísticas sobre horas de máquina"
+        statistics_machine: "de estatísticas sobre slots de máquina"   # missing translation
         statistics_project: "de estatísticas sobre projetos"
         statistics_subscription: "de estatísticas de assinatura"
         statistics_training: "de estatísticas sobre treinamentos"
@@ -351,10 +351,11 @@ pt:
       notify_privacy_policy_changed:
         policy_updated: "Privacy policy updated."        # missing translation
         click_to_show: "Click here to consult"        # missing translation
+
   statistics:
     # statistics tools for admins
     subscriptions: "Assinaturas"
-    machines_hours: "Horas de máquina"
+    machines_hours: "Slots de máquina"                                # missing translation
     spaces: "Espaços"
     trainings: "Treinamentos"
     events: "Eventos"
diff --git a/db/seeds.rb b/db/seeds.rb
index da3de1060..e13ae4cdb 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -425,8 +425,8 @@ Stylesheet.build_sheet!
 
 unless Setting.find_by(name: 'training_information_message').try(:value)
   setting = Setting.find_or_initialize_by(name: 'training_information_message')
-  setting.value = "Avant de réserver une formation, nous vous conseillons de consulter nos offres d'abonnement qui"+
-                  ' proposent des conditions avantageuses sur le prix des formations et les heures machines.'
+  setting.value = "Avant de réserver une formation, nous vous conseillons de consulter nos offres d'abonnement qui" \
+                  ' proposent des conditions avantageuses sur le prix des formations et les créneaux machines.'
   setting.save
 end
 
diff --git a/test/fixtures/history_values.yml b/test/fixtures/history_values.yml
index 0940b6d94..be2063477 100644
--- a/test/fixtures/history_values.yml
+++ b/test/fixtures/history_values.yml
@@ -250,7 +250,7 @@ value_history_26:
   invoicing_profile_id: 1
   value: Avant de réserver une formation, nous vous conseillons de consulter nos offres
     d'abonnement qui proposent des conditions avantageuses sur le prix des formations
-    et les heures machines.
+    et les créneaux machines.
   created_at: 2018-12-17 11:23:01.569316000 Z
   updated_at: 2018-12-17 11:23:01.717053000 Z
   footprint: 4413b595bfbb0ec9ac2637997b1731eb06e516dea606e6a2f1acc4b9bf323f98
diff --git a/test/fixtures/statistic_indices.yml b/test/fixtures/statistic_indices.yml
index b3b6fbe60..aab5aa638 100644
--- a/test/fixtures/statistic_indices.yml
+++ b/test/fixtures/statistic_indices.yml
@@ -11,7 +11,7 @@ statistic_index_1:
 statistic_index_2:
   id: 2
   es_type_key: machine
-  label: Heures machines
+  label: Créneaux machines
   created_at: 2016-04-04 14:11:33.359367000 Z
   updated_at: 2016-04-04 14:11:33.359367000 Z
   table: true