From e44499d7eeaad02ad94e3dbd7c141b8b9b0c4d8c Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 11 Mar 2020 10:04:32 +0100 Subject: [PATCH] fixed some translations --- .../templates/admin/statistics/index.html.erb | 2 +- config/locales/app.admin.ach.yml | 1 - config/locales/app.admin.en.yml | 23 +++++++++---------- config/locales/app.admin.es.yml | 1 - config/locales/app.admin.fr.yml | 1 - config/locales/app.admin.pt.yml | 3 +-- config/locales/app.logged.en.yml | 2 +- config/locales/app.logged.es.yml | 2 +- config/locales/app.logged.pt.yml | 2 +- config/locales/app.public.en.yml | 23 ++++++++++--------- config/locales/app.public.es.yml | 1 + config/locales/app.public.fr.yml | 9 ++++---- config/locales/app.public.pt.yml | 1 + config/locales/app.shared.en.yml | 12 +++++----- 14 files changed, 41 insertions(+), 42 deletions(-) diff --git a/app/assets/templates/admin/statistics/index.html.erb b/app/assets/templates/admin/statistics/index.html.erb index 852b59bce..030ffbf50 100644 --- a/app/assets/templates/admin/statistics/index.html.erb +++ b/app/assets/templates/admin/statistics/index.html.erb @@ -44,7 +44,7 @@ {{agePicker.start}} {{ 'app.admin.statistics.to_age' }} {{agePicker.end}} - {{ 'app.admin.statistics._years_old' }} + {{ 'app.admin.statistics.years_old' }} {{ 'app.admin.statistics.age_filter' }} diff --git a/config/locales/app.admin.ach.yml b/config/locales/app.admin.ach.yml index 174eabd85..61ca48653 100644 --- a/config/locales/app.admin.ach.yml +++ b/config/locales/app.admin.ach.yml @@ -788,7 +788,6 @@ ach: age_filter: "crwdns8095:0crwdne8095:0" from_age: "crwdns8097:0crwdne8097:0" #eg. from 8 to 40 years old to_age: "crwdns8099:0crwdne8099:0" #eg. from 8 to 40 years old - _years_old: "crwdns8101:0crwdne8101:0" start: "crwdns8103:0crwdne8103:0" end: "crwdns8105:0crwdne8105:0" custom_filter: "crwdns8107:0crwdne8107:0" diff --git a/config/locales/app.admin.en.yml b/config/locales/app.admin.en.yml index c93820bdb..4dec6111e 100644 --- a/config/locales/app.admin.en.yml +++ b/config/locales/app.admin.en.yml @@ -95,7 +95,7 @@ en: event_in_the_past: "Unable to create a slot in the past." edit_event: "Edit the event" view_reservations: "View reservations" - legend: "legend" + legend: "Legend" and: "and" external_sync: "Calendar synchronization" # import external iCal calendar @@ -240,7 +240,7 @@ en: edit_this_and_next: "This event and the following" edit_all: "All events" date_wont_change: "Warning: you have changed the event date. This modification won't be propagated to other occurrences of the periodic event." - event_successfully_updated: "Event successfully updated" + event_successfully_updated: "Event successfully updated." events_updated: "The event, and {COUNT, plural, =1{one other} other{{COUNT} others}}, have been updated" unable_to_update_the_event: "Unable to update the event" events_not_updated: "On {TOTAL} events, {COUNT, plural, =1{one was not updated} other{{COUNT} were not deleted}}." @@ -340,7 +340,7 @@ en: #ajouter un code promotionnel coupons_new: add_a_coupon: "Add a coupon" - unable_to_create_the_coupon_check_code_already_used: "Unable to create the coupon. Please check that the code is not already used" + unable_to_create_the_coupon_check_code_already_used: "Unable to create the coupon. Please check that the code is not already used." #mettre à jour un code promotionnel coupons_edit: coupon: "Coupon:" @@ -692,7 +692,7 @@ en: #import results members_import_result: import_results: "Import results" - import_details: "Import #{ID}, of {DATE}, initiated by {USER}" + import_details: "Import # {ID}, of {DATE}, initiated by {USER}" results: "Results" pending: "Pending..." status_create: "Creating a new user" @@ -768,7 +768,7 @@ en: add_a_new_authentication_provider: "Add a new authentication provider" a_local_database_provider_already_exists_unable_to_create_another: "A \"Local Database\" provider already exists. Unable to create another." local_provider_successfully_saved: "Local provider successfully saved." - it_is_required_to_set_the_matching_between_User.uid_and_the_API_to_add_this_provider: "It is required to set the matching between User.uid and the API to add this provider" + it_is_required_to_set_the_matching_between_User.uid_and_the_API_to_add_this_provider: "It is required to set the matching between User.uid and the API to add this provider." security_issue_detected: "Security issue detected" beware_the_oauth2_authenticatoin_provider_you_are_about_to_add_isnt_using_HTTPS: "Beware: the OAuth 2 provider you are about to add isn't using HTTPS." this_is_a_serious_security_issue_on_internet_and_should_never_be_used_except_for_testing_purposes: "This is a serious security issue on internet and should never be used except for testing purposes." @@ -778,8 +778,8 @@ en: #edit an authentication provider (SSO) authentication_edit: provider: "Provider :" - it_is_required_to_set_the_matching_between_User.uid_and_the_API_to_add_this_provider: "It is required to set the matching between User.uid and the API to add this provider" - provider_successfully_updated: "Provider successfully updated" + it_is_required_to_set_the_matching_between_User.uid_and_the_API_to_add_this_provider: "It is required to set the matching between User.uid and the API to add this provider." + provider_successfully_updated: "Provider successfully updated." an_error_occurred_unable_to_update_the_provider: "An error occurred: unable to update the provider." #statistics tables statistics: @@ -788,7 +788,6 @@ en: age_filter: "Age filter" from_age: "From" #eg. from 8 to 40 years old to_age: "to" #eg. from 8 to 40 years old - _years_old: "years old" start: "Start:" end: "End:" custom_filter: "Custom filter" @@ -801,7 +800,7 @@ en: entries: "Entries:" revenue_: "Revenue:" average_age: "Average age:" - years_old: "Years old" + years_old: "years old" total: "Total" available_hours: "Hours available for booking:" available_tickets: "Tickets available for booking:" @@ -1009,10 +1008,10 @@ en: api_documentation: "API documentation" open_api_clients: "OpenAPI clients" name: "Name" - calls_count: "calls count" + calls_count: "Calls count" token: "Token" created_at: "Creation date" - reset_token: "revoke access" + reset_token: "Revoke access" client_name: "Client's name" confirmation_required: "Confirmation required" do_you_really_want_to_delete_this_open_api_client: "Do you really want to delete this OpenAPI client?" @@ -1053,7 +1052,7 @@ en: content: "Here you can create, modify and delete trainings. It is also the place where you can validate the training courses followed by your members." trainings: title: "Manage trainings" - content: "

When creating a training, you can define a default number of places. However, the number of actual places may be modified for each session.

The training sessions are scheduled from the administrator tab [Calendar].

Another thing: it is possible to associate one or more machines with a training. This makes it a prerequisite for the reservation of these machines.

" + content: "

When creating a training, you can define a default number of places. However, the number of actual places may be modified for each session.

The training sessions are scheduled from the administrator tab « Calendar ».

Another thing: it is possible to associate one or more machines with a training. This makes it a prerequisite for the reservation of these machines.

" filter: title: "Filter" content: "By default, only active courses are displayed here. Display the others by choosing another filter here." diff --git a/config/locales/app.admin.es.yml b/config/locales/app.admin.es.yml index 1bb1d2cd6..b1d146be7 100644 --- a/config/locales/app.admin.es.yml +++ b/config/locales/app.admin.es.yml @@ -788,7 +788,6 @@ es: age_filter: "Filtro de edad" from_age: "Desde" #eg. from 8 to 40 years old to_age: "a" #eg. from 8 to 40 years old - _years_old: "años" start: "Principio:" end: "Final:" custom_filter: "Filtro personalizado" diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index e89e7f922..dd73678f4 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -788,7 +788,6 @@ fr: age_filter: "Filtre d'âge" from_age: "De" #eg. from 8 to 40 years old to_age: "à" #eg. from 8 to 40 years old - _years_old: "ans" start: "Début :" end: "Fin :" custom_filter: "Filtre personnalisé" diff --git a/config/locales/app.admin.pt.yml b/config/locales/app.admin.pt.yml index 9cc2d771c..781b0d498 100755 --- a/config/locales/app.admin.pt.yml +++ b/config/locales/app.admin.pt.yml @@ -788,7 +788,6 @@ pt: age_filter: "Filtro de idade" from_age: "Dos" #eg. from 8 to 40 years old to_age: "aos" #eg. from 8 to 40 years old - _years_old: "anos de idade" start: "Início:" end: "Fim:" custom_filter: "Filtro customizado" @@ -801,7 +800,7 @@ pt: entries: "Entradas:" revenue_: "Receita:" average_age: "Idade média:" - years_old: "Anos de idade" + years_old: "anos de idade" total: "Total" available_hours: "Horas disponíveis para reserva:" available_tickets: "Vagas disponíveis para reserva:" diff --git a/config/locales/app.logged.en.yml b/config/locales/app.logged.en.yml index f2d16dfd0..8348486bb 100644 --- a/config/locales/app.logged.en.yml +++ b/config/locales/app.logged.en.yml @@ -45,7 +45,7 @@ en: empty: '' #dashboard: edit my profile settings: - last_activity_on_: "Last activity on" + last_activity_on_: "Last activity on {DATE}" i_want_to_change_group: "I want to change group!" your_subscription_expires_on_: "Your subscription expires on" no_subscriptions: "No subscriptions" diff --git a/config/locales/app.logged.es.yml b/config/locales/app.logged.es.yml index 252a9d008..b3d8d244a 100644 --- a/config/locales/app.logged.es.yml +++ b/config/locales/app.logged.es.yml @@ -45,7 +45,7 @@ es: empty: '' #dashboard: edit my profile settings: - last_activity_on_: "Última vez activo" + last_activity_on_: "Última vez activo {DATE}" i_want_to_change_group: "Quiero cambiar de grupo" your_subscription_expires_on_: "su suscripción acaba el" no_subscriptions: "Sin suscripciones" diff --git a/config/locales/app.logged.pt.yml b/config/locales/app.logged.pt.yml index bd16258a6..b62c7c050 100755 --- a/config/locales/app.logged.pt.yml +++ b/config/locales/app.logged.pt.yml @@ -45,7 +45,7 @@ pt: empty: '' #dashboard: edit my profile settings: - last_activity_on_: "Última atividade em" + last_activity_on_: "Última atividade em {DATE}" i_want_to_change_group: "Eu quero trocar de grupo!" your_subscription_expires_on_: "Sua inscrição expira em" no_subscriptions: "Sem inscrições" diff --git a/config/locales/app.public.en.yml b/config/locales/app.public.en.yml index 9dbd7eb7e..e0d3c9fbd 100644 --- a/config/locales/app.public.en.yml +++ b/config/locales/app.public.en.yml @@ -102,7 +102,7 @@ en: connection: "Connection" password_forgotten: "Forgotten password?" confirm_my_account: "Confirm my e-mail" - not_registered_to_the_fablab: "Not registered to the Fablab?" + not_registered_to_the_fablab: "Not registered to the FabLab?" create_an_account: "Create an account" wrong_email_or_password: "Wrong e-mail or password." caps_lock_is_on: "Caps lock key is on." @@ -148,9 +148,10 @@ en: from_time_to_time: "From {START} to {END}" free_entry: "Free entry" free_admission: "Free admission" - full_price: "Full price" + full_price: "Full price: " event_full: "Event full" - still_available: "Available place(s)" + still_available: "Available place(s): " + all_day: "All day" #projects gallery projects_list: the_fablab_projects: "The Fab Lab projects" @@ -258,7 +259,7 @@ en: subscription_confirmation: "Subscription confirmation" here_is_the_NAME_subscription_summary: "Here is the {NAME}'s subscription summary:" confirm_payment_of_html: "{ROLE, select, admin{Cash} other{Pay}}: {AMOUNT}" #(contexte : validate a payment of $20,00) - online_payment_disabled: "Payment by credit card is not available. Please contact the Fablab's reception directly." + online_payment_disabled: "Payment by credit card is not available. Please contact the FabLab's reception directly." #Fablab's events list events_list: the_fablab_s_events: "The Fablab's events" @@ -301,7 +302,7 @@ en: book: "Book" confirm_and_pay: "Confirm and pay" confirm_payment_of_html: "{ROLE, select, admin{Cash} other{Pay}}: {AMOUNT}" #(contexte : validate a payment of $20,00) - online_payment_disabled: "Payment by credit card is not available. Please contact the Fablab's reception directly." + online_payment_disabled: "Payment by credit card is not available. Please contact the FabLab's reception directly." please_select_a_member_first: "Please select a member first" change_the_reservation: "Change the reservation" you_can_shift_this_reservation_on_the_following_slots: "You can shift this reservation on the following slots:" @@ -311,15 +312,15 @@ en: delete_this_event: "Only this event" delete_this_and_next: "This event and the following" delete_all: "All events" - event_successfully_deleted: "Event successfully deleted" + event_successfully_deleted: "Event successfully deleted." events_deleted: "The event, and {COUNT, plural, =1{one other} other{{COUNT} others}}, have been deleted" unable_to_delete_the_event: "Unable to delete the event, it may be booked by a member" events_not_deleted: "On {TOTAL} events, {COUNT, plural, =1{one was not deleted} other{{COUNT} were not deleted}}. Some reservations may exists on {COUNT, plural, =1{it} other{them}}." cancel_the_reservation: "Cancel the reservation" do_you_really_want_to_cancel_this_reservation_this_apply_to_all_booked_tickets: "Do you really want to cancel this reservation? This apply to ALL booked tickets." - reservation_was_successfully_cancelled: "Reservation was successfully cancelled" + reservation_was_successfully_cancelled: "Reservation was successfully cancelled." cancellation_failed: "Cancellation failed." - event_is_over: "The event is over" + event_is_over: "The event is over." thanks_for_coming: "Thanks for coming!" view_event_list: "View events to come" share_on_facebook: "Share on Facebook" @@ -381,7 +382,7 @@ en: content: "Visualize at a glance everything that is scheduled for the next coming weeks (events, training, machines available, etc.)." projects: title: "Projects" - content: "

Document and share all your creations with the community.

If you use OpenLab, you will also be able to consult the projects of the entire Fab-Manager network. Contact-us to get your access, it's free!

" + content: "

Document and share all your creations with the community.

If you use OpenLab, you will also be able to consult the projects of the entire Fab-manager network. Contact-us to get your access, it's free!

" plans: title: "Subscriptions" content: "Subscriptions provide a way to segment your prices and provide benefits to regular users." @@ -399,13 +400,13 @@ en: content: "

Find your personal information here as well as all your activity on Fab-manager.

This space is also available for all your members.

" news: title: "News" - content: "

This space allows you to display the latest news from your structure.

You can easily change its content from [Customization]> [Home page].

" + content: "

This space allows you to display the latest news from your structure.

You can easily change its content from « Customization », « Home page».

" last_projects: title: "Last projects" content: "

This carousel scrolls through the latest projects documented by your members.

" last_tweet: title: "Last tweet" - content: "

Le dernier tweet de votre flux Twitter peut s'afficher ici.

Configure it from [Customization]> [Home page].

" + content: "

Le dernier tweet de votre flux Twitter peut s'afficher ici.

Configure it from « Customization », « Home page».

" last_members: title: "Last members" content: "The last registered members who have validated their address and agreed to be contacted will be shown here." diff --git a/config/locales/app.public.es.yml b/config/locales/app.public.es.yml index d18bd3860..b89d12222 100644 --- a/config/locales/app.public.es.yml +++ b/config/locales/app.public.es.yml @@ -151,6 +151,7 @@ es: full_price: "Precio final" event_full: "Evento lleno" still_available: "Available place(s)" + all_day: "Todo el día" #projects gallery projects_list: the_fablab_projects: "Los proyectos del FabLab" diff --git a/config/locales/app.public.fr.yml b/config/locales/app.public.fr.yml index 970e6fcf3..61cbe388c 100644 --- a/config/locales/app.public.fr.yml +++ b/config/locales/app.public.fr.yml @@ -102,7 +102,7 @@ fr: connection: "Connexion" password_forgotten: "Mot de passe oublié ?" confirm_my_account: "Confirmer mon adresse de courriel" - not_registered_to_the_fablab: "Vous n'êtes pas inscrit au FAB LAB ?" + not_registered_to_the_fablab: "Vous n'êtes pas inscrit au FabLab ?" create_an_account: "Créer un compte" wrong_email_or_password: "Adresse courriel ou mot de passe incorrect." caps_lock_is_on: "La touche de verrouillage des majuscules est activée." @@ -143,14 +143,15 @@ fr: #next events summary on the home page fablab_s_next_events: "Les prochains évènements du Fab Lab" every_events: "Tous les évènements" - from_date_to_date: "du {START} au {END}" - on_the_date: "le {DATE}" - from_time_to_time: "de {START} à {END}" + from_date_to_date: "Du {START} au {END}" + on_the_date: "Le {DATE}" + from_time_to_time: "De {START} à {END}" free_entry: "Accès libre" free_admission: "Entrée gratuite" full_price: "Plein tarif : " event_full: "Événement complet" still_available: "Place(s) disponible(s) :" + all_day: "Toute la journée" #projects gallery projects_list: the_fablab_projects: "Les projets du FabLab" diff --git a/config/locales/app.public.pt.yml b/config/locales/app.public.pt.yml index 85c146a2c..bc16d1f4f 100755 --- a/config/locales/app.public.pt.yml +++ b/config/locales/app.public.pt.yml @@ -151,6 +151,7 @@ pt: full_price: "Valor inteira" event_full: "Evento lotado" still_available: "Locais disponíveis" + all_day: "O dia inteiro" #projects gallery projects_list: the_fablab_projects: "Projetos do Fab Lab" diff --git a/config/locales/app.shared.en.yml b/config/locales/app.shared.en.yml index 3fd4ec76e..05358f586 100644 --- a/config/locales/app.shared.en.yml +++ b/config/locales/app.shared.en.yml @@ -214,7 +214,7 @@ en: user_profile: "User profile" warning_incomplete_user_profile_probably_imported_from_sso: "Warning: This user's profile is incomplete. As \"single sign-on\" (SSO) authentication is currently enabled, it may probably be an imported but non merged account. Do not modify it unless you know what your doing." group: "Group" - group_is_required: "Group is required" + group_is_required: "Group is required." trainings: "Trainings" tags: "Tags" #partial form to edit/create an authentication provider (SSO) @@ -308,10 +308,10 @@ en: to_credit: 'Credit' wallet_credit_successfully: "Wallet of user is credited successfully." a_problem_occurred_for_wallet_credit: "A problem is occurred while taking the credit of wallet" - amount_is_required: "The amount is required" + amount_is_required: "The amount is required." amount_minimum_1: "The amount minimum is 1" - amount_confirm_is_required: "The amount confirmation is required" - amount_confirm_does_not_match: "The amount confirmation does not match" + amount_confirm_is_required: "The amount confirmation is required." + amount_confirm_does_not_match: "The amount confirmation does not match." you_have_amount_in_wallet: "You have {amount} {currency} in your wallet" client_have_amount_in_wallet: "Client has {amount} {currency} in wallet" wallet_pay_reservation: "You can pay direct your reservation" @@ -415,7 +415,7 @@ en: confirm_payment_of_html: "{ROLE, select, admin{Payment on site} other{Pay}}: {AMOUNT}" #eg. confirm my payment of $20.00 a_problem_occurred_during_the_payment_process_please_try_again_later: "A problem occurred during the payment process. Please try again later." none: "None" - online_payment_disabled: "Online payment is not available. Please contact the Fablab reception directly." + online_payment_disabled: "Online payment is not available. Please contact the FabLab's reception directly." slot_restrict_plans: "This slot is restricted for the plans below:" slot_restrict_subscriptions_must_select_plan: "The slot is restricted for the subscribers. Please select a plan first." slot_restrict_plans_of_others_groups: "The slot is restricted for the subscribers of others groups." @@ -435,4 +435,4 @@ en: title: "Help" what_to_do: "What do you want to do?" tour: "Start the feature tour" - guide: "Open the user's manual" \ No newline at end of file + guide: "Open the user's manual"