diff --git a/config/locales/app.admin.de.yml b/config/locales/app.admin.de.yml
index ab269c3c7..f36a5662a 100644
--- a/config/locales/app.admin.de.yml
+++ b/config/locales/app.admin.de.yml
@@ -111,6 +111,10 @@ de:
save: "Speichern"
create_success: "Der Raum wurde erfolgreich erstellt"
update_success: "Der Raum wurde erfolgreich aktualisiert"
+ associated_machines: "Included machines"
+ children_spaces: "Included spaces"
+ associated_objects: "Associated objects"
+ associated_objects_warning: "Only use these fields if you want interblocking reservation between spaces, child spaces and machines. If you want machine and space reservations to remain independent, please leave the following fields blank."
event_form:
ACTION_title: "{ACTION, select, create{Neue} other{Aktualisiere die}} Veranstaltung"
title: "Titel"
diff --git a/config/locales/app.admin.es.yml b/config/locales/app.admin.es.yml
index 20d4e8ad8..35f294d4f 100644
--- a/config/locales/app.admin.es.yml
+++ b/config/locales/app.admin.es.yml
@@ -111,6 +111,10 @@ es:
save: "Guardar"
create_success: "El espacio se ha creado correctamente"
update_success: "El espacio se ha actualizado correctamente"
+ associated_machines: "Included machines"
+ children_spaces: "Included spaces"
+ associated_objects: "Associated objects"
+ associated_objects_warning: "Only use these fields if you want interblocking reservation between spaces, child spaces and machines. If you want machine and space reservations to remain independent, please leave the following fields blank."
event_form:
ACTION_title: "{ACTION, select, create{Nuevo} other{Actualiza el}} evento"
title: "Título"
diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml
index dbf0edb20..d36efb352 100644
--- a/config/locales/app.admin.fr.yml
+++ b/config/locales/app.admin.fr.yml
@@ -111,10 +111,10 @@ fr:
save: "Enregistrer"
create_success: "L'espace a bien été créé"
update_success: "L'espace a bien été mis à jour"
- associated_machines: "Machines"
- children_spaces: "Espaces"
- associated_objects: "Machines et sous-espaces"
- associated_objects_warning: "Utilisez ces champs uniquement si vous souhaitez que la réservation de l'espace bloque la réservation des machines associées et des sous-espaces (et vice-versa). Si vous souhaitez que les réservations restent indépendantes, veuillez laisser les champs suivants vides."
+ associated_machines: "Machines incluses"
+ children_spaces: "Espaces inclus"
+ associated_objects: "Objet associé"
+ associated_objects_warning: "Utilisez uniquement ces champs si vous souhaitez une réservation d'interblocage entre les espaces, les sous-espaces et les machines. Si vous voulez que les réservations de machines et d'espaces restent indépendantes, veuillez laisser les champs suivants vides."
event_form:
ACTION_title: "{ACTION, select, create{Nouvel } other{Mettre à jour l''}}événement"
title: "Titre"
diff --git a/config/locales/app.admin.it.yml b/config/locales/app.admin.it.yml
index b7a5a64e3..258a6fbe5 100644
--- a/config/locales/app.admin.it.yml
+++ b/config/locales/app.admin.it.yml
@@ -111,6 +111,10 @@ it:
save: "Salva"
create_success: "Lo spazio è stato creato correttamente"
update_success: "Lo spazio è stato aggiornato correttamente"
+ associated_machines: "Included machines"
+ children_spaces: "Included spaces"
+ associated_objects: "Associated objects"
+ associated_objects_warning: "Only use these fields if you want interblocking reservation between spaces, child spaces and machines. If you want machine and space reservations to remain independent, please leave the following fields blank."
event_form:
ACTION_title: "{ACTION, select, create{Nuovo} other{Aggiorna}} evento"
title: "Titolo"
diff --git a/config/locales/app.admin.no.yml b/config/locales/app.admin.no.yml
index 092a4769c..708ece1ca 100644
--- a/config/locales/app.admin.no.yml
+++ b/config/locales/app.admin.no.yml
@@ -111,6 +111,10 @@
save: "Save"
create_success: "The space was created successfully"
update_success: "The space was updated successfully"
+ associated_machines: "Included machines"
+ children_spaces: "Included spaces"
+ associated_objects: "Associated objects"
+ associated_objects_warning: "Only use these fields if you want interblocking reservation between spaces, child spaces and machines. If you want machine and space reservations to remain independent, please leave the following fields blank."
event_form:
ACTION_title: "{ACTION, select, create{New} other{Update the}} event"
title: "Title"
diff --git a/config/locales/app.admin.pt.yml b/config/locales/app.admin.pt.yml
index 38d1181f5..680842515 100644
--- a/config/locales/app.admin.pt.yml
+++ b/config/locales/app.admin.pt.yml
@@ -111,6 +111,10 @@ pt:
save: "Save"
create_success: "The space was created successfully"
update_success: "The space was updated successfully"
+ associated_machines: "Included machines"
+ children_spaces: "Included spaces"
+ associated_objects: "Associated objects"
+ associated_objects_warning: "Only use these fields if you want interblocking reservation between spaces, child spaces and machines. If you want machine and space reservations to remain independent, please leave the following fields blank."
event_form:
ACTION_title: "{ACTION, select, create{New} other{Update the}} event"
title: "Title"
diff --git a/config/locales/app.admin.zu.yml b/config/locales/app.admin.zu.yml
index d56cab190..257ec281c 100644
--- a/config/locales/app.admin.zu.yml
+++ b/config/locales/app.admin.zu.yml
@@ -111,6 +111,10 @@ zu:
save: "crwdns36885:0crwdne36885:0"
create_success: "crwdns31813:0crwdne31813:0"
update_success: "crwdns31815:0crwdne31815:0"
+ associated_machines: "crwdns37729:0crwdne37729:0"
+ children_spaces: "crwdns37731:0crwdne37731:0"
+ associated_objects: "crwdns37733:0crwdne37733:0"
+ associated_objects_warning: "crwdns37735:0crwdne37735:0"
event_form:
ACTION_title: "crwdns36887:0ACTION={ACTION}crwdne36887:0"
title: "crwdns31817:0crwdne31817:0"
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 101773e34..a91036804 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -65,6 +65,7 @@ de:
not_available: "Nicht verfügbar"
reserving: "Ich reserviere"
i_ve_reserved: "Ich reservierte"
+ blocked: "Blocked"
length_must_be_slot_multiple: "muss mindestens %{MIN} Minuten nach dem Startdatum liegen"
must_be_associated_with_at_least_1_machine: "muss mindestens einer Maschine zugeordnet sein"
deleted_user: "Gelöschte Benutzer"
@@ -446,6 +447,8 @@ de:
account_invalidated: "Dein Account ist ungültig."
notify_user_supporting_document_refusal:
refusal: "Your supporting documents were refused"
+ notify_user_supporting_document_reminder:
+ reminder_message: "This is a reminder for you to upload your supporting documents."
notify_admin_user_supporting_document_refusal:
refusal: "Member's supporting document %{NAME} was refused."
notify_user_order_is_ready:
@@ -538,6 +541,7 @@ de:
space: "Dieser Space ist deaktiviert"
machine: "Diese Maschine ist deaktiviert"
reservable: "Diese Maschine ist nicht reservierbar"
+ blocked_by_another_reservation: "This slot is blocked by another reservation"
cart_validation:
select_user: "Please select a user before continuing"
settings:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index b1f1918ec..637a2c531 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -65,6 +65,7 @@ es:
not_available: "No disponible"
reserving: "Me reservo"
i_ve_reserved: "He reservado"
+ blocked: "Blocked"
length_must_be_slot_multiple: "Debe ser al menos %{MIN} minutos después de la fecha de inicio"
must_be_associated_with_at_least_1_machine: "debe estar asociado con al menos 1 máquina"
deleted_user: "Usuario eliminado"
@@ -446,6 +447,8 @@ es:
account_invalidated: "Su cuenta no es válida."
notify_user_supporting_document_refusal:
refusal: "Sus justificantes han sido rechazados"
+ notify_user_supporting_document_reminder:
+ reminder_message: "This is a reminder for you to upload your supporting documents."
notify_admin_user_supporting_document_refusal:
refusal: "El justificante del afiliado %{NAME} ha sido rechazado."
notify_user_order_is_ready:
@@ -538,6 +541,7 @@ es:
space: "Este espacio está desactivado"
machine: "Esta máquina está desactivada"
reservable: "Esta máquina no se puede reservar"
+ blocked_by_another_reservation: "This slot is blocked by another reservation"
cart_validation:
select_user: "Por favor, seleccione un usuario antes de continuar"
settings:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 3e3c09f64..1fd3bed8d 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -65,7 +65,7 @@ fr:
not_available: "Non disponible"
reserving: "Je réserve"
i_ve_reserved: "J'ai réservé"
- blocked: "Bloquée"
+ blocked: "Bloqué"
length_must_be_slot_multiple: "doit être au moins %{MIN} minutes après la date de début"
must_be_associated_with_at_least_1_machine: "doit être associé avec au moins 1 machine"
deleted_user: "Utilisateur supprimé"
@@ -448,7 +448,7 @@ fr:
notify_user_supporting_document_refusal:
refusal: "Vos pièces justificatives ont été refusées"
notify_user_supporting_document_reminder:
- reminder_message: "Ceci est un message de rappel pour vous inviter à uploader vos pièces justificatives."
+ reminder_message: "Ceci est un rappel pour vous demander de télécharger vos documents justificatifs."
notify_admin_user_supporting_document_refusal:
refusal: "Le justificatif du membre %{NAME} a été refusé."
notify_user_order_is_ready:
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 5e3cd0173..106244325 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -65,6 +65,7 @@ it:
not_available: "Non disponibile"
reserving: "Sto prenotando"
i_ve_reserved: "Ho prenotato"
+ blocked: "Blocked"
length_must_be_slot_multiple: "deve essere almeno %{MIN} minuti dopo la data di inizio"
must_be_associated_with_at_least_1_machine: "deve essere associata ad almeno 1 macchina"
deleted_user: "Utente eliminato"
@@ -446,6 +447,8 @@ it:
account_invalidated: "Il tuo account non è valido."
notify_user_supporting_document_refusal:
refusal: "I tuoi documenti aggiuntivi sono stati rifiutati"
+ notify_user_supporting_document_reminder:
+ reminder_message: "This is a reminder for you to upload your supporting documents."
notify_admin_user_supporting_document_refusal:
refusal: "Il documento aggiuntivo del membro %{NAME} è stato rifiutato."
notify_user_order_is_ready:
@@ -538,6 +541,7 @@ it:
space: "Questo spazio è disabilitato"
machine: "Questa macchina è disabilitata"
reservable: "Questa macchina non è prenotabile"
+ blocked_by_another_reservation: "This slot is blocked by another reservation"
cart_validation:
select_user: "Seleziona un utente prima di continuare"
settings:
diff --git a/config/locales/mails.de.yml b/config/locales/mails.de.yml
index 0d29d6ec9..1ca61c7c1 100644
--- a/config/locales/mails.de.yml
+++ b/config/locales/mails.de.yml
@@ -402,6 +402,10 @@ de:
body:
user_supporting_document_files_refusal: "Your supporting documents were refused:"
action: "Please re-upload some new supporting documents."
+ notify_user_supporting_document_reminder:
+ subject: "Reminder to upload your supporting documents"
+ body:
+ user_supporting_document_reminder: "This is a reminder for you to upload your supporting documents."
notify_admin_user_supporting_document_refusal:
subject: "A member's supporting documents were refused"
body:
diff --git a/config/locales/mails.es.yml b/config/locales/mails.es.yml
index 8d2d6f563..7f1406c21 100644
--- a/config/locales/mails.es.yml
+++ b/config/locales/mails.es.yml
@@ -402,6 +402,10 @@ es:
body:
user_supporting_document_files_refusal: "Sus justificantes han sido rechazados:"
action: "Por favor, vuelva a subir nuevos documentos justificativos."
+ notify_user_supporting_document_reminder:
+ subject: "Reminder to upload your supporting documents"
+ body:
+ user_supporting_document_reminder: "This is a reminder for you to upload your supporting documents."
notify_admin_user_supporting_document_refusal:
subject: "Los justificantes del afiliado de un miembro han sido rechazados"
body:
diff --git a/config/locales/mails.fr.yml b/config/locales/mails.fr.yml
index 0517ad9e2..47cd1bd75 100644
--- a/config/locales/mails.fr.yml
+++ b/config/locales/mails.fr.yml
@@ -402,6 +402,10 @@ fr:
body:
user_supporting_document_files_refusal: "Vos pièces justificatives ont été refusées :"
action: "Veuillez téléverser de nouvelles pièces justificatives."
+ notify_user_supporting_document_reminder:
+ subject: "Rappel de télécharger vos documents justificatifs"
+ body:
+ user_supporting_document_reminder: "Ceci est un rappel pour vous demander de télécharger vos documents justificatifs."
notify_admin_user_supporting_document_refusal:
subject: "Les justificatifs d'un membre ont été refusés"
body:
diff --git a/config/locales/mails.it.yml b/config/locales/mails.it.yml
index c0d842a27..1b17ef14b 100644
--- a/config/locales/mails.it.yml
+++ b/config/locales/mails.it.yml
@@ -402,6 +402,10 @@ it:
body:
user_supporting_document_files_refusal: "I tuoi documenti aggiuntivi sono stati rifiutati:"
action: "Si prega di ricaricare nuovi documenti di supporto."
+ notify_user_supporting_document_reminder:
+ subject: "Reminder to upload your supporting documents"
+ body:
+ user_supporting_document_reminder: "This is a reminder for you to upload your supporting documents."
notify_admin_user_supporting_document_refusal:
subject: "I documenti aggiuntivi di un membro sono stati rifiutati"
body:
diff --git a/config/locales/mails.no.yml b/config/locales/mails.no.yml
index a4ed1ec5e..4d69e9d83 100644
--- a/config/locales/mails.no.yml
+++ b/config/locales/mails.no.yml
@@ -402,6 +402,10 @@
body:
user_supporting_document_files_refusal: "Your supporting documents were refused:"
action: "Please re-upload some new supporting documents."
+ notify_user_supporting_document_reminder:
+ subject: "Reminder to upload your supporting documents"
+ body:
+ user_supporting_document_reminder: "This is a reminder for you to upload your supporting documents."
notify_admin_user_supporting_document_refusal:
subject: "A member's supporting documents were refused"
body:
diff --git a/config/locales/mails.pt.yml b/config/locales/mails.pt.yml
index 99eb43143..c1408a120 100644
--- a/config/locales/mails.pt.yml
+++ b/config/locales/mails.pt.yml
@@ -402,6 +402,10 @@ pt:
body:
user_supporting_document_files_refusal: "Os seus documentos de apoio foram recusados:"
action: "Por favor, recarregue novos documentos de apoio."
+ notify_user_supporting_document_reminder:
+ subject: "Reminder to upload your supporting documents"
+ body:
+ user_supporting_document_reminder: "This is a reminder for you to upload your supporting documents."
notify_admin_user_supporting_document_refusal:
subject: "Documentos de apoio de um membro foram recusados"
body:
diff --git a/config/locales/mails.zu.yml b/config/locales/mails.zu.yml
index 6aca672d6..7d831a98e 100644
--- a/config/locales/mails.zu.yml
+++ b/config/locales/mails.zu.yml
@@ -402,6 +402,10 @@ zu:
body:
user_supporting_document_files_refusal: "crwdns37363:0crwdne37363:0"
action: "crwdns37365:0crwdne37365:0"
+ notify_user_supporting_document_reminder:
+ subject: "crwdns37743:0crwdne37743:0"
+ body:
+ user_supporting_document_reminder: "crwdns37745:0crwdne37745:0"
notify_admin_user_supporting_document_refusal:
subject: "crwdns37367:0crwdne37367:0"
body:
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 3ea449d2f..22e5e5c53 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -65,6 +65,7 @@
not_available: "Ikke tilgjengelig"
reserving: "I'm reserving"
i_ve_reserved: "Jeg har reservert"
+ blocked: "Blocked"
length_must_be_slot_multiple: "må være minst %{MIN} minutter etter startdatoen"
must_be_associated_with_at_least_1_machine: "må være tilknyttet minst 1 maskin"
deleted_user: "Deleted user"
@@ -446,6 +447,8 @@
account_invalidated: "Your account is invalid."
notify_user_supporting_document_refusal:
refusal: "Your supporting documents were refused"
+ notify_user_supporting_document_reminder:
+ reminder_message: "This is a reminder for you to upload your supporting documents."
notify_admin_user_supporting_document_refusal:
refusal: "Member's supporting document %{NAME} was refused."
notify_user_order_is_ready:
@@ -538,6 +541,7 @@
space: "This space is disabled"
machine: "This machine is disabled"
reservable: "This machine is not reservable"
+ blocked_by_another_reservation: "This slot is blocked by another reservation"
cart_validation:
select_user: "Please select a user before continuing"
settings:
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 1c02c1c9a..584a3b76c 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -65,6 +65,7 @@ pt:
not_available: "Não disponível "
reserving: "I'm reserving"
i_ve_reserved: "Eu reservei"
+ blocked: "Blocked"
length_must_be_slot_multiple: "deve ser pelo menos %{MIN} minutos após a data de início"
must_be_associated_with_at_least_1_machine: "deve estar associada a pelo menos uma máquina"
deleted_user: "Usuário deletado"
@@ -446,6 +447,8 @@ pt:
account_invalidated: "Sua conta é inválida."
notify_user_supporting_document_refusal:
refusal: "Your supporting documents were refused"
+ notify_user_supporting_document_reminder:
+ reminder_message: "This is a reminder for you to upload your supporting documents."
notify_admin_user_supporting_document_refusal:
refusal: "Member's supporting document %{NAME} was refused."
notify_user_order_is_ready:
@@ -538,6 +541,7 @@ pt:
space: "Este espaço está desativado"
machine: "Esta máquina está desativada"
reservable: "Esta máquina não é reservável"
+ blocked_by_another_reservation: "This slot is blocked by another reservation"
cart_validation:
select_user: "Por favor, selecione um usuário antes de continuar"
settings:
diff --git a/config/locales/zu.yml b/config/locales/zu.yml
index 9e9b08728..5d4ed4b32 100644
--- a/config/locales/zu.yml
+++ b/config/locales/zu.yml
@@ -65,6 +65,7 @@ zu:
not_available: "crwdns3267:0crwdne3267:0"
reserving: "crwdns37199:0crwdne37199:0"
i_ve_reserved: "crwdns3269:0crwdne3269:0"
+ blocked: "crwdns37737:0crwdne37737:0"
length_must_be_slot_multiple: "crwdns3271:0%{MIN}crwdne3271:0"
must_be_associated_with_at_least_1_machine: "crwdns3273:0crwdne3273:0"
deleted_user: "crwdns22460:0crwdne22460:0"
@@ -446,6 +447,8 @@ zu:
account_invalidated: "crwdns23006:0crwdne23006:0"
notify_user_supporting_document_refusal:
refusal: "crwdns37345:0crwdne37345:0"
+ notify_user_supporting_document_reminder:
+ reminder_message: "crwdns37739:0crwdne37739:0"
notify_admin_user_supporting_document_refusal:
refusal: "crwdns37347:0%{NAME}crwdne37347:0"
notify_user_order_is_ready:
@@ -538,6 +541,7 @@ zu:
space: "crwdns36283:0crwdne36283:0"
machine: "crwdns36285:0crwdne36285:0"
reservable: "crwdns36287:0crwdne36287:0"
+ blocked_by_another_reservation: "crwdns37741:0crwdne37741:0"
cart_validation:
select_user: "crwdns37211:0crwdne37211:0"
settings: