From d90d23699ca611f05d8def40109505251507fa46 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Wed, 12 Apr 2017 17:11:49 +0200 Subject: Make Reporting admin section translatable (#1549) * Make Reporting admin section translatable And translate it into english and french Signed-off-by: Thomas Citharel * Make subject of emails translatable and improve french translation Signed-off-by: Thomas Citharel * Make error pages translatable and translate them in english and french Signed-off-by: Thomas Citharel * Translate site setting section * Insert instance in registration emails and improve them a bit Signed-off-by: Thomas Citharel --- config/locales/devise.en.yml | 2 +- config/locales/devise.fr.yml | 6 +++--- config/locales/en.yml | 51 ++++++++++++++++++++++++++++++++++++++++++++ config/locales/fr.yml | 51 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 106 insertions(+), 4 deletions(-) (limited to 'config/locales') diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml index 442e70d51..b9204b59c 100644 --- a/config/locales/devise.en.yml +++ b/config/locales/devise.en.yml @@ -17,7 +17,7 @@ en: unconfirmed: You have to confirm your email address before continuing. mailer: confirmation_instructions: - subject: 'Mastodon: Confirmation instructions' + subject: 'Mastodon: Confirmation instructions for %{instance}' password_change: subject: 'Mastodon: Password changed' reset_password_instructions: diff --git a/config/locales/devise.fr.yml b/config/locales/devise.fr.yml index a986113e2..d1dae7c32 100644 --- a/config/locales/devise.fr.yml +++ b/config/locales/devise.fr.yml @@ -17,13 +17,13 @@ fr: unconfirmed: Vous devez valider votre compte pour continuer. mailer: confirmation_instructions: - subject: Instructions de confirmation + subject: "Merci de confirmer votre inscription sur %{instance}" password_change: subject: Votre mot de passe a été modifié avec succés. reset_password_instructions: - subject: Instructions pour modifier le mot de passe + subject: Instructions pour changer votre mot de passe unlock_instructions: - subject: Instructions pour déverrouiller le compte + subject: Instructions pour déverrouiller votre compte omniauth_callbacks: failure: 'Nous n''avons pas pu vous authentifier via %{kind} : ''%{reason}''.' success: Authentifié avec succès via %{kind}. diff --git a/config/locales/en.yml b/config/locales/en.yml index 6c4738991..802db148c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -170,3 +170,54 @@ en: users: invalid_email: The e-mail address is invalid invalid_otp_token: Invalid two-factor code + will_paginate: + page_gap: "…" + errors: + 404: The page you were looking for doesn't exist. + 410: The page you were looking for doesn't exist anymore. + 422: + title: Security verification failed + content: Security verification failed. Are you blocking cookies? + reports: + reports: Reports + status: Status + unresolved: Unresolved + resolved: Resolved + id: ID + target: Target + reported_by: Reported by + comment: + label: Comment + none: None + view: View + report: "Report #%{id}" + delete: Delete + reported_account: Reported account + reported_by: Signalé par + silence_account: Silence account + suspend_account: Suspend account + mark_as_resolved: Mark as resolved + admin: + settings: + title: Site Settings + setting: Setting + click_to_edit: Click to edit + contact_information: + label: Contact information + username: Enter a username + email: Enter a public e-mail address + site_title: Site title + site_description: + title: Site description + desc_html: "Displayed as a paragraph on the frontpage and used as a meta tag.
You can use HTML tags, in particular <a> and <em>." + site_description_extended: + title: Extended site description + desc_html: "Displayed on extended information page
You can use HTML tags" + registrations: + open: + title: Open registration + enabled: Enabled + disabled: Disabled + closed_message: + title: Closed registration message + desc_html: "Displayed on frontpage when registrations are closed
You can use HTML tags" diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 92cf43944..86dc13d5a 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -167,3 +167,54 @@ fr: users: invalid_email: L'adresse courriel est invalide invalid_otp_token: Le code d'authentification à deux facteurs est invalide + will_paginate: + page_gap: "…" + errors: + 404: La page que vous recherchez n'existe pas. + 410: La page que vous recherchez n'existe plus. + 422: + title: Vérification de sécurité échouée + content: Vérification de sécurité échouée. Bloquez-vous les cookies ? + reports: + reports: Signalements + status: Statut + unresolved: Non résolus + resolved: Résolus + id: ID + target: Cible + reported_by: Signalé par + comment: + label: Commentaire + none: Aucun + view: Voir + report: "Signalement #%{id}" + delete: Supprimer + reported_account: Compte signalé + reported_by: Signalé par + silence_account: Rendre le compte muet + suspend_account: Suspendre le compte + mark_as_resolved: Marqué comme résolu + admin: + settings: + title: Paramètres du site + setting: Paramètre + click_to_edit: Cliquez pour éditer + contact_information: + label: Informations de contact + username: Entrez un nom d'utilisateur + email: Entrez une adresse courriel publique + site_title: Titre du site + site_description: + title: Description du site + desc_html: "Affichée sous la forme d'un paragraphe sur la page d'accueil et utilisée comme balise meta.
Vous pouvez utiliser des balises HTML, en particulier <a> et <em>." + site_description_extended: + title: Description étendue du site + desc_html: "Affichée sur la page d'informations complémentaires du site
Vous pouvez utiliser des balises HTML" + registrations: + open: + title: Inscriptions + enabled: Activées + disabled: Désactivées + closed_message: + title: Message de fermeture des inscriptions + desc_html: "Affiché sur la page d'accueil lorsque les inscriptions sont fermées
Vous pouvez utiliser des balises HTML" -- cgit