diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-01-12 15:57:34 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-01-12 15:57:34 +0100 |
| commit | 980c004f0601bbfaf440c0ea56de408ccfd79007 (patch) | |
| tree | 8ed051d5e8b9c530b3282cfd84e34e50b3bcfa57 /config/locales/doorkeeper.sv.yml | |
| parent | 180f1383943ad171d8394ef9af7c7861bfc08056 (diff) | |
| parent | 24cd2126c6cfb80844ef9ffbf61647b3d9afdc68 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `Gemfile.lock`: No real conflict, glitch-soc-only dependency (redcarpet) too close to an upstream one (rdf-normalize) - `README.md`: we have different READMEs, discarded upstream's changes - `app/views/admin/custom_emojis/index.html.haml`: No real conflict, different context because of glitch-soc theming - `lib/mastodon/statuses_cli.rb`: Upstream added code to keep bookmarked statuses, we were already doing so with slightly different code. Discarded upstream's changes. - `package.json`: No real conflict, glitch-soc-only dependency (favico.js) too close to an upstream one
Diffstat (limited to 'config/locales/doorkeeper.sv.yml')
| -rw-r--r-- | config/locales/doorkeeper.sv.yml | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/config/locales/doorkeeper.sv.yml b/config/locales/doorkeeper.sv.yml index 47b11b7fd..d9367ce5e 100644 --- a/config/locales/doorkeeper.sv.yml +++ b/config/locales/doorkeeper.sv.yml @@ -25,7 +25,7 @@ sv: edit: Redigera submit: Skicka confirmations: - destroy: Äre du säker? + destroy: Är du säker? edit: title: Redigera applikation form: @@ -38,6 +38,7 @@ sv: application: Applikation callback_url: Återkalls URL delete: Ta bort + empty: Du har inga program. name: Namn new: Ny applikation scopes: Omfattning @@ -120,16 +121,16 @@ sv: admin:write:accounts: utför alla aktiviteter för moderering på konton admin:write:reports: utför alla aktiviteter för moderering i rapporter follow: följa, blockera, ta bort blockerade och sluta följa konton - push: ta emot push aviseringar för ditt konto + push: ta emot push-aviseringar för ditt konto read: läsa dina kontodata read:accounts: se kontoinformation - read:blocks: se dina block + read:blocks: se dina blockeringar read:favourites: se dina favoriter read:filters: se dina filter read:follows: se vem du följer read:lists: se dina listor read:mutes: se dina tystningar - read:notifications: se dina notifieringar + read:notifications: se dina aviseringar read:reports: se dina rapporter read:search: sök å dina vägnar read:statuses: se alla statusar @@ -142,6 +143,6 @@ sv: write:lists: skapa listor write:media: ladda upp mediafiler write:mutes: tysta människor och konversationer - write:notifications: rensa dina notifieringar + write:notifications: rensa dina aviseringar write:reports: rapportera andra människor write:statuses: publicera statusar |