Merge branch 'develop' into xenofem/pleroma-fe-rebased-image-description-authoring

This commit is contained in:
Shpuld Shpuldson 2020-06-29 15:19:41 +03:00
commit 79011e02ef
4 changed files with 103 additions and 61 deletions

View file

@ -637,7 +637,11 @@
"status_unavailable": "Status unavailable",
"copy_link": "Copy link to status",
"thread_muted": "Thread muted",
"thread_muted_and_words": ", has words:"
"thread_muted_and_words": ", has words:",
"show_full_subject": "Show full subject",
"hide_full_subject": "Hide full subject",
"show_content": "Show content",
"hide_content": "Hide content"
},
"user_card": {
"approve": "Approve",

View file

@ -476,7 +476,14 @@
"backend_version": "Backend Versie",
"title": "Versie"
},
"mutes_and_blocks": "Negeringen en Blokkades"
"mutes_and_blocks": "Negeringen en Blokkades",
"profile_fields": {
"value": "Inhoud",
"name": "Label",
"add_field": "Veld Toevoegen",
"label": "Profiel metadata"
},
"bot": "Dit is een bot account"
},
"timeline": {
"collapse": "Inklappen",