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.co.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.co.yml')
| -rw-r--r-- | config/locales/doorkeeper.co.yml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config/locales/doorkeeper.co.yml b/config/locales/doorkeeper.co.yml index d45041a4e..4f03c0c32 100644 --- a/config/locales/doorkeeper.co.yml +++ b/config/locales/doorkeeper.co.yml @@ -38,6 +38,7 @@ co: application: Applicazione callback_url: URL di richjama delete: Toglie + empty: Ùn avete micca d'applicazione. name: Nome new: Applicazione nova scopes: Scopi @@ -125,6 +126,7 @@ co: read: leghje tutte l’infurmazioni di u vostru contu read:accounts: Vede l'infurmazione di i conti read:blocks: vede i vostri blucchimi + read:bookmarks: vede i vostri segnalibri read:favourites: vede i vostri favuriti read:filters: vede i vostri filtri read:follows: vede i vostri abbunamenti @@ -137,6 +139,7 @@ co: write: mudificà i dati di u vostru contu write:accounts: mudificà u prufile write:blocks: bluccà conti è dumini + write:bookmarks: segnà statuti write:favourites: aghjustà statuti à i favuriti write:filters: creà filtri write:follows: siguità conti |