diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-11-12 13:28:03 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-11-12 13:28:03 +0100 |
| commit | 93912f04988eab072a119a588342c68c5cdb52e0 (patch) | |
| tree | 815a69053ed9f1eb5e86e62735220a53bfcef814 /config/locales/doorkeeper.oc.yml | |
| parent | d37f426f95f812b44925e13c00eabb9d1cd76b1f (diff) | |
| parent | d26c1cb2fe145b8d56a9c15e110a917e6f63068b (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/models/account.rb`: Conflict because we (glitch-soc) have disabled trending of posts without review. Discarded that upstream change. - `app/views/admin/settings/discovery/show.html.haml`: Just an extra setting in glitch-soc. Kept that extra setting.
Diffstat (limited to 'config/locales/doorkeeper.oc.yml')
| -rw-r--r-- | config/locales/doorkeeper.oc.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/locales/doorkeeper.oc.yml b/config/locales/doorkeeper.oc.yml index e45dd0245..d86fbe793 100644 --- a/config/locales/doorkeeper.oc.yml +++ b/config/locales/doorkeeper.oc.yml @@ -60,6 +60,7 @@ oc: error: title: I a agut un error new: + prompt_html: "%{client_name} volria l’autorizacion d’accedir a vòstre compte. Es una aplicacion tèrça.<strong>Se vos fisatz pas a ela, alara deuriatz pas l’autorizacion.</strong>" review_permissions: Repassar las autorizacions title: Cal l’autorizacion show: @@ -71,6 +72,7 @@ oc: revoke: Ne sètz segur ? index: authorized_at: Autorizada lo %{date} + description_html: Aquestas aplicacions pòdon accedir a vòstre compte via l’API. S’i a d’aplicacions que coneissètz pas aicí o qu’una aplicacion se compòrta pas coma cal, podètz revocar son accès. last_used_at: Darrièra utilizacion lo %{date} never_used: Pas jamai utilizada scopes: Autorizacions |