diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-10-25 20:28:51 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2021-10-25 20:28:51 +0200 |
| commit | e855df149bd2f19729af48cd5f452fa3972273f8 (patch) | |
| tree | 4d9dab4fd4568f67b07642db61a2f382e8b1dcc0 /config/locales/doorkeeper.gd.yml | |
| parent | c647fa99cab9b9db81d36223cf2c2c27e065b648 (diff) | |
| parent | 5ba46952af87e42a64962a34f7ec43bc710bdcaf (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `.env.production.sample`: Upstream added new configuration options, uncommented by default. Commented them. - `Gemfile.lock`: Upstream updated dependencies textually close to glitch-soc-specific dependencies. Updated those upstream dependencies.
Diffstat (limited to 'config/locales/doorkeeper.gd.yml')
| -rw-r--r-- | config/locales/doorkeeper.gd.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/locales/doorkeeper.gd.yml b/config/locales/doorkeeper.gd.yml index 4b3bccf67..0ca8dfa23 100644 --- a/config/locales/doorkeeper.gd.yml +++ b/config/locales/doorkeeper.gd.yml @@ -33,7 +33,7 @@ gd: help: native_redirect_uri: Cleachd %{native_redirect_uri} gus a chur fo dheuchainn gu h-ionadail redirect_uri: Cleachd loidhne fa leth do gach URI - scopes: Sgar sgòpaichean le beàrnan. Fàg seo bàn airson nan sgòpaichean tùsail a chleachdadh. + scopes: Sgar sgòpaichean le beàrnan. Fàg seo bàn airson nan sgòpaichean bunaiteach a chleachdadh. index: application: Aplacaid callback_url: URL gairm air ais |