Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `app/services/remove_status_service.rb`:
  Conflict due to glitch-soc having extra code for a proper direct visibility
  timeline, in a part of the code upstream refactored.
  Restored glitch-soc's extra code in the refactored bit.
This commit is contained in:
Claire
2022-05-16 09:42:32 +02:00
163 changed files with 1785 additions and 991 deletions

View File

@@ -75,6 +75,14 @@
{
"defaultMessage": "Unmute notifications from @{name}",
"id": "account.unmute_notifications"
},
{
"defaultMessage": "Mute @{name}",
"id": "account.mute"
},
{
"defaultMessage": "Block @{name}",
"id": "account.block"
}
],
"path": "app/javascript/mastodon/components/account.json"
@@ -787,6 +795,19 @@
],
"path": "app/javascript/mastodon/features/account_timeline/components/header.json"
},
{
"descriptors": [
{
"defaultMessage": "This profile has been hidden by the moderators of your server.",
"id": "limited_account_hint.title"
},
{
"defaultMessage": "Show profile anyway",
"id": "limited_account_hint.action"
}
],
"path": "app/javascript/mastodon/features/account_timeline/components/limited_account_hint.json"
},
{
"descriptors": [
{
@@ -1888,6 +1909,10 @@
"defaultMessage": "Followers",
"id": "timeline_hint.resources.followers"
},
{
"defaultMessage": "Account suspended",
"id": "empty_column.account_suspended"
},
{
"defaultMessage": "Profile unavailable",
"id": "empty_column.account_unavailable"
@@ -1905,6 +1930,10 @@
"defaultMessage": "Follows",
"id": "timeline_hint.resources.follows"
},
{
"defaultMessage": "Account suspended",
"id": "empty_column.account_suspended"
},
{
"defaultMessage": "Profile unavailable",
"id": "empty_column.account_unavailable"