diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-07-17 22:07:20 +0200 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2022-07-17 22:07:20 +0200 |
commit | cd87d7dcef814ad86fb15334680cb0e3232437a9 (patch) | |
tree | 63db8838568ea440bb3cb9797cdbaf5c4952e9e7 /app/javascript/mastodon/locales/defaultMessages.json | |
parent | 9094c2f52c24e1c00b594e7c11cd00e4a07eb431 (diff) | |
parent | c3f0621a59a74d0e20e6db6170894871c48e8f0f (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
- `.env.production.sample`: Our sample config file is very different from upstream since it is much more complete. Upstream added documentation for a few env variables. Copied the new variables/documentation from upstream. - `app/lib/feed_manager.rb`: Upstream added a timeline type (hashtags), while glitch-soc already had an extra one (direct messages). Not really a conflict but textually close changes. Ported upstream's changes. - `app/models/custom_emoji.rb`: Upstream upped the custom emoji size limit, while glitch-soc had configurable limits. Upped the default limits accordingly. - `streaming/index.js`: Upstream reworked how hastags were normalized. Minor conflict due to glitch-soc's handling of instance-local posts. Ported upstream's changes.
Diffstat (limited to 'app/javascript/mastodon/locales/defaultMessages.json')
-rw-r--r-- | app/javascript/mastodon/locales/defaultMessages.json | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json index 8c46acf6d..9027c98bb 100644 --- a/app/javascript/mastodon/locales/defaultMessages.json +++ b/app/javascript/mastodon/locales/defaultMessages.json @@ -613,6 +613,10 @@ "id": "status.copy" }, { + "defaultMessage": "Hide toot", + "id": "status.hide" + }, + { "defaultMessage": "Block domain {domain}", "id": "account.block_domain" }, @@ -679,6 +683,10 @@ "id": "status.filtered" }, { + "defaultMessage": "Show anyway", + "id": "status.show_filter_reason" + }, + { "defaultMessage": "Pinned post", "id": "status.pinned" }, |