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.oc.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.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 e715cc7d5..749a49a4c 100644 --- a/config/locales/doorkeeper.oc.yml +++ b/config/locales/doorkeeper.oc.yml @@ -125,6 +125,7 @@ oc: read: legir totas las donadas de vòstre compte read:accounts: veire las informacions del compte read:blocks: veire vòstres blocatges + read:bookmarks: veire vòstres marcadors read:favourites: veire vòstres favorits read:filters: veire vòstres filtres read:follows: veire vòstres abonaments @@ -137,6 +138,7 @@ oc: write: modificar totas las donadas de vòstre compte write:accounts: modificar vòstre perfil write:blocks: blocar de comptes e de domenis + write:bookmarks: ajustar als marcadors write:favourites: metre en favorit write:filters: crear de filtres write:follows: sègre de monde |