Merge branch 'dev' into manager

config/locales/app.admin.es.yml

@@ -98,7 +98,9 @@ es:
         legend: "Leyenda"
         and: "y"
         external_sync: "Calendar synchronization"
-        divide_this_availability: "Divide this availability in slots of"
+        divide_this_availability: "Divide this availability in"
+        slots: "slots"
+        slots_of: "of"
         minutes: "minutes"
       #import external iCal calendar
       icalendar:
@@ -586,6 +588,7 @@ es:
       #management of users, labels, groups, and so on
       members:
         users_management: "Gestión de usuarios"
+        users: "Users"
         members: "Miembros"
         subscriptions: "Subscriptions"
         search_for_an_user: "Buscar un usuario"
@@ -601,6 +604,15 @@ es:
         administrators: "Administradores"
         search_for_an_administrator: "Buscar un administrador"
         add_a_new_administrator: "Agregar un nuevo administrador"
+        partners: "Partners"
+        partners_info: "A partner is a special user that can be associated with the «Partner» plans. These users will only receive notifications about subscriptions to these plans."
+        search_for_a_partner: "Search for a partner"
+        add_a_new_partner: "Add a new partner"
+        delete_this_partner: "Do you really want to delete this partner? This cannot be undone."
+        partner_successfully_deleted: "Partner successfully deleted."
+        unable_to_delete_the_partner: "Unable to delete the partner."
+        associated_plan: "Associated plan"
+        managers: "Managers"
         groups: "Grupos"
         tags: "Tags"
         authentication: "Autenticación"

config/locales/app.admin.fr.yml

@@ -588,6 +588,7 @@ fr:
       #management of users, labels, groups, and so on
       members:
         users_management: "Gestion des utilisateurs"
+        users: "Utilisateurs"
         members: "Membres"
         subscriptions: "Abonnements"
         search_for_an_user: "Recherchez un utilisateur"
@@ -603,6 +604,15 @@ fr:
         administrators: "Administrateurs"
         search_for_an_administrator: "Recherchez un administrateur"
         add_a_new_administrator: "Ajouter un nouvel administrateur"
+        partners: "Partenaires"
+        partners_info: "Un partenaire est un utilisateur spécial qui peut être associé à une formule d'abonnement de type «Partenaire». Ces utilisateurs ne feront que recevoir des notifications, à propos des souscriptions à ces abonnements."
+        search_for_a_partner: "Rechercher un partenaire"
+        add_a_new_partner: "Ajouter un partenaire"
+        delete_this_partner: "Voulez-vous vraiment supprimer ce partenaire ? Cette opération est irréversible."
+        partner_successfully_deleted: "Le partenaire a bien été supprimé."
+        unable_to_delete_the_partner: "Impossible de supprimer le partenaire."
+        associated_plan: "Abonnement associé"
+        managers: "Gestionnaires"
         groups: "Groupes"
         tags: "Étiquettes"
         authentication: "Authentification"

config/locales/app.admin.pt.yml

@@ -98,7 +98,9 @@ pt:
         legend: "Legenda"
         and: "and"
         external_sync: "Calendar synchronization"
-        divide_this_availability: "Divide this availability in slots of"
+        divide_this_availability: "Divide this availability in"
+        slots: "slots"
+        slots_of: "of"
         minutes: "minutes"
       #import external iCal calendar
       icalendar:
@@ -586,6 +588,7 @@ pt:
       #management of users, labels, groups, and so on
       members:
         users_management: "Gerenciamento de usuários"
+        users: "Users"
         members: "Membros"
         subscriptions: "Subscriptions"
         search_for_an_user: "Buscar por usuário"
@@ -601,6 +604,15 @@ pt:
         administrators: "Administradores"
         search_for_an_administrator: "Buscar por administrador"
         add_a_new_administrator: "Adicionar novo administrador"
+        partners: "Partners"
+        partners_info: "A partner is a special user that can be associated with the «Partner» plans. These users will only receive notifications about subscriptions to these plans."
+        search_for_a_partner: "Search for a partner"
+        add_a_new_partner: "Add a new partner"
+        delete_this_partner: "Do you really want to delete this partner? This cannot be undone."
+        partner_successfully_deleted: "Partner successfully deleted."
+        unable_to_delete_the_partner: "Unable to delete the partner."
+        associated_plan: "Associated plan"
+        managers: "Managers"
         groups: "Grupos"
         tags: "Tags"
         authentication: "Autenticação"

config/locales/app.admin.zu.yml

@@ -98,7 +98,9 @@ zu:
         legend: "crwdns20198:0crwdne20198:0"
         and: "crwdns6853:0crwdne6853:0"
         external_sync: "crwdns19774:0crwdne19774:0"
-        divide_this_availability: "crwdns20286:0crwdne20286:0"
+        divide_this_availability: "crwdns20300:0crwdne20300:0"
+        slots: "crwdns20302:0crwdne20302:0"
+        slots_of: "crwdns20304:0crwdne20304:0"
         minutes: "crwdns20288:0crwdne20288:0"
       #import external iCal calendar
       icalendar:
@@ -586,6 +588,7 @@ zu:
       #management of users, labels, groups, and so on
       members:
         users_management: "crwdns7735:0crwdne7735:0"
+        users: "crwdns20306:0crwdne20306:0"
         members: "crwdns7737:0crwdne7737:0"
         subscriptions: "crwdns7739:0crwdne7739:0"
         search_for_an_user: "crwdns7741:0crwdne7741:0"
@@ -601,6 +604,15 @@ zu:
         administrators: "crwdns7761:0crwdne7761:0"
         search_for_an_administrator: "crwdns7763:0crwdne7763:0"
         add_a_new_administrator: "crwdns7765:0crwdne7765:0"
+        partners: "crwdns20308:0crwdne20308:0"
+        partners_info: "crwdns20310:0crwdne20310:0"
+        search_for_a_partner: "crwdns20312:0crwdne20312:0"
+        add_a_new_partner: "crwdns20314:0crwdne20314:0"
+        delete_this_partner: "crwdns20316:0crwdne20316:0"
+        partner_successfully_deleted: "crwdns20318:0crwdne20318:0"
+        unable_to_delete_the_partner: "crwdns20320:0crwdne20320:0"
+        associated_plan: "crwdns20322:0crwdne20322:0"
+        managers: "crwdns20324:0crwdne20324:0"
         groups: "crwdns7767:0crwdne7767:0"
         tags: "crwdns7769:0crwdne7769:0"
         authentication: "crwdns7771:0crwdne7771:0"

config/locales/app.shared.es.yml

@@ -57,7 +57,7 @@ es:
         phone_number: "Phone number"
         phone_number_is_required: "Phone number is required."
         i_authorize_Fablab_users_registered_on_the_site_to_contact_me: "I authorize FabLab users, registered on the site, to contact me"
-        i_accept_to_receive_information_from_the_fablab: "I accept to receive information from the FabLab"
+        i_accept_to_receive_information_from_the_fablab: "Acepto recibir información del FabLab"
         used_for_statistics: "This data will be used for statistical purposes"
         used_for_invoicing: "This data will be used for billing purposes"
         used_for_reservation: "This data will be used in case of change on one of your bookings"

config/locales/app.shared.fr.yml

@@ -57,7 +57,7 @@ fr:
         phone_number: "Numéro de téléphone"
         phone_number_is_required: "Le numéro de téléphone est requis."
         i_authorize_Fablab_users_registered_on_the_site_to_contact_me: "J'autorise les utilisateurs du Fab Lab inscrits sur le site à me contacter"
-        i_accept_to_receive_information_from_the_fablab: "I accept to receive information from the FabLab"
+        i_accept_to_receive_information_from_the_fablab: "J'accepte de recevoir des informations du Fab Lab"
         used_for_statistics: "Cette donnée sera utilisée à des fins statistiques"
         used_for_invoicing: "Cette donnée sera utilisée à des fins de facturation"
         used_for_reservation: "Cette donnée sera utilisée en cas de changement sur une de vos réservations"

config/locales/app.shared.pt.yml

@@ -57,7 +57,7 @@ pt:
         phone_number: "Phone number"
         phone_number_is_required: "Phone number is required."
         i_authorize_Fablab_users_registered_on_the_site_to_contact_me: "I authorize FabLab users, registered on the site, to contact me"
-        i_accept_to_receive_information_from_the_fablab: "I accept to receive information from the FabLab"
+        i_accept_to_receive_information_from_the_fablab: "Eu aceito receber informações do FabLab"
         used_for_statistics: "This data will be used for statistical purposes"
         used_for_invoicing: "This data will be used for billing purposes"
         used_for_reservation: "This data will be used in case of change on one of your bookings"