diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-11-20 15:36:09 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-11-20 15:36:09 +0100 |
| commit | ff67385cfbfd6f5403b2f8b58407dc730dc7e694 (patch) | |
| tree | a8a0df2129a863a739dda6399352d64af811110e /config/locales/doorkeeper.fr.yml | |
| parent | 707c4918b21d19dd53b64120dbc7263f45fc5ecd (diff) | |
| parent | 8dfc45f757ed8995be0d16e88a1f1d6514dae677 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - README.md discarded upstream changes - app/controllers/api/v1/bookmarks_controller.rb finally merged upstream, some code style fixes and slightly changed pagination code - app/controllers/application_controller.rb changed upstream to always return HTML error pages slight conflict caused by theming code - app/models/bookmark.rb finally merged upstream, no real conflict - spec/controllers/api/v1/bookmarks_controller_spec.rb finally merged upstream, slightly changed pagination code
Diffstat (limited to 'config/locales/doorkeeper.fr.yml')
| -rw-r--r-- | config/locales/doorkeeper.fr.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/locales/doorkeeper.fr.yml b/config/locales/doorkeeper.fr.yml index 09908b89a..5dc13af87 100644 --- a/config/locales/doorkeeper.fr.yml +++ b/config/locales/doorkeeper.fr.yml @@ -121,7 +121,7 @@ fr: admin:write:accounts: effectuer des actions de modération sur les comptes admin:write:reports: effectuer des actions de modération sur les singnalements follow: modifier les relations avec les comptes - push: recevoir vos notifications + push: recevoir vos notifications poussées read: lire toutes les données de votre compte read:accounts: voir les informations du compte read:blocks: voir vos bloquages |