diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-01-10 09:18:05 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2023-01-10 09:39:15 +0100 |
| commit | 9765d2b3f8192ff8a8c1bc90faf5f87331a26118 (patch) | |
| tree | 1325b4c03508ebc650af429e23f873b2aa5decde /app/javascript/mastodon/locales/en.json | |
| parent | ad17e1944aa4c01c5637199b464c9d78b7e54af2 (diff) | |
| parent | aefefc74c468ffd90e3ac97bfed5973717138759 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `config/environments/production.rb`: Upstream changed headers, and we have different ones. Ported upstream's change.
Diffstat (limited to 'app/javascript/mastodon/locales/en.json')
| -rw-r--r-- | app/javascript/mastodon/locales/en.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json index d0fa1022c..9db0f3eb7 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -132,7 +132,7 @@ "compose.language.search": "Search languages...", "compose_form.direct_message_warning_learn_more": "Learn more", "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any sensitive information over Mastodon.", - "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.", + "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is not public. Only public posts can be searched by hashtag.", "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.", "compose_form.lock_disclaimer.lock": "locked", "compose_form.placeholder": "What's on your mind?", @@ -547,6 +547,7 @@ "sign_in_banner.sign_in": "Sign in", "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts, or interact from your account on a different server.", "status.admin_account": "Open moderation interface for @{name}", + "status.admin_domain": "Open moderation interface for {domain}", "status.admin_status": "Open this post in the moderation interface", "status.block": "Block @{name}", "status.bookmark": "Bookmark", |