diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-05-07 19:51:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-07 19:51:00 +0200 |
| commit | 50f8ee2e07e0a8a0ab8971543cb6544c8d6c5f5d (patch) | |
| tree | 2d0f4954a3077e3e0bb2d02f671af41b69672e2a /config/locales/activerecord.fr.yml | |
| parent | a346912030012dc1451249373ff7ef1a61016517 (diff) | |
| parent | e08b31a70624fe069d2f26bf2078a69e2d48f6aa (diff) | |
Merge pull request #1526 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/locales/activerecord.fr.yml')
| -rw-r--r-- | config/locales/activerecord.fr.yml | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/config/locales/activerecord.fr.yml b/config/locales/activerecord.fr.yml index e26e02592..47cd8765d 100644 --- a/config/locales/activerecord.fr.yml +++ b/config/locales/activerecord.fr.yml @@ -5,13 +5,28 @@ fr: poll: expires_at: Date butoir options: Choix + user: + agreement: Contrat de service + email: Adresse courriel + locale: Langue + password: Mot de passe + user/account: + username: Nom d’utilisateur·ice + user/invite_request: + text: Raison errors: models: account: attributes: username: invalid: seulement des lettres, des nombres et des tirets bas + reserved: est réservé status: attributes: reblog: taken: du statut existe déjà + user: + attributes: + email: + blocked: utilise un fournisseur de courriel interdit + unreachable: ne semble pas exister |