tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Thibaut Girka
2020-04-04 21:47:37 +02:00
parent 5c5317041f d3ff06a320
commit 8fef96cbf5
18 changed files with 215 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/javascript/mastodon/locales/defaultMessages.json
View File

@ -1532,6 +1532,10 @@
{
"defaultMessage": "You don't have any follow requests yet. When you receive one, it will show up here.",
"id": "empty_column.follow_requests"
},
{
"defaultMessage": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
"id": "follow_requests.unlocked_explanation"
}
],
"path": "app/javascript/mastodon/features/follow_requests/index.json"
@ -2961,4 +2965,4 @@
],
"path": "app/javascript/mastodon/features/video/index.json"
}
]
]

1
app/javascript/mastodon/locales/en.json
View File

@ -168,6 +168,7 @@
"errors.unexpected_crash.report_issue": "Report issue",
"follow_request.authorize": "Authorize",
"follow_request.reject": "Reject",
"follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
"getting_started.developers": "Developers",
"getting_started.directory": "Profile directory",
"getting_started.documentation": "Documentation",