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.fi.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.fi.yml')
| -rw-r--r-- | config/locales/doorkeeper.fi.yml | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/config/locales/doorkeeper.fi.yml b/config/locales/doorkeeper.fi.yml index 10613d435..abe1a96b2 100644 --- a/config/locales/doorkeeper.fi.yml +++ b/config/locales/doorkeeper.fi.yml @@ -72,6 +72,7 @@ fi: index: application: Sovellus created_at: Valtuutettu + date_format: "%d/%m/%Y %H:%M:%S" scopes: Oikeudet title: Valtuutetut sovellukset errors: @@ -113,6 +114,17 @@ fi: application: title: OAuth-valtuutus tarvitaan scopes: + admin:read: lukea kaikkia tietoja palvelimelta + admin:read:accounts: lukea arkaluontoista sisältöä kaikista tileistä + admin:write: muokata kaikkia tietoja palvelimella follow: seurata, estää, perua eston ja lopettaa tilien seuraaminen + push: vastaanottaa push-ilmoituksesi read: lukea tilin tietoja + read:accounts: nähdä tilin tiedot write: julkaista puolestasi + write:accounts: muokata profiiliasi + write:filters: luoda suodattimia + write:follows: seurata ihmisiä + write:lists: luoda listoja + write:media: lähettää mediatiedostoja + write:notifications: tyhjentää ilmoituksesi |