diff options
| author | Henry Jameson <me@hjkos.com> | 2022-03-13 16:34:05 +0200 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2022-03-13 16:34:05 +0200 |
| commit | f16f35a4d43fa1f5a13b7e8c1cde85737f5d2f32 (patch) | |
| tree | 88b2d75843e2679c9392e46b4dbc2b52a3366a72 /src/i18n | |
| parent | 5930b667a147a194993dba604dd617f926bb9d31 (diff) | |
| parent | 51b14cc61578c6aee80fbf63dce2dbb7503914bb (diff) | |
Merge remote-tracking branch 'origin/develop' into expert-settings-and-serverside
* origin/develop:
Update dependency v-click-outside to v2.1.5
Update dependency shelljs to v0.8.5
Update dependency portal-vue to v2.1.7
Update dependency lodash to v4.17.21
Update dependency karma-spec-reporter to v0.0.33
Update dependency karma-webpack to v4.0.2
Update dependency karma-sourcemap-loader to v0.3.8
Update dependency eslint-plugin-vue to v5.2.3
Update dependency chromedriver to v87.0.7
Update dependency @chenfengyuan/vue-qrcode to v1.0.2
Pin dependencies
Pin dependencies
Do not mute bot posts in notifications
Lint
Add renovate.json
Add bot indication to user icon on statuses
Mute bot posts
fix placeholder attachments opening new tab
Diffstat (limited to 'src/i18n')
| -rw-r--r-- | src/i18n/en.json | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/i18n/en.json b/src/i18n/en.json index 05549682..61dd2538 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -354,6 +354,8 @@ "hide_attachments_in_tl": "Hide attachments in timeline", "hide_media_previews": "Hide media previews", "hide_muted_posts": "Hide posts of muted users", + "mute_bot_posts": "Mute bot posts", + "hide_bot_indication": "Hide bot indication in posts", "hide_all_muted_posts": "Hide muted posts", "max_thumbnails": "Maximum amount of thumbnails per post (empty = no limit)", "hide_isp": "Hide instance-specific panel", |