diff options
| author | beatrix <beatrix.bitrot@gmail.com> | 2017-09-09 20:11:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-09 20:11:48 -0400 |
| commit | 3dff74eecf5387b92b862893248710d2efb90eec (patch) | |
| tree | 0d29d8c952a0c62e7de4348a1d63963fd5eca237 /config/locales/doorkeeper.fr.yml | |
| parent | e18ed4bbc7ab4e258d05a3e2a5db0790f67a8f37 (diff) | |
| parent | 14e1fb8d36763e5255e7b8e440ecaf02208db004 (diff) | |
Merge pull request #141 from yipdw/sync/upstream
Sync with upstream @ v1.6.0rc3 ohhhhhhhhhhh heck here we go
Diffstat (limited to 'config/locales/doorkeeper.fr.yml')
| -rw-r--r-- | config/locales/doorkeeper.fr.yml | 29 |
1 files changed, 2 insertions, 27 deletions
diff --git a/config/locales/doorkeeper.fr.yml b/config/locales/doorkeeper.fr.yml index 0e74532c1..487018209 100644 --- a/config/locales/doorkeeper.fr.yml +++ b/config/locales/doorkeeper.fr.yml @@ -1,28 +1,14 @@ --- fr: - activemodel: - errors: - models: - remote_follow: - attributes: - acct: - blank: Le nom d’utilisateur ne doit pas être vide activerecord: attributes: doorkeeper/application: name: Nom redirect_uri: L’URL de redirection + scope: Portée + website: Site Web de l'application errors: - messages: - record_invalid: Données invalides models: - account: - attributes: - note: - too_long: Description trop longue - username: - blank: Identifiant vide - taken: Identifiant déjà pris doorkeeper/application: attributes: redirect_uri: @@ -30,17 +16,6 @@ fr: invalid_uri: doit être une URL valide. relative_uri: doit être une URL absolue. secured_uri: doit être une URL HTTP/SSL. - user: - attributes: - email: - blank: Courriel vide - invalid: Courriel invalide - taken: Courriel pris - password: - blank: Mot de passe vide - too_short: Mot de passe trop court - password_confirmation: - confirmation: Le mot de passe ne correspond pas doorkeeper: applications: buttons: |