diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2020-12-05 17:33:29 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2020-12-05 17:33:37 +0100 |
| commit | f8d867bac43e7e18d293ac32a9be597d1f46dce3 (patch) | |
| tree | b3d950a01a8dee5403081f56cf0c6b0571954e90 /config/locales/da.yml | |
| parent | 13df125b6c75923ccc21a5c57053e680cea75f38 (diff) | |
| parent | 44d5c6bc8ffd92cd201380dabe35748e50b6af68 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/services/remove_status_service.rb`: Conflict caused by us having a distinc Direct timeline. Ported upstream changes. - `app/javascript/mastodon/features/compose/components/compose_form.js`: Conflict between glitch-soc's variable character limit and upstream refactoring that part of the code. Ported upstream changes.
Diffstat (limited to 'config/locales/da.yml')
| -rw-r--r-- | config/locales/da.yml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config/locales/da.yml b/config/locales/da.yml index 984bd3cc4..c98404066 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -754,6 +754,7 @@ da: request: Anmod om dit arkiv size: Størrelse blocks: Du blokerer + bookmarks: Bogmærker csv: CSV domain_blocks: Domæne blokeringer lists: Lister @@ -816,6 +817,7 @@ da: success: Dine data blev succesfuldt uploaded og vil nu blive behandlet hurtigst muligt types: blocking: Blokeringsliste + bookmarks: Bogmærker domain_blocking: Domæne blokeringsliste following: Følgningsliste muting: Liste over dæmpninger @@ -941,6 +943,7 @@ da: unrecognized_emoji: er ikke en genkendt emoji relationships: activity: Aktivitet for konto + follow_selected_followers: Følg valgte følgere followers: Følgere following: Følger invited: Inviteret |