From 9472febf3927e6b1c943a17f74f88cf927e4c0f2 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 6 May 2020 17:00:32 +0200 Subject: [PATCH 01/10] New translations app.admin.en.yml (Zulu) --- config/locales/app.admin.zu.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/config/locales/app.admin.zu.yml b/config/locales/app.admin.zu.yml index 0e01620ff..13ee8c22e 100644 --- a/config/locales/app.admin.zu.yml +++ b/config/locales/app.admin.zu.yml @@ -18,6 +18,9 @@ zu: events: "crwdns6715:0crwdne6715:0" availabilities: "crwdns6717:0crwdne6717:0" availabilities_notice: "crwdns6719:0crwdne6719:0" + info: "crwdns20468:0crwdne20468:0" + tags: "crwdns20470:0crwdne20470:0" + slot_duration: "crwdns20472:0{DURATION}crwdne20472:0" ongoing_reservations: "crwdns6721:0crwdne6721:0" without_reservation: "crwdns20326:0crwdne20326:0" confirmation_required: "crwdns6725:0crwdne6725:0" @@ -280,8 +283,9 @@ zu: prominence: "crwdns7143:0crwdne7143:0" price: "crwdns7145:0crwdne7145:0" machine_hours: "crwdns7147:0crwdne7147:0" - these_prices_match_machine_hours_rates_: "crwdns20290:0{DURATION}crwdne20290:0" - _without_subscriptions: "crwdns7151:0crwdne7151:0" + these_prices_match_machine_hours_rates_html: "crwdns20474:0crwdne20474:0" + prices_calculated_on_hourly_rate_html: "crwdns20476:0{RATE}crwdnd20476:0{DURATION}crwdnd20476:0{PRICE}crwdne20476:0" + you_can_override: "crwdns20478:0crwdne20478:0" machines: "crwdns7153:0crwdne7153:0" credits: "crwdns7155:0crwdne7155:0" subscription: "crwdns7157:0crwdne7157:0" @@ -334,7 +338,7 @@ zu: forever: "crwdns7251:0crwdne7251:0" valid_until: "crwdns7253:0crwdne7253:0" spaces: "crwdns7255:0crwdne7255:0" - these_prices_match_space_hours_rates_: "crwdns20294:0{DURATION}crwdne20294:0" + these_prices_match_space_hours_rates_html: "crwdns20480:0crwdne20480:0" add_a_space_credit: "crwdns7259:0crwdne7259:0" space: "crwdns7261:0crwdne7261:0" error_a_credit_linking_this_space_with_that_subscription_already_exists: "crwdns7263:0crwdne7263:0" @@ -363,7 +367,7 @@ zu: copy_prices_from: "crwdns7291:0crwdne7291:0" machines: "crwdns7293:0crwdne7293:0" machine: "crwdns7295:0crwdne7295:0" - hourly_rate: "crwdns7297:0crwdne7297:0" + hourly_rate: "crwdns20482:0crwdne20482:0" spaces: "crwdns7299:0crwdne7299:0" space: "crwdns7301:0crwdne7301:0" unable_to_save_subscription_changes_please_try_again: "crwdns7303:0crwdne7303:0" From ef6fd82941136a28173f1c4e93bbab5ae9902e80 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 6 May 2020 17:00:33 +0200 Subject: [PATCH 02/10] New translations app.shared.en.yml (Portuguese) --- config/locales/app.shared.pt.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/locales/app.shared.pt.yml b/config/locales/app.shared.pt.yml index d2f738654..b689f5b21 100755 --- a/config/locales/app.shared.pt.yml +++ b/config/locales/app.shared.pt.yml @@ -425,6 +425,12 @@ pt: slot_at_same_time: "Conflict with others reservations" do_you_really_want_to_book_slot_at_same_time: "Do you really want to book this slot? Other bookings take place at the same time" unable_to_book_slot_because_really_have_reservation_at_same_time: "Unable to book this slot because the following reservation occurs at the same time." + tags_mismatch: "Tags mismatch" + confirm_book_slot_tags_mismatch: "Do you really want to book this slot? {USER} does not have any of the required tags." + unable_to_book_slot_tags_mismatch: "Unable to book this slot because you don't have any of the required tags." + slot_tags: "Slot tags" + user_tags: "User tags" + no_tags: "No tags" #feature-tour modal tour: previous: "Previous" From 41103a5b7cdf12d8f585d8192fc2213a77e98d96 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 6 May 2020 17:00:35 +0200 Subject: [PATCH 03/10] New translations app.shared.en.yml (Spanish) --- config/locales/app.shared.es.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/locales/app.shared.es.yml b/config/locales/app.shared.es.yml index 9225bcc98..f1dca4d36 100644 --- a/config/locales/app.shared.es.yml +++ b/config/locales/app.shared.es.yml @@ -425,6 +425,12 @@ es: slot_at_same_time: "Conflict with others reservations" do_you_really_want_to_book_slot_at_same_time: "Do you really want to book this slot? Other bookings take place at the same time" unable_to_book_slot_because_really_have_reservation_at_same_time: "Unable to book this slot because the following reservation occurs at the same time." + tags_mismatch: "Tags mismatch" + confirm_book_slot_tags_mismatch: "Do you really want to book this slot? {USER} does not have any of the required tags." + unable_to_book_slot_tags_mismatch: "Unable to book this slot because you don't have any of the required tags." + slot_tags: "Slot tags" + user_tags: "User tags" + no_tags: "No tags" #feature-tour modal tour: previous: "Previous" From b0ac7f54c631a030b1e0bb304d9afb6854f7c23d Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 6 May 2020 17:00:37 +0200 Subject: [PATCH 04/10] New translations app.shared.en.yml (French) --- config/locales/app.shared.fr.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/locales/app.shared.fr.yml b/config/locales/app.shared.fr.yml index 7da53ec21..a4c4d2cbe 100644 --- a/config/locales/app.shared.fr.yml +++ b/config/locales/app.shared.fr.yml @@ -425,6 +425,12 @@ fr: slot_at_same_time: "Conflit avec d'autres réservations" do_you_really_want_to_book_slot_at_same_time: "Êtes-vous sûr de réserver ce créneau ? D'autres réservations ont lieu en même temps" unable_to_book_slot_because_really_have_reservation_at_same_time: "Impossible de réserver ce créneau car les réservations ci-dessous ont lieu en même temps." + tags_mismatch: "Tags mismatch" + confirm_book_slot_tags_mismatch: "Do you really want to book this slot? {USER} does not have any of the required tags." + unable_to_book_slot_tags_mismatch: "Unable to book this slot because you don't have any of the required tags." + slot_tags: "Slot tags" + user_tags: "User tags" + no_tags: "No tags" #feature-tour modal tour: previous: "Précédent" From df51249155492b9ed3ecb24efd2e129e88a07321 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 6 May 2020 17:00:44 +0200 Subject: [PATCH 05/10] New translations app.admin.en.yml (Portuguese) --- config/locales/app.admin.pt.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/config/locales/app.admin.pt.yml b/config/locales/app.admin.pt.yml index 4b7424004..83e4b8aec 100755 --- a/config/locales/app.admin.pt.yml +++ b/config/locales/app.admin.pt.yml @@ -18,6 +18,9 @@ pt: events: "Eventos" availabilities: "Disponíveis" availabilities_notice: "Exportar para Excel livro com todos os slots disponíveis para reserva, e suas ocupações." + info: "Info" + tags: "Tags" + slot_duration: "Slot duration: {DURATION} minutes" ongoing_reservations: "Reservas em curso" without_reservation: "Sem reservas" confirmation_required: "Confirmação Obrigatória" @@ -280,8 +283,9 @@ pt: prominence: "Relevância" price: "Preço" machine_hours: "Machine slots" - these_prices_match_machine_hours_rates_: "Estes preços correspondem a um slot da máquina (padrão {DURATION} minutos), " - _without_subscriptions: "sem assinaturas" + these_prices_match_machine_hours_rates_html: "The prices below match one hour of machine usage, without subscription." + prices_calculated_on_hourly_rate_html: "All the prices will be automatically calculated based on the hourly rate defined here.
For example, if you define an hourly rate at {RATE}: a slot of {DURATION} minutes (default), will be charged {PRICE}." + you_can_override: "You can override this duration for each availability you create in the agenda. The price will then be adjusted accordingly." machines: "Máquinas" credits: "Créditos" subscription: "Inscrições" @@ -334,7 +338,7 @@ pt: forever: "Cada uso" valid_until: "Válido até (incluindo)" spaces: "Espaços" - these_prices_match_space_hours_rates_: "Estes preços correspondem a um slot de espaço (padrão {DURATION} minutos), " + these_prices_match_space_hours_rates_html: "The prices below match one hour of space usage, without subscription." 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." @@ -363,7 +367,7 @@ pt: copy_prices_from: "Copiar preços de" machines: "Máquinas" machine: "Máquina" - hourly_rate: "Price by slot" + hourly_rate: "Hourly rate" 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." From 20005278f79f6a9ccf232918d02c8ca91138ca46 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 6 May 2020 17:00:47 +0200 Subject: [PATCH 06/10] New translations app.admin.en.yml (Spanish) --- config/locales/app.admin.es.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/config/locales/app.admin.es.yml b/config/locales/app.admin.es.yml index 8a0228d8e..5721bff36 100644 --- a/config/locales/app.admin.es.yml +++ b/config/locales/app.admin.es.yml @@ -18,6 +18,9 @@ es: events: "Eventos" availabilities: "Disponibilidades" availabilities_notice: "Exportar a un libro de trabajo de Excel cada ranura disponible para reserva, y su ratio de ocupación." + info: "Info" + tags: "Tags" + slot_duration: "Slot duration: {DURATION} minutes" ongoing_reservations: "Reservas en curso" without_reservation: "Sin reserva" confirmation_required: "Confirmación requerida" @@ -280,8 +283,9 @@ es: prominence: "Prominencia" price: "Precio" machine_hours: "Machine slots" - these_prices_match_machine_hours_rates_: "Estos precios se ajustan a la tarifas un espacio de uso de la máquina (predeterminado {DURATION} minutos), " - _without_subscriptions: "Sin suscripciones" + these_prices_match_machine_hours_rates_html: "The prices below match one hour of machine usage, without subscription." + prices_calculated_on_hourly_rate_html: "All the prices will be automatically calculated based on the hourly rate defined here.
For example, if you define an hourly rate at {RATE}: a slot of {DURATION} minutes (default), will be charged {PRICE}." + you_can_override: "You can override this duration for each availability you create in the agenda. The price will then be adjusted accordingly." machines: "Máquinas" credits: "Créditos" subscription: "Suscripción" @@ -334,7 +338,7 @@ es: forever: "Cada uso" valid_until: "Válido hasta (incluido)" spaces: "Espacios" - these_prices_match_space_hours_rates_: "Estos precios se ajustan a la tarifas un espacio de uso de espacio (predeterminado {DURATION} minutos), " + these_prices_match_space_hours_rates_html: "The prices below match one hour of space usage, without subscription." 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." @@ -363,7 +367,7 @@ es: copy_prices_from: "Copia los precios desde" machines: "Máquinas" machine: "Máquina" - hourly_rate: "Tarifa por slot" + hourly_rate: "Hourly rate" 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." From ae28ae896c28a59031102d2f9399ef0885ca5c2f Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 6 May 2020 17:00:49 +0200 Subject: [PATCH 07/10] New translations app.admin.en.yml (French) --- config/locales/app.admin.fr.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index 499b410bb..0ef8ec2c2 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -18,6 +18,9 @@ fr: events: "Évènements" availabilities: "Disponibilités" availabilities_notice: "Exporter dans un classeur Excel tous les créneaux ouverts à la réservation et leurs taux d'occupation." + info: "Info" + tags: "Tags" + slot_duration: "Slot duration: {DURATION} minutes" ongoing_reservations: "Réservations en cours" without_reservation: "Sans réservation" confirmation_required: "Confirmation requise" @@ -280,8 +283,9 @@ fr: prominence: "Importance" price: "Prix" machine_hours: "Créneaux machines" - these_prices_match_machine_hours_rates_: "Ces tarifs correspondent au prix d'un créneau machine (par défaut {DURATION} minutes), " - _without_subscriptions: "sans abonnement" + these_prices_match_machine_hours_rates_html: "The prices below match one hour of machine usage, without subscription." + prices_calculated_on_hourly_rate_html: "All the prices will be automatically calculated based on the hourly rate defined here.
For example, if you define an hourly rate at {RATE}: a slot of {DURATION} minutes (default), will be charged {PRICE}." + you_can_override: "You can override this duration for each availability you create in the agenda. The price will then be adjusted accordingly." machines: "Machines" credits: "Crédits" subscription: "Abonnement" @@ -334,7 +338,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'un créneau espace (par défaut {DURATION} minutes), " + these_prices_match_space_hours_rates_html: "The prices below match one hour of space usage, without subscription." 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à." @@ -363,7 +367,7 @@ fr: copy_prices_from: "Copier les prix depuis" machines: "Machines" machine: "Machine" - hourly_rate: "Tarif par créneau" + hourly_rate: "Hourly rate" 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." @@ -374,7 +378,7 @@ fr: accounting_periods: "Périodes comptables" invoices_list: "Liste des factures" filter_invoices: "Filtrer les factures" - operator_: "Opérateur :" + operator_: "Opérateur:" invoice_num_: "Facture n° :" customer_: "Client :" date_: "Date :" From 2ea976f16e734daa014b26f3e56ac3a3c42f12d1 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 6 May 2020 17:00:56 +0200 Subject: [PATCH 08/10] New translations app.shared.en.yml (Zulu) --- config/locales/app.shared.zu.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/locales/app.shared.zu.yml b/config/locales/app.shared.zu.yml index 2edec81b2..56d8084a0 100644 --- a/config/locales/app.shared.zu.yml +++ b/config/locales/app.shared.zu.yml @@ -425,6 +425,12 @@ zu: slot_at_same_time: "crwdns20150:0crwdne20150:0" do_you_really_want_to_book_slot_at_same_time: "crwdns20152:0crwdne20152:0" unable_to_book_slot_because_really_have_reservation_at_same_time: "crwdns20154:0crwdne20154:0" + tags_mismatch: "crwdns20484:0crwdne20484:0" + confirm_book_slot_tags_mismatch: "crwdns20486:0{USER}crwdne20486:0" + unable_to_book_slot_tags_mismatch: "crwdns20488:0crwdne20488:0" + slot_tags: "crwdns20490:0crwdne20490:0" + user_tags: "crwdns20492:0crwdne20492:0" + no_tags: "crwdns20494:0crwdne20494:0" #feature-tour modal tour: previous: "crwdns20166:0crwdne20166:0" From c668583965d20cf9527f17406dc07e34c062e8d2 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 6 May 2020 17:09:17 +0200 Subject: [PATCH 09/10] New translations app.shared.en.yml (French) --- config/locales/app.shared.fr.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/config/locales/app.shared.fr.yml b/config/locales/app.shared.fr.yml index a4c4d2cbe..21449714e 100644 --- a/config/locales/app.shared.fr.yml +++ b/config/locales/app.shared.fr.yml @@ -425,12 +425,12 @@ fr: slot_at_same_time: "Conflit avec d'autres réservations" do_you_really_want_to_book_slot_at_same_time: "Êtes-vous sûr de réserver ce créneau ? D'autres réservations ont lieu en même temps" unable_to_book_slot_because_really_have_reservation_at_same_time: "Impossible de réserver ce créneau car les réservations ci-dessous ont lieu en même temps." - tags_mismatch: "Tags mismatch" - confirm_book_slot_tags_mismatch: "Do you really want to book this slot? {USER} does not have any of the required tags." - unable_to_book_slot_tags_mismatch: "Unable to book this slot because you don't have any of the required tags." - slot_tags: "Slot tags" - user_tags: "User tags" - no_tags: "No tags" + tags_mismatch: "Étiquettes incompatibles" + confirm_book_slot_tags_mismatch: "Êtes-vous sûr de vouloir réserver ce créneau ? {USER} ne possède aucune des étiquettes requises." + unable_to_book_slot_tags_mismatch: "Impossible de réserver ce créneau car vous ne possédez aucune des étiquettes requises." + slot_tags: "Étiquettes du créneau" + user_tags: "Étiquettes de l'utilisateur" + no_tags: "Aucune étiquette" #feature-tour modal tour: previous: "Précédent" From 2099e6cd98400e0623dbbe7dbe939beae9279a2d Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 6 May 2020 17:09:24 +0200 Subject: [PATCH 10/10] New translations app.admin.en.yml (French) --- config/locales/app.admin.fr.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index 0ef8ec2c2..5d9281afb 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -18,9 +18,9 @@ fr: events: "Évènements" availabilities: "Disponibilités" availabilities_notice: "Exporter dans un classeur Excel tous les créneaux ouverts à la réservation et leurs taux d'occupation." - info: "Info" - tags: "Tags" - slot_duration: "Slot duration: {DURATION} minutes" + info: "Informations" + tags: "Étiquettes" + slot_duration: "Durée des créneaux: {DURATION} minutes" ongoing_reservations: "Réservations en cours" without_reservation: "Sans réservation" confirmation_required: "Confirmation requise" @@ -283,9 +283,9 @@ fr: prominence: "Importance" price: "Prix" machine_hours: "Créneaux machines" - these_prices_match_machine_hours_rates_html: "The prices below match one hour of machine usage, without subscription." - prices_calculated_on_hourly_rate_html: "All the prices will be automatically calculated based on the hourly rate defined here.
For example, if you define an hourly rate at {RATE}: a slot of {DURATION} minutes (default), will be charged {PRICE}." - you_can_override: "You can override this duration for each availability you create in the agenda. The price will then be adjusted accordingly." + these_prices_match_machine_hours_rates_html: "Les tarifs ci-dessous correspondent à une heure d'utilisation machine, sans abonnement." + prices_calculated_on_hourly_rate_html: "Tous les prix seront automatiquement calculés par rapport au tarif horaire défini ici.
Par exemple, si vous définissez un tarif horaire à {RATE} : un créneau de {DURATION} minutes (par défaut), sera facturé {PRICE}." + you_can_override: "Vous pouvez surcharger cette durée pour chaque disponibilité que vous créez dans l'agenda. Le prix sera alors ajusté en conséquence." machines: "Machines" credits: "Crédits" subscription: "Abonnement" @@ -338,7 +338,7 @@ fr: forever: "À chaque utilisation" valid_until: "Valable jusqu'au (inclus)" spaces: "Espaces" - these_prices_match_space_hours_rates_html: "The prices below match one hour of space usage, without subscription." + these_prices_match_space_hours_rates_html: "Les tarifs ci-dessous correspondent à une heure d'utilisation espace, sans abonnement." 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à." @@ -367,7 +367,7 @@ fr: copy_prices_from: "Copier les prix depuis" machines: "Machines" machine: "Machine" - hourly_rate: "Hourly rate" + hourly_rate: "Tarif horaire" 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."