diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-05-16 09:42:32 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-05-16 09:42:32 +0200 |
| commit | 040b7d37a460e5f023f7654b1b619368cbbc24ea (patch) | |
| tree | 251a14cd362a6d98c1721e8f3f54fc386165e464 /app/javascript/mastodon/locales/en-GB.json | |
| parent | 94e98864e39c010635e839fea984f2b4893bef1a (diff) | |
| parent | c3fac61f56b3ad63534961f3d3c426cdf8ac6213 (diff) | |
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.
Diffstat (limited to 'app/javascript/mastodon/locales/en-GB.json')
| -rw-r--r-- | app/javascript/mastodon/locales/en-GB.json | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json index cf698618e..20f264f9d 100644 --- a/app/javascript/mastodon/locales/en-GB.json +++ b/app/javascript/mastodon/locales/en-GB.json @@ -264,6 +264,8 @@ "lightbox.expand": "Expand image view box", "lightbox.next": "Next", "lightbox.previous": "Previous", + "limited_account_hint.action": "Show profile anyway", + "limited_account_hint.title": "This profile has been hidden by the moderators of your server.", "lists.account.add": "Add to list", "lists.account.remove": "Remove from list", "lists.delete": "Delete list", |