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.de.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.de.yml')
| -rw-r--r-- | config/locales/doorkeeper.de.yml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config/locales/doorkeeper.de.yml b/config/locales/doorkeeper.de.yml index c41a847b2..8b850b56a 100644 --- a/config/locales/doorkeeper.de.yml +++ b/config/locales/doorkeeper.de.yml @@ -38,6 +38,7 @@ de: application: Anwendung callback_url: Callback-URL delete: Löschen + empty: Du hast keine Anwendungen. name: Name new: Neue Anwendung scopes: Befugnisse @@ -125,6 +126,7 @@ de: read: all deine Daten lesen read:accounts: deine Konteninformationen einsehen read:blocks: deine Blockaden einsehen + read:bookmarks: deine Lesezeichen lesen read:favourites: deine Favoriten ansehen read:filters: deine Filter ansehen read:follows: sehen, wem du folgst @@ -137,6 +139,7 @@ de: write: all deine Benutzerdaten verändern write:accounts: dein Profil bearbeiten write:blocks: Domains und Konten blockieren + write:bookmarks: Lesezeichen hinzufügen write:favourites: Beiträge favorisieren write:filters: Filter erstellen write:follows: Leuten folgen |