Merge branch '812-subject-separation' into 'develop'

StatusContent: Better separate subject from status content.

Closes #812

See merge request pleroma/pleroma-fe!1150
This commit is contained in:
lain 2020-06-29 07:53:12 +00:00
commit 82944f862d
3 changed files with 95 additions and 60 deletions

View file

@ -636,7 +636,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",