diff --git a/.bundler-audit.yml b/.bundler-audit.yml
deleted file mode 100644
index f84ec80872..0000000000
--- a/.bundler-audit.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-ignore:
-  - CVE-2015-9284 # Mitigation following https://github.com/omniauth/omniauth/wiki/Resolving-CVE-2015-9284#mitigating-in-rails-applications
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 17208a84e9..ce14169aae 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,31 +1,29 @@
-// For more details, see https://aka.ms/devcontainer.json.
 {
   "name": "Mastodon",
   "dockerComposeFile": "docker-compose.yml",
   "service": "app",
   "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
 
-  // Features to add to the dev container. More info: https://containers.dev/features.
   "features": {
     "ghcr.io/devcontainers/features/sshd:1": {}
   },
 
-  // Use 'forwardPorts' to make a list of ports inside the container available locally.
-  // This can be used to network with other containers or the host.
+  "runServices": ["app", "db", "redis"],
+
   "forwardPorts": [3000, 4000],
 
-  // Use 'postCreateCommand' to run commands after the container is created.
+  "containerEnv": {
+    "ES_ENABLED": "",
+    "LIBRE_TRANSLATE_ENDPOINT": ""
+  },
+
   "onCreateCommand": "git config --global --add safe.directory ${containerWorkspaceFolder}",
   "postCreateCommand": ".devcontainer/post-create.sh",
   "waitFor": "postCreateCommand",
 
-  // Configure tool-specific properties.
   "customizations": {
-    // Configure properties specific to VS Code.
     "vscode": {
-      // Set *default* container specific settings.json values on container create.
       "settings": {},
-      // Add the IDs of extensions you want installed when the container is created.
       "extensions": ["EditorConfig.EditorConfig", "webben.browserslist"]
     }
   }
diff --git a/.env.vagrant b/.env.vagrant
index 32ed9b9229..69c1bf1fb3 100644
--- a/.env.vagrant
+++ b/.env.vagrant
@@ -2,3 +2,7 @@ VAGRANT=true
 LOCAL_DOMAIN=mastodon.local
 BIND=0.0.0.0
 DB_HOST=/var/run/postgresql/
+
+ES_ENABLED=true
+ES_HOST=localhost
+ES_PORT=9200
\ No newline at end of file
diff --git a/.github/renovate.json5 b/.github/renovate.json5
index 78530d65b4..879a564e1c 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -1,20 +1,21 @@
 {
   $schema: 'https://docs.renovatebot.com/renovate-schema.json',
   extends: [
-    'config:base',
-    ':dependencyDashboard',
+    'config:recommended',
     ':labels(dependencies)',
     ':maintainLockFilesMonthly', // update non-direct dependencies monthly
-    ':prConcurrentLimit10', // only 10 open PRs at the same time
+    ':prConcurrentLimitNone', // Remove limit for open PRs at any time.
+    ':prHourlyLimit2', // Rate limit PR creation to a maximum of two per hour.
   ],
-  stabilityDays: 3, // Wait 3 days after the package has been published before upgrading it
+  minimumReleaseAge: '3', // Wait 3 days after the package has been published before upgrading it
   // packageRules order is important, they are applied from top to bottom and are merged,
   // meaning the most important ones must be at the bottom, for example grouping rules
   // If we do not want a package to be grouped with others, we need to set its groupName
   // to `null` after any other rule set it to something.
+  dependencyDashboardHeader: 'This issue lists Renovate updates and detected dependencies. Read the [Dependency Dashboard](https://docs.renovatebot.com/key-concepts/dashboard/) docs to learn more. Before approving any upgrade: read the description and comments in the [`renovate.json5` file](https://github.com/mastodon/mastodon/blob/main/.github/renovate.json5).',
   packageRules: [
     {
-      // Ignore major version bumps for these node packages
+      // Require Dependency Dashboard Approval for major version bumps of these node packages
       matchManagers: ['npm'],
       matchPackageNames: [
         'tesseract.js', // Requires code changes
@@ -41,10 +42,10 @@
         'react-router-dom',
       ],
       matchUpdateTypes: ['major'],
-      enabled: false,
+      dependencyDashboardApproval: true,
     },
     {
-      // Ignore major version bumps for these Ruby packages
+      // Require Dependency Dashboard Approval for major version bumps of these Ruby packages
       matchManagers: ['bundler'],
       matchPackageNames: [
         'rack', // Needs to be synced with Rails version
@@ -55,7 +56,7 @@
         'redis', // Requires manual upgrade and sync with Sidekiq version
       ],
       matchUpdateTypes: ['major'],
-      enabled: false,
+      dependencyDashboardApproval: true,
     },
     {
       // Update Github Actions and Docker images weekly
@@ -63,25 +64,25 @@
       extends: ['schedule:weekly'],
     },
     {
-      // Ignore major & minor bumps for the ruby image, this needs to be synced with .ruby-version
+      // Require Dependency Dashboard Approval for major & minor bumps for the ruby image, this needs to be synced with .ruby-version
       matchManagers: ['dockerfile'],
       matchPackageNames: ['moritzheiber/ruby-jemalloc'],
       matchUpdateTypes: ['minor', 'major'],
-      enabled: false,
+      dependencyDashboardApproval: true,
     },
     {
-      // Ignore major bump for the node image, this needs to be synced with .nvmrc
+      // Require Dependency Dashboard Approval for major bumps for the node image, this needs to be synced with .nvmrc
       matchManagers: ['dockerfile'],
       matchPackageNames: ['node'],
       matchUpdateTypes: ['major'],
-      enabled: false,
+      dependencyDashboardApproval: true,
     },
     {
-      // Ignore major postgres bumps in the docker-compose file, as those break dev environments
+      // Require Dependency Dashboard Approval for major postgres bumps in the docker-compose file, as those break dev environments
       matchManagers: ['docker-compose'],
       matchPackageNames: ['postgres'],
       matchUpdateTypes: ['major'],
-      enabled: false,
+      dependencyDashboardApproval: true,
     },
     {
       // Update devDependencies every week, with one grouped PR
diff --git a/.github/workflows/build-nightly.yml b/.github/workflows/build-nightly.yml
index fe3dc5b187..a3ae671d67 100644
--- a/.github/workflows/build-nightly.yml
+++ b/.github/workflows/build-nightly.yml
@@ -16,7 +16,7 @@ jobs:
         env:
           TZ: Etc/UTC
         run: |
-          echo mastodon_version_suffix=nightly-$(date +'%Y-%m-%d')>> $GITHUB_OUTPUT
+          echo mastodon_version_suffix=nightly.$(date +'%Y-%m-%d')>> $GITHUB_OUTPUT
     outputs:
       suffix: ${{ steps.version_vars.outputs.mastodon_version_suffix }}
 
@@ -28,8 +28,8 @@ jobs:
       use_native_arm64_builder: false
       push_to_images: |
         ghcr.io/${{ github.repository_owner }}/mastodon
-      # The `+` is important here, result will be v4.1.2+nightly-2022-03-05
-      version_suffix: +${{ needs.compute-suffix.outputs.suffix }}
+      # The `-` is important here, result will be v4.1.2-nightly.2022-03-05
+      version_suffix: -${{ needs.compute-suffix.outputs.suffix }}
       labels: |
         org.opencontainers.image.description=Nightly build image used for testing purposes
       flavor: |
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index bd1758f783..55583e5f83 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --auto-gen-only-exclude --no-exclude-limit --no-offense-counts --no-auto-gen-timestamp`
-# using RuboCop version 1.54.2.
+# using RuboCop version 1.56.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -61,38 +61,8 @@ Lint/EmptyBlock:
     - 'spec/fabricators/access_token_fabricator.rb'
     - 'spec/fabricators/conversation_fabricator.rb'
     - 'spec/fabricators/system_key_fabricator.rb'
-    - 'spec/helpers/admin/action_logs_helper_spec.rb'
     - 'spec/lib/activitypub/adapter_spec.rb'
-    - 'spec/models/account_alias_spec.rb'
-    - 'spec/models/account_deletion_request_spec.rb'
-    - 'spec/models/account_moderation_note_spec.rb'
-    - 'spec/models/announcement_mute_spec.rb'
-    - 'spec/models/announcement_reaction_spec.rb'
-    - 'spec/models/announcement_spec.rb'
-    - 'spec/models/backup_spec.rb'
-    - 'spec/models/conversation_mute_spec.rb'
-    - 'spec/models/custom_filter_keyword_spec.rb'
-    - 'spec/models/custom_filter_spec.rb'
-    - 'spec/models/device_spec.rb'
-    - 'spec/models/encrypted_message_spec.rb'
-    - 'spec/models/featured_tag_spec.rb'
-    - 'spec/models/follow_recommendation_suppression_spec.rb'
-    - 'spec/models/list_account_spec.rb'
-    - 'spec/models/list_spec.rb'
-    - 'spec/models/login_activity_spec.rb'
-    - 'spec/models/mute_spec.rb'
-    - 'spec/models/preview_card_spec.rb'
-    - 'spec/models/preview_card_trend_spec.rb'
-    - 'spec/models/relay_spec.rb'
-    - 'spec/models/scheduled_status_spec.rb'
-    - 'spec/models/status_stat_spec.rb'
-    - 'spec/models/status_trend_spec.rb'
-    - 'spec/models/system_key_spec.rb'
-    - 'spec/models/tag_follow_spec.rb'
-    - 'spec/models/unavailable_domain_spec.rb'
-    - 'spec/models/user_invite_request_spec.rb'
     - 'spec/models/user_role_spec.rb'
-    - 'spec/models/web/setting_spec.rb'
 
 Lint/NonLocalExitFromIterator:
   Exclude:
@@ -135,7 +105,7 @@ Lint/UselessAssignment:
 
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 143
+  Max: 144
   Exclude:
     - 'app/serializers/initial_state_serializer.rb'
 
@@ -166,6 +136,19 @@ Naming/VariableNumber:
     - 'spec/models/domain_block_spec.rb'
     - 'spec/models/user_spec.rb'
 
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: SafeMultiline.
+Performance/DeletePrefix:
+  Exclude:
+    - 'app/models/featured_tag.rb'
+
+Performance/MapMethodChain:
+  Exclude:
+    - 'app/models/feed.rb'
+    - 'lib/mastodon/cli/maintenance.rb'
+    - 'spec/services/bulk_import_service_spec.rb'
+    - 'spec/services/import_service_spec.rb'
+
 RSpec/AnyInstance:
   Exclude:
     - 'spec/controllers/activitypub/inboxes_controller_spec.rb'
@@ -765,6 +748,15 @@ Style/RedundantFetchBlock:
     - 'config/initializers/paperclip.rb'
     - 'config/puma.rb'
 
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowMultipleReturnValues.
+Style/RedundantReturn:
+  Exclude:
+    - 'app/controllers/api/v1/directories_controller.rb'
+    - 'app/controllers/auth/confirmations_controller.rb'
+    - 'app/lib/ostatus/tag_manager.rb'
+    - 'app/models/form/import.rb'
+
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: ConvertCodeThatCanStartToReturnNil, AllowedMethods, MaxChainLength.
 # AllowedMethods: present?, blank?, presence, try, try!
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9fe1ac3803..107dfaca3f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,259 @@
 
 All notable changes to this project will be documented in this file.
 
+## [4.2.0] - UNRELEASED
+
+The following changelog entries focus on changes visible to users, administrators, client developers or federated software developers, but there has also been a lot of code modernization, refactoring, and tooling work, in particular by [@danielmbrasil](https://github.com/danielmbrasil), [@mjankowski](https://github.com/mjankowski), [@nschonni](https://github.com/nschonni), [@renchap](https://github.com/renchap), and [@takayamaki](https://github.com/takayamaki).
+
+### Added
+
+- **Add “Privacy and reach” tab in profile settings** ([Gargron](https://github.com/mastodon/mastodon/pull/26484), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/26508))
+  This reorganized scattered privacy and reach settings to a single place, as well as improve their wording.
+- **Add display of out-of-band hashtags in the web interface** ([Gargron](https://github.com/mastodon/mastodon/pull/26492), [arbolitoloco1](https://github.com/mastodon/mastodon/pull/26497), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/26506), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/26525))
+- **Add role badges to the web interface** ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/25649), [Gargron](https://github.com/mastodon/mastodon/pull/26281))
+- **Add ability to pick domains to forward reports to using the `forward_to_domains` parameter in `POST /api/v1/reports`** ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/25866))
+  The `forward_to_domains` REST API parameter is a list of strings. If it is empty or omitted, the previous behavior is maintained.
+  The `forward` parameter still needs to be set for `forward_to_domains` to be taken into account.
+  The forwarded-to domains can only include that of the original author and people being replied to.
+- **Add forwarding of reported replies to servers being replied to** ([Gargron](https://github.com/mastodon/mastodon/pull/25341), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/26189))
+- Add direct link to the Single-Sign On provider if there is only one sign up method available ([CSDUMMI](https://github.com/mastodon/mastodon/pull/26083), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/26368))
+- **Add webhook templating** ([Gargron](https://github.com/mastodon/mastodon/pull/23289))
+- **Add webhooks for local `status.created`, `status.updated`, `account.updated` and `report.updated`** ([VyrCossont](https://github.com/mastodon/mastodon/pull/24133), [VyrCossont](https://github.com/mastodon/mastodon/pull/24243), [VyrCossont](https://github.com/mastodon/mastodon/pull/24211))
+- **Add exclusive lists** ([dariusk](https://github.com/mastodon/mastodon/pull/22048), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/25324))
+- **Add a confirmation screen when suspending a domain** ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/25144), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/25603))
+- **Add support for importing lists** ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/25203), [mgmn](https://github.com/mastodon/mastodon/pull/26120), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/26372))
+- **Add optional hCaptcha support** ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/25019), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/25057), [Gargron](https://github.com/mastodon/mastodon/pull/25395), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/26388))
+- **Add lines to threads in web UI** ([Gargron](https://github.com/mastodon/mastodon/pull/24549), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/24677), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/24696), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/24711), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/24714), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/24713), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/24715), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/24800), [teeerevor](https://github.com/mastodon/mastodon/pull/25706), [renchap](https://github.com/mastodon/mastodon/pull/25807))
+- **Add new onboarding flow to web UI** ([Gargron](https://github.com/mastodon/mastodon/pull/24619), [Gargron](https://github.com/mastodon/mastodon/pull/24646), [Gargron](https://github.com/mastodon/mastodon/pull/24705), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/24872), [ThisIsMissEm](https://github.com/mastodon/mastodon/pull/24883), [Gargron](https://github.com/mastodon/mastodon/pull/24954), [stevenjlm](https://github.com/mastodon/mastodon/pull/24959), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/25010), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/25275), [Gargron](https://github.com/mastodon/mastodon/pull/25559), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/25561))
+- **Add `S3_DISABLE_CHECKSUM_MODE` environment variable for compatibility with some S3-compatible providers** ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/26435))
+- **Add auto-refresh of accounts we get new messages/edits of** ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/26510))
+- **Add Elasticsearch cluster health check and indexes mismatch check to dashboard** ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/26448))
+- Add support for `indexable` attribute on remote actors ([Gargron](https://github.com/mastodon/mastodon/pull/26485))
+- Add `DELETE /api/v1/profile/avatar` and `DELETE /api/v1/profile/header` to the REST API ([danielmbrasil](https://github.com/mastodon/mastodon/pull/25124), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/26573))
+- Add `ES_PRESET` option to customize numbers of shards and replicas ([Gargron](https://github.com/mastodon/mastodon/pull/26483), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/26489))
+  This can have a value of `single_node_cluster` (default), `small_cluster` (uses one replica) or `large_cluster` (uses one replica and a higher number of shards).
+- Add missing `instances` option to `tootctl search deploy` ([tribela](https://github.com/mastodon/mastodon/pull/26461))
+- Add `CACHE_BUSTER_HTTP_METHOD` environment variable ([renchap](https://github.com/mastodon/mastodon/pull/26528), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/26542))
+- Add support for `DB_PASS` when using `DATABASE_URL` ([ThisIsMissEm](https://github.com/mastodon/mastodon/pull/26295))
+- Add `GET /api/v1/instance/languages` to REST API ([danielmbrasil](https://github.com/mastodon/mastodon/pull/24443))
+- Add primary key to `preview_cards_statuses` join table ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/25243), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/26384), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/26447))
+- Add client-side timeout on resend confirmation button ([Gargron](https://github.com/mastodon/mastodon/pull/26300))
+- Add published date and author to news on the explore screen in web UI ([Gargron](https://github.com/mastodon/mastodon/pull/26155))
+- Add `lang` attribute to various UI components ([c960657](https://github.com/mastodon/mastodon/pull/23869), [c960657](https://github.com/mastodon/mastodon/pull/23891), [c960657](https://github.com/mastodon/mastodon/pull/26111), [c960657](https://github.com/mastodon/mastodon/pull/26149))
+- Add stricter protocol fields validation for accounts ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/25937))
+- Add support for Azure blob storage ([mistydemeo](https://github.com/mastodon/mastodon/pull/23607), [mistydemeo](https://github.com/mastodon/mastodon/pull/26080))
+- Add toast with option to open post after publishing in web UI ([Gargron](https://github.com/mastodon/mastodon/pull/25564), [Signez](https://github.com/mastodon/mastodon/pull/25919))
+- Add canonical link tags in web UI ([Gargron](https://github.com/mastodon/mastodon/pull/25715))
+- Add button to see results for polls in web UI ([Gargron](https://github.com/mastodon/mastodon/pull/25726))
+- Add at-symbol prepended to mention span title ([forsamori](https://github.com/mastodon/mastodon/pull/25684))
+- Add users index on `unconfirmed_email` ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/25672), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/25702))
+- Add superapp index on `oauth_applications` ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/25670))
+- Add index to backups on `user_id` column ([mjankowski](https://github.com/mastodon/mastodon/pull/25647))
+- Add onboarding prompt when home feed too slow in web UI ([Gargron](https://github.com/mastodon/mastodon/pull/25267), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/25556), [Gargron](https://github.com/mastodon/mastodon/pull/25579), [renchap](https://github.com/mastodon/mastodon/pull/25580), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/25581), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/25617), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/25917))
+- Add `POST /api/v1/conversations/:id/unread` API endpoint to mark a conversation as unread ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/25509))
+- Add `translate="no"` to outgoing mentions and links ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/25524))
+- Add unsubscribe link and headers to e-mails ([Gargron](https://github.com/mastodon/mastodon/pull/25378), [c960657](https://github.com/mastodon/mastodon/pull/26085))
+- Add logging of websocket send errors ([ThisIsMissEm](https://github.com/mastodon/mastodon/pull/25280))
+- Add time zone preference ([Gargron](https://github.com/mastodon/mastodon/pull/25342), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/26025))
+- Add `legal` as report category ([Gargron](https://github.com/mastodon/mastodon/pull/23941), [renchap](https://github.com/mastodon/mastodon/pull/25400), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/26509))
+- Add `data-nosnippet` so Google doesn't use trending posts in snippets for `/` ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/25279))
+- Add card with who invited you to join when displaying rules on sign-up ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/23475))
+- Add missing primary keys to `accounts_tags` and `statuses_tags` ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/25210))
+- Add support for custom sign-up URLs ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/25014), [renchap](https://github.com/mastodon/mastodon/pull/25108), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/25190), [mgmn](https://github.com/mastodon/mastodon/pull/25531))
+  This is set using `SSO_ACCOUNT_SIGN_UP` and reflected in the REST API by adding `registrations.sign_up_url` to the `/api/v2/instance` endpoint.
+- Add polling and automatic redirection to `/start` on email confirmation ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/25013))
+- Add ability to block sign-ups from IP using the CLI ([danielmbrasil](https://github.com/mastodon/mastodon/pull/24870))
+- Add ALT badges to media that has alternative text in web UI ([Gargron](https://github.com/mastodon/mastodon/pull/24782), [c960657](https://github.com/mastodon/mastodon/pull/26166)
+- Add ability to include accounts with pending follow requests in lists ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/19727), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/24810))
+- Add trend management to admin API ([rrgeorge](https://github.com/mastodon/mastodon/pull/24257))
+  - `POST /api/v1/admin/trends/statuses/:id/approve`
+  - `POST /api/v1/admin/trends/statuses/:id/reject`
+  - `POST /api/v1/admin/trends/links/:id/approve`
+  - `POST /api/v1/admin/trends/links/:id/reject`
+  - `POST /api/v1/admin/trends/tags/:id/approve`
+  - `POST /api/v1/admin/trends/tags/:id/reject`
+  - `GET /api/v1/admin/trends/links/publishers`
+  - `POST /api/v1/admin/trends/links/publishers/:id/approve`
+  - `POST /api/v1/admin/trends/links/publishers/:id/reject`
+- Add user handle to notification mail recipient address ([HeitorMC](https://github.com/mastodon/mastodon/pull/24240))
+- Add progress indicator to sign-up flow ([Gargron](https://github.com/mastodon/mastodon/pull/24545))
+- Add client-side validation for taken username in sign-up form ([Gargron](https://github.com/mastodon/mastodon/pull/24546))
+- Add `--approve` option to `tootctl accounts create` ([danielmbrasil](https://github.com/mastodon/mastodon/pull/24533))
+- Add “In Memoriam” banner back to profiles ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/23591), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/23614))
+  This adds the `memorial` attribute to the `Account` REST API entity.
+- Add colour to follow button when hashtag is being followed ([c960657](https://github.com/mastodon/mastodon/pull/24361))
+- Add further explanations to the profile link verification instructions ([drzax](https://github.com/mastodon/mastodon/pull/19723))
+- Add a link to Identity provider's account settings from the account settings ([CSDUMMI](https://github.com/mastodon/mastodon/pull/24100), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/24628))
+- Add support for streaming server to connect to postgres with self-signed certs through the `sslmode` URL parameter ([ramuuns](https://github.com/mastodon/mastodon/pull/21431))
+- Add support for specifying S3 storage classes through the `S3_STORAGE_CLASS` environment variable ([hyl](https://github.com/mastodon/mastodon/pull/22480))
+- Add support for incoming rich text ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/23913))
+- Add support for Ruby 3.2 ([tenderlove](https://github.com/mastodon/mastodon/pull/22928), [casperisfine](https://github.com/mastodon/mastodon/pull/24142), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/24202))
+- Add API parameter to safeguard unexpected mentions in new posts ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18350))
+
+### Changed
+
+- **Change hashtags to be displayed separately when they are the last line of a post** ([renchap](https://github.com/mastodon/mastodon/pull/26499))
+- **Change reblogs to be excluded from "Posts and replies" tab in web UI** ([Gargron](https://github.com/mastodon/mastodon/pull/26302))
+- **Change interaction modal in web interface** ([Gargron, ClearlyClaire](https://github.com/mastodon/mastodon/pull/26075), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/26269), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/26268), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/26267), [mgmn](https://github.com/mastodon/mastodon/pull/26459))
+- **Change design of link previews in web UI** ([Gargron](https://github.com/mastodon/mastodon/pull/26136), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/26151), [Gargron](https://github.com/mastodon/mastodon/pull/26153), [Gargron](https://github.com/mastodon/mastodon/pull/26250), [Gargron](https://github.com/mastodon/mastodon/pull/26287), [Gargron](https://github.com/mastodon/mastodon/pull/26286), [c960657](https://github.com/mastodon/mastodon/pull/26184))
+- **Change "direct message" nomenclature to "private mention" in web UI** ([Gargron](https://github.com/mastodon/mastodon/pull/24248))
+- **Change translation feature to cover Content Warnings, poll options and media descriptions** ([c960657](https://github.com/mastodon/mastodon/pull/24175), [S-H-GAMELINKS](https://github.com/mastodon/mastodon/pull/25251), [c960657](https://github.com/mastodon/mastodon/pull/26168), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/26452))
+- **Change account search to match by text when opted-in** ([jsgoldstein](https://github.com/mastodon/mastodon/pull/25599), [Gargron](https://github.com/mastodon/mastodon/pull/26378))
+- **Change import feature to be clearer, less error-prone and more reliable** ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/21054), [mgmn](https://github.com/mastodon/mastodon/pull/24874))
+- **Change local and federated timelines to be in a single “Live feeds” column** ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/25641), [Gargron](https://github.com/mastodon/mastodon/pull/25683), [mgmn](https://github.com/mastodon/mastodon/pull/25694), [Plastikmensch](https://github.com/mastodon/mastodon/pull/26247))
+- **Change user archive export to be faster and more reliable, and export `.zip` archives instead of `.tar.gz` ones** ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/23360), [TheEssem](https://github.com/mastodon/mastodon/pull/25034))
+- **Change `mastodon-streaming` systemd unit files to be templated** ([e-nomem](https://github.com/mastodon/mastodon/pull/24751))
+- **Change `statsd` integration to disable sidekiq metrics by default** ([mjankowski](https://github.com/mastodon/mastodon/pull/25265), [mjankowski](https://github.com/mastodon/mastodon/pull/25336), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/26310))
+  This deprecates `statsd` support and disables the sidekiq integration unless `STATSD_SIDEKIQ` is set to `true`.
+  This is because the `nsa` gem is unmaintained, and its sidekiq integration is known to add very significant overhead.
+  Later versions of Mastodon will have other ways to get the same metrics.
+- **Change replica support to native Rails adapter** ([krainboltgreene](https://github.com/mastodon/mastodon/pull/25693), [Gargron](https://github.com/mastodon/mastodon/pull/25849), [Gargron](https://github.com/mastodon/mastodon/pull/25874), [Gargron](https://github.com/mastodon/mastodon/pull/25851), [Gargron](https://github.com/mastodon/mastodon/pull/25977), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/26074), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/26326), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/26386))
+  This is a breaking change, dropping `makara` support, and requiring you to update your database configuration if you are using replicas.
+  To tell Mastodon to use a read replica, you can either set the `REPLICA_DB_NAME` environment variable (along with `REPLICA_DB_USER`, `REPLICA_DB_PASS`, `REPLICA_DB_HOST`, and `REPLICA_DB_PORT`, if they differ from the primary database), or the `REPLICA_DATABASE_URL` environment variable if your configuration is based on `DATABASE_URL`.
+- Change follow recommendation materialized view to be faster in most cases ([renchap, ClearlyClaire](https://github.com/mastodon/mastodon/pull/26545))
+- Change `robots.txt` to block GPTBot ([Foritus](https://github.com/mastodon/mastodon/pull/26396))
+- Change header of hashtag timelines in web UI ([Gargron](https://github.com/mastodon/mastodon/pull/26362), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/26416))
+- Change streaming `/metrics` to include additional metrics ([ThisIsMissEm](https://github.com/mastodon/mastodon/pull/26299))
+- Change indexing frequency from 5 minutes to 1 minute, add locks to schedulers ([Gargron](https://github.com/mastodon/mastodon/pull/26304))
+- Change column link to add a better keyboard focus indicator ([teeerevor](https://github.com/mastodon/mastodon/pull/26278))
+- Change poll form element colors to fit with the rest of the ui ([teeerevor](https://github.com/mastodon/mastodon/pull/26139), [teeerevor](https://github.com/mastodon/mastodon/pull/26162), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/26164))
+- Change 'favourite' to 'favorite' for American English ([marekr](https://github.com/mastodon/mastodon/pull/24667), [gunchleoc](https://github.com/mastodon/mastodon/pull/26009), [nabijaczleweli](https://github.com/mastodon/mastodon/pull/26109))
+- Change ActivityStreams representation of suspended accounts to not use a blank `name` ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/25276))
+- Change focus UI for keyboard only input ([teeerevor](https://github.com/mastodon/mastodon/pull/25935), [Gargron](https://github.com/mastodon/mastodon/pull/26125))
+- Change thread view to scroll to the selected post rather than the post being replied to ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/24685))
+- Change links in multi-column mode so tabs are open in single-column mode ([Signez](https://github.com/mastodon/mastodon/pull/25893), [Signez](https://github.com/mastodon/mastodon/pull/26070), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/25973))
+- Change searching with `#` to include account index ([jsgoldstein](https://github.com/mastodon/mastodon/pull/25638))
+- Change label and design of sensitive and unavailable media in web UI ([Gargron](https://github.com/mastodon/mastodon/pull/25712), [Gargron](https://github.com/mastodon/mastodon/pull/26135), [Gargron](https://github.com/mastodon/mastodon/pull/26330))
+- Change button colors to increase hover/focus contrast and consistency ([teeerevor](https://github.com/mastodon/mastodon/pull/25677), [Gargron](https://github.com/mastodon/mastodon/pull/25679))
+- Change dropdown icon above compose form from ellipsis to bars in web UI ([Gargron](https://github.com/mastodon/mastodon/pull/25661))
+- Change header backgrounds to use fewer different colors in web UI ([Gargron](https://github.com/mastodon/mastodon/pull/25577))
+- Change files to be deleted in batches instead of one-by-one ([Gargron](https://github.com/mastodon/mastodon/pull/23302), [S-H-GAMELINKS](https://github.com/mastodon/mastodon/pull/25586), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/25587))
+- Change emoji picker icon ([iparr](https://github.com/mastodon/mastodon/pull/25479))
+- Change edit profile page ([Gargron](https://github.com/mastodon/mastodon/pull/25413), [c960657](https://github.com/mastodon/mastodon/pull/26538))
+- Change "bot" label to "automated" ([Gargron](https://github.com/mastodon/mastodon/pull/25356))
+- Change design of dropdowns in web UI ([Gargron](https://github.com/mastodon/mastodon/pull/25107))
+- Change wording of “Content cache retention period” setting to highlight destructive implications ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/23261))
+- Change autolinking to allow carets in URL search params ([renchap](https://github.com/mastodon/mastodon/pull/25216))
+- Change share action from being in action bar to being in dropdown in web UI ([Gargron](https://github.com/mastodon/mastodon/pull/25105))
+- Change remote report processing to accept reports with long comments, but truncate them ([ThisIsMissEm](https://github.com/mastodon/mastodon/pull/25028))
+- Change sessions to be ordered from most-recent to least-recently updated ([frankieroberto](https://github.com/mastodon/mastodon/pull/25005))
+- Change vacuum scheduler to also delete expired tokens and unused application records ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/24868), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/24871))
+- Change "Sign in" to "Login" ([Gargron](https://github.com/mastodon/mastodon/pull/24942))
+- Change domain suspensions to also be checked before trying to fetch unknown remote resources ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/24535))
+- Change media components to use aspect-ratio rather than compute height themselves ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/24686), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/24943))
+- Change logo version in header based on screen size in web UI ([Gargron](https://github.com/mastodon/mastodon/pull/24707))
+- Change label from "For you" to "People" on explore screen in web UI ([Gargron](https://github.com/mastodon/mastodon/pull/24706))
+- Change logged-out WebUI HTML pages to be cached for a few seconds ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/24708))
+- Change unauthenticated responses to be cached in REST API ([Gargron](https://github.com/mastodon/mastodon/pull/24348), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/24662), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/24665))
+- Change HTTP caching logic ([Gargron](https://github.com/mastodon/mastodon/pull/24347), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/24604))
+- Change hashtags and mentions in bios to open in-app in web UI ([Gargron](https://github.com/mastodon/mastodon/pull/24643))
+- Change styling of the recommended accounts to allow bio to be more visible ([chike00](https://github.com/mastodon/mastodon/pull/24480))
+- Change account search in moderation interface to allow searching by username including the leading `@` ([HeitorMC](https://github.com/mastodon/mastodon/pull/24242))
+- Change all components to use the same error page in web UI ([Gargron](https://github.com/mastodon/mastodon/pull/24512))
+- Change search pop-out in web UI ([Gargron](https://github.com/mastodon/mastodon/pull/24305))
+- Change user settings to be stored in a more optimal way ([Gargron](https://github.com/mastodon/mastodon/pull/23630), [c960657](https://github.com/mastodon/mastodon/pull/24321), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/24453), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/24460), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/24558), [Gargron](https://github.com/mastodon/mastodon/pull/24761), [Gargron](https://github.com/mastodon/mastodon/pull/24783), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/25508), [jsgoldstein](https://github.com/mastodon/mastodon/pull/25340))
+- Change media upload limits and remove client-side resizing ([Gargron](https://github.com/mastodon/mastodon/pull/23726))
+- Change design of account rows in web UI ([Gargron](https://github.com/mastodon/mastodon/pull/24247), [Gargron](https://github.com/mastodon/mastodon/pull/24343), [Gargron](https://github.com/mastodon/mastodon/pull/24956), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/25131))
+- Change log-out to use Single Logout when using external log-in through OIDC ([CSDUMMI](https://github.com/mastodon/mastodon/pull/24020))
+- Change sidekiq-bulk's batch size from 10,000 to 1,000 jobs in one Redis call ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/24034))
+- Change translation to only be offered for supported languages ([c960657](https://github.com/mastodon/mastodon/pull/23879), [c960657](https://github.com/mastodon/mastodon/pull/24037))
+  This adds the `/api/v1/instance/translation_languages` REST API endpoint that returns an object with the supported translation language pairs in the form:
+  ```json
+  {
+    "fr": ["en", "de"]
+  }
+  ```
+  (where `fr` is a supported source language and `en` and `de` or supported output language when translating a `fr` string)
+- Change compose form checkbox to native input with `appearance: none` ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/22949))
+- Change posts' clickable area to be larger ([c960657](https://github.com/mastodon/mastodon/pull/23621))
+- Change `followed_by` link to `location=all` if account is local on /admin/accounts/:id page ([tribela](https://github.com/mastodon/mastodon/pull/23467))
+
+### Removed
+
+- **Remove support for Node.js 14** ([renchap](https://github.com/mastodon/mastodon/pull/25198))
+- **Remove support for Ruby 2.7** ([nschonni](https://github.com/mastodon/mastodon/pull/24237))
+- **Remove clustering from streaming API** ([ThisIsMissEm](https://github.com/mastodon/mastodon/pull/24655))
+- **Remove anonymous access to the streaming API** ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/23989))
+- Remove 16:9 cropping from web UI ([Gargron](https://github.com/mastodon/mastodon/pull/26132))
+- Remove back button from bookmarks, favourites and lists screens in web UI ([Gargron](https://github.com/mastodon/mastodon/pull/26126))
+- Remove display name input from sign-up form ([Gargron](https://github.com/mastodon/mastodon/pull/24704))
+- Remove `tai` locale ([c960657](https://github.com/mastodon/mastodon/pull/23880))
+- Remove empty Kushubian (csb) local files ([nschonni](https://github.com/mastodon/mastodon/pull/24151))
+- Remove `Permissions-Policy` header from all responses ([Gargron](https://github.com/mastodon/mastodon/pull/24124))
+
+### Fixed
+
+- **Fix filters not being applying in the explore page** ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/25887))
+- **Fix being unable to load past a full page of filtered posts in Home timeline** ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/24930))
+- **Fix log-in flow when involving both OAuth and external authentication** ([CSDUMMI](https://github.com/mastodon/mastodon/pull/24073))
+- **Fix broken links in account gallery** ([c960657](https://github.com/mastodon/mastodon/pull/24218))
+- **Fix blocking subdomains of an already-blocked domain** ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/26392))
+- Fix uploading of video files for which `ffprobe` reports `0/0` average framerate ([NicolaiSoeborg](https://github.com/mastodon/mastodon/pull/26500))
+- Fix cached posts including stale stats ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/26409))
+- Fix adding column with default value taking longer on Postgres >= 11 ([Gargron](https://github.com/mastodon/mastodon/pull/26375))
+- Fix light theme select option for hashtags ([teeerevor](https://github.com/mastodon/mastodon/pull/26311))
+- Fix AVIF attachments ([c960657](https://github.com/mastodon/mastodon/pull/26264))
+- Fix incorrect URL normalization when fetching remote resources ([c960657](https://github.com/mastodon/mastodon/pull/26219), [c960657](https://github.com/mastodon/mastodon/pull/26285))
+- Fix being unable to filter posts for individual Chinese languages ([gunchleoc](https://github.com/mastodon/mastodon/pull/26066))
+- Fix preview card sometimes linking to 4xx error pages ([c960657](https://github.com/mastodon/mastodon/pull/26200))
+- Fix emoji picker button scrolling with textarea content in single-column view ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/25304))
+- Fix missing border on error screen in light theme in web UI ([Gargron](https://github.com/mastodon/mastodon/pull/26152))
+- Fix UI overlap with the loupe icon in the Explore Tab ([gol-cha](https://github.com/mastodon/mastodon/pull/26113))
+- Fix unexpected redirection to `/explore` after sign-in ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/26143))
+- Fix `/api/v1/statuses/:id/unfavourite` and `/api/v1/statuses/:id/unreblog` returning non-updated counts ([c960657](https://github.com/mastodon/mastodon/pull/24365))
+- Fix clicking the “Back” button sometimes leading out of Mastodon ([c960657](https://github.com/mastodon/mastodon/pull/23953), [CSFlorin](https://github.com/mastodon/mastodon/pull/24835), [S-H-GAMELINKS](https://github.com/mastodon/mastodon/pull/24867), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/25281))
+- Fix processing of `null` ActivityPub activities ([tribela](https://github.com/mastodon/mastodon/pull/26021))
+- Fix hashtag posts not being removed from home feed on hashtag unfollow ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/26028))
+- Fix for "follows you" indicator in light web UI not readable ([vmstan](https://github.com/mastodon/mastodon/pull/25993))
+- Fix incorrect line break between icon and number of reposts & favourites ([edent](https://github.com/mastodon/mastodon/pull/26004))
+- Fix sounds not being loaded from assets host ([Signez](https://github.com/mastodon/mastodon/pull/25931))
+- Fix buttons showing inconsistent styles ([teeerevor](https://github.com/mastodon/mastodon/pull/25903), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/25965), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/26341), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/26482))
+- Fix trend calculation working on too many items at a time ([Gargron](https://github.com/mastodon/mastodon/pull/25835))
+- Fix dropdowns being disabled for logged out users in web UI ([Gargron](https://github.com/mastodon/mastodon/pull/25714), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/25964))
+- Fix explore page being inaccessible when opted-out of trends in web UI ([Gargron](https://github.com/mastodon/mastodon/pull/25716))
+- Fix re-activated accounts possibly getting deleted by `AccountDeletionWorker` ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/25711))
+- Fix `/api/v2/search` not working with following query param ([danielmbrasil](https://github.com/mastodon/mastodon/pull/25681))
+- Fix inefficient query when requesting a new confirmation email from a logged-in account ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/25669))
+- Fix unnecessary concurrent calls to `/api/*/instance` in web UI ([mgmn](https://github.com/mastodon/mastodon/pull/25663))
+- Fix resolving local URL for remote content ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/25637))
+- Fix search not being easily findable on smaller screens in web UI ([Gargron](https://github.com/mastodon/mastodon/pull/25576), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/25631))
+- Fix j/k keyboard shortcuts on some status lists ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/25554))
+- Fix missing validation on `default_privacy` setting ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/25513))
+- Fix incorrect pagination headers in `/api/v2/admin/accounts` ([danielmbrasil](https://github.com/mastodon/mastodon/pull/25477))
+- Fix non-interactive upload container being given a `button` role and tabIndex ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/25462))
+- Fix always redirecting to onboarding in web UI ([Gargron](https://github.com/mastodon/mastodon/pull/25396))
+- Fix inconsistent use of middle dot (·) instead of bullet (•) to separate items ([j-f1](https://github.com/mastodon/mastodon/pull/25248))
+- Fix spacing of middle dots in the detailed status meta section ([j-f1](https://github.com/mastodon/mastodon/pull/25247))
+- Fix prev/next buttons color in media viewer ([renchap](https://github.com/mastodon/mastodon/pull/25231))
+- Fix email addresses not being properly updated in `tootctl maintenance fix-duplicates` ([mjankowski](https://github.com/mastodon/mastodon/pull/25118))
+- Fix unicode surrogate pairs sometimes being broken in page title ([eai04191](https://github.com/mastodon/mastodon/pull/25148))
+- Fix various inefficient queries against account domains ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/25126))
+- Fix video player offering to expand in a lightbox when it's in an `iframe` ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/25067))
+- Fix post embed previews ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/25071))
+- Fix inadequate error handling in several API controllers when given invalid parameters ([danielmbrasil](https://github.com/mastodon/mastodon/pull/24947), [danielmbrasil](https://github.com/mastodon/mastodon/pull/24958), [danielmbrasil](https://github.com/mastodon/mastodon/pull/25063), [danielmbrasil](https://github.com/mastodon/mastodon/pull/25072), [danielmbrasil](https://github.com/mastodon/mastodon/pull/25386), [danielmbrasil](https://github.com/mastodon/mastodon/pull/25595))
+- Fix uncaught `ActiveRecord::StatementInvalid` in Mastodon::IpBlocksCLI ([danielmbrasil](https://github.com/mastodon/mastodon/pull/24861))
+- Fix various edge cases with local moves ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/24812))
+- Fix `tootctl accounts cull` crashing when encountering a domain resolving to a private address ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/23378))
+- Fix `tootctl accounts approve --number N` not aproving the N earliest registrations ([danielmbrasil](https://github.com/mastodon/mastodon/pull/24605))
+- Fix being unable to clear media description when editing posts ([c960657](https://github.com/mastodon/mastodon/pull/24720))
+- Fix unavailable translations not falling back to English ([mgmn](https://github.com/mastodon/mastodon/pull/24727))
+- Fix anonymous visitors getting a session cookie on first visit ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/24584), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/24650), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/24664))
+- Fix cutting off first letter of hashtag links sometimes in web UI ([Gargron](https://github.com/mastodon/mastodon/pull/24623))
+- Fix crash in `tootctl accounts create --reattach --force` ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/24557), [danielmbrasil](https://github.com/mastodon/mastodon/pull/24680))
+- Fix characters being emojified even when using Variation Selector 15 (text) ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/20949), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/24615))
+- Fix uncaught ActiveRecord::StatementInvalid exception in `Mastodon::AccountsCLI#approve` ([danielmbrasil](https://github.com/mastodon/mastodon/pull/24590))
+- Fix email confirmation skip option in `tootctl accounts modify USERNAME --email EMAIL --confirm` ([danielmbrasil](https://github.com/mastodon/mastodon/pull/24578))
+- Fix tooltip for dates without time ([c960657](https://github.com/mastodon/mastodon/pull/24244))
+- Fix missing loading spinner and loading more on scroll in Private Mentions column ([c960657](https://github.com/mastodon/mastodon/pull/24446))
+- Fix account header image missing from `/settings/profile` on narrow screens ([c960657](https://github.com/mastodon/mastodon/pull/24433))
+- Fix height of announcements not being updated when using reduced animations ([c960657](https://github.com/mastodon/mastodon/pull/24354))
+- Fix inconsistent radius in advanced interface drawer ([thislight](https://github.com/mastodon/mastodon/pull/24407))
+- Fix loading more trending posts on scroll in the advanced interface ([OmmyZhang](https://github.com/mastodon/mastodon/pull/24314))
+- Fix poll ending notification for edited polls ([c960657](https://github.com/mastodon/mastodon/pull/24311))
+- Fix max width of media in `/about` and `/privacy-policy` ([mgmn](https://github.com/mastodon/mastodon/pull/24180))
+- Fix streaming API not being usable without `DATABASE_URL` ([Gargron](https://github.com/mastodon/mastodon/pull/23960))
+- Fix external authentication not running onboarding code for new users ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/23458))
+
 ## [4.1.6] - 2023-07-31
 
 ### Fixed
diff --git a/Gemfile b/Gemfile
index 41a6646e0d..8d43d0287e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -35,11 +35,14 @@ group :pam_authentication, optional: true do
 end
 
 gem 'net-ldap', '~> 0.18'
-gem 'omniauth-cas', '~> 2.0'
-gem 'omniauth-saml', '~> 1.10'
+
+# TODO: Point back at released omniauth-cas gem when PR merged
+# https://github.com/dlindahl/omniauth-cas/pull/68
+gem 'omniauth-cas', github: 'stanhu/omniauth-cas', ref: '4211e6d05941b4a981f9a36b49ec166cecd0e271'
+gem 'omniauth-saml', '~> 2.0'
 gem 'omniauth_openid_connect', '~> 0.6.1'
-gem 'omniauth', '~> 1.9'
-gem 'omniauth-rails_csrf_protection', '~> 0.1'
+gem 'omniauth', '~> 2.0'
+gem 'omniauth-rails_csrf_protection', '~> 1.0'
 
 gem 'color_diff', '~> 0.1'
 gem 'discard', '~> 1.2'
@@ -56,8 +59,9 @@ gem 'httplog', '~> 1.6.2'
 gem 'idn-ruby', require: 'idn'
 gem 'kaminari', '~> 1.2'
 gem 'link_header', '~> 0.0'
-gem 'mime-types', '~> 3.4.1', require: 'mime/types/columnar'
+gem 'mime-types', '~> 3.5.0', require: 'mime/types/columnar'
 gem 'nokogiri', '~> 1.15'
+gem 'nsa', github: 'jhawthorn/nsa', ref: 'e020fcc3a54d993ab45b7194d89ab720296c111b'
 gem 'oj', '~> 3.14'
 gem 'ox', '~> 2.14'
 gem 'parslet'
@@ -106,7 +110,7 @@ group :test do
   gem 'fuubar', '~> 2.5'
 
   # Extra RSpec extenion methods and helpers for sidekiq
-  gem 'rspec-sidekiq', '~> 3.1'
+  gem 'rspec-sidekiq', '~> 4.0'
 
   # Browser integration testing
   gem 'capybara', '~> 3.39'
diff --git a/Gemfile.lock b/Gemfile.lock
index 1766220aad..a53adcb5ed 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -7,6 +7,17 @@ GIT
       hkdf (~> 0.2)
       jwt (~> 2.0)
 
+GIT
+  remote: https://github.com/jhawthorn/nsa.git
+  revision: e020fcc3a54d993ab45b7194d89ab720296c111b
+  ref: e020fcc3a54d993ab45b7194d89ab720296c111b
+  specs:
+    nsa (0.2.8)
+      activesupport (>= 4.2, < 7.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      sidekiq (>= 3.5)
+      statsd-ruby (~> 1.4, >= 1.4.0)
+
 GIT
   remote: https://github.com/mastodon/rails-settings-cached.git
   revision: 86328ef0bd04ce21cc0504ff5e334591e8c2ccab
@@ -15,50 +26,60 @@ GIT
     rails-settings-cached (0.6.6)
       rails (>= 4.2.0)
 
+GIT
+  remote: https://github.com/stanhu/omniauth-cas.git
+  revision: 4211e6d05941b4a981f9a36b49ec166cecd0e271
+  ref: 4211e6d05941b4a981f9a36b49ec166cecd0e271
+  specs:
+    omniauth-cas (2.0.0)
+      addressable (~> 2.3)
+      nokogiri (~> 1.5)
+      omniauth (>= 1.2, < 3)
+
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.0.6)
-      actionpack (= 7.0.6)
-      activesupport (= 7.0.6)
+    actioncable (7.0.7.2)
+      actionpack (= 7.0.7.2)
+      activesupport (= 7.0.7.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.6)
-      actionpack (= 7.0.6)
-      activejob (= 7.0.6)
-      activerecord (= 7.0.6)
-      activestorage (= 7.0.6)
-      activesupport (= 7.0.6)
+    actionmailbox (7.0.7.2)
+      actionpack (= 7.0.7.2)
+      activejob (= 7.0.7.2)
+      activerecord (= 7.0.7.2)
+      activestorage (= 7.0.7.2)
+      activesupport (= 7.0.7.2)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.0.6)
-      actionpack (= 7.0.6)
-      actionview (= 7.0.6)
-      activejob (= 7.0.6)
-      activesupport (= 7.0.6)
+    actionmailer (7.0.7.2)
+      actionpack (= 7.0.7.2)
+      actionview (= 7.0.7.2)
+      activejob (= 7.0.7.2)
+      activesupport (= 7.0.7.2)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (7.0.6)
-      actionview (= 7.0.6)
-      activesupport (= 7.0.6)
+    actionpack (7.0.7.2)
+      actionview (= 7.0.7.2)
+      activesupport (= 7.0.7.2)
       rack (~> 2.0, >= 2.2.4)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (7.0.6)
-      actionpack (= 7.0.6)
-      activerecord (= 7.0.6)
-      activestorage (= 7.0.6)
-      activesupport (= 7.0.6)
+    actiontext (7.0.7.2)
+      actionpack (= 7.0.7.2)
+      activerecord (= 7.0.7.2)
+      activestorage (= 7.0.7.2)
+      activesupport (= 7.0.7.2)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.0.6)
-      activesupport (= 7.0.6)
+    actionview (7.0.7.2)
+      activesupport (= 7.0.7.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -68,22 +89,22 @@ GEM
       activemodel (>= 4.1, < 7.1)
       case_transform (>= 0.2)
       jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
-    activejob (7.0.6)
-      activesupport (= 7.0.6)
+    activejob (7.0.7.2)
+      activesupport (= 7.0.7.2)
       globalid (>= 0.3.6)
-    activemodel (7.0.6)
-      activesupport (= 7.0.6)
-    activerecord (7.0.6)
-      activemodel (= 7.0.6)
-      activesupport (= 7.0.6)
-    activestorage (7.0.6)
-      actionpack (= 7.0.6)
-      activejob (= 7.0.6)
-      activerecord (= 7.0.6)
-      activesupport (= 7.0.6)
+    activemodel (7.0.7.2)
+      activesupport (= 7.0.7.2)
+    activerecord (7.0.7.2)
+      activemodel (= 7.0.7.2)
+      activesupport (= 7.0.7.2)
+    activestorage (7.0.7.2)
+      actionpack (= 7.0.7.2)
+      activejob (= 7.0.7.2)
+      activerecord (= 7.0.7.2)
+      activesupport (= 7.0.7.2)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (7.0.6)
+    activesupport (7.0.7.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -103,8 +124,8 @@ GEM
     attr_required (1.0.1)
     awrence (1.2.1)
     aws-eventstream (1.2.0)
-    aws-partitions (1.791.0)
-    aws-sdk-core (3.178.0)
+    aws-partitions (1.793.0)
+    aws-sdk-core (3.180.3)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.5)
@@ -112,8 +133,8 @@ GEM
     aws-sdk-kms (1.71.0)
       aws-sdk-core (~> 3, >= 3.177.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.131.0)
-      aws-sdk-core (~> 3, >= 3.177.0)
+    aws-sdk-s3 (1.132.1)
+      aws-sdk-core (~> 3, >= 3.179.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.6)
     aws-sigv4 (1.6.0)
@@ -126,6 +147,7 @@ GEM
       faraday_middleware (~> 1.0, >= 1.0.0.rc1)
       net-http-persistent (~> 4.0)
       nokogiri (~> 1, >= 1.10.8)
+    base64 (0.1.1)
     bcrypt (3.1.18)
     better_errors (2.10.1)
       erubi (>= 1.0.0)
@@ -248,7 +270,7 @@ GEM
       tzinfo
     excon (0.100.0)
     fabrication (2.30.0)
-    faker (3.2.0)
+    faker (3.2.1)
       i18n (>= 1.8.11, < 2)
     faraday (1.10.3)
       faraday-em_http (~> 1.0)
@@ -312,7 +334,7 @@ GEM
       activesupport (>= 5.1)
       haml (>= 4.0.6)
       railties (>= 5.1)
-    haml_lint (0.49.2)
+    haml_lint (0.49.3)
       haml (>= 4.0, < 6.2)
       parallel (~> 1.10)
       rainbow
@@ -408,7 +430,7 @@ GEM
     llhttp-ffi (0.4.0)
       ffi-compiler (~> 1.0)
       rake (~> 13.0)
-    lograge (0.12.0)
+    lograge (0.13.0)
       actionpack (>= 4)
       activesupport (>= 4)
       railties (>= 4)
@@ -431,12 +453,12 @@ GEM
       hashie (~> 5.0)
     memory_profiler (1.0.1)
     method_source (1.0.0)
-    mime-types (3.4.1)
+    mime-types (3.5.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2023.0218.1)
-    mini_mime (1.1.2)
-    mini_portile2 (2.8.2)
-    minitest (5.18.1)
+    mime-types-data (3.2023.0808)
+    mini_mime (1.1.5)
+    mini_portile2 (2.8.4)
+    minitest (5.19.0)
     msgpack (1.7.1)
     multi_json (1.15.0)
     multipart-post (2.3.0)
@@ -444,7 +466,7 @@ GEM
       uri
     net-http-persistent (4.0.2)
       connection_pool (~> 2.2)
-    net-imap (0.3.6)
+    net-imap (0.3.7)
       date
       net-protocol
     net-ldap (0.18.0)
@@ -458,23 +480,20 @@ GEM
       net-protocol
     net-ssh (7.1.0)
     nio4r (2.5.9)
-    nokogiri (1.15.3)
+    nokogiri (1.15.4)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    oj (3.15.0)
-    omniauth (1.9.2)
+    oj (3.16.0)
+    omniauth (2.1.1)
       hashie (>= 3.4.6)
-      rack (>= 1.6.2, < 3)
-    omniauth-cas (2.0.0)
-      addressable (~> 2.3)
-      nokogiri (~> 1.5)
-      omniauth (~> 1.2)
-    omniauth-rails_csrf_protection (0.1.2)
+      rack (>= 2.2.3)
+      rack-protection
+    omniauth-rails_csrf_protection (1.0.1)
       actionpack (>= 4.2)
-      omniauth (>= 1.3.1)
-    omniauth-saml (1.10.3)
-      omniauth (~> 1.3, >= 1.3.2)
-      ruby-saml (~> 1.9)
+      omniauth (~> 2.0)
+    omniauth-saml (2.1.0)
+      omniauth (~> 2.0)
+      ruby-saml (~> 1.12)
     omniauth_openid_connect (0.6.1)
       omniauth (>= 1.9, < 3)
       openid_connect (~> 1.1)
@@ -515,15 +534,15 @@ GEM
       premailer (~> 1.7, >= 1.7.9)
     private_address_check (0.5.0)
     public_suffix (5.0.3)
-    puma (6.3.0)
+    puma (6.3.1)
       nio4r (~> 2.0)
     pundit (2.3.0)
       activesupport (>= 3.0.0)
     raabro (1.4.0)
     racc (1.7.1)
-    rack (2.2.7)
-    rack-attack (6.6.1)
-      rack (>= 1.0, < 3)
+    rack (2.2.8)
+    rack-attack (6.7.0)
+      rack (>= 1.0, < 4)
     rack-cors (2.0.1)
       rack (>= 2.0.0)
     rack-oauth2 (1.21.3)
@@ -532,30 +551,33 @@ GEM
       httpclient
       json-jwt (>= 1.11.0)
       rack (>= 2.1.0)
+    rack-protection (3.0.5)
+      rack
     rack-proxy (0.7.6)
       rack
     rack-test (2.1.0)
       rack (>= 1.3)
-    rails (7.0.6)
-      actioncable (= 7.0.6)
-      actionmailbox (= 7.0.6)
-      actionmailer (= 7.0.6)
-      actionpack (= 7.0.6)
-      actiontext (= 7.0.6)
-      actionview (= 7.0.6)
-      activejob (= 7.0.6)
-      activemodel (= 7.0.6)
-      activerecord (= 7.0.6)
-      activestorage (= 7.0.6)
-      activesupport (= 7.0.6)
+    rails (7.0.7.2)
+      actioncable (= 7.0.7.2)
+      actionmailbox (= 7.0.7.2)
+      actionmailer (= 7.0.7.2)
+      actionpack (= 7.0.7.2)
+      actiontext (= 7.0.7.2)
+      actionview (= 7.0.7.2)
+      activejob (= 7.0.7.2)
+      activemodel (= 7.0.7.2)
+      activerecord (= 7.0.7.2)
+      activestorage (= 7.0.7.2)
+      activesupport (= 7.0.7.2)
       bundler (>= 1.15.0)
-      railties (= 7.0.6)
+      railties (= 7.0.7.2)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
       activesupport (>= 5.0.1.rc1)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
+    rails-dom-testing (2.1.1)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
@@ -563,9 +585,9 @@ GEM
     rails-i18n (7.0.7)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
-    railties (7.0.6)
-      actionpack (= 7.0.6)
-      activesupport (= 7.0.6)
+    railties (7.0.7.2)
+      actionpack (= 7.0.7.2)
+      activesupport (= 7.0.7.2)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
@@ -612,12 +634,15 @@ GEM
       rspec-expectations (~> 3.12)
       rspec-mocks (~> 3.12)
       rspec-support (~> 3.12)
-    rspec-sidekiq (3.1.0)
-      rspec-core (~> 3.0, >= 3.0.0)
-      sidekiq (>= 2.4.0)
-    rspec-support (3.12.0)
+    rspec-sidekiq (4.0.1)
+      rspec-core (~> 3.0)
+      rspec-expectations (~> 3.0)
+      rspec-mocks (~> 3.0)
+      sidekiq (>= 5, < 8)
+    rspec-support (3.12.1)
     rspec_chunked (0.6)
-    rubocop (1.54.2)
+    rubocop (1.56.1)
+      base64 (~> 0.1.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -625,7 +650,7 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.0, < 2.0)
+      rubocop-ast (>= 1.28.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.29.0)
@@ -634,14 +659,14 @@ GEM
       rubocop (~> 1.41)
     rubocop-factory_bot (2.23.1)
       rubocop (~> 1.33)
-    rubocop-performance (1.18.0)
+    rubocop-performance (1.19.0)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     rubocop-rails (2.20.2)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
-    rubocop-rspec (2.22.0)
+    rubocop-rspec (2.23.2)
       rubocop (~> 1.33)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
@@ -662,7 +687,7 @@ GEM
     scenic (1.7.0)
       activerecord (>= 4.0.0)
       railties (>= 4.0.0)
-    selenium-webdriver (4.9.1)
+    selenium-webdriver (4.11.0)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
@@ -706,6 +731,7 @@ GEM
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
     stackprof (0.2.25)
+    statsd-ruby (1.5.0)
     stoplight (3.0.1)
       redlock (~> 1.0)
     strong_migrations (0.8.0)
@@ -720,7 +746,7 @@ GEM
       unicode-display_width (>= 1.1.1, < 3)
     terrapin (0.6.0)
       climate_control (>= 0.0.3, < 1.0)
-    test-prof (1.2.1)
+    test-prof (1.2.2)
     thor (1.2.2)
     tilt (2.2.0)
     timeout (0.4.0)
@@ -780,14 +806,14 @@ GEM
       railties (>= 5.2)
       semantic_range (>= 2.3.0)
     websocket (1.2.9)
-    websocket-driver (0.7.5)
+    websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     wisper (2.0.1)
     xorcist (1.1.3)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.8)
+    zeitwerk (2.6.11)
 
 PLATFORMS
   ruby
@@ -854,15 +880,16 @@ DEPENDENCIES
   mario-redis-lock (~> 1.2)
   md-paperclip-azure (~> 2.2)
   memory_profiler
-  mime-types (~> 3.4.1)
+  mime-types (~> 3.5.0)
   net-http (~> 0.3.2)
   net-ldap (~> 0.18)
   nokogiri (~> 1.15)
+  nsa!
   oj (~> 3.14)
-  omniauth (~> 1.9)
-  omniauth-cas (~> 2.0)
-  omniauth-rails_csrf_protection (~> 0.1)
-  omniauth-saml (~> 1.10)
+  omniauth (~> 2.0)
+  omniauth-cas!
+  omniauth-rails_csrf_protection (~> 1.0)
+  omniauth-saml (~> 2.0)
   omniauth_openid_connect (~> 0.6.1)
   ox (~> 2.14)
   parslet
@@ -888,7 +915,7 @@ DEPENDENCIES
   redis-namespace (~> 1.10)
   rqrcode (~> 2.2)
   rspec-rails (~> 6.0)
-  rspec-sidekiq (~> 3.1)
+  rspec-sidekiq (~> 4.0)
   rspec_chunked (~> 0.6)
   rubocop
   rubocop-capybara
diff --git a/SECURITY.md b/SECURITY.md
index 6a51c126ab..7a79d9f91d 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -1,8 +1,11 @@
 # Security Policy
 
-If you believe you've identified a security vulnerability in Mastodon (a bug that allows something to happen that shouldn't be possible), you can reach us at <security@joinmastodon.org>.
+If you believe you've identified a security vulnerability in Mastodon (a bug that allows something to happen that shouldn't be possible), you can either:
 
-You should _not_ report such issues on GitHub or in other public spaces to give us time to publish a fix for the issue without exposing Mastodon's users to increased risk.
+- open a [Github security issue on the Mastodon project](https://github.com/mastodon/mastodon/security/advisories/new)
+- reach us at <security@joinmastodon.org>
+
+You should _not_ report such issues on public GitHub issues or in other public spaces to give us time to publish a fix for the issue without exposing Mastodon's users to increased risk.
 
 ## Scope
 
diff --git a/Vagrantfile b/Vagrantfile
index 043bab3e91..1117d62fff 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -60,6 +60,37 @@ sudo usermod -a -G rvm $USER
 
 SCRIPT
 
+$provisionElasticsearch = <<SCRIPT
+# Install Elastic Search
+sudo apt install openjdk-17-jre-headless -y
+sudo wget -O /usr/share/keyrings/elasticsearch.asc https://artifacts.elastic.co/GPG-KEY-elasticsearch
+sudo sh -c 'echo "deb [signed-by=/usr/share/keyrings/elasticsearch.asc] https://artifacts.elastic.co/packages/7.x/apt stable main" > /etc/apt/sources.list.d/elastic-7.x.list'
+sudo apt update
+sudo apt install elasticsearch -y
+
+sudo systemctl daemon-reload
+sudo systemctl enable --now elasticsearch
+
+echo 'path.data: /var/lib/elasticsearch
+path.logs: /var/log/elasticsearch
+network.host: 0.0.0.0
+http.port: 9200
+discovery.seed_hosts: ["localhost"]
+cluster.initial_master_nodes: ["node-1"]' > /etc/elasticsearch/elasticsearch.yml
+
+sudo systemctl restart elasticsearch
+
+# Install Kibana
+sudo apt install kibana -y
+sudo systemctl enable --now kibana
+
+echo 'server.host: "0.0.0.0"
+elasticsearch.hosts: ["http://localhost:9200"]' > /etc/kibana/kibana.yml
+
+sudo systemctl restart kibana
+
+SCRIPT
+
 $provisionB = <<SCRIPT
 
 source "/etc/profile.d/rvm.sh"
@@ -102,10 +133,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   config.vm.provider :virtualbox do |vb|
     vb.name = "mastodon"
-    vb.customize ["modifyvm", :id, "--memory", "4096"]
-    # Increase the number of CPUs. Uncomment and adjust to
-    # increase performance
-    # vb.customize ["modifyvm", :id, "--cpus", "3"]
+    vb.customize ["modifyvm", :id, "--memory", "8192"]
+    vb.customize ["modifyvm", :id, "--cpus", "3"]
 
     # Disable VirtualBox DNS proxy to skip long-delay IPv6 resolutions.
     # https://github.com/mitchellh/vagrant/issues/1172
@@ -141,9 +170,15 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.network :forwarded_port, guest: 3000, host: 3000
   config.vm.network :forwarded_port, guest: 4000, host: 4000
   config.vm.network :forwarded_port, guest: 8080, host: 8080
+  config.vm.network :forwarded_port, guest: 9200, host: 9200
+  config.vm.network :forwarded_port, guest: 9300, host: 9300
+  config.vm.network :forwarded_port, guest: 9243, host: 9243
+  config.vm.network :forwarded_port, guest: 5601, host: 5601
 
   # Full provisioning script, only runs on first 'vagrant up' or with 'vagrant provision'
   config.vm.provision :shell, inline: $provisionA, privileged: false, reset: true
+  # Run with elevated privileges for Elasticsearch installation
+  config.vm.provision :shell, inline: $provisionElasticsearch, privileged: true
   config.vm.provision :shell, inline: $provisionB, privileged: false
 
   config.vm.post_up_message = <<MESSAGE
diff --git a/app/chewy/accounts_index.rb b/app/chewy/accounts_index.rb
index abde8e92f1..1f8571c09d 100644
--- a/app/chewy/accounts_index.rb
+++ b/app/chewy/accounts_index.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class AccountsIndex < Chewy::Index
-  settings index: { refresh_interval: '30s' }, analysis: {
+  settings index: index_preset(refresh_interval: '30s'), analysis: {
     filter: {
       english_stop: {
         type: 'stop',
@@ -33,7 +33,7 @@ class AccountsIndex < Chewy::Index
       },
 
       verbatim: {
-        tokenizer: 'whitespace',
+        tokenizer: 'standard',
         filter: %w(lowercase asciifolding cjk_width),
       },
 
diff --git a/app/chewy/instances_index.rb b/app/chewy/instances_index.rb
index 2bce4043c9..8f10d13b6d 100644
--- a/app/chewy/instances_index.rb
+++ b/app/chewy/instances_index.rb
@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 class InstancesIndex < Chewy::Index
-  settings index: { refresh_interval: '30s' }
+  settings index: index_preset(refresh_interval: '30s')
 
   index_scope ::Instance.searchable
 
   root date_detection: false do
-    field :domain, type: 'text', index_prefixes: { min_chars: 1 }
+    field :domain, type: 'text', index_prefixes: { min_chars: 1, max_chars: 5 }
     field :accounts_count, type: 'long'
   end
 end
diff --git a/app/chewy/statuses_index.rb b/app/chewy/statuses_index.rb
index 6dd4fb18b0..9f680efa52 100644
--- a/app/chewy/statuses_index.rb
+++ b/app/chewy/statuses_index.rb
@@ -3,7 +3,7 @@
 class StatusesIndex < Chewy::Index
   include FormattingHelper
 
-  settings index: { refresh_interval: '30s' }, analysis: {
+  settings index: index_preset(refresh_interval: '30s', number_of_shards: 5), analysis: {
     filter: {
       english_stop: {
         type: 'stop',
diff --git a/app/chewy/tags_index.rb b/app/chewy/tags_index.rb
index df3d9e4cce..b2d50a000c 100644
--- a/app/chewy/tags_index.rb
+++ b/app/chewy/tags_index.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class TagsIndex < Chewy::Index
-  settings index: { refresh_interval: '30s' }, analysis: {
+  settings index: index_preset(refresh_interval: '30s'), analysis: {
     analyzer: {
       content: {
         tokenizer: 'keyword',
diff --git a/app/controllers/admin/domain_blocks_controller.rb b/app/controllers/admin/domain_blocks_controller.rb
index b9691c5a3a..96c31a38fd 100644
--- a/app/controllers/admin/domain_blocks_controller.rb
+++ b/app/controllers/admin/domain_blocks_controller.rb
@@ -40,7 +40,7 @@ module Admin
       end
 
       # Allow transparently upgrading a domain block
-      if existing_domain_block.present?
+      if existing_domain_block.present? && existing_domain_block.domain == TagManager.instance.normalize_domain(@domain_block.domain.strip)
         @domain_block = existing_domain_block
         @domain_block.assign_attributes(resource_params)
       end
diff --git a/app/controllers/api/v1/instances/languages_controller.rb b/app/controllers/api/v1/instances/languages_controller.rb
new file mode 100644
index 0000000000..17509e748c
--- /dev/null
+++ b/app/controllers/api/v1/instances/languages_controller.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class Api::V1::Instances::LanguagesController < Api::BaseController
+  skip_before_action :require_authenticated_user!, unless: :limited_federation_mode?
+  skip_around_action :set_locale
+
+  before_action :set_languages
+
+  vary_by ''
+
+  def show
+    cache_even_if_authenticated!
+    render json: @languages, each_serializer: REST::LanguageSerializer
+  end
+
+  private
+
+  def set_languages
+    @languages = LanguagesHelper::SUPPORTED_LOCALES.keys.map { |code| LanguagePresenter.new(code) }
+  end
+end
diff --git a/app/controllers/api/v1/profile/avatars_controller.rb b/app/controllers/api/v1/profile/avatars_controller.rb
new file mode 100644
index 0000000000..bc4d01a597
--- /dev/null
+++ b/app/controllers/api/v1/profile/avatars_controller.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class Api::V1::Profile::AvatarsController < Api::BaseController
+  before_action -> { doorkeeper_authorize! :write, :'write:accounts' }
+  before_action :require_user!
+
+  def destroy
+    @account = current_account
+    UpdateAccountService.new.call(@account, { avatar: nil }, raise_error: true)
+    ActivityPub::UpdateDistributionWorker.perform_async(@account.id)
+    render json: @account, serializer: REST::CredentialAccountSerializer
+  end
+end
diff --git a/app/controllers/api/v1/profile/headers_controller.rb b/app/controllers/api/v1/profile/headers_controller.rb
new file mode 100644
index 0000000000..9f4daa2f77
--- /dev/null
+++ b/app/controllers/api/v1/profile/headers_controller.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class Api::V1::Profile::HeadersController < Api::BaseController
+  before_action -> { doorkeeper_authorize! :write, :'write:accounts' }
+  before_action :require_user!
+
+  def destroy
+    @account = current_account
+    UpdateAccountService.new.call(@account, { header: nil }, raise_error: true)
+    ActivityPub::UpdateDistributionWorker.perform_async(@account.id)
+    render json: @account, serializer: REST::CredentialAccountSerializer
+  end
+end
diff --git a/app/controllers/concerns/captcha_concern.rb b/app/controllers/concerns/captcha_concern.rb
index 576304d1ca..170c8f5e03 100644
--- a/app/controllers/concerns/captcha_concern.rb
+++ b/app/controllers/concerns/captcha_concern.rb
@@ -42,7 +42,7 @@ module CaptchaConcern
   end
 
   def extend_csp_for_captcha!
-    policy = request.content_security_policy
+    policy = request.content_security_policy&.clone
 
     return unless captcha_required? && policy.present?
 
@@ -54,6 +54,8 @@ module CaptchaConcern
 
       policy.send(directive, *values)
     end
+
+    request.content_security_policy = policy
   end
 
   def render_captcha
diff --git a/app/controllers/concerns/web_app_controller_concern.rb b/app/controllers/concerns/web_app_controller_concern.rb
index 96c31566e0..550522ce02 100644
--- a/app/controllers/concerns/web_app_controller_concern.rb
+++ b/app/controllers/concerns/web_app_controller_concern.rb
@@ -12,7 +12,7 @@ module WebAppControllerConcern
   end
 
   def skip_csrf_meta_tags?
-    current_user.nil?
+    !(ENV['OMNIAUTH_ONLY'] == 'true' && Devise.omniauth_providers.length == 1) && current_user.nil?
   end
 
   def set_app_body_class
diff --git a/app/controllers/settings/privacy_controller.rb b/app/controllers/settings/privacy_controller.rb
new file mode 100644
index 0000000000..c2648eedd8
--- /dev/null
+++ b/app/controllers/settings/privacy_controller.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+class Settings::PrivacyController < Settings::BaseController
+  before_action :set_account
+
+  def show; end
+
+  def update
+    if UpdateAccountService.new.call(@account, account_params.except(:settings))
+      current_user.update!(settings_attributes: account_params[:settings])
+      ActivityPub::UpdateDistributionWorker.perform_async(@account.id)
+      redirect_to settings_privacy_path, notice: I18n.t('generic.changes_saved_msg')
+    else
+      render :show
+    end
+  end
+
+  private
+
+  def account_params
+    params.require(:account).permit(:discoverable, :unlocked, :show_collections, settings: UserSettings.keys)
+  end
+
+  def set_account
+    @account = current_account
+  end
+end
diff --git a/app/controllers/settings/profiles_controller.rb b/app/controllers/settings/profiles_controller.rb
index be5b4f3029..8ae69b7fe0 100644
--- a/app/controllers/settings/profiles_controller.rb
+++ b/app/controllers/settings/profiles_controller.rb
@@ -20,7 +20,7 @@ class Settings::ProfilesController < Settings::BaseController
   private
 
   def account_params
-    params.require(:account).permit(:display_name, :note, :avatar, :header, :locked, :bot, :discoverable, :hide_collections, fields_attributes: [:name, :value])
+    params.require(:account).permit(:display_name, :note, :avatar, :header, :bot, fields_attributes: [:name, :value])
   end
 
   def set_account
diff --git a/app/helpers/context_helper.rb b/app/helpers/context_helper.rb
index 87057a8b58..3027077c43 100644
--- a/app/helpers/context_helper.rb
+++ b/app/helpers/context_helper.rb
@@ -21,6 +21,8 @@ module ContextHelper
     focal_point: { 'toot' => 'http://joinmastodon.org/ns#', 'focalPoint' => { '@container' => '@list', '@id' => 'toot:focalPoint' } },
     blurhash: { 'toot' => 'http://joinmastodon.org/ns#', 'blurhash' => 'toot:blurhash' },
     discoverable: { 'toot' => 'http://joinmastodon.org/ns#', 'discoverable' => 'toot:discoverable' },
+    indexable: { 'toot' => 'http://joinmastodon.org/ns#', 'indexable' => 'toot:indexable' },
+    memorial: { 'toot' => 'http://joinmastodon.org/ns#', 'memorial' => 'toot:memorial' },
     voters_count: { 'toot' => 'http://joinmastodon.org/ns#', 'votersCount' => 'toot:votersCount' },
     olm: {
       'toot' => 'http://joinmastodon.org/ns#', 'Device' => 'toot:Device', 'Ed25519Signature' => 'toot:Ed25519Signature', 'Ed25519Key' => 'toot:Ed25519Key', 'Curve25519Key' => 'toot:Curve25519Key', 'EncryptedMessage' => 'toot:EncryptedMessage', 'publicKeyBase64' => 'toot:publicKeyBase64', 'deviceId' => 'toot:deviceId',
diff --git a/app/helpers/languages_helper.rb b/app/helpers/languages_helper.rb
index 1f400b477a..e76def5818 100644
--- a/app/helpers/languages_helper.rb
+++ b/app/helpers/languages_helper.rb
@@ -188,6 +188,7 @@ module LanguagesHelper
 
   ISO_639_3 = {
     ast: ['Asturian', 'Asturianu'].freeze,
+    chr: ['Cherokee', 'ᏣᎳᎩ ᎦᏬᏂᎯᏍᏗ'].freeze,
     ckb: ['Sorani (Kurdish)', 'سۆرانی'].freeze,
     cnr: ['Montenegrin', 'crnogorski'].freeze,
     jbo: ['Lojban', 'la .lojban.'].freeze,
@@ -200,6 +201,7 @@ module LanguagesHelper
     smj: ['Lule Sami', 'Julevsámegiella'].freeze,
     szl: ['Silesian', 'ślůnsko godka'].freeze,
     tok: ['Toki Pona', 'toki pona'].freeze,
+    xal: ['Kalmyk', 'Хальмг келн'].freeze,
     zba: ['Balaibalan', 'باليبلن'].freeze,
     zgh: ['Standard Moroccan Tamazight', 'ⵜⴰⵎⴰⵣⵉⵖⵜ'].freeze,
   }.freeze
diff --git a/app/javascript/core/settings.js b/app/javascript/core/settings.js
index 40537377c0..0155d933e4 100644
--- a/app/javascript/core/settings.js
+++ b/app/javascript/core/settings.js
@@ -18,22 +18,14 @@ delegate(document, '#account_display_name', 'input', ({ target }) => {
   }
 });
 
-delegate(document, '#account_avatar', 'change', ({ target }) => {
-  const avatar = document.querySelector('.card .avatar img');
+delegate(document, '#edit_profile input[type=file]', 'change', ({ target }) => {
+  const avatar = document.getElementById(target.id + '-preview');
   const [file] = target.files || [];
   const url = file ? URL.createObjectURL(file) : avatar.dataset.originalSrc;
 
   avatar.src = url;
 });
 
-delegate(document, '#account_header', 'change', ({ target }) => {
-  const header = document.querySelector('.card .card__img img');
-  const [file] = target.files || [];
-  const url = file ? URL.createObjectURL(file) : header.dataset.originalSrc;
-
-  header.src = url;
-});
-
 delegate(document, '#account_locked', 'change', ({ target }) => {
   const lock = document.querySelector('.card .display-name i');
 
diff --git a/app/javascript/flavours/glitch/actions/importer/normalizer.js b/app/javascript/flavours/glitch/actions/importer/normalizer.js
index 64d98a29db..2c8c47f250 100644
--- a/app/javascript/flavours/glitch/actions/importer/normalizer.js
+++ b/app/javascript/flavours/glitch/actions/importer/normalizer.js
@@ -77,7 +77,10 @@ export function normalizeStatus(status, normalOldStatus, settings) {
     normalStatus.hidden = normalOldStatus.get('hidden');
     normalStatus.quote = normalOldStatus.get('quote');
     normalStatus.quote_hidden = normalOldStatus.get('quote_hidden');
-    normalStatus.translation = normalOldStatus.get('translation');
+
+    if (normalOldStatus.get('translation')) {
+      normalStatus.translation = normalOldStatus.get('translation');
+    }
   } else {
     const spoilerText   = normalStatus.spoiler_text || '';
     const searchContent = ([spoilerText, status.content].concat((status.poll && status.poll.options) ? status.poll.options.map(option => option.title) : [])).concat(status.media_attachments.map(att => att.description)).join('\n\n').replace(/<br\s*\/?>/g, '\n').replace(/<\/p><p>/g, '\n\n');
diff --git a/app/javascript/flavours/glitch/actions/timelines.js b/app/javascript/flavours/glitch/actions/timelines.js
index 7d4d56a784..fa69bca985 100644
--- a/app/javascript/flavours/glitch/actions/timelines.js
+++ b/app/javascript/flavours/glitch/actions/timelines.js
@@ -157,7 +157,7 @@ export const expandHomeTimeline            = ({ maxId } = {}, done = noOp) => ex
 export const expandPublicTimeline          = ({ maxId, onlyMedia, onlyRemote, allowLocalOnly } = {}, done = noOp) => expandTimeline(`public${onlyRemote ? ':remote' : (allowLocalOnly ? ':allow_local_only' : '')}${onlyMedia ? ':media' : ''}`, '/api/v1/timelines/public', { remote: !!onlyRemote, allow_local_only: !!allowLocalOnly, max_id: maxId, only_media: !!onlyMedia }, done);
 export const expandCommunityTimeline       = ({ maxId, onlyMedia } = {}, done = noOp) => expandTimeline(`community${onlyMedia ? ':media' : ''}`, '/api/v1/timelines/public', { local: true, max_id: maxId, only_media: !!onlyMedia }, done);
 export const expandDirectTimeline          = ({ maxId } = {}, done = noOp) => expandTimeline('direct', '/api/v1/timelines/direct', { max_id: maxId }, done);
-export const expandAccountTimeline         = (accountId, { maxId, withReplies, tagged } = {}) => expandTimeline(`account:${accountId}${withReplies ? ':with_replies' : ''}${tagged ? `:${tagged}` : ''}`, `/api/v1/accounts/${accountId}/statuses`, { exclude_replies: !withReplies, tagged, max_id: maxId });
+export const expandAccountTimeline         = (accountId, { maxId, withReplies, tagged } = {}) => expandTimeline(`account:${accountId}${withReplies ? ':with_replies' : ''}${tagged ? `:${tagged}` : ''}`, `/api/v1/accounts/${accountId}/statuses`, { exclude_replies: !withReplies, exclude_reblogs: withReplies, tagged, max_id: maxId });
 export const expandAccountFeaturedTimeline = (accountId, { tagged } = {}) => expandTimeline(`account:${accountId}:pinned`, `/api/v1/accounts/${accountId}/statuses`, { pinned: true, tagged });
 export const expandAccountMediaTimeline    = (accountId, { maxId } = {}) => expandTimeline(`account:${accountId}:media`, `/api/v1/accounts/${accountId}/statuses`, { max_id: maxId, only_media: true, limit: 40 });
 export const expandListTimeline            = (id, { maxId } = {}, done = noOp) => expandTimeline(`list:${id}`, `/api/v1/timelines/list/${id}`, { max_id: maxId }, done);
diff --git a/app/javascript/flavours/glitch/components/admin/ReportReasonSelector.jsx b/app/javascript/flavours/glitch/components/admin/ReportReasonSelector.jsx
index d72465e4ad..542ca3e1b6 100644
--- a/app/javascript/flavours/glitch/components/admin/ReportReasonSelector.jsx
+++ b/app/javascript/flavours/glitch/components/admin/ReportReasonSelector.jsx
@@ -8,6 +8,7 @@ import classNames from 'classnames';
 import api from 'flavours/glitch/api';
 
 const messages = defineMessages({
+  legal: { id: 'report.categories.legal', defaultMessage: 'Legal' },
   other: { id: 'report.categories.other', defaultMessage: 'Other' },
   spam: { id: 'report.categories.spam', defaultMessage: 'Spam' },
   violation: { id: 'report.categories.violation', defaultMessage: 'Content violates one or more server rules' },
@@ -150,6 +151,7 @@ class ReportReasonSelector extends PureComponent {
     return (
       <div className='report-reason-selector'>
         <Category id='other' text={intl.formatMessage(messages.other)} selected={category === 'other'} onSelect={this.handleSelect} disabled={disabled} />
+        <Category id='legal' text={intl.formatMessage(messages.legal)} selected={category === 'legal'} onSelect={this.handleSelect} disabled={disabled} />
         <Category id='spam' text={intl.formatMessage(messages.spam)} selected={category === 'spam'} onSelect={this.handleSelect} disabled={disabled} />
         <Category id='violation' text={intl.formatMessage(messages.violation)} selected={category === 'violation'} onSelect={this.handleSelect} disabled={disabled}>
           {rules.map(rule => <Rule key={rule.id} id={rule.id} text={rule.text} selected={rule_ids.includes(rule.id)} onToggle={this.handleToggle} disabled={disabled} />)}
diff --git a/app/javascript/flavours/glitch/components/column.jsx b/app/javascript/flavours/glitch/components/column.jsx
index 312a6848b5..3c58130528 100644
--- a/app/javascript/flavours/glitch/components/column.jsx
+++ b/app/javascript/flavours/glitch/components/column.jsx
@@ -18,7 +18,19 @@ export default class Column extends PureComponent {
   };
 
   scrollTop () {
-    const scrollable = this.props.bindToDocument ? document.scrollingElement : this.node.querySelector('.scrollable');
+    let scrollable = null;
+
+    if (this.props.bindToDocument) {
+      scrollable = document.scrollingElement;
+    } else {
+      scrollable = this.node.querySelector('.scrollable');
+
+      // Some columns have nested `.scrollable` containers, with the outer one
+      // being a wrapper while the actual scrollable content is deeper.
+      if (scrollable.classList.contains('scrollable--flex')) {
+        scrollable = scrollable?.querySelector('.scrollable') || scrollable;
+      }
+   }
 
     if (!scrollable) {
       return;
diff --git a/app/javascript/flavours/glitch/features/account/components/header.jsx b/app/javascript/flavours/glitch/features/account/components/header.jsx
index c956834776..acebd9f322 100644
--- a/app/javascript/flavours/glitch/features/account/components/header.jsx
+++ b/app/javascript/flavours/glitch/features/account/components/header.jsx
@@ -196,9 +196,9 @@ class Header extends ImmutablePureComponent {
       if (signedIn && !account.get('relationship')) { // Wait until the relationship is loaded
         actionBtn = '';
       } else if (account.getIn(['relationship', 'requested'])) {
-        actionBtn = <Button className={classNames({ 'button--with-bell': bellBtn !== '' })} text={intl.formatMessage(messages.cancel_follow_request)} title={intl.formatMessage(messages.requested)} onClick={this.props.onFollow} />;
+        actionBtn = <Button text={intl.formatMessage(messages.cancel_follow_request)} title={intl.formatMessage(messages.requested)} onClick={this.props.onFollow} />;
       } else if (!account.getIn(['relationship', 'blocking'])) {
-        actionBtn = <Button className={classNames({ 'button--destructive': account.getIn(['relationship', 'following']), 'button--with-bell': bellBtn !== '' })} text={intl.formatMessage(account.getIn(['relationship', 'following']) ? messages.unfollow : messages.follow)} onClick={signedIn ? this.props.onFollow : this.props.onInteractionModal} />;
+        actionBtn = <Button className={classNames({ 'button--destructive': account.getIn(['relationship', 'following']) })} text={intl.formatMessage(account.getIn(['relationship', 'following']) ? messages.unfollow : messages.follow)} onClick={signedIn ? this.props.onFollow : this.props.onInteractionModal} />;
       } else if (account.getIn(['relationship', 'blocking'])) {
         actionBtn = <Button text={intl.formatMessage(messages.unblock, { name: account.get('username') })} onClick={this.props.onBlock} />;
       }
diff --git a/app/javascript/flavours/glitch/features/explore/components/story.jsx b/app/javascript/flavours/glitch/features/explore/components/story.jsx
index 9a4a221bca..8dc92a4d91 100644
--- a/app/javascript/flavours/glitch/features/explore/components/story.jsx
+++ b/app/javascript/flavours/glitch/features/explore/components/story.jsx
@@ -23,6 +23,7 @@ export default class Story extends PureComponent {
     author: PropTypes.string,
     sharedTimes: PropTypes.number,
     thumbnail: PropTypes.string,
+    thumbnailDescription: PropTypes.string,
     blurhash: PropTypes.string,
     expanded: PropTypes.bool,
   };
@@ -34,7 +35,7 @@ export default class Story extends PureComponent {
   handleImageLoad = () => this.setState({ thumbnailLoaded: true });
 
   render () {
-    const { expanded, url, title, lang, publisher, author, publishedAt, sharedTimes, thumbnail, blurhash } = this.props;
+    const { expanded, url, title, lang, publisher, author, publishedAt, sharedTimes, thumbnail, thumbnailDescription, blurhash } = this.props;
 
     const { thumbnailLoaded } = this.state;
 
@@ -50,7 +51,7 @@ export default class Story extends PureComponent {
           {thumbnail ? (
             <>
               <div className={classNames('story__thumbnail__preview', { 'story__thumbnail__preview--hidden': thumbnailLoaded })}><Blurhash hash={blurhash} /></div>
-              <img src={thumbnail} onLoad={this.handleImageLoad} alt='' role='presentation' />
+              <img src={thumbnail} onLoad={this.handleImageLoad} alt={thumbnailDescription} title={thumbnailDescription} lang={lang} />
             </>
           ) : <Skeleton />}
         </div>
diff --git a/app/javascript/flavours/glitch/features/explore/links.jsx b/app/javascript/flavours/glitch/features/explore/links.jsx
index 383f68a8b4..9124285f4f 100644
--- a/app/javascript/flavours/glitch/features/explore/links.jsx
+++ b/app/javascript/flavours/glitch/features/explore/links.jsx
@@ -67,6 +67,7 @@ class Links extends PureComponent {
             author={link.get('author_name')}
             sharedTimes={link.getIn(['history', 0, 'accounts']) * 1 + link.getIn(['history', 1, 'accounts']) * 1}
             thumbnail={link.get('image')}
+            thumbnailDescription={link.get('image_description')}
             blurhash={link.get('blurhash')}
           />
         ))}
diff --git a/app/javascript/flavours/glitch/features/explore/results.jsx b/app/javascript/flavours/glitch/features/explore/results.jsx
index 724aa02902..699105e0d6 100644
--- a/app/javascript/flavours/glitch/features/explore/results.jsx
+++ b/app/javascript/flavours/glitch/features/explore/results.jsx
@@ -110,10 +110,10 @@ class Results extends PureComponent {
     return (
       <>
         <div className='account__section-headline'>
-          <button onClick={this.handleSelectAll} className={type === 'all' && 'active'}><FormattedMessage id='search_results.all' defaultMessage='All' /></button>
-          <button onClick={this.handleSelectAccounts} className={type === 'accounts' && 'active'}><FormattedMessage id='search_results.accounts' defaultMessage='Profiles' /></button>
-          <button onClick={this.handleSelectHashtags} className={type === 'hashtags' && 'active'}><FormattedMessage id='search_results.hashtags' defaultMessage='Hashtags' /></button>
-          <button onClick={this.handleSelectStatuses} className={type === 'statuses' && 'active'}><FormattedMessage id='search_results.statuses' defaultMessage='Posts' /></button>
+          <button onClick={this.handleSelectAll} className={type === 'all' ? 'active' : undefined}><FormattedMessage id='search_results.all' defaultMessage='All' /></button>
+          <button onClick={this.handleSelectAccounts} className={type === 'accounts' ? 'active' : undefined}><FormattedMessage id='search_results.accounts' defaultMessage='Profiles' /></button>
+          <button onClick={this.handleSelectHashtags} className={type === 'hashtags' ? 'active' : undefined}><FormattedMessage id='search_results.hashtags' defaultMessage='Hashtags' /></button>
+          <button onClick={this.handleSelectStatuses} className={type === 'statuses' ? 'active' : undefined}><FormattedMessage id='search_results.statuses' defaultMessage='Posts' /></button>
         </div>
 
         <div className='explore__search-results'>
diff --git a/app/javascript/flavours/glitch/features/hashtag_timeline/components/hashtag_header.jsx b/app/javascript/flavours/glitch/features/hashtag_timeline/components/hashtag_header.jsx
new file mode 100644
index 0000000000..986bf80b51
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/hashtag_timeline/components/hashtag_header.jsx
@@ -0,0 +1,79 @@
+import PropTypes from 'prop-types';
+
+import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+
+import ImmutablePropTypes from 'react-immutable-proptypes';
+
+import Button from 'flavours/glitch/components/button';
+import { ShortNumber } from 'flavours/glitch/components/short_number';
+
+const messages = defineMessages({
+  followHashtag: { id: 'hashtag.follow', defaultMessage: 'Follow hashtag' },
+  unfollowHashtag: { id: 'hashtag.unfollow', defaultMessage: 'Unfollow hashtag' },
+});
+
+const usesRenderer = (displayNumber, pluralReady) => (
+  <FormattedMessage
+    id='hashtag.counter_by_uses'
+    defaultMessage='{count, plural, one {{counter} post} other {{counter} posts}}'
+    values={{
+      count: pluralReady,
+      counter: <strong>{displayNumber}</strong>,
+    }}
+  />
+);
+
+const peopleRenderer = (displayNumber, pluralReady) => (
+  <FormattedMessage
+    id='hashtag.counter_by_accounts'
+    defaultMessage='{count, plural, one {{counter} participant} other {{counter} participants}}'
+    values={{
+      count: pluralReady,
+      counter: <strong>{displayNumber}</strong>,
+    }}
+  />
+);
+
+const usesTodayRenderer = (displayNumber, pluralReady) => (
+  <FormattedMessage
+    id='hashtag.counter_by_uses_today'
+    defaultMessage='{count, plural, one {{counter} post} other {{counter} posts}} today'
+    values={{
+      count: pluralReady,
+      counter: <strong>{displayNumber}</strong>,
+    }}
+  />
+);
+
+export const HashtagHeader = injectIntl(({ tag, intl, disabled, onClick }) => {
+  if (!tag) {
+    return null;
+  }
+
+  const [uses, people] = tag.get('history').reduce((arr, day) => [arr[0] + day.get('uses') * 1, arr[1] + day.get('accounts') * 1], [0, 0]);
+  const dividingCircle = <span aria-hidden>{' · '}</span>;
+
+  return (
+    <div className='hashtag-header'>
+      <div className='hashtag-header__header'>
+        <h1>#{tag.get('name')}</h1>
+        <Button onClick={onClick} text={intl.formatMessage(tag.get('following') ? messages.unfollowHashtag : messages.followHashtag)} disabled={disabled} />
+      </div>
+
+      <div>
+        <ShortNumber value={uses} renderer={usesRenderer} />
+        {dividingCircle}
+        <ShortNumber value={people} renderer={peopleRenderer} />
+        {dividingCircle}
+        <ShortNumber value={tag.getIn(['history', 0, 'uses']) * 1} renderer={usesTodayRenderer} />
+      </div>
+    </div>
+  );
+});
+
+HashtagHeader.propTypes = {
+  tag: ImmutablePropTypes.map,
+  disabled: PropTypes.bool,
+  onClick: PropTypes.func,
+  intl: PropTypes.object,
+};
\ No newline at end of file
diff --git a/app/javascript/flavours/glitch/features/hashtag_timeline/index.jsx b/app/javascript/flavours/glitch/features/hashtag_timeline/index.jsx
index de67b06ca8..675c4cc022 100644
--- a/app/javascript/flavours/glitch/features/hashtag_timeline/index.jsx
+++ b/app/javascript/flavours/glitch/features/hashtag_timeline/index.jsx
@@ -1,9 +1,8 @@
 import PropTypes from 'prop-types';
 import { PureComponent } from 'react';
 
-import { injectIntl, FormattedMessage, defineMessages } from 'react-intl';
+import { FormattedMessage } from 'react-intl';
 
-import classNames from 'classnames';
 import { Helmet } from 'react-helmet';
 
 import ImmutablePropTypes from 'react-immutable-proptypes';
@@ -17,17 +16,11 @@ import { fetchHashtag, followHashtag, unfollowHashtag } from 'flavours/glitch/ac
 import { expandHashtagTimeline, clearTimeline } from 'flavours/glitch/actions/timelines';
 import Column from 'flavours/glitch/components/column';
 import ColumnHeader from 'flavours/glitch/components/column_header';
-import { Icon } from 'flavours/glitch/components/icon';
 import StatusListContainer from 'flavours/glitch/features/ui/containers/status_list_container';
 
+import { HashtagHeader } from './components/hashtag_header';
 import ColumnSettingsContainer from './containers/column_settings_container';
 
-
-const messages = defineMessages({
-  followHashtag: { id: 'hashtag.follow', defaultMessage: 'Follow hashtag' },
-  unfollowHashtag: { id: 'hashtag.unfollow', defaultMessage: 'Unfollow hashtag' },
-});
-
 const mapStateToProps = (state, props) => ({
   hasUnread: state.getIn(['timelines', `hashtag:${props.params.id}${props.params.local ? ':local' : ''}`, 'unread']) > 0,
   tag: state.getIn(['tags', props.params.id]),
@@ -48,7 +41,6 @@ class HashtagTimeline extends PureComponent {
     hasUnread: PropTypes.bool,
     tag: ImmutablePropTypes.map,
     multiColumn: PropTypes.bool,
-    intl: PropTypes.object,
   };
 
   handlePin = () => {
@@ -188,27 +180,11 @@ class HashtagTimeline extends PureComponent {
   };
 
   render () {
-    const { hasUnread, columnId, multiColumn, tag, intl } = this.props;
+    const { hasUnread, columnId, multiColumn, tag } = this.props;
     const { id, local } = this.props.params;
     const pinned = !!columnId;
     const { signedIn } = this.context.identity;
 
-    let followButton;
-
-    if (tag) {
-      const following = tag.get('following');
-
-      const classes = classNames('column-header__button', {
-        active: following,
-      });
-
-      followButton = (
-        <button className={classes} onClick={this.handleFollow} disabled={!signedIn} title={intl.formatMessage(following ? messages.unfollowHashtag : messages.followHashtag)} aria-label={intl.formatMessage(following ? messages.unfollowHashtag : messages.followHashtag)}>
-          <Icon id={following ? 'user-times' : 'user-plus'} fixedWidth className='column-header__icon' />
-        </button>
-      );
-    }
-
     return (
       <Column bindToDocument={!multiColumn} ref={this.setRef} label={`#${id}`}>
         <ColumnHeader
@@ -220,13 +196,14 @@ class HashtagTimeline extends PureComponent {
           onClick={this.handleHeaderClick}
           pinned={pinned}
           multiColumn={multiColumn}
-          extraButton={followButton}
           showBackButton
         >
           {columnId && <ColumnSettingsContainer columnId={columnId} />}
         </ColumnHeader>
 
         <StatusListContainer
+          prepend={pinned ? null : <HashtagHeader tag={tag} disabled={!signedIn} onClick={this.handleFollow} />}
+          alwaysPrepend
           trackScroll={!pinned}
           scrollKey={`hashtag_timeline-${columnId}`}
           timelineId={`hashtag:${id}${local ? ':local' : ''}`}
@@ -245,4 +222,4 @@ class HashtagTimeline extends PureComponent {
 
 }
 
-export default connect(mapStateToProps)(injectIntl(HashtagTimeline));
+export default connect(mapStateToProps)(HashtagTimeline);
diff --git a/app/javascript/flavours/glitch/features/interaction_modal/index.jsx b/app/javascript/flavours/glitch/features/interaction_modal/index.jsx
index e5b3c17016..bbfa9af8d4 100644
--- a/app/javascript/flavours/glitch/features/interaction_modal/index.jsx
+++ b/app/javascript/flavours/glitch/features/interaction_modal/index.jsx
@@ -13,7 +13,7 @@ import { openModal, closeModal } from 'flavours/glitch/actions/modal';
 import api from 'flavours/glitch/api';
 import Button from 'flavours/glitch/components/button';
 import { Icon } from 'flavours/glitch/components/icon';
-import { registrationsOpen } from 'flavours/glitch/initial_state';
+import { registrationsOpen, sso_redirect } from 'flavours/glitch/initial_state';
 
 const messages = defineMessages({
   loginPrompt: { id: 'interaction_modal.login.prompt', defaultMessage: 'Domain of your home server, e.g. mastodon.social' },
@@ -21,12 +21,16 @@ const messages = defineMessages({
 
 const mapStateToProps = (state, { accountId }) => ({
   displayNameHtml: state.getIn(['accounts', accountId, 'display_name_html']),
+  signupUrl: state.getIn(['server', 'server', 'registrations', 'url'], null) || '/auth/sign_up',
 });
 
 const mapDispatchToProps = (dispatch) => ({
   onSignupClick() {
-    dispatch(closeModal());
-    dispatch(openModal('CLOSED_REGISTRATIONS'));
+    dispatch(closeModal({
+        modalType: undefined,
+        ignoreFocus: false,
+      }));
+    dispatch(openModal({ modalType: 'CLOSED_REGISTRATIONS' }));
   },
 });
 
@@ -294,6 +298,7 @@ class InteractionModal extends React.PureComponent {
     url: PropTypes.string,
     type: PropTypes.oneOf(['reply', 'reblog', 'favourite', 'follow']),
     onSignupClick: PropTypes.func.isRequired,
+    signupUrl: PropTypes.string.isRequired,
   };
 
   handleSignupClick = () => {
@@ -301,7 +306,7 @@ class InteractionModal extends React.PureComponent {
   };
 
   render () {
-    const { url, type, displayNameHtml } = this.props;
+    const { url, type, displayNameHtml, signupUrl } = this.props;
 
     const name = <bdi dangerouslySetInnerHTML={{ __html: displayNameHtml }} />;
 
@@ -332,9 +337,15 @@ class InteractionModal extends React.PureComponent {
 
     let signupButton;
 
-    if (registrationsOpen) {
+    if (sso_redirect) {
       signupButton = (
-        <a href='/auth/sign_up' className='link-button'>
+        <a href={sso_redirect} data-method='post' className='link-button'>
+          <FormattedMessage id='sign_in_banner.create_account' defaultMessage='Create account' />
+        </a>
+      );
+    } else if (registrationsOpen) {
+      signupButton = (
+        <a href={signupUrl} className='link-button'>
           <FormattedMessage id='sign_in_banner.create_account' defaultMessage='Create account' />
         </a>
       );
diff --git a/app/javascript/flavours/glitch/features/status/components/card.jsx b/app/javascript/flavours/glitch/features/status/components/card.jsx
index ff34b525a0..a64314efa3 100644
--- a/app/javascript/flavours/glitch/features/status/components/card.jsx
+++ b/app/javascript/flavours/glitch/features/status/components/card.jsx
@@ -178,7 +178,8 @@ export default class Card extends PureComponent {
         dummy={!useBlurhash}
       />
     );
-    let thumbnail = <img src={card.get('image')} alt='' style={thumbnailStyle} onLoad={this.handleImageLoad} className='status-card__image-image' />;
+    const thumbnailDescription = card.get('image_description');
+    const thumbnail = <img src={card.get('image')} alt={thumbnailDescription} title={thumbnailDescription} lang={language} style={thumbnailStyle} onLoad={this.handleImageLoad} className='status-card__image-image' />;
     let spoilerButton = (
       <button type='button' onClick={this.handleReveal} className='spoiler-button__overlay'>
         <span className='spoiler-button__overlay__label'>
diff --git a/app/javascript/flavours/glitch/features/status/index.jsx b/app/javascript/flavours/glitch/features/status/index.jsx
index 8a128c27e7..b5226cb8d6 100644
--- a/app/javascript/flavours/glitch/features/status/index.jsx
+++ b/app/javascript/flavours/glitch/features/status/index.jsx
@@ -611,7 +611,7 @@ class Status extends ImmutablePureComponent {
         onMoveUp={this.handleMoveUp}
         onMoveDown={this.handleMoveDown}
         contextType='thread'
-        previousId={i > 0 && list.get(i - 1)}
+        previousId={i > 0 ? list.get(i - 1) : undefined}
         nextId={list.get(i + 1) || (ancestors && statusId)}
         rootId={statusId}
       />
diff --git a/app/javascript/flavours/glitch/features/status/index.jsx.orig b/app/javascript/flavours/glitch/features/status/index.jsx.orig
deleted file mode 100644
index d35b3a522a..0000000000
--- a/app/javascript/flavours/glitch/features/status/index.jsx.orig
+++ /dev/null
@@ -1,761 +0,0 @@
-import PropTypes from 'prop-types';
-
-import { defineMessages, injectIntl } from 'react-intl';
-
-import classNames from 'classnames';
-import { Helmet } from 'react-helmet';
-
-import Immutable from 'immutable';
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-
-import { HotKeys } from 'react-hotkeys';
-
-import { initBlockModal } from 'flavours/glitch/actions/blocks';
-import { initBoostModal } from 'flavours/glitch/actions/boosts';
-import {
-  replyCompose,
-  mentionCompose,
-  directCompose,
-} from 'flavours/glitch/actions/compose';
-import {
-  favourite,
-  unfavourite,
-  bookmark,
-  unbookmark,
-  reblog,
-  unreblog,
-  pin,
-  unpin,
-} from 'flavours/glitch/actions/interactions';
-import { changeLocalSetting } from 'flavours/glitch/actions/local_settings';
-import { openModal } from 'flavours/glitch/actions/modal';
-import { initMuteModal } from 'flavours/glitch/actions/mutes';
-import { initReport } from 'flavours/glitch/actions/reports';
-import {
-  fetchStatus,
-  muteStatus,
-  unmuteStatus,
-  deleteStatus,
-  editStatus,
-  hideStatus,
-  revealStatus,
-  translateStatus,
-  undoStatusTranslation,
-} from 'flavours/glitch/actions/statuses';
-import { Icon } from 'flavours/glitch/components/icon';
-import { LoadingIndicator } from 'flavours/glitch/components/loading_indicator';
-import { textForScreenReader, defaultMediaVisibility } from 'flavours/glitch/components/status';
-import ScrollContainer from 'flavours/glitch/containers/scroll_container';
-import StatusContainer from 'flavours/glitch/containers/status_container';
-import BundleColumnError from 'flavours/glitch/features/ui/components/bundle_column_error';
-import Column from 'flavours/glitch/features/ui/components/column';
-import { boostModal, favouriteModal, deleteModal } from 'flavours/glitch/initial_state';
-import { makeGetStatus, makeGetPictureInPicture } from 'flavours/glitch/selectors';
-import { autoUnfoldCW } from 'flavours/glitch/utils/content_warning';
-
-import ColumnHeader from '../../components/column_header';
-import { attachFullscreenListener, detachFullscreenListener, isFullscreen } from '../ui/util/fullscreen';
-
-import ActionBar from './components/action_bar';
-import DetailedStatus from './components/detailed_status';
-
-const messages = defineMessages({
-  deleteConfirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' },
-  deleteMessage: { id: 'confirmations.delete.message', defaultMessage: 'Are you sure you want to delete this status?' },
-  redraftConfirm: { id: 'confirmations.redraft.confirm', defaultMessage: 'Delete & redraft' },
-  redraftMessage: { id: 'confirmations.redraft.message', defaultMessage: 'Are you sure you want to delete this status and re-draft it? Favorites and boosts will be lost, and replies to the original post will be orphaned.' },
-  revealAll: { id: 'status.show_more_all', defaultMessage: 'Show more for all' },
-  hideAll: { id: 'status.show_less_all', defaultMessage: 'Show less for all' },
-  statusTitleWithAttachments: { id: 'status.title.with_attachments', defaultMessage: '{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}' },
-  detailedStatus: { id: 'status.detailed_status', defaultMessage: 'Detailed conversation view' },
-  replyConfirm: { id: 'confirmations.reply.confirm', defaultMessage: 'Reply' },
-  replyMessage: { id: 'confirmations.reply.message', defaultMessage: 'Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
-  tootHeading: { id: 'account.posts_with_replies', defaultMessage: 'Posts and replies' },
-});
-
-const makeMapStateToProps = () => {
-  const getStatus = makeGetStatus();
-  const getPictureInPicture = makeGetPictureInPicture();
-
-  const getAncestorsIds = createSelector([
-    (_, { id }) => id,
-    state => state.getIn(['contexts', 'inReplyTos']),
-  ], (statusId, inReplyTos) => {
-    let ancestorsIds = Immutable.List();
-    ancestorsIds = ancestorsIds.withMutations(mutable => {
-      let id = statusId;
-
-      while (id && !mutable.includes(id)) {
-        mutable.unshift(id);
-        id = inReplyTos.get(id);
-      }
-    });
-
-    return ancestorsIds;
-  });
-
-  const getDescendantsIds = createSelector([
-    (_, { id }) => id,
-    state => state.getIn(['contexts', 'replies']),
-    state => state.get('statuses'),
-  ], (statusId, contextReplies, statuses) => {
-    let descendantsIds = [];
-    const ids = [statusId];
-
-    while (ids.length > 0) {
-      let id        = ids.pop();
-      const replies = contextReplies.get(id);
-
-      if (statusId !== id) {
-        descendantsIds.push(id);
-      }
-
-      if (replies) {
-        replies.reverse().forEach(reply => {
-          if (!ids.includes(reply) && !descendantsIds.includes(reply) && statusId !== reply) ids.push(reply);
-        });
-      }
-    }
-
-    let insertAt = descendantsIds.findIndex((id) => statuses.get(id).get('in_reply_to_account_id') !== statuses.get(id).get('account'));
-    if (insertAt !== -1) {
-      descendantsIds.forEach((id, idx) => {
-        if (idx > insertAt && statuses.get(id).get('in_reply_to_account_id') === statuses.get(id).get('account')) {
-          descendantsIds.splice(idx, 1);
-          descendantsIds.splice(insertAt, 0, id);
-          insertAt += 1;
-        }
-      });
-    }
-
-    return Immutable.List(descendantsIds);
-  });
-
-  const mapStateToProps = (state, props) => {
-    const status = getStatus(state, { id: props.params.statusId });
-
-    let ancestorsIds   = Immutable.List();
-    let descendantsIds = Immutable.List();
-
-    if (status) {
-      ancestorsIds   = getAncestorsIds(state, { id: status.get('in_reply_to_id') });
-      descendantsIds = getDescendantsIds(state, { id: status.get('id') });
-    }
-
-    return {
-      isLoading: state.getIn(['statuses', props.params.statusId, 'isLoading']),
-      status,
-      ancestorsIds,
-      descendantsIds,
-      settings: state.get('local_settings'),
-      askReplyConfirmation: state.getIn(['local_settings', 'confirm_before_clearing_draft']) && state.getIn(['compose', 'text']).trim().length !== 0,
-      domain: state.getIn(['meta', 'domain']),
-      pictureInPicture: getPictureInPicture(state, { id: props.params.statusId }),
-    };
-  };
-
-  return mapStateToProps;
-};
-
-const truncate = (str, num) => {
-  const arr = Array.from(str);
-  if (arr.length > num) {
-    return arr.slice(0, num).join('') + '…';
-  } else {
-    return str;
-  }
-};
-
-const titleFromStatus = (intl, status) => {
-  const displayName = status.getIn(['account', 'display_name']);
-  const username = status.getIn(['account', 'username']);
-  const user = displayName.trim().length === 0 ? username : displayName;
-  const text = status.get('search_index');
-  const attachmentCount = status.get('media_attachments').size;
-
-  return text ? `${user}: "${truncate(text, 30)}"` : intl.formatMessage(messages.statusTitleWithAttachments, { user, attachmentCount });
-};
-
-class Status extends ImmutablePureComponent {
-
-  static contextTypes = {
-    router: PropTypes.object,
-    identity: PropTypes.object,
-  };
-
-  static propTypes = {
-    params: PropTypes.object.isRequired,
-    dispatch: PropTypes.func.isRequired,
-    status: ImmutablePropTypes.map,
-    isLoading: PropTypes.bool,
-    settings: ImmutablePropTypes.map.isRequired,
-    ancestorsIds: ImmutablePropTypes.list.isRequired,
-    descendantsIds: ImmutablePropTypes.list.isRequired,
-    intl: PropTypes.object.isRequired,
-    askReplyConfirmation: PropTypes.bool,
-    multiColumn: PropTypes.bool,
-    domain: PropTypes.string.isRequired,
-    pictureInPicture: ImmutablePropTypes.contains({
-      inUse: PropTypes.bool,
-      available: PropTypes.bool,
-    }),
-  };
-
-  state = {
-    fullscreen: false,
-    isExpanded: undefined,
-    threadExpanded: undefined,
-    statusId: undefined,
-    loadedStatusId: undefined,
-    showMedia: undefined,
-    revealBehindCW: undefined,
-  };
-
-  componentDidMount () {
-    attachFullscreenListener(this.onFullScreenChange);
-    this.props.dispatch(fetchStatus(this.props.params.statusId));
-  }
-
-  static getDerivedStateFromProps(props, state) {
-    let update = {};
-    let updated = false;
-
-    if (props.params.statusId && state.statusId !== props.params.statusId) {
-      props.dispatch(fetchStatus(props.params.statusId));
-      update.threadExpanded = undefined;
-      update.statusId = props.params.statusId;
-      updated = true;
-    }
-
-    const revealBehindCW = props.settings.getIn(['media', 'reveal_behind_cw']);
-    if (revealBehindCW !== state.revealBehindCW) {
-      update.revealBehindCW = revealBehindCW;
-      if (revealBehindCW) update.showMedia = defaultMediaVisibility(props.status, props.settings);
-      updated = true;
-    }
-
-    if (props.status && state.loadedStatusId !== props.status.get('id')) {
-      update.showMedia = defaultMediaVisibility(props.status, props.settings);
-      update.loadedStatusId = props.status.get('id');
-      update.isExpanded = autoUnfoldCW(props.settings, props.status);
-      updated = true;
-    }
-
-    return updated ? update : null;
-  }
-
-  handleToggleHidden = () => {
-    const { status } = this.props;
-
-    if (this.props.settings.getIn(['content_warnings', 'shared_state'])) {
-      if (status.get('hidden')) {
-        this.props.dispatch(revealStatus(status.get('id')));
-      } else {
-        this.props.dispatch(hideStatus(status.get('id')));
-      }
-    } else if (this.props.status.get('spoiler_text')) {
-      this.setExpansion(!this.state.isExpanded);
-    }
-  };
-
-  handleToggleMediaVisibility = () => {
-    this.setState({ showMedia: !this.state.showMedia });
-  };
-
-  handleModalFavourite = (status) => {
-    this.props.dispatch(favourite(status));
-  };
-
-  handleFavouriteClick = (status, e) => {
-    const { dispatch } = this.props;
-    const { signedIn } = this.context.identity;
-
-    if (signedIn) {
-      if (status.get('favourited')) {
-        dispatch(unfavourite(status));
-      } else {
-        if ((e && e.shiftKey) || !favouriteModal) {
-          this.handleModalFavourite(status);
-        } else {
-          dispatch(openModal({
-            modalType: 'FAVOURITE',
-            modalProps: {
-              status,
-              onFavourite: this.handleModalFavourite,
-            },
-          }));
-        }
-      }
-    } else {
-      dispatch(openModal({
-        modalType: 'INTERACTION',
-        modalProps: {
-          type: 'favourite',
-          accountId: status.getIn(['account', 'id']),
-          url: status.get('url'),
-        },
-      }));
-    }
-  };
-
-  handlePin = (status) => {
-    if (status.get('pinned')) {
-      this.props.dispatch(unpin(status));
-    } else {
-      this.props.dispatch(pin(status));
-    }
-  };
-
-  handleReplyClick = (status) => {
-    const { askReplyConfirmation, dispatch, intl } = this.props;
-    const { signedIn } = this.context.identity;
-
-    if (signedIn) {
-      if (askReplyConfirmation) {
-        dispatch(openModal({
-          modalType: 'CONFIRM',
-          modalProps: {
-            message: intl.formatMessage(messages.replyMessage),
-            confirm: intl.formatMessage(messages.replyConfirm),
-            onDoNotAsk: () => dispatch(changeLocalSetting(['confirm_before_clearing_draft'], false)),
-            onConfirm: () => dispatch(replyCompose(status, this.context.router.history)),
-          },
-        }));
-      } else {
-        dispatch(replyCompose(status, this.context.router.history));
-      }
-    } else {
-      dispatch(openModal({
-        modalType: 'INTERACTION',
-        modalProps: {
-          type: 'reply',
-          accountId: status.getIn(['account', 'id']),
-          url: status.get('url'),
-        },
-      }));
-    }
-  };
-
-  handleModalReblog = (status, privacy) => {
-    const { dispatch } = this.props;
-
-    if (status.get('reblogged')) {
-      dispatch(unreblog(status));
-    } else {
-      dispatch(reblog(status, privacy));
-    }
-  };
-
-  handleReblogClick = (status, e) => {
-    const { settings, dispatch } = this.props;
-    const { signedIn } = this.context.identity;
-
-    if (signedIn) {
-      if (settings.get('confirm_boost_missing_media_description') && status.get('media_attachments').some(item => !item.get('description')) && !status.get('reblogged')) {
-        dispatch(initBoostModal({ status, onReblog: this.handleModalReblog, missingMediaDescription: true }));
-      } else if ((e && e.shiftKey) || !boostModal) {
-        this.handleModalReblog(status);
-      } else {
-        dispatch(initBoostModal({ status, onReblog: this.handleModalReblog }));
-      }
-    } else {
-      dispatch(openModal({
-        modalType: 'INTERACTION',
-        modalProps: {
-          type: 'reblog',
-          accountId: status.getIn(['account', 'id']),
-          url: status.get('url'),
-        },
-      }));
-    }
-  };
-
-  handleBookmarkClick = (status) => {
-    if (status.get('bookmarked')) {
-      this.props.dispatch(unbookmark(status));
-    } else {
-      this.props.dispatch(bookmark(status));
-    }
-  };
-
-  handleDeleteClick = (status, history, withRedraft = false) => {
-    const { dispatch, intl } = this.props;
-
-    if (!deleteModal) {
-      dispatch(deleteStatus(status.get('id'), history, withRedraft));
-    } else {
-      dispatch(openModal({
-        modalType: 'CONFIRM',
-        modalProps: {
-          message: intl.formatMessage(withRedraft ? messages.redraftMessage : messages.deleteMessage),
-          confirm: intl.formatMessage(withRedraft ? messages.redraftConfirm : messages.deleteConfirm),
-          onConfirm: () => dispatch(deleteStatus(status.get('id'), history, withRedraft)),
-        },
-      }));
-    }
-  };
-
-  handleEditClick = (status, history) => {
-    this.props.dispatch(editStatus(status.get('id'), history));
-  };
-
-  handleDirectClick = (account, router) => {
-    this.props.dispatch(directCompose(account, router));
-  };
-
-  handleMentionClick = (account, router) => {
-    this.props.dispatch(mentionCompose(account, router));
-  };
-
-  handleOpenMedia = (media, index, lang) => {
-    this.props.dispatch(openModal({
-      modalType: 'MEDIA',
-      modalProps: { statusId: this.props.status.get('id'), media, index, lang },
-    }));
-  };
-
-  handleOpenVideo = (media, lang, options) => {
-    this.props.dispatch(openModal({
-      modalType: 'VIDEO',
-      modalProps: { statusId: this.props.status.get('id'), media, lang, options },
-    }));
-  };
-
-  handleHotkeyOpenMedia = e => {
-    const { status } = this.props;
-
-    e.preventDefault();
-
-    if (status.get('media_attachments').size > 0) {
-      if (status.getIn(['media_attachments', 0, 'type']) === 'video') {
-        this.handleOpenVideo(status.getIn(['media_attachments', 0]), { startTime: 0 });
-      } else {
-        this.handleOpenMedia(status.get('media_attachments'), 0);
-      }
-    }
-  };
-
-  handleMuteClick = (account) => {
-    this.props.dispatch(initMuteModal(account));
-  };
-
-  handleConversationMuteClick = (status) => {
-    if (status.get('muted')) {
-      this.props.dispatch(unmuteStatus(status.get('id')));
-    } else {
-      this.props.dispatch(muteStatus(status.get('id')));
-    }
-  };
-
-  handleToggleAll = () => {
-    const { status, ancestorsIds, descendantsIds, settings } = this.props;
-    const statusIds = [status.get('id')].concat(ancestorsIds.toJS(), descendantsIds.toJS());
-    let { isExpanded } = this.state;
-
-    if (settings.getIn(['content_warnings', 'shared_state']))
-      isExpanded = !status.get('hidden');
-
-    if (!isExpanded) {
-      this.props.dispatch(revealStatus(statusIds));
-    } else {
-      this.props.dispatch(hideStatus(statusIds));
-    }
-
-    this.setState({ isExpanded: !isExpanded, threadExpanded: !isExpanded });
-  };
-
-  handleTranslate = status => {
-    const { dispatch } = this.props;
-
-    if (status.get('translation')) {
-      dispatch(undoStatusTranslation(status.get('id'), status.get('poll')));
-    } else {
-      dispatch(translateStatus(status.get('id')));
-    }
-  };
-
-  handleBlockClick = (status) => {
-    const { dispatch } = this.props;
-    const account = status.get('account');
-    dispatch(initBlockModal(account));
-  };
-
-  handleReport = (status) => {
-    this.props.dispatch(initReport(status.get('account'), status));
-  };
-
-  handleEmbed = (status) => {
-    this.props.dispatch(openModal({
-      modalType: 'EMBED',
-      modalProps: { id: status.get('id') },
-    }));
-  };
-
-  handleHotkeyToggleSensitive = () => {
-    this.handleToggleMediaVisibility();
-  };
-
-  handleHotkeyMoveUp = () => {
-    this.handleMoveUp(this.props.status.get('id'));
-  };
-
-  handleHotkeyMoveDown = () => {
-    this.handleMoveDown(this.props.status.get('id'));
-  };
-
-  handleHotkeyReply = e => {
-    e.preventDefault();
-    this.handleReplyClick(this.props.status);
-  };
-
-  handleHotkeyFavourite = () => {
-    this.handleFavouriteClick(this.props.status);
-  };
-
-  handleHotkeyBoost = () => {
-    this.handleReblogClick(this.props.status);
-  };
-
-  handleHotkeyBookmark = () => {
-    this.handleBookmarkClick(this.props.status);
-  };
-
-  handleHotkeyMention = e => {
-    e.preventDefault();
-    this.handleMentionClick(this.props.status);
-  };
-
-  handleHotkeyOpenProfile = () => {
-    this.context.router.history.push(`/@${this.props.status.getIn(['account', 'acct'])}`);
-  };
-
-  handleMoveUp = id => {
-    const { status, ancestorsIds, descendantsIds } = this.props;
-
-    if (id === status.get('id')) {
-      this._selectChild(ancestorsIds.size - 1, true);
-    } else {
-      let index = ancestorsIds.indexOf(id);
-
-      if (index === -1) {
-        index = descendantsIds.indexOf(id);
-        this._selectChild(ancestorsIds.size + index, true);
-      } else {
-        this._selectChild(index - 1, true);
-      }
-    }
-  };
-
-  handleMoveDown = id => {
-    const { status, ancestorsIds, descendantsIds } = this.props;
-
-    if (id === status.get('id')) {
-      this._selectChild(ancestorsIds.size + 1, false);
-    } else {
-      let index = ancestorsIds.indexOf(id);
-
-      if (index === -1) {
-        index = descendantsIds.indexOf(id);
-        this._selectChild(ancestorsIds.size + index + 2, false);
-      } else {
-        this._selectChild(index + 1, false);
-      }
-    }
-  };
-
-  _selectChild (index, align_top) {
-    const container = this.node;
-    const element = container.querySelectorAll('.focusable')[index];
-
-    if (element) {
-      if (align_top && container.scrollTop > element.offsetTop) {
-        element.scrollIntoView(true);
-      } else if (!align_top && container.scrollTop + container.clientHeight < element.offsetTop + element.offsetHeight) {
-        element.scrollIntoView(false);
-      }
-      element.focus();
-    }
-  }
-
-  handleHeaderClick = () => {
-    this.column.scrollTop();
-  };
-
-  renderChildren (list, ancestors) {
-    const { params: { statusId } } = this.props;
-
-    return list.map((id, i) => (
-      <StatusContainer
-        key={id}
-        id={id}
-        expanded={this.state.threadExpanded}
-        onMoveUp={this.handleMoveUp}
-        onMoveDown={this.handleMoveDown}
-        contextType='thread'
-        previousId={i > 0 && list.get(i - 1)}
-        nextId={list.get(i + 1) || (ancestors && statusId)}
-        rootId={statusId}
-      />
-    ));
-  }
-
-  setExpansion = value => {
-    this.setState({ isExpanded: value });
-  };
-
-  setRef = c => {
-    this.node = c;
-  };
-
-  setColumnRef = c => {
-    this.column = c;
-  };
-
-  componentDidUpdate (prevProps) {
-    const { status, ancestorsIds, multiColumn } = this.props;
-
-    if (status && (ancestorsIds.size > prevProps.ancestorsIds.size || prevProps.status?.get('id') !== status.get('id'))) {
-      window.requestAnimationFrame(() => {
-        this.node?.querySelector('.detailed-status__wrapper')?.scrollIntoView(true);
-
-        // In the single-column interface, `scrollIntoView` will put the post behind the header,
-        // so compensate for that.
-        if (!multiColumn) {
-          const offset = document.querySelector('.column-header__wrapper')?.getBoundingClientRect()?.bottom;
-          if (offset) {
-            const scrollingElement = document.scrollingElement || document.body;
-            scrollingElement.scrollBy(0, -offset);
-          }
-        }
-      });
-    }
-  }
-
-  componentWillUnmount () {
-    detachFullscreenListener(this.onFullScreenChange);
-  }
-
-  onFullScreenChange = () => {
-    this.setState({ fullscreen: isFullscreen() });
-  };
-
-  render () {
-    let ancestors, descendants;
-    const { isLoading, status, settings, ancestorsIds, descendantsIds, intl, domain, multiColumn, pictureInPicture } = this.props;
-    const { fullscreen } = this.state;
-
-    if (isLoading) {
-      return (
-        <Column>
-          <LoadingIndicator />
-        </Column>
-      );
-    }
-
-    if (status === null) {
-      return (
-        <BundleColumnError multiColumn={multiColumn} errorType='routing' />
-      );
-    }
-
-    const isExpanded = settings.getIn(['content_warnings', 'shared_state']) ? !status.get('hidden') : this.state.isExpanded;
-
-    if (ancestorsIds && ancestorsIds.size > 0) {
-      ancestors = <>{this.renderChildren(ancestorsIds, true)}</>;
-    }
-
-    if (descendantsIds && descendantsIds.size > 0) {
-      descendants = <>{this.renderChildren(descendantsIds)}</>;
-    }
-
-    const isLocal = status.getIn(['account', 'acct'], '').indexOf('@') === -1;
-    const isIndexable = !status.getIn(['account', 'noindex']);
-
-    const handlers = {
-      moveUp: this.handleHotkeyMoveUp,
-      moveDown: this.handleHotkeyMoveDown,
-      reply: this.handleHotkeyReply,
-      favourite: this.handleHotkeyFavourite,
-      boost: this.handleHotkeyBoost,
-      bookmark: this.handleHotkeyBookmark,
-      mention: this.handleHotkeyMention,
-      openProfile: this.handleHotkeyOpenProfile,
-      toggleSpoiler: this.handleToggleHidden,
-      toggleSensitive: this.handleHotkeyToggleSensitive,
-      openMedia: this.handleHotkeyOpenMedia,
-    };
-
-    return (
-      <Column bindToDocument={!multiColumn} ref={this.setColumnRef} label={intl.formatMessage(messages.detailedStatus)}>
-        <ColumnHeader
-          icon='comment'
-          title={intl.formatMessage(messages.tootHeading)}
-          onClick={this.handleHeaderClick}
-          showBackButton
-          multiColumn={multiColumn}
-          extraButton={(
-            <button type='button' className='column-header__button' title={intl.formatMessage(!isExpanded ? messages.revealAll : messages.hideAll)} aria-label={intl.formatMessage(!isExpanded ? messages.revealAll : messages.hideAll)} onClick={this.handleToggleAll}><Icon id={!isExpanded ? 'eye-slash' : 'eye'} /></button>
-          )}
-        />
-
-        <ScrollContainer scrollKey='thread'>
-          <div className={classNames('scrollable', { fullscreen })} ref={this.setRef}>
-            {ancestors}
-
-            <HotKeys handlers={handlers}>
-              <div className={classNames('focusable', 'detailed-status__wrapper', `detailed-status__wrapper-${status.get('visibility')}`)} tabIndex={0} aria-label={textForScreenReader(intl, status, false, isExpanded)}>
-                <DetailedStatus
-                  key={`details-${status.get('id')}`}
-                  status={status}
-                  settings={settings}
-                  onOpenVideo={this.handleOpenVideo}
-                  onOpenMedia={this.handleOpenMedia}
-                  expanded={isExpanded}
-                  onToggleHidden={this.handleToggleHidden}
-                  onTranslate={this.handleTranslate}
-                  domain={domain}
-                  showMedia={this.state.showMedia}
-                  onToggleMediaVisibility={this.handleToggleMediaVisibility}
-                  pictureInPicture={pictureInPicture}
-                />
-
-                <ActionBar
-                  key={`action-bar-${status.get('id')}`}
-                  status={status}
-                  onReply={this.handleReplyClick}
-                  onFavourite={this.handleFavouriteClick}
-                  onReblog={this.handleReblogClick}
-                  onBookmark={this.handleBookmarkClick}
-                  onDelete={this.handleDeleteClick}
-                  onEdit={this.handleEditClick}
-                  onDirect={this.handleDirectClick}
-                  onMention={this.handleMentionClick}
-                  onMute={this.handleMuteClick}
-                  onMuteConversation={this.handleConversationMuteClick}
-                  onBlock={this.handleBlockClick}
-                  onReport={this.handleReport}
-                  onPin={this.handlePin}
-                  onEmbed={this.handleEmbed}
-                />
-              </div>
-            </HotKeys>
-
-            {descendants}
-          </div>
-        </ScrollContainer>
-
-        <Helmet>
-          <title>{titleFromStatus(intl, status)}</title>
-          <meta name='robots' content={(isLocal && isIndexable) ? 'all' : 'noindex'} />
-          <link rel='canonical' href={status.get('url')} />
-        </Helmet>
-      </Column>
-    );
-  }
-
-}
-
-export default injectIntl(connect(makeMapStateToProps)(Status));
diff --git a/app/javascript/flavours/glitch/features/ui/components/focal_point_modal.jsx b/app/javascript/flavours/glitch/features/ui/components/focal_point_modal.jsx
index ed3bed47e1..eeef422779 100644
--- a/app/javascript/flavours/glitch/features/ui/components/focal_point_modal.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/focal_point_modal.jsx
@@ -423,4 +423,4 @@ class FocalPointModal extends ImmutablePureComponent {
 
 export default connect(mapStateToProps, mapDispatchToProps, null, {
   forwardRef: true,
-})(injectIntl(FocalPointModal, { withRef: true }));
+})(injectIntl(FocalPointModal, { forwardRef: true }));
diff --git a/app/javascript/flavours/glitch/features/ui/components/header.jsx b/app/javascript/flavours/glitch/features/ui/components/header.jsx
index 1ebecbd29d..114d348d45 100644
--- a/app/javascript/flavours/glitch/features/ui/components/header.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/header.jsx
@@ -13,7 +13,7 @@ import { Avatar } from 'flavours/glitch/components/avatar';
 import { Icon } from 'flavours/glitch/components/icon';
 import { WordmarkLogo, SymbolLogo } from 'flavours/glitch/components/logo';
 import Permalink from 'flavours/glitch/components/permalink';
-import { registrationsOpen, me } from 'flavours/glitch/initial_state';
+import { registrationsOpen, me, sso_redirect } from 'flavours/glitch/initial_state';
 
 const Account = connect(state => ({
   account: state.getIn(['accounts', me]),
@@ -74,28 +74,35 @@ class Header extends PureComponent {
         </>
       );
     } else {
-      let signupButton;
 
-      if (registrationsOpen) {
-        signupButton = (
-          <a href={signupUrl} className='button'>
-            <FormattedMessage id='sign_in_banner.create_account' defaultMessage='Create account' />
-          </a>
-        );
+      if (sso_redirect) {
+        content = (
+            <a href={sso_redirect} data-method='post' className='button button--block button-tertiary'><FormattedMessage id='sign_in_banner.sso_redirect' defaultMessage='Login or Register' /></a>
+        )
       } else {
-        signupButton = (
-          <button className='button' onClick={openClosedRegistrationsModal}>
-            <FormattedMessage id='sign_in_banner.create_account' defaultMessage='Create account' />
-          </button>
+        let signupButton;
+
+        if (registrationsOpen) {
+          signupButton = (
+            <a href={signupUrl} className='button'>
+              <FormattedMessage id='sign_in_banner.create_account' defaultMessage='Create account' />
+            </a>
+          );
+        } else {
+          signupButton = (
+            <button className='button' onClick={openClosedRegistrationsModal}>
+              <FormattedMessage id='sign_in_banner.create_account' defaultMessage='Create account' />
+            </button>
+          );
+        }
+
+        content = (
+          <>
+            {signupButton}
+            <a href='/auth/sign_in' className='button button-tertiary'><FormattedMessage id='sign_in_banner.sign_in' defaultMessage='Login' /></a>
+          </>
         );
       }
-
-      content = (
-        <>
-          {signupButton}
-          <a href='/auth/sign_in' className='button button-tertiary'><FormattedMessage id='sign_in_banner.sign_in' defaultMessage='Login' /></a>
-        </>
-      );
     }
 
     return (
diff --git a/app/javascript/flavours/glitch/features/ui/components/modal_root.jsx b/app/javascript/flavours/glitch/features/ui/components/modal_root.jsx
index 1e5bf40db7..94adbf8f83 100644
--- a/app/javascript/flavours/glitch/features/ui/components/modal_root.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/modal_root.jsx
@@ -105,14 +105,7 @@ export default class ModalRoot extends PureComponent {
 
   handleClose = (ignoreFocus = false) => {
     const { onClose } = this.props;
-    let message = null;
-    try {
-      message = this._modal?.getWrappedInstance?.().getCloseConfirmationMessage?.();
-    } catch (_) {
-      // injectIntl defines `getWrappedInstance` but errors out if `withRef`
-      // isn't set.
-      // This would be much smoother with react-intl 3+ and `forwardRef`.
-    }
+    const message = this._modal?.getCloseConfirmationMessage?.();
     onClose(message, ignoreFocus);
   };
 
@@ -133,7 +126,10 @@ export default class ModalRoot extends PureComponent {
         {visible && (
           <>
             <BundleContainer fetchComponent={MODAL_COMPONENTS[type]} loading={this.renderLoading(type)} error={this.renderError} renderDelay={200}>
-              {(SpecificComponent) => <SpecificComponent {...props} onChangeBackgroundColor={this.setBackgroundColor} onClose={this.handleClose} ref={this.setModalRef} />}
+              {(SpecificComponent) => {
+                const ref = typeof SpecificComponent !== 'function' ? this.setModalRef : undefined;
+                return <SpecificComponent {...props} onChangeBackgroundColor={this.setBackgroundColor} onClose={this.handleClose} ref={ref} />
+              }}
             </BundleContainer>
 
             <Helmet>
diff --git a/app/javascript/flavours/glitch/features/ui/components/report_modal.jsx b/app/javascript/flavours/glitch/features/ui/components/report_modal.jsx
index 72a41e9adf..2cf273112b 100644
--- a/app/javascript/flavours/glitch/features/ui/components/report_modal.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/report_modal.jsx
@@ -63,7 +63,7 @@ class ReportModal extends ImmutablePureComponent {
     dispatch(submitReport({
       account_id: accountId,
       status_ids: selectedStatusIds.toArray(),
-      selected_domains: selectedDomains.toArray(),
+      forward_to_domains: selectedDomains.toArray(),
       comment,
       forward: selectedDomains.size > 0,
       category,
diff --git a/app/javascript/flavours/glitch/features/ui/components/sign_in_banner.jsx b/app/javascript/flavours/glitch/features/ui/components/sign_in_banner.jsx
index ea7de7efbb..82a7fcdb95 100644
--- a/app/javascript/flavours/glitch/features/ui/components/sign_in_banner.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/sign_in_banner.jsx
@@ -3,7 +3,7 @@ import { useCallback } from 'react';
 import { FormattedMessage } from 'react-intl';
 
 import { openModal } from 'flavours/glitch/actions/modal';
-import { registrationsOpen } from 'flavours/glitch/initial_state';
+import { registrationsOpen, sso_redirect } from 'flavours/glitch/initial_state';
 import { useAppDispatch, useAppSelector } from 'flavours/glitch/store';
 
 const SignInBanner = () => {
@@ -18,6 +18,15 @@ const SignInBanner = () => {
 
   const signupUrl = useAppSelector((state) => state.getIn(['server', 'server', 'registrations', 'url'], null) || '/auth/sign_up');
 
+  if (sso_redirect) {
+    return (
+      <div className='sign-in-banner'>
+        <p><FormattedMessage id='sign_in_banner.text' defaultMessage='Login to follow profiles or hashtags, favorite, share and reply to posts. You can also interact from your account on a different server.' /></p>
+        <a href={sso_redirect} data-method='post' className='button button--block button-tertiary'><FormattedMessage id='sign_in_banner.sso_redirect' defaultMessage='Login or Register' /></a>
+      </div>
+    )
+  }
+
   if (registrationsOpen) {
     signupButton = (
       <a href={signupUrl} className='button button--block'>
diff --git a/app/javascript/flavours/glitch/initial_state.js b/app/javascript/flavours/glitch/initial_state.js
index f07c9fb71f..46228c3306 100644
--- a/app/javascript/flavours/glitch/initial_state.js
+++ b/app/javascript/flavours/glitch/initial_state.js
@@ -82,6 +82,7 @@
  * @property {boolean} use_blurhash
  * @property {boolean=} use_pending_items
  * @property {string} version
+ * @property {string} sso_redirect
  * @property {boolean} translation_enabled
  * @property {string} status_page_url
  * @property {boolean} system_emoji_font
@@ -160,6 +161,7 @@ export const usePendingItems = getMeta('use_pending_items');
 export const version = getMeta('version');
 export const languages = initialState?.languages;
 export const statusPageUrl = getMeta('status_page_url');
+export const sso_redirect = getMeta('sso_redirect');
 
 // Glitch-soc-specific settings
 export const maxChars = (initialState && initialState.max_toot_chars) || 500;
diff --git a/app/javascript/flavours/glitch/locales/da.json b/app/javascript/flavours/glitch/locales/da.json
index 7652c983ed..380894fe6a 100644
--- a/app/javascript/flavours/glitch/locales/da.json
+++ b/app/javascript/flavours/glitch/locales/da.json
@@ -1,10 +1,43 @@
 {
+  "compose.attach": "Vedhæft...",
+  "compose.attach.doodle": "Tegn noget",
+  "compose.attach.upload": "Upload en fil",
+  "compose_form.poll.multiple_choices": "Tillad flere valg",
+  "confirmations.missing_media_description.message": "Mindst én vedhæftet medie mangler en beskrivelse. Overvej at tilføje en beskrivelse af alle vedhæftede medier af hensyn til personer med nedsat syn, før du publicerer dit indlæg.",
   "empty_column.follow_recommendations": "Det ser ud til, at der ikke kunne genereres forslag til dig. Du kan prøve med Søg for at lede efter personer, du måske kender, eller udforske hashtags.",
   "follow_recommendations.done": "Udført",
   "follow_recommendations.heading": "Følg personer du gerne vil se indlæg fra! Her er nogle forslag.",
   "follow_recommendations.lead": "Indlæg, fra personer du følger, vil fremgå kronologisk ordnet i dit hjemmefeed. Vær ikke bange for at begå fejl, da du altid og meget nemt kan ændre dit valg!",
+  "home.column_settings.advanced": "Avanceret",
+  "home.column_settings.show_direct": "Vis private omtaler",
+  "navigation_bar.app_settings": "Appindstillinger",
+  "navigation_bar.misc": "Diverse",
   "onboarding.page_one.federation": "{domain} is an \"instance\" of Mastodon. Mastodon is a network of independent servers joining up to make one larger social network. We call these servers instances.",
   "onboarding.page_six.github": "{domain} runs on Glitchsoc. Glitchsoc is a friendly {fork} of {Mastodon}. Glitchsoc is fully compatible with all Mastodon apps and instances. Glitchsoc is free open-source software. You can report bugs, request features, or contribute to the code on {github}.",
-  "settings.content_warnings": "Content warnings",
-  "settings.preferences": "Preferences"
+  "settings.always_show_spoilers_field": "Vis altid feltet til indholdsadvarsel",
+  "settings.auto_collapse_media": "Indlæg med medier",
+  "settings.close": "Luk",
+  "settings.collapsed_statuses": "Sammenfoldede indlæg",
+  "settings.content_warnings": "Indholdsadvarsler",
+  "settings.content_warnings.regexp": "Regulært udtryk",
+  "settings.general": "Generelt",
+  "settings.image_backgrounds_media_hint": "Hvis et indlæg har vedhæftede medier, brug den første som baggrund",
+  "settings.media": "Medier",
+  "settings.preferences": "Præferencer",
+  "settings.rewrite_mentions": "Omskriv omtaler i viste indlæg",
+  "settings.rewrite_mentions_acct": "Omskriv med brugernavn og domæne (når brugeren ikke er lokal)",
+  "settings.rewrite_mentions_no": "Omskriv ikke omtaler",
+  "settings.rewrite_mentions_username": "Omskriv med brugernavn",
+  "settings.show_reply_counter": "Vis et estimat over antal svar",
+  "settings.status_icons": "Statusikoner",
+  "settings.status_icons_language": "Sprogindikator",
+  "settings.status_icons_local_only": "Kun lokal-indikator",
+  "settings.status_icons_media": "Medie- og afstemningsindikator",
+  "settings.status_icons_reply": "Svarindikator",
+  "settings.status_icons_visibility": "Statussynlighedsindikator",
+  "settings.tag_misleading_links": "Marker vildledende links",
+  "status.has_audio": "Har vedhæftede lydfiler",
+  "status.has_pictures": "Har vedhæftede billeder",
+  "status.has_preview_card": "Har en vedhæftet linkvisning",
+  "status.has_video": "Har vedhæftede videoer"
 }
diff --git a/app/javascript/flavours/glitch/locales/ja.json b/app/javascript/flavours/glitch/locales/ja.json
index 6d3e27280d..646c447439 100644
--- a/app/javascript/flavours/glitch/locales/ja.json
+++ b/app/javascript/flavours/glitch/locales/ja.json
@@ -1,8 +1,12 @@
 {
+  "about.fork_disclaimer": "Glitch-socはMastodonからフォークされたフリーなオープンソースソフトウェアです。",
   "account.add_account_note": "@{name}のメモを追加",
   "account.disclaimer_full": "このユーザー情報は不正確な可能性があります。",
   "account.follows": "フォロー",
+  "account.joined": "{date} に登録",
+  "account.mute_notifications": "@{name}さんからの通知を受け取らない",
   "account.suspended_disclaimer_full": "このユーザーはモデレータにより停止されました。",
+  "account.unmute_notifications": "@{name}さんからの通知を受け取る",
   "account.view_full_profile": "正確な情報を見る",
   "account_note.cancel": "キャンセル",
   "account_note.edit": "編集",
@@ -16,20 +20,25 @@
   "advanced_options.threaded_mode.short": "スレッドモード",
   "advanced_options.threaded_mode.tooltip": "スレッドモードを有効にする",
   "boost_modal.missing_description": "このトゥートには少なくとも1つの画像に説明が付与されていません",
+  "column.favourited_by": "お気に入りしたユーザー",
   "column.heading": "その他",
+  "column.reblogged_by": "ブーストしたユーザー",
   "column.subheading": "その他のオプション",
+  "column_header.profile": "プロフィール",
   "column_subheading.lists": "リスト",
   "column_subheading.navigation": "ナビゲーション",
   "community.column_settings.allow_local_only": "ローカル限定投稿を表示する",
   "compose.attach": "添付...",
   "compose.attach.doodle": "お絵描きをする",
   "compose.attach.upload": "ファイルをアップロード",
+  "compose.content-type.html": "HTML",
   "compose.content-type.markdown": "マークダウン",
   "compose.content-type.plain": "プレーンテキスト",
   "compose_form.poll.multiple_choices": "複数回答を許可",
   "compose_form.poll.single_choice": "単一回答を許可",
   "compose_form.spoiler": "本文は警告の後ろに隠す",
   "confirmation_modal.do_not_ask_again": "もう１度尋ねない",
+  "confirmations.deprecated_settings.confirm": "Mastodonの設定を使用",
   "confirmations.missing_media_description.confirm": "このまま投稿",
   "confirmations.missing_media_description.edit": "メディアを編集",
   "confirmations.missing_media_description.message": "少なくとも1つの画像に視覚障害者のための画像説明が付与されていません。すべての画像に対して説明を付与することを望みます。",
@@ -38,6 +47,7 @@
   "confirmations.unfilter.edit_filter": "フィルターを編集",
   "confirmations.unfilter.filters": "適用されたフィルター",
   "content-type.change": "コンテンツ形式を変更",
+  "direct.group_by_conversations": "会話でグループ化",
   "empty_column.follow_recommendations": "おすすめを生成できませんでした。検索を使って知り合いを探したり、トレンドハッシュタグを見てみましょう。",
   "endorsed_accounts_editor.endorsed_accounts": "紹介しているユーザー",
   "favourite_modal.combo": "次からは {combo} を押せば、これをスキップできます。",
@@ -48,18 +58,22 @@
   "home.column_settings.advanced": "高度",
   "home.column_settings.filter_regex": "正規表現でフィルター",
   "home.column_settings.show_direct": "DMを表示",
+  "home.settings": "カラムの設定",
   "keyboard_shortcuts.bookmark": "ブックマーク",
   "keyboard_shortcuts.secondary_toot": "セカンダリートゥートの公開範囲でトゥートする",
   "keyboard_shortcuts.toggle_collapse": "折りたたむ/折りたたみを解除",
+  "media_gallery.sensitive": "閲覧注意",
   "moved_to_warning": "このアカウント{moved_to_link}に引っ越したため、新しいフォロワーを受け入れていません。",
   "navigation_bar.app_settings": "アプリ設定",
   "navigation_bar.featured_users": "紹介しているアカウント",
+  "navigation_bar.keyboard_shortcuts": "キーボードショートカット",
   "navigation_bar.misc": "その他",
   "notification.markForDeletion": "選択",
   "notification_purge.btn_all": "すべて\n選択",
   "notification_purge.btn_apply": "選択したものを\n削除",
   "notification_purge.btn_invert": "選択を\n反転",
   "notification_purge.btn_none": "選択\n解除",
+  "notification_purge.start": "通知整理モードに入る",
   "notifications.marked_clear": "選択した通知を削除する",
   "notifications.marked_clear_confirmation": "削除した全ての通知を完全に削除してもよろしいですか？",
   "onboarding.page_one.federation": "{domain}はMastodonのインスタンスです。Mastodonとは、独立したサーバが連携して作るソーシャルネットワークです。これらのサーバーをインスタンスと呼びます。",
@@ -68,6 +82,7 @@
   "settings.always_show_spoilers_field": "常にコンテンツワーニング設定を表示する(指定がない場合は通常投稿)",
   "settings.auto_collapse": "自動折りたたみ",
   "settings.auto_collapse_all": "すべて",
+  "settings.auto_collapse_height": "トゥートが長いと見なされる高さ（ピクセル）",
   "settings.auto_collapse_lengthy": "長いトゥート",
   "settings.auto_collapse_media": "メディア付きトゥート",
   "settings.auto_collapse_notifications": "通知",
@@ -82,6 +97,9 @@
   "settings.content_warnings": "コンテンツワーニング",
   "settings.content_warnings.regexp": "正規表現",
   "settings.content_warnings_filter": "説明に指定した文字が含まれているものを自動で展開しないようにする",
+  "settings.content_warnings_media_outside": "コンテンツワーニングの外側にメディア添付ファイルを表示する",
+  "settings.content_warnings_shared_state": "すべてのコピーの内容を一度に表示/非表示",
+  "settings.content_warnings_unfold_opts": "自動展開オプション",
   "settings.enable_collapsed": "トゥート折りたたみを有効にする",
   "settings.enable_content_warnings_auto_unfold": "コンテンツワーニング指定されている投稿を常に表示する",
   "settings.general": "一般",
@@ -119,10 +137,24 @@
   "settings.side_arm_reply_mode.copy": "返信先の投稿範囲を利用する",
   "settings.side_arm_reply_mode.keep": "セカンダリートゥートボタンの設定を維持する",
   "settings.side_arm_reply_mode.restrict": "返信先の投稿範囲に制限する",
+  "settings.status_icons": "トゥートアイコン",
+  "settings.status_icons_language": "言語インジケータ",
+  "settings.status_icons_local_only": "ローカル限定インジケータ",
+  "settings.status_icons_media": "メディア・アンケートインジケータ",
+  "settings.status_icons_reply": "返信インジケータ",
+  "settings.status_icons_visibility": "公開範囲インジケータ",
   "settings.swipe_to_change_columns": "スワイプでカラムを切り替え可能にする（モバイルのみ）",
   "settings.tag_misleading_links": "誤解を招くリンクにタグをつける",
   "settings.tag_misleading_links.hint": "明示的に言及していないすべてのリンクに、リンクターゲットホストを含む視覚的な表示を追加します",
   "settings.wide_view": "ワイドビュー(デスクトップ レイアウトのみ)",
   "status.collapse": "折りたたむ",
+  "status.has_audio": "添付されたオーディオファイルが表示されます",
+  "status.has_pictures": "添付された画像が表示されます",
+  "status.has_preview_card": "添付されたプレビューカードが表示されます",
+  "status.has_video": "添付動画が表示されます",
+  "status.in_reply_to": "このトゥートは返信です",
+  "status.is_poll": "このトゥートはアンケートです",
+  "status.local_only": "あなたのインスタンスのみに公開",
+  "status.sensitive_toggle": "クリックして表示",
   "status.uncollapse": "折りたたみを解除"
 }
diff --git a/app/javascript/flavours/glitch/packs/public.jsx b/app/javascript/flavours/glitch/packs/public.jsx
index 22a3e1214d..653b35f3da 100644
--- a/app/javascript/flavours/glitch/packs/public.jsx
+++ b/app/javascript/flavours/glitch/packs/public.jsx
@@ -14,7 +14,6 @@ import emojify  from 'flavours/glitch/features/emoji/emoji';
 import loadKeyboardExtensions from 'flavours/glitch/load_keyboard_extensions';
 import { loadLocale, getLocale } from 'flavours/glitch/locales';
 import { loadPolyfills } from 'flavours/glitch/polyfills';
-import ready from 'flavours/glitch/ready';
 
 const messages = defineMessages({
   usernameTaken: { id: 'username.taken', defaultMessage: 'That username is taken. Try another' },
@@ -42,159 +41,157 @@ function main() {
     };
   };
 
-  ready(() => {
-    const locale = document.documentElement.lang;
+  const locale = document.documentElement.lang;
 
-    const dateTimeFormat = new Intl.DateTimeFormat(locale, {
-      year: 'numeric',
-      month: 'long',
-      day: 'numeric',
-      hour: 'numeric',
-      minute: 'numeric',
-    });
+  const dateTimeFormat = new Intl.DateTimeFormat(locale, {
+    year: 'numeric',
+    month: 'long',
+    day: 'numeric',
+    hour: 'numeric',
+    minute: 'numeric',
+  });
 
-    const dateFormat = new Intl.DateTimeFormat(locale, {
-      year: 'numeric',
-      month: 'short',
-      day: 'numeric',
-      timeFormat: false,
-    });
+  const dateFormat = new Intl.DateTimeFormat(locale, {
+    year: 'numeric',
+    month: 'short',
+    day: 'numeric',
+    timeFormat: false,
+  });
 
-    const timeFormat = new Intl.DateTimeFormat(locale, {
-      timeStyle: 'short',
-      hour12: false,
-    });
+  const timeFormat = new Intl.DateTimeFormat(locale, {
+    timeStyle: 'short',
+    hour12: false,
+  });
 
-    const formatMessage = ({ id, defaultMessage }, values) => {
-      const messageFormat = new IntlMessageFormat(localeData[id] || defaultMessage, locale);
-      return messageFormat.format(values);
-    };
+  const formatMessage = ({ id, defaultMessage }, values) => {
+    const messageFormat = new IntlMessageFormat(localeData[id] || defaultMessage, locale);
+    return messageFormat.format(values);
+  };
 
-    [].forEach.call(document.querySelectorAll('.emojify'), (content) => {
-      content.innerHTML = emojify(content.innerHTML);
-    });
+  [].forEach.call(document.querySelectorAll('.emojify'), (content) => {
+    content.innerHTML = emojify(content.innerHTML);
+  });
 
-    [].forEach.call(document.querySelectorAll('time.formatted'), (content) => {
-      const datetime = new Date(content.getAttribute('datetime'));
-      const formattedDate = dateTimeFormat.format(datetime);
+  [].forEach.call(document.querySelectorAll('time.formatted'), (content) => {
+    const datetime = new Date(content.getAttribute('datetime'));
+    const formattedDate = dateTimeFormat.format(datetime);
 
-      content.title = formattedDate;
-      content.textContent = formattedDate;
-    });
+    content.title = formattedDate;
+    content.textContent = formattedDate;
+  });
 
-    const isToday = date => {
-      const today = new Date();
+  const isToday = date => {
+    const today = new Date();
 
-      return date.getDate() === today.getDate() &&
-        date.getMonth() === today.getMonth() &&
-        date.getFullYear() === today.getFullYear();
-    };
-    const todayFormat = new IntlMessageFormat(localeData['relative_format.today'] || 'Today at {time}', locale);
+    return date.getDate() === today.getDate() &&
+      date.getMonth() === today.getMonth() &&
+      date.getFullYear() === today.getFullYear();
+  };
+  const todayFormat = new IntlMessageFormat(localeData['relative_format.today'] || 'Today at {time}', locale);
 
-    [].forEach.call(document.querySelectorAll('time.relative-formatted'), (content) => {
-      const datetime = new Date(content.getAttribute('datetime'));
+  [].forEach.call(document.querySelectorAll('time.relative-formatted'), (content) => {
+    const datetime = new Date(content.getAttribute('datetime'));
 
-      let formattedContent;
+    let formattedContent;
 
-      if (isToday(datetime)) {
-        const formattedTime = timeFormat.format(datetime);
+    if (isToday(datetime)) {
+      const formattedTime = timeFormat.format(datetime);
 
-        formattedContent = todayFormat.format({ time: formattedTime });
-      } else {
-        formattedContent = dateFormat.format(datetime);
-      }
-
-      content.title = formattedContent;
-      content.textContent = formattedContent;
-    });
-
-    [].forEach.call(document.querySelectorAll('time.time-ago'), (content) => {
-      const datetime = new Date(content.getAttribute('datetime'));
-      const now      = new Date();
-
-      const timeGiven = content.getAttribute('datetime').includes('T');
-      content.title = timeGiven ? dateTimeFormat.format(datetime) : dateFormat.format(datetime);
-      content.textContent = timeAgoString({
-        formatMessage,
-        formatDate: (date, options) => (new Intl.DateTimeFormat(locale, options)).format(date),
-      }, datetime, now, now.getFullYear(), timeGiven);
-    });
-
-    const reactComponents = document.querySelectorAll('[data-component]');
-    if (reactComponents.length > 0) {
-      import(/* webpackChunkName: "containers/media_container" */ 'flavours/glitch/containers/media_container')
-        .then(({ default: MediaContainer }) => {
-          [].forEach.call(reactComponents, (component) => {
-            [].forEach.call(component.children, (child) => {
-              component.removeChild(child);
-            });
-          });
-
-          const content = document.createElement('div');
-
-          const root = createRoot(content);
-          root.render(<MediaContainer locale={locale} components={reactComponents} />);
-          document.body.appendChild(content);
-          scrollToDetailedStatus();
-        })
-        .catch(error => {
-          console.error(error);
-          scrollToDetailedStatus();
-        });
+      formattedContent = todayFormat.format({ time: formattedTime });
     } else {
-      scrollToDetailedStatus();
+      formattedContent = dateFormat.format(datetime);
     }
 
-    delegate(document, '#user_account_attributes_username', 'input', throttle(() => {
-      const username = document.getElementById('user_account_attributes_username');
+    content.title = formattedContent;
+    content.textContent = formattedContent;
+  });
 
-      if (username.value && username.value.length > 0) {
-        axios.get('/api/v1/accounts/lookup', { params: { acct: username.value } }).then(() => {
-          username.setCustomValidity(formatMessage(messages.usernameTaken));
-        }).catch(() => {
-          username.setCustomValidity('');
+  [].forEach.call(document.querySelectorAll('time.time-ago'), (content) => {
+    const datetime = new Date(content.getAttribute('datetime'));
+    const now      = new Date();
+
+    const timeGiven = content.getAttribute('datetime').includes('T');
+    content.title = timeGiven ? dateTimeFormat.format(datetime) : dateFormat.format(datetime);
+    content.textContent = timeAgoString({
+      formatMessage,
+      formatDate: (date, options) => (new Intl.DateTimeFormat(locale, options)).format(date),
+    }, datetime, now, now.getFullYear(), timeGiven);
+  });
+
+  const reactComponents = document.querySelectorAll('[data-component]');
+  if (reactComponents.length > 0) {
+    import(/* webpackChunkName: "containers/media_container" */ 'flavours/glitch/containers/media_container')
+      .then(({ default: MediaContainer }) => {
+        [].forEach.call(reactComponents, (component) => {
+          [].forEach.call(component.children, (child) => {
+            component.removeChild(child);
+          });
         });
-      } else {
+
+        const content = document.createElement('div');
+
+        const root = createRoot(content);
+        root.render(<MediaContainer locale={locale} components={reactComponents} />);
+        document.body.appendChild(content);
+        scrollToDetailedStatus();
+      })
+      .catch(error => {
+        console.error(error);
+        scrollToDetailedStatus();
+      });
+  } else {
+    scrollToDetailedStatus();
+  }
+
+  delegate(document, '#user_account_attributes_username', 'input', throttle(() => {
+    const username = document.getElementById('user_account_attributes_username');
+
+    if (username.value && username.value.length > 0) {
+      axios.get('/api/v1/accounts/lookup', { params: { acct: username.value } }).then(() => {
+        username.setCustomValidity(formatMessage(messages.usernameTaken));
+      }).catch(() => {
         username.setCustomValidity('');
-      }
-    }, 500, { leading: false, trailing: true }));
+      });
+    } else {
+      username.setCustomValidity('');
+    }
+  }, 500, { leading: false, trailing: true }));
 
-    delegate(document, '#user_password,#user_password_confirmation', 'input', () => {
-      const password = document.getElementById('user_password');
-      const confirmation = document.getElementById('user_password_confirmation');
-      if (!confirmation) return;
+  delegate(document, '#user_password,#user_password_confirmation', 'input', () => {
+    const password = document.getElementById('user_password');
+    const confirmation = document.getElementById('user_password_confirmation');
+    if (!confirmation) return;
 
-      if (confirmation.value && confirmation.value.length > password.maxLength) {
-        confirmation.setCustomValidity(formatMessage(messages.passwordExceedsLength));
-      } else if (password.value && password.value !== confirmation.value) {
-        confirmation.setCustomValidity(formatMessage(messages.passwordDoesNotMatch));
-      } else {
-        confirmation.setCustomValidity('');
-      }
-    });
+    if (confirmation.value && confirmation.value.length > password.maxLength) {
+      confirmation.setCustomValidity(formatMessage(messages.passwordExceedsLength));
+    } else if (password.value && password.value !== confirmation.value) {
+      confirmation.setCustomValidity(formatMessage(messages.passwordDoesNotMatch));
+    } else {
+      confirmation.setCustomValidity('');
+    }
+  });
 
-    delegate(document, '.custom-emoji', 'mouseover', getEmojiAnimationHandler('data-original'));
-    delegate(document, '.custom-emoji', 'mouseout', getEmojiAnimationHandler('data-static'));
+  delegate(document, '.custom-emoji', 'mouseover', getEmojiAnimationHandler('data-original'));
+  delegate(document, '.custom-emoji', 'mouseout', getEmojiAnimationHandler('data-static'));
 
-    delegate(document, '.status__content__spoiler-link', 'click', function() {
-      const statusEl = this.parentNode.parentNode;
+  delegate(document, '.status__content__spoiler-link', 'click', function() {
+    const statusEl = this.parentNode.parentNode;
 
-      if (statusEl.dataset.spoiler === 'expanded') {
-        statusEl.dataset.spoiler = 'folded';
-        this.textContent = (new IntlMessageFormat(localeData['status.show_more'] || 'Show more', locale)).format();
-      } else {
-        statusEl.dataset.spoiler = 'expanded';
-        this.textContent = (new IntlMessageFormat(localeData['status.show_less'] || 'Show less', locale)).format();
-      }
+    if (statusEl.dataset.spoiler === 'expanded') {
+      statusEl.dataset.spoiler = 'folded';
+      this.textContent = (new IntlMessageFormat(localeData['status.show_more'] || 'Show more', locale)).format();
+    } else {
+      statusEl.dataset.spoiler = 'expanded';
+      this.textContent = (new IntlMessageFormat(localeData['status.show_less'] || 'Show less', locale)).format();
+    }
 
-      return false;
-    });
+    return false;
+  });
 
-    [].forEach.call(document.querySelectorAll('.status__content__spoiler-link'), (spoilerLink) => {
-      const statusEl = spoilerLink.parentNode.parentNode;
-      const message = (statusEl.dataset.spoiler === 'expanded') ? (localeData['status.show_less'] || 'Show less') : (localeData['status.show_more'] || 'Show more');
-      spoilerLink.textContent = (new IntlMessageFormat(message, locale)).format();
-    });
+  [].forEach.call(document.querySelectorAll('.status__content__spoiler-link'), (spoilerLink) => {
+    const statusEl = spoilerLink.parentNode.parentNode;
+    const message = (statusEl.dataset.spoiler === 'expanded') ? (localeData['status.show_less'] || 'Show less') : (localeData['status.show_more'] || 'Show more');
+    spoilerLink.textContent = (new IntlMessageFormat(message, locale)).format();
   });
 
   const toggleSidebar = () => {
diff --git a/app/javascript/flavours/glitch/packs/sign_up.js b/app/javascript/flavours/glitch/packs/sign_up.js
index 2e675dff20..4e0af41a2e 100644
--- a/app/javascript/flavours/glitch/packs/sign_up.js
+++ b/app/javascript/flavours/glitch/packs/sign_up.js
@@ -13,4 +13,30 @@ ready(() => {
       console.error(error);
     });
   }, 5000);
+
+  document.querySelectorAll('.timer-button').forEach(button => {
+    let counter = 30;
+
+    const container = document.createElement('span');
+
+    const updateCounter = () => {
+      container.innerText = ` (${counter})`;
+    };
+
+    updateCounter();
+
+    const countdown = setInterval(() => {
+      counter--;
+
+      if (counter === 0) {
+        button.disabled = false;
+        button.removeChild(container);
+        clearInterval(countdown);
+      } else {
+        updateCounter();
+      }
+    }, 1000);
+
+    button.appendChild(container);
+  });
 });
diff --git a/app/javascript/flavours/glitch/styles/components/columns.scss b/app/javascript/flavours/glitch/styles/components/columns.scss
index 2ca456191c..d4860258ed 100644
--- a/app/javascript/flavours/glitch/styles/components/columns.scss
+++ b/app/javascript/flavours/glitch/styles/components/columns.scss
@@ -1038,3 +1038,33 @@ $ui-header-height: 55px;
     }
   }
 }
+
+.hashtag-header {
+  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  padding: 15px;
+  font-size: 17px;
+  line-height: 22px;
+  color: $darker-text-color;
+
+  strong {
+    font-weight: 700;
+  }
+
+  &__header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 15px;
+    gap: 15px;
+
+    h1 {
+      color: $primary-text-color;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      overflow: hidden;
+      font-size: 22px;
+      line-height: 33px;
+      font-weight: 700;
+    }
+  }
+}
diff --git a/app/javascript/flavours/glitch/styles/components/misc.scss b/app/javascript/flavours/glitch/styles/components/misc.scss
index 064d500d5a..0312602a58 100644
--- a/app/javascript/flavours/glitch/styles/components/misc.scss
+++ b/app/javascript/flavours/glitch/styles/components/misc.scss
@@ -147,10 +147,6 @@
     display: block;
     width: 100%;
   }
-
-  .layout-multiple-columns &.button--with-bell {
-    font-size: 12px;
-  }
 }
 
 .icon-button {
@@ -1345,7 +1341,7 @@ button.icon-button.active i.fa-retweet {
     display: flex;
     align-items: center;
     justify-content: center;
-    background: rgba($black, 0.5);
+    background: transparent;
     width: 100%;
     height: 100%;
     padding: 0;
@@ -1354,6 +1350,10 @@ button.icon-button.active i.fa-retweet {
     color: $white;
 
     &__label {
+      background-color: rgba($black, 0.45);
+      backdrop-filter: blur(10px) saturate(180%) contrast(75%) brightness(70%);
+      border-radius: 6px;
+      padding: 10px 15px;
       display: flex;
       align-items: center;
       justify-content: center;
@@ -1367,6 +1367,13 @@ button.icon-button.active i.fa-retweet {
       font-weight: 400;
       font-size: 13px;
     }
+
+    &:hover,
+    &:focus {
+      .spoiler-button__overlay__label {
+        background-color: rgba($black, 0.9);
+      }
+    }
   }
 }
 
diff --git a/app/javascript/flavours/glitch/styles/components/modal.scss b/app/javascript/flavours/glitch/styles/components/modal.scss
index 9d8838783e..d0db308a15 100644
--- a/app/javascript/flavours/glitch/styles/components/modal.scss
+++ b/app/javascript/flavours/glitch/styles/components/modal.scss
@@ -719,15 +719,16 @@
   }
 
   .button.button-secondary {
-    border-color: $ui-button-secondary-border-color;
-    color: $ui-button-secondary-color;
+    border-color: $inverted-text-color;
+    color: $inverted-text-color;
     flex: 0 0 auto;
 
     &:hover,
     &:focus,
     &:active {
-      border-color: $ui-button-secondary-focus-background-color;
-      color: $ui-button-secondary-focus-color;
+      background: transparent;
+      border-color: $ui-button-background-color;
+      color: $ui-button-background-color;
     }
   }
 
@@ -1412,6 +1413,44 @@ img.modal-warning {
     }
   }
 
+  &__choices {
+    display: flex;
+    gap: 40px;
+
+    &__choice {
+      flex: 1;
+      box-sizing: border-box;
+
+      h3 {
+        margin-bottom: 20px;
+      }
+
+      p {
+        color: $darker-text-color;
+        margin-bottom: 20px;
+        font-size: 15px;
+      }
+
+      .button {
+        margin-bottom: 10px;
+
+        &:last-child {
+          margin-bottom: 0;
+        }
+      }
+    }
+  }
+
+  @media screen and (max-width: $no-gap-breakpoint - 1px) {
+    &__choices {
+      flex-direction: column;
+
+      &__choice {
+        margin-top: 40px;
+      }
+    }
+  }
+
   .link-button {
     font-size: inherit;
     display: inline;
diff --git a/app/javascript/flavours/glitch/styles/components/modal.scss.orig b/app/javascript/flavours/glitch/styles/components/modal.scss.orig
deleted file mode 100644
index 49173e1ee8..0000000000
--- a/app/javascript/flavours/glitch/styles/components/modal.scss.orig
+++ /dev/null
@@ -1,1425 +0,0 @@
-.modal-container--preloader {
-  background: lighten($ui-base-color, 8%);
-}
-
-.modal-root {
-  position: relative;
-  z-index: 9999;
-}
-
-.modal-root__overlay {
-  position: fixed;
-  top: 0;
-  inset-inline-start: 0;
-  inset-inline-end: 0;
-  bottom: 0;
-  background: rgba($base-overlay-background, 0.7);
-  transition: background 0.5s;
-}
-
-.modal-root__container {
-  position: fixed;
-  top: 0;
-  inset-inline-start: 0;
-  width: 100%;
-  height: 100%;
-  box-sizing: border-box;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  align-content: space-around;
-  z-index: 9999;
-  pointer-events: none;
-  user-select: none;
-}
-
-.modal-root__modal {
-  pointer-events: auto;
-  display: flex;
-}
-
-.media-modal__zoom-button {
-  position: absolute;
-  inset-inline-end: 64px;
-  top: 8px;
-  z-index: 100;
-  pointer-events: auto;
-  transition: opacity 0.3s linear;
-  will-change: opacity;
-}
-
-.media-modal__zoom-button--hidden {
-  pointer-events: none;
-  opacity: 0;
-}
-
-.onboarding-modal,
-.error-modal,
-.embed-modal {
-  background: $ui-secondary-color;
-  color: $inverted-text-color;
-  border-radius: 8px;
-  overflow: hidden;
-  display: flex;
-  flex-direction: column;
-}
-
-.onboarding-modal__pager {
-  height: 80vh;
-  width: 80vw;
-  max-width: 520px;
-  max-height: 470px;
-
-  .react-swipeable-view-container > div {
-    width: 100%;
-    height: 100%;
-    box-sizing: border-box;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    display: flex;
-    user-select: text;
-  }
-}
-
-.error-modal__body {
-  height: 80vh;
-  width: 80vw;
-  max-width: 520px;
-  max-height: 420px;
-  position: relative;
-
-  & > div {
-    position: absolute;
-    top: 0;
-    inset-inline-start: 0;
-    width: 100%;
-    height: 100%;
-    box-sizing: border-box;
-    padding: 25px;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    display: flex;
-    opacity: 0;
-    user-select: text;
-  }
-}
-
-.error-modal__body {
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  text-align: center;
-}
-
-@media screen and (width <= 550px) {
-  .onboarding-modal {
-    width: 100%;
-    height: 100%;
-    border-radius: 0;
-  }
-
-  .onboarding-modal__pager {
-    width: 100%;
-    height: auto;
-    max-width: none;
-    max-height: none;
-    flex: 1 1 auto;
-  }
-}
-
-.onboarding-modal__paginator,
-.error-modal__footer {
-  flex: 0 0 auto;
-  background: darken($ui-secondary-color, 8%);
-  display: flex;
-  padding: 25px;
-
-  & > div {
-    min-width: 33px;
-  }
-
-  .onboarding-modal__nav,
-  .error-modal__nav {
-    color: $lighter-text-color;
-    border: 0;
-    font-size: 14px;
-    font-weight: 500;
-    padding: 10px 25px;
-    line-height: inherit;
-    height: auto;
-    margin: -10px;
-    border-radius: 4px;
-    background-color: transparent;
-
-    &:hover,
-    &:focus,
-    &:active {
-      color: darken($lighter-text-color, 4%);
-      background-color: darken($ui-secondary-color, 16%);
-    }
-
-    &.onboarding-modal__done,
-    &.onboarding-modal__next {
-      color: $inverted-text-color;
-
-      &:hover,
-      &:focus,
-      &:active {
-        color: lighten($inverted-text-color, 4%);
-      }
-    }
-  }
-}
-
-.error-modal__footer {
-  justify-content: center;
-}
-
-.onboarding-modal__dots {
-  flex: 1 1 auto;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-.onboarding-modal__dot {
-  width: 14px;
-  height: 14px;
-  border-radius: 14px;
-  background: darken($ui-secondary-color, 16%);
-  margin: 0 3px;
-  cursor: pointer;
-
-  &:hover {
-    background: darken($ui-secondary-color, 18%);
-  }
-
-  &.active {
-    cursor: default;
-    background: darken($ui-secondary-color, 24%);
-  }
-}
-
-.onboarding-modal__page__wrapper {
-  pointer-events: none;
-  padding: 25px;
-  padding-bottom: 0;
-
-  &.onboarding-modal__page__wrapper--active {
-    pointer-events: auto;
-  }
-}
-
-.onboarding-modal__page {
-  cursor: default;
-  line-height: 21px;
-
-  h1 {
-    font-size: 18px;
-    font-weight: 500;
-    color: $inverted-text-color;
-    margin-bottom: 20px;
-  }
-
-  a {
-    color: $highlight-text-color;
-
-    &:hover,
-    &:focus,
-    &:active {
-      color: lighten($highlight-text-color, 4%);
-    }
-  }
-
-  .navigation-bar a {
-    color: inherit;
-  }
-
-  p {
-    font-size: 16px;
-    color: $lighter-text-color;
-    margin-top: 10px;
-    margin-bottom: 10px;
-
-    &:last-child {
-      margin-bottom: 0;
-    }
-
-    strong {
-      font-weight: 500;
-      background: $ui-base-color;
-      color: $secondary-text-color;
-      border-radius: 4px;
-      font-size: 14px;
-      padding: 3px 6px;
-
-      @each $lang in $cjk-langs {
-        &:lang(#{$lang}) {
-          font-weight: 700;
-        }
-      }
-    }
-  }
-}
-
-.onboarding-modal__page__wrapper-0 {
-  background: url('~images/elephant_ui_greeting.svg') no-repeat left bottom /
-    auto 250px;
-  height: 100%;
-  padding: 0;
-}
-
-.onboarding-modal__page-one {
-  &__lead {
-    padding: 65px;
-    padding-top: 45px;
-    padding-bottom: 0;
-    margin-bottom: 10px;
-
-    h1 {
-      font-size: 26px;
-      line-height: 36px;
-      margin-bottom: 8px;
-    }
-
-    p {
-      margin-bottom: 0;
-    }
-  }
-
-  &__extra {
-    padding-inline-end: 65px;
-    padding-inline-start: 185px;
-    text-align: center;
-  }
-}
-
-.display-case {
-  text-align: center;
-  font-size: 15px;
-  margin-bottom: 15px;
-
-  &__label {
-    font-weight: 500;
-    color: $inverted-text-color;
-    margin-bottom: 5px;
-    text-transform: uppercase;
-    font-size: 12px;
-  }
-
-  &__case {
-    background: $ui-base-color;
-    color: $secondary-text-color;
-    font-weight: 500;
-    padding: 10px;
-    border-radius: 4px;
-  }
-}
-
-.onboarding-modal__page-two,
-.onboarding-modal__page-three,
-.onboarding-modal__page-four,
-.onboarding-modal__page-five {
-  p {
-    text-align: start;
-  }
-
-  .figure {
-    background: darken($ui-base-color, 8%);
-    color: $secondary-text-color;
-    margin-bottom: 20px;
-    border-radius: 4px;
-    padding: 10px;
-    text-align: center;
-    font-size: 14px;
-    box-shadow: 1px 2px 6px rgba($base-shadow-color, 0.3);
-
-    .onboarding-modal__image {
-      border-radius: 4px;
-      margin-bottom: 10px;
-    }
-
-    &.non-interactive {
-      pointer-events: none;
-      text-align: start;
-    }
-  }
-}
-
-.onboarding-modal__page-four__columns {
-  .row {
-    display: flex;
-    margin-bottom: 20px;
-
-    & > div {
-      flex: 1 1 0;
-      margin: 0 10px;
-
-      &:first-child {
-        margin-inline-start: 0;
-      }
-
-      &:last-child {
-        margin-inline-end: 0;
-      }
-
-      p {
-        text-align: center;
-      }
-    }
-
-    &:last-child {
-      margin-bottom: 0;
-    }
-  }
-
-  .column-header {
-    color: $primary-text-color;
-  }
-}
-
-@media screen and (width <= 320px) and (height <= 600px) {
-  .onboarding-modal__page p {
-    font-size: 14px;
-    line-height: 20px;
-  }
-
-  .onboarding-modal__page-two .figure,
-  .onboarding-modal__page-three .figure,
-  .onboarding-modal__page-four .figure,
-  .onboarding-modal__page-five .figure {
-    font-size: 12px;
-    margin-bottom: 10px;
-  }
-
-  .onboarding-modal__page-four__columns .row {
-    margin-bottom: 10px;
-  }
-
-  .onboarding-modal__page-four__columns .column-header {
-    padding: 5px;
-    font-size: 12px;
-  }
-}
-
-.onboard-sliders {
-  display: inline-block;
-  max-width: 30px;
-  max-height: auto;
-  margin-inline-start: 10px;
-}
-
-.doodle-modal,
-.boost-modal,
-.confirmation-modal,
-.report-modal,
-.actions-modal,
-.mute-modal,
-.block-modal,
-.compare-history-modal {
-  background: lighten($ui-secondary-color, 8%);
-  color: $inverted-text-color;
-  border-radius: 8px;
-  overflow: hidden;
-  max-width: 90vw;
-  width: 480px;
-  position: relative;
-  flex-direction: column;
-
-  .status__relative-time {
-    color: $dark-text-color;
-    float: right;
-    font-size: 14px;
-    width: auto;
-    margin: initial;
-    padding: initial;
-  }
-
-  .status__visibility-icon {
-    color: $dark-text-color;
-    font-size: 14px;
-    padding: 0 4px;
-  }
-
-  .status__display-name {
-    display: flex;
-  }
-
-  .status__avatar {
-    height: 48px;
-    width: 48px;
-  }
-
-  .status__content__spoiler-link {
-    color: lighten($secondary-text-color, 8%);
-  }
-}
-
-.boost-modal .status-direct {
-  background-color: inherit;
-}
-
-.actions-modal {
-  .status {
-    background: $white;
-    border-bottom-color: $ui-secondary-color;
-    padding-top: 10px;
-    padding-bottom: 10px;
-  }
-
-  .dropdown-menu__separator {
-    border-bottom-color: $ui-secondary-color;
-  }
-}
-
-.boost-modal__container {
-  overflow-x: scroll;
-  padding: 10px;
-
-  .status {
-    user-select: text;
-    border-bottom: 0;
-  }
-}
-
-.doodle-modal__action-bar,
-.boost-modal__action-bar,
-.confirmation-modal__action-bar,
-.mute-modal__action-bar,
-.block-modal__action-bar {
-  display: flex;
-  justify-content: space-between;
-  background: $ui-secondary-color;
-  padding: 10px;
-  line-height: 36px;
-
-  & > div {
-    flex: 1 1 auto;
-    text-align: end;
-    color: $lighter-text-color;
-    padding-inline-end: 10px;
-  }
-
-  .button {
-    flex: 0 0 auto;
-  }
-}
-
-.boost-modal__status-header {
-  font-size: 15px;
-}
-
-.boost-modal__status-time {
-  float: right;
-  font-size: 14px;
-}
-
-.mute-modal,
-.block-modal {
-  line-height: 24px;
-}
-
-.mute-modal .react-toggle,
-.block-modal .react-toggle {
-  vertical-align: middle;
-}
-
-.report-modal {
-  width: 90vw;
-  max-width: 700px;
-}
-
-.report-dialog-modal {
-  max-width: 90vw;
-  width: 480px;
-  height: 80vh;
-  background: lighten($ui-secondary-color, 8%);
-  color: $inverted-text-color;
-  border-radius: 8px;
-  overflow: hidden;
-  position: relative;
-  flex-direction: column;
-  display: flex;
-
-  &__container {
-    box-sizing: border-box;
-    border-top: 1px solid $ui-secondary-color;
-    padding: 20px;
-    flex-grow: 1;
-    display: flex;
-    flex-direction: column;
-    min-height: 0;
-    overflow: auto;
-  }
-
-  &__title {
-    font-size: 28px;
-    line-height: 33px;
-    font-weight: 700;
-    margin-bottom: 15px;
-
-    @media screen and (height <= 800px) {
-      font-size: 22px;
-    }
-  }
-
-  &__subtitle {
-    font-size: 17px;
-    font-weight: 600;
-    line-height: 22px;
-    margin-bottom: 4px;
-  }
-
-  &__lead {
-    font-size: 17px;
-    line-height: 22px;
-    color: lighten($inverted-text-color, 16%);
-    margin-bottom: 30px;
-
-    a {
-      text-decoration: none;
-      color: $inverted-text-color;
-      font-weight: 500;
-
-      &:hover {
-        text-decoration: underline;
-      }
-    }
-  }
-
-  &__actions {
-    margin-top: 30px;
-    display: flex;
-
-    .button {
-      flex: 1 1 auto;
-    }
-  }
-
-  &__statuses {
-    flex-grow: 1;
-    min-height: 0;
-    overflow: auto;
-  }
-
-  .status__content a {
-    color: $highlight-text-color;
-  }
-
-  .status__content,
-  .status__content p {
-    color: $inverted-text-color;
-  }
-
-  .status__content__spoiler-link {
-    color: $primary-text-color;
-    background: $ui-primary-color;
-
-    &:hover {
-      background: lighten($ui-primary-color, 8%);
-    }
-  }
-
-  .dialog-option .poll__input {
-    border-color: $inverted-text-color;
-    color: $ui-secondary-color;
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-
-    svg {
-      width: 8px;
-      height: auto;
-    }
-
-    &:active,
-    &:focus,
-    &:hover {
-      border-color: lighten($inverted-text-color, 15%);
-      border-width: 4px;
-    }
-
-    &.active {
-      border-color: $inverted-text-color;
-      background: $inverted-text-color;
-    }
-  }
-
-  .poll__option.dialog-option {
-    padding: 15px 0;
-    flex: 0 0 auto;
-    border-bottom: 1px solid $ui-secondary-color;
-
-    &:last-child {
-      border-bottom: 0;
-    }
-
-    & > .poll__option__text {
-      font-size: 13px;
-      color: lighten($inverted-text-color, 16%);
-
-      strong {
-        font-size: 17px;
-        font-weight: 500;
-        line-height: 22px;
-        color: $inverted-text-color;
-        display: block;
-        margin-bottom: 4px;
-
-        &:last-child {
-          margin-bottom: 0;
-        }
-      }
-    }
-  }
-
-  .flex-spacer {
-    background: transparent;
-  }
-
-  &__textarea {
-    display: block;
-    box-sizing: border-box;
-    width: 100%;
-    color: $inverted-text-color;
-    background: $simple-background-color;
-    padding: 10px;
-    font-family: inherit;
-    font-size: 17px;
-    line-height: 22px;
-    resize: vertical;
-    border: 0;
-    outline: 0;
-    border-radius: 4px;
-    margin: 20px 0;
-
-    &::placeholder {
-      color: $dark-text-color;
-    }
-
-    &:focus {
-      outline: 0;
-    }
-  }
-
-  &__toggle {
-    display: flex;
-    align-items: center;
-    margin-bottom: 10px;
-
-    & > span {
-      font-size: 17px;
-      font-weight: 500;
-      margin-inline-start: 10px;
-    }
-  }
-
-  .button.button-secondary {
-    border-color: $ui-button-secondary-border-color;
-    color: $ui-button-secondary-color;
-    flex: 0 0 auto;
-
-    &:hover,
-    &:focus,
-    &:active {
-      border-color: $ui-button-secondary-focus-background-color;
-      color: $ui-button-secondary-focus-color;
-    }
-  }
-
-  hr {
-    border: 0;
-    background: transparent;
-    margin: 15px 0;
-  }
-
-  .emoji-mart-search {
-    padding-inline-end: 10px;
-  }
-
-  .emoji-mart-search-icon {
-    inset-inline-end: 10px + 5px;
-  }
-}
-
-.report-modal__container {
-  display: flex;
-  border-top: 1px solid $ui-secondary-color;
-
-  @media screen and (width <= 480px) {
-    flex-wrap: wrap;
-    overflow-y: auto;
-  }
-}
-
-.report-modal__statuses,
-.report-modal__comment {
-  box-sizing: border-box;
-  width: 50%;
-
-  @media screen and (width <= 480px) {
-    width: 100%;
-  }
-}
-
-.report-modal__statuses,
-.focal-point-modal__content {
-  flex: 1 1 auto;
-  min-height: 20vh;
-  max-height: 80vh;
-  overflow-y: auto;
-  overflow-x: hidden;
-
-  .status__content a {
-    color: $highlight-text-color;
-  }
-
-  @media screen and (width <= 480px) {
-    max-height: 10vh;
-  }
-}
-
-.focal-point-modal__content {
-  @media screen and (width <= 480px) {
-    max-height: 40vh;
-  }
-}
-
-.setting-divider {
-  background: transparent;
-  border: 0;
-  margin: 0;
-  width: 100%;
-  height: 1px;
-  margin-bottom: 29px;
-}
-
-.report-modal__comment {
-  padding: 20px;
-  border-inline-end: 1px solid $ui-secondary-color;
-  max-width: 320px;
-
-  p {
-    font-size: 14px;
-    line-height: 20px;
-    margin-bottom: 20px;
-  }
-
-  .setting-text {
-    display: block;
-    box-sizing: border-box;
-    width: 100%;
-    margin: 0;
-    color: $inverted-text-color;
-    background: $white;
-    padding: 10px;
-    font-family: inherit;
-    font-size: 14px;
-    resize: none;
-    outline: 0;
-    border-radius: 4px;
-    border: 1px solid $ui-secondary-color;
-    min-height: 100px;
-    max-height: 50vh;
-    margin-bottom: 10px;
-
-    &:focus {
-      border: 1px solid darken($ui-secondary-color, 8%);
-    }
-
-    &__wrapper {
-      background: $white;
-      border: 1px solid $ui-secondary-color;
-      margin-bottom: 10px;
-      border-radius: 4px;
-
-      .setting-text {
-        border: 0;
-        margin-bottom: 0;
-        border-radius: 0;
-
-        &:focus {
-          border: 0;
-        }
-      }
-
-      &__modifiers {
-        color: $inverted-text-color;
-        font-family: inherit;
-        font-size: 14px;
-        background: $white;
-      }
-    }
-
-    &__toolbar {
-      display: flex;
-      justify-content: space-between;
-      margin-bottom: 20px;
-    }
-  }
-
-  .setting-text-label {
-    display: block;
-    color: $inverted-text-color;
-    font-size: 14px;
-    font-weight: 500;
-    margin-bottom: 10px;
-  }
-
-  .setting-toggle {
-    margin-top: 20px;
-    margin-bottom: 24px;
-
-    &__label {
-      color: $inverted-text-color;
-      font-size: 14px;
-    }
-  }
-
-  @media screen and (width <= 480px) {
-    padding: 10px;
-    max-width: 100%;
-    order: 2;
-
-    .setting-toggle {
-      margin-bottom: 4px;
-    }
-  }
-}
-
-.actions-modal {
-  .status {
-    overflow-y: auto;
-    max-height: 300px;
-  }
-
-  strong {
-    display: block;
-    font-weight: 500;
-  }
-
-  max-height: 80vh;
-  max-width: 80vw;
-
-  .actions-modal__item-label {
-    font-weight: 500;
-  }
-
-  ul {
-    overflow-y: auto;
-    flex-shrink: 0;
-    max-height: 80vh;
-
-    &.with-status {
-      max-height: calc(80vh - 75px);
-    }
-
-    li:empty {
-      margin: 0;
-    }
-
-    li:not(:empty) {
-      a {
-        color: $inverted-text-color;
-        display: flex;
-        padding: 12px 16px;
-        font-size: 15px;
-        align-items: center;
-        text-decoration: none;
-
-        &,
-        button {
-          transition: none;
-        }
-
-        &.active,
-        &:hover,
-        &:active,
-        &:focus {
-          &,
-          button {
-            background: $ui-highlight-color;
-            color: $primary-text-color;
-          }
-        }
-
-        & > .react-toggle,
-        & > .icon,
-        button:first-child {
-          margin-inline-end: 10px;
-        }
-      }
-    }
-  }
-}
-
-.confirmation-modal__action-bar,
-.mute-modal__action-bar,
-.block-modal__action-bar {
-  .confirmation-modal__secondary-button {
-    flex-shrink: 1;
-  }
-}
-
-.confirmation-modal__secondary-button,
-.confirmation-modal__cancel-button,
-.mute-modal__cancel-button,
-.block-modal__cancel-button {
-  background-color: transparent;
-  color: $lighter-text-color;
-  font-size: 14px;
-  font-weight: 500;
-
-  &:hover,
-  &:focus,
-  &:active {
-    color: darken($lighter-text-color, 4%);
-    background-color: transparent;
-  }
-}
-
-.confirmation-modal__do_not_ask_again {
-  padding-inline-start: 20px;
-  padding-inline-end: 20px;
-  padding-bottom: 10px;
-  font-size: 14px;
-
-  label,
-  input {
-    vertical-align: middle;
-  }
-}
-
-.confirmation-modal__container,
-.mute-modal__container,
-.block-modal__container,
-.report-modal__target {
-  padding: 30px;
-  font-size: 16px;
-
-  strong {
-    font-weight: 500;
-
-    @each $lang in $cjk-langs {
-      &:lang(#{$lang}) {
-        font-weight: 700;
-      }
-    }
-  }
-
-  select {
-    appearance: none;
-    box-sizing: border-box;
-    font-size: 14px;
-    color: $inverted-text-color;
-    display: inline-block;
-    width: auto;
-    outline: 0;
-    font-family: inherit;
-    background: $simple-background-color
-      url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 14.933 18.467' height='19.698' width='15.929'><path d='M3.467 14.967l-3.393-3.5H14.86l-3.392 3.5c-1.866 1.925-3.666 3.5-4 3.5-.335 0-2.135-1.575-4-3.5zm.266-11.234L7.467 0 11.2 3.733l3.733 3.734H0l3.733-3.734z' fill='#{hex-color(darken($simple-background-color, 14%))}'/></svg>")
-      no-repeat right 8px center / auto 16px;
-    border: 1px solid darken($simple-background-color, 14%);
-    border-radius: 4px;
-    padding: 6px 10px;
-    padding-inline-end: 30px;
-  }
-}
-
-.confirmation-modal__container,
-.report-modal__target {
-  text-align: center;
-}
-
-.block-modal,
-.mute-modal {
-  &__explanation {
-    margin-top: 20px;
-  }
-
-  .setting-toggle {
-    margin-top: 20px;
-    margin-bottom: 24px;
-    display: flex;
-    align-items: center;
-
-    &__label {
-      color: $inverted-text-color;
-      margin: 0;
-      margin-inline-start: 8px;
-    }
-  }
-}
-
-.report-modal__target {
-  padding: 15px;
-
-  .report-modal__close {
-    position: absolute;
-    top: 10px;
-    inset-inline-end: 10px;
-  }
-}
-
-.compare-history-modal {
-  .report-modal__target {
-    border-bottom: 1px solid $ui-secondary-color;
-  }
-
-  &__container {
-    padding: 30px;
-    pointer-events: all;
-    overflow-y: auto;
-  }
-
-  .status__content {
-    color: $inverted-text-color;
-    font-size: 19px;
-    line-height: 24px;
-
-    .emojione {
-      width: 24px;
-      height: 24px;
-      margin: -1px 0 0;
-    }
-
-    a {
-      color: $highlight-text-color;
-    }
-
-    hr {
-      height: 0.25rem;
-      padding: 0;
-      background-color: $ui-secondary-color;
-      border: 0;
-      margin: 20px 0;
-    }
-  }
-
-  .media-gallery,
-  .audio-player,
-  .video-player {
-    margin-top: 15px;
-  }
-}
-
-.embed-modal {
-  width: auto;
-  max-width: 80vw;
-  max-height: 80vh;
-
-  h4 {
-    padding: 30px;
-    font-weight: 500;
-    font-size: 16px;
-    text-align: center;
-  }
-
-  .embed-modal__container {
-    padding: 10px;
-
-    .hint {
-      margin-bottom: 15px;
-    }
-
-    .embed-modal__html {
-      outline: 0;
-      box-sizing: border-box;
-      display: block;
-      width: 100%;
-      border: 0;
-      padding: 10px;
-      font-family: mastodon-font-monospace, monospace;
-      background: $ui-base-color;
-      color: $primary-text-color;
-      font-size: 14px;
-      margin: 0;
-      margin-bottom: 15px;
-      border-radius: 4px;
-
-      &::-moz-focus-inner {
-        border: 0;
-      }
-
-      &::-moz-focus-inner,
-      &:focus,
-      &:active {
-        outline: 0 !important;
-      }
-
-      &:focus {
-        background: lighten($ui-base-color, 4%);
-      }
-
-      @media screen and (width <= 600px) {
-        font-size: 16px;
-      }
-    }
-
-    .embed-modal__iframe {
-      width: 400px;
-      max-width: 100%;
-      overflow: hidden;
-      border: 0;
-      border-radius: 4px;
-    }
-  }
-}
-
-.focal-point {
-  position: relative;
-  cursor: move;
-  overflow: hidden;
-  height: 100%;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  background: $base-shadow-color;
-
-  img,
-  video,
-  canvas {
-    display: block;
-    max-height: 80vh;
-    width: 100%;
-    height: auto;
-    margin: 0;
-    object-fit: contain;
-    background: $base-shadow-color;
-  }
-
-  &__reticle {
-    position: absolute;
-    width: 100px;
-    height: 100px;
-    transform: translate(-50%, -50%);
-    background: url('~images/reticle.png') no-repeat 0 0;
-    border-radius: 50%;
-    box-shadow: 0 0 0 9999em rgba($base-shadow-color, 0.35);
-  }
-
-  &__overlay {
-    position: absolute;
-    width: 100%;
-    height: 100%;
-    top: 0;
-    inset-inline-start: 0;
-  }
-
-  &__preview {
-    position: absolute;
-    bottom: 10px;
-    inset-inline-end: 10px;
-    z-index: 2;
-    cursor: move;
-    transition: opacity 0.1s ease;
-
-    &:hover {
-      opacity: 0.5;
-    }
-
-    strong {
-      color: $primary-text-color;
-      font-size: 14px;
-      font-weight: 500;
-      display: block;
-      margin-bottom: 5px;
-    }
-
-    div {
-      border-radius: 4px;
-      box-shadow: 0 0 14px rgba($base-shadow-color, 0.2);
-    }
-  }
-
-  @media screen and (width <= 480px) {
-    img,
-    video {
-      max-height: 100%;
-    }
-
-    &__preview {
-      display: none;
-    }
-  }
-}
-
-.filtered-status-info {
-  text-align: start;
-
-  .spoiler__text {
-    margin-top: 20px;
-  }
-
-  .account {
-    border-bottom: 0;
-  }
-
-  .account__display-name strong {
-    color: $inverted-text-color;
-  }
-
-  .status__content__spoiler {
-    display: none;
-
-    &--visible {
-      display: flex;
-    }
-  }
-
-  ul {
-    padding: 10px;
-    margin-inline-start: 12px;
-    list-style: disc inside;
-  }
-
-  .filtered-status-edit-link {
-    color: $action-button-color;
-    text-decoration: none;
-
-    &:hover {
-      text-decoration: underline;
-    }
-  }
-}
-
-.modal-root__container .privacy-dropdown {
-  flex-grow: 0;
-}
-
-.modal-root__container .privacy-dropdown__dropdown {
-  pointer-events: auto;
-  z-index: 9999;
-}
-
-img.modal-warning {
-  display: block;
-  margin: auto;
-  margin-bottom: 15px;
-  width: 60px;
-}
-
-.interaction-modal {
-  max-width: 90vw;
-  width: 600px;
-  background: $ui-base-color;
-  border-radius: 8px;
-  overflow-x: hidden;
-  overflow-y: auto;
-  position: relative;
-  display: block;
-  padding: 20px;
-
-  h3 {
-    font-size: 22px;
-    line-height: 33px;
-    font-weight: 700;
-    text-align: center;
-  }
-
-  &__icon {
-    color: $highlight-text-color;
-    margin: 0 5px;
-  }
-
-  &__lead {
-    padding: 20px;
-    text-align: center;
-
-    h3 {
-      margin-bottom: 15px;
-    }
-
-    p {
-      font-size: 17px;
-      line-height: 22px;
-      color: $darker-text-color;
-    }
-  }
-
-  &__choices {
-    display: flex;
-
-    &__choice {
-      flex: 0 0 auto;
-      width: 50%;
-      box-sizing: border-box;
-      padding: 20px;
-
-      h3 {
-        margin-bottom: 20px;
-      }
-
-      p {
-        color: $darker-text-color;
-        margin-bottom: 20px;
-      }
-
-      .button {
-        margin-bottom: 10px;
-
-        &:last-child {
-          margin-bottom: 0;
-        }
-      }
-    }
-  }
-
-  @media screen and (max-width: $no-gap-breakpoint - 1px) {
-    &__choices {
-      display: block;
-
-      &__choice {
-        width: auto;
-        margin-bottom: 20px;
-      }
-    }
-  }
-}
-
-.copypaste {
-  display: flex;
-  align-items: center;
-  gap: 10px;
-
-  input {
-    display: block;
-    font-family: inherit;
-    background: darken($ui-base-color, 8%);
-    border: 1px solid $highlight-text-color;
-    color: $darker-text-color;
-    border-radius: 4px;
-    padding: 6px 9px;
-    line-height: 22px;
-    font-size: 14px;
-    transition: border-color 300ms linear;
-    flex: 1 1 auto;
-    overflow: hidden;
-
-    &:focus {
-      outline: 0;
-      background: darken($ui-base-color, 4%);
-    }
-  }
-
-  .button {
-    flex: 0 0 auto;
-    transition: background 300ms linear;
-  }
-
-  &.copied {
-    input {
-      border: 1px solid $valid-value-color;
-      transition: none;
-    }
-
-    .button {
-      background: $valid-value-color;
-      transition: none;
-    }
-  }
-}
diff --git a/app/javascript/flavours/glitch/styles/components/search.scss b/app/javascript/flavours/glitch/styles/components/search.scss
index 3261efafdc..99ed697e37 100644
--- a/app/javascript/flavours/glitch/styles/components/search.scss
+++ b/app/javascript/flavours/glitch/styles/components/search.scss
@@ -159,6 +159,7 @@
 
     &.active {
       transform: rotate(90deg);
+      opacity: 1;
     }
 
     &:hover {
diff --git a/app/javascript/flavours/glitch/styles/forms.scss b/app/javascript/flavours/glitch/styles/forms.scss
index 850374f613..2b7c02f115 100644
--- a/app/javascript/flavours/glitch/styles/forms.scss
+++ b/app/javascript/flavours/glitch/styles/forms.scss
@@ -310,9 +310,19 @@ code {
       border-radius: 4px;
       background: url('images/void.png');
 
+      &[src$='missing.png'] {
+        visibility: hidden;
+      }
+
       &:last-child {
         margin-bottom: 0;
       }
+
+      &#account_avatar-preview {
+        width: 90px;
+        height: 90px;
+        object-fit: cover;
+      }
     }
   }
 
diff --git a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
index 93c861356e..9bc2366529 100644
--- a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
+++ b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
@@ -421,6 +421,10 @@ html {
   border-top: 0;
 }
 
+.column-settings__hashtags .column-select__option {
+  color: $white;
+}
+
 .dashboard__quick-access,
 .focal-point__preview strong,
 .admin-wrapper .content__heading__tabs a.selected {
diff --git a/app/javascript/mastodon/actions/importer/normalizer.js b/app/javascript/mastodon/actions/importer/normalizer.js
index 67368abb24..e6b361c0c9 100644
--- a/app/javascript/mastodon/actions/importer/normalizer.js
+++ b/app/javascript/mastodon/actions/importer/normalizer.js
@@ -76,7 +76,10 @@ export function normalizeStatus(status, normalOldStatus) {
     normalStatus.spoilerHtml = normalOldStatus.get('spoilerHtml');
     normalStatus.spoiler_text = normalOldStatus.get('spoiler_text');
     normalStatus.hidden = normalOldStatus.get('hidden');
-    normalStatus.translation = normalOldStatus.get('translation');
+
+    if (normalOldStatus.get('translation')) {
+      normalStatus.translation = normalOldStatus.get('translation');
+    }
   } else {
     // If the status has a CW but no contents, treat the CW as if it were the
     // status' contents, to avoid having a CW toggle with seemingly no effect.
diff --git a/app/javascript/mastodon/actions/timelines.js b/app/javascript/mastodon/actions/timelines.js
index 96dc4a2a1e..08561c71f4 100644
--- a/app/javascript/mastodon/actions/timelines.js
+++ b/app/javascript/mastodon/actions/timelines.js
@@ -145,7 +145,7 @@ export function fillTimelineGaps(timelineId, path, params = {}, done = noOp) {
 export const expandHomeTimeline            = ({ maxId } = {}, done = noOp) => expandTimeline('home', '/api/v1/timelines/home', { max_id: maxId }, done);
 export const expandPublicTimeline          = ({ maxId, onlyMedia, onlyRemote } = {}, done = noOp) => expandTimeline(`public${onlyRemote ? ':remote' : ''}${onlyMedia ? ':media' : ''}`, '/api/v1/timelines/public', { remote: !!onlyRemote, max_id: maxId, only_media: !!onlyMedia }, done);
 export const expandCommunityTimeline       = ({ maxId, onlyMedia } = {}, done = noOp) => expandTimeline(`community${onlyMedia ? ':media' : ''}`, '/api/v1/timelines/public', { local: true, max_id: maxId, only_media: !!onlyMedia }, done);
-export const expandAccountTimeline         = (accountId, { maxId, withReplies, tagged } = {}) => expandTimeline(`account:${accountId}${withReplies ? ':with_replies' : ''}${tagged ? `:${tagged}` : ''}`, `/api/v1/accounts/${accountId}/statuses`, { exclude_replies: !withReplies, tagged, max_id: maxId });
+export const expandAccountTimeline         = (accountId, { maxId, withReplies, tagged } = {}) => expandTimeline(`account:${accountId}${withReplies ? ':with_replies' : ''}${tagged ? `:${tagged}` : ''}`, `/api/v1/accounts/${accountId}/statuses`, { exclude_replies: !withReplies, exclude_reblogs: withReplies, tagged, max_id: maxId });
 export const expandAccountFeaturedTimeline = (accountId, { tagged } = {}) => expandTimeline(`account:${accountId}:pinned${tagged ? `:${tagged}` : ''}`, `/api/v1/accounts/${accountId}/statuses`, { pinned: true, tagged });
 export const expandAccountMediaTimeline    = (accountId, { maxId } = {}) => expandTimeline(`account:${accountId}:media`, `/api/v1/accounts/${accountId}/statuses`, { max_id: maxId, only_media: true, limit: 40 });
 export const expandListTimeline            = (id, { maxId } = {}, done = noOp) => expandTimeline(`list:${id}`, `/api/v1/timelines/list/${id}`, { max_id: maxId }, done);
diff --git a/app/javascript/mastodon/components/__tests__/hashtag_bar.tsx b/app/javascript/mastodon/components/__tests__/hashtag_bar.tsx
new file mode 100644
index 0000000000..1856b7109e
--- /dev/null
+++ b/app/javascript/mastodon/components/__tests__/hashtag_bar.tsx
@@ -0,0 +1,199 @@
+import { fromJS } from 'immutable';
+
+import type { StatusLike } from '../hashtag_bar';
+import { computeHashtagBarForStatus } from '../hashtag_bar';
+
+function createStatus(
+  content: string,
+  hashtags: string[],
+  hasMedia = false,
+  spoilerText?: string,
+) {
+  return fromJS({
+    tags: hashtags.map((name) => ({ name })),
+    contentHtml: content,
+    media_attachments: hasMedia ? ['fakeMedia'] : [],
+    spoiler_text: spoilerText,
+  }) as unknown as StatusLike; // need to force the type here, as it is not properly defined
+}
+
+describe('computeHashtagBarForStatus', () => {
+  it('does nothing when there are no tags', () => {
+    const status = createStatus('<p>Simple text</p>', []);
+
+    const { hashtagsInBar, statusContentProps } =
+      computeHashtagBarForStatus(status);
+
+    expect(hashtagsInBar).toEqual([]);
+    expect(statusContentProps.statusContent).toMatchInlineSnapshot(
+      `"<p>Simple text</p>"`,
+    );
+  });
+
+  it('displays out of band hashtags in the bar', () => {
+    const status = createStatus(
+      '<p>Simple text <a href="test">#hashtag</a></p>',
+      ['hashtag', 'test'],
+    );
+
+    const { hashtagsInBar, statusContentProps } =
+      computeHashtagBarForStatus(status);
+
+    expect(hashtagsInBar).toEqual(['test']);
+    expect(statusContentProps.statusContent).toMatchInlineSnapshot(
+      `"<p>Simple text <a href="test">#hashtag</a></p>"`,
+    );
+  });
+
+  it('extract tags from the last line', () => {
+    const status = createStatus(
+      '<p>Simple text</p><p><a href="test">#hashtag</a></p>',
+      ['hashtag'],
+    );
+
+    const { hashtagsInBar, statusContentProps } =
+      computeHashtagBarForStatus(status);
+
+    expect(hashtagsInBar).toEqual(['hashtag']);
+    expect(statusContentProps.statusContent).toMatchInlineSnapshot(
+      `"<p>Simple text</p>"`,
+    );
+  });
+
+  it('does not include tags from content', () => {
+    const status = createStatus(
+      '<p>Simple text with a <a href="test">#hashtag</a></p><p><a href="test">#hashtag</a></p>',
+      ['hashtag'],
+    );
+
+    const { hashtagsInBar, statusContentProps } =
+      computeHashtagBarForStatus(status);
+
+    expect(hashtagsInBar).toEqual([]);
+    expect(statusContentProps.statusContent).toMatchInlineSnapshot(
+      `"<p>Simple text with a <a href="test">#hashtag</a></p>"`,
+    );
+  });
+
+  it('works with one line status and hashtags', () => {
+    const status = createStatus(
+      '<p><a href="test">#test</a>. And another <a href="test">#hashtag</a></p>',
+      ['hashtag', 'test'],
+    );
+
+    const { hashtagsInBar, statusContentProps } =
+      computeHashtagBarForStatus(status);
+
+    expect(hashtagsInBar).toEqual([]);
+    expect(statusContentProps.statusContent).toMatchInlineSnapshot(
+      `"<p><a href="test">#test</a>. And another <a href="test">#hashtag</a></p>"`,
+    );
+  });
+
+  it('de-duplicate accentuated characters with case differences', () => {
+    const status = createStatus(
+      '<p>Text</p><p><a href="test">#éaa</a> <a href="test">#Éaa</a></p>',
+      ['éaa'],
+    );
+
+    const { hashtagsInBar, statusContentProps } =
+      computeHashtagBarForStatus(status);
+
+    expect(hashtagsInBar).toEqual(['Éaa']);
+    expect(statusContentProps.statusContent).toMatchInlineSnapshot(
+      `"<p>Text</p>"`,
+    );
+  });
+
+  it('handles server-side normalized tags with accentuated characters', () => {
+    const status = createStatus(
+      '<p>Text</p><p><a href="test">#éaa</a> <a href="test">#Éaa</a></p>',
+      ['eaa'], // The server may normalize the hashtags in the `tags` attribute
+    );
+
+    const { hashtagsInBar, statusContentProps } =
+      computeHashtagBarForStatus(status);
+
+    expect(hashtagsInBar).toEqual(['Éaa']);
+    expect(statusContentProps.statusContent).toMatchInlineSnapshot(
+      `"<p>Text</p>"`,
+    );
+  });
+
+  it('does not display in bar a hashtag in content with a case difference', () => {
+    const status = createStatus(
+      '<p>Text <a href="test">#Éaa</a></p><p><a href="test">#éaa</a></p>',
+      ['éaa'],
+    );
+
+    const { hashtagsInBar, statusContentProps } =
+      computeHashtagBarForStatus(status);
+
+    expect(hashtagsInBar).toEqual([]);
+    expect(statusContentProps.statusContent).toMatchInlineSnapshot(
+      `"<p>Text <a href="test">#Éaa</a></p>"`,
+    );
+  });
+
+  it('does not modify a status with a line of hashtags only', () => {
+    const status = createStatus(
+      '<p><a href="test">#test</a>  <a href="test">#hashtag</a></p>',
+      ['test', 'hashtag'],
+    );
+
+    const { hashtagsInBar, statusContentProps } =
+      computeHashtagBarForStatus(status);
+
+    expect(hashtagsInBar).toEqual([]);
+    expect(statusContentProps.statusContent).toMatchInlineSnapshot(
+      `"<p><a href="test">#test</a>  <a href="test">#hashtag</a></p>"`,
+    );
+  });
+
+  it('puts the hashtags in the bar if a status content has hashtags in the only line and has a media', () => {
+    const status = createStatus(
+      '<p>This is my content! <a href="test">#hashtag</a></p>',
+      ['hashtag'],
+      true,
+    );
+
+    const { hashtagsInBar, statusContentProps } =
+      computeHashtagBarForStatus(status);
+
+    expect(hashtagsInBar).toEqual([]);
+    expect(statusContentProps.statusContent).toMatchInlineSnapshot(
+      `"<p>This is my content! <a href="test">#hashtag</a></p>"`,
+    );
+  });
+
+  it('puts the hashtags in the bar if a status content is only hashtags and has a media', () => {
+    const status = createStatus(
+      '<p><a href="test">#test</a>  <a href="test">#hashtag</a></p>',
+      ['test', 'hashtag'],
+      true,
+    );
+
+    const { hashtagsInBar, statusContentProps } =
+      computeHashtagBarForStatus(status);
+
+    expect(hashtagsInBar).toEqual(['test', 'hashtag']);
+    expect(statusContentProps.statusContent).toMatchInlineSnapshot(`""`);
+  });
+
+  it('does not use the hashtag bar if the status content is only hashtags, has a CW and a media', () => {
+    const status = createStatus(
+      '<p><a href="test">#test</a>  <a href="test">#hashtag</a></p>',
+      ['test', 'hashtag'],
+      true,
+      'My CW text',
+    );
+
+    const { hashtagsInBar, statusContentProps } =
+      computeHashtagBarForStatus(status);
+
+    expect(hashtagsInBar).toEqual([]);
+    expect(statusContentProps.statusContent).toMatchInlineSnapshot(
+      `"<p><a href="test">#test</a>  <a href="test">#hashtag</a></p>"`,
+    );
+  });
+});
diff --git a/app/javascript/mastodon/components/admin/ReportReasonSelector.jsx b/app/javascript/mastodon/components/admin/ReportReasonSelector.jsx
index df298f333c..ecce92b309 100644
--- a/app/javascript/mastodon/components/admin/ReportReasonSelector.jsx
+++ b/app/javascript/mastodon/components/admin/ReportReasonSelector.jsx
@@ -8,6 +8,7 @@ import classNames from 'classnames';
 import api from 'mastodon/api';
 
 const messages = defineMessages({
+  legal: { id: 'report.categories.legal', defaultMessage: 'Legal' },
   other: { id: 'report.categories.other', defaultMessage: 'Other' },
   spam: { id: 'report.categories.spam', defaultMessage: 'Spam' },
   violation: { id: 'report.categories.violation', defaultMessage: 'Content violates one or more server rules' },
@@ -150,6 +151,7 @@ class ReportReasonSelector extends PureComponent {
     return (
       <div className='report-reason-selector'>
         <Category id='other' text={intl.formatMessage(messages.other)} selected={category === 'other'} onSelect={this.handleSelect} disabled={disabled} />
+        <Category id='legal' text={intl.formatMessage(messages.legal)} selected={category === 'legal'} onSelect={this.handleSelect} disabled={disabled} />
         <Category id='spam' text={intl.formatMessage(messages.spam)} selected={category === 'spam'} onSelect={this.handleSelect} disabled={disabled} />
         <Category id='violation' text={intl.formatMessage(messages.violation)} selected={category === 'violation'} onSelect={this.handleSelect} disabled={disabled}>
           {rules.map(rule => <Rule key={rule.id} id={rule.id} text={rule.text} selected={rule_ids.includes(rule.id)} onToggle={this.handleToggle} disabled={disabled} />)}
diff --git a/app/javascript/mastodon/components/column.jsx b/app/javascript/mastodon/components/column.jsx
index 7e7eaa4115..d737bd347c 100644
--- a/app/javascript/mastodon/components/column.jsx
+++ b/app/javascript/mastodon/components/column.jsx
@@ -16,7 +16,19 @@ export default class Column extends PureComponent {
   };
 
   scrollTop () {
-    const scrollable = this.props.bindToDocument ? document.scrollingElement : this.node.querySelector('.scrollable');
+    let scrollable = null;
+
+    if (this.props.bindToDocument) {
+      scrollable = document.scrollingElement;
+    } else {
+      scrollable = this.node.querySelector('.scrollable');
+
+      // Some columns have nested `.scrollable` containers, with the outer one
+      // being a wrapper while the actual scrollable content is deeper.
+      if (scrollable.classList.contains('scrollable--flex')) {
+        scrollable = scrollable?.querySelector('.scrollable') || scrollable;
+      }
+   }
 
     if (!scrollable) {
       return;
diff --git a/app/javascript/mastodon/components/hashtag_bar.tsx b/app/javascript/mastodon/components/hashtag_bar.tsx
new file mode 100644
index 0000000000..674c481b81
--- /dev/null
+++ b/app/javascript/mastodon/components/hashtag_bar.tsx
@@ -0,0 +1,234 @@
+import { useState, useCallback } from 'react';
+
+import { FormattedMessage } from 'react-intl';
+
+import { Link } from 'react-router-dom';
+
+import type { List, Record } from 'immutable';
+
+import { groupBy, minBy } from 'lodash';
+
+import { getStatusContent } from './status_content';
+
+// About two lines on desktop
+const VISIBLE_HASHTAGS = 7;
+
+// Those types are not correct, they need to be replaced once this part of the state is typed
+export type TagLike = Record<{ name: string }>;
+export type StatusLike = Record<{
+  tags: List<TagLike>;
+  contentHTML: string;
+  media_attachments: List<unknown>;
+  spoiler_text?: string;
+}>;
+
+function normalizeHashtag(hashtag: string) {
+  return (
+    hashtag && hashtag.startsWith('#') ? hashtag.slice(1) : hashtag
+  ).normalize('NFKC');
+}
+
+function isNodeLinkHashtag(element: Node): element is HTMLLinkElement {
+  return (
+    element instanceof HTMLAnchorElement &&
+    // it may be a <a> starting with a hashtag
+    (element.textContent?.[0] === '#' ||
+      // or a #<a>
+      element.previousSibling?.textContent?.[
+        element.previousSibling.textContent.length - 1
+      ] === '#')
+  );
+}
+
+/**
+ * Removes duplicates from an hashtag list, case-insensitive, keeping only the best one
+ * "Best" here is defined by the one with the more casing difference (ie, the most camel-cased one)
+ * @param hashtags The list of hashtags
+ * @returns The input hashtags, but with only 1 occurence of each (case-insensitive)
+ */
+function uniqueHashtagsWithCaseHandling(hashtags: string[]) {
+  const groups = groupBy(hashtags, (tag) =>
+    tag.normalize('NFKD').toLowerCase(),
+  );
+
+  return Object.values(groups).map((tags) => {
+    if (tags.length === 1) return tags[0];
+
+    // The best match is the one where we have the less difference between upper and lower case letter count
+    const best = minBy(tags, (tag) => {
+      const upperCase = Array.from(tag).reduce(
+        (acc, char) => (acc += char.toUpperCase() === char ? 1 : 0),
+        0,
+      );
+
+      const lowerCase = tag.length - upperCase;
+
+      return Math.abs(lowerCase - upperCase);
+    });
+
+    return best ?? tags[0];
+  });
+}
+
+// Create the collator once, this is much more efficient
+const collator = new Intl.Collator(undefined, {
+  sensitivity: 'base', // we use this to emulate the ASCII folding done on the server-side, hopefuly more efficiently
+});
+
+function localeAwareInclude(collection: string[], value: string) {
+  const normalizedValue = value.normalize('NFKC');
+
+  return !!collection.find(
+    (item) => collator.compare(item.normalize('NFKC'), normalizedValue) === 0,
+  );
+}
+
+// We use an intermediate function here to make it easier to test
+export function computeHashtagBarForStatus(status: StatusLike): {
+  statusContentProps: { statusContent: string };
+  hashtagsInBar: string[];
+} {
+  let statusContent = getStatusContent(status);
+
+  const tagNames = status
+    .get('tags')
+    .map((tag) => tag.get('name'))
+    .toJS();
+
+  // this is returned if we stop the processing early, it does not change what is displayed
+  const defaultResult = {
+    statusContentProps: { statusContent },
+    hashtagsInBar: [],
+  };
+
+  // return early if this status does not have any tags
+  if (tagNames.length === 0) return defaultResult;
+
+  const template = document.createElement('template');
+  template.innerHTML = statusContent.trim();
+
+  const lastChild = template.content.lastChild;
+
+  if (!lastChild) return defaultResult;
+
+  template.content.removeChild(lastChild);
+  const contentWithoutLastLine = template;
+
+  // First, try to parse
+  const contentHashtags = Array.from(
+    contentWithoutLastLine.content.querySelectorAll<HTMLLinkElement>('a[href]'),
+  ).reduce<string[]>((result, link) => {
+    if (isNodeLinkHashtag(link)) {
+      if (link.textContent) result.push(normalizeHashtag(link.textContent));
+    }
+    return result;
+  }, []);
+
+  // Now we parse the last line, and try to see if it only contains hashtags
+  const lastLineHashtags: string[] = [];
+  // try to see if the last line is only hashtags
+  let onlyHashtags = true;
+
+  const normalizedTagNames = tagNames.map((tag) => tag.normalize('NFKC'));
+
+  Array.from(lastChild.childNodes).forEach((node) => {
+    if (isNodeLinkHashtag(node) && node.textContent) {
+      const normalized = normalizeHashtag(node.textContent);
+
+      if (!localeAwareInclude(normalizedTagNames, normalized)) {
+        // stop here, this is not a real hashtag, so consider it as text
+        onlyHashtags = false;
+        return;
+      }
+
+      if (!localeAwareInclude(contentHashtags, normalized))
+        // only add it if it does not appear in the rest of the content
+        lastLineHashtags.push(normalized);
+    } else if (node.nodeType !== Node.TEXT_NODE || node.nodeValue?.trim()) {
+      // not a space
+      onlyHashtags = false;
+    }
+  });
+
+  const hashtagsInBar = tagNames.filter((tag) => {
+    const normalizedTag = tag.normalize('NFKC');
+    // the tag does not appear at all in the status content, it is an out-of-band tag
+    return (
+      !localeAwareInclude(contentHashtags, normalizedTag) &&
+      !localeAwareInclude(lastLineHashtags, normalizedTag)
+    );
+  });
+
+  const isOnlyOneLine = contentWithoutLastLine.content.childElementCount === 0;
+  const hasMedia = status.get('media_attachments').size > 0;
+  const hasSpoiler = !!status.get('spoiler_text');
+
+  // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition -- due to https://github.com/microsoft/TypeScript/issues/9998
+  if (onlyHashtags && ((hasMedia && !hasSpoiler) || !isOnlyOneLine)) {
+    // if the last line only contains hashtags, and we either:
+    // - have other content in the status
+    // - dont have other content, but a media and no CW. If it has a CW, then we do not remove the content to avoid having an empty content behind the CW button
+    statusContent = contentWithoutLastLine.innerHTML;
+    // and add the tags to the bar
+    hashtagsInBar.push(...lastLineHashtags);
+  }
+
+  return {
+    statusContentProps: { statusContent },
+    hashtagsInBar: uniqueHashtagsWithCaseHandling(hashtagsInBar),
+  };
+}
+
+/**
+ *  This function will process a status to, at the same time (avoiding parsing it twice):
+ * - build the HashtagBar for this status
+ * - remove the last-line hashtags from the status content
+ * @param status The status to process
+ * @returns Props to be passed to the <StatusContent> component, and the hashtagBar to render
+ */
+export function getHashtagBarForStatus(status: StatusLike) {
+  const { statusContentProps, hashtagsInBar } =
+    computeHashtagBarForStatus(status);
+
+  return {
+    statusContentProps,
+    hashtagBar: <HashtagBar hashtags={hashtagsInBar} />,
+  };
+}
+
+const HashtagBar: React.FC<{
+  hashtags: string[];
+}> = ({ hashtags }) => {
+  const [expanded, setExpanded] = useState(false);
+  const handleClick = useCallback(() => {
+    setExpanded(true);
+  }, []);
+
+  if (hashtags.length === 0) {
+    return null;
+  }
+
+  const revealedHashtags = expanded
+    ? hashtags
+    : hashtags.slice(0, VISIBLE_HASHTAGS - 1);
+
+  return (
+    <div className='hashtag-bar'>
+      {revealedHashtags.map((hashtag) => (
+        <Link key={hashtag} to={`/tags/${hashtag}`}>
+          #<span>{hashtag}</span>
+        </Link>
+      ))}
+
+      {!expanded && hashtags.length > VISIBLE_HASHTAGS && (
+        <button className='link-button' onClick={handleClick}>
+          <FormattedMessage
+            id='hashtags.and_other'
+            defaultMessage='…and {count, plural, other {# more}}'
+            values={{ count: hashtags.length - VISIBLE_HASHTAGS }}
+          />
+        </button>
+      )}
+    </div>
+  );
+};
diff --git a/app/javascript/mastodon/components/status.jsx b/app/javascript/mastodon/components/status.jsx
index 37951d5782..30692d1cd9 100644
--- a/app/javascript/mastodon/components/status.jsx
+++ b/app/javascript/mastodon/components/status.jsx
@@ -22,6 +22,7 @@ import { displayMedia } from '../initial_state';
 import { Avatar } from './avatar';
 import { AvatarOverlay } from './avatar_overlay';
 import { DisplayName } from './display_name';
+import { getHashtagBarForStatus } from './hashtag_bar';
 import { RelativeTimestamp } from './relative_timestamp';
 import StatusActionBar from './status_action_bar';
 import StatusContent from './status_content';
@@ -544,6 +545,9 @@ class Status extends ImmutablePureComponent {
 
     const visibilityIcon = visibilityIconInfo[status.get('visibility')];
 
+    const {statusContentProps, hashtagBar} = getHashtagBarForStatus(status);
+    const expanded = !status.get('hidden')
+
     return (
       <HotKeys handlers={handlers}>
         <div className={classNames('status__wrapper', `status__wrapper-${status.get('visibility')}`, { 'status__wrapper-reply': !!status.get('in_reply_to_id'), unread, focusable: !this.props.muted })} tabIndex={this.props.muted ? null : 0} data-featured={featured ? 'true' : null} aria-label={textForScreenReader(intl, status, rebloggedByText)} ref={this.handleRef}>
@@ -571,15 +575,18 @@ class Status extends ImmutablePureComponent {
             <StatusContent
               status={status}
               onClick={this.handleClick}
-              expanded={!status.get('hidden')}
+              expanded={expanded}
               onExpandedToggle={this.handleExpandedToggle}
               onTranslate={this.handleTranslate}
               collapsible
               onCollapsedToggle={this.handleCollapsedToggle}
+              {...statusContentProps}
             />
 
             {media}
 
+            {expanded && hashtagBar}
+
             <StatusActionBar scrollKey={scrollKey} status={status} account={account} onFilter={matchedFilters ? this.handleFilterClick : null} {...other} />
           </div>
         </div>
diff --git a/app/javascript/mastodon/components/status_content.jsx b/app/javascript/mastodon/components/status_content.jsx
index 84a698810f..d3bbc1ba02 100644
--- a/app/javascript/mastodon/components/status_content.jsx
+++ b/app/javascript/mastodon/components/status_content.jsx
@@ -15,6 +15,15 @@ import { autoPlayGif, languages as preloadedLanguages } from 'mastodon/initial_s
 
 const MAX_HEIGHT = 706; // 22px * 32 (+ 2px padding at the top)
 
+/**
+ *
+ * @param {any} status
+ * @returns {string}
+ */
+export function getStatusContent(status) {
+  return status.getIn(['translation', 'contentHtml']) || status.get('contentHtml');
+}
+
 class TranslateButton extends PureComponent {
 
   static propTypes = {
@@ -65,6 +74,7 @@ class StatusContent extends PureComponent {
 
   static propTypes = {
     status: ImmutablePropTypes.map.isRequired,
+    statusContent: PropTypes.string,
     expanded: PropTypes.bool,
     onExpandedToggle: PropTypes.func,
     onTranslate: PropTypes.func,
@@ -225,7 +235,7 @@ class StatusContent extends PureComponent {
   };
 
   render () {
-    const { status, intl } = this.props;
+    const { status, intl, statusContent } = this.props;
 
     const hidden = this.props.onExpandedToggle ? !this.props.expanded : this.state.hidden;
     const renderReadMore = this.props.onClick && status.get('collapsed');
@@ -233,7 +243,7 @@ class StatusContent extends PureComponent {
     const targetLanguages = this.props.languages?.get(status.get('language') || 'und');
     const renderTranslate = this.props.onTranslate && this.context.identity.signedIn && ['public', 'unlisted'].includes(status.get('visibility')) && status.get('search_index').trim().length > 0 && targetLanguages?.includes(contentLocale);
 
-    const content = { __html: status.getIn(['translation', 'contentHtml']) || status.get('contentHtml') };
+    const content = { __html: statusContent ?? getStatusContent(status) };
     const spoilerContent = { __html: status.getIn(['translation', 'spoilerHtml']) || status.get('spoilerHtml') };
     const language = status.getIn(['translation', 'language']) || status.get('language');
     const classNames = classnames('status__content', {
diff --git a/app/javascript/mastodon/features/account/components/header.jsx b/app/javascript/mastodon/features/account/components/header.jsx
index d351e210f6..fe6cbad547 100644
--- a/app/javascript/mastodon/features/account/components/header.jsx
+++ b/app/javascript/mastodon/features/account/components/header.jsx
@@ -265,9 +265,9 @@ class Header extends ImmutablePureComponent {
       if (signedIn && !account.get('relationship')) { // Wait until the relationship is loaded
         actionBtn = '';
       } else if (account.getIn(['relationship', 'requested'])) {
-        actionBtn = <Button className={classNames({ 'button--with-bell': bellBtn !== '' })} text={intl.formatMessage(messages.cancel_follow_request)} title={intl.formatMessage(messages.requested)} onClick={this.props.onFollow} />;
+        actionBtn = <Button text={intl.formatMessage(messages.cancel_follow_request)} title={intl.formatMessage(messages.requested)} onClick={this.props.onFollow} />;
       } else if (!account.getIn(['relationship', 'blocking'])) {
-        actionBtn = <Button disabled={account.getIn(['relationship', 'blocked_by'])} className={classNames({ 'button--destructive': account.getIn(['relationship', 'following']), 'button--with-bell': bellBtn !== '' })} text={intl.formatMessage(account.getIn(['relationship', 'following']) ? messages.unfollow : messages.follow)} onClick={signedIn ? this.props.onFollow : this.props.onInteractionModal} />;
+        actionBtn = <Button disabled={account.getIn(['relationship', 'blocked_by'])} className={classNames({ 'button--destructive': account.getIn(['relationship', 'following']) })} text={intl.formatMessage(account.getIn(['relationship', 'following']) ? messages.unfollow : messages.follow)} onClick={signedIn ? this.props.onFollow : this.props.onInteractionModal} />;
       } else if (account.getIn(['relationship', 'blocking'])) {
         actionBtn = <Button text={intl.formatMessage(messages.unblock, { name: account.get('username') })} onClick={this.props.onBlock} />;
       }
diff --git a/app/javascript/mastodon/features/explore/components/story.jsx b/app/javascript/mastodon/features/explore/components/story.jsx
index 92eb41cff8..80dd5200fc 100644
--- a/app/javascript/mastodon/features/explore/components/story.jsx
+++ b/app/javascript/mastodon/features/explore/components/story.jsx
@@ -22,6 +22,7 @@ export default class Story extends PureComponent {
     author: PropTypes.string,
     sharedTimes: PropTypes.number,
     thumbnail: PropTypes.string,
+    thumbnailDescription: PropTypes.string,
     blurhash: PropTypes.string,
     expanded: PropTypes.bool,
   };
@@ -33,7 +34,7 @@ export default class Story extends PureComponent {
   handleImageLoad = () => this.setState({ thumbnailLoaded: true });
 
   render () {
-    const { expanded, url, title, lang, publisher, author, publishedAt, sharedTimes, thumbnail, blurhash } = this.props;
+    const { expanded, url, title, lang, publisher, author, publishedAt, sharedTimes, thumbnail, thumbnailDescription, blurhash } = this.props;
 
     const { thumbnailLoaded } = this.state;
 
@@ -49,7 +50,7 @@ export default class Story extends PureComponent {
           {thumbnail ? (
             <>
               <div className={classNames('story__thumbnail__preview', { 'story__thumbnail__preview--hidden': thumbnailLoaded })}><Blurhash hash={blurhash} /></div>
-              <img src={thumbnail} onLoad={this.handleImageLoad} alt='' role='presentation' />
+              <img src={thumbnail} onLoad={this.handleImageLoad} alt={thumbnailDescription} title={thumbnailDescription} lang={lang} />
             </>
           ) : <Skeleton />}
         </div>
diff --git a/app/javascript/mastodon/features/explore/links.jsx b/app/javascript/mastodon/features/explore/links.jsx
index 489ab6dd61..663aa6d80f 100644
--- a/app/javascript/mastodon/features/explore/links.jsx
+++ b/app/javascript/mastodon/features/explore/links.jsx
@@ -67,6 +67,7 @@ class Links extends PureComponent {
             author={link.get('author_name')}
             sharedTimes={link.getIn(['history', 0, 'accounts']) * 1 + link.getIn(['history', 1, 'accounts']) * 1}
             thumbnail={link.get('image')}
+            thumbnailDescription={link.get('image_description')}
             blurhash={link.get('blurhash')}
           />
         ))}
diff --git a/app/javascript/mastodon/features/explore/results.jsx b/app/javascript/mastodon/features/explore/results.jsx
index bf2f0b95ad..7d1ce69ad0 100644
--- a/app/javascript/mastodon/features/explore/results.jsx
+++ b/app/javascript/mastodon/features/explore/results.jsx
@@ -108,10 +108,10 @@ class Results extends PureComponent {
     return (
       <>
         <div className='account__section-headline'>
-          <button onClick={this.handleSelectAll} className={type === 'all' && 'active'}><FormattedMessage id='search_results.all' defaultMessage='All' /></button>
-          <button onClick={this.handleSelectAccounts} className={type === 'accounts' && 'active'}><FormattedMessage id='search_results.accounts' defaultMessage='Profiles' /></button>
-          <button onClick={this.handleSelectHashtags} className={type === 'hashtags' && 'active'}><FormattedMessage id='search_results.hashtags' defaultMessage='Hashtags' /></button>
-          <button onClick={this.handleSelectStatuses} className={type === 'statuses' && 'active'}><FormattedMessage id='search_results.statuses' defaultMessage='Posts' /></button>
+          <button onClick={this.handleSelectAll} className={type === 'all' ? 'active' : undefined}><FormattedMessage id='search_results.all' defaultMessage='All' /></button>
+          <button onClick={this.handleSelectAccounts} className={type === 'accounts' ? 'active' : undefined}><FormattedMessage id='search_results.accounts' defaultMessage='Profiles' /></button>
+          <button onClick={this.handleSelectHashtags} className={type === 'hashtags' ? 'active' : undefined}><FormattedMessage id='search_results.hashtags' defaultMessage='Hashtags' /></button>
+          <button onClick={this.handleSelectStatuses} className={type === 'statuses' ? 'active' : undefined}><FormattedMessage id='search_results.statuses' defaultMessage='Posts' /></button>
         </div>
 
         <div className='explore__search-results'>
diff --git a/app/javascript/mastodon/features/hashtag_timeline/components/hashtag_header.jsx b/app/javascript/mastodon/features/hashtag_timeline/components/hashtag_header.jsx
new file mode 100644
index 0000000000..46050309ff
--- /dev/null
+++ b/app/javascript/mastodon/features/hashtag_timeline/components/hashtag_header.jsx
@@ -0,0 +1,79 @@
+import PropTypes from 'prop-types';
+
+import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+
+import ImmutablePropTypes from 'react-immutable-proptypes';
+
+import Button from 'mastodon/components/button';
+import { ShortNumber } from 'mastodon/components/short_number';
+
+const messages = defineMessages({
+  followHashtag: { id: 'hashtag.follow', defaultMessage: 'Follow hashtag' },
+  unfollowHashtag: { id: 'hashtag.unfollow', defaultMessage: 'Unfollow hashtag' },
+});
+
+const usesRenderer = (displayNumber, pluralReady) => (
+  <FormattedMessage
+    id='hashtag.counter_by_uses'
+    defaultMessage='{count, plural, one {{counter} post} other {{counter} posts}}'
+    values={{
+      count: pluralReady,
+      counter: <strong>{displayNumber}</strong>,
+    }}
+  />
+);
+
+const peopleRenderer = (displayNumber, pluralReady) => (
+  <FormattedMessage
+    id='hashtag.counter_by_accounts'
+    defaultMessage='{count, plural, one {{counter} participant} other {{counter} participants}}'
+    values={{
+      count: pluralReady,
+      counter: <strong>{displayNumber}</strong>,
+    }}
+  />
+);
+
+const usesTodayRenderer = (displayNumber, pluralReady) => (
+  <FormattedMessage
+    id='hashtag.counter_by_uses_today'
+    defaultMessage='{count, plural, one {{counter} post} other {{counter} posts}} today'
+    values={{
+      count: pluralReady,
+      counter: <strong>{displayNumber}</strong>,
+    }}
+  />
+);
+
+export const HashtagHeader = injectIntl(({ tag, intl, disabled, onClick }) => {
+  if (!tag) {
+    return null;
+  }
+
+  const [uses, people] = tag.get('history').reduce((arr, day) => [arr[0] + day.get('uses') * 1, arr[1] + day.get('accounts') * 1], [0, 0]);
+  const dividingCircle = <span aria-hidden>{' · '}</span>;
+
+  return (
+    <div className='hashtag-header'>
+      <div className='hashtag-header__header'>
+        <h1>#{tag.get('name')}</h1>
+        <Button onClick={onClick} text={intl.formatMessage(tag.get('following') ? messages.unfollowHashtag : messages.followHashtag)} disabled={disabled} />
+      </div>
+
+      <div>
+        <ShortNumber value={uses} renderer={usesRenderer} />
+        {dividingCircle}
+        <ShortNumber value={people} renderer={peopleRenderer} />
+        {dividingCircle}
+        <ShortNumber value={tag.getIn(['history', 0, 'uses']) * 1} renderer={usesTodayRenderer} />
+      </div>
+    </div>
+  );
+});
+
+HashtagHeader.propTypes = {
+  tag: ImmutablePropTypes.map,
+  disabled: PropTypes.bool,
+  onClick: PropTypes.func,
+  intl: PropTypes.object,
+};
\ No newline at end of file
diff --git a/app/javascript/mastodon/features/hashtag_timeline/index.jsx b/app/javascript/mastodon/features/hashtag_timeline/index.jsx
index b6ed29d8de..7079f55e92 100644
--- a/app/javascript/mastodon/features/hashtag_timeline/index.jsx
+++ b/app/javascript/mastodon/features/hashtag_timeline/index.jsx
@@ -1,9 +1,8 @@
 import PropTypes from 'prop-types';
 import { PureComponent } from 'react';
 
-import { injectIntl, FormattedMessage, defineMessages } from 'react-intl';
+import { FormattedMessage } from 'react-intl';
 
-import classNames from 'classnames';
 import { Helmet } from 'react-helmet';
 
 import ImmutablePropTypes from 'react-immutable-proptypes';
@@ -17,17 +16,12 @@ import { fetchHashtag, followHashtag, unfollowHashtag } from 'mastodon/actions/t
 import { expandHashtagTimeline, clearTimeline } from 'mastodon/actions/timelines';
 import Column from 'mastodon/components/column';
 import ColumnHeader from 'mastodon/components/column_header';
-import { Icon }  from 'mastodon/components/icon';
 
 import StatusListContainer from '../ui/containers/status_list_container';
 
+import { HashtagHeader } from './components/hashtag_header';
 import ColumnSettingsContainer from './containers/column_settings_container';
 
-const messages = defineMessages({
-  followHashtag: { id: 'hashtag.follow', defaultMessage: 'Follow hashtag' },
-  unfollowHashtag: { id: 'hashtag.unfollow', defaultMessage: 'Unfollow hashtag' },
-});
-
 const mapStateToProps = (state, props) => ({
   hasUnread: state.getIn(['timelines', `hashtag:${props.params.id}${props.params.local ? ':local' : ''}`, 'unread']) > 0,
   tag: state.getIn(['tags', props.params.id]),
@@ -48,7 +42,6 @@ class HashtagTimeline extends PureComponent {
     hasUnread: PropTypes.bool,
     tag: ImmutablePropTypes.map,
     multiColumn: PropTypes.bool,
-    intl: PropTypes.object,
   };
 
   handlePin = () => {
@@ -188,27 +181,11 @@ class HashtagTimeline extends PureComponent {
   };
 
   render () {
-    const { hasUnread, columnId, multiColumn, tag, intl } = this.props;
+    const { hasUnread, columnId, multiColumn, tag } = this.props;
     const { id, local } = this.props.params;
     const pinned = !!columnId;
     const { signedIn } = this.context.identity;
 
-    let followButton;
-
-    if (tag) {
-      const following = tag.get('following');
-
-      const classes = classNames('column-header__button', {
-        active: following,
-      });
-
-      followButton = (
-        <button className={classes} onClick={this.handleFollow} disabled={!signedIn} title={intl.formatMessage(following ? messages.unfollowHashtag : messages.followHashtag)} aria-label={intl.formatMessage(following ? messages.unfollowHashtag : messages.followHashtag)}>
-          <Icon id={following ? 'user-times' : 'user-plus'} fixedWidth className='column-header__icon' />
-        </button>
-      );
-    }
-
     return (
       <Column bindToDocument={!multiColumn} ref={this.setRef} label={`#${id}`}>
         <ColumnHeader
@@ -220,13 +197,14 @@ class HashtagTimeline extends PureComponent {
           onClick={this.handleHeaderClick}
           pinned={pinned}
           multiColumn={multiColumn}
-          extraButton={followButton}
           showBackButton
         >
           {columnId && <ColumnSettingsContainer columnId={columnId} />}
         </ColumnHeader>
 
         <StatusListContainer
+          prepend={pinned ? null : <HashtagHeader tag={tag} disabled={!signedIn} onClick={this.handleFollow} />}
+          alwaysPrepend
           trackScroll={!pinned}
           scrollKey={`hashtag_timeline-${columnId}`}
           timelineId={`hashtag:${id}${local ? ':local' : ''}`}
@@ -245,4 +223,4 @@ class HashtagTimeline extends PureComponent {
 
 }
 
-export default connect(mapStateToProps)(injectIntl(HashtagTimeline));
+export default connect(mapStateToProps)(HashtagTimeline);
diff --git a/app/javascript/mastodon/features/interaction_modal/index.jsx b/app/javascript/mastodon/features/interaction_modal/index.jsx
index 6b6768ac32..84e4309254 100644
--- a/app/javascript/mastodon/features/interaction_modal/index.jsx
+++ b/app/javascript/mastodon/features/interaction_modal/index.jsx
@@ -13,7 +13,7 @@ import { openModal, closeModal } from 'mastodon/actions/modal';
 import api from 'mastodon/api';
 import Button from 'mastodon/components/button';
 import { Icon }  from 'mastodon/components/icon';
-import { registrationsOpen } from 'mastodon/initial_state';
+import { registrationsOpen, sso_redirect } from 'mastodon/initial_state';
 
 const messages = defineMessages({
   loginPrompt: { id: 'interaction_modal.login.prompt', defaultMessage: 'Domain of your home server, e.g. mastodon.social' },
@@ -21,12 +21,16 @@ const messages = defineMessages({
 
 const mapStateToProps = (state, { accountId }) => ({
   displayNameHtml: state.getIn(['accounts', accountId, 'display_name_html']),
+  signupUrl: state.getIn(['server', 'server', 'registrations', 'url'], null) || '/auth/sign_up',
 });
 
 const mapDispatchToProps = (dispatch) => ({
   onSignupClick() {
-    dispatch(closeModal());
-    dispatch(openModal('CLOSED_REGISTRATIONS'));
+    dispatch(closeModal({
+        modalType: undefined,
+        ignoreFocus: false,
+      }));
+    dispatch(openModal({ modalType: 'CLOSED_REGISTRATIONS' }));
   },
 });
 
@@ -294,6 +298,7 @@ class InteractionModal extends React.PureComponent {
     url: PropTypes.string,
     type: PropTypes.oneOf(['reply', 'reblog', 'favourite', 'follow']),
     onSignupClick: PropTypes.func.isRequired,
+    signupUrl: PropTypes.string.isRequired,
   };
 
   handleSignupClick = () => {
@@ -301,7 +306,7 @@ class InteractionModal extends React.PureComponent {
   };
 
   render () {
-    const { url, type, displayNameHtml } = this.props;
+    const { url, type, displayNameHtml, signupUrl } = this.props;
 
     const name = <bdi dangerouslySetInnerHTML={{ __html: displayNameHtml }} />;
 
@@ -332,9 +337,15 @@ class InteractionModal extends React.PureComponent {
 
     let signupButton;
 
-    if (registrationsOpen) {
+    if (sso_redirect) {
       signupButton = (
-        <a href='/auth/sign_up' className='link-button'>
+        <a href={sso_redirect} data-method='post' className='link-button'>
+          <FormattedMessage id='sign_in_banner.create_account' defaultMessage='Create account' />
+        </a>
+      );
+    } else if (registrationsOpen) {
+      signupButton = (
+        <a href={signupUrl} className='link-button'>
           <FormattedMessage id='sign_in_banner.create_account' defaultMessage='Create account' />
         </a>
       );
diff --git a/app/javascript/mastodon/features/status/components/card.jsx b/app/javascript/mastodon/features/status/components/card.jsx
index 6ac3c1d0f2..07fb1db9e2 100644
--- a/app/javascript/mastodon/features/status/components/card.jsx
+++ b/app/javascript/mastodon/features/status/components/card.jsx
@@ -167,7 +167,8 @@ export default class Card extends PureComponent {
       />
     );
 
-    let thumbnail = <img src={card.get('image')} alt='' style={thumbnailStyle} onLoad={this.handleImageLoad} className='status-card__image-image' />;
+    const thumbnailDescription = card.get('image_description');
+    const thumbnail = <img src={card.get('image')} alt={thumbnailDescription} title={thumbnailDescription} lang={language} style={thumbnailStyle} onLoad={this.handleImageLoad} className='status-card__image-image' />;
 
     let spoilerButton = (
       <button type='button' onClick={this.handleReveal} className='spoiler-button__overlay'>
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.jsx b/app/javascript/mastodon/features/status/components/detailed_status.jsx
index 7348905c53..e41a042c7c 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.jsx
+++ b/app/javascript/mastodon/features/status/components/detailed_status.jsx
@@ -10,6 +10,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 
 import { AnimatedNumber } from 'mastodon/components/animated_number';
 import EditedTimestamp from 'mastodon/components/edited_timestamp';
+import { getHashtagBarForStatus } from 'mastodon/components/hashtag_bar';
 import { Icon }  from 'mastodon/components/icon';
 import PictureInPicturePlaceholder from 'mastodon/components/picture_in_picture_placeholder';
 
@@ -291,6 +292,9 @@ class DetailedStatus extends ImmutablePureComponent {
       );
     }
 
+    const {statusContentProps, hashtagBar} = getHashtagBarForStatus(status);
+    const expanded = !status.get('hidden')
+
     return (
       <div style={outerStyle}>
         <div ref={this.setRef} className={classNames('detailed-status', { compact })}>
@@ -310,10 +314,13 @@ class DetailedStatus extends ImmutablePureComponent {
             expanded={!status.get('hidden')}
             onExpandedToggle={this.handleExpandedToggle}
             onTranslate={this.handleTranslate}
+            {...statusContentProps}
           />
 
           {media}
 
+          {expanded && hashtagBar}
+
           <div className='detailed-status__meta'>
             <a className='detailed-status__datetime' href={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}`} target='_blank' rel='noopener noreferrer'>
               <FormattedDate value={new Date(status.get('created_at'))} hour12={false} year='numeric' month='short' day='2-digit' hour='2-digit' minute='2-digit' />
diff --git a/app/javascript/mastodon/features/status/index.jsx b/app/javascript/mastodon/features/status/index.jsx
index 8f4130d019..aed8b8cfb8 100644
--- a/app/javascript/mastodon/features/status/index.jsx
+++ b/app/javascript/mastodon/features/status/index.jsx
@@ -571,7 +571,7 @@ class Status extends ImmutablePureComponent {
         onMoveUp={this.handleMoveUp}
         onMoveDown={this.handleMoveDown}
         contextType='thread'
-        previousId={i > 0 && list.get(i - 1)}
+        previousId={i > 0 ? list.get(i - 1) : undefined}
         nextId={list.get(i + 1) || (ancestors && statusId)}
         rootId={statusId}
       />
diff --git a/app/javascript/mastodon/features/ui/components/focal_point_modal.jsx b/app/javascript/mastodon/features/ui/components/focal_point_modal.jsx
index 7169b8a279..0c2e3901ea 100644
--- a/app/javascript/mastodon/features/ui/components/focal_point_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/focal_point_modal.jsx
@@ -434,4 +434,4 @@ class FocalPointModal extends ImmutablePureComponent {
 
 export default connect(mapStateToProps, mapDispatchToProps, null, {
   forwardRef: true,
-})(injectIntl(FocalPointModal, { withRef: true }));
+})(injectIntl(FocalPointModal, { forwardRef: true }));
diff --git a/app/javascript/mastodon/features/ui/components/header.jsx b/app/javascript/mastodon/features/ui/components/header.jsx
index 3d249e8d4f..68484b59ab 100644
--- a/app/javascript/mastodon/features/ui/components/header.jsx
+++ b/app/javascript/mastodon/features/ui/components/header.jsx
@@ -12,7 +12,7 @@ import { fetchServer } from 'mastodon/actions/server';
 import { Avatar } from 'mastodon/components/avatar';
 import { Icon } from 'mastodon/components/icon';
 import { WordmarkLogo, SymbolLogo } from 'mastodon/components/logo';
-import { registrationsOpen, me } from 'mastodon/initial_state';
+import { registrationsOpen, me, sso_redirect } from 'mastodon/initial_state';
 
 const Account = connect(state => ({
   account: state.getIn(['accounts', me]),
@@ -73,28 +73,35 @@ class Header extends PureComponent {
         </>
       );
     } else {
-      let signupButton;
 
-      if (registrationsOpen) {
-        signupButton = (
-          <a href={signupUrl} className='button'>
-            <FormattedMessage id='sign_in_banner.create_account' defaultMessage='Create account' />
-          </a>
-        );
+      if (sso_redirect) {
+        content = (
+            <a href={sso_redirect} data-method='post' className='button button--block button-tertiary'><FormattedMessage id='sign_in_banner.sso_redirect' defaultMessage='Login or Register' /></a>
+        )
       } else {
-        signupButton = (
-          <button className='button' onClick={openClosedRegistrationsModal}>
-            <FormattedMessage id='sign_in_banner.create_account' defaultMessage='Create account' />
-          </button>
+        let signupButton;
+
+        if (registrationsOpen) {
+          signupButton = (
+            <a href={signupUrl} className='button'>
+              <FormattedMessage id='sign_in_banner.create_account' defaultMessage='Create account' />
+            </a>
+          );
+        } else {
+          signupButton = (
+            <button className='button' onClick={openClosedRegistrationsModal}>
+              <FormattedMessage id='sign_in_banner.create_account' defaultMessage='Create account' />
+            </button>
+          );
+        }
+
+        content = (
+          <>
+            {signupButton}
+            <a href='/auth/sign_in' className='button button-tertiary'><FormattedMessage id='sign_in_banner.sign_in' defaultMessage='Login' /></a>
+          </>
         );
       }
-
-      content = (
-        <>
-          {signupButton}
-          <a href='/auth/sign_in' className='button button-tertiary'><FormattedMessage id='sign_in_banner.sign_in' defaultMessage='Login' /></a>
-        </>
-      );
     }
 
     return (
diff --git a/app/javascript/mastodon/features/ui/components/modal_root.jsx b/app/javascript/mastodon/features/ui/components/modal_root.jsx
index d5edb45b36..f6de5dad35 100644
--- a/app/javascript/mastodon/features/ui/components/modal_root.jsx
+++ b/app/javascript/mastodon/features/ui/components/modal_root.jsx
@@ -97,14 +97,7 @@ export default class ModalRoot extends PureComponent {
 
   handleClose = (ignoreFocus = false) => {
     const { onClose } = this.props;
-    let message = null;
-    try {
-      message = this._modal?.getWrappedInstance?.().getCloseConfirmationMessage?.();
-    } catch (_) {
-      // injectIntl defines `getWrappedInstance` but errors out if `withRef`
-      // isn't set.
-      // This would be much smoother with react-intl 3+ and `forwardRef`.
-    }
+    const message = this._modal?.getCloseConfirmationMessage?.();
     onClose(message, ignoreFocus);
   };
 
@@ -122,7 +115,10 @@ export default class ModalRoot extends PureComponent {
         {visible && (
           <>
             <BundleContainer fetchComponent={MODAL_COMPONENTS[type]} loading={this.renderLoading(type)} error={this.renderError} renderDelay={200}>
-              {(SpecificComponent) => <SpecificComponent {...props} onChangeBackgroundColor={this.setBackgroundColor} onClose={this.handleClose} ref={this.setModalRef} />}
+              {(SpecificComponent) => {
+                const ref = typeof SpecificComponent !== 'function' ? this.setModalRef : undefined;
+                return <SpecificComponent {...props} onChangeBackgroundColor={this.setBackgroundColor} onClose={this.handleClose} ref={ref} />
+              }}
             </BundleContainer>
 
             <Helmet>
diff --git a/app/javascript/mastodon/features/ui/components/report_modal.jsx b/app/javascript/mastodon/features/ui/components/report_modal.jsx
index 7ed5742588..fef1ced824 100644
--- a/app/javascript/mastodon/features/ui/components/report_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/report_modal.jsx
@@ -62,7 +62,7 @@ class ReportModal extends ImmutablePureComponent {
     dispatch(submitReport({
       account_id: accountId,
       status_ids: selectedStatusIds.toArray(),
-      selected_domains: selectedDomains.toArray(),
+      forward_to_domains: selectedDomains.toArray(),
       comment,
       forward: selectedDomains.size > 0,
       category,
diff --git a/app/javascript/mastodon/features/ui/components/sign_in_banner.jsx b/app/javascript/mastodon/features/ui/components/sign_in_banner.jsx
index e44b797692..d5f0c00dca 100644
--- a/app/javascript/mastodon/features/ui/components/sign_in_banner.jsx
+++ b/app/javascript/mastodon/features/ui/components/sign_in_banner.jsx
@@ -4,7 +4,7 @@ import { FormattedMessage } from 'react-intl';
 
 
 import { openModal } from 'mastodon/actions/modal';
-import { registrationsOpen } from 'mastodon/initial_state';
+import { registrationsOpen, sso_redirect } from 'mastodon/initial_state';
 import { useAppDispatch, useAppSelector } from 'mastodon/store';
 
 const SignInBanner = () => {
@@ -19,6 +19,15 @@ const SignInBanner = () => {
 
   const signupUrl = useAppSelector((state) => state.getIn(['server', 'server', 'registrations', 'url'], null) || '/auth/sign_up');
 
+  if (sso_redirect) {
+    return (
+      <div className='sign-in-banner'>
+        <p><FormattedMessage id='sign_in_banner.text' defaultMessage='Login to follow profiles or hashtags, favorite, share and reply to posts. You can also interact from your account on a different server.' /></p>
+        <a href={sso_redirect} data-method='post' className='button button--block button-tertiary'><FormattedMessage id='sign_in_banner.sso_redirect' defaultMessage='Login or Register' /></a>
+      </div>
+    )
+  }
+
   if (registrationsOpen) {
     signupButton = (
       <a href={signupUrl} className='button button--block'>
diff --git a/app/javascript/mastodon/initial_state.js b/app/javascript/mastodon/initial_state.js
index 905c742c14..13b80c0925 100644
--- a/app/javascript/mastodon/initial_state.js
+++ b/app/javascript/mastodon/initial_state.js
@@ -80,6 +80,7 @@
  * @property {boolean} use_blurhash
  * @property {boolean=} use_pending_items
  * @property {string} version
+ * @property {string} sso_redirect
  */
 
 /**
@@ -142,6 +143,7 @@ export const version = getMeta('version');
 export const languages = initialState?.languages;
 // @ts-expect-error
 export const statusPageUrl = getMeta('status_page_url');
+export const sso_redirect = getMeta('sso_redirect');
 
 // Glitch-soc-specific settings
 export const maxChars = (initialState && initialState.max_toot_chars) || 500;
diff --git a/app/javascript/mastodon/locales/af.json b/app/javascript/mastodon/locales/af.json
index 388f7cd0cc..aee0f775db 100644
--- a/app/javascript/mastodon/locales/af.json
+++ b/app/javascript/mastodon/locales/af.json
@@ -181,7 +181,6 @@
   "home.column_settings.show_reblogs": "Wys aangestuurde plasings",
   "interaction_modal.description.reblog": "Met 'n rekening op Mastodon kan jy hierdie plasing aanstuur om dit met jou volgers te deel.",
   "interaction_modal.description.reply": "Met 'n rekening op Mastodon kan jy op hierdie plasing reageer.",
-  "interaction_modal.preamble": "Omdat Mastodon gedesentraliseer is, hoef jy nie ’n rekening op hierdie bediener te hê nie. Jy kan jy jou bestaande Mastodonrekening gebruik, al word dit op 'n ander Mastodonbediener of versoenbare platform waar ook al gehuisves.",
   "interaction_modal.title.reblog": "Stuur {name} se plasing aan",
   "interaction_modal.title.reply": "Reageer op {name} se plasing",
   "keyboard_shortcuts.back": "Navigeer terug",
diff --git a/app/javascript/mastodon/locales/an.json b/app/javascript/mastodon/locales/an.json
index d9e436a35e..369f280099 100644
--- a/app/javascript/mastodon/locales/an.json
+++ b/app/javascript/mastodon/locales/an.json
@@ -172,7 +172,6 @@
   "conversation.open": "Veyer conversación",
   "conversation.with": "Con {names}",
   "copypaste.copied": "Copiau",
-  "copypaste.copy": "Copiar",
   "directory.federated": "Dende lo fediverso conoixiu",
   "directory.local": "Nomás de {domain}",
   "directory.new_arrivals": "Recientment plegaus",
@@ -276,7 +275,6 @@
   "interaction_modal.description.reply": "Con una cuenta en Mastodon, puetz responder a esta publicación.",
   "interaction_modal.on_another_server": "En un servidor diferent",
   "interaction_modal.on_this_server": "En este servidor",
-  "interaction_modal.preamble": "Ya que Mastodon ye descentralizau, puetz usar la tuya cuenta existent alochada en unatro servidor Mastodon u plataforma compatible si no tiens una cuenta en este servidor.",
   "interaction_modal.title.follow": "Seguir a {name}",
   "interaction_modal.title.reblog": "Empentar la publicación de {name}",
   "interaction_modal.title.reply": "Responder a la publicación de {name}",
diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index 1ed6dc1bb3..f5843d7d83 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -13,7 +13,7 @@
   "about.rules": "قواعد الخادم",
   "account.account_note_header": "مُلاحظة",
   "account.add_or_remove_from_list": "الإضافة أو الإزالة من القائمة",
-  "account.badges.bot": "بوت",
+  "account.badges.bot": "آلي",
   "account.badges.group": "فريق",
   "account.block": "احجب @{name}",
   "account.block_domain": "حظر اسم النِّطاق {domain}",
@@ -181,6 +181,7 @@
   "confirmations.mute.explanation": "هذا سيخفي المنشورات عنهم وتلك المشار فيها إليهم، لكنه سيسمح لهم برؤية منشوراتك ومتابعتك.",
   "confirmations.mute.message": "هل أنت متأكد أنك تريد كتم {name} ؟",
   "confirmations.redraft.confirm": "إزالة وإعادة الصياغة",
+  "confirmations.redraft.message": "هل أنت متأكد من أنك تريد حذف هذا المنشور و إعادة صياغته؟ سوف تفقد جميع الإعجابات و الترقيات أما الردود المتصلة به فستُصبِح يتيمة.",
   "confirmations.reply.confirm": "رد",
   "confirmations.reply.message": "الرد في الحين سوف يُعيد كتابة الرسالة التي أنت بصدد كتابتها. متأكد من أنك تريد المواصلة؟",
   "confirmations.unfollow.confirm": "إلغاء المتابعة",
@@ -190,7 +191,6 @@
   "conversation.open": "اعرض المحادثة",
   "conversation.with": "مع {names}",
   "copypaste.copied": "تم نسخه",
-  "copypaste.copy": "انسخ",
   "copypaste.copy_to_clipboard": "نسخ إلى الحافظة",
   "directory.federated": "مِن الفديفرس المعروف",
   "directory.local": "مِن {domain} فقط",
@@ -201,6 +201,7 @@
   "dismissable_banner.community_timeline": "هذه هي أحدث المشاركات العامة من الأشخاص الذين تُستضاف حساباتهم على {domain}.",
   "dismissable_banner.dismiss": "رفض",
   "dismissable_banner.explore_links": "هذه القصص الإخبارية يتحدث عنها حاليًا أشخاص على هذا الخادم وكذا على الخوادم الأخرى للشبكة اللامركزية.",
+  "dismissable_banner.explore_statuses": "هذه هي المنشورات الرائجة على الشبكات الاجتماعيّة اليوم. تظهر المنشورات التي أعيد مشاركتها وحازت على مفضّلات أكثر في مرتبة عليا.",
   "dismissable_banner.explore_tags": "هذه الوسوم تكتسب جذب اهتمام الناس حاليًا على هذا الخادم وكذا على الخوادم الأخرى للشبكة اللامركزية.",
   "dismissable_banner.public_timeline": "هذه هي أحدث المنشورات العامة من الناس على الشبكة الاجتماعية التي يتبعها الناس على {domain}.",
   "embed.instructions": "يمكنكم إدماج هذا المنشور على موقعكم الإلكتروني عن طريق نسخ الشفرة أدناه.",
@@ -229,6 +230,8 @@
   "empty_column.direct": "لم يتم الإشارة إليك بشكل خاص بعد. عندما تتلقى أو ترسل إشارة، سيتم عرضها هنا.",
   "empty_column.domain_blocks": "ليس هناك نطاقات تم حجبها بعد.",
   "empty_column.explore_statuses": "ليس هناك ما هو متداوَل الآن. عد في وقت لاحق!",
+  "empty_column.favourited_statuses": "ليس لديك أية منشورات مفضلة بعد. عندما ستقوم بالإعجاب بواحدة، ستظهر هنا.",
+  "empty_column.favourites": "لم يقم أي أحد بالإعجاب بهذا المنشور بعد. عندما يقوم أحدهم بذلك سوف يظهر هنا.",
   "empty_column.follow_requests": "ليس عندك أي طلب للمتابعة بعد. سوف تظهر طلباتك هنا إن قمت بتلقي البعض منها.",
   "empty_column.followed_tags": "لم تُتابع أي وسم بعدُ. ستظهر الوسوم هنا حينما تفعل ذلك.",
   "empty_column.hashtag": "ليس هناك بعدُ أي محتوى ذو علاقة بهذا الوسم.",
@@ -299,16 +302,22 @@
   "home.column_settings.basic": "الأساسية",
   "home.column_settings.show_reblogs": "اعرض الترقيات",
   "home.column_settings.show_replies": "اعرض الردود",
-  "home.explore_prompt.body": "سوف تحتوي تغذية منزلك على مزيج من المشاركات من الوسوم التي اخترت متابعتها، والأشخاص الذين اخترت متابعتهم، والمشاركات التي قاموا بدعمها. الأمور تبدو هادئة جدا الآن، لذلك ماذا عن:",
+  "home.explore_prompt.body": "سوف يحتوي خيط أخبارك الرئيسي على مزيج من المشاركات من الوسوم التي اخترت متابعتها، والأشخاص الذين اخترت متابعتهم، والمنشورات التي قاموا بدعمها. ومع ذلك، إن كانت تبدو الأمور هادئة جدا، ماذا لو:",
   "home.explore_prompt.title": "هذا مقرك الرئيسي داخل ماستدون.",
   "home.hide_announcements": "إخفاء الإعلانات",
   "home.show_announcements": "إظهار الإعلانات",
+  "interaction_modal.description.favourite": "بفضل حساب على ماستدون، يمكنك إضافة هذا المنشور إلى مفضلتك لإبلاغ الناشر عن تقديرك وكذا للاحتفاظ بالمنشور إلى وقت لاحق.",
   "interaction_modal.description.follow": "مع حساب في ماستدون، يمكنك متابعة {name} وتلقي منشوراته على خيطك الرئيس.",
   "interaction_modal.description.reblog": "مع حساب في ماستدون، يمكنك تعزيز هذا المنشور ومشاركته مع مُتابِعيك.",
   "interaction_modal.description.reply": "مع حساب في ماستدون، يمكنك الرد على هذا المنشور.",
+  "interaction_modal.login.action": "خذني إلى خادمي",
+  "interaction_modal.login.prompt": "نطاق الخادم الخاص بك، على سبيل المثال mastodon.social",
+  "interaction_modal.no_account_yet": "ليست على ماستدون بعد؟",
   "interaction_modal.on_another_server": "على خادم مختلف",
   "interaction_modal.on_this_server": "على هذا الخادم",
-  "interaction_modal.preamble": "بما إن ماستدون لامركزي، يمكنك استخدام حسابك الحالي المستضاف بواسطة خادم ماستدون آخر أو منصة متوافقة إذا لم يكن لديك حساب هنا.",
+  "interaction_modal.sign_in": "لم تقم بتسجيل الدخول إلى هذا الخادم. أين هو مستضاف حسابك؟",
+  "interaction_modal.sign_in_hint": "تلميح: هذا هو الموقع الذي سجّلت عن طريقه. إن لم تتذكّر/ين اسم الموقع، يمكنك البحث عن الرسالة الترحيبيّة في بريدك الالكتروني. يمكنك أيضاً استخدام إسم المستخدم/ـة الكامل! (مثلاً: @Mastadon@mastadon.social)",
+  "interaction_modal.title.favourite": "إضافة منشور {name} إلى المفضلة",
   "interaction_modal.title.follow": "اتبع {name}",
   "interaction_modal.title.reblog": "مشاركة منشور {name}",
   "interaction_modal.title.reply": "الرد على منشور {name}",
@@ -324,6 +333,8 @@
   "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "للانتقال إلى أسفل القائمة",
   "keyboard_shortcuts.enter": "لفتح المنشور",
+  "keyboard_shortcuts.favourite": "لإضافة المنشور إلى المفضلة",
+  "keyboard_shortcuts.favourites": "لفتح قائمة المفضلات",
   "keyboard_shortcuts.federated": "لفتح الخيط الزمني الفديرالي",
   "keyboard_shortcuts.heading": "Keyboard Shortcuts",
   "keyboard_shortcuts.home": "لفتح الخيط الرئيسي",
@@ -354,6 +365,7 @@
   "lightbox.previous": "العودة",
   "limited_account_hint.action": "إظهار الملف التعريفي على أي حال",
   "limited_account_hint.title": "تم إخفاء هذا الملف الشخصي من قبل مشرفي {domain}.",
+  "link_preview.author": "مِن {name}",
   "lists.account.add": "أضف إلى القائمة",
   "lists.account.remove": "احذف من القائمة",
   "lists.delete": "احذف القائمة",
@@ -376,6 +388,7 @@
   "mute_modal.hide_notifications": "هل تود إخفاء الإخطارات القادمة من هذا المستخدم ؟",
   "mute_modal.indefinite": "إلى أجل غير مسمى",
   "navigation_bar.about": "عن",
+  "navigation_bar.advanced_interface": "افتحه في واجهة الويب المتقدمة",
   "navigation_bar.blocks": "الحسابات المحجوبة",
   "navigation_bar.bookmarks": "الفواصل المرجعية",
   "navigation_bar.community_timeline": "الخيط المحلي",
@@ -385,6 +398,7 @@
   "navigation_bar.domain_blocks": "النطاقات المحظورة",
   "navigation_bar.edit_profile": "عدّل الملف التعريفي",
   "navigation_bar.explore": "استكشف",
+  "navigation_bar.favourites": "المفضلة",
   "navigation_bar.filters": "الكلمات المكتومة",
   "navigation_bar.follow_requests": "طلبات المتابعة",
   "navigation_bar.followed_tags": "الوسوم المتابَعة",
@@ -401,6 +415,7 @@
   "not_signed_in_indicator.not_signed_in": "تحتاج إلى تسجيل الدخول للوصول إلى هذا المصدر.",
   "notification.admin.report": "{name} أبلغ عن {target}",
   "notification.admin.sign_up": "أنشأ {name} حسابًا",
+  "notification.favourite": "أضاف {name} منشورك إلى مفضلته",
   "notification.follow": "{name} يتابعك",
   "notification.follow_request": "لقد طلب {name} متابعتك",
   "notification.mention": "{name} ذكرك",
@@ -414,6 +429,7 @@
   "notifications.column_settings.admin.report": "التقارير الجديدة:",
   "notifications.column_settings.admin.sign_up": "التسجيلات الجديدة:",
   "notifications.column_settings.alert": "إشعارات سطح المكتب",
+  "notifications.column_settings.favourite": "المفضلة:",
   "notifications.column_settings.filter_bar.advanced": "اعرض كافة الفئات",
   "notifications.column_settings.filter_bar.category": "شريط الفلترة السريعة",
   "notifications.column_settings.filter_bar.show_bar": "إظهار شريط التصفية",
@@ -431,6 +447,7 @@
   "notifications.column_settings.update": "التعديلات:",
   "notifications.filter.all": "الكل",
   "notifications.filter.boosts": "الترقيات",
+  "notifications.filter.favourites": "المفضلة",
   "notifications.filter.follows": "يتابِع",
   "notifications.filter.mentions": "الإشارات",
   "notifications.filter.polls": "نتائج استطلاع الرأي",
@@ -581,6 +598,8 @@
   "server_banner.server_stats": "إحصائيات الخادم:",
   "sign_in_banner.create_account": "أنشئ حسابًا",
   "sign_in_banner.sign_in": "تسجيل الدخول",
+  "sign_in_banner.sso_redirect": "تسجيل الدخول أو إنشاء حساب",
+  "sign_in_banner.text": "قم بالولوج بحسابك لمتابعة الصفحات الشخصية أو الوسوم، أو لإضافة المنشورات إلى المفضلة ومشاركتها والرد عليها أو التفاعل بواسطة حسابك المتواجد على خادم مختلف.",
   "status.admin_account": "افتح الواجهة الإدارية لـ @{name}",
   "status.admin_domain": "فتح واجهة الإشراف لـ {domain}",
   "status.admin_status": "افتح هذا المنشور على واجهة الإشراف",
@@ -597,6 +616,7 @@
   "status.edited": "عُدّل في {date}",
   "status.edited_x_times": "عُدّل {count, plural, zero {} one {مرةً واحدة} two {مرّتان} few {{count} مرات} many {{count} مرة} other {{count} مرة}}",
   "status.embed": "إدماج",
+  "status.favourite": "فضّل",
   "status.filter": "تصفية هذه الرسالة",
   "status.filtered": "مُصفّى",
   "status.hide": "إخفاء المنشور",
diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json
index 3b458b9ac8..af52135ac0 100644
--- a/app/javascript/mastodon/locales/ast.json
+++ b/app/javascript/mastodon/locales/ast.json
@@ -133,7 +133,6 @@
   "conversation.open": "Ver la conversación",
   "conversation.with": "Con {names}",
   "copypaste.copied": "Copióse",
-  "copypaste.copy": "Copiar",
   "directory.federated": "Del fediversu conocíu",
   "directory.local": "De «{domain}» namás",
   "directory.new_arrivals": "Cuentes nueves",
@@ -213,6 +212,7 @@
   "hashtag.column_header.tag_mode.none": "ensin {additional}",
   "hashtag.column_settings.select.no_options_message": "Nun s'atopó nenguna suxerencia",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} participante} other {{counter} participantes}}",
   "hashtag.follow": "Siguir a la etiqueta",
   "hashtag.unfollow": "Dexar de siguir a la etiqueta",
   "home.column_settings.basic": "Configuración básica",
@@ -223,7 +223,6 @@
   "interaction_modal.description.reply": "Con una cuenta de Mastodon, pues responder a esti artículu.",
   "interaction_modal.on_another_server": "N'otru sirvidor",
   "interaction_modal.on_this_server": "Nesti sirvidor",
-  "interaction_modal.preamble": "Darréu que Mastodon ye una rede social descentralizada, pues usar una cuenta agospiada n'otru sirvidor de Mastodon o n'otra plataforma compatible si nun tienes cuenta nesti sirvidor.",
   "interaction_modal.title.reply": "Rempuesta al artículu de: {name}",
   "intervals.full.days": "{number, plural, one {# día} other {# díes}}",
   "intervals.full.hours": "{number, plural, one {# hora} other {# hores}}",
@@ -420,6 +419,7 @@
   "server_banner.learn_more": "Saber más",
   "server_banner.server_stats": "Estadístiques del sirvidor:",
   "sign_in_banner.create_account": "Crear una cuenta",
+  "sign_in_banner.sso_redirect": "Aniciar la sesión o rexistrase",
   "status.admin_account": "Abrir la interfaz de moderación pa @{name}",
   "status.admin_domain": "Abrir la interfaz de moderación pa «{domain}»",
   "status.admin_status": "Abrir esti artículu na interfaz de moderación",
diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json
index 564d210a24..c94ebe0d15 100644
--- a/app/javascript/mastodon/locales/be.json
+++ b/app/javascript/mastodon/locales/be.json
@@ -113,6 +113,7 @@
   "column.direct": "Асабістыя згадванні",
   "column.directory": "Праглядзець профілі",
   "column.domain_blocks": "Заблакіраваныя дамены",
+  "column.favourites": "Упадабанае",
   "column.firehose": "Стужкі",
   "column.follow_requests": "Запыты на падпіску",
   "column.home": "Галоўная",
@@ -180,6 +181,7 @@
   "confirmations.mute.explanation": "Гэта схавае допісы ад гэтага карыстальніка і пра яго, але ўсё яшчэ дазволіць яму чытаць вашыя допісы і быць падпісаным на вас.",
   "confirmations.mute.message": "Вы ўпэўненыя, што хочаце ігнараваць {name}?",
   "confirmations.redraft.confirm": "Выдаліць і перапісаць",
+  "confirmations.redraft.message": "Вы ўпэўнены, што хочаце выдаліць допіс і перапісаць яго? Упадабанні і пашырэнні згубяцца, а адказы да арыгінальнага допісу асірацеюць.",
   "confirmations.reply.confirm": "Адказаць",
   "confirmations.reply.message": "Калі вы адкажаце зараз, гэта ператрэ паведамленне, якое вы пішаце. Вы ўпэўнены, што хочаце працягнуць?",
   "confirmations.unfollow.confirm": "Адпісацца",
@@ -189,7 +191,6 @@
   "conversation.open": "Прагледзець размову",
   "conversation.with": "З {names}",
   "copypaste.copied": "Скапіравана",
-  "copypaste.copy": "Скапіраваць",
   "copypaste.copy_to_clipboard": "Капіраваць у буфер абмену",
   "directory.federated": "З вядомага федэсвету",
   "directory.local": "Толькі з {domain}",
@@ -200,6 +201,7 @@
   "dismissable_banner.community_timeline": "Гэта самыя апошнія допісы ад людзей, уліковыя запісы якіх размяшчаюцца на {domain}.",
   "dismissable_banner.dismiss": "Адхіліць",
   "dismissable_banner.explore_links": "Гэтыя навіны абмяркоўваюцца прама зараз на гэтым і іншых серверах дэцэнтралізаванай сеткі.",
+  "dismissable_banner.explore_statuses": "Допісы з гэтага і іншых сервераў дэцэнтралізаванай сеткі, якія набіраюць папулярнасць прама зараз.",
   "dismissable_banner.explore_tags": "Гэтыя хэштэгі зараз набіраюць папулярнасць сярод людзей на гэтым і іншых серверах дэцэнтралізаванай сеткі",
   "dismissable_banner.public_timeline": "Гэта апошнія публічныя допісы людзей з усей сеткі, за якімі сочаць карыстальнікі {domain}.",
   "embed.instructions": "Убудуйце гэты пост на свой сайт, скапіраваўшы прыведзены ніжэй код",
@@ -228,6 +230,8 @@
   "empty_column.direct": "Пакуль у вас няма асабістых згадак. Калі вы дашляце або атрымаеце штось, яно з'явіцца тут.",
   "empty_column.domain_blocks": "Заблакіраваных даменаў пакуль няма.",
   "empty_column.explore_statuses": "Зараз не ў трэндзе. Праверце пазней",
+  "empty_column.favourited_statuses": "Вы яшчэ не ўпадабалі ніводны допіс. Калі гэта адбудзецца, вы ўбачыце яго тут.",
+  "empty_column.favourites": "Ніхто яшчэ не ўпадабаў гэты допіс. Калі гэта адбудзецца, вы ўбачыце гэтых людзей тут.",
   "empty_column.follow_requests": "У вас яшчэ няма запытаў на падпіскуі. Калі вы атрымаеце запыт, ён з'явяцца тут.",
   "empty_column.followed_tags": "Вы пакуль не падпісаны ні на адзін хэштэг. Калі падпішацеся, яны з'явяцца тут.",
   "empty_column.hashtag": "Па гэтаму хэштэгу пакуль што нічога няма.",
@@ -291,6 +295,9 @@
   "hashtag.column_settings.tag_mode.any": "Любы",
   "hashtag.column_settings.tag_mode.none": "Нічога з пералічанага",
   "hashtag.column_settings.tag_toggle": "Уключыць дадатковыя тэгі для гэтай калонкі",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} удзельнік} few {{counter} удзельніка} many {{counter} удзельнікаў} other {{counter} удзельніка}}",
+  "hashtag.counter_by_uses": "{count, plural, one {{counter} допіс} few {{counter} допісы} many {{counter} допісаў} other {{counter} допісу}}",
+  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} допіс} few {{counter} допісы} many {{counter} допісаў} other {{counter} допісу}} за сёння",
   "hashtag.follow": "Падпісацца на хэштэг",
   "hashtag.unfollow": "Адпісацца ад хэштэга",
   "home.actions.go_to_explore": "Паглядзіце, што ў трэндзе",
@@ -302,12 +309,18 @@
   "home.explore_prompt.title": "Гэта ваша апорная кропка ў Mastodon.",
   "home.hide_announcements": "Схаваць аб'явы",
   "home.show_announcements": "Паказаць аб'явы",
+  "interaction_modal.description.favourite": "Маючы ўліковы запіс Mastodon, вы можаце ўпадабаць гэты допіс, каб паведаміць аўтару, што ён вам падабаецца, і захаваць яго на будучыню.",
   "interaction_modal.description.follow": "Маючы акаўнт у Mastodon, вы можаце падпісацца на {name}, каб бачыць яго/яе допісы ў сваёй хатняй стужцы.",
   "interaction_modal.description.reblog": "З уліковым запісам Mastodon, вы можаце пашырыць гэты пост, каб падзяліцца ім са сваімі падпісчыкамі.",
   "interaction_modal.description.reply": "Маючы акаўнт у Mastodon, вы можаце адказаць на гэты пост.",
+  "interaction_modal.login.action": "Вярніце мяне дадому",
+  "interaction_modal.login.prompt": "Дамен вашага хатняга сервера, напрыклад, mastodon.social",
+  "interaction_modal.no_account_yet": "Яшчэ не ў Mastodon?",
   "interaction_modal.on_another_server": "На іншым серверы",
   "interaction_modal.on_this_server": "На гэтым серверы",
-  "interaction_modal.preamble": "Паколькі Mastodon дэцэнтралізаваны, вы можаце выкарыстоўваць існуючы акаўнт, які быў створаны на іншым серверы Mastodon або на сумяшчальнай платформе, калі ў вас пакуль няма акаўнта тут.",
+  "interaction_modal.sign_in": "Вы не выканалі ўваход на гэтым серверы. Дзе размешчаны ваш уліковы запіс?",
+  "interaction_modal.sign_in_hint": "Падказка: гэта сайт, на якім вы зарэгістраваліся. Калі вы не памятаеце, знайдзіце ліст у паштовай скрыні. Вы таксама можаце ўвесці сваё поўнае імя карыстальніка! (напрыклад, @Mastodon@mastodon.social)",
+  "interaction_modal.title.favourite": "Упадабаць допіс {name}",
   "interaction_modal.title.follow": "Падпісацца на {name}",
   "interaction_modal.title.reblog": "Пашырыць допіс ад {name}",
   "interaction_modal.title.reply": "Адказаць на допіс {name}",
@@ -323,6 +336,8 @@
   "keyboard_shortcuts.direct": "адкрыць стоўп асабістых згадак",
   "keyboard_shortcuts.down": "Перамясціцца ўніз па спісе",
   "keyboard_shortcuts.enter": "Адкрыць допіс",
+  "keyboard_shortcuts.favourite": "Упадабаць допіс",
+  "keyboard_shortcuts.favourites": "Адкрыць спіс упадабанага",
   "keyboard_shortcuts.federated": "Адкрыць інтэграваную стужку",
   "keyboard_shortcuts.heading": "Спалучэнні клавіш",
   "keyboard_shortcuts.home": "Адкрыць хатнюю храналагічную стужку",
@@ -353,6 +368,7 @@
   "lightbox.previous": "Назад",
   "limited_account_hint.action": "Усе роўна паказваць профіль",
   "limited_account_hint.title": "Гэты профіль быў схаваны мадэратарамі",
+  "link_preview.author": "Ад {name}",
   "lists.account.add": "Дадаць да спісу",
   "lists.account.remove": "Выдаліць са спісу",
   "lists.delete": "Выдаліць спіс",
@@ -375,6 +391,7 @@
   "mute_modal.hide_notifications": "Схаваць апавяшчэнні ад гэтага карыстальніка?",
   "mute_modal.indefinite": "Бестэрмінова",
   "navigation_bar.about": "Пра нас",
+  "navigation_bar.advanced_interface": "Адкрыць у пашыраным вэб-інтэрфейсе",
   "navigation_bar.blocks": "Заблакаваныя карыстальнікі",
   "navigation_bar.bookmarks": "Закладкі",
   "navigation_bar.community_timeline": "Лакальная стужка",
@@ -384,6 +401,7 @@
   "navigation_bar.domain_blocks": "Заблакіраваныя дамены",
   "navigation_bar.edit_profile": "Рэдагаваць профіль",
   "navigation_bar.explore": "Агляд",
+  "navigation_bar.favourites": "Упадабанае",
   "navigation_bar.filters": "Ігнараваныя словы",
   "navigation_bar.follow_requests": "Запыты на падпіску",
   "navigation_bar.followed_tags": "Падпіскі",
@@ -400,6 +418,7 @@
   "not_signed_in_indicator.not_signed_in": "Вам трэба ўвайсці каб атрымаць доступ да гэтага рэсурсу.",
   "notification.admin.report": "{name} паскардзіўся на {target}",
   "notification.admin.sign_up": "{name} зарэгістраваўся",
+  "notification.favourite": "Ваш допіс упадабаны {name}",
   "notification.follow": "{name} падпісаўся на вас",
   "notification.follow_request": "{name} адправіў запыт на падпіску",
   "notification.mention": "{name} згадаў вас",
@@ -413,6 +432,7 @@
   "notifications.column_settings.admin.report": "Новыя скаргі:",
   "notifications.column_settings.admin.sign_up": "Новыя ўваходы:",
   "notifications.column_settings.alert": "Апавяшчэнні на працоўным стале",
+  "notifications.column_settings.favourite": "Упадабанае:",
   "notifications.column_settings.filter_bar.advanced": "Паказваць усе катэгорыі",
   "notifications.column_settings.filter_bar.category": "Панэль хуткай фільтрацыі",
   "notifications.column_settings.filter_bar.show_bar": "Паказваць панэль фільтрацыі",
@@ -430,6 +450,7 @@
   "notifications.column_settings.update": "Праўкі:",
   "notifications.filter.all": "Усе",
   "notifications.filter.boosts": "Пашырэнні",
+  "notifications.filter.favourites": "Упадабанае",
   "notifications.filter.follows": "Падпісаны на",
   "notifications.filter.mentions": "Згадванні",
   "notifications.filter.polls": "Вынікі апытання",
@@ -580,6 +601,8 @@
   "server_banner.server_stats": "Статыстыка сервера:",
   "sign_in_banner.create_account": "Стварыць уліковы запіс",
   "sign_in_banner.sign_in": "Увайсці",
+  "sign_in_banner.sso_redirect": "Уваход ці рэгістрацыя",
+  "sign_in_banner.text": "Увайдзіце, каб падпісацца на людзей і тэгі, каб адказваць на допісы, дзяліцца імі і падабаць іх, альбо кантактаваць з вашага ўліковага запісу на іншым серверы.",
   "status.admin_account": "Адкрыць інтэрфейс мадэратара для @{name}",
   "status.admin_domain": "Адкрыць інтэрфейс мадэратара для {domain}",
   "status.admin_status": "Адкрыць гэты допіс у інтэрфейсе мадэрацыі",
@@ -596,6 +619,7 @@
   "status.edited": "Адрэдагавана {date}",
   "status.edited_x_times": "Рэдагавана {count, plural, one {{count} раз} few {{count} разы} many {{count} разоў} other {{count} разу}}",
   "status.embed": "Убудаваць",
+  "status.favourite": "Упадабанае",
   "status.filter": "Фільтраваць гэты допіс",
   "status.filtered": "Адфільтравана",
   "status.hide": "Схаваць допіс",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index b7f40cb6c2..d5f94f8436 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -189,7 +189,6 @@
   "conversation.open": "Преглед на разговора",
   "conversation.with": "С {names}",
   "copypaste.copied": "Копирано",
-  "copypaste.copy": "Копиране",
   "copypaste.copy_to_clipboard": "Копиране в буферната памет",
   "directory.federated": "От позната федивселена",
   "directory.local": "Само от {domain}",
@@ -298,7 +297,6 @@
   "home.column_settings.basic": "Основно",
   "home.column_settings.show_reblogs": "Показване на подсилванията",
   "home.column_settings.show_replies": "Показване на отговорите",
-  "home.explore_prompt.body": "Вашият начален инфоканал ще е смес на публикации от хаштаговете, които сте избрали да следвате, избраните хора за следвате, а и публикациите, които са подсилили. Изглежда доста тихо в момента, така че какво ще кажете за:",
   "home.explore_prompt.title": "Това е началната ви база с Mastodon.",
   "home.hide_announcements": "Скриване на оповестяванията",
   "home.show_announcements": "Показване на оповестяванията",
@@ -307,7 +305,6 @@
   "interaction_modal.description.reply": "С акаунт в Mastodon може да добавите отговор към тази публикация.",
   "interaction_modal.on_another_server": "На различен сървър",
   "interaction_modal.on_this_server": "На този сървър",
-  "interaction_modal.preamble": "Откак Mastodon е децентрализиран, може да употребявате съществуващ акаунт, разположен на друг сървър на Mastodon или съвместима платформа, ако нямате акаунт на този сървър.",
   "interaction_modal.title.follow": "Последване на {name}",
   "interaction_modal.title.reblog": "Подсилване на публикацията на {name}",
   "interaction_modal.title.reply": "Отговаряне на публикацията на {name}",
diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json
index 34f9ad21b5..c6f845b402 100644
--- a/app/javascript/mastodon/locales/br.json
+++ b/app/javascript/mastodon/locales/br.json
@@ -17,6 +17,7 @@
   "account.badges.group": "Strollad",
   "account.block": "Stankañ @{name}",
   "account.block_domain": "Stankañ an domani {domain}",
+  "account.block_short": "Stankañ",
   "account.blocked": "Stanket",
   "account.browse_more_on_origin_server": "Furchal pelloc'h war ar profil orin",
   "account.cancel_follow_request": "Nullañ ar reked heuliañ",
@@ -46,6 +47,8 @@
   "account.mention": "Menegiñ @{name}",
   "account.moved_to": "Gant {name} eo bet merket e oa bremañ h·e gont nevez :",
   "account.mute": "Kuzhat @{name}",
+  "account.mute_notifications_short": "Kuzhat ar c'hemennoù",
+  "account.mute_short": "Kuzhat",
   "account.muted": "Kuzhet",
   "account.open_original_page": "Digeriñ ar bajenn orin",
   "account.posts": "Toudoù",
@@ -171,7 +174,6 @@
   "conversation.open": "Gwelout ar gaozeadenn",
   "conversation.with": "Gant {names}",
   "copypaste.copied": "Eilet",
-  "copypaste.copy": "Eilañ",
   "directory.federated": "Eus ar fedibed anavezet",
   "directory.local": "Eus {domain} hepken",
   "directory.new_arrivals": "Degouezhet a-nevez",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 29b2e3c2da..5f42d42f98 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -80,7 +80,7 @@
   "admin.impact_report.instance_followers": "Seguidors que els nostres usuaris perdrien",
   "admin.impact_report.instance_follows": "Seguidors que els seus usuaris perdrien",
   "admin.impact_report.title": "Resum del impacte",
-  "alert.rate_limited.message": "Si us plau prova-ho després de {retry_time, time, medium}.",
+  "alert.rate_limited.message": "Proveu-ho una altra vegada al cap de {retry_time, time, medium}.",
   "alert.rate_limited.title": "Límit de freqüència",
   "alert.unexpected.message": "S'ha produït un error inesperat.",
   "alert.unexpected.title": "Vaja!",
@@ -114,7 +114,7 @@
   "column.directory": "Navega pels perfils",
   "column.domain_blocks": "Dominis blocats",
   "column.favourites": "Favorits",
-  "column.firehose": "Fluxos en directe",
+  "column.firehose": "Tuts en directe",
   "column.follow_requests": "Peticions de seguir-te",
   "column.home": "Inici",
   "column.lists": "Llistes",
@@ -138,11 +138,11 @@
   "compose.published.body": "Tut publicat.",
   "compose.published.open": "Obre",
   "compose_form.direct_message_warning_learn_more": "Més informació",
-  "compose_form.encryption_warning": "Els tuts a Mastodon no estant xifrats punt a punt. No comparteixis informació sensible mitjançant Mastodon.",
+  "compose_form.encryption_warning": "Les publicacions a Mastodon no estant xifrades punt a punt. No comparteixis informació sensible mitjançant Mastodon.",
   "compose_form.hashtag_warning": "Aquest tut no apareixerà a les llistes d'etiquetes perquè no és públic. Només els tuts públics apareixen a les cerques per etiqueta.",
   "compose_form.lock_disclaimer": "El teu compte no està {locked}. Tothom pot seguir-te i veure els tuts de només per a seguidors.",
   "compose_form.lock_disclaimer.lock": "blocat",
-  "compose_form.placeholder": "En què penses?",
+  "compose_form.placeholder": "Què tens al cap?",
   "compose_form.poll.add_option": "Afegeix una opció",
   "compose_form.poll.duration": "Durada de l'enquesta",
   "compose_form.poll.option_placeholder": "Opció {number}",
@@ -191,7 +191,6 @@
   "conversation.open": "Mostra la conversa",
   "conversation.with": "Amb {names}",
   "copypaste.copied": "Copiat",
-  "copypaste.copy": "Copia",
   "copypaste.copy_to_clipboard": "Copia al porta-retalls",
   "directory.federated": "Del fedivers conegut",
   "directory.local": "Només de {domain}",
@@ -296,6 +295,9 @@
   "hashtag.column_settings.tag_mode.any": "Qualsevol d’aquests",
   "hashtag.column_settings.tag_mode.none": "Cap d’aquests",
   "hashtag.column_settings.tag_toggle": "Inclou etiquetes addicionals per a aquesta columna",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} participant} other {{counter} participants}}",
+  "hashtag.counter_by_uses": "{count, plural, one {{counter} tut} other {{counter} tuts}}",
+  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} tut} other {{counter} tuts}} avui",
   "hashtag.follow": "Segueix l'etiqueta",
   "hashtag.unfollow": "Deixa de seguir l'etiqueta",
   "home.actions.go_to_explore": "Mira què és tendència",
@@ -303,7 +305,7 @@
   "home.column_settings.basic": "Bàsic",
   "home.column_settings.show_reblogs": "Mostra els impulsos",
   "home.column_settings.show_replies": "Mostra les respostes",
-  "home.explore_prompt.body": "La teva línia de temps Inici tindrà una barreja dels tuts de les etiquetes que has triat seguir, de les persones que has triat seguir i dels tuts que impulsen. Ara mateix es veu força tranquila, què et sembla si:",
+  "home.explore_prompt.body": "La teva línia de temps Inici tindrà una barreja dels tuts de les etiquetes que has triat seguir, de les persones que has triat seguir i dels tuts que s'impulsen. Ara mateix es veu força tranquil·la, què et sembla si:",
   "home.explore_prompt.title": "Aquest és la teva base a Mastodon.",
   "home.hide_announcements": "Amaga els anuncis",
   "home.show_announcements": "Mostra els anuncis",
@@ -311,10 +313,13 @@
   "interaction_modal.description.follow": "Amb un compte a Mastodon, pots seguir a {name} per a rebre els seus tuts en la teva línia de temps d'Inici.",
   "interaction_modal.description.reblog": "Amb un compte a Mastodon, pots impulsar aquest tut per a compartir-lo amb els teus seguidors.",
   "interaction_modal.description.reply": "Amb un compte a Mastodon, pots respondre aquest tut.",
+  "interaction_modal.login.action": "Torna a l'inici",
+  "interaction_modal.login.prompt": "Domini del teu servidor domèstic, p.ex. mastodon.social",
+  "interaction_modal.no_account_yet": "No a Mastodon?",
   "interaction_modal.on_another_server": "En un servidor diferent",
   "interaction_modal.on_this_server": "En aquest servidor",
-  "interaction_modal.other_server_instructions": "Copia i enganxa aquest URL en el camp de cerca de la teva aplicació Mastodon preferida o a la interfície web del teu servidor Mastodon.",
-  "interaction_modal.preamble": "Com que Mastodon és descentralitzat, pots fer servir el teu compte existent en un altre servidor Mastodon o plataforma compatible si no tens compte en aquest.",
+  "interaction_modal.sign_in": "No has iniciat sessió en aquest servidor. On tens el teu compte?",
+  "interaction_modal.sign_in_hint": "Ajuda: Aquesta és la web on vas registrar-te. Si no ho recordes, mira el correu electrònic de benvinguda en la teva safata d'entrada. També pots introduïr el teu nom d'usuari complet! (per ex. @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Afavoreix el tut de {name}",
   "interaction_modal.title.follow": "Segueix {name}",
   "interaction_modal.title.reblog": "Impulsa el tut de {name}",
@@ -596,6 +601,7 @@
   "server_banner.server_stats": "Estadístiques del servidor:",
   "sign_in_banner.create_account": "Crea un compte",
   "sign_in_banner.sign_in": "Inici de sessió",
+  "sign_in_banner.sso_redirect": "Inici de sessió o Registre",
   "sign_in_banner.text": "Inicia la sessió per a seguir perfils o etiquetes, afavorir, compartir i respondre tuts. També pots interactuar des del teu compte a un servidor diferent.",
   "status.admin_account": "Obre la interfície de moderació per a @{name}",
   "status.admin_domain": "Obre la interfície de moderació per a @{domain}",
diff --git a/app/javascript/mastodon/locales/ckb.json b/app/javascript/mastodon/locales/ckb.json
index 01b41abcf5..b14756b096 100644
--- a/app/javascript/mastodon/locales/ckb.json
+++ b/app/javascript/mastodon/locales/ckb.json
@@ -176,7 +176,6 @@
   "conversation.open": "نیشاندان گفتوگۆ",
   "conversation.with": "لەگەڵ{names}",
   "copypaste.copied": "کۆپی کراوە",
-  "copypaste.copy": "ڕوونووس",
   "directory.federated": "لە ڕاژەکانی ناسراو",
   "directory.local": "تەنها لە {domain}",
   "directory.new_arrivals": "تازە گەیشتنەکان",
@@ -284,7 +283,6 @@
   "interaction_modal.description.reply": "بە هەژمارێک لەسەر ماستدۆن، ئەتوانیت وەڵامی ئەم بڵاوکراوەیە بدەیتەوە.",
   "interaction_modal.on_another_server": "لەسەر ڕاژەیەکی جیا",
   "interaction_modal.on_this_server": "لەسەر ئەم ڕاژەیە",
-  "interaction_modal.preamble": "بەو پێیەی ماستۆدۆن لامەرکەزییە، دەتوانیت ئەکاونتی ئێستات بەکاربهێنیت کە لەلایەن سێرڤەرێکی تری ماستۆدۆن یان پلاتفۆرمی گونجاوەوە هۆست کراوە ئەگەر ئەکاونتێکت لەسەر ئەم ئەکاونتە نەبێت.",
   "interaction_modal.title.follow": "دوای {name} بکەوە",
   "interaction_modal.title.reblog": "پۆستی {name} زیاد بکە",
   "interaction_modal.title.reply": "وەڵامی پۆستەکەی {name} بدەرەوە",
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index 0eb7320bbd..70d8e47bdb 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -191,7 +191,6 @@
   "conversation.open": "Zobrazit konverzaci",
   "conversation.with": "S {names}",
   "copypaste.copied": "Zkopírováno",
-  "copypaste.copy": "Zkopírovat",
   "copypaste.copy_to_clipboard": "Zkopírovat do schránky",
   "directory.federated": "Ze známého fedivesmíru",
   "directory.local": "Pouze z {domain}",
@@ -202,7 +201,9 @@
   "dismissable_banner.community_timeline": "Toto jsou nejnovější veřejné příspěvky od lidí, jejichž účty hostuje {domain}.",
   "dismissable_banner.dismiss": "Zavřít",
   "dismissable_banner.explore_links": "O těchto zprávách hovoří lidé na tomto a dalších serverech decentralizované sítě právě teď.",
+  "dismissable_banner.explore_statuses": "Toto jsou příspěvky ze sociálních sítí, které dnes získávají na popularitě. Novější příspěvky s větším počtem boostů a oblíbení jsou hodnoceny výše.",
   "dismissable_banner.explore_tags": "Tyto hashtagy právě teď získávají na popularitě mezi lidmi na tomto a dalších serverech decentralizované sítě.",
+  "dismissable_banner.public_timeline": "Toto jsou nejnovější veřejné příspěvky od lidí na sociální síti, které sledují lidé na {domain}.",
   "embed.instructions": "Pro přidání příspěvku na vaši webovou stránku zkopírujte níže uvedený kód.",
   "embed.preview": "Takhle to bude vypadat:",
   "emoji_button.activity": "Aktivita",
@@ -229,6 +230,8 @@
   "empty_column.direct": "Zatím nemáte žádné soukromé zmínky. Až nějakou pošlete nebo dostanete, zobrazí se zde.",
   "empty_column.domain_blocks": "Ještě nemáte žádné zablokované domény.",
   "empty_column.explore_statuses": "Momentálně není nic populární. Vraťte se později!",
+  "empty_column.favourited_statuses": "Zatím nemáte žádné oblíbené příspěvky. Až si nějaký oblíbíte, zobrazí se zde.",
+  "empty_column.favourites": "Tento příspěvek si zatím nikdo neoblíbil. Až to někdo udělá, zobrazí se zde.",
   "empty_column.follow_requests": "Zatím nemáte žádné žádosti o sledování. Až nějakou obdržíte, zobrazí se zde.",
   "empty_column.followed_tags": "Zatím jste nesledovali žádné hashtagy. Až to uděláte, objeví se zde.",
   "empty_column.hashtag": "Pod tímto hashtagem zde zatím nic není.",
@@ -294,17 +297,27 @@
   "hashtag.column_settings.tag_toggle": "Zahrnout v tomto sloupci další štítky",
   "hashtag.follow": "Sledovat hashtag",
   "hashtag.unfollow": "Přestat sledovat hashtag",
+  "home.actions.go_to_explore": "Podívejte se, co frčí",
+  "home.actions.go_to_suggestions": "Najít lidi ke sledování",
   "home.column_settings.basic": "Základní",
   "home.column_settings.show_reblogs": "Zobrazit boosty",
   "home.column_settings.show_replies": "Zobrazit odpovědi",
+  "home.explore_prompt.body": "Váš domovský kanál bude obsahovat směs příspěvků z hashtagů, které jste se rozhodli sledovat, lidí, které jste se rozhodli sledovat, a příspěvků, které boostují. Pokud vám to připadá příliš klidné, možná budete chtít:",
+  "home.explore_prompt.title": "Toto je vaše domovská základna uvnitř Mastodonu.",
   "home.hide_announcements": "Skrýt oznámení",
   "home.show_announcements": "Zobrazit oznámení",
+  "interaction_modal.description.favourite": "Pokud máte účet na Mastodonu, můžete tento příspěvek označit jako oblíbený a dát tak autorovi najevo, že si ho vážíte, a uložit si ho na později.",
   "interaction_modal.description.follow": "S účtem na Mastodonu můžete sledovat uživatele {name} a přijímat příspěvky ve vašem domovském kanálu.",
   "interaction_modal.description.reblog": "S účtem na Mastodonu můžete boostnout tento příspěvek a sdílet jej s vlastními sledujícími.",
   "interaction_modal.description.reply": "S účtem na Mastodonu můžete odpovědět na tento příspěvek.",
+  "interaction_modal.login.action": "Domů",
+  "interaction_modal.login.prompt": "Doména vašeho domovského serveru, např. mastodon.social",
+  "interaction_modal.no_account_yet": "Nejste na Mastodonu?",
   "interaction_modal.on_another_server": "Na jiném serveru",
   "interaction_modal.on_this_server": "Na tomto serveru",
-  "interaction_modal.preamble": "Protože Mastodon je decentralizovaný, pokud nemáte účet na tomto serveru, můžete použít svůj existující účet hostovaný jiným Mastodon serverem nebo kompatibilní platformou.",
+  "interaction_modal.sign_in": "Nejste přihlášeni k tomuto serveru. Kde je váš účet hostován?",
+  "interaction_modal.sign_in_hint": "Tip: To je stránka, na které jste se zaregistrovali. Pokud si ji nepamatujete, vyhledejte ve své e-mailové schránce uvítací e-mail. Můžete také zadat své celé uživatelské jméno! (např. @Mastodon@mastodon.social)",
+  "interaction_modal.title.favourite": "Oblíbit si příspěvek od uživatele {name}",
   "interaction_modal.title.follow": "Sledovat {name}",
   "interaction_modal.title.reblog": "Boostnout příspěvek uživatele {name}",
   "interaction_modal.title.reply": "Odpovědět na příspěvek uživatele {name}",
@@ -320,6 +333,8 @@
   "keyboard_shortcuts.direct": "otevřít sloupec soukromých zmínek",
   "keyboard_shortcuts.down": "Posunout v seznamu dolů",
   "keyboard_shortcuts.enter": "Otevřít příspěvek",
+  "keyboard_shortcuts.favourite": "Oblíbit si příspěvek",
+  "keyboard_shortcuts.favourites": "Otevřít seznam oblíbených",
   "keyboard_shortcuts.federated": "Otevřít federovanou časovou osu",
   "keyboard_shortcuts.heading": "Klávesové zkratky",
   "keyboard_shortcuts.home": "Otevřít domovskou časovou osu",
@@ -350,11 +365,13 @@
   "lightbox.previous": "Předchozí",
   "limited_account_hint.action": "Přesto profil zobrazit",
   "limited_account_hint.title": "Tento profil byl skryt moderátory {domain}.",
+  "link_preview.author": "Podle {name}",
   "lists.account.add": "Přidat do seznamu",
   "lists.account.remove": "Odebrat ze seznamu",
   "lists.delete": "Smazat seznam",
   "lists.edit": "Upravit seznam",
   "lists.edit.submit": "Změnit název",
+  "lists.exclusive": "Skrýt tyto příspěvky z domovské stránky",
   "lists.new.create": "Přidat seznam",
   "lists.new.title_placeholder": "Název nového seznamu",
   "lists.replies_policy.followed": "Sledovaným uživatelům",
@@ -371,6 +388,7 @@
   "mute_modal.hide_notifications": "Skrýt oznámení od tohoto uživatele?",
   "mute_modal.indefinite": "Neomezeně",
   "navigation_bar.about": "O aplikaci",
+  "navigation_bar.advanced_interface": "Otevřít pokročilé webové rozhraní",
   "navigation_bar.blocks": "Blokovaní uživatelé",
   "navigation_bar.bookmarks": "Záložky",
   "navigation_bar.community_timeline": "Místní časová osa",
@@ -380,6 +398,7 @@
   "navigation_bar.domain_blocks": "Blokované domény",
   "navigation_bar.edit_profile": "Upravit profil",
   "navigation_bar.explore": "Prozkoumat",
+  "navigation_bar.favourites": "Oblíbené",
   "navigation_bar.filters": "Skrytá slova",
   "navigation_bar.follow_requests": "Žádosti o sledování",
   "navigation_bar.followed_tags": "Sledované hashtagy",
@@ -396,6 +415,7 @@
   "not_signed_in_indicator.not_signed_in": "Pro přístup k tomuto zdroji se musíte přihlásit.",
   "notification.admin.report": "Uživatel {name} nahlásil {target}",
   "notification.admin.sign_up": "Uživatel {name} se zaregistroval",
+  "notification.favourite": "Uživatel {name} si oblíbil váš příspěvek",
   "notification.follow": "Uživatel {name} vás začal sledovat",
   "notification.follow_request": "Uživatel {name} požádal o povolení vás sledovat",
   "notification.mention": "Uživatel {name} vás zmínil",
@@ -409,6 +429,7 @@
   "notifications.column_settings.admin.report": "Nová hlášení:",
   "notifications.column_settings.admin.sign_up": "Nové registrace:",
   "notifications.column_settings.alert": "Oznámení na počítači",
+  "notifications.column_settings.favourite": "Oblíbené:",
   "notifications.column_settings.filter_bar.advanced": "Zobrazit všechny kategorie",
   "notifications.column_settings.filter_bar.category": "Panel rychlého filtrování",
   "notifications.column_settings.filter_bar.show_bar": "Zobrazit panel filtrů",
@@ -426,6 +447,7 @@
   "notifications.column_settings.update": "Úpravy:",
   "notifications.filter.all": "Vše",
   "notifications.filter.boosts": "Boosty",
+  "notifications.filter.favourites": "Oblíbené",
   "notifications.filter.follows": "Sledování",
   "notifications.filter.mentions": "Zmínky",
   "notifications.filter.polls": "Výsledky anket",
@@ -448,10 +470,12 @@
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
   "onboarding.follows.title": "Populární na Mastodonu",
   "onboarding.share.lead": "Dejte lidem vědět, jak vás mohou najít na Mastodonu!",
+  "onboarding.share.message": "Jsem {username} na #Mastodonu! Pojď mě sledovat na {url}",
   "onboarding.share.next_steps": "Možné další kroky:",
   "onboarding.share.title": "Sdílejte svůj profil",
   "onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:",
   "onboarding.start.skip": "Want to skip right ahead?",
+  "onboarding.start.title": "Dokázali jste to!",
   "onboarding.steps.follow_people.body": "You curate your own feed. Lets fill it with interesting people.",
   "onboarding.steps.follow_people.title": "Follow {count, plural, one {one person} other {# people}}",
   "onboarding.steps.publish_status.body": "Řekněte světu Ahoj.",
@@ -460,11 +484,16 @@
   "onboarding.steps.setup_profile.title": "Přizpůsobit svůj profil",
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Sdílejte svůj profil",
+  "onboarding.tips.2fa": "<strong>Víte, že?</strong> Svůj účet můžete zabezpečit nastavením dvoufaktorového ověřování v nastavení účtu. Funguje s jakoukoli TOTP aplikací podle vašeho výběru, telefonní číslo není nutné!",
+  "onboarding.tips.accounts_from_other_servers": "<strong>Víte, že?</strong> Protože je Mastodon decentralizovaný, některé profily, na které narazíte, budou hostovány na jiných serverech, než je ten váš. A přesto s nimi můžete bezproblémově komunikovat! Jejich server se nachází v druhé polovině uživatelského jména!",
+  "onboarding.tips.migration": "<strong>Víte, že?</strong> Pokud máte pocit, že {domain} pro vás v budoucnu není vhodnou volbou, můžete se přesunout na jiný Mastodon server, aniž byste přišli o své sledující. Můžete dokonce hostovat svůj vlastní server!",
+  "onboarding.tips.verification": "<strong>Víte, že?</strong> Svůj účet můžete ověřit tak, že na své webové stránky umístíte odkaz na váš Mastodon profil a odkaz na stránku přidáte do svého profilu. Nejsou k tomu potřeba žádné poplatky ani dokumenty!",
   "password_confirmation.exceeds_maxlength": "Potvrzení hesla překračuje maximální délku hesla",
   "password_confirmation.mismatching": "Zadaná hesla se neshodují",
   "picture_in_picture.restore": "Vrátit zpět",
   "poll.closed": "Uzavřeno",
   "poll.refresh": "Obnovit",
+  "poll.reveal": "Zobrazit výsledky",
   "poll.total_people": "{count, plural, one {# člověk} few {# lidé} many {# lidí} other {# lidí}}",
   "poll.total_votes": "{count, plural, one {# hlas} few {# hlasy} many {# hlasů} other {# hlasů}}",
   "poll.vote": "Hlasovat",
@@ -517,6 +546,8 @@
   "report.placeholder": "Další komentáře",
   "report.reasons.dislike": "Nelíbí se mi to",
   "report.reasons.dislike_description": "Není to něco, co chcete vidět",
+  "report.reasons.legal": "Je to nezákonné",
+  "report.reasons.legal_description": "Domníváte se, že to porušuje zákony vaší země nebo země serveru",
   "report.reasons.other": "Je to něco jiného",
   "report.reasons.other_description": "Problém neodpovídá ostatním kategoriím",
   "report.reasons.spam": "Je to spam",
@@ -536,6 +567,7 @@
   "report.unfollow": "Přestat sledovat @{name}",
   "report.unfollow_explanation": "Tento účet sledujete. Abyste už neviděli jeho příspěvky ve své domovské časové ose, přestaňte jej sledovat.",
   "report_notification.attached_statuses": "{count, plural, one {{count} připojený příspěvek} few {{count} připojené příspěvky} many {{count} připojených příspěvků} other {{count} připojených příspěvků}}",
+  "report_notification.categories.legal": "Zákonné",
   "report_notification.categories.other": "Ostatní",
   "report_notification.categories.spam": "Spam",
   "report_notification.categories.violation": "Porušení pravidla",
@@ -566,6 +598,8 @@
   "server_banner.server_stats": "Statistiky serveru:",
   "sign_in_banner.create_account": "Vytvořit účet",
   "sign_in_banner.sign_in": "Přihlásit se",
+  "sign_in_banner.sso_redirect": "Přihlášení nebo Registrace",
+  "sign_in_banner.text": "Přihlaste se pro sledování profilů nebo hashtagů, oblíbení, sdílení a odpovídání na příspěvky. Svůj účet můžete také používat k interagování i na jiném serveru.",
   "status.admin_account": "Otevřít moderátorské rozhraní pro @{name}",
   "status.admin_domain": "Otevřít moderátorské rozhraní pro {domain}",
   "status.admin_status": "Otevřít tento příspěvek v moderátorském rozhraní",
@@ -582,6 +616,7 @@
   "status.edited": "Upraveno {date}",
   "status.edited_x_times": "Upraveno {count, plural, one {{count}krát} few {{count}krát} many {{count}krát} other {{count}krát}}",
   "status.embed": "Vložit na web",
+  "status.favourite": "Oblíbit",
   "status.filter": "Filtrovat tento příspěvek",
   "status.filtered": "Filtrováno",
   "status.hide": "Skrýt příspěvek",
diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index aa98e070e3..a2952a9310 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -191,7 +191,6 @@
   "conversation.open": "Gweld sgwrs",
   "conversation.with": "Gyda {names}",
   "copypaste.copied": "Wedi ei gopïo",
-  "copypaste.copy": "Copïo",
   "copypaste.copy_to_clipboard": "Copïo i'r clipfwrdd",
   "directory.federated": "O'r ffedysawd cyfan",
   "directory.local": "O {domain} yn unig",
@@ -299,22 +298,25 @@
   "hashtag.follow": "Dilyn hashnod",
   "hashtag.unfollow": "Dad-ddilyn hashnod",
   "home.actions.go_to_explore": "Gweld beth sy'n tueddu",
-  "home.actions.go_to_suggestions": "Ffeindio i bobl i'w dilyn",
+  "home.actions.go_to_suggestions": "Ffeindio pobl i'w dilyn",
   "home.column_settings.basic": "Syml",
   "home.column_settings.show_reblogs": "Dangos hybiau",
   "home.column_settings.show_replies": "Dangos atebion",
-  "home.explore_prompt.body": "Bydd eich llif cartref yn cynnwys cymysgedd o bostiadau o'r hashnodau rydych chi wedi dewis eu dilyn, y bobl rydych chi wedi dewis eu dilyn, a'r postiadau maen nhw'n rhoi hwb iddyn nhw. Mae'n edrych yn eithaf tawel ar hyn o bryd, felly beth am:",
-  "home.explore_prompt.title": "Dyma'ch cartref o feewnn Mastodon.",
+  "home.explore_prompt.body": "Bydd eich llif cartref yn cynnwys cymysgedd o bostiadau o'r hashnodau rydych chi wedi dewis eu dilyn, y bobl rydych chi wedi dewis eu dilyn, a'r postiadau maen nhw'n rhoi hwb iddyn nhw. Os yw hynny'n teimlo'n rhy dawel, efallai y byddwch am:",
+  "home.explore_prompt.title": "Dyma'ch cartref o fewn Mastodon.",
   "home.hide_announcements": "Cuddio cyhoeddiadau",
   "home.show_announcements": "Dangos cyhoeddiadau",
   "interaction_modal.description.favourite": "Gyda chyfrif ar Mastodon, gallwch chi hoffi'r postiad hwn er mwyn roi gwybod i'r awdur eich bod chi'n ei werthfawrogi ac yn ei gadw ar gyfer nes ymlaen.",
   "interaction_modal.description.follow": "Gyda chyfrif ar Mastodon, gallwch ddilyn {name} i dderbyn eu postiadau yn eich llif cartref.",
   "interaction_modal.description.reblog": "Gyda chyfrif ar Mastodon, gallwch hybu'r postiad hwn i'w rannu â'ch dilynwyr.",
   "interaction_modal.description.reply": "Gyda chyfrif ar Mastodon, gallwch ymateb i'r postiad hwn.",
+  "interaction_modal.login.action": "Ewch â fi adref",
+  "interaction_modal.login.prompt": "Parth eich gweinydd cartref, e.e. mastodon.social",
+  "interaction_modal.no_account_yet": "Dim ar Mastodon?",
   "interaction_modal.on_another_server": "Ar weinydd gwahanol",
   "interaction_modal.on_this_server": "Ar y gweinydd hwn",
-  "interaction_modal.other_server_instructions": "Copïwch a gludwch yr URL hwn i faes chwilio eich hoff ap Mastodon neu ryngwyneb gwe eich gweinydd Mastodon.",
-  "interaction_modal.preamble": "Gan fod Mastodon wedi'i ddatganoli, gallwch ddefnyddio'ch cyfrif presennol a gynhelir gan weinydd Mastodon arall neu blatfform cydnaws os nad oes gennych gyfrif ar yr un hwn.",
+  "interaction_modal.sign_in": "Nid ydych wedi mewngofnodi i'r gweinydd hwn. Ble mae eich cyfrif yn cael ei gynnal?",
+  "interaction_modal.sign_in_hint": "Awgrym: Dyna'r wefan lle gwnaethoch gofrestru. Os nad ydych yn cofio, edrychwch am yr e-bost croeso yn eich blwch derbyn. Gallwch hefyd nodi eich enw defnyddiwr llawn! (e.e. @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Hoffi postiad {name}",
   "interaction_modal.title.follow": "Dilyn {name}",
   "interaction_modal.title.reblog": "Hybu postiad {name}",
@@ -363,6 +365,7 @@
   "lightbox.previous": "Blaenorol",
   "limited_account_hint.action": "Dangos y proffil beth bynnag",
   "limited_account_hint.title": "Mae'r proffil hwn wedi cael ei guddio gan gymedrolwyr {domain}.",
+  "link_preview.author": "Gan {name}",
   "lists.account.add": "Ychwanegu at restr",
   "lists.account.remove": "Tynnu o'r rhestr",
   "lists.delete": "Dileu rhestr",
@@ -387,7 +390,7 @@
   "navigation_bar.about": "Ynghylch",
   "navigation_bar.advanced_interface": "Agor mewn rhyngwyneb gwe uwch",
   "navigation_bar.blocks": "Defnyddwyr wedi eu blocio",
-  "navigation_bar.bookmarks": "Llyfrnodau",
+  "navigation_bar.bookmarks": "Nodau Tudalen",
   "navigation_bar.community_timeline": "Ffrwd leol",
   "navigation_bar.compose": "Cyfansoddi post newydd",
   "navigation_bar.direct": "Crybwylliadau preifat",
@@ -456,8 +459,8 @@
   "notifications.permission_denied_alert": "Nid oes modd galluogi hysbysiadau bwrdd gwaith, gan fod caniatâd porwr wedi'i wrthod o'r blaen",
   "notifications.permission_required": "Nid oes hysbysiadau bwrdd gwaith ar gael oherwydd na roddwyd y caniatâd gofynnol.",
   "notifications_permission_banner.enable": "Galluogi hysbysiadau bwrdd gwaith",
-  "notifications_permission_banner.how_to_control": "I dderbyn hysbysiadau pan nad yw Mastodon ar agor, galluogwch hysbysiadau bwrdd gwaith. Gallwch reoli'n union pa fathau o ryngweithiadau sy'n cynhyrchu hysbysiadau bwrdd gwaith trwy'r botwm {icon} uchod unwaith y byddant wedi'u galluogi.",
-  "notifications_permission_banner.title": "Peidiwch colli dim",
+  "notifications_permission_banner.how_to_control": "I dderbyn hysbysiadau pan nad yw Mastodon ar agor, galluogwch hysbysiadau bwrdd gwaith. Gallwch reoli'n union pa fathau o ryngweithiadau sy'n cynhyrchu hysbysiadau bwrdd gwaith trwy'r botwm {icon} uchod unwaith y byddan nhw wedi'u galluogi.",
+  "notifications_permission_banner.title": "Peidiwch â cholli dim",
   "onboarding.action.back": "Ewch â fi yn ôl",
   "onboarding.actions.back": "Ewch â fi yn ôl",
   "onboarding.actions.go_to_explore": "Gweld beth yw'r tuedd",
@@ -501,7 +504,7 @@
   "privacy.change": "Addasu preifatrwdd y post",
   "privacy.direct.long": "Dim ond yn weladwy i ddefnyddwyr a grybwyllwyd",
   "privacy.direct.short": "Dim ond pobl sy wedi'u crybwyll",
-  "privacy.private.long": "Dim ond pobl sy'n ddilynwyrl",
+  "privacy.private.long": "Dim ond pobl sy'n ddilynwyr",
   "privacy.private.short": "Dilynwyr yn unig",
   "privacy.public.long": "Gweladwy i bawb",
   "privacy.public.short": "Cyhoeddus",
@@ -510,7 +513,7 @@
   "privacy_policy.last_updated": "Diweddarwyd ddiwethaf ar {date}",
   "privacy_policy.title": "Polisi Preifatrwydd",
   "refresh": "Adnewyddu",
-  "regeneration_indicator.label": "Llwytho…",
+  "regeneration_indicator.label": "Yn llwytho…",
   "regeneration_indicator.sublabel": "Mae eich ffrwd cartref yn cael ei baratoi!",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "{number, plural, one {# diwrnod} other {# diwrnod}} yn ôl",
@@ -590,11 +593,12 @@
   "server_banner.about_active_users": "Pobl sy'n defnyddio'r gweinydd hwn yn ystod y 30 diwrnod diwethaf (Defnyddwyr Gweithredol Misol)",
   "server_banner.active_users": "defnyddwyr gweithredol",
   "server_banner.administered_by": "Gweinyddir gan:",
-  "server_banner.introduction": "Mae {domain} yn rhan o'r rhwydwaith cymdeithasol datganoledig a bwerir gan {mastodon}.",
+  "server_banner.introduction": "Mae {domain} yn rhan o'r rhwydwaith cymdeithasol datganoledig sy'n cael ei bweru gan {mastodon}.",
   "server_banner.learn_more": "Dysgu mwy",
   "server_banner.server_stats": "Ystadegau'r gweinydd:",
   "sign_in_banner.create_account": "Creu cyfrif",
   "sign_in_banner.sign_in": "Mewngofnodi",
+  "sign_in_banner.sso_redirect": "Mewngofnodi neu Gofrestru",
   "sign_in_banner.text": "Mewngofnodwch i ddilyn proffiliau neu hashnodau, ffefrynnau, rhannu ac ymateb i bostiadau. Gallwch hefyd ryngweithio o'ch cyfrif ar weinyddion gwahanol.",
   "status.admin_account": "Agor rhyngwyneb cymedroli ar gyfer @{name}",
   "status.admin_domain": "Agor rhyngwyneb cymedroli {domain}",
@@ -635,7 +639,7 @@
   "status.reblogged_by": "Hybodd {name}",
   "status.reblogs.empty": "Does neb wedi hybio'r post yma eto. Pan y bydd rhywun yn gwneud, byddent yn ymddangos yma.",
   "status.redraft": "Dileu ac ailddrafftio",
-  "status.remove_bookmark": "Dileu llyfrnod",
+  "status.remove_bookmark": "Tynnu nod tudalen",
   "status.replied_to": "Wedi ateb {name}",
   "status.reply": "Ateb",
   "status.replyAll": "Ateb i edefyn",
@@ -678,7 +682,7 @@
   "units.short.thousand": "{count}mil",
   "upload_area.title": "Llusgwch a gollwng i lwytho",
   "upload_button.label": "Ychwanegwch gyfryngau (JPEG, PNG, GIF, WebM, MP4, MOV)",
-  "upload_error.limit": "Wedi mynd heibio'r uchafswm terfyn uwchlwytho.",
+  "upload_error.limit": "Wedi pasio'r uchafswm llwytho.",
   "upload_error.poll": "Nid oes modd llwytho ffeiliau â phleidleisiau.",
   "upload_form.audio_description": "Disgrifio ar gyfer pobl sydd â cholled clyw",
   "upload_form.description": "Disgrifio i'r rheini a nam ar ei golwg",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index db1b0be78f..20c8bd6fdf 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -191,7 +191,6 @@
   "conversation.open": "Vis samtale",
   "conversation.with": "Med {names}",
   "copypaste.copied": "Kopieret",
-  "copypaste.copy": "Kopiér",
   "copypaste.copy_to_clipboard": "Kopiér til udklipsholder",
   "directory.federated": "Fra kendt fedivers",
   "directory.local": "Kun fra {domain}",
@@ -296,6 +295,9 @@
   "hashtag.column_settings.tag_mode.any": "Nogle af disse",
   "hashtag.column_settings.tag_mode.none": "Ingen af disse",
   "hashtag.column_settings.tag_toggle": "Inkludér ekstra tags for denne kolonne",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} deltager} other {{counter} deltagere}}",
+  "hashtag.counter_by_uses": "{count, plural, one {{counter} indlæg} other {{counter} indlæg}}",
+  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} indlæg} other {{counter} indlæg}} i dag",
   "hashtag.follow": "Følg hashtag",
   "hashtag.unfollow": "Stop med at følge hashtag",
   "home.actions.go_to_explore": "Se, hvad som trender",
@@ -303,7 +305,7 @@
   "home.column_settings.basic": "Grundlæggende",
   "home.column_settings.show_reblogs": "Vis boosts",
   "home.column_settings.show_replies": "Vis svar",
-  "home.explore_prompt.body": "Dit hjemmefeed vil have en blanding af indlæg fra de hashtags, du har valgt at følge, de personer, du har valgt at følge, og de indlæg, de booster. Her virker temmelig stille lige nu, så hvad med at prøve:",
+  "home.explore_prompt.body": "Hjemmefeedet vil indeholde en blanding af indlæg fra de hashtags og personer, du følger samt de indlæg, de booster. Føles synes for stille, kan du prøve:",
   "home.explore_prompt.title": "Dette er din hjemmebase i Mastodon.",
   "home.hide_announcements": "Skjul bekendtgørelser",
   "home.show_announcements": "Vis bekendtgørelser",
@@ -311,10 +313,13 @@
   "interaction_modal.description.follow": "Med en konto på Mastodon kan du følge {name} for at modtage vedkommendes indlæg i dit hjemmefeed.",
   "interaction_modal.description.reblog": "Med en konto på Mastodon kan dette indlæg fremhæves så det deles med egne følgere.",
   "interaction_modal.description.reply": "Med en konto på Mastodon kan dette indlæg besvares.",
+  "interaction_modal.login.action": "Gå til hjemmeserver",
+  "interaction_modal.login.prompt": "Hjemmeserverdomænet, f.eks. mastodon.social",
+  "interaction_modal.no_account_yet": "Ikke på Mastodon?",
   "interaction_modal.on_another_server": "På en anden server",
   "interaction_modal.on_this_server": "På denne server",
-  "interaction_modal.other_server_instructions": "Kopiér og indsæt denne URL i søgefeltet på den foretrukne Mastodon-app eller Mastodon-serverens webgrænseflade.",
-  "interaction_modal.preamble": "Da Mastodon er decentraliseret, kan man bruge sin eksisterende konto hostet af en anden Mastodon-server eller kompatibel platform, såfremt man ikke har en konto på denne.",
+  "interaction_modal.sign_in": "Du er ikke logget ind på denne server. Hvor hostes din konto?",
+  "interaction_modal.sign_in_hint": "Tip: Det er webstedet, hvor du tilmeldte dig. Har du glemt det, så kig efter velkomstmailen i indbakken. Du kan også angive dit fulde brugernavn! (f.eks. @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Gør {name}s indlæg til favorit",
   "interaction_modal.title.follow": "Følg {name}",
   "interaction_modal.title.reblog": "Boost {name}s indlæg",
@@ -596,6 +601,7 @@
   "server_banner.server_stats": "Serverstatstik:",
   "sign_in_banner.create_account": "Opret konto",
   "sign_in_banner.sign_in": "Log ind",
+  "sign_in_banner.sso_redirect": "Log ind eller Tilmeld",
   "sign_in_banner.text": "Log ind for at følge profiler eller hashtags, markere som favorit, dele og besvare indlæg eller interagere fra din konto på en anden server.",
   "status.admin_account": "Åbn modereringsbrugerflade for @{name}",
   "status.admin_domain": "Åbn modereringsbrugerflade for {domain}",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index 8130c3f640..93183bdd7e 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -150,7 +150,7 @@
   "compose_form.poll.switch_to_multiple": "Mehrfachauswahl erlauben",
   "compose_form.poll.switch_to_single": "Nur Einzelauswahl erlauben",
   "compose_form.publish": "Veröffentlichen",
-  "compose_form.publish_form": "Veröffentlichen",
+  "compose_form.publish_form": "Neuer Beitrag",
   "compose_form.publish_loud": "{publish}!",
   "compose_form.save_changes": "Änderungen speichern",
   "compose_form.sensitive.hide": "{count, plural, one {Mit einer Inhaltswarnung versehen} other {Mit einer Inhaltswarnung versehen}}",
@@ -191,7 +191,6 @@
   "conversation.open": "Unterhaltung anzeigen",
   "conversation.with": "Mit {names}",
   "copypaste.copied": "Kopiert",
-  "copypaste.copy": "Kopieren",
   "copypaste.copy_to_clipboard": "In die Zwischenablage kopieren",
   "directory.federated": "Aus bekanntem Fediverse",
   "directory.local": "Nur von der Domain {domain}",
@@ -202,7 +201,7 @@
   "dismissable_banner.community_timeline": "Das sind die neuesten öffentlichen Beiträge von Profilen, deren Konten von {domain} verwaltet werden.",
   "dismissable_banner.dismiss": "Ablehnen",
   "dismissable_banner.explore_links": "Diese Nachrichten werden heute am häufigsten im sozialen Netzwerk geteilt. Neuere Nachrichten, die von vielen verschiedenen Profilen veröffentlicht wurden, werden höher eingestuft.",
-  "dismissable_banner.explore_statuses": "Diese Beiträge stammen aus dem gesamten sozialen Netz und gewinnen derzeit an Reichweite. Neuere Beiträge, die häufiger geteilt und favorisiert wurden, werden höher eingestuft.",
+  "dismissable_banner.explore_statuses": "Diese Beiträge stammen aus dem gesamten sozialen Netzwerk und gewinnen derzeit an Reichweite. Neuere Beiträge, die häufiger geteilt und favorisiert wurden, werden höher eingestuft.",
   "dismissable_banner.explore_tags": "Das sind Hashtags, die derzeit an Reichweite gewinnen. Hashtags, die von vielen verschiedenen Profilen verwendet werden, werden höher eingestuft.",
   "dismissable_banner.public_timeline": "Das sind die neuesten öffentlichen Beiträge von Profilen im sozialen Netzwerk, denen Leute auf {domain} folgen.",
   "embed.instructions": "Du kannst diesen Beitrag außerhalb des Fediverse (z. B. auf deiner Website) einbetten, indem du diesen iFrame-Code einfügst.",
@@ -296,6 +295,9 @@
   "hashtag.column_settings.tag_mode.any": "Eines von diesen",
   "hashtag.column_settings.tag_mode.none": "Keines von diesen",
   "hashtag.column_settings.tag_toggle": "Zusätzliche Hashtags dieser Spalte hinzufügen",
+  "hashtag.counter_by_accounts": "{count, plural, one{{counter} Beteiligte*r} other{{counter} Beteiligte}}",
+  "hashtag.counter_by_uses": "{count, plural, one {{counter} Beitrag} other {{counter} Beiträge}}",
+  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} Beitrag} other {{counter} Beiträge}} heute",
   "hashtag.follow": "Hashtag folgen",
   "hashtag.unfollow": "Hashtag entfolgen",
   "home.actions.go_to_explore": "Trends ansehen",
@@ -303,7 +305,7 @@
   "home.column_settings.basic": "Einfach",
   "home.column_settings.show_reblogs": "Geteilte Beiträge anzeigen",
   "home.column_settings.show_replies": "Antworten anzeigen",
-  "home.explore_prompt.body": "Deine Startseite wird eine Mischung aus Beiträgen mit gefolgten Hashtags und den Profilen, denen du folgst sowie den Beiträgen, die sie teilen, enthalten. Aktuell ist es noch etwas still. Wie wäre es mit:",
+  "home.explore_prompt.body": "Deine Startseite wird eine Mischung aus Beiträgen mit Hashtags und den Profilen, denen du folgst sowie den Beiträgen, die sie teilen, enthalten. Sollte es sich zu still anfühlen:",
   "home.explore_prompt.title": "Das ist dein Zuhause bei Mastodon.",
   "home.hide_announcements": "Ankündigungen ausblenden",
   "home.show_announcements": "Ankündigungen anzeigen",
@@ -311,10 +313,13 @@
   "interaction_modal.description.follow": "Mit einem Mastodon-Konto kannst du {name} folgen, um die Beiträge auf deiner Startseite zu sehen.",
   "interaction_modal.description.reblog": "Mit einem Mastodon-Konto kannst du die Reichweite dieses Beitrags erhöhen, indem du ihn mit deinen Followern teilst.",
   "interaction_modal.description.reply": "Mit einem Mastodon-Konto kannst du auf diesen Beitrag antworten.",
+  "interaction_modal.login.action": "Zurück zur Startseite",
+  "interaction_modal.login.prompt": "Adresse deines Servers, z. B. mastodon.social",
+  "interaction_modal.no_account_yet": "Nicht auf Mastodon?",
   "interaction_modal.on_another_server": "Auf einem anderen Server",
   "interaction_modal.on_this_server": "Auf diesem Server",
-  "interaction_modal.other_server_instructions": "Kopiere diese URL und füge sie in das Suchfeld deiner bevorzugten Mastodon-App oder in das Webinterface deines Mastodon-Servers ein.",
-  "interaction_modal.preamble": "Da Mastodon dezentralisiert ist, kannst du dein bestehendes Konto auf einem anderen Mastodon-Server oder einer kompatiblen Plattform nutzen, wenn du kein Konto auf dieser Plattform hast.",
+  "interaction_modal.sign_in": "Du bist auf diesem Server nicht angemeldet. Auf welchem Server wird dein Konto verwaltet?",
+  "interaction_modal.sign_in_hint": "Hinweis: Hierbei handelt es sich um die Website, auf der du dich registriert hast. Wenn du dich nicht mehr daran erinnerst, dann kannst du sie in der Willkommens-E-Mail nachsehen. Du kannst auch deinen vollständigen Profilnamen eingeben! (z. B. @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Beitrag von {name} favorisieren",
   "interaction_modal.title.follow": "Folge {name}",
   "interaction_modal.title.reblog": "Beitrag von {name} teilen",
@@ -471,7 +476,7 @@
   "onboarding.share.message": "Ich bin {username} auf #Mastodon! Folge mir auf {url}",
   "onboarding.share.next_steps": "Mögliche nächste Schritte:",
   "onboarding.share.title": "Teile dein Profil",
-  "onboarding.start.lead": "Du bist nun ein Teil von Mastodon – eine einzigartige, dezentralisierte Social Media-Plattform, bei der du und kein Algorithmus deine eigene Erfahrung gestaltest. Fangen wir an, diese neue soziale Dimension zu erkunden:",
+  "onboarding.start.lead": "Du bist nun ein Teil von Mastodon – eine einzigartige, dezentralisierte Social-Media-Plattform, bei der du und kein Algorithmus deine eigene Erfahrung gestaltest. Fangen wir an, diese neue soziale Dimension zu erkunden:",
   "onboarding.start.skip": "Du benötigst keine Hilfe für den Einstieg?",
   "onboarding.start.title": "Du hast es geschafft!",
   "onboarding.steps.follow_people.body": "Interessanten Profilen zu folgen ist das, was Mastodon ausmacht.",
@@ -506,7 +511,7 @@
   "privacy.private.short": "Nur Follower",
   "privacy.public.long": "Für alle sichtbar",
   "privacy.public.short": "Öffentlich",
-  "privacy.unlisted.long": "Sichtbar für alle, aber nicht über Suchfunktion",
+  "privacy.unlisted.long": "Für alle sichtbar, aber nicht über die Suche zu finden",
   "privacy.unlisted.short": "Nicht gelistet",
   "privacy_policy.last_updated": "Stand: {date}",
   "privacy_policy.title": "Datenschutzerklärung",
@@ -526,7 +531,7 @@
   "relative_time.today": "heute",
   "reply_indicator.cancel": "Abbrechen",
   "report.block": "Blockieren",
-  "report.block_explanation": "Dir wird es nicht länger möglich sein, die Beiträge dieses Konto zu sehen. Das blockierte Profil wird nicht mehr in der Lage sein, deine Beiträge zu sehen oder dir zu folgen. Die Person hinter dem Konto wird mitbekommen, dass du ihr Konto blockiert hast.",
+  "report.block_explanation": "Du wirst keine Beiträge mehr von diesem Konto sehen. Das blockierte Konto wird deine Beiträge nicht mehr sehen oder dir folgen können. Die Person könnte mitbekommen, dass du sie blockiert hast.",
   "report.categories.other": "Andere",
   "report.categories.spam": "Spam",
   "report.categories.violation": "Der Inhalt verletzt eine oder mehrere Serverregeln",
@@ -539,13 +544,13 @@
   "report.forward": "Meldung zusätzlich an {target} weiterleiten",
   "report.forward_hint": "Dieses Konto gehört zu einem anderen Server. Soll eine anonymisierte Kopie der Meldung auch dorthin gesendet werden?",
   "report.mute": "Stummschalten",
-  "report.mute_explanation": "Du wirst die Beiträge vom Konto nicht mehr sehen. Das Konto kann dir immer noch folgen, und die Person hinter dem Konto wird deine Beiträge sehen können und nicht wissen, dass du sie stummgeschaltet hast.",
+  "report.mute_explanation": "Du wirst keine Beiträge mehr von diesem Konto sehen. Das stummgeschaltete Konto wird dir weiterhin folgen und deine Beiträge sehen können. Die Person wird nicht mitbekommen, dass du sie stummgeschaltet hast.",
   "report.next": "Weiter",
   "report.placeholder": "Ergänzende Hinweise",
   "report.reasons.dislike": "Das gefällt mir nicht",
   "report.reasons.dislike_description": "Das ist etwas, das du nicht sehen möchtest",
   "report.reasons.legal": "Das ist illegal",
-  "report.reasons.legal_description": "Du bist davon überzeugt, dass es gegen die Gesetze deines Landes oder des Landes des Servers verstößt",
+  "report.reasons.legal_description": "Du glaubst, dass es gegen die Gesetze deines Landes oder des Landes des Servers verstößt",
   "report.reasons.other": "Es ist etwas anderes",
   "report.reasons.other_description": "Der Vorfall passt zu keiner dieser Kategorien",
   "report.reasons.spam": "Das ist Spam",
@@ -555,8 +560,8 @@
   "report.rules.subtitle": "Wähle alle zutreffenden Inhalte aus",
   "report.rules.title": "Welche Regeln werden verletzt?",
   "report.statuses.subtitle": "Wähle alle zutreffenden Inhalte aus",
-  "report.statuses.title": "Gibt es Beiträge, die diesen Bericht untermauern?",
-  "report.submit": "Absenden",
+  "report.statuses.title": "Gibt es Beiträge, die diese Meldung bekräftigen?",
+  "report.submit": "Senden",
   "report.target": "{target} melden",
   "report.thanks.take_action": "Das sind deine Möglichkeiten zu bestimmen, was du auf Mastodon sehen möchtest:",
   "report.thanks.take_action_actionable": "Während wir den Vorfall überprüfen, kannst du gegen @{name} weitere Maßnahmen ergreifen:",
@@ -591,11 +596,12 @@
   "server_banner.about_active_users": "Personen, die diesen Server in den vergangenen 30 Tagen verwendet haben (monatlich aktive Nutzer*innen)",
   "server_banner.active_users": "aktive Profile",
   "server_banner.administered_by": "Verwaltet von:",
-  "server_banner.introduction": "{domain} ist ein Teil des dezentralisierten sozialen Netzwerks, angetrieben von {mastodon}.",
+  "server_banner.introduction": "{domain} ist Teil eines dezentralisierten sozialen Netzwerks, angetrieben von {mastodon}.",
   "server_banner.learn_more": "Mehr erfahren",
   "server_banner.server_stats": "Serverstatistiken:",
   "sign_in_banner.create_account": "Konto erstellen",
   "sign_in_banner.sign_in": "Anmelden",
+  "sign_in_banner.sso_redirect": "Anmelden oder registrieren",
   "sign_in_banner.text": "Melde dich an, um Profilen oder Hashtags zu folgen, Beiträge zu favorisieren, zu teilen und auf sie zu antworten. Du kannst auch von deinem Konto aus auf einem anderen Server interagieren.",
   "status.admin_account": "@{name} moderieren",
   "status.admin_domain": "{domain} moderieren",
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index e34df674fd..6a9d45cf87 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -177,7 +177,6 @@
   "conversation.open": "Προβολή συνομιλίας",
   "conversation.with": "Με {names}",
   "copypaste.copied": "Αντιγράφηκε",
-  "copypaste.copy": "Αντιγραφή",
   "copypaste.copy_to_clipboard": "Αντιγραφή στο πρόχειρο",
   "directory.federated": "Από το γνωστό fediverse",
   "directory.local": "Μόνο από {domain}",
@@ -287,7 +286,6 @@
   "interaction_modal.description.reply": "Με ένα λογαριασμό Mastodon, μπορείς να απαντήσεις σε αυτή την ανάρτηση.",
   "interaction_modal.on_another_server": "Σε διαφορετικό διακομιστή",
   "interaction_modal.on_this_server": "Σε αυτόν τον διακομιστή",
-  "interaction_modal.preamble": "Δεδομένου ότι το Mastodon είναι αποκεντρωμένο, μπορείς να χρησιμοποιείς τον υπάρχοντα λογαριασμό σου που φιλοξενείται σε άλλον διακομιστή του Mastodon ή σε συμβατή πλατφόρμα, αν δεν έχετε λογαριασμό σε αυτόν.",
   "interaction_modal.title.follow": "Ακολούθησε {name}",
   "interaction_modal.title.reblog": "Ενίσχυσε την ανάρτηση του {name}",
   "interaction_modal.title.reply": "Απάντηση στην ανάρτηση του {name}",
diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json
index a0892fd1e3..0566e164d7 100644
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@@ -13,14 +13,14 @@
   "about.rules": "Server rules",
   "account.account_note_header": "Note",
   "account.add_or_remove_from_list": "Add or Remove from lists",
-  "account.badges.bot": "Bot",
+  "account.badges.bot": "Automated",
   "account.badges.group": "Group",
   "account.block": "Block @{name}",
-  "account.block_domain": "Unblock domain {domain}",
+  "account.block_domain": "Block domain {domain}",
   "account.block_short": "Block",
   "account.blocked": "Blocked",
   "account.browse_more_on_origin_server": "Browse more on the original profile",
-  "account.cancel_follow_request": "Withdraw follow request",
+  "account.cancel_follow_request": "Cancel follow",
   "account.direct": "Privately mention @{name}",
   "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocked": "Domain blocked",
@@ -150,7 +150,7 @@
   "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
   "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
   "compose_form.publish": "Publish",
-  "compose_form.publish_form": "Publish",
+  "compose_form.publish_form": "New post",
   "compose_form.publish_loud": "{publish}!",
   "compose_form.save_changes": "Save changes",
   "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
@@ -191,7 +191,6 @@
   "conversation.open": "View conversation",
   "conversation.with": "With {names}",
   "copypaste.copied": "Copied",
-  "copypaste.copy": "Copy",
   "copypaste.copy_to_clipboard": "Copy to clipboard",
   "directory.federated": "From known fediverse",
   "directory.local": "From {domain} only",
@@ -236,7 +235,7 @@
   "empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
   "empty_column.followed_tags": "You have not followed any hashtags yet. When you do, they will show up here.",
   "empty_column.hashtag": "There is nothing in this hashtag yet.",
-  "empty_column.home": "Your home timeline is empty! Follow more people to fill it up. {suggestions}",
+  "empty_column.home": "Your home timeline is empty! Follow more people to fill it up.",
   "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
   "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
   "empty_column.mutes": "You haven't muted any users yet.",
@@ -296,6 +295,7 @@
   "hashtag.column_settings.tag_mode.any": "Any of these",
   "hashtag.column_settings.tag_mode.none": "None of these",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} Following} other {{counter} Following}}",
   "hashtag.follow": "Follow hashtag",
   "hashtag.unfollow": "Unfollow hashtag",
   "home.actions.go_to_explore": "See what's trending",
@@ -303,7 +303,7 @@
   "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Show boosts",
   "home.column_settings.show_replies": "Show replies",
-  "home.explore_prompt.body": "Your home feed will have a mix of posts from the hashtags you've chosen to follow, the people you've chosen to follow, and the posts they boost. It's looking pretty quiet right now, so how about:",
+  "home.explore_prompt.body": "Your home feed will have a mix of posts from the hashtags you've chosen to follow, the people you've chosen to follow, and the posts they boost. If that feels too quiet, you may want to:",
   "home.explore_prompt.title": "This is your home base within Mastodon.",
   "home.hide_announcements": "Hide announcements",
   "home.show_announcements": "Show announcements",
@@ -311,10 +311,13 @@
   "interaction_modal.description.follow": "With an account on Mastodon, you can follow {name} to receive their posts in your home feed.",
   "interaction_modal.description.reblog": "With an account on Mastodon, you can boost this post to share it with your own followers.",
   "interaction_modal.description.reply": "With an account on Mastodon, you can respond to this post.",
+  "interaction_modal.login.action": "Take me home",
+  "interaction_modal.login.prompt": "Domain of your home server, e.g. mastodon.social",
+  "interaction_modal.no_account_yet": "Not on Mastodon?",
   "interaction_modal.on_another_server": "On a different server",
   "interaction_modal.on_this_server": "On this server",
-  "interaction_modal.other_server_instructions": "Copy and paste this URL into the search field of your favourite Mastodon app or the web interface of your Mastodon server.",
-  "interaction_modal.preamble": "Since Mastodon is decentralised, you can use your existing account hosted by another Mastodon server or compatible platform if you don't have an account on this one.",
+  "interaction_modal.sign_in": "You are not logged in to this server. Where is your account hosted?",
+  "interaction_modal.sign_in_hint": "Tip: That's the website where you signed up. If you don't remember, look for the welcome e-mail in your inbox. You can also enter your full username! (e.g. @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Favourite {name}'s post",
   "interaction_modal.title.follow": "Follow {name}",
   "interaction_modal.title.reblog": "Boost {name}'s post",
@@ -335,14 +338,14 @@
   "keyboard_shortcuts.favourites": "Open favourites list",
   "keyboard_shortcuts.federated": "to open federated timeline",
   "keyboard_shortcuts.heading": "Keyboard Shortcuts",
-  "keyboard_shortcuts.home": "to open home timeline",
+  "keyboard_shortcuts.home": "Open home timeline",
   "keyboard_shortcuts.hotkey": "Hotkey",
   "keyboard_shortcuts.legend": "to display this legend",
   "keyboard_shortcuts.local": "to open local timeline",
   "keyboard_shortcuts.mention": "to mention author",
   "keyboard_shortcuts.muted": "to open muted users list",
   "keyboard_shortcuts.my_profile": "to open your profile",
-  "keyboard_shortcuts.notifications": "to open notifications column",
+  "keyboard_shortcuts.notifications": "Open notifications column",
   "keyboard_shortcuts.open_media": "to open media",
   "keyboard_shortcuts.pinned": "to open pinned posts list",
   "keyboard_shortcuts.profile": "to open author's profile",
@@ -352,10 +355,10 @@
   "keyboard_shortcuts.spoilers": "to show/hide CW field",
   "keyboard_shortcuts.start": "to open \"get started\" column",
   "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
-  "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
+  "keyboard_shortcuts.toggle_sensitivity": "Show/hide media",
   "keyboard_shortcuts.toot": "to start a brand new post",
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
-  "keyboard_shortcuts.up": "to move up in the list",
+  "keyboard_shortcuts.up": "Move up in the list",
   "lightbox.close": "Close",
   "lightbox.compress": "Compress image view box",
   "lightbox.expand": "Expand image view box",
@@ -393,7 +396,7 @@
   "navigation_bar.compose": "Compose new post",
   "navigation_bar.direct": "Private mentions",
   "navigation_bar.discover": "Discover",
-  "navigation_bar.domain_blocks": "Hidden domains",
+  "navigation_bar.domain_blocks": "Blocked domains",
   "navigation_bar.edit_profile": "Edit profile",
   "navigation_bar.explore": "Explore",
   "navigation_bar.favourites": "Favourites",
@@ -462,26 +465,26 @@
   "onboarding.action.back": "Take me back",
   "onboarding.actions.back": "Take me back",
   "onboarding.actions.go_to_explore": "See what's trending",
-  "onboarding.actions.go_to_home": "Go to your home feed",
+  "onboarding.actions.go_to_home": "Take me to my home feed",
   "onboarding.compose.template": "Hello #Mastodon!",
   "onboarding.follows.empty": "Unfortunately, no results can be shown right now. You can try using search or browsing the explore page to find people to follow, or try again later.",
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
-  "onboarding.follows.title": "Popular on Mastodon",
+  "onboarding.follows.title": "Personalize your home feed",
   "onboarding.share.lead": "Let people know how they can find you on Mastodon!",
   "onboarding.share.message": "I'm {username} on #Mastodon! Come follow me at {url}",
   "onboarding.share.next_steps": "Possible next steps:",
   "onboarding.share.title": "Share your profile",
-  "onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:",
-  "onboarding.start.skip": "Want to skip right ahead?",
+  "onboarding.start.lead": "You're now part of Mastodon, a unique, decentralized social media platform where you—not an algorithm—curate your own experience. Let's get you started on this new social frontier:",
+  "onboarding.start.skip": "Don't need help getting started?",
   "onboarding.start.title": "You've made it!",
   "onboarding.steps.follow_people.body": "Following interesting people is what Mastodon is all about.",
-  "onboarding.steps.follow_people.title": "Follow {count, plural, one {one person} other {# people}}",
-  "onboarding.steps.publish_status.body": "Say hello to the World.",
+  "onboarding.steps.follow_people.title": "Personalize your home feed",
+  "onboarding.steps.publish_status.body": "Say hello to the world with text, photos, videos, or polls {emoji}",
   "onboarding.steps.publish_status.title": "Make your first post",
   "onboarding.steps.setup_profile.body": "Others are more likely to interact with you with a filled out profile.",
   "onboarding.steps.setup_profile.title": "Customise your profile",
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
-  "onboarding.steps.share_profile.title": "Share your profile",
+  "onboarding.steps.share_profile.title": "Share your Mastodon profile",
   "onboarding.tips.2fa": "<strong>Did you know?</strong> You can secure your account by setting up two-factor authentication in your account settings. It works with any TOTP app of your choice, no phone number necessary!",
   "onboarding.tips.accounts_from_other_servers": "<strong>Did you know?</strong> Since Mastodon is decentralised, some profiles you come across will be hosted on servers other than yours. And yet you can interact with them seamlessly! Their server is in the second half of their username!",
   "onboarding.tips.migration": "<strong>Did you know?</strong> If you feel like {domain} is not a great server choice for you in the future, you can move to another Mastodon server without losing your followers. You can even host your own server!",
@@ -498,10 +501,10 @@
   "poll.voted": "You voted for this answer",
   "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
   "poll_button.add_poll": "Add a poll",
-  "poll_button.remove_poll": "Add a poll",
-  "privacy.change": "Adjust status privacy",
+  "poll_button.remove_poll": "Remove poll",
+  "privacy.change": "Change post privacy",
   "privacy.direct.long": "Visible for mentioned users only",
-  "privacy.direct.short": "Direct",
+  "privacy.direct.short": "Mentioned people only",
   "privacy.private.long": "Visible for followers only",
   "privacy.private.short": "Followers-only",
   "privacy.public.long": "Visible for all",
@@ -541,7 +544,7 @@
   "report.mute": "Mute",
   "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
   "report.next": "Next",
-  "report.placeholder": "Type or paste additional comments",
+  "report.placeholder": "Additional comments",
   "report.reasons.dislike": "I don't like it",
   "report.reasons.dislike_description": "It is not something you want to see",
   "report.reasons.legal": "It's illegal",
@@ -556,8 +559,8 @@
   "report.rules.title": "Which rules are being violated?",
   "report.statuses.subtitle": "Select all that apply",
   "report.statuses.title": "Are there any posts that back up this report?",
-  "report.submit": "Submit report",
-  "report.target": "Report {target}",
+  "report.submit": "Submit",
+  "report.target": "Reporting {target}",
   "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
   "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
   "report.thanks.title": "Don't want to see this?",
@@ -596,10 +599,11 @@
   "server_banner.server_stats": "Server stats:",
   "sign_in_banner.create_account": "Create account",
   "sign_in_banner.sign_in": "Sign in",
+  "sign_in_banner.sso_redirect": "Login or Register",
   "sign_in_banner.text": "Login to follow profiles or hashtags, favourite, share and reply to posts. You can also 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 status in the moderation interface",
+  "status.admin_status": "Open this post in the moderation interface",
   "status.block": "Block @{name}",
   "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Unboost",
@@ -627,7 +631,7 @@
   "status.more": "More",
   "status.mute": "Mute @{name}",
   "status.mute_conversation": "Mute conversation",
-  "status.open": "Expand this status",
+  "status.open": "Expand this post",
   "status.pin": "Pin on profile",
   "status.pinned": "Pinned post",
   "status.read_more": "Read more",
@@ -681,13 +685,13 @@
   "upload_button.label": "Add images, a video or an audio file",
   "upload_error.limit": "File upload limit exceeded.",
   "upload_error.poll": "File upload not allowed with polls.",
-  "upload_form.audio_description": "Describe for people with hearing loss",
-  "upload_form.description": "Describe for the visually impaired",
+  "upload_form.audio_description": "Describe for people who are deaf or hard of hearing",
+  "upload_form.description": "Describe for people who are blind or have low vision",
   "upload_form.description_missing": "No description added",
   "upload_form.edit": "Edit",
   "upload_form.thumbnail": "Change thumbnail",
   "upload_form.undo": "Delete",
-  "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
+  "upload_form.video_description": "Describe for people who are deaf, hard of hearing, blind or have low vision",
   "upload_modal.analyzing_picture": "Analysing picture…",
   "upload_modal.apply": "Apply",
   "upload_modal.applying": "Applying…",
@@ -700,7 +704,7 @@
   "upload_modal.preview_label": "Preview ({ratio})",
   "upload_progress.label": "Uploading…",
   "upload_progress.processing": "Processing…",
-  "username.taken": "Username is taken - try another. Carlito77",
+  "username.taken": "That username is taken. Try another",
   "video.close": "Close video",
   "video.download": "Download file",
   "video.exit_fullscreen": "Exit full screen",
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 1457db329b..d4cd8c7945 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -295,8 +295,12 @@
   "hashtag.column_settings.tag_mode.any": "Any of these",
   "hashtag.column_settings.tag_mode.none": "None of these",
   "hashtag.column_settings.tag_toggle": "Include additional tags for this column",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} participant} other {{counter} participants}}",
+  "hashtag.counter_by_uses": "{count, plural, one {{counter} post} other {{counter} posts}}",
+  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} post} other {{counter} posts}} today",
   "hashtag.follow": "Follow hashtag",
   "hashtag.unfollow": "Unfollow hashtag",
+  "hashtags.and_other": "…and {count, plural, other {# more}}",
   "home.actions.go_to_explore": "See what's trending",
   "home.actions.go_to_suggestions": "Find people to follow",
   "home.column_settings.basic": "Basic",
@@ -529,6 +533,7 @@
   "reply_indicator.cancel": "Cancel",
   "report.block": "Block",
   "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
+  "report.categories.legal": "Legal",
   "report.categories.other": "Other",
   "report.categories.spam": "Spam",
   "report.categories.violation": "Content violates one or more server rules",
@@ -598,6 +603,7 @@
   "server_banner.server_stats": "Server stats:",
   "sign_in_banner.create_account": "Create account",
   "sign_in_banner.sign_in": "Login",
+  "sign_in_banner.sso_redirect": "Login or Register",
   "sign_in_banner.text": "Login to follow profiles or hashtags, favorite, share and reply to posts. You can also interact from your account on a different server.",
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_domain": "Open moderation interface for {domain}",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index 68fb0a8012..2735f05d0b 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -189,7 +189,6 @@
   "conversation.open": "Vidi konversacion",
   "conversation.with": "Kun {names}",
   "copypaste.copied": "Kopiita",
-  "copypaste.copy": "Kopii",
   "copypaste.copy_to_clipboard": "Kopii al dosierujo",
   "directory.federated": "El konata fediverso",
   "directory.local": "Nur de {domain}",
@@ -303,7 +302,6 @@
   "interaction_modal.description.reply": "Kun konto ĉe Mastodon, vi povos respondi al ĉi tiu mesaĝo.",
   "interaction_modal.on_another_server": "En alia servilo",
   "interaction_modal.on_this_server": "En ĉi tiu servilo",
-  "interaction_modal.preamble": "Ĉar Mastodon estas malcentrigita, vi povas uzi jam ekzistantan konton gastigatan de alia Mastodona servilo aŭ kongrua substrato, se vi ne havas konton ĉe tiu ĉi.",
   "interaction_modal.title.follow": "Sekvi {name}",
   "interaction_modal.title.reblog": "Akceli la afiŝon de {name}",
   "interaction_modal.title.reply": "Respondi al la afiŝo de {name}",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index 511dcc453e..d894bfe0c6 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -191,7 +191,6 @@
   "conversation.open": "Ver conversación",
   "conversation.with": "Con {names}",
   "copypaste.copied": "Copiado",
-  "copypaste.copy": "Copiar",
   "copypaste.copy_to_clipboard": "Copiar al portapapeles",
   "directory.federated": "Desde fediverso conocido",
   "directory.local": "Sólo de {domain}",
@@ -296,6 +295,9 @@
   "hashtag.column_settings.tag_mode.any": "Cualquiera de estas",
   "hashtag.column_settings.tag_mode.none": "Ninguna de estas",
   "hashtag.column_settings.tag_toggle": "Incluir etiquetas adicionales para esta columna",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} participante} other {{counter} participantes}}",
+  "hashtag.counter_by_uses": "{count, plural, one {{counter} mensaje} other {{counter} mensajes}}",
+  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} mensaje} other {{counter} mensajes}} hoy",
   "hashtag.follow": "Seguir etiqueta",
   "hashtag.unfollow": "Dejar de seguir etiqueta",
   "home.actions.go_to_explore": "Mirá qué está en tendencia",
@@ -303,7 +305,7 @@
   "home.column_settings.basic": "Básico",
   "home.column_settings.show_reblogs": "Mostrar adhesiones",
   "home.column_settings.show_replies": "Mostrar respuestas",
-  "home.explore_prompt.body": "Tu línea temporal principal tendrá una mezcla de mensajes de etiquetas que hayás decidido seguir, cuentas que hayás seguido y mensajes a los que éstas adhieran. Ahora está muy tranquilo por acá, así que, qué te parece:",
+  "home.explore_prompt.body": "Tu línea temporal principal tendrá una mezcla de mensajes de etiquetas que hayás decidido seguir, cuentas que hayás seguido y mensajes a los que éstas adhieran. Si está muy tranquilo por acá, quizás quieras:",
   "home.explore_prompt.title": "Este es tu inicio en Mastodon.",
   "home.hide_announcements": "Ocultar anuncios",
   "home.show_announcements": "Mostrar anuncios",
@@ -311,10 +313,13 @@
   "interaction_modal.description.follow": "Con una cuenta en Mastodon, podés seguir a {name} para recibir sus mensajes en tu línea temporal principal.",
   "interaction_modal.description.reblog": "Con una cuenta en Mastodon, podés adherir a este mensaje para compartirlo con tus propios seguidores.",
   "interaction_modal.description.reply": "Con una cuenta en Mastodon, podés responder a este mensaje.",
+  "interaction_modal.login.action": "Llevame al comienzo",
+  "interaction_modal.login.prompt": "Dominio de su servidor de inicio, p. ej., mastodon.social",
+  "interaction_modal.no_account_yet": "¿No tenés cuenta en Mastodon?",
   "interaction_modal.on_another_server": "En un servidor diferente",
   "interaction_modal.on_this_server": "En este servidor",
-  "interaction_modal.other_server_instructions": "Copiá y pegá esta dirección web en la barra de búsqueda de tu aplicación favorita de Mastodon, o en la interface web de tu servidor de Mastodon.",
-  "interaction_modal.preamble": "Ya que Mastodon es descentralizado, podés usar tu cuenta existente alojada por otro servidor Mastodon (u otra plataforma compatible, si no tenés una cuenta en ésta).",
+  "interaction_modal.sign_in": "No iniciaste sesión en este servidor. ¿Dónde se encuentra alojada tu cuenta?",
+  "interaction_modal.sign_in_hint": "Ayuda: es el sitio web en donde te registraste. Si no te acordás, buscá el correo electrónico de bienvenida en tu cuenta de email. También podés usar tu nombre de usuario entero, p. ej., @tunombredeusuario@mastodon.social.",
   "interaction_modal.title.favourite": "Marcar como favorito el mensaje de {name}",
   "interaction_modal.title.follow": "Seguir a {name}",
   "interaction_modal.title.reblog": "Adherir al mensaje de {name}",
@@ -596,6 +601,7 @@
   "server_banner.server_stats": "Estadísticas del servidor:",
   "sign_in_banner.create_account": "Crear cuenta",
   "sign_in_banner.sign_in": "Iniciar sesión",
+  "sign_in_banner.sso_redirect": "Iniciá sesión o registrate",
   "sign_in_banner.text": "Iniciá sesión para seguir cuentas o etiquetas, marcar mensajes como favoritos, compartirlos y responderlos. También podés interactuar desde tu cuenta en un servidor diferente.",
   "status.admin_account": "Abrir interface de moderación para @{name}",
   "status.admin_domain": "Abrir interface de moderación para {domain}",
@@ -671,7 +677,7 @@
   "timeline_hint.resources.followers": "Tus seguidores",
   "timeline_hint.resources.follows": "Las cuentas que seguís",
   "timeline_hint.resources.statuses": "Mensajes más antiguos",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} personas}} en el/los pasado/s {days, plural, one {día} other {{days} días}}",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} personas}} en {days, plural, one {el pasado día} other {los pasados {days} días}}",
   "trends.trending_now": "Tendencia ahora",
   "ui.beforeunload": "Tu borrador se perderá si abandonás Mastodon.",
   "units.short.billion": "{count}MM",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index 6e4ad100eb..015cf5a058 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -191,7 +191,6 @@
   "conversation.open": "Ver conversación",
   "conversation.with": "Con {names}",
   "copypaste.copied": "Copiado",
-  "copypaste.copy": "Copiar",
   "copypaste.copy_to_clipboard": "Copiar al portapapeles",
   "directory.federated": "Desde el fediverso conocido",
   "directory.local": "Sólo de {domain}",
@@ -202,6 +201,7 @@
   "dismissable_banner.community_timeline": "Estas son las publicaciones públicas más recientes de las personas cuyas cuentas están alojadas en {domain}.",
   "dismissable_banner.dismiss": "Descartar",
   "dismissable_banner.explore_links": "Estas noticias están siendo discutidas por personas en este y otros servidores de la red descentralizada en este momento.",
+  "dismissable_banner.explore_statuses": "Estas son las publicaciones que están ganando popularidad en la web social hoy. Las publicaciones recientes con más impulsos y favoritos obtienen más exposición.",
   "dismissable_banner.explore_tags": "Se trata de hashtags que están ganando adeptos en las redes sociales hoy en día. Los hashtags que son utilizados por más personas diferentes se clasifican mejor.",
   "dismissable_banner.public_timeline": "Estos son los toots públicos más recientes de personas en la web social a las que sigue la gente en {domain}.",
   "embed.instructions": "Añade este toot a tu sitio web con el siguiente código.",
@@ -230,6 +230,8 @@
   "empty_column.direct": "Aún no tienes menciones privadas. Cuando envíes o recibas una, aparecerán aquí.",
   "empty_column.domain_blocks": "Todavía no hay dominios ocultos.",
   "empty_column.explore_statuses": "Nada es tendencia en este momento. ¡Revisa más tarde!",
+  "empty_column.favourited_statuses": "Todavía no tienes publicaciones favoritas. Cuando marques una publicación como favorita, se mostrarán aquí.",
+  "empty_column.favourites": "Todavía nadie marcó esta publicación como favorita. Cuando alguien lo haga, se mostrarán aquí.",
   "empty_column.follow_requests": "No tienes ninguna petición de seguidor. Cuando recibas una, se mostrará aquí.",
   "empty_column.followed_tags": "No estás siguiendo ningún hashtag todavía. Cuando lo hagas, aparecerá aquí.",
   "empty_column.hashtag": "No hay nada en este hashtag aún.",
@@ -293,6 +295,9 @@
   "hashtag.column_settings.tag_mode.any": "Cualquiera de estos",
   "hashtag.column_settings.tag_mode.none": "Ninguno de estos",
   "hashtag.column_settings.tag_toggle": "Incluye etiquetas adicionales para esta columna",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} participante} other {{counter} participantes}}",
+  "hashtag.counter_by_uses": "{count, plural, one {{counter} publicación} other {{counter} publicaciones}}",
+  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} publicación} other {{counter} publicaciones}} hoy",
   "hashtag.follow": "Seguir etiqueta",
   "hashtag.unfollow": "Dejar de seguir etiqueta",
   "home.actions.go_to_explore": "Ver tendencias",
@@ -300,16 +305,22 @@
   "home.column_settings.basic": "Básico",
   "home.column_settings.show_reblogs": "Mostrar retoots",
   "home.column_settings.show_replies": "Mostrar respuestas",
-  "home.explore_prompt.body": "Tu cronología de inicio tendrá una mezcla de publicaciones de etiquetas que hayas decidido seguir, personas que hayas seguido y publicaciones que estas impulsen. Ahora está muy vacía, por qué no:",
+  "home.explore_prompt.body": "Tu cronología de inicio tendrá una mezcla de publicaciones de las etiquetas que has escogido seguir, la gente que has decidido seguir y las publicaciones que impulsen. Si crees que está demasiado tranquila, quizás quieras:",
   "home.explore_prompt.title": "Este es tu punto de partida en Mastodon.",
   "home.hide_announcements": "Ocultar anuncios",
   "home.show_announcements": "Mostrar anuncios",
+  "interaction_modal.description.favourite": "Con una cuenta en Mastodon, puedes marcar como favorita esta publicación para que el autor sepa que te gusta, y guardala para más adelante.",
   "interaction_modal.description.follow": "Con una cuenta en Mastodon, puedes seguir {name} para recibir sus publicaciones en tu fuente de inicio.",
   "interaction_modal.description.reblog": "Con una cuenta en Mastodon, puedes impulsar esta publicación para compartirla con tus propios seguidores.",
   "interaction_modal.description.reply": "Con una cuenta en Mastodon, puedes responder a esta publicación.",
+  "interaction_modal.login.action": "Ir a Inicio",
+  "interaction_modal.login.prompt": "Dominio de tu servidor, por ejemplo mastodon.social",
+  "interaction_modal.no_account_yet": "¿Aún no tienes cuenta en Mastodon?",
   "interaction_modal.on_another_server": "En un servidor diferente",
   "interaction_modal.on_this_server": "En este servidor",
-  "interaction_modal.preamble": "Ya que Mastodon es descentralizado, puedes usar tu cuenta existente alojada en otro servidor Mastodon o plataforma compatible si no tienes una cuenta en este servidor.",
+  "interaction_modal.sign_in": "No estás registrado en este servidor. ¿Dónde tienes tu cuenta?",
+  "interaction_modal.sign_in_hint": "Pista: Ese es el sitio donde te registraste. Si no lo recuerdas, busca el correo electrónico de bienvenida en tu bandeja de entrada. También puedes introducir tu nombre de usuario completo (por ejemplo @Mastodon@mastodon.social)",
+  "interaction_modal.title.favourite": "Marcar como favorita la publicación de {name}",
   "interaction_modal.title.follow": "Seguir a {name}",
   "interaction_modal.title.reblog": "Impulsar la publicación de {name}",
   "interaction_modal.title.reply": "Responder la publicación de {name}",
@@ -325,6 +336,8 @@
   "keyboard_shortcuts.direct": "para abrir la columna de menciones privadas",
   "keyboard_shortcuts.down": "mover hacia abajo en la lista",
   "keyboard_shortcuts.enter": "abrir estado",
+  "keyboard_shortcuts.favourite": "Marcar como favorita la publicación",
+  "keyboard_shortcuts.favourites": "Abrir lista de favoritos",
   "keyboard_shortcuts.federated": "abrir el timeline federado",
   "keyboard_shortcuts.heading": "Keyboard Shortcuts",
   "keyboard_shortcuts.home": "abrir el timeline propio",
@@ -355,6 +368,7 @@
   "lightbox.previous": "Anterior",
   "limited_account_hint.action": "Mostrar perfil de todos modos",
   "limited_account_hint.title": "Este perfil ha sido ocultado por los moderadores de {domain}.",
+  "link_preview.author": "Por {name}",
   "lists.account.add": "Añadir a lista",
   "lists.account.remove": "Quitar de lista",
   "lists.delete": "Borrar lista",
@@ -387,6 +401,7 @@
   "navigation_bar.domain_blocks": "Dominios ocultos",
   "navigation_bar.edit_profile": "Editar perfil",
   "navigation_bar.explore": "Explorar",
+  "navigation_bar.favourites": "Favoritos",
   "navigation_bar.filters": "Palabras silenciadas",
   "navigation_bar.follow_requests": "Solicitudes para seguirte",
   "navigation_bar.followed_tags": "Hashtags seguidos",
@@ -403,6 +418,7 @@
   "not_signed_in_indicator.not_signed_in": "Necesitas iniciar sesión para acceder a este recurso.",
   "notification.admin.report": "{name} denunció a {target}",
   "notification.admin.sign_up": "{name} se unio",
+  "notification.favourite": "{name} marcó como favorita tu publicación",
   "notification.follow": "{name} te empezó a seguir",
   "notification.follow_request": "{name} ha solicitado seguirte",
   "notification.mention": "{name} te ha mencionado",
@@ -416,6 +432,7 @@
   "notifications.column_settings.admin.report": "Nuevas denuncias:",
   "notifications.column_settings.admin.sign_up": "Registros nuevos:",
   "notifications.column_settings.alert": "Notificaciones de escritorio",
+  "notifications.column_settings.favourite": "Favoritos:",
   "notifications.column_settings.filter_bar.advanced": "Mostrar todas las categorías",
   "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido",
   "notifications.column_settings.filter_bar.show_bar": "Mostrar barra de filtros",
@@ -433,6 +450,7 @@
   "notifications.column_settings.update": "Ediciones:",
   "notifications.filter.all": "Todos",
   "notifications.filter.boosts": "Retoots",
+  "notifications.filter.favourites": "Favoritos",
   "notifications.filter.follows": "Seguidores",
   "notifications.filter.mentions": "Menciones",
   "notifications.filter.polls": "Resultados de la votación",
@@ -583,6 +601,8 @@
   "server_banner.server_stats": "Estadísticas del servidor:",
   "sign_in_banner.create_account": "Crear cuenta",
   "sign_in_banner.sign_in": "Iniciar sesión",
+  "sign_in_banner.sso_redirect": "Iniciar sesión o Registrarse",
+  "sign_in_banner.text": "Inicia sesión para seguir perfiles o etiquetas, así como marcar como favoritas, compartir y responder a publicaciones. También puedes interactuar desde tu cuenta en un servidor diferente.",
   "status.admin_account": "Abrir interfaz de moderación para @{name}",
   "status.admin_domain": "Abrir interfaz de moderación para {domain}",
   "status.admin_status": "Abrir este estado en la interfaz de moderación",
@@ -599,6 +619,7 @@
   "status.edited": "Editado {date}",
   "status.edited_x_times": "Editado {count, plural, one {{count} time} other {{count} veces}}",
   "status.embed": "Incrustado",
+  "status.favourite": "Favorito",
   "status.filter": "Filtrar esta publicación",
   "status.filtered": "Filtrado",
   "status.hide": "Ocultar toot",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index db78eb7dac..cb1bcb9896 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -191,7 +191,6 @@
   "conversation.open": "Ver conversación",
   "conversation.with": "Con {names}",
   "copypaste.copied": "Copiado",
-  "copypaste.copy": "Copiar",
   "copypaste.copy_to_clipboard": "Copiar al portapapeles",
   "directory.federated": "Desde el fediverso conocido",
   "directory.local": "Sólo de {domain}",
@@ -202,6 +201,7 @@
   "dismissable_banner.community_timeline": "Estas son las publicaciones públicas más recientes de personas cuyas cuentas están alojadas en {domain}.",
   "dismissable_banner.dismiss": "Descartar",
   "dismissable_banner.explore_links": "Estas son las noticias que están siendo más compartidas hoy en la red. Nuevas noticias publicadas por diferentes personas se puntúan más alto.",
+  "dismissable_banner.explore_statuses": "Estas son las publicaciones que están ganando popularidad en la web social hoy. Las publicaciones recientes con más impulsos y favoritos obtienen más exposición.",
   "dismissable_banner.explore_tags": "Estas son las etiquetas que están ganando popularidad hoy en la red. Etiquetas que se usan por personas diferentes se puntúan más alto.",
   "dismissable_banner.public_timeline": "Estas son las publicaciones más recientes de personas en el Fediverso que siguen las personas de {domain}.",
   "embed.instructions": "Añade esta publicación a tu sitio web con el siguiente código.",
@@ -230,6 +230,8 @@
   "empty_column.direct": "Aún no tienes menciones privadas. Cuando envíes o recibas una, aparecerán aquí.",
   "empty_column.domain_blocks": "Todavía no hay dominios ocultos.",
   "empty_column.explore_statuses": "Nada está en tendencia en este momento. ¡Revisa más tarde!",
+  "empty_column.favourited_statuses": "Todavía no tienes publicaciones favoritas. Cuando marques una publicación como favorita, se mostrarán aquí.",
+  "empty_column.favourites": "Todavía nadie marcó esta publicación como favorita. Cuando alguien lo haga, se mostrarán aquí.",
   "empty_column.follow_requests": "No tienes ninguna petición de seguidor. Cuando recibas una, se mostrará aquí.",
   "empty_column.followed_tags": "No has seguido ninguna etiqueta todavía. Cuando lo hagas, se mostrarán aquí.",
   "empty_column.hashtag": "No hay nada en este hashtag aún.",
@@ -293,6 +295,9 @@
   "hashtag.column_settings.tag_mode.any": "Cualquiera de estos",
   "hashtag.column_settings.tag_mode.none": "Ninguno de estos",
   "hashtag.column_settings.tag_toggle": "Incluir etiquetas adicionales en esta columna",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} participante} other {{counter} participantes}}",
+  "hashtag.counter_by_uses": "{count, plural, one {{counter} publicación} other {{counter} publicaciones}}",
+  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} publicación} other {{counter} publicaciones}} hoy",
   "hashtag.follow": "Seguir etiqueta",
   "hashtag.unfollow": "Dejar de seguir etiqueta",
   "home.actions.go_to_explore": "Ver tendencias",
@@ -300,16 +305,22 @@
   "home.column_settings.basic": "Básico",
   "home.column_settings.show_reblogs": "Mostrar impulsos",
   "home.column_settings.show_replies": "Mostrar respuestas",
-  "home.explore_prompt.body": "Tu cronología de inicio tendrá una mezcla de publicaciones de etiquetas que hayas decidido seguir, personas que hayas seguido y publicaciones que estas impulsen. Ahora está muy vacía, por qué no:",
+  "home.explore_prompt.body": "Tu cronología de inicio tendrá una mezcla de publicaciones de las etiquetas que has escogido seguir, la gente que has decidido seguir y las publicaciones que impulsen. Si crees que está demasiado tranquila, quizás quieras:",
   "home.explore_prompt.title": "Este es tu punto de partida en Mastodon.",
   "home.hide_announcements": "Ocultar anuncios",
   "home.show_announcements": "Mostrar anuncios",
+  "interaction_modal.description.favourite": "Con una cuenta en Mastodon, puedes marcar como favorita esta publicación para que el autor sepa que te gusta, y guardala para más adelante.",
   "interaction_modal.description.follow": "Con una cuenta en Mastodon, puedes seguir {name} para recibir sus publicaciones en tu línea temporal de inicio.",
   "interaction_modal.description.reblog": "Con una cuenta en Mastodon, puedes impulsar esta publicación para compartirla con tus propios seguidores.",
   "interaction_modal.description.reply": "Con una cuenta en Mastodon, puedes responder a esta publicación.",
+  "interaction_modal.login.action": "Ir a Inicio",
+  "interaction_modal.login.prompt": "Dominio de tu servidor, por ejemplo mastodon.social",
+  "interaction_modal.no_account_yet": "¿Aún no tienes cuenta en Mastodon?",
   "interaction_modal.on_another_server": "En un servidor diferente",
   "interaction_modal.on_this_server": "En este servidor",
-  "interaction_modal.preamble": "Ya que Mastodon es descentralizado, puedes usar tu cuenta existente alojada en otro servidor Mastodon o plataforma compatible si no tienes una cuenta en este servidor.",
+  "interaction_modal.sign_in": "No estás registrado en este servidor. ¿Dónde tienes tu cuenta?",
+  "interaction_modal.sign_in_hint": "Pista: Ese es el sitio donde te registraste. Si no lo recuerdas, busca el correo electrónico de bienvenida en tu bandeja de entrada. También puedes introducir tu nombre de usuario completo (por ejemplo @Mastodon@mastodon.social)",
+  "interaction_modal.title.favourite": "Marcar como favorita la publicación de {name}",
   "interaction_modal.title.follow": "Seguir a {name}",
   "interaction_modal.title.reblog": "Impulsar la publicación de {name}",
   "interaction_modal.title.reply": "Responder a la publicación de {name}",
@@ -325,6 +336,8 @@
   "keyboard_shortcuts.direct": "para abrir la columna de menciones privadas",
   "keyboard_shortcuts.down": "mover hacia abajo en la lista",
   "keyboard_shortcuts.enter": "Abrir publicación",
+  "keyboard_shortcuts.favourite": "Marcar como favorita la publicación",
+  "keyboard_shortcuts.favourites": "Abrir lista de favoritos",
   "keyboard_shortcuts.federated": "Abrir la cronología federada",
   "keyboard_shortcuts.heading": "Keyboard Shortcuts",
   "keyboard_shortcuts.home": "Abrir cronología principal",
@@ -355,6 +368,7 @@
   "lightbox.previous": "Anterior",
   "limited_account_hint.action": "Mostrar perfil de todos modos",
   "limited_account_hint.title": "Este perfil ha sido ocultado por los moderadores de {domain}.",
+  "link_preview.author": "Por {name}",
   "lists.account.add": "Añadir a lista",
   "lists.account.remove": "Quitar de lista",
   "lists.delete": "Borrar lista",
@@ -377,6 +391,7 @@
   "mute_modal.hide_notifications": "¿Ocultar notificaciones de este usuario?",
   "mute_modal.indefinite": "Indefinida",
   "navigation_bar.about": "Acerca de",
+  "navigation_bar.advanced_interface": "Abrir en la interfaz web avanzada",
   "navigation_bar.blocks": "Usuarios bloqueados",
   "navigation_bar.bookmarks": "Marcadores",
   "navigation_bar.community_timeline": "Cronología local",
@@ -386,6 +401,7 @@
   "navigation_bar.domain_blocks": "Dominios ocultos",
   "navigation_bar.edit_profile": "Editar perfil",
   "navigation_bar.explore": "Explorar",
+  "navigation_bar.favourites": "Favoritos",
   "navigation_bar.filters": "Palabras silenciadas",
   "navigation_bar.follow_requests": "Solicitudes para seguirte",
   "navigation_bar.followed_tags": "Etiquetas seguidas",
@@ -402,6 +418,7 @@
   "not_signed_in_indicator.not_signed_in": "Necesitas iniciar sesión para acceder a este recurso.",
   "notification.admin.report": "{name} informó {target}",
   "notification.admin.sign_up": "{name} se registró",
+  "notification.favourite": "{name} marcó como favorita tu publicación",
   "notification.follow": "{name} te empezó a seguir",
   "notification.follow_request": "{name} ha solicitado seguirte",
   "notification.mention": "{name} te ha mencionado",
@@ -415,6 +432,7 @@
   "notifications.column_settings.admin.report": "Nuevos informes:",
   "notifications.column_settings.admin.sign_up": "Nuevos registros:",
   "notifications.column_settings.alert": "Notificaciones de escritorio",
+  "notifications.column_settings.favourite": "Favoritos:",
   "notifications.column_settings.filter_bar.advanced": "Mostrar todas las categorías",
   "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido",
   "notifications.column_settings.filter_bar.show_bar": "Mostrar barra de filtros",
@@ -432,6 +450,7 @@
   "notifications.column_settings.update": "Ediciones:",
   "notifications.filter.all": "Todos",
   "notifications.filter.boosts": "Impulsos",
+  "notifications.filter.favourites": "Favoritos",
   "notifications.filter.follows": "Seguidores",
   "notifications.filter.mentions": "Menciones",
   "notifications.filter.polls": "Resultados de la votación",
@@ -582,6 +601,8 @@
   "server_banner.server_stats": "Estadísticas del servidor:",
   "sign_in_banner.create_account": "Crear cuenta",
   "sign_in_banner.sign_in": "Iniciar sesión",
+  "sign_in_banner.sso_redirect": "Iniciar sesión o Registrarse",
+  "sign_in_banner.text": "Inicia sesión para seguir perfiles o etiquetas, así como marcar como favoritas, compartir y responder a publicaciones. También puedes interactuar desde tu cuenta en un servidor diferente.",
   "status.admin_account": "Abrir interfaz de moderación para @{name}",
   "status.admin_domain": "Abrir interfaz de moderación para {domain}",
   "status.admin_status": "Abrir esta publicación en la interfaz de moderación",
@@ -598,6 +619,7 @@
   "status.edited": "Editado {date}",
   "status.edited_x_times": "Editado {count, plural, one {{count} vez} other {{count} veces}}",
   "status.embed": "Incrustado",
+  "status.favourite": "Favorito",
   "status.filter": "Filtrar esta publicación",
   "status.filtered": "Filtrado",
   "status.hide": "Ocultar publicación",
diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index 44d3c91220..b94787ea18 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -191,7 +191,6 @@
   "conversation.open": "Vaata vestlust",
   "conversation.with": "Koos {names}",
   "copypaste.copied": "Kopeeritud",
-  "copypaste.copy": "Kopeeri",
   "copypaste.copy_to_clipboard": "Kopeeri vahemällu",
   "directory.federated": "Tuntud födiversumist",
   "directory.local": "Ainult domeenilt {domain}",
@@ -296,6 +295,9 @@
   "hashtag.column_settings.tag_mode.any": "Mõni neist",
   "hashtag.column_settings.tag_mode.none": "Mitte ükski neist",
   "hashtag.column_settings.tag_toggle": "Kaasa lisamärked selle tulba jaoks",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} osalejaga} other {{counter} osalejaga}}",
+  "hashtag.counter_by_uses": "{count, plural, one {{counter} postitusega} other {{counter} postitusega}}",
+  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} postitust} other {{counter} postitust}} täna",
   "hashtag.follow": "Jälgi silti",
   "hashtag.unfollow": "Lõpeta sildi jälgimine",
   "home.actions.go_to_explore": "Vaata, mis on populaarne",
@@ -303,7 +305,7 @@
   "home.column_settings.basic": "Peamine",
   "home.column_settings.show_reblogs": "Näita jagamisi",
   "home.column_settings.show_replies": "Näita vastuseid",
-  "home.explore_prompt.body": "Sinu koduvoos on koos jälgimiseks valitud siltidega postitused, sinu jälgitavate inimeste postitused ja postitused, mida nad jagavad. Praegu paistab siin üsna vaikne olema, et kuidas oleks kui:",
+  "home.explore_prompt.body": "Sinu koduvoos on koos jälgimiseks valitud siltidega postitused, sinu jälgitavate inimeste postitused ja postitused, mida nad jagavad. Kui see tundub liiga vaikne, võid sa soovida:",
   "home.explore_prompt.title": "See on sinu kodubaas Mastodonis.",
   "home.hide_announcements": "Peida teadaanded",
   "home.show_announcements": "Kuva teadaandeid",
@@ -311,10 +313,13 @@
   "interaction_modal.description.follow": "Mastodoni kontoga saad jälgida kasutajat {name}, et tema postitusi oma koduvoos näha.",
   "interaction_modal.description.reblog": "Mastodoni kontoga saad seda postitust levitada, jagades seda oma jälgijatele.",
   "interaction_modal.description.reply": "Mastodoni kontoga saad sellele postitusele vastata.",
+  "interaction_modal.login.action": "Vii mind avalehele",
+  "interaction_modal.login.prompt": "Sinu koduserveri domeen, näiteks mastodon.social",
+  "interaction_modal.no_account_yet": "Pole Mastodonis?",
   "interaction_modal.on_another_server": "Teises serveris",
   "interaction_modal.on_this_server": "Selles serveris",
-  "interaction_modal.other_server_instructions": "Kopeeri ja kleebi see URL oma Mastodoni lemmikäpi või Mastodoni serveri veebiliidese otsinguväljale.",
-  "interaction_modal.preamble": "Kuna Mastodon on detsentraliseeritud, saab kasutada teises Mastodoni serveris olevat kontot või ka ühilduval platvormil, kui siin serveril kontot ei ole.",
+  "interaction_modal.sign_in": "Sa pole sellesse serverisse sisse logitud. Kus sinu konto asub?",
+  "interaction_modal.sign_in_hint": "Vihje: See on veebileht, millel sa registreerusid. Kui see ei meenu, otsi sisendkaustast tervitus-e-kirja. Võid sisestada ka oma täispika kasutajanime! (Näit. @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Lisa konto {name} postitus lemmikuks",
   "interaction_modal.title.follow": "Jälgi kontot {name}",
   "interaction_modal.title.reblog": "Jaga {name} postitust",
@@ -386,6 +391,7 @@
   "mute_modal.hide_notifications": "Kas peita teated sellelt kasutajalt?",
   "mute_modal.indefinite": "Lõpmatu",
   "navigation_bar.about": "Teave",
+  "navigation_bar.advanced_interface": "Ava kohandatud veebiliides",
   "navigation_bar.blocks": "Blokeeritud kasutajad",
   "navigation_bar.bookmarks": "Järjehoidjad",
   "navigation_bar.community_timeline": "Kohalik ajajoon",
@@ -444,6 +450,7 @@
   "notifications.column_settings.update": "Muudatused:",
   "notifications.filter.all": "Kõik",
   "notifications.filter.boosts": "Jagamised",
+  "notifications.filter.favourites": "Lemmikud",
   "notifications.filter.follows": "Jälgib",
   "notifications.filter.mentions": "Mainimised",
   "notifications.filter.polls": "Küsitluse tulemused",
@@ -594,6 +601,7 @@
   "server_banner.server_stats": "Serveri statistika:",
   "sign_in_banner.create_account": "Loo konto",
   "sign_in_banner.sign_in": "Logi sisse",
+  "sign_in_banner.sso_redirect": "Sisene või registreeru",
   "sign_in_banner.text": "Logi sisse, et jälgida profiile või silte, märkida lemmikuks, jagada ja vastata postitustele. Võid suhelda ka mõne teise serveri konto kaudu.",
   "status.admin_account": "Ava @{name} moderaatorivaates",
   "status.admin_domain": "Ava {domain} modeereerimisliides",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index 5a7a97f9a9..d5a7343bae 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -191,7 +191,6 @@
   "conversation.open": "Ikusi elkarrizketa",
   "conversation.with": "Hauekin: {names}",
   "copypaste.copied": "Kopiatuta",
-  "copypaste.copy": "Kopiatu",
   "copypaste.copy_to_clipboard": "Kopiatu arbelera",
   "directory.federated": "Fedibertso ezagunekoak",
   "directory.local": "{domain} domeinukoak soilik",
@@ -293,6 +292,9 @@
   "hashtag.column_settings.tag_mode.any": "Hautako edozein",
   "hashtag.column_settings.tag_mode.none": "Hauetako bat ere ez",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} parte-hartzaile} other {{counter} parte-hartzaile}}",
+  "hashtag.counter_by_uses": "{count, plural, one {{counter} argitalpen} other {{counter} argitalpen}}",
+  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} argitalpen} other {{counter} argitalpen}} gaur",
   "hashtag.follow": "Jarraitu traola",
   "hashtag.unfollow": "Utzi traola jarraitzeari",
   "home.actions.go_to_explore": "Ikusi zer dagoen pil-pilean",
@@ -300,16 +302,19 @@
   "home.column_settings.basic": "Oinarrizkoa",
   "home.column_settings.show_reblogs": "Erakutsi bultzadak",
   "home.column_settings.show_replies": "Erakutsi erantzunak",
-  "home.explore_prompt.body": "Zure hasierako jarioak jarraitzeko aukeratu dituzun traolen, jarraitzeko aukeratu duzun jendearen eta beraiek bultzatutako argitalpenen nahasketa bat edukiko du. Nahiko isila dirudi oraintxe, beraz, zergatik ez:",
   "home.explore_prompt.title": "Hau zure hasiera da Mastodonen.",
   "home.hide_announcements": "Ezkutatu iragarpenak",
   "home.show_announcements": "Erakutsi iragarpenak",
   "interaction_modal.description.follow": "Mastodon kontu batekin {name} jarraitu dezakezu bere bidalketak zure hasierako denbora lerroan jasotzeko.",
   "interaction_modal.description.reblog": "Mastodon kontu batekin bidalketa hau bultzatu dezakezu, zure jarraitzaileekin partekatzeko.",
   "interaction_modal.description.reply": "Mastodon kontu batekin bidalketa honi erantzun diezaiokezu.",
+  "interaction_modal.login.action": "Itzuli hasierara",
+  "interaction_modal.login.prompt": "Zure zerbitzariko domeinua, adib. mastodon.eus",
+  "interaction_modal.no_account_yet": "Oraindik ez duzu izena eman Mastodonen?",
   "interaction_modal.on_another_server": "Beste zerbitzari batean",
   "interaction_modal.on_this_server": "Zerbitzari honetan",
-  "interaction_modal.preamble": "Mastodon deszentralizatua denez, zerbitzari honetan konturik ez badaukazu, beste Mastodon zerbitzari batean edo bateragarria den plataforma batean ostatatutako kontua erabil dezakezu.",
+  "interaction_modal.sign_in": "Ez duzu saioa hasita zerbitzari honetan. Non dago zure kontua ostatatua?",
+  "interaction_modal.sign_in_hint": "Aholkua: Izena eman duzun zerbitzaria da. Ez baduzu gogoratzen, begiratu ongietorri-mezua zure sarrera-ontzian. Baita ere, zure erabiltzaile-izen osoa sar dezakezu! (adib. @Mastodon@mastodon.social)",
   "interaction_modal.title.follow": "Jarraitu {name}",
   "interaction_modal.title.reblog": "Bultzatu {name}(r)en bidalketa",
   "interaction_modal.title.reply": "Erantzun {name}(r)en bidalketari",
@@ -584,6 +589,7 @@
   "server_banner.server_stats": "Zerbitzariaren estatistikak:",
   "sign_in_banner.create_account": "Sortu kontua",
   "sign_in_banner.sign_in": "Hasi saioa",
+  "sign_in_banner.sso_redirect": "Hasi saioa edo izena eman",
   "status.admin_account": "Ireki @{name} erabiltzailearen moderazio interfazea",
   "status.admin_domain": "{domain}-(r)en moderazio-interfazea ireki",
   "status.admin_status": "Ireki bidalketa hau moderazio interfazean",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index 01ddb7565b..56f23009a3 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -190,7 +190,6 @@
   "conversation.open": "دیدن گفتگو",
   "conversation.with": "با {names}",
   "copypaste.copied": "رونوشت شد",
-  "copypaste.copy": "رونوشت",
   "copypaste.copy_to_clipboard": "رونوشت به تخته‌گیره",
   "directory.federated": "از کارسازهای شناخته‌شده",
   "directory.local": "تنها از {domain}",
@@ -302,7 +301,6 @@
   "home.column_settings.basic": "پایه‌ای",
   "home.column_settings.show_reblogs": "نمایش تقویت‌ها",
   "home.column_settings.show_replies": "نمایش پاسخ‌ها",
-  "home.explore_prompt.body": "خوراک خانگیتان ترکیبی از فرسته‌ها از برچسب‌هایی که برای پی‌گیری گزیده‌اید، افرادی که پی می‌گیرید و فرسته‌هایی که تقویت می‌کنند را خواهد داشت. در حال حاضر بسیار ساکت است؛ پس چه طور است:",
   "home.explore_prompt.title": "این پایگاه خانگیتان در ماستودون است.",
   "home.hide_announcements": "نهفتن اعلامیه‌ها",
   "home.show_announcements": "نمایش اعلامیه‌ها",
@@ -312,8 +310,6 @@
   "interaction_modal.description.reply": "با حسابی روی ماستودون می‌توانید به این فرسته پاسخ دهید.",
   "interaction_modal.on_another_server": "روی کارسازی دیگر",
   "interaction_modal.on_this_server": "روی این کارساز",
-  "interaction_modal.other_server_instructions": "این نشانی را رونویسی و در زمینهٔ جست‌وجوی کارهٔ دلخواه یا رابط وب کارساز ماستودونتان جایگذاری کنید.",
-  "interaction_modal.preamble": "از آن‌جا که ماستودون نامتمرکز است، می‌توانید در صورت نداشتن حساب روی این کارساز، از حساب موجود خودتان که روی کارساز ماستودون یا بن‌سازهٔ سازگار دیگری میزبانی می‌شود استفاده کنید.",
   "interaction_modal.title.favourite": "فرسته‌های برگزیدهٔ {name}",
   "interaction_modal.title.follow": "پیگیری {name}",
   "interaction_modal.title.reblog": "تقویت فرستهٔ {name}",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 814652e8be..2a09c2344d 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -52,7 +52,7 @@
   "account.mute_notifications_short": "Mykistä ilmoitukset",
   "account.mute_short": "Mykistä",
   "account.muted": "Mykistetty",
-  "account.no_bio": "Ei kuvausta.",
+  "account.no_bio": "Kuvausta ei ole annettu.",
   "account.open_original_page": "Avaa alkuperäinen sivu",
   "account.posts": "viesti(t)",
   "account.posts_with_replies": "Viestit ja vastaukset",
@@ -68,7 +68,7 @@
   "account.unendorse": "Poista suosittelu profiilistasi",
   "account.unfollow": "Lopeta seuraaminen",
   "account.unmute": "Poista käyttäjän @{name} mykistys",
-  "account.unmute_notifications_short": "Poista ilmoitusten mykistys",
+  "account.unmute_notifications_short": "Kumoa ilmoitusten mykistys",
   "account.unmute_short": "Poista mykistys",
   "account_note.placeholder": "Lisää muistiinpano napsauttamalla",
   "admin.dashboard.daily_retention": "Käyttäjän säilyminen rekisteröitymisen jälkeiseen päivään mennessä",
@@ -81,7 +81,7 @@
   "admin.impact_report.instance_follows": "Seuraajat, jotka heidän käyttäjänsä menettäisivät",
   "admin.impact_report.title": "Vaikutusten yhteenveto",
   "alert.rate_limited.message": "Yritä uudestaan {retry_time, time, medium} jälkeen.",
-  "alert.rate_limited.title": "Määrää rajoitettu",
+  "alert.rate_limited.title": "Pyyntömäärää rajoitettu",
   "alert.unexpected.message": "Tapahtui odottamaton virhe.",
   "alert.unexpected.title": "Hups!",
   "announcement.announcement": "Ilmoitus",
@@ -135,7 +135,7 @@
   "community.column_settings.remote_only": "Vain etätilit",
   "compose.language.change": "Vaihda kieli",
   "compose.language.search": "Hae kieliä...",
-  "compose.published.body": "Julkaisu lähetetty.",
+  "compose.published.body": "Julkaisusi julkaistiin.",
   "compose.published.open": "Avaa",
   "compose_form.direct_message_warning_learn_more": "Lisätietoja",
   "compose_form.encryption_warning": "Mastodonin viestit eivät ole päästä päähän salattuja. Älä jaa arkaluonteisia tietoja Mastodonissa.",
@@ -150,7 +150,7 @@
   "compose_form.poll.switch_to_multiple": "Muuta äänestys monivalinnaksi",
   "compose_form.poll.switch_to_single": "Muuta äänestys sallimaan vain yksi valinta",
   "compose_form.publish": "Julkaise",
-  "compose_form.publish_form": "Julkaise",
+  "compose_form.publish_form": "Uusi julkaisu",
   "compose_form.publish_loud": "{publish}!",
   "compose_form.save_changes": "Tallenna muutokset",
   "compose_form.sensitive.hide": "{count, plural, one {Merkitse media arkaluontoiseksi} other {Merkitse mediat arkaluontoiseksi}}",
@@ -181,7 +181,7 @@
   "confirmations.mute.explanation": "Tämä toiminto piilottaa heidän julkaisunsa sinulta – mukaan lukien ne, joissa heidät mainitaan – sallien heidän yhä nähdä julkaisusi ja seurata sinua.",
   "confirmations.mute.message": "Haluatko varmasti mykistää profiilin {name}?",
   "confirmations.redraft.confirm": "Poista & palauta muokattavaksi",
-  "confirmations.redraft.message": "Haluatko varmasti poistaa viestin ja tehdä siitä uuden luonnoksen? Suosikit ja tehostukset menetään, ja alkuperäisen viestisi vastaukset jäävät orvoiksi.",
+  "confirmations.redraft.message": "Haluatko varmasti poistaa viestin ja tehdä siitä luonnoksen? Suosikiksi lisäykset sekä tehostukset menetään, ja vastaukset alkuperäisviestiisi jäävät orvoiksi.",
   "confirmations.reply.confirm": "Vastaa",
   "confirmations.reply.message": "Jos vastaat nyt, vastaus korvaa tällä hetkellä työstämäsi viestin. Oletko varma, että haluat jatkaa?",
   "confirmations.unfollow.confirm": "Lopeta seuraaminen",
@@ -191,7 +191,6 @@
   "conversation.open": "Näytä keskustelu",
   "conversation.with": "{names} kanssa",
   "copypaste.copied": "Kopioitu",
-  "copypaste.copy": "Kopioi",
   "copypaste.copy_to_clipboard": "Kopioi leikepöydälle",
   "directory.federated": "Koko tunnettu fediverse",
   "directory.local": "Vain palvelusta {domain}",
@@ -201,10 +200,10 @@
   "disabled_account_banner.text": "Tilisi {disabledAccount} on tällä hetkellä poissa käytöstä.",
   "dismissable_banner.community_timeline": "Nämä ovat uusimmat julkiset julkaisut käyttäjiltä, joiden tilejä isännöi {domain}.",
   "dismissable_banner.dismiss": "Hylkää",
-  "dismissable_banner.explore_links": "Näistä uutisista puhuvat ihmiset juuri nyt tällä ja muilla hajautetun verkon palvelimilla.",
-  "dismissable_banner.explore_statuses": "Nämä ovat sosiaalisen verkon viestejä, jotka keräävät huomiota tänään. Uudemmat ja enemmän tehostetut viestit, ja suosikit rankataan korkeammalle.",
+  "dismissable_banner.explore_links": "Näistä uutisista puhutaan juuri nyt tällä ja muilla hajautetun verkon palvelimilla.",
+  "dismissable_banner.explore_statuses": "Nämä ovat tänään huomiota keräävimpiä sosiaalisen verkon julkaisuja. Tuoreimmat, tehostetuimmat sekä suosikeiksi merkityimmät sijoitetaan listauksessa korkeammalle.",
   "dismissable_banner.explore_tags": "Nämä aihetunnisteet saavat juuri nyt vetovoimaa tällä ja muilla hajautetun verkon palvelimilla olevien ihmisten keskuudessa.",
-  "dismissable_banner.public_timeline": "Nämä ovat viimeisimmät julkiset viestit sosiaalisen verkon ihmisiltä, joita {domain} käyttäjät seuraa.",
+  "dismissable_banner.public_timeline": "Nämä ovat viimeisimpiä julkaisuja sosiaalisen verkon käyttäjiltä, joita seurataan palvelussa {domain}.",
   "embed.instructions": "Upota julkaisu verkkosivullesi kopioimalla alla oleva koodi.",
   "embed.preview": "Se tulee näyttämään tältä:",
   "emoji_button.activity": "Aktiviteetit",
@@ -232,11 +231,11 @@
   "empty_column.domain_blocks": "Palveluita ei ole vielä estetty.",
   "empty_column.explore_statuses": "Mikään ei trendaa nyt. Tarkista myöhemmin uudelleen!",
   "empty_column.favourited_statuses": "Sinulla ei ole vielä yhtään suosikkiviestiä. Kun lisäät yhden, näkyy se tässä.",
-  "empty_column.favourites": "Kukaan ei ole vielä lisännyt tätä viestiä suosikkeihinsa. Kun joku on lisännyt, näkyy hän tässä.",
+  "empty_column.favourites": "Kukaan ei ole vielä merkinnyt tätä viestiä suosikiksi. Kun joku tekee niin, näkyy asia täällä.",
   "empty_column.follow_requests": "Et ole vielä vastaanottanut seurauspyyntöjä. Saamasi pyynnöt näytetään täällä.",
   "empty_column.followed_tags": "Et ole vielä ottanut yhtään aihetunnistetta seurattavaksesi. Jos tai kun sitten teet niin, ne listautuvat tänne.",
   "empty_column.hashtag": "Tällä aihetunnisteella ei ole vielä mitään.",
-  "empty_column.home": "Kotisi aikajana on tyhjä! Seuraa lisää ihmisiä täyttääksesi sen. {suggestions}",
+  "empty_column.home": "Kotiaikajanasi on tyhjä! Seuraa useampia henkilöjä, niin näet enemmän sisältöä.",
   "empty_column.list": "Tässä luettelossa ei ole vielä mitään. Kun tämän luettelon jäsenet julkaisevat uusia viestejä, ne näkyvät täällä.",
   "empty_column.lists": "Sinulla ei ole vielä yhtään listaa. Kun luot sellaisen, näkyy se tässä.",
   "empty_column.mutes": "Et ole mykistänyt vielä yhtään käyttäjää.",
@@ -296,26 +295,32 @@
   "hashtag.column_settings.tag_mode.any": "Mikä tahansa näistä",
   "hashtag.column_settings.tag_mode.none": "Ei mitään näistä",
   "hashtag.column_settings.tag_toggle": "Sisällytä lisätunnisteet tähän sarakkeeseen",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} osallistuja} other {{counter} osallistujaa}}",
+  "hashtag.counter_by_uses": "{count, plural, one{{counter} julkaisu} other {{counter} julkaisua}}",
+  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} julkaisu} other {{counter} julkaisua}} tänään",
   "hashtag.follow": "Seuraa aihetunnistetta",
   "hashtag.unfollow": "Lopeta aihetunnisteen seuraaminen",
-  "home.actions.go_to_explore": "Näe mitä tapahtuu",
+  "home.actions.go_to_explore": "Katso, mikä on suosittua",
   "home.actions.go_to_suggestions": "Löydä seurattavia käyttäjiä",
   "home.column_settings.basic": "Perusasetukset",
   "home.column_settings.show_reblogs": "Näytä tehostukset",
   "home.column_settings.show_replies": "Näytä vastaukset",
-  "home.explore_prompt.body": "Kotisyötteesi on sekoitus seuraamistasi aihetunnisteista ja käyttäjistä sekä heidän tehostamistaan viesteistä. Se näyttää tällä hetkellä varsin hiljaiselta, joten mitäpä jos:",
-  "home.explore_prompt.title": "Tämä on kotitukikohtasi Mastodonissa.",
+  "home.explore_prompt.body": "Kotisyötteesi on sekoitus seuraamistasi aihetunnisteista ja käyttäjistä sekä heidän tehostamistaan viesteistä. Jos se näyttää tällä hetkellä turhan hiljaiselta, saatat haluta:",
+  "home.explore_prompt.title": "Tämä on tukikohtasi Mastodonissa.",
   "home.hide_announcements": "Piilota ilmoitukset",
   "home.show_announcements": "Näytä ilmoitukset",
-  "interaction_modal.description.favourite": "Mastodon-tilillä voit lisätä viestin suosikkeihisi näyttääksesi sen kirjoittajalle arvostavasi sitä ja tallentaaksesi sen tulevaisuutta varten.",
+  "interaction_modal.description.favourite": "Mastodon-tilisi myötä voit merkitä julkaisuja suosikeiksi, jolloin osoitat julkaisijoille arvostavasi sisältöä, ja tallennat sitä myös helpommin saatavillesi jatkossa.",
   "interaction_modal.description.follow": "Kun sinulla on Mastodon-tili, voit seurata käyttäjää {name} nähdäksesi hänen viestinsä kotisyötteessäsi.",
   "interaction_modal.description.reblog": "Kun sinulla on tili Mastodonissa, voit tehostaa viestiä ja jakaa sen omien seuraajiesi kanssa.",
   "interaction_modal.description.reply": "Kun sinulla on tili Mastodonissa, voit vastata tähän viestiin.",
+  "interaction_modal.login.action": "Palaa aloitussivulle",
+  "interaction_modal.login.prompt": "Kotipalvelimesi verkkotunnus (kuten mastodon.social)",
+  "interaction_modal.no_account_yet": "Etkö ole vielä Mastodonissa?",
   "interaction_modal.on_another_server": "Toisella palvelimella",
   "interaction_modal.on_this_server": "Tällä palvelimella",
-  "interaction_modal.other_server_instructions": "Kopioi ja liitä tämä URL-osoite käyttämäsi Mastodon-sovelluksen tai Mastodon-palvelimen verkkosivuston hakukenttään.",
-  "interaction_modal.preamble": "Koska Mastodon on hajautettu, voit käyttää toisen Mastodon-palvelimen tai yhteensopivan alustan ylläpitämää tiliäsi, jos sinulla ei ole tiliä tällä palvelimella.",
-  "interaction_modal.title.favourite": "Lisää käyttäjän {name} viesti suosikkeihin",
+  "interaction_modal.sign_in": "Et ole kirjautunut tälle palvelimelle. Millä palvelimella tilisi sijaitsee?",
+  "interaction_modal.sign_in_hint": "Vihje: Se on sama verkkosivusto, jolla loit tilisi. Jos et muista, etsi tervetuliaissähköpostia saapuneista viesteistäsi. Voit myös syöttää koko käyttäjätunnuksesi! (Esimerkki: @Mastodon@mastodon.social)",
+  "interaction_modal.title.favourite": "Lisää käyttäjän {name} julkaisu suosikkeihin",
   "interaction_modal.title.follow": "Seuraa {name}",
   "interaction_modal.title.reblog": "Tehosta käyttäjän {name} viestiä",
   "interaction_modal.title.reply": "Vastaa käyttäjän {name} viestiin",
@@ -331,7 +336,7 @@
   "keyboard_shortcuts.direct": "avataksesi yksityisten mainintojen sarakkeen",
   "keyboard_shortcuts.down": "Siirry listassa alaspäin",
   "keyboard_shortcuts.enter": "Avaa julkaisu",
-  "keyboard_shortcuts.favourite": "Lisää viesti suosikkeihin",
+  "keyboard_shortcuts.favourite": "Lisää julkaisu suosikkeihin",
   "keyboard_shortcuts.favourites": "Avaa suosikkilista",
   "keyboard_shortcuts.federated": "Avaa yleinen aikajana",
   "keyboard_shortcuts.heading": "Pikanäppäimet",
@@ -369,7 +374,7 @@
   "lists.delete": "Poista lista",
   "lists.edit": "Muokkaa listaa",
   "lists.edit.submit": "Vaihda otsikko",
-  "lists.exclusive": "Piilota nämä viestit kotoasi",
+  "lists.exclusive": "Piilota nämä julkaisut kotiaikajanaltasi",
   "lists.new.create": "Lisää lista",
   "lists.new.title_placeholder": "Uuden listan nimi",
   "lists.replies_policy.followed": "Jokainen seurattu käyttäjä",
@@ -386,7 +391,7 @@
   "mute_modal.hide_notifications": "Piilota tältä käyttäjältä tulevat ilmoitukset?",
   "mute_modal.indefinite": "Ikuisesti",
   "navigation_bar.about": "Tietoja",
-  "navigation_bar.advanced_interface": "Avaa edistyneessä käyttöliittymässä",
+  "navigation_bar.advanced_interface": "Avaa edistyneessä selainkäyttöliittymässä",
   "navigation_bar.blocks": "Estetyt käyttäjät",
   "navigation_bar.bookmarks": "Kirjanmerkit",
   "navigation_bar.community_timeline": "Paikallinen aikajana",
@@ -413,12 +418,12 @@
   "not_signed_in_indicator.not_signed_in": "Sinun on kirjauduttava sisään käyttääksesi resurssia.",
   "notification.admin.report": "{name} teki ilmoituksen käytäjästä {target}",
   "notification.admin.sign_up": "{name} rekisteröityi",
-  "notification.favourite": "{name} lisäsi viestisi suosikkeihinsa",
+  "notification.favourite": "{name} lisäsi julkaisusi suosikkeihinsa",
   "notification.follow": "{name} seurasi sinua",
   "notification.follow_request": "{name} haluaa seurata sinua",
   "notification.mention": "{name} mainitsi sinut",
   "notification.own_poll": "Äänestyksesi on päättynyt",
-  "notification.poll": "Kysely, johon osallistuit, on päättynyt",
+  "notification.poll": "Äänestys, johon osallistuit, on päättynyt",
   "notification.reblog": "{name} tehosti viestiäsi",
   "notification.status": "{name} julkaisi juuri viestin",
   "notification.update": "{name} muokkasi viestiä",
@@ -461,8 +466,8 @@
   "notifications_permission_banner.title": "Älä anna minkään mennä ohi",
   "onboarding.action.back": "Palaa takaisin",
   "onboarding.actions.back": "Palaa takaisin",
-  "onboarding.actions.go_to_explore": "Katso, mikä on trendikästä",
-  "onboarding.actions.go_to_home": "Siirry kotisyötteeseesi",
+  "onboarding.actions.go_to_explore": "Siirry suosituimpien aiheiden syötteeseen",
+  "onboarding.actions.go_to_home": "Siirry kotisyötteeseen",
   "onboarding.compose.template": "Tervehdys #Mastodon!",
   "onboarding.follows.empty": "Valitettavasti tuloksia ei voida näyttää juuri nyt. Voit kokeilla hakua tai selata tutustumissivua löytääksesi seurattavaa, tai yrittää myöhemmin uudelleen.",
   "onboarding.follows.lead": "Kokoat oman kotisyötteesi itse. Mitä enemmän ihmisiä seuraat, sitä aktiivisempi ja kiinnostavampi syöte on. Nämä profiilit voivat olla alkuun hyvä lähtökohta — voit aina lopettaa niiden seuraamisen myöhemmin!",
@@ -471,17 +476,17 @@
   "onboarding.share.message": "Olen {username} #Mastodon'issa! Seuraa minua osoitteessa {url}",
   "onboarding.share.next_steps": "Mahdolliset seuraavat vaiheet:",
   "onboarding.share.title": "Jaa profiilisi",
-  "onboarding.start.lead": "Uusi Mastodon-tilisi on valmiina käyttöön. Näin hyödyt siitä eniten:",
-  "onboarding.start.skip": "Haluatko hypätä suoraan eteenpäin?",
+  "onboarding.start.lead": "Uusi Mastodon-tilisi on nyt valmiina käyttöön. Kyseessä on ainutlaatuinen, hajautettu sosiaalisen median alusta, jolla sinä itse – algoritmin sijaan – määrität käyttökokemuksesi. Näin hyödyt Mastodonista eniten:",
+  "onboarding.start.skip": "Haluatko hypätä suoraan eteenpäin ilman alkuunpääsyohjeistuksia?",
   "onboarding.start.title": "Olet tehnyt sen!",
-  "onboarding.steps.follow_people.body": "Kokoat oman syötteesi itse. Täytetään se kiinnostavilla henkilöillä.",
-  "onboarding.steps.follow_people.title": "Seurattu {count, plural, one {henkilö} other {# henkilöä}}",
-  "onboarding.steps.publish_status.body": "Sano tervehdys maailmalle.",
+  "onboarding.steps.follow_people.body": "Mastodon perustuu sinua kiinnostavien henkilöjen julkaisujen seuraamiseen.",
+  "onboarding.steps.follow_people.title": "Mukauta kotisyötteesi",
+  "onboarding.steps.publish_status.body": "Tervehdi maailmaa sanoin, kuvin tai äänestyksin {emoji}",
   "onboarding.steps.publish_status.title": "Laadi ensimmäinen julkaisusi",
-  "onboarding.steps.setup_profile.body": "Kun profiilisi on täytetty, muut ovat helpommin yhteyksissä sinun kanssasi.",
-  "onboarding.steps.setup_profile.title": "Muokkaa profiiliasi",
-  "onboarding.steps.share_profile.body": "Kerro ystävillesi, kuinka sinut löytää Mastodonista!",
-  "onboarding.steps.share_profile.title": "Jaa profiilisi",
+  "onboarding.steps.setup_profile.body": "Täydentämällä profiilisi tietoja tehostat vuorovaikutteisuutta.",
+  "onboarding.steps.setup_profile.title": "Mukauta profiiliasi",
+  "onboarding.steps.share_profile.body": "Kerro kavereillesi, kuinka sinut löytää Mastodonista",
+  "onboarding.steps.share_profile.title": "Jaa Mastodon-profiilisi",
   "onboarding.tips.2fa": "<strong>Tiesitkö?</strong> Voit lisäsuojata tiliäsi ottamalla kaksivaiheisen todennuksen käyttöön palvelun tiliasetuksista. Ominaisuus toimii haluamasi TOTP-todennussovelluksen avulla, eikä käyttö edellytä puhelinnumeron antamista!",
   "onboarding.tips.accounts_from_other_servers": "<strong>Tiesitkö?</strong> Koska Mastodon kuuluu hajautettuun verkkoon, osa kohtaamistasi profiileista sijaitsee muilla palvelimilla kuin sinun. Voit silti viestiä saumattomasti heidän kanssaan! Heidän palvelimensa ilmaistaan käyttäjänimen perässä!",
   "onboarding.tips.migration": "<strong>Tiesitkö?</strong> Jos koet, ettei {domain} ole jatkossa itsellesi hyvä palvelinvalinta, voit siirtyä toiselle Mastodon-palvelimelle menettämättä seuraajiasi. Voit jopa isännöidä omaa palvelintasi!",
@@ -544,8 +549,8 @@
   "report.placeholder": "Lisäkommentit",
   "report.reasons.dislike": "En pidä siitä",
   "report.reasons.dislike_description": "Et halua nähdä sitä",
-  "report.reasons.legal": "Se on laiton",
-  "report.reasons.legal_description": "Uskot sen rikkovan oman maasi tai palvelimen maan lakeja",
+  "report.reasons.legal": "Se on laitonta",
+  "report.reasons.legal_description": "Katsot sisällön rikkovan maasi tai palvelimen kotimaan lakeja",
   "report.reasons.other": "Jotain muuta",
   "report.reasons.other_description": "Ongelma ei sovi muihin kategorioihin",
   "report.reasons.spam": "Se on roskapostia",
@@ -596,7 +601,8 @@
   "server_banner.server_stats": "Palvelimen tilastot:",
   "sign_in_banner.create_account": "Luo tili",
   "sign_in_banner.sign_in": "Kirjaudu",
-  "sign_in_banner.text": "Kirjaudu sisään seurataksesi profiileja tai aihetunnisteita, lisätäksesi suosikkeja, jakaaksesi viestejä ja vastataksesi niihin. Voit myös vuorovaikuttaa myös eri palvelimilla olevilta tileiltäsi.",
+  "sign_in_banner.sso_redirect": "Kirjaudu tai rekisteröidy",
+  "sign_in_banner.text": "Kirjaudu sisään seurataksesi profiileja tai aihetunnisteita, merkitäksesi julkaisuja suosikeiksi, julkaistaksesi sekä vastataksesi julkaisuihin. Voit vuorovaikuttaa myös eri palvelimella sijaitsevalta tililtäsi.",
   "status.admin_account": "Avaa moderaattorinäkymä tilistä @{name}",
   "status.admin_domain": "Avaa palvelimen {domain} moderointitoiminnot",
   "status.admin_status": "Avaa viesti moderointinäkymässä",
@@ -613,15 +619,15 @@
   "status.edited": "Muokattu {date}",
   "status.edited_x_times": "Muokattu {count, plural, one {{count} kerran} other {{count} kertaa}}",
   "status.embed": "Upota",
-  "status.favourite": "Suosikki",
+  "status.favourite": "Merkitse suosikiksi",
   "status.filter": "Suodata tämä viesti",
   "status.filtered": "Suodatettu",
   "status.hide": "Piilota julkaisu",
   "status.history.created": "{name} luotu {date}",
   "status.history.edited": "{name} muokkasi {date}",
   "status.load_more": "Lataa lisää",
-  "status.media.open": "Avaa napsauttamalla",
-  "status.media.show": "Näytä napsauttamalla",
+  "status.media.open": "Napsauta avataksesi",
+  "status.media.show": "Napsauta näyttääksesi",
   "status.media_hidden": "Media piilotettu",
   "status.mention": "Mainitse @{name}",
   "status.more": "Lisää",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index 87a47b3756..6e4ff2d9e0 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -191,7 +191,6 @@
   "conversation.open": "Vís samrøðu",
   "conversation.with": "Við {names}",
   "copypaste.copied": "Avritað",
-  "copypaste.copy": "Avrita",
   "copypaste.copy_to_clipboard": "Avrita til setiborðið",
   "directory.federated": "Frá tí kenda fediversinum",
   "directory.local": "Einans frá {domain}",
@@ -296,6 +295,9 @@
   "hashtag.column_settings.tag_mode.any": "Okkurt av hesum",
   "hashtag.column_settings.tag_mode.none": "Einki av hesum",
   "hashtag.column_settings.tag_toggle": "Legg frámerki afturat hesum teigi",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} luttakari} other {{counter} luttakarar}}",
+  "hashtag.counter_by_uses": "{count, plural, one {{counter} postur} other {{counter} postar}}",
+  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} postur} other {{counter} postar}} í dag",
   "hashtag.follow": "Fylg frámerki",
   "hashtag.unfollow": "Gevst at fylgja frámerki",
   "home.actions.go_to_explore": "Sí rákið",
@@ -303,7 +305,7 @@
   "home.column_settings.basic": "Grundleggjandi",
   "home.column_settings.show_reblogs": "Vís lyft",
   "home.column_settings.show_replies": "Vís svar",
-  "home.explore_prompt.body": "Heimarásin fer at hava eitt bland av postum frá frámerkjunum, sum tú hevur valt at fylgja, brúkarunum, tú hevur valt at fylgja, og postunum, sum tey stimbra. Tað sær rættiliga kvirt út í løtuni, so hvat við at:",
+  "home.explore_prompt.body": "Heimarásin fer at hava eitt bland av postum frá frámerkjunum, sum tú hevur valt at fylgja, brúkarunum, tú hevur valt at fylgja, og postunum, sum tey stimbra. Um tað kennist ov friðarligt, so kanst tú:",
   "home.explore_prompt.title": "Hetta er tín heimastøð í Mastodon.",
   "home.hide_announcements": "Fjal kunngerðir",
   "home.show_announcements": "Vís kunngerðir",
@@ -311,10 +313,13 @@
   "interaction_modal.description.follow": "Við eini kontu á Mastodon kanst tú fylgja {name} fyri at síggja teirra postar á tíni heimarás.",
   "interaction_modal.description.reblog": "Við eini kontu á Mastodon kanst tú stimbra hendan postin og soleiðis deila hann við tínar fylgjarar.",
   "interaction_modal.description.reply": "Við eini kontu á Mastodon, so kanst tú svara hesum posti.",
+  "interaction_modal.login.action": "Tak meg heim",
+  "interaction_modal.login.prompt": "Navnaøki hjá tínum heimaambætara, t.d. mastodon.social",
+  "interaction_modal.no_account_yet": "Ikki á Mastodon?",
   "interaction_modal.on_another_server": "Á øðrum ambætara",
   "interaction_modal.on_this_server": "Á hesum ambætaranum",
-  "interaction_modal.other_server_instructions": "Kopiera og set hendan URLin inn í leititeigin í tíni yndis-Mastodon-app ella í vev-markamótið á tínum Mastodon-ambætara.",
-  "interaction_modal.preamble": "Av tí at Mastodon er desentraliserað, kanst tú brúka tína kontu frá einum øðrum Mastodon ambætara ella sambærligum palli, um tú ikki hevur eina kontu á hesum ambætaranum.",
+  "interaction_modal.sign_in": "Tú er ikki ritað/ur inn á hesum ambætaranum. Hvar er kontan hjá tær hýst?",
+  "interaction_modal.sign_in_hint": "Góð ráð: tað er heimasíðan, har tú lat teg skráseta. Minnist tú ikki, so kanst tú leita eftir vælkomin-teldubrævinum í innbakkanum hjá tær. Tú kanst eisini innlesa fulla brúkaranavnið hjá tær! (t.d. @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Dáma postin hjá {name}",
   "interaction_modal.title.follow": "Fylg {name}",
   "interaction_modal.title.reblog": "Stimbra postin hjá {name}",
@@ -596,6 +601,7 @@
   "server_banner.server_stats": "Ambætarahagtøl:",
   "sign_in_banner.create_account": "Stovna kontu",
   "sign_in_banner.sign_in": "Rita inn",
+  "sign_in_banner.sso_redirect": "Rita inn ella Skráset teg",
   "sign_in_banner.text": "Innrita fyri at fylgja vangum og frámerkjum, dáma, deila og svara postum. Tú kanst eisini brúka kontuna til at samvirka á einum øðrum ambætara.",
   "status.admin_account": "Lat kjakleiðaramarkamót upp fyri @{name}",
   "status.admin_domain": "Lat umsjónarmarkamót upp fyri {domain}",
diff --git a/app/javascript/mastodon/locales/fr-QC.json b/app/javascript/mastodon/locales/fr-QC.json
index 547d9a773f..2278818b12 100644
--- a/app/javascript/mastodon/locales/fr-QC.json
+++ b/app/javascript/mastodon/locales/fr-QC.json
@@ -191,7 +191,6 @@
   "conversation.open": "Afficher cette conversation",
   "conversation.with": "Avec {names}",
   "copypaste.copied": "Copié",
-  "copypaste.copy": "Copier",
   "copypaste.copy_to_clipboard": "Copier dans le presse-papiers",
   "directory.federated": "D'un fediverse connu",
   "directory.local": "De {domain} seulement",
@@ -296,6 +295,9 @@
   "hashtag.column_settings.tag_mode.any": "Au moins un de ceux-ci",
   "hashtag.column_settings.tag_mode.none": "Aucun de ceux-ci",
   "hashtag.column_settings.tag_toggle": "Inclure des hashtags additionnels pour cette colonne",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} participant} other {{counter} participants}}",
+  "hashtag.counter_by_uses": "{count, plural, one {{counter} message} other {{counter} messages}}",
+  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} message} other {{counter} messages}} aujourd’hui",
   "hashtag.follow": "Suivre ce hashtag",
   "hashtag.unfollow": "Ne plus suivre ce hashtag",
   "home.actions.go_to_explore": "Voir les tendances",
@@ -303,7 +305,7 @@
   "home.column_settings.basic": "Basique",
   "home.column_settings.show_reblogs": "Afficher boosts",
   "home.column_settings.show_replies": "Afficher réponses",
-  "home.explore_prompt.body": "Votre fil d'actualité aura un mélange de publications depuis les hashtags que vous avez choisi de suivre, les personnes que vous avez choisi de suivre, et les publications qu'elles boostent. C'est plutôt calme en ce moment, alors que dites-vous de:",
+  "home.explore_prompt.body": "Votre fil d'actualité aura un mélange de messages depuis les hashtags que vous avez choisi de suivre, les personnes que vous avez choisi de suivre, et les messages qu'ils boostent. Si ça vous semble trop calme à votre goût, n’hésitez pas à :",
   "home.explore_prompt.title": "C'est chez vous dans Mastadon.",
   "home.hide_announcements": "Masquer les annonces",
   "home.show_announcements": "Afficher annonces",
@@ -311,10 +313,13 @@
   "interaction_modal.description.follow": "Avec un compte Mastodon, vous pouvez suivre {name} et recevoir leurs publications dans votre fil d'accueil.",
   "interaction_modal.description.reblog": "Avec un compte Mastodon, vous pouvez booster cette publication pour la partager avec vos propres abonné·e·s.",
   "interaction_modal.description.reply": "Avec un compte sur Mastodon, vous pouvez répondre à cette publication.",
+  "interaction_modal.login.action": "Aller à mon serveur",
+  "interaction_modal.login.prompt": "Domaine de votre serveur, ex. mastodon.social",
+  "interaction_modal.no_account_yet": "Pas sur Mastodon ?",
   "interaction_modal.on_another_server": "Sur un autre serveur",
   "interaction_modal.on_this_server": "Sur ce serveur",
-  "interaction_modal.other_server_instructions": "Copiez et collez cet URL dans le champ de recherche de votre application Mastodon préférée ou de l'interface web de votre serveur Mastodon.",
-  "interaction_modal.preamble": "Puisque Mastodon est décentralisé, vous pouvez utiliser votre compte existant hébergé par un autre serveur Mastodon ou une plateforme compatible si vous n'avez pas de compte sur celui-ci.",
+  "interaction_modal.sign_in": "Vous n’êtes pas connectés sur ce serveur. Où est hébergé votre compte ?",
+  "interaction_modal.sign_in_hint": "Astuce : c'est le site web sur lequel vous vous êtes inscrit. Si vous ne vous en souvenez pas, cherchez le courriel de bienvenue dans votre boîte de réception. Vous pouvez aussi indiquer votre nom d’utilisateur complet ! (par ex. @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Ajouter la publication de {name} aux favoris",
   "interaction_modal.title.follow": "Suivre {name}",
   "interaction_modal.title.reblog": "Booster la publication de {name}",
@@ -596,6 +601,7 @@
   "server_banner.server_stats": "Statistiques du serveur:",
   "sign_in_banner.create_account": "Créer un compte",
   "sign_in_banner.sign_in": "Se connecter",
+  "sign_in_banner.sso_redirect": "Se connecter ou s’inscrire",
   "sign_in_banner.text": "Identifiez-vous pour suivre des profils ou des hashtags, ajouter des favoris, partager et répondre à des publications. Vous pouvez également interagir depuis votre compte sur un autre serveur.",
   "status.admin_account": "Ouvrir l’interface de modération pour @{name}",
   "status.admin_domain": "Ouvrir l’interface de modération pour {domain}",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 00025b20a5..2bef3bb4b3 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -38,7 +38,7 @@
   "account.following_counter": "{count, plural, one {{counter} Abonnement} other {{counter} Abonnements}}",
   "account.follows.empty": "Cet·te utilisateur·rice ne suit personne pour l’instant.",
   "account.follows_you": "Vous suit",
-  "account.go_to_profile": "Voir le profil",
+  "account.go_to_profile": "Aller au profil",
   "account.hide_reblogs": "Masquer les partages de @{name}",
   "account.in_memoriam": "En mémoire de.",
   "account.joined_short": "Ici depuis",
@@ -50,9 +50,9 @@
   "account.moved_to": "{name} a indiqué que son nouveau compte est maintenant :",
   "account.mute": "Masquer @{name}",
   "account.mute_notifications_short": "Désactiver les alertes",
-  "account.mute_short": "Mettre en sourdine",
+  "account.mute_short": "Masquer",
   "account.muted": "Masqué·e",
-  "account.no_bio": "Aucune description enregistrée.",
+  "account.no_bio": "Aucune description fournie.",
   "account.open_original_page": "Ouvrir la page d'origine",
   "account.posts": "Messages",
   "account.posts_with_replies": "Messages et réponses",
@@ -191,7 +191,6 @@
   "conversation.open": "Afficher la conversation",
   "conversation.with": "Avec {names}",
   "copypaste.copied": "Copié",
-  "copypaste.copy": "Copier",
   "copypaste.copy_to_clipboard": "Copier dans le presse-papiers",
   "directory.federated": "Du fédiverse connu",
   "directory.local": "De {domain} seulement",
@@ -296,6 +295,9 @@
   "hashtag.column_settings.tag_mode.any": "Au moins un de ces éléments",
   "hashtag.column_settings.tag_mode.none": "Aucun de ces éléments",
   "hashtag.column_settings.tag_toggle": "Inclure des hashtags additionnels pour cette colonne",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} participant} other {{counter} participants}}",
+  "hashtag.counter_by_uses": "{count, plural, one {{counter} message} other {{counter} messages}}",
+  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} message} other {{counter} messages}} aujourd’hui",
   "hashtag.follow": "Suivre le hashtag",
   "hashtag.unfollow": "Ne plus suivre le hashtag",
   "home.actions.go_to_explore": "Voir les tendances",
@@ -303,7 +305,7 @@
   "home.column_settings.basic": "Basique",
   "home.column_settings.show_reblogs": "Afficher les partages",
   "home.column_settings.show_replies": "Afficher les réponses",
-  "home.explore_prompt.body": "Votre fil d'actualité aura un mélange de messages depuis les hashtags que vous avez choisi de suivre, les personnes que vous avez choisi de suivre, et les messages qu'ils boostent. Cela a l'air assez calme en ce moment, alors comment :",
+  "home.explore_prompt.body": "Votre fil d'actualité aura un mélange de messages depuis les hashtags que vous avez choisi de suivre, les personnes que vous avez choisi de suivre, et les messages qu'ils boostent. Si ça vous semble trop calme à votre goût, n’hésitez pas à :",
   "home.explore_prompt.title": "C'est votre page d'accueil dans Mastodon.",
   "home.hide_announcements": "Masquer les annonces",
   "home.show_announcements": "Afficher les annonces",
@@ -311,10 +313,13 @@
   "interaction_modal.description.follow": "Avec un compte Mastodon, vous pouvez suivre {name} et recevoir leurs posts dans votre fil d'actualité.",
   "interaction_modal.description.reblog": "Avec un compte sur Mastodon, vous pouvez partager ce message pour le faire découvrir à vos propres abonné⋅e⋅s.",
   "interaction_modal.description.reply": "Avec un compte sur Mastodon, vous pouvez répondre à ce message.",
+  "interaction_modal.login.action": "Aller à mon serveur",
+  "interaction_modal.login.prompt": "Domaine de votre serveur, ex. mastodon.social",
+  "interaction_modal.no_account_yet": "Pas sur Mastodon ?",
   "interaction_modal.on_another_server": "Sur un autre serveur",
   "interaction_modal.on_this_server": "Sur ce serveur",
-  "interaction_modal.other_server_instructions": "Copiez et collez cette URL dans le champ de recherche de votre application Mastodon préférée ou de l'interface web de votre serveur Mastodon.",
-  "interaction_modal.preamble": "Mastodon étant décentralisé, vous pouvez utiliser votre compte existant sur un autre serveur Mastodon, ou sur une autre plateforme compatible, si vous n'avez pas de compte ici.",
+  "interaction_modal.sign_in": "Vous n’êtes pas connectés sur ce serveur. Où est hébergé votre compte ?",
+  "interaction_modal.sign_in_hint": "Astuce : c'est le site web sur lequel vous vous êtes inscrit. Si vous ne vous en souvenez pas, cherchez le courriel de bienvenue dans votre boîte de réception. Vous pouvez aussi indiquer votre nom d’utilisateur complet ! (par ex. @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Ajouter le message de {name} aux favoris",
   "interaction_modal.title.follow": "Suivre {name}",
   "interaction_modal.title.reblog": "Partager le message de {name}",
@@ -596,6 +601,7 @@
   "server_banner.server_stats": "Statistiques du serveur :",
   "sign_in_banner.create_account": "Créer un compte",
   "sign_in_banner.sign_in": "Se connecter",
+  "sign_in_banner.sso_redirect": "Se connecter ou s’inscrire",
   "sign_in_banner.text": "Identifiez-vous pour suivre des profils ou des hashtags, ajouter des favoris, partager et répondre à des messages. Vous pouvez également interagir depuis votre compte sur un autre serveur.",
   "status.admin_account": "Ouvrir l’interface de modération pour @{name}",
   "status.admin_domain": "Ouvrir l’interface de modération pour {domain}",
diff --git a/app/javascript/mastodon/locales/fy.json b/app/javascript/mastodon/locales/fy.json
index d6bfba9eec..299c155c4f 100644
--- a/app/javascript/mastodon/locales/fy.json
+++ b/app/javascript/mastodon/locales/fy.json
@@ -189,7 +189,6 @@
   "conversation.open": "Petear toane",
   "conversation.with": "Mei {names}",
   "copypaste.copied": "Kopiearre",
-  "copypaste.copy": "Kopiearje",
   "copypaste.copy_to_clipboard": "Nei klamboerd kopiearje",
   "directory.federated": "Fediverse (wat bekend is)",
   "directory.local": "Allinnich fan {domain}",
@@ -298,7 +297,6 @@
   "home.column_settings.basic": "Algemien",
   "home.column_settings.show_reblogs": "Boosts toane",
   "home.column_settings.show_replies": "Reaksjes toane",
-  "home.explore_prompt.body": "Jo starttiidline befettet in miks fan berjochten mei hashtags dy’t jo keazen hawwe om te folgjen, fan minsken dy’t jo keazen hawwe om te folgjen en berjochten dy’t se booste. It sjocht der no frij rêstich út, dus wat tinke jo derfan om:",
   "home.explore_prompt.title": "Dit is jo thúsbasis op Mastodon.",
   "home.hide_announcements": "Meidielingen ferstopje",
   "home.show_announcements": "Meidielingen toane",
@@ -307,7 +305,6 @@
   "interaction_modal.description.reply": "Jo kinne mei in Mastodon-account op dit berjocht reagearje.",
   "interaction_modal.on_another_server": "Op een oare server",
   "interaction_modal.on_this_server": "Op dizze server",
-  "interaction_modal.preamble": "Mastodon is desintralisearre. Dêrom hawwe jo gjin account op dizze Mastodon-server nedich, wannear’t jo al in account op in oare Mastodon-server of kompatibel platfoarm hawwe.",
   "interaction_modal.title.follow": "{name} folgje",
   "interaction_modal.title.reblog": "Berjocht fan {name} booste",
   "interaction_modal.title.reply": "Op it berjocht fan {name} reagearje",
diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json
index d2a60ba0e0..37034b2465 100644
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@@ -170,7 +170,6 @@
   "conversation.open": "Féach ar comhrá",
   "conversation.with": "Le {names}",
   "copypaste.copied": "Cóipeáilte",
-  "copypaste.copy": "Cóipeáil",
   "directory.federated": "Ó chomhchruinne aitheanta",
   "directory.local": "Ó {domain} amháin",
   "directory.new_arrivals": "Daoine atá tar éis teacht",
diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json
index a1bc89d217..ba859498f6 100644
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@@ -13,14 +13,14 @@
   "about.rules": "Riaghailtean an fhrithealaiche",
   "account.account_note_header": "Nòta",
   "account.add_or_remove_from_list": "Cuir ris no thoir air falbh o na liostaichean",
-  "account.badges.bot": "Bot",
+  "account.badges.bot": "Fèin-obrachail",
   "account.badges.group": "Buidheann",
   "account.block": "Bac @{name}",
   "account.block_domain": "Bac an àrainn {domain}",
   "account.block_short": "Bac",
   "account.blocked": "’Ga bhacadh",
   "account.browse_more_on_origin_server": "Rùraich barrachd dheth air a’ phròifil thùsail",
-  "account.cancel_follow_request": "Cuir d’ iarrtas leantainn dhan dàrna taobh",
+  "account.cancel_follow_request": "Sguir dhen leantainn",
   "account.direct": "Thoir iomradh air @{name} gu prìobhaideach",
   "account.disable_notifications": "Na cuir brath thugam tuilleadh nuair a chuireas @{name} post ris",
   "account.domain_blocked": "Chaidh an àrainn a bhacadh",
@@ -113,7 +113,8 @@
   "column.direct": "Iomraidhean prìobhaideach",
   "column.directory": "Rùraich sna pròifilean",
   "column.domain_blocks": "Àrainnean bacte",
-  "column.firehose": "Inbhirean beòtha",
+  "column.favourites": "Annsachdan",
+  "column.firehose": "An saoghal poblach",
   "column.follow_requests": "Iarrtasan leantainn",
   "column.home": "Dachaigh",
   "column.lists": "Liostaichean",
@@ -134,6 +135,8 @@
   "community.column_settings.remote_only": "Feadhainn chèin a-mhàin",
   "compose.language.change": "Atharraich an cànan",
   "compose.language.search": "Lorg cànan…",
+  "compose.published.body": "Chaidh am post fhoillseachadh.",
+  "compose.published.open": "Fosgail",
   "compose_form.direct_message_warning_learn_more": "Barrachd fiosrachaidh",
   "compose_form.encryption_warning": "Chan eil crioptachadh ceann gu ceann air postaichean Mhastodon. Na co-roinn fiosrachadh dìomhair idir le Mastodon.",
   "compose_form.hashtag_warning": "Cha nochd am post seo fon taga hais o nach eil e poblach. Cha ghabh ach postaichean poblach a lorg a-rèir an tagaichean hais.",
@@ -147,7 +150,7 @@
   "compose_form.poll.switch_to_multiple": "Atharraich an cunntas-bheachd ach an gabh iomadh roghainn a thaghadh",
   "compose_form.poll.switch_to_single": "Atharraich an cunntas-bheachd gus nach gabh ach aon roghainn a thaghadh",
   "compose_form.publish": "Foillsich",
-  "compose_form.publish_form": "Foillsich",
+  "compose_form.publish_form": "Post ùr",
   "compose_form.publish_loud": "{publish}!",
   "compose_form.save_changes": "Sàbhail na h-atharraichean",
   "compose_form.sensitive.hide": "{count, plural, one {Cuir comharra gu bheil am meadhan frionasach} two {Cuir comharra gu bheil na meadhanan frionasach} few {Cuir comharra gu bheil na meadhanan frionasach} other {Cuir comharra gu bheil na meadhanan frionasach}}",
@@ -178,6 +181,7 @@
   "confirmations.mute.explanation": "Cuiridh seo na postaichean uapa ’s na postaichean a bheir iomradh orra am falach ach chì iad-san na postaichean agad fhathast is faodaidh iad ’gad leantainn.",
   "confirmations.mute.message": "A bheil thu cinnteach gu bheil thu airson {name} a mhùchadh?",
   "confirmations.redraft.confirm": "Sguab às ⁊ dèan dreachd ùr",
+  "confirmations.redraft.message": "A bheil thu cinnteach gu bheil thu airson am post seo a sguabadh às agus dreachd ùr a thòiseachadh? Caillidh tu gach annsachd is brosnachadh air agus thèid freagairtean dhan phost thùsail ’nan dìlleachdanan.",
   "confirmations.reply.confirm": "Freagair",
   "confirmations.reply.message": "Ma bheir thu freagairt an-dràsta, thèid seo a sgrìobhadh thairis air an teachdaireachd a tha thu a’ sgrìobhadh an-dràsta. A bheil thu cinnteach gu bheil thu airson leantainn air adhart?",
   "confirmations.unfollow.confirm": "Na lean tuilleadh",
@@ -187,7 +191,6 @@
   "conversation.open": "Seall an còmhradh",
   "conversation.with": "Còmhla ri {names}",
   "copypaste.copied": "Chaidh lethbhreac dheth a dhèanamh",
-  "copypaste.copy": "Dèan lethbhreac",
   "copypaste.copy_to_clipboard": "Cuir lethbhreac dheth air an stòr-bhòrd",
   "directory.federated": "On cho-shaoghal aithnichte",
   "directory.local": "O {domain} a-mhàin",
@@ -197,8 +200,9 @@
   "disabled_account_banner.text": "Tha an cunntas {disabledAccount} agad à comas aig an àm seo.",
   "dismissable_banner.community_timeline": "Seo na postaichean poblach as ùire o dhaoine aig a bheil cunntas air {domain}.",
   "dismissable_banner.dismiss": "Leig seachad",
-  "dismissable_banner.explore_links": "Seo na naidheachdan air a bhithear a’ bruidhinn an-dràsta fhèin air an fhrithealaiche seo is frithealaichean eile dhen lìonra sgaoilte.",
-  "dismissable_banner.explore_tags": "Tha fèill air na tagaichean hais seo a’ fàs an-dràsta fhèin air an fhrithealaich seo is frithealaichean eile dhen lìonra sgaoilte.",
+  "dismissable_banner.explore_links": "Seo na cinn-naidheachd a tha ’gan co-roinneadh as trice thar an lìona shòisealta an-diugh. Gheibh naidheachdan nas ùire a tha ’gan co-roinneadh le daoine eadar-dhealaichte rangachadh nas àirde.",
+  "dismissable_banner.explore_statuses": "Tha fèill air na postaichean seo a’ fàs thar an lìona shòisealta an-diugh. Gheibh postaichean nas ùire le barrachd brosnaichean is annsachdan rangachadh nas àirde.",
+  "dismissable_banner.explore_tags": "Tha fèill air na tagaichean hais seo a’ fàs air an fhrithealaiche seo is frithealaichean eile dhen lìonra sgaoilte an-diugh. Gheibh tagaichean hais a tha ’gan cleachdadh le daoine eadar-dhealaichte rangachadh nas àirde.",
   "dismissable_banner.public_timeline": "Seo na postaichean poblach as ùire o dhaoine air an lìonra sòisealta tha ’gan leantainn le daoine air {domain}.",
   "embed.instructions": "Leabaich am post seo san làrach-lìn agad is tu a’ dèanamh lethbhreac dhen chòd gu h-ìosal.",
   "embed.preview": "Seo an coltas a bhios air:",
@@ -226,10 +230,12 @@
   "empty_column.direct": "Chan eil iomradh prìobhaideach agad fhathast. Nuair a chuireas no a gheibh thu tè, nochdaidh i an-seo.",
   "empty_column.domain_blocks": "Cha deach àrainn sam bith a bhacadh fhathast.",
   "empty_column.explore_statuses": "Chan eil dad a’ treandadh an-dràsta fhèin. Thoir sùil a-rithist an ceann greis!",
+  "empty_column.favourited_statuses": "Chan eil annsachd air post agad fhathast. Nuair a nì thu annsachd de dh’fhear, nochdaidh e an-seo.",
+  "empty_column.favourites": "Chan deach am post seo a bhrosnachadh le duine sam bith fhathast. Nuair a bhrosnaicheas cuideigin e, nochdaidh iad an-seo.",
   "empty_column.follow_requests": "Chan eil iarrtas leantainn agad fhathast. Nuair a gheibh thu fear, nochdaidh e an-seo.",
   "empty_column.followed_tags": "Cha do lean thu taga hais sam bith fhathast. Nuair a leanas tu, nochdaidh iad an-seo.",
   "empty_column.hashtag": "Chan eil dad san taga hais seo fhathast.",
-  "empty_column.home": "Tha loidhne-ama na dachaigh agad falamh! Lean barrachd dhaoine gus a lìonadh. {suggestions}",
+  "empty_column.home": "Tha loidhne-ama na dachaigh agad falamh! Lean barrachd dhaoine gus a lìonadh.",
   "empty_column.list": "Chan eil dad air an liosta seo fhathast. Nuair a phostaicheas buill a tha air an liosta seo postaichean ùra, nochdaidh iad an-seo.",
   "empty_column.lists": "Chan eil liosta agad fhathast. Nuair chruthaicheas tu tè, nochdaidh i an-seo.",
   "empty_column.mutes": "Cha do mhùch thu cleachdaiche sam bith fhathast.",
@@ -289,23 +295,32 @@
   "hashtag.column_settings.tag_mode.any": "Gin sam bith dhiubh",
   "hashtag.column_settings.tag_mode.none": "Às aonais gin sam bith dhiubh",
   "hashtag.column_settings.tag_toggle": "Gabh a-steach barrachd tagaichean sa cholbh seo",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} chom-pàirtiche} two {{counter} chom-pàirtiche} few {{counter} com-pàirtiche} other {{counter} com-pàirtiche}}",
+  "hashtag.counter_by_uses": "{count, plural, one {{counter} phost} two {{counter} phost} few {{counter} postaichean} other {{counter} post}}",
+  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} phost} two {{counter} phost} few { postaichean} other { post}} an-diugh",
   "hashtag.follow": "Lean an taga hais",
   "hashtag.unfollow": "Na lean an taga hais tuilleadh",
   "home.actions.go_to_explore": "Faic na tha a’ treandadh",
-  "home.actions.go_to_suggestions": "Lorg daoine a leanas tu",
+  "home.actions.go_to_suggestions": "Lorg daoine gus an leantainn",
   "home.column_settings.basic": "Bunasach",
   "home.column_settings.show_reblogs": "Seall na brosnachaidhean",
   "home.column_settings.show_replies": "Seall na freagairtean",
-  "home.explore_prompt.body": "Bidh measgachadh de phostaichean o na tagaichean hais a leanas tu, na daoine a leanas tu is na postaichean a bhrosnaicheas iad air do dhachaigh. Tha cùisean caran sàmhach an-dràsta, mar sin dheth seo moladh no dhà dhut:",
+  "home.explore_prompt.body": "Bidh measgachadh de phostaichean o na tagaichean hais a leanas tu, na daoine a leanas tu is na postaichean a bhrosnaicheas iad air do dhachaigh. Ma tha cùisean ro shàmhach dhut, seo nas urrainn dhut a dhèanamh:",
   "home.explore_prompt.title": "Seo do dhachaigh am broinn Mastodon.",
   "home.hide_announcements": "Falaich na brathan-fios",
   "home.show_announcements": "Seall na brathan-fios",
+  "interaction_modal.description.favourite": "Le cunntas air Mastodon, ’s urrainn dhut am post seo a chur ris na h-annsachdan airson innse dhan ùghdar gu bheil e a’ còrdadh dhut ’s a shàbhaladh do uaireigin eile.",
   "interaction_modal.description.follow": "Le cunntas air Mastodon, ’s urrainn dhut {name} a leantainn ach am faigh thu na postaichean aca nad dhachaigh.",
   "interaction_modal.description.reblog": "Le cunntas air Mastodon, ’s urrainn dhut am post seo a bhrosnachadh gus a cho-roinneadh leis an luchd-leantainn agad fhèin.",
   "interaction_modal.description.reply": "Le cunntas air Mastodon, ’s urrainn dhut freagairt a chur dhan phost seo.",
+  "interaction_modal.login.action": "Thoir dhachaigh mi",
+  "interaction_modal.login.prompt": "Àrainn-lìn an fhrithealaiche dachaigh agad, can ailbhean.co-shaoghal.net",
+  "interaction_modal.no_account_yet": "Nach eil thu air Mastodon?",
   "interaction_modal.on_another_server": "Air frithealaiche eile",
   "interaction_modal.on_this_server": "Air an frithealaiche seo",
-  "interaction_modal.preamble": "Air sgàth ’s gu bheil Mastodon sgaoilte, ’s urrainn dhut cunntas a chleachdadh a tha ’ga òstadh le frithealaiche Mastodon no le ùrlar co-chòrdail eile mur eil cunntas agad air an fhear seo.",
+  "interaction_modal.sign_in": "Cha deach do chlàradh a-steach air an fhrithealaiche seo. Càit a bheil an cunntas agad ’ga òstadh?",
+  "interaction_modal.sign_in_hint": "Gliocas: Seo an làrach-lìn far an do chlàraich thu. Mur eil cuimhne agad dè bh’ ann, thoir sùil air a’ phost-d fàilteachaidh sa bhogsa a-steach agad. ’S urrainn dhut an t-ainm-cleachdaiche slàn agad a chur a-steach cuideachd! (can @mise@ ailbhean.co-shaoghal.net)",
+  "interaction_modal.title.favourite": "Cuir am post aig {name} ris na h-annsachdan",
   "interaction_modal.title.follow": "Lean {name}",
   "interaction_modal.title.reblog": "Brosnaich am post aig {name}",
   "interaction_modal.title.reply": "Freagair dhan phost aig {name}",
@@ -318,9 +333,11 @@
   "keyboard_shortcuts.column": "Cuir am fòcas air colbh",
   "keyboard_shortcuts.compose": "Cuir am fòcas air raon teacsa an sgrìobhaidh",
   "keyboard_shortcuts.description": "Tuairisgeul",
-  "keyboard_shortcuts.direct": "to open direct messages column",
+  "keyboard_shortcuts.direct": "a dh’fhosgladh colbh nan iomraidhean prìobhaideach",
   "keyboard_shortcuts.down": "Gluais sìos air an liosta",
   "keyboard_shortcuts.enter": "Fosgail post",
+  "keyboard_shortcuts.favourite": "Cuir am post ris na h-annsachdan",
+  "keyboard_shortcuts.favourites": "Fosgail liosta nan annsachdan",
   "keyboard_shortcuts.federated": "Fosgail an loidhne-ama cho-naisgte",
   "keyboard_shortcuts.heading": "Ath-ghoiridean a’ mheur-chlàir",
   "keyboard_shortcuts.home": "Fosgail loidhne-ama na dachaigh",
@@ -351,6 +368,7 @@
   "lightbox.previous": "Air ais",
   "limited_account_hint.action": "Seall a’ phròifil co-dhiù",
   "limited_account_hint.title": "Chaidh a’ phròifil seo fhalach le maoir {domain}.",
+  "link_preview.author": "Le {name}",
   "lists.account.add": "Cuir ris an liosta",
   "lists.account.remove": "Thoir air falbh on liosta",
   "lists.delete": "Sguab às an liosta",
@@ -362,7 +380,7 @@
   "lists.replies_policy.followed": "Cleachdaiche sam bith a leanas mi",
   "lists.replies_policy.list": "Buill na liosta",
   "lists.replies_policy.none": "Na seall idir",
-  "lists.replies_policy.title": "Seall na freagairtean gu:",
+  "lists.replies_policy.title": "Seall freagairtean do:",
   "lists.search": "Lorg am measg nan daoine a leanas tu",
   "lists.subheading": "Na liostaichean agad",
   "load_pending": "{count, plural, one {# nì ùr} two {# nì ùr} few {# nithean ùra} other {# nì ùr}}",
@@ -373,6 +391,7 @@
   "mute_modal.hide_notifications": "A bheil thu airson na brathan fhalach on chleachdaiche seo?",
   "mute_modal.indefinite": "Gun chrìoch",
   "navigation_bar.about": "Mu dhèidhinn",
+  "navigation_bar.advanced_interface": "Fosgail san eadar-aghaidh-lìn adhartach",
   "navigation_bar.blocks": "Cleachdaichean bacte",
   "navigation_bar.bookmarks": "Comharran-lìn",
   "navigation_bar.community_timeline": "Loidhne-ama ionadail",
@@ -382,6 +401,7 @@
   "navigation_bar.domain_blocks": "Àrainnean bacte",
   "navigation_bar.edit_profile": "Deasaich a’ phròifil",
   "navigation_bar.explore": "Rùraich",
+  "navigation_bar.favourites": "Annsachdan",
   "navigation_bar.filters": "Faclan mùchte",
   "navigation_bar.follow_requests": "Iarrtasan leantainn",
   "navigation_bar.followed_tags": "Tagaichean hais ’gan leantainn",
@@ -398,6 +418,7 @@
   "not_signed_in_indicator.not_signed_in": "Feumaidh tu clàradh a-steach mus fhaigh thu cothrom air a’ ghoireas seo.",
   "notification.admin.report": "Rinn {name} gearan mu {target}",
   "notification.admin.sign_up": "Chlàraich {name}",
+  "notification.favourite": "Is annsa le {name} am post agad",
   "notification.follow": "Tha {name} ’gad leantainn a-nis",
   "notification.follow_request": "Dh’iarr {name} ’gad leantainn",
   "notification.mention": "Thug {name} iomradh ort",
@@ -411,6 +432,7 @@
   "notifications.column_settings.admin.report": "Gearanan ùra:",
   "notifications.column_settings.admin.sign_up": "Clàraidhean ùra:",
   "notifications.column_settings.alert": "Brathan deasga",
+  "notifications.column_settings.favourite": "Annsachdan:",
   "notifications.column_settings.filter_bar.advanced": "Seall a h-uile roinn-seòrsa",
   "notifications.column_settings.filter_bar.category": "Bàr-criathraidh luath",
   "notifications.column_settings.filter_bar.show_bar": "Seall am bàr-criathraidh",
@@ -428,6 +450,7 @@
   "notifications.column_settings.update": "Deasachaidhean:",
   "notifications.filter.all": "Na h-uile",
   "notifications.filter.boosts": "Brosnachaidhean",
+  "notifications.filter.favourites": "Annsachdan",
   "notifications.filter.follows": "A’ leantainn",
   "notifications.filter.mentions": "Iomraidhean",
   "notifications.filter.polls": "Toraidhean cunntais-bheachd",
@@ -443,12 +466,12 @@
   "notifications_permission_banner.title": "Na caill dad gu bràth tuilleadh",
   "onboarding.action.back": "Air ais leam",
   "onboarding.actions.back": "Air ais leam",
-  "onboarding.actions.go_to_explore": "See what's trending",
-  "onboarding.actions.go_to_home": "Go to your home feed",
+  "onboarding.actions.go_to_explore": "Thoir dha na treandaichean mi",
+  "onboarding.actions.go_to_home": "Thoir dhachaigh mi",
   "onboarding.compose.template": "Shin thu, a #Mhastodon!",
   "onboarding.follows.empty": "Gu mì-fhortanach, chan urrainn dhuinn toradh a shealltainn an-dràsta. Feuch gleus an luirg no duilleag an rùrachaidh airson daoine ri leantainn a lorg no feuch ris a-rithist an ceann tamaill.",
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
-  "onboarding.follows.title": "Popular on Mastodon",
+  "onboarding.follows.title": "Cuir dreach pearsanta air do dhachaigh",
   "onboarding.share.lead": "Innis do dhaoine mar a gheibh iad grèim ort air Mastodon!",
   "onboarding.share.message": "Is mise {username} air #Mastodon! Thig ’gam leantainn air {url}",
   "onboarding.share.next_steps": "Ceuman eile as urrainn dhut gabhail:",
@@ -457,13 +480,13 @@
   "onboarding.start.skip": "Want to skip right ahead?",
   "onboarding.start.title": "Rinn thu a’ chùis air!",
   "onboarding.steps.follow_people.body": "You curate your own feed. Lets fill it with interesting people.",
-  "onboarding.steps.follow_people.title": "Follow {count, plural, one {one person} other {# people}}",
+  "onboarding.steps.follow_people.title": "Cuir dreach pearsanta air do dhachaigh",
   "onboarding.steps.publish_status.body": "Say hello to the world.",
   "onboarding.steps.publish_status.title": "Dèan a’ chiad phost agad",
   "onboarding.steps.setup_profile.body": "Others are more likely to interact with you with a filled out profile.",
-  "onboarding.steps.setup_profile.title": "Customize your profile",
-  "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
-  "onboarding.steps.share_profile.title": "Share your profile",
+  "onboarding.steps.setup_profile.title": "Gnàthaich a’ phròifil agad",
+  "onboarding.steps.share_profile.body": "Leig fios dha do charaidean mar a gheibh iad lorg ort air Mastodon",
+  "onboarding.steps.share_profile.title": "Co-roinn a’ phròifil Mastodon agad",
   "onboarding.tips.2fa": "<strong>An robh fios agad?</strong> ’S urrainn dhut an cunntas agad a dhìon is tu a’ suidheachadh dearbhadh dà-cheumnach ann an roghainnean a’ chunntais agad. Obraichidh e le aplacaid dearbhaidh dhà-cheumnaich sam bith a thogras tu gun fheum air àireamh fòn!",
   "onboarding.tips.accounts_from_other_servers": "<strong>An robh fios agad?</strong> On a tha Mastodon sgaoilte, tachraidh tu air pròifilean a tha ’gan òstadh air frithealaichean eile. ’S urrainn dhut bruidhinn riutha gun chnap-starra co-dhiù! ’S e ainm an fhrithealaiche a tha san dàrna leth dhen ainm-chleachdaiche aca!",
   "onboarding.tips.migration": "<strong>An robh fios agad?</strong> Ma thig an latha nach eil thu toilichte le {domain} mar an fhrithealaiche agad tuilleadh, ’s urrainn dhut imrich gu frithealaiche Mastodon eile gun a bhith a’ call an luchd-leantainn agad. ’S urrainn dhut fiù frithealaiche agad fhèin òstadh!",
@@ -578,6 +601,8 @@
   "server_banner.server_stats": "Stadastaireachd an fhrithealaiche:",
   "sign_in_banner.create_account": "Cruthaich cunntas",
   "sign_in_banner.sign_in": "Clàraich a-steach",
+  "sign_in_banner.sso_redirect": "Clàraich a-steach no clàraich leinn",
+  "sign_in_banner.text": "Clàraich a-steach a leantainn phròifilean no thagaichean hais, a’ cur postaichean ris na h-annsachdan ’s ’gan co-roinneadh is freagairt dhaibh. ’S urrainn dhut gnìomh a ghabhail le cunntas o fhrithealaiche eile cuideachd.",
   "status.admin_account": "Fosgail eadar-aghaidh na maorsainneachd dha @{name}",
   "status.admin_domain": "Fosgail eadar-aghaidh na maorsainneachd dha {domain}",
   "status.admin_status": "Fosgail am post seo ann an eadar-aghaidh na maorsainneachd",
@@ -594,12 +619,15 @@
   "status.edited": "Air a dheasachadh {date}",
   "status.edited_x_times": "Chaidh a dheasachadh {count, plural, one {{counter} turas} two {{counter} thuras} few {{counter} tursan} other {{counter} turas}}",
   "status.embed": "Leabaich",
+  "status.favourite": "Cuir ris na h-annsachdan",
   "status.filter": "Criathraich am post seo",
   "status.filtered": "Criathraichte",
   "status.hide": "Falaich am post",
   "status.history.created": "Chruthaich {name} {date} e",
   "status.history.edited": "Dheasaich {name} {date} e",
   "status.load_more": "Luchdaich barrachd dheth",
+  "status.media.open": "Dèan briogadh gus fhosgladh",
+  "status.media.show": "Dèan briogadh gus a shealltainn",
   "status.media_hidden": "Meadhan falaichte",
   "status.mention": "Thoir iomradh air @{name}",
   "status.more": "Barrachd",
@@ -627,9 +655,10 @@
   "status.show_more": "Seall barrachd dheth",
   "status.show_more_all": "Seall barrachd dhen a h-uile",
   "status.show_original": "Seall an tionndadh tùsail",
-  "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
+  "status.title.with_attachments": "Phostaich {user} {attachmentCount, plural, one {{attachmentCount} cheanglachan} two {{attachmentCount} cheanglachan} few {{attachmentCount} ceanglachain} other {{attachmentCount} ceanglachan}}",
   "status.translate": "Eadar-theangaich",
   "status.translated_from_with": "Air eadar-theangachadh o {lang} le {provider}",
+  "status.uncached_media_warning": "Chan eil ro-shealladh ri fhaighinn",
   "status.unmute_conversation": "Dì-mhùch an còmhradh",
   "status.unpin": "Dì-phrìnich on phròifil",
   "subscribed_languages.lead": "Cha nochd ach na postaichean sna cànanan a thagh thu air loidhnichean-ama na dachaigh ’s nan liostaichean às dèidh an atharrachaidh seo. Na tagh gin ma tha thu airson na postaichean uile fhaighinn ge b’ e dè an cànan.",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index 3ecb3b8cbe..37f22be16a 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -191,7 +191,6 @@
   "conversation.open": "Ver conversa",
   "conversation.with": "Con {names}",
   "copypaste.copied": "Copiado",
-  "copypaste.copy": "Copiar",
   "copypaste.copy_to_clipboard": "Copiar ao portapapeis",
   "directory.federated": "Do fediverso coñecido",
   "directory.local": "Só de {domain}",
@@ -296,6 +295,9 @@
   "hashtag.column_settings.tag_mode.any": "Calquera destes",
   "hashtag.column_settings.tag_mode.none": "Ningún destes",
   "hashtag.column_settings.tag_toggle": "Incluír cancelos adicionais para esta columna",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} participante} other {{counter} participantes}}",
+  "hashtag.counter_by_uses": "{count, plural, one {{counter} publicación} other {{counter} publicacións}}",
+  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} publicación} other {{counter} publicacións}} hoxe",
   "hashtag.follow": "Seguir cancelo",
   "hashtag.unfollow": "Deixar de seguir cancelo",
   "home.actions.go_to_explore": "Mira do que se está a falar",
@@ -303,7 +305,7 @@
   "home.column_settings.basic": "Básico",
   "home.column_settings.show_reblogs": "Amosar compartidos",
   "home.column_settings.show_replies": "Amosar respostas",
-  "home.explore_prompt.body": "A túa cronoloxía de inicio vai ter unha mistura de publicacións procedentes dos cancelos que segues, das persoas que elexiches seguir e das publicacións que elas promoven. Hai poucas cousas polo de agora, que che parece se:",
+  "home.explore_prompt.body": "A túa cronoloxía de inicio vai ter unha mistura de publicacións procedentes dos cancelos que segues, das persoas que elexiches seguir e das publicacións que elas promoven. Se non tes moito que ler, podes probar a:",
   "home.explore_prompt.title": "Iste é o teu fogar en Mastodon.",
   "home.hide_announcements": "Agochar anuncios",
   "home.show_announcements": "Amosar anuncios",
@@ -311,10 +313,13 @@
   "interaction_modal.description.follow": "Cunha conta en Mastodon, poderás seguir a {name} e recibir as súas publicacións na túa cronoloxía de inicio.",
   "interaction_modal.description.reblog": "Cunha conta en Mastodon, poderás promover esta publicación para compartila con quen te siga.",
   "interaction_modal.description.reply": "Cunha conta en Mastodon, poderás responder a esta publicación.",
+  "interaction_modal.login.action": "Lévame ao inicio",
+  "interaction_modal.login.prompt": "Dominio do teu servidor de inicio, ex. mastodon.social",
+  "interaction_modal.no_account_yet": "Aínda non tes unha conta?",
   "interaction_modal.on_another_server": "Nun servidor diferente",
   "interaction_modal.on_this_server": "Neste servidor",
-  "interaction_modal.other_server_instructions": "Copia e pega este URL na barra de busca da túa app Mastodon favorita ou na interface web do servidor Mastodon.",
-  "interaction_modal.preamble": "Como Mastodon é descentralizado, é posible usar unha conta existente noutro servidor Mastodon, ou nunha plataforma compatible, se non dispós dunha conta neste servidor.",
+  "interaction_modal.sign_in": "Non iniciaches sesión neste servidor. Onde creaches a túa conta?",
+  "interaction_modal.sign_in_hint": "Axuda: trátase da web na que te rexistraches. Se non a lembras, busca na caixa de correo a mensaxe de benvida. Tamén podes escribir o teu identificador completo! (ex. @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Marcar coma favorita a publicación de {name}",
   "interaction_modal.title.follow": "Seguir a {name}",
   "interaction_modal.title.reblog": "Promover a publicación de {name}",
@@ -596,6 +601,7 @@
   "server_banner.server_stats": "Estatísticas do servidor:",
   "sign_in_banner.create_account": "Crear conta",
   "sign_in_banner.sign_in": "Iniciar sesión",
+  "sign_in_banner.sso_redirect": "Acceder ou Crear conta",
   "sign_in_banner.text": "Inicia sesión para seguir perfís ou cancelos, marcar como favorita e responder a publicacións. Tamén podes interactuar coa túa conta noutro servidor.",
   "status.admin_account": "Abrir interface de moderación para @{name}",
   "status.admin_domain": "Abrir interface de moderación para {domain}",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index a86f2a124e..6c310c60a0 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -191,7 +191,6 @@
   "conversation.open": "צפו בשיחה",
   "conversation.with": "עם {names}",
   "copypaste.copied": "הועתק",
-  "copypaste.copy": "העתקה",
   "copypaste.copy_to_clipboard": "העתקה ללוח הגזירים",
   "directory.federated": "מהפדרציה הידועה",
   "directory.local": "מ- {domain} בלבד",
@@ -296,6 +295,9 @@
   "hashtag.column_settings.tag_mode.any": "לפחות אחד מאלה",
   "hashtag.column_settings.tag_mode.none": "אף אחד מאלה",
   "hashtag.column_settings.tag_toggle": "כלול תגיות נוספות בטור זה",
+  "hashtag.counter_by_accounts": "{count, plural,one{{count} משתתף.ת}other{{count} משתתפיםות}}",
+  "hashtag.counter_by_uses": "{count, plural, one {הודעה אחת} two {הודעותיים} many {{count} הודעות} other {{count} הודעות}}",
+  "hashtag.counter_by_uses_today": "{count, plural, one {הודעה אחת} two {הודעותיים} many {{count} הודעות} other {{count} הודעות}} היום",
   "hashtag.follow": "מעקב אחר תגית",
   "hashtag.unfollow": "ביטול מעקב אחר תגית",
   "home.actions.go_to_explore": "הצגת מגמות",
@@ -303,7 +305,7 @@
   "home.column_settings.basic": "למתחילים",
   "home.column_settings.show_reblogs": "הצגת הדהודים",
   "home.column_settings.show_replies": "הצגת תגובות",
-  "home.explore_prompt.body": "פיד הנעקבים שלך יכיל תערובת של הודעות מהתגיות והאנשים שבחרת לעקיבה, וההודעות שהנעקבים בוחרים להדהד. נראה שדי שקט כאן כרגע אז מה לגבי:",
+  "home.explore_prompt.body": "זרם הבית שלך יכיל תערובת של הודעות מהתגיות והאנשים שבחרת לעקיבה, וההודעות שהנעקבים בוחרים להדהד. אם זה נראה שקט מדי כרגע אז מה לגבי:",
   "home.explore_prompt.title": "זהו בסיס הבית שלך בתוך מסטודון.",
   "home.hide_announcements": "הסתר הכרזות",
   "home.show_announcements": "הצג הכרזות",
@@ -311,10 +313,13 @@
   "interaction_modal.description.follow": "עם חשבון מסטודון, ניתן לעקוב אחרי {name} כדי לקבל את הםוסטים שלו/ה בפיד הבית.",
   "interaction_modal.description.reblog": "עם חשבון מסטודון, ניתן להדהד את החצרוץ ולשתף עם עוקבים.",
   "interaction_modal.description.reply": "עם חשבון מסטודון, ניתן לענות לחצרוץ.",
+  "interaction_modal.login.action": "קח אותי לדף הבית",
+  "interaction_modal.login.prompt": "שם השרת שלך, למשל mastodon.social",
+  "interaction_modal.no_account_yet": "עדיין לא במסטודון?",
   "interaction_modal.on_another_server": "על שרת אחר",
   "interaction_modal.on_this_server": "על שרת זה",
-  "interaction_modal.other_server_instructions": "ניתן להעתיק ולהדביק קישור זה לתוך שדה החיפוש באפליקציית מסטודון שבשימוש אצלך או בממשק הדפדפן של שרת המסטודון.",
-  "interaction_modal.preamble": "כיוון שמסטודון מבוזרת, תוכל/י להשתמש בחשבון שלך משרתי מסטודון או רשתות תואמות אחרות אם אין לך חשבון על שרת זה.",
+  "interaction_modal.sign_in": "אינך מחובר.ת לשרת זה. היכן מתאכסן החשבון שלך?",
+  "interaction_modal.sign_in_hint": "רמז: זהו האתר שבו נרשמת. אם שכחת, יש לך הודעת \"ברוכים הבאים\" בתיבת הדוא\"ל. ניתן גם לכתוב את שם המשתמש המלא (למשל @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "חיבוב החצרוץ של {name}",
   "interaction_modal.title.follow": "לעקוב אחרי {name}",
   "interaction_modal.title.reblog": "להדהד את החצרוץ של {name}",
@@ -596,6 +601,7 @@
   "server_banner.server_stats": "סטטיסטיקות שרת:",
   "sign_in_banner.create_account": "יצירת חשבון",
   "sign_in_banner.sign_in": "התחברות",
+  "sign_in_banner.sso_redirect": "התחברות/הרשמה",
   "sign_in_banner.text": "יש להתחבר כדי לעקוב אחרי משתמשים או תגיות, לחבב, לשתף ולענות להודעות. ניתן גם לתקשר מהחשבון שלך עם שרת אחר.",
   "status.admin_account": "פתח/י ממשק ניהול עבור @{name}",
   "status.admin_domain": "פתיחת ממשק ניהול עבור {domain}",
diff --git a/app/javascript/mastodon/locales/hi.json b/app/javascript/mastodon/locales/hi.json
index 9be65015b2..aea8e5e231 100644
--- a/app/javascript/mastodon/locales/hi.json
+++ b/app/javascript/mastodon/locales/hi.json
@@ -176,7 +176,6 @@
   "conversation.open": "वार्तालाप देखें",
   "conversation.with": "{names} के साथ",
   "copypaste.copied": "कॉपी किआ जा चूका है",
-  "copypaste.copy": "कॉपी",
   "directory.federated": "ज्ञात फेडीवर्स से",
   "directory.local": "केवल {domain} से",
   "directory.new_arrivals": "नए आगंतुक",
@@ -285,7 +284,6 @@
   "interaction_modal.description.reply": "मास्टोडन पर एक अकाउंट के साथ, आप इस पोस्ट का जवाब दे सकते हैं।",
   "interaction_modal.on_another_server": "एक अलग सर्वर पर",
   "interaction_modal.on_this_server": "इस सर्वर पे",
-  "interaction_modal.preamble": "चूंकि मास्टोडन डेसेंट्रलीसेड है, यदि आपके पास इस पर कोई अकाउंट नहीं है, तो आप किसी अन्य मास्टोडन सर्वर या संगत प्लेटफ़ॉर्म द्वारा होस्ट किए गए अपने मौजूदा अकाउंट का उपयोग कर सकते हैं।",
   "interaction_modal.title.follow": "फॉलो {name}",
   "interaction_modal.title.reblog": "बूस्ट {name} की पोस्ट",
   "interaction_modal.title.reply": "{name} की पोस्ट पे रिप्लाई करें",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index c4a2cadef2..5645f4806c 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -114,7 +114,7 @@
   "column.directory": "Profilok böngészése",
   "column.domain_blocks": "Letiltott tartománynevek",
   "column.favourites": "Kedvencek",
-  "column.firehose": "Élő hírfolyamok",
+  "column.firehose": "Hírfolyamok",
   "column.follow_requests": "Követési kérelmek",
   "column.home": "Kezdőlap",
   "column.lists": "Listák",
@@ -191,7 +191,6 @@
   "conversation.open": "Beszélgetés megtekintése",
   "conversation.with": "Velük: {names}",
   "copypaste.copied": "Másolva",
-  "copypaste.copy": "Másolás",
   "copypaste.copy_to_clipboard": "Másolás vágólapra",
   "directory.federated": "Az ismert fediverzumból",
   "directory.local": "Csak {domain} tartományból",
@@ -296,6 +295,9 @@
   "hashtag.column_settings.tag_mode.any": "Bármelyik",
   "hashtag.column_settings.tag_mode.none": "Egyik sem",
   "hashtag.column_settings.tag_toggle": "További címkék felvétele ehhez az oszlophoz",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} résztvevő} other {{counter} résztvevő}}",
+  "hashtag.counter_by_uses": "{count, plural, one {{counter} bejegyzés} other {{counter} bejegyzés}}",
+  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} bejegyzés} other {{counter} bejegyzés}} ma",
   "hashtag.follow": "Hashtag követése",
   "hashtag.unfollow": "Hashtag követésének megszüntetése",
   "home.actions.go_to_explore": "Felkapottak megtekintése",
@@ -303,7 +305,7 @@
   "home.column_settings.basic": "Általános",
   "home.column_settings.show_reblogs": "Megtolások megjelenítése",
   "home.column_settings.show_replies": "Válaszok megjelenítése",
-  "home.explore_prompt.body": "A saját hírfolyam a követésre kiválasztott hashtagek, a követésre kiválasztott személyek és az általuk népszerűsített bejegyzések keverékét tartalmazza. Ez most elég csendesnek tűnik, szóval mit szólnál ehhez:",
+  "home.explore_prompt.body": "A saját hírfolyam a követésre kiválasztott hashtagek, a követésre kiválasztott személyek és az általuk népszerűsített bejegyzések keverékét tartalmazza. Ha csendesnek tűnik, akkor megpróbálhatod ezeket:",
   "home.explore_prompt.title": "Ez a kezdőpontod a Mastodonon belül.",
   "home.hide_announcements": "Közlemények elrejtése",
   "home.show_announcements": "Közlemények megjelenítése",
@@ -311,10 +313,13 @@
   "interaction_modal.description.follow": "Egy Mastodon fiókkal bekövetheted {name} fiókot, hogy lásd a bejegyzéseit a saját hírfolyamodban.",
   "interaction_modal.description.reblog": "Egy Mastodon fiókkal megtolhatod ezt a bejegyzést, hogy megoszd a saját követőiddel.",
   "interaction_modal.description.reply": "Egy Mastodon fiókkal válaszolhatsz erre a bejegyzésre.",
+  "interaction_modal.login.action": "Vigyen haza",
+  "interaction_modal.login.prompt": "A saját kiszolgálód tartományneve, pl.: mastodon.social",
+  "interaction_modal.no_account_yet": "Nem vagy Mastodonon?",
   "interaction_modal.on_another_server": "Másik kiszolgálón",
   "interaction_modal.on_this_server": "Ezen a kiszolgálón",
-  "interaction_modal.other_server_instructions": "Másold és illeszd be ezt a webcímet a kedvenc Mastodon alkalmazásod vagy a Mastodon-kiszolgálód webes felületének keresőmezőjébe.",
-  "interaction_modal.preamble": "Mivel a Mastodon decentralizált, használhatod egy másik Mastodon kiszolgálón, vagy kompatibilis szolgáltatáson lévő fiókodat, ha ezen a kiszolgálón nincs fiókod.",
+  "interaction_modal.sign_in": "Nem vagy bejelentkezve ezen a kiszolgálón. Hol van a fiókod hosztolva?",
+  "interaction_modal.sign_in_hint": "Tip: Ez az a weboldal, ahol regisztráltál. Ha nem emlékszel, keresd meg az üdvözlőlevelet a bejövő leveleid között. Beírhatod a teljes felhasználónevedet is! (pl.: @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "{name} bejegyzésének megjelölése kedvencként",
   "interaction_modal.title.follow": "{name} követése",
   "interaction_modal.title.reblog": "{name} bejegyzésének megtolása",
@@ -596,6 +601,7 @@
   "server_banner.server_stats": "Kiszolgálóstatisztika:",
   "sign_in_banner.create_account": "Fiók létrehozása",
   "sign_in_banner.sign_in": "Bejelentkezés",
+  "sign_in_banner.sso_redirect": "Bejelentkezés vagy regisztráció",
   "sign_in_banner.text": "Jelentkezz be profilok vagy hashtagek követéséhez, kedvencnek jelöléséhez, bejegyzések megosztásához, megválaszolásához. A fiókodból más kiszolgálókon is kommunikálhatsz.",
   "status.admin_account": "Moderációs felület megnyitása @{name} fiókhoz",
   "status.admin_domain": "Moderációs felület megnyitása {domain} esetében",
diff --git a/app/javascript/mastodon/locales/hy.json b/app/javascript/mastodon/locales/hy.json
index 5e4f16c150..03350bb723 100644
--- a/app/javascript/mastodon/locales/hy.json
+++ b/app/javascript/mastodon/locales/hy.json
@@ -157,7 +157,6 @@
   "conversation.open": "Դիտել խօսակցութիւնը",
   "conversation.with": "{names}-ի հետ",
   "copypaste.copied": "Պատճէնուած է",
-  "copypaste.copy": "Պատճէնել",
   "directory.federated": "Յայտնի դաշնեզերքից",
   "directory.local": "{domain} տիրոյթից միայն",
   "directory.new_arrivals": "Նորեկներ",
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index e898d8efd6..42fc9f98e1 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -181,7 +181,6 @@
   "conversation.open": "Lihat percakapan",
   "conversation.with": "Dengan {names}",
   "copypaste.copied": "Disalin",
-  "copypaste.copy": "Salin",
   "copypaste.copy_to_clipboard": "Salin ke clipboard",
   "directory.federated": "Dari fediverse yang dikenal",
   "directory.local": "Dari {domain} saja",
@@ -295,7 +294,6 @@
   "interaction_modal.description.reply": "Dengan sebuah akun di Mastodon, Anda bisa menanggapi kiriman ini.",
   "interaction_modal.on_another_server": "Di server lain",
   "interaction_modal.on_this_server": "Di server ini",
-  "interaction_modal.preamble": "Karena Mastodon itu terdesentralisasi, Anda dapat menggunakan akun Anda yang sudah ada yang berada di server Mastodon lain atau platform yang kompatibel jika Anda tidak memiliki sebuah akun di sini.",
   "interaction_modal.title.follow": "Ikuti {name}",
   "interaction_modal.title.reblog": "Boost kiriman {name}",
   "interaction_modal.title.reply": "Balas ke kiriman {name}",
diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json
index 443c73e4ce..cfefd43992 100644
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@@ -160,7 +160,6 @@
   "conversation.open": "Videz konverso",
   "conversation.with": "Kun {names}",
   "copypaste.copied": "Kopiesis",
-  "copypaste.copy": "Kopiez",
   "directory.federated": "De savita fediverso",
   "directory.local": "De {domain} nur",
   "directory.new_arrivals": "Nova venanti",
@@ -252,7 +251,6 @@
   "interaction_modal.description.reply": "Per konto che Mastodon, vu povas respondar ca posto.",
   "interaction_modal.on_another_server": "Che diferanta servilo",
   "interaction_modal.on_this_server": "Che ca servilo",
-  "interaction_modal.preamble": "Pro ke Mastodon esas necentraligita, on povas uzar vua havata konto quo hostigesas altra servilo di Mastodon o konciliebla metodo se on ne havas konto hike.",
   "interaction_modal.title.follow": "Sequez {name}",
   "interaction_modal.title.reblog": "Bustizez posto di {name}",
   "interaction_modal.title.reply": "Respondez posto di {name}",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index 38edc2b5e3..c522ff4fb4 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -191,7 +191,6 @@
   "conversation.open": "Skoða samtal",
   "conversation.with": "Við {names}",
   "copypaste.copied": "Afritað",
-  "copypaste.copy": "Afrita",
   "copypaste.copy_to_clipboard": "Afrita á klippispjald",
   "directory.federated": "Frá samtengdum vefþjónum",
   "directory.local": "Einungis frá {domain}",
@@ -296,6 +295,9 @@
   "hashtag.column_settings.tag_mode.any": "Hvað sem er af þessu",
   "hashtag.column_settings.tag_mode.none": "Ekkert af þessu",
   "hashtag.column_settings.tag_toggle": "Taka með viðbótarmerki fyrir þennan dálk",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} þátttakandi} other {{counter} þátttakendur}}",
+  "hashtag.counter_by_uses": "{count, plural, one {{counter} færsla} other {{counter} færslur}}",
+  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} færsla} other {{counter} færslur}} í dag",
   "hashtag.follow": "Fylgjast með myllumerki",
   "hashtag.unfollow": "Hætta að fylgjast með myllumerki",
   "home.actions.go_to_explore": "Sjáðu hvað er í umræðunni",
@@ -303,7 +305,7 @@
   "home.column_settings.basic": "Einfalt",
   "home.column_settings.show_reblogs": "Sýna endurbirtingar",
   "home.column_settings.show_replies": "Birta svör",
-  "home.explore_prompt.body": "Heimastreymið inniheldur blöndu af færslum frá þeim myllumerkjum sem þú hefur valið að fylgjast með, fólki sem þú hefur valið að fylgja, og færslunum sem þau endurbirta. Það lítur út fyrir að vera lítið að ske í augnablikinu, svo hvað með að:",
+  "home.explore_prompt.body": "Heimastreymið þitt verður með blöndu af færslum úr myllumerkjunum sem þú hefur valið að fylgja, færslum frá fólki sem þú hefur valið að fylgja og færslum sem þau endurbirta. Ef þér finnst þetta allt of kyrrlátt, gætirðu viljað:",
   "home.explore_prompt.title": "Þetta er bækistöð þín innan Loðfílsins.",
   "home.hide_announcements": "Fela auglýsingar",
   "home.show_announcements": "Birta auglýsingar",
@@ -311,10 +313,13 @@
   "interaction_modal.description.follow": "Með notandaaðgangi á Mastodon geturðu fylgst með {name} og fengið færslur frá viðkomandi í heimastreymið þitt.",
   "interaction_modal.description.reblog": "Með notandaaðgangi á Mastodon geturðu endurbirt þessa færslu til að deila henni með þeim sem fylgjast með þér.",
   "interaction_modal.description.reply": "Með notandaaðgangi á Mastodon geturðu svarað þessari færslu.",
+  "interaction_modal.login.action": "Fara á heimastreymið mitt",
+  "interaction_modal.login.prompt": "Lén heimanetþjónsins þíns, t.d. mastodon.social",
+  "interaction_modal.no_account_yet": "Ekki á Mastodon?",
   "interaction_modal.on_another_server": "Á öðrum netþjóni",
   "interaction_modal.on_this_server": "Á þessum netþjóni",
-  "interaction_modal.other_server_instructions": "Afritaðu og límdu þessa slóð inn í leitarreit Mastodon-forrits þess sem þú vilt nota eða í vefviðmóti Mastodon-netþjónsins þíns.",
-  "interaction_modal.preamble": "Þar sem Mastodon er dreifhýst kerfi, þá geturðu notað aðgang sem er hýstur á öðrum Mastodon-þjóni eða öðru samhæfðu kerfi, ef þú ert ekki með notandaaðgang á þessum hér.",
+  "interaction_modal.sign_in": "Þú ert ekki skráð/ur inn á þennan netþjón. Hvar er aðgangurinn þinn hýstur?",
+  "interaction_modal.sign_in_hint": "Ábending: Það er vefsvæðið þar sem þú skráðir þig. Ef þú manst ekki hvar, geturðu leitað að kynningarpóstinum í pósthólfinu þínu. Þú getur líka sett inn fullt notandanafn þitt (t.d. @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Setja færsluna frá {name} í eftirlæti",
   "interaction_modal.title.follow": "Fylgjast með {name}",
   "interaction_modal.title.reblog": "Endurbirta færsluna frá {name}",
@@ -596,6 +601,7 @@
   "server_banner.server_stats": "Tölfræði þjóns:",
   "sign_in_banner.create_account": "Búa til notandaaðgang",
   "sign_in_banner.sign_in": "Skrá inn",
+  "sign_in_banner.sso_redirect": "Skrá inn eða nýskrá",
   "sign_in_banner.text": "Skráðu þig inn til að fylgjast með notendum eða myllumerkjum, svara færslum, deila þeim eða setja í eftirlæti. Þú getur einnig átt í samskiptum á aðgangnum þínum á öðrum netþjónum.",
   "status.admin_account": "Opna umsjónarviðmót fyrir @{name}",
   "status.admin_domain": "Opna umsjónarviðmót fyrir @{domain}",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index d78514073c..30932946f1 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -191,7 +191,6 @@
   "conversation.open": "Visualizza conversazione",
   "conversation.with": "Con {names}",
   "copypaste.copied": "Copiato",
-  "copypaste.copy": "Copia",
   "copypaste.copy_to_clipboard": "Copia negli Appunti",
   "directory.federated": "Da un fediverse noto",
   "directory.local": "Solo da {domain}",
@@ -296,6 +295,9 @@
   "hashtag.column_settings.tag_mode.any": "Uno o più di questi",
   "hashtag.column_settings.tag_mode.none": "Nessuno di questi",
   "hashtag.column_settings.tag_toggle": "Includi i tag aggiuntivi per questa colonna",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} partecipante} other {{counter} partecipanti}}",
+  "hashtag.counter_by_uses": "{count, plural, one {{counter} post} other {{counter} post}}",
+  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} post} other {{counter} post}} oggi",
   "hashtag.follow": "Segui l'hashtag",
   "hashtag.unfollow": "Smetti di seguire l'hashtag",
   "home.actions.go_to_explore": "Scopri cosa sia di tendenza",
@@ -311,10 +313,13 @@
   "interaction_modal.description.follow": "Con un profilo di Mastodon, puoi seguire {name} per ricevere i suoi post nel feed della tua home.",
   "interaction_modal.description.reblog": "Con un profilo di Mastodon, puoi rebloggare questo post per condividerlo con i tuoi seguaci.",
   "interaction_modal.description.reply": "Con un profilo di Mastodon, puoi rispondere a questo post.",
+  "interaction_modal.login.action": "Torna all’inizio",
+  "interaction_modal.login.prompt": "Dominio del tuo server principale, ad esempio mastodon.social",
+  "interaction_modal.no_account_yet": "Non su Mastodon?",
   "interaction_modal.on_another_server": "Su un altro server",
   "interaction_modal.on_this_server": "Su questo server",
-  "interaction_modal.other_server_instructions": "Copia e incolla questo URL nel campo di ricerca della tua app Mastodon preferita o nell'interfaccia web del tuo server Mastodon.",
-  "interaction_modal.preamble": "Poiché Mastodon è decentralizzato, puoi utilizzare il tuo profilo esistente ospitato da un altro server di Mastodon on piattaforma compatibile, se non hai un profilo su questo.",
+  "interaction_modal.sign_in": "Non sei connesso a questo server. Dove è ospitato il tuo account?",
+  "interaction_modal.sign_in_hint": "Suggerimento: questo è il sito in cui ti sei registrato. Se non ti ricordi, cerca l'e-mail di benvenuto nella tua casella di posta. Puoi anche inserire il tuo nome utente completo! (es. @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Contrassegna il post di {name} come preferito",
   "interaction_modal.title.follow": "Segui {name}",
   "interaction_modal.title.reblog": "Reblogga il post di {name}",
@@ -596,6 +601,7 @@
   "server_banner.server_stats": "Statistiche del server:",
   "sign_in_banner.create_account": "Crea un profilo",
   "sign_in_banner.sign_in": "Accedi",
+  "sign_in_banner.sso_redirect": "Accedi o Registrati",
   "sign_in_banner.text": "Accedi per seguire profili o hashtag, condividere, rispondere e aggiungere post ai preferiti. Puoi anche interagire dal tuo account su un server diverso.",
   "status.admin_account": "Apri interfaccia di moderazione per @{name}",
   "status.admin_domain": "Apri l'interfaccia di moderazione per {domain}",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 91b7255ebd..1db0d5ff4a 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -191,7 +191,6 @@
   "conversation.open": "会話を表示",
   "conversation.with": "{names}",
   "copypaste.copied": "コピーしました",
-  "copypaste.copy": "コピー",
   "copypaste.copy_to_clipboard": "クリップボードにコピー",
   "directory.federated": "既知の連合より",
   "directory.local": "{domain} のみ",
@@ -296,6 +295,9 @@
   "hashtag.column_settings.tag_mode.any": "いずれかを含む",
   "hashtag.column_settings.tag_mode.none": "これらを除く",
   "hashtag.column_settings.tag_toggle": "このカラムに追加のタグを含める",
+  "hashtag.counter_by_accounts": "{count, plural, other {{counter}人投稿}}",
+  "hashtag.counter_by_uses": "{count, plural, other {{counter}件}}",
+  "hashtag.counter_by_uses_today": "今日{count, plural, other {{counter}件}}",
   "hashtag.follow": "ハッシュタグをフォローする",
   "hashtag.unfollow": "ハッシュタグのフォローを解除",
   "home.actions.go_to_explore": "話題をさがす",
@@ -303,7 +305,7 @@
   "home.column_settings.basic": "基本設定",
   "home.column_settings.show_reblogs": "ブースト表示",
   "home.column_settings.show_replies": "返信表示",
-  "home.explore_prompt.body": "ユーザーやハッシュタグをフォローすると、この「ホーム」タイムラインに投稿やブーストが流れるようになります。タイムラインをもう少し、にぎやかにしてみませんか？",
+  "home.explore_prompt.body": "ユーザーやハッシュタグをフォローすると、この「ホーム」タイムラインに投稿やブーストが流れるようになります。タイムラインをもう少しにぎやかにしてみませんか？",
   "home.explore_prompt.title": "Mastodonのタイムラインへようこそ。",
   "home.hide_announcements": "お知らせを隠す",
   "home.show_announcements": "お知らせを表示",
@@ -311,10 +313,13 @@
   "interaction_modal.description.follow": "Mastodonのアカウントで{name}さんをフォローしてホームフィードで投稿を受け取れます。",
   "interaction_modal.description.reblog": "Mastodonのアカウントでこの投稿をブーストして自分のフォロワーに共有できます。",
   "interaction_modal.description.reply": "Mastodonのアカウントでこの投稿に反応できます。",
+  "interaction_modal.login.action": "サーバーに移動",
+  "interaction_modal.login.prompt": "登録したサーバーのドメイン (例: mastodon.social)",
+  "interaction_modal.no_account_yet": "Mastodonにアカウントがない場合は",
   "interaction_modal.on_another_server": "別のサーバー",
   "interaction_modal.on_this_server": "このサーバー",
-  "interaction_modal.other_server_instructions": "以下のURLをコピーして、Mastodon対応アプリや自分のサーバーの検索欄に貼り付けます。",
-  "interaction_modal.preamble": "Mastodonは分散化されているためアカウントを持っていなくても別のMastodonサーバーまたは互換性のあるプラットフォームでホストされているアカウントを使用できます。",
+  "interaction_modal.sign_in": "このサーバーにアカウントがなくても、ほかのサーバーや互換性のあるプラットフォームのアカウントを使用できます。",
+  "interaction_modal.sign_in_hint": "ワンポイント: ここでは自分のアカウントのドメインを入力します。うまくいかない場合はドメインまで含めた完全なユーザー名を入力してみてください (例: @Mastodon@mastodon.social)。ドメインやユーザー名は登録完了時のメールに記載されています。",
   "interaction_modal.title.favourite": "{name}さんの投稿をお気に入り登録",
   "interaction_modal.title.follow": "{name}さんをフォロー",
   "interaction_modal.title.reblog": "{name}さんの投稿をブースト",
@@ -363,7 +368,7 @@
   "lightbox.previous": "前",
   "limited_account_hint.action": "構わず表示する",
   "limited_account_hint.title": "このプロフィールは{domain}のモデレーターによって非表示にされています。",
-  "link_preview.author": "{name} が作成",
+  "link_preview.author": "{name}",
   "lists.account.add": "リストに追加",
   "lists.account.remove": "リストから外す",
   "lists.delete": "リストを削除",
@@ -596,6 +601,7 @@
   "server_banner.server_stats": "サーバーの情報",
   "sign_in_banner.create_account": "アカウント作成",
   "sign_in_banner.sign_in": "ログイン",
+  "sign_in_banner.sso_redirect": "ログインまたは登録",
   "sign_in_banner.text": "アカウントがあればユーザーやハッシュタグをフォローしたり、投稿のお気に入り登録やブースト、投稿への返信ができます。別のサーバーのユーザーとの交流も可能です。",
   "status.admin_account": "@{name}さんのモデレーション画面を開く",
   "status.admin_domain": "{domain}のモデレーション画面を開く",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index d13a80fa03..0f200cf6fb 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -7,6 +7,7 @@
   "account.badges.group": "Agraw",
   "account.block": "Seḥbes @{name}",
   "account.block_domain": "Ffer kra i d-yekkan seg {domain}",
+  "account.block_short": "Sewḥel",
   "account.blocked": "Yettusewḥel",
   "account.browse_more_on_origin_server": "Snirem ugar deg umeɣnu aneẓli",
   "account.cancel_follow_request": "Withdraw follow request",
@@ -28,6 +29,7 @@
   "account.media": "Timidyatin",
   "account.mention": "Bder-d @{name}",
   "account.mute": "Sgugem @{name}",
+  "account.mute_short": "Sgugem",
   "account.muted": "Yettwasgugem",
   "account.open_original_page": "Ldi asebter anasli",
   "account.posts": "Tisuffaɣ",
@@ -70,6 +72,7 @@
   "column.community": "Tasuddemt tadigant",
   "column.directory": "Inig deg imaɣnuten",
   "column.domain_blocks": "Taɣulin yeffren",
+  "column.favourites": "Imenyafen",
   "column.follow_requests": "Isuturen n teḍfeṛt",
   "column.home": "Agejdan",
   "column.lists": "Tibdarin",
@@ -90,6 +93,7 @@
   "community.column_settings.remote_only": "Anmeggag kan",
   "compose.language.change": "Beddel tutlayt",
   "compose.language.search": "Nadi tutlayin …",
+  "compose.published.open": "Ldi",
   "compose_form.direct_message_warning_learn_more": "Issin ugar",
   "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous 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.",
@@ -135,7 +139,6 @@
   "conversation.open": "Ssken adiwenni",
   "conversation.with": "Akked {names}",
   "copypaste.copied": "Yettwanɣel",
-  "copypaste.copy": "Nγel",
   "directory.federated": "Deg fedivers yettwasnen",
   "directory.local": "Seg {domain} kan",
   "directory.new_arrivals": "Imaynuten id yewḍen",
@@ -178,6 +181,7 @@
   "errors.unexpected_crash.copy_stacktrace": "Nɣel stacktrace ɣef wafus",
   "errors.unexpected_crash.report_issue": "Mmel ugur",
   "explore.search_results": "Igemmaḍ n unadi",
+  "explore.suggested_follows": "Imdanen",
   "explore.title": "Snirem",
   "explore.trending_links": "Isallen",
   "explore.trending_statuses": "Tisuffiɣin",
@@ -185,6 +189,8 @@
   "filter_modal.added.settings_link": "asebter n yiɣewwaṛen",
   "filter_modal.select_filter.prompt_new": "Taggayt tamaynutt : {name}",
   "filter_modal.select_filter.search": "Nadi neɣ snulfu-d",
+  "firehose.all": "Akk",
+  "firehose.local": "Deg uqeddac-ayi",
   "follow_request.authorize": "Ssireg",
   "follow_request.reject": "Agi",
   "footer.about": "Γef",
@@ -253,6 +259,7 @@
   "lightbox.expand": "Simeɣer tamnaḍt n uskan n tugna",
   "lightbox.next": "Γer zdat",
   "lightbox.previous": "Γer deffir",
+  "link_preview.author": "S-ɣur {name}",
   "lists.account.add": "Rnu ɣer tebdart",
   "lists.account.remove": "Kkes seg tebdart",
   "lists.delete": "Kkes tabdart",
@@ -281,6 +288,7 @@
   "navigation_bar.domain_blocks": "Tiɣula yeffren",
   "navigation_bar.edit_profile": "Ẓreg amaɣnu",
   "navigation_bar.explore": "Snirem",
+  "navigation_bar.favourites": "Imenyafen",
   "navigation_bar.filters": "Awalen i yettwasgugmen",
   "navigation_bar.follow_requests": "Isuturen n teḍfeṛt",
   "navigation_bar.follows_and_followers": "Imeḍfaṛen akked wid i teṭṭafaṛeḍ",
@@ -304,6 +312,7 @@
   "notifications.clear": "Sfeḍ tilɣa",
   "notifications.clear_confirmation": "Tebɣiḍ s tidet ad tekkseḍ akk tilɣa-inek·em i lebda?",
   "notifications.column_settings.alert": "Tilɣa n tnarit",
+  "notifications.column_settings.favourite": "Imenyafen:",
   "notifications.column_settings.filter_bar.advanced": "Ssken-d meṛṛa tiggayin",
   "notifications.column_settings.filter_bar.category": "Iri n usizdeg uzrib",
   "notifications.column_settings.follow": "Imeḍfaṛen imaynuten:",
@@ -317,6 +326,7 @@
   "notifications.column_settings.status": "Tiẓenẓunin timaynutin:",
   "notifications.filter.all": "Akk",
   "notifications.filter.boosts": "Seǧhed",
+  "notifications.filter.favourites": "Imenyafen",
   "notifications.filter.follows": "Yeṭafaṛ",
   "notifications.filter.mentions": "Abdar",
   "notifications.filter.polls": "Igemmaḍ n usenqed",
@@ -329,6 +339,7 @@
   "notifications_permission_banner.title": "Ur zeggel acemma",
   "onboarding.actions.go_to_explore": "See what's trending",
   "onboarding.actions.go_to_home": "Go to your home feed",
+  "onboarding.compose.template": "Azul a #Mastodon!",
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
   "onboarding.follows.title": "Popular on Mastodon",
   "onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:",
@@ -397,6 +408,7 @@
   "server_banner.learn_more": "Issin ugar",
   "sign_in_banner.create_account": "Snulfu-d amiḍan",
   "sign_in_banner.sign_in": "Qqen",
+  "sign_in_banner.sso_redirect": "Qqen neɣ jerred",
   "status.admin_status": "Open this status in the moderation interface",
   "status.block": "Seḥbes @{name}",
   "status.bookmark": "Creḍ",
diff --git a/app/javascript/mastodon/locales/kk.json b/app/javascript/mastodon/locales/kk.json
index 9e4855efde..6416d695ee 100644
--- a/app/javascript/mastodon/locales/kk.json
+++ b/app/javascript/mastodon/locales/kk.json
@@ -136,7 +136,6 @@
   "conversation.mark_as_read": "Оқылды деп белгіле",
   "conversation.open": "Пікірталасты қарау",
   "conversation.with": "{names} атты",
-  "copypaste.copy": "Көшіру",
   "directory.federated": "Танымал желіден",
   "directory.local": "Тек {domain} доменінен",
   "directory.new_arrivals": "Жаңадан келгендер",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index ea887b32dc..72195770b4 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -37,7 +37,7 @@
   "account.following": "팔로잉",
   "account.following_counter": "{counter} 팔로잉",
   "account.follows.empty": "이 사용자는 아직 아무도 팔로우하고 있지 않습니다.",
-  "account.follows_you": "날 팔로우합니다",
+  "account.follows_you": "나를 팔로우합니다",
   "account.go_to_profile": "프로필로 이동",
   "account.hide_reblogs": "@{name}의 부스트를 숨기기",
   "account.in_memoriam": "고인의 계정입니다.",
@@ -191,7 +191,6 @@
   "conversation.open": "대화 보기",
   "conversation.with": "{names} 님과",
   "copypaste.copied": "복사됨",
-  "copypaste.copy": "복사",
   "copypaste.copy_to_clipboard": "클립보드에 복사",
   "directory.federated": "알려진 연합우주로부터",
   "directory.local": "{domain}에서만",
@@ -202,7 +201,7 @@
   "dismissable_banner.community_timeline": "여기 있는 것들은 계정이 {domain}에 있는 사람들의 최근 공개 게시물들입니다.",
   "dismissable_banner.dismiss": "지우기",
   "dismissable_banner.explore_links": "이 소식들은 오늘 소셜 웹에서 가장 많이 공유된 내용들입니다. 새 소식을 더 많은 사람들이 공유할수록 높은 순위가 됩니다.",
-  "dismissable_banner.explore_statuses": "이 게시물들은 오늘 소셜 웹에서 호응을 얻고 있는 것들입니다. 부스트와 관심을 받는 새로운 글들이 높은 순위가 됩니다",
+  "dismissable_banner.explore_statuses": "오늘 소셜 웹에서 호응을 얻고 있는 게시물이에요. 부스트와 좋아요를 받는 새로운 게시물이 높은 순위가 돼요.",
   "dismissable_banner.explore_tags": "이 해시태그들은 이 서버와 분산화된 네트워크의 다른 서버에서 사람들의 인기를 끌고 있는 것들입니다.",
   "dismissable_banner.public_timeline": "이것들은 {domain}에 있는 사람들이 팔로우한 사람들의 최신 게시물들입니다.",
   "embed.instructions": "아래의 코드를 복사하여 대화를 원하는 곳으로 공유하세요.",
@@ -231,8 +230,8 @@
   "empty_column.direct": "개인적인 멘션이 없습니다. 보내거나 받으면 여기에 표시됩니다.",
   "empty_column.domain_blocks": "아직 차단한 도메인이 없습니다.",
   "empty_column.explore_statuses": "아직 유행하는 것이 없습니다. 나중에 다시 확인하세요!",
-  "empty_column.favourited_statuses": "아직 마음에 들어한 게시물이 없습니다. 게시물을 좋아요 하면 여기에 나타납니다.",
-  "empty_column.favourites": "아직 아무도 이 게시물을 마음에 들어하지 않았습니다. 누군가 좋아요를 하면 여기에 나타납니다.",
+  "empty_column.favourited_statuses": "아직 좋아요한 게시물이 없습니다. 게시물을 좋아요 하면 여기에 나타납니다.",
+  "empty_column.favourites": "아직 아무도 이 게시물을 좋아요를 하지 않았습니다. 누군가 좋아요를 하면 여기에 나타납니다.",
   "empty_column.follow_requests": "아직 팔로우 요청이 없습니다. 요청을 받았을 때 여기에 나타납니다.",
   "empty_column.followed_tags": "아직 아무 해시태그도 팔로우하고 있지 않습니다. 해시태그를 팔로우하면, 여기에 표시됩니다.",
   "empty_column.hashtag": "이 해시태그는 아직 사용되지 않았습니다.",
@@ -296,6 +295,9 @@
   "hashtag.column_settings.tag_mode.any": "어느것이든",
   "hashtag.column_settings.tag_mode.none": "이것들을 제외하고",
   "hashtag.column_settings.tag_toggle": "추가 해시태그를 이 컬럼에 추가합니다",
+  "hashtag.counter_by_accounts": "{count, plural, other {{counter} 명의 참여자}}",
+  "hashtag.counter_by_uses": "{count, plural, other {{counter} 개의 게시물}}",
+  "hashtag.counter_by_uses_today": "오늘 {count, plural, other {{counter} 개의 게시물}}",
   "hashtag.follow": "해시태그 팔로우",
   "hashtag.unfollow": "해시태그 팔로우 해제",
   "home.actions.go_to_explore": "무엇이 유행인지 보기",
@@ -303,19 +305,22 @@
   "home.column_settings.basic": "기본",
   "home.column_settings.show_reblogs": "부스트 표시",
   "home.column_settings.show_replies": "답글 표시",
-  "home.explore_prompt.body": "내 홈 피드는 내가 팔로우한 해시태그를 가진 게시물, 내가 팔로우한 사람들의 게시물, 그들이 부스트한 게시물들이 다같이 나타납니다. 아직은 조용하네요, 이렇게 해보는 게 어떠신가요:",
-  "home.explore_prompt.title": "이것은 마스토돈에 있는 내 본거지입니다.",
+  "home.explore_prompt.body": "홈 피드에는 내가 팔로우한 해시태그 그리고 팔로우한 사람과 부스트가 함께 나타나요. 너무 고요하게 느껴진다면, 다음 것들을 살펴볼 수 있어요:",
+  "home.explore_prompt.title": "여기가 Mastodon 이용의 본거지예요.",
   "home.hide_announcements": "공지사항 숨기기",
   "home.show_announcements": "공지사항 보기",
-  "interaction_modal.description.favourite": "마스토돈 계정을 통해, 게시물을 마음에 들어 하는 것으로 작성자에게 호의를 표하고 나중에 보기 위해 저장할 수 있습니다.",
+  "interaction_modal.description.favourite": "마스토돈 계정을 통해, 게시물을 좋아하는 것으로 작성자에게 호의를 표하고 나중에 보기 위해 저장할 수 있습니다.",
   "interaction_modal.description.follow": "마스토돈 계정을 통해, {name} 님을 팔로우 하고 그의 게시물을 홈 피드에서 받아 볼 수 있습니다.",
   "interaction_modal.description.reblog": "마스토돈 계정을 통해, 이 게시물을 부스트 하고 자신의 팔로워들에게 공유할 수 있습니다.",
   "interaction_modal.description.reply": "마스토돈 계정을 통해, 이 게시물에 응답할 수 있습니다.",
+  "interaction_modal.login.action": "홈 서버로 가기",
+  "interaction_modal.login.prompt": "내 홈 서버의 도메인. 예시: mastodon.social",
+  "interaction_modal.no_account_yet": "Mastodon 계정이 없나요?",
   "interaction_modal.on_another_server": "다른 서버에",
   "interaction_modal.on_this_server": "이 서버에서",
-  "interaction_modal.other_server_instructions": "주로 이용하는 마스토돈 앱이나 마스토돈 서버의 웹 인터페이스 내 검색 영역에 이 URL을 복사 및 붙여넣기 하세요.",
-  "interaction_modal.preamble": "마스토돈은 분산화 되어 있기 때문에, 이곳에 계정이 없더라도 다른 곳에서 운영되는 마스토돈 서버나 호환 되는 플랫폼에 있는 계정을 사용할 수 있습니다.",
-  "interaction_modal.title.favourite": "{name} 님의 게시물을 마음에 들어하기",
+  "interaction_modal.sign_in": "이 서버에 로그인되어 있지 않습니다. 계정이 어디에 속해 있나요?",
+  "interaction_modal.sign_in_hint": "팁: 여러분이 가입한 사이트입니다. 만약 기억이 나지 않는다면 가입환영 이메일을 찾아보는 것도 좋습니다. 전체 사용자이름(예: @mastodon@mastodon.social)을 넣어도 됩니다!",
+  "interaction_modal.title.favourite": "{name} 님의 게시물을 좋아하기",
   "interaction_modal.title.follow": "{name} 님을 팔로우",
   "interaction_modal.title.reblog": "{name} 님의 게시물을 부스트",
   "interaction_modal.title.reply": "{name} 님의 게시물에 답글",
@@ -413,7 +418,7 @@
   "not_signed_in_indicator.not_signed_in": "이 정보에 접근하려면 로그인을 해야 합니다.",
   "notification.admin.report": "{name} 님이 {target}를 신고했습니다",
   "notification.admin.sign_up": "{name} 님이 가입했습니다",
-  "notification.favourite": "{name} 님이 내 게시물을 마음에 들어했습니다",
+  "notification.favourite": "{name} 님이 내 게시물을 좋아합니다",
   "notification.follow": "{name} 님이 나를 팔로우했습니다",
   "notification.follow_request": "{name} 님이 팔로우 요청을 보냈습니다",
   "notification.mention": "{name} 님의 멘션",
@@ -512,7 +517,7 @@
   "privacy_policy.title": "개인정보처리방침",
   "refresh": "새로고침",
   "regeneration_indicator.label": "불러오는 중…",
-  "regeneration_indicator.sublabel": "당신의 홈 피드가 준비되는 중입니다!",
+  "regeneration_indicator.sublabel": "홈 피드를 준비하고 있습니다!",
   "relative_time.days": "{number}일 전",
   "relative_time.full.days": "{number} 일 전",
   "relative_time.full.hours": "{number} 시간 전",
@@ -596,6 +601,7 @@
   "server_banner.server_stats": "서버 통계:",
   "sign_in_banner.create_account": "계정 생성",
   "sign_in_banner.sign_in": "로그인",
+  "sign_in_banner.sso_redirect": "로그인 또는 가입하기",
   "sign_in_banner.text": "로그인을 통해 프로필이나 해시태그를 팔로우하거나 마음에 들어하거나 공유하고 답글을 달 수 있습니다. 다른 서버에 있는 본인의 계정을 통해 참여할 수도 있습니다.",
   "status.admin_account": "@{name}에 대한 중재 화면 열기",
   "status.admin_domain": "{domain}에 대한 중재 화면 열기",
@@ -612,12 +618,12 @@
   "status.edit": "수정",
   "status.edited": "{date}에 수정함",
   "status.edited_x_times": "{count}번 수정됨",
-  "status.embed": "공유하기",
+  "status.embed": "임베드",
   "status.favourite": "좋아요",
   "status.filter": "이 게시물을 필터",
   "status.filtered": "필터로 걸러짐",
   "status.hide": "게시물 숨기기",
-  "status.history.created": "{name} 님이 {date}에 생성함",
+  "status.history.created": "{name} 님이 {date}에 처음 게시함",
   "status.history.edited": "{name} 님이 {date}에 수정함",
   "status.load_more": "더 보기",
   "status.media.open": "클릭하여 열기",
diff --git a/app/javascript/mastodon/locales/ku.json b/app/javascript/mastodon/locales/ku.json
index bacd599102..24f01c6b1a 100644
--- a/app/javascript/mastodon/locales/ku.json
+++ b/app/javascript/mastodon/locales/ku.json
@@ -176,7 +176,6 @@
   "conversation.open": "Axaftinê nîşan bide",
   "conversation.with": "Bi {names} re",
   "copypaste.copied": "Hate jêgirtin",
-  "copypaste.copy": "Jê bigire",
   "directory.federated": "Ji fediversên naskirî",
   "directory.local": "Tenê ji {domain}",
   "directory.new_arrivals": "Kesên ku nû hatine",
@@ -281,7 +280,6 @@
   "interaction_modal.description.reply": "Bi ajimêrekê li ser Mastodon, tu dikarî bersiva vê şandiyê bidî.",
   "interaction_modal.on_another_server": "Li ser rajekareke cuda",
   "interaction_modal.on_this_server": "Li ser ev rajekar",
-  "interaction_modal.preamble": "Ji ber ku Mastodon nenavendî ye, tu dikarî ajimêrê xwe ya heyî ku ji aliyê rajekarek din a Mastodon an platformek lihevhatî ve hatî pêşkêşkirin bi kar bînî ku ajimêrê te li ser vê yekê tune be.",
   "interaction_modal.title.follow": "{name} bişopîne",
   "interaction_modal.title.reblog": "Şandiyê {name} bilind bike",
   "interaction_modal.title.reply": "Bersivê bide şandiyê {name}",
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index 3e96087281..f45b0427e0 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -17,6 +17,7 @@
   "account.badges.group": "Grupa",
   "account.block": "Bloķēt @{name}",
   "account.block_domain": "Bloķēt domēnu {domain}",
+  "account.block_short": "Bloķēt",
   "account.blocked": "Bloķēts",
   "account.browse_more_on_origin_server": "Pārlūkot vairāk sākotnējā profilā",
   "account.cancel_follow_request": "Atsaukt sekošanas pieprasījumu",
@@ -48,7 +49,9 @@
   "account.mention": "Pieminēt @{name}",
   "account.moved_to": "{name} norādīja, ka viņu jaunais konts tagad ir:",
   "account.mute": "Apklusināt @{name}",
+  "account.mute_short": "Apklusināt",
   "account.muted": "Apklusināts",
+  "account.no_bio": "Apraksts nav sniegts.",
   "account.open_original_page": "Atvērt oriģinālo lapu",
   "account.posts": "Ieraksti",
   "account.posts_with_replies": "Ieraksti un atbildes",
@@ -104,6 +107,7 @@
   "column.direct": "Privāti pieminēti",
   "column.directory": "Pārlūkot profilus",
   "column.domain_blocks": "Bloķētie domēni",
+  "column.favourites": "Iecienīti",
   "column.follow_requests": "Sekošanas pieprasījumi",
   "column.home": "Sākums",
   "column.lists": "Saraksti",
@@ -124,6 +128,7 @@
   "community.column_settings.remote_only": "Tikai attālinātie",
   "compose.language.change": "Mainīt valodu",
   "compose.language.search": "Meklēt valodas...",
+  "compose.published.open": "Atvērt",
   "compose_form.direct_message_warning_learn_more": "Uzzināt vairāk",
   "compose_form.encryption_warning": "Ziņas vietnē Mastodon nav pilnībā šifrētas. Nedalies ar sensitīvu informāciju caur Mastodon.",
   "compose_form.hashtag_warning": "Šī ziņa netiks norādīta zem nevienas atsauces, jo tā nav publiska. Tikai publiskās ziņās var meklēt pēc atsauces.",
@@ -177,7 +182,6 @@
   "conversation.open": "Skatīt sarunu",
   "conversation.with": "Ar {names}",
   "copypaste.copied": "Nokopēts",
-  "copypaste.copy": "Kopēt",
   "copypaste.copy_to_clipboard": "Kopēt uz starpliktuvi",
   "directory.federated": "No pazīstamas federācijas",
   "directory.local": "Tikai no {domain}",
@@ -252,6 +256,7 @@
   "filter_modal.select_filter.subtitle": "Izmanto esošu kategoriju vai izveido jaunu",
   "filter_modal.select_filter.title": "Filtrēt šo ziņu",
   "filter_modal.title.status": "Filtrēt ziņu",
+  "firehose.remote": "Citi serveri",
   "follow_request.authorize": "Autorizēt",
   "follow_request.reject": "Noraidīt",
   "follow_requests.unlocked_explanation": "Lai gan tavs konts nav bloķēts, {domain} darbinieki iedomājās, ka, iespējams, vēlēsies pārskatīt pieprasījumus no šiem kontiem.",
@@ -287,7 +292,6 @@
   "interaction_modal.description.reply": "Ar Mastodon kontu tu vari atbildēt uz šo ziņu.",
   "interaction_modal.on_another_server": "Citā serverī",
   "interaction_modal.on_this_server": "Šajā serverī",
-  "interaction_modal.preamble": "Tā kā Mastodon ir decentralizēts, tu vari izmantot savu esošo kontu, ko mitina cits Mastodon serveris vai saderīga platforma, ja tev nav konta šajā serverī.",
   "interaction_modal.title.follow": "Sekot {name}",
   "interaction_modal.title.reblog": "Pastiprināt {name} ierakstu",
   "interaction_modal.title.reply": "Atbildēt uz {name} ziņu",
@@ -454,6 +458,7 @@
   "picture_in_picture.restore": "Novietot atpakaļ",
   "poll.closed": "Pabeigta",
   "poll.refresh": "Atsvaidzināt",
+  "poll.reveal": "Skatīt rezultātus",
   "poll.total_people": "{count, plural, zero {# cilvēku} one {# persona} other {# cilvēki}}",
   "poll.total_votes": "{count, plural, zero {# balsojumu} one {# balsojums} other {# balsojumi}}",
   "poll.vote": "Balsot",
diff --git a/app/javascript/mastodon/locales/ml.json b/app/javascript/mastodon/locales/ml.json
index 630d5c430e..dfc9f98cfe 100644
--- a/app/javascript/mastodon/locales/ml.json
+++ b/app/javascript/mastodon/locales/ml.json
@@ -136,7 +136,6 @@
   "conversation.open": "സംഭാഷണം കാണുക",
   "conversation.with": "{names} കൂടെ",
   "copypaste.copied": "പകർത്തി",
-  "copypaste.copy": "പകര്‍ത്തുക",
   "directory.federated": "അറിയപ്പെടുന്ന ഫെഡിവേഴ്‌സ്ൽ നിന്ന്",
   "directory.local": "{domain} ൽ നിന്ന് മാത്രം",
   "directory.new_arrivals": "പുതിയ വരവുകൾ",
diff --git a/app/javascript/mastodon/locales/mr.json b/app/javascript/mastodon/locales/mr.json
index 126df3a7e8..abb2f474d6 100644
--- a/app/javascript/mastodon/locales/mr.json
+++ b/app/javascript/mastodon/locales/mr.json
@@ -137,7 +137,6 @@
   "interaction_modal.description.reply": "मॅस्टोडॉनवरील खात्यासह, तुम्ही या पोस्टला प्रतिसाद देऊ शकता.",
   "interaction_modal.on_another_server": "वेगळ्या सर्व्हरवर",
   "interaction_modal.on_this_server": "या सर्व्हरवर",
-  "interaction_modal.preamble": "मास्टोडॉन विकेंद्रित असल्याने, तुमचे खाते नसेल तर तुम्ही दुसरे मॅस्टोडॉन सर्व्हर किंवा सुसंगत प्लॅटफॉर्मद्वारे होस्ट केलेले तुमचे विद्यमान खाते वापरू शकता.",
   "interaction_modal.title.follow": "{name} चे अनुसरण करा",
   "interaction_modal.title.reblog": "{name} ची पोस्ट बूस्ट करा",
   "interaction_modal.title.reply": "{name} च्या पोस्टला उत्तर द्या",
diff --git a/app/javascript/mastodon/locales/ms.json b/app/javascript/mastodon/locales/ms.json
index a1f1d61f3d..8b389c48fa 100644
--- a/app/javascript/mastodon/locales/ms.json
+++ b/app/javascript/mastodon/locales/ms.json
@@ -21,6 +21,7 @@
   "account.blocked": "Disekat",
   "account.browse_more_on_origin_server": "Layari selebihnya di profil asal",
   "account.cancel_follow_request": "Menarik balik permintaan mengikut",
+  "account.direct": "Sebut secara persendirian @{name}",
   "account.disable_notifications": "Berhenti maklumkan saya apabila @{name} mengirim hantaran",
   "account.domain_blocked": "Domain disekat",
   "account.edit_profile": "Sunting profil",
@@ -39,6 +40,7 @@
   "account.follows_you": "Mengikuti anda",
   "account.go_to_profile": "Pergi ke profil",
   "account.hide_reblogs": "Sembunyikan galakan daripada @{name}",
+  "account.in_memoriam": "Dalam Memoriam.",
   "account.joined_short": "Menyertai",
   "account.languages": "Tukar bahasa yang dilanggan",
   "account.link_verified_on": "Pemilikan pautan ini telah disemak pada {date}",
@@ -47,7 +49,10 @@
   "account.mention": "Sebut @{name}",
   "account.moved_to": "{name} telah menandakan bahawa akaun baru mereka sekarang ialah:",
   "account.mute": "Bisukan @{name}",
+  "account.mute_notifications_short": "Redam pemberitahuan",
+  "account.mute_short": "Redam",
   "account.muted": "Dibisukan",
+  "account.no_bio": "Tiada penerangan diberikan.",
   "account.open_original_page": "Buka halaman asal",
   "account.posts": "Hantaran",
   "account.posts_with_replies": "Hantaran dan balasan",
@@ -70,6 +75,8 @@
   "admin.dashboard.retention.average": "Purata",
   "admin.dashboard.retention.cohort": "Bulan pendaftaran",
   "admin.dashboard.retention.cohort_size": "Pengguna baru",
+  "admin.impact_report.instance_accounts": "Profil akaun ini akan dipadamkan",
+  "admin.impact_report.title": "Ringkasan kesan",
   "alert.rate_limited.message": "Sila cuba semula selepas {retry_time, time, medium}.",
   "alert.rate_limited.title": "Kadar terhad",
   "alert.unexpected.message": "Berlaku ralat di luar jangkaan.",
@@ -102,6 +109,7 @@
   "column.community": "Garis masa tempatan",
   "column.directory": "Layari profil",
   "column.domain_blocks": "Domain disekat",
+  "column.favourites": "Kegemaran",
   "column.follow_requests": "Permintaan ikutan",
   "column.home": "Laman Utama",
   "column.lists": "Senarai",
@@ -122,6 +130,8 @@
   "community.column_settings.remote_only": "Jauh sahaja",
   "compose.language.change": "Tukar bahasa",
   "compose.language.search": "Cari bahasa...",
+  "compose.published.body": "Pos telah diterbitkan.",
+  "compose.published.open": "Buka",
   "compose_form.direct_message_warning_learn_more": "Ketahui lebih lanjut",
   "compose_form.encryption_warning": "Hantaran pada Mastodon tidak disulitkan hujung ke hujung. Jangan berkongsi sebarang maklumat sensitif melalui Mastodon.",
   "compose_form.hashtag_warning": "Hantaran ini tidak akan disenaraikan di bawah mana-mana tanda pagar kerana ia tidak tersenarai. Hanya hantaran awam sahaja boleh dicari menggunakan tanda pagar.",
@@ -158,12 +168,14 @@
   "confirmations.discard_edit_media.message": "Anda belum menyimpan perubahan pada penerangan atau pratonton media. Anda ingin membuangnya?",
   "confirmations.domain_block.confirm": "Sekat keseluruhan domain",
   "confirmations.domain_block.message": "Adakah anda betul-betul, sungguh-sungguh pasti anda ingin menyekat keseluruhan {domain}? Selalunya, beberapa sekatan atau pembisuan tersasar sudah memadai dan lebih diutamakan. Anda tidak akan nampak kandungan daripada domain tersebut di mana-mana garis masa awam mahupun pemberitahuan anda. Pengikut anda daripada domain tersebut juga akan dibuang.",
+  "confirmations.edit.confirm": "Sunting",
   "confirmations.logout.confirm": "Log keluar",
   "confirmations.logout.message": "Adakah anda pasti anda ingin log keluar?",
   "confirmations.mute.confirm": "Bisukan",
   "confirmations.mute.explanation": "Ini akan menyembunyikan hantaran daripada mereka dan juga hantaran yang menyebut mereka, tetapi ia masih membenarkan mereka melihat hantaran anda dan mengikuti anda.",
   "confirmations.mute.message": "Adakah anda pasti anda ingin membisukan {name}?",
   "confirmations.redraft.confirm": "Padam & rangka semula",
+  "confirmations.redraft.message": "Adakah anda pasti anda ingin memadam pos ini dan merangkanya semula? Kegemaran dan galakan akan hilang, dan balasan ke pos asal akan menjadi yatim.",
   "confirmations.reply.confirm": "Balas",
   "confirmations.reply.message": "Membalas sekarang akan menulis ganti mesej yang anda sedang karang. Adakah anda pasti anda ingin teruskan?",
   "confirmations.unfollow.confirm": "Nyahikut",
@@ -173,7 +185,7 @@
   "conversation.open": "Lihat perbualan",
   "conversation.with": "Dengan {names}",
   "copypaste.copied": "Disalin",
-  "copypaste.copy": "Salin",
+  "copypaste.copy_to_clipboard": "Salin ke papan klip",
   "directory.federated": "Dari fediverse yang diketahui",
   "directory.local": "Dari {domain} sahaja",
   "directory.new_arrivals": "Ketibaan baharu",
@@ -183,7 +195,9 @@
   "dismissable_banner.community_timeline": "Inilah hantaran awam terkini daripada orang yang akaun dihos oleh {domain}.",
   "dismissable_banner.dismiss": "Ketepikan",
   "dismissable_banner.explore_links": "Berita-berita ini sedang dibualkan oleh orang di pelayar ini dan pelayar lain dalam rangkaian terpencar sekarang.",
+  "dismissable_banner.explore_statuses": "Ini adalah pos dari seluruh web sosial yang semakin menarik perhatian hari ini. Pos baharu dengan lebih banyak rangsangan dan kegemaran diberi kedudukan lebih tinggi.",
   "dismissable_banner.explore_tags": "Tanda-tanda pagar ini daripada pelayar ini dan pelayar lain dalam rangkaian terpencar sedang hangat pada pelayar ini sekarang.",
+  "dismissable_banner.public_timeline": "Ini ialah pos awam terbaharu daripada orang di web sosial yang diikuti oleh orang di {domain}.",
   "embed.instructions": "Benam hantaran ini di laman sesawang anda dengan menyalin kod berikut.",
   "embed.preview": "Begini rupanya nanti:",
   "emoji_button.activity": "Aktiviti",
@@ -225,6 +239,7 @@
   "errors.unexpected_crash.copy_stacktrace": "Salin surih tindanan ke papan keratan",
   "errors.unexpected_crash.report_issue": "Laporkan masalah",
   "explore.search_results": "Hasil carian",
+  "explore.suggested_follows": "Orang",
   "explore.title": "Terokai",
   "explore.trending_links": "Baru",
   "explore.trending_statuses": "Hantar",
@@ -245,6 +260,9 @@
   "filter_modal.select_filter.subtitle": "Gunakan kumpulan yang sedia ada atau mencipta kumpulan baru",
   "filter_modal.select_filter.title": "Tapiskan hantaran ini",
   "filter_modal.title.status": "Tapiskan sesuatu hantaran",
+  "firehose.all": "Semua",
+  "firehose.local": "Server ini",
+  "firehose.remote": "Server lain",
   "follow_request.authorize": "Benarkan",
   "follow_request.reject": "Tolak",
   "follow_requests.unlocked_explanation": "Walaupun akaun anda tidak dikunci, kakitangan {domain} merasakan anda mungkin ingin menyemak permintaan ikutan daripada akaun ini secara manual.",
@@ -270,17 +288,21 @@
   "hashtag.column_settings.tag_toggle": "Sertakan tag tambahan untuk lajur ini",
   "hashtag.follow": "Ikuti hashtag",
   "hashtag.unfollow": "Nyahikut tanda pagar",
+  "home.actions.go_to_explore": "Lihat apa yand sedang tren",
+  "home.actions.go_to_suggestions": "Cari orang untuk diikuti",
   "home.column_settings.basic": "Asas",
   "home.column_settings.show_reblogs": "Tunjukkan galakan",
   "home.column_settings.show_replies": "Tunjukkan balasan",
+  "home.explore_prompt.title": "Ini adalah pusat operasi anda dalam Mastodon.",
   "home.hide_announcements": "Sembunyikan pengumuman",
   "home.show_announcements": "Tunjukkan pengumuman",
   "interaction_modal.description.follow": "Dengan akaun pada Mastodon, anda boleh mengikut {name} untuk menerima hantaran mereka di suapan rumah anda.",
   "interaction_modal.description.reblog": "Dengan akaun pada Mastodon, anda boleh menggalakkan hantaran ini untuk dikongsi dengan pengikut anda.",
   "interaction_modal.description.reply": "Dengan akaun pada Mastodon, anda boleh membalas kepada hantaran ini.",
+  "interaction_modal.login.action": "Bawa saya pulang rumah",
+  "interaction_modal.no_account_yet": "Tak di Mastadon?",
   "interaction_modal.on_another_server": "Di pelayan lain",
   "interaction_modal.on_this_server": "Pada pelayan ini",
-  "interaction_modal.preamble": "Oleh sebab Mastodon terpencar, anda boleh menggunakan akaun sedia ada anda yang dihos oleh pelayan Mastodon lain atau platform yang serasi jika anda tidak mempunyai akaun pada platform ini.",
   "interaction_modal.title.follow": "Ikuti {name}",
   "interaction_modal.title.reblog": "Galak hantaran {name}",
   "interaction_modal.title.reply": "Balas siaran {name}",
@@ -296,6 +318,7 @@
   "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "to move down in the list",
   "keyboard_shortcuts.enter": "Buka hantaran",
+  "keyboard_shortcuts.favourites": "Buka senarai kegemaran",
   "keyboard_shortcuts.federated": "to open federated timeline",
   "keyboard_shortcuts.heading": "Pintasan papan kekunci",
   "keyboard_shortcuts.home": "to open home timeline",
@@ -326,6 +349,7 @@
   "lightbox.previous": "Sebelumnya",
   "limited_account_hint.action": "Paparkan profil",
   "limited_account_hint.title": "Profil ini telah disembunyikan oleh moderator {domain}.",
+  "link_preview.author": "Dengan {name}",
   "lists.account.add": "Tambah ke senarai",
   "lists.account.remove": "Buang daripada senarai",
   "lists.delete": "Padam senarai",
@@ -355,6 +379,7 @@
   "navigation_bar.domain_blocks": "Domain disekat",
   "navigation_bar.edit_profile": "Sunting profil",
   "navigation_bar.explore": "Teroka",
+  "navigation_bar.favourites": "Kegemaran",
   "navigation_bar.filters": "Perkataan yang dibisukan",
   "navigation_bar.follow_requests": "Permintaan ikutan",
   "navigation_bar.followed_tags": "Ikuti hashtag",
@@ -384,6 +409,7 @@
   "notifications.column_settings.admin.report": "Laporan baru:",
   "notifications.column_settings.admin.sign_up": "Pendaftaran baru:",
   "notifications.column_settings.alert": "Pemberitahuan atas meja",
+  "notifications.column_settings.favourite": "Kegemaran:",
   "notifications.column_settings.filter_bar.advanced": "Papar semua kategori",
   "notifications.column_settings.filter_bar.category": "Bar penapis pantas",
   "notifications.column_settings.filter_bar.show_bar": "Paparkan bar penapis",
@@ -401,6 +427,7 @@
   "notifications.column_settings.update": "Suntingan:",
   "notifications.filter.all": "Semua",
   "notifications.filter.boosts": "Galakan",
+  "notifications.filter.favourites": "Kegemaran",
   "notifications.filter.follows": "Ikutan",
   "notifications.filter.mentions": "Sebutan",
   "notifications.filter.polls": "Keputusan undian",
@@ -414,22 +441,36 @@
   "notifications_permission_banner.enable": "Dayakan pemberitahuan atas meja",
   "notifications_permission_banner.how_to_control": "Untuk mendapat pemberitahuan ketika Mastodon tidak dibuka, dayakan pemberitahuan atas meja. Anda boleh mengawal jenis interaksi mana yang menjana pemberitahuan atas meja melalui butang {icon} di atas setelah ia didayakan.",
   "notifications_permission_banner.title": "Jangan terlepas apa-apa",
+  "onboarding.action.back": "Bawa saya kembali",
+  "onboarding.actions.back": "Bawa saya kembali",
   "onboarding.actions.go_to_explore": "See what's trending",
   "onboarding.actions.go_to_home": "Go to your home feed",
+  "onboarding.compose.template": "Hello #Mastodon!",
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
   "onboarding.follows.title": "Popular on Mastodon",
+  "onboarding.share.next_steps": "Langkah seterusnya yang mungkin:",
+  "onboarding.share.title": "Berkongsi profil anda",
   "onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:",
   "onboarding.start.skip": "Want to skip right ahead?",
+  "onboarding.start.title": "Anda telah berjaya!",
   "onboarding.steps.follow_people.body": "You curate your own feed. Lets fill it with interesting people.",
   "onboarding.steps.follow_people.title": "Follow {count, plural, one {one person} other {# people}}",
   "onboarding.steps.publish_status.body": "Say hello to the world.",
+  "onboarding.steps.publish_status.title": "Buat pos pertama anda",
   "onboarding.steps.setup_profile.body": "Others are more likely to interact with you with a filled out profile.",
   "onboarding.steps.setup_profile.title": "Customize your profile",
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
+  "onboarding.tips.2fa": "<strong>Tahukah anda?</strong> Anda boleh melindungi akaun anda dengan menyediakan pengesahan dua faktor dalam tetapan akaun anda. Ia berfungsi dengan mana-mana aplikasi TOTP pilihan anda, tiada nombor telefon diperlukan!",
+  "onboarding.tips.accounts_from_other_servers": "<strong>Tahukah anda?</strong> Memandangkan Mastodon tidak berpusat, beberapa profil yang anda temui akan dihoskan pada server selain anda. Namun anda boleh berinteraksi dengan mereka dengan lancar! Server mereka berada di separuh kedua nama pengguna mereka!",
+  "onboarding.tips.migration": "<strong>Tahukah anda?</strong> Jika anda rasa {domain} bukan pilihan server yang bagus untuk anda pada masa hadapan, anda boleh beralih ke server Mastodon yang lain tanpa kehilangan pengikut anda. Anda juga boleh mengehoskan server anda sendiri!",
+  "onboarding.tips.verification": "<strong>Tahukah anda?</strong> Anda boleh mengesahkan akaun anda dengan meletakkan pautan ke profil Mastodon anda pada tapak web anda sendiri dan menambah tapak web pada profil anda. Tiada bayaran atau dokumen diperlukan!",
+  "password_confirmation.exceeds_maxlength": "Pengesahan kata laluan melebihi panjang kata laluan maksimum",
+  "password_confirmation.mismatching": "Pengesahan kata laluan tidak sepadan",
   "picture_in_picture.restore": "Letak semula",
   "poll.closed": "Ditutup",
   "poll.refresh": "Muat semula",
+  "poll.reveal": "Hasil carian",
   "poll.total_people": "{count, plural, other {# orang}}",
   "poll.total_votes": "{count, plural, other {# undian}}",
   "poll.vote": "Undi",
@@ -482,6 +523,8 @@
   "report.placeholder": "Ulasan tambahan",
   "report.reasons.dislike": "Saya tidak suka",
   "report.reasons.dislike_description": "Inilah sesuatu yang anda tidak ingin lihat",
+  "report.reasons.legal": "Ia haram",
+  "report.reasons.legal_description": "Anda percaya ia melanggar undang-undang negara anda atau negara server",
   "report.reasons.other": "Inilah sesuatu yang lain",
   "report.reasons.other_description": "Isu ini tidak sesuai untuk kategori lain",
   "report.reasons.spam": "Inilah spam",
@@ -501,12 +544,22 @@
   "report.unfollow": "Nyahikut @{name}",
   "report.unfollow_explanation": "Anda sedang mengikuti akaun ini. Untuk memadam siaran mereka daripada suapan berita anda, nyahikutkan mereka.",
   "report_notification.attached_statuses": "{count, plural, other {{count} hantaran}} dilampirkan",
+  "report_notification.categories.legal": "Sah",
   "report_notification.categories.other": "Lain-lain",
   "report_notification.categories.spam": "Spam",
   "report_notification.categories.violation": "Langgaran peraturan",
   "report_notification.open": "Buka laporan",
+  "search.no_recent_searches": "Tiada carian terkini",
   "search.placeholder": "Cari",
+  "search.quick_action.account_search": "Pos sepadan {x}",
+  "search.quick_action.go_to_account": "Pergi ke profil {x}",
+  "search.quick_action.go_to_hashtag": "Pergi ke hashtag {x}",
+  "search.quick_action.open_url": "Buka URL dalam Mastadon",
+  "search.quick_action.status_search": "Pos sepadan {x}",
   "search.search_or_paste": "Cari atau tampal URL",
+  "search_popout.quick_actions": "Tindakan pantas",
+  "search_popout.recent": "Carian terkini",
+  "search_results.accounts": "Profil",
   "search_results.all": "Semua",
   "search_results.hashtags": "Tanda pagar",
   "search_results.nothing_found": "Tidak dapat menemui apa-apa untuk istilah carian tersebut",
@@ -522,6 +575,7 @@
   "server_banner.server_stats": "Statistik pelayan:",
   "sign_in_banner.create_account": "Cipta akaun",
   "sign_in_banner.sign_in": "Daftar masuk",
+  "sign_in_banner.sso_redirect": "Log masuk atau mendaftar",
   "status.admin_account": "Buka antara muka penyederhanaan untuk @{name}",
   "status.admin_domain": "antara muka penyederhanaan",
   "status.admin_status": "Buka hantaran ini dalam antara muka penyederhanaan",
@@ -536,11 +590,15 @@
   "status.edited": "Disunting {date}",
   "status.edited_x_times": "Disunting {count, plural, other {{count} kali}}",
   "status.embed": "Benaman",
+  "status.favourite": "Kegemaran",
   "status.filter": "Tapiskan hantaran ini",
   "status.filtered": "Ditapis",
+  "status.hide": "Sembunyikan pos",
   "status.history.created": "{name} mencipta pada {date}",
   "status.history.edited": "{name} menyunting pada {date}",
   "status.load_more": "Muatkan lagi",
+  "status.media.open": "Klik untuk membuka",
+  "status.media.show": "Klik untuk menunjukkan",
   "status.media_hidden": "Media disembunyikan",
   "status.mention": "Sebut @{name}",
   "status.more": "Lagi",
@@ -571,6 +629,7 @@
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
   "status.translate": "Menterjemah",
   "status.translated_from_with": "Diterjemah daripada {lang} dengan {provider}",
+  "status.uncached_media_warning": "Pratonton tidak tersedia",
   "status.unmute_conversation": "Nyahbisukan perbualan",
   "status.unpin": "Nyahsemat daripada profil",
   "subscribed_languages.lead": "Hanya hantaran dalam bahasa-bahasa terpilih akan dipaparkan pada garis masa rumah dan senarai selepas perubahan. Pilih tiada untuk menerima hantaran dalam semua bahasa.",
@@ -618,6 +677,7 @@
   "upload_modal.preview_label": "Pratonton ({ratio})",
   "upload_progress.label": "Memuat naik...",
   "upload_progress.processing": "Memproses…",
+  "username.taken": "Nama pengguna tersebut sudah digunakan. Sila cuba lagi",
   "video.close": "Tutup video",
   "video.download": "Muat turun fail",
   "video.exit_fullscreen": "Keluar skrin penuh",
diff --git a/app/javascript/mastodon/locales/my.json b/app/javascript/mastodon/locales/my.json
index fadc89a7bd..cd3858ae72 100644
--- a/app/javascript/mastodon/locales/my.json
+++ b/app/javascript/mastodon/locales/my.json
@@ -1,9 +1,9 @@
 {
-  "about.blocks": "ထိန်းချုပ်ထားသော ဆာဗာများ",
+  "about.blocks": "ထိန်းချုပ်မှုရှိသော ဆာဗာများ",
   "about.contact": "ဆက်သွယ်ရန်:",
-  "about.disclaimer": "Mastodon သည် အခမဲ့ဖြစ်ပြီး open-source software နှင့် Mastodon gGmbH ၏ ကုန်အမှတ်တံဆိပ်တစ်ခုဖြစ်သည်။",
+  "about.disclaimer": "Mastodon သည် အခမဲ့ဖြစ်ပြီး open-source software နှင့် Mastodon gGmbH ၏ ကုန်အမှတ်တံဆိပ်တစ်ခုဖြစ်သည်။.",
   "about.domain_blocks.no_reason_available": "အကြောင်းပြချက်မရှိပါ",
-  "about.domain_blocks.preamble": "Mastodon သည် ယေဘူယျအားဖြင့် သင့်အား အစုအဝေးရှိ အခြားဆာဗာများမှ အသုံးပြုသူများထံမှ အကြောင်းအရာများကို ကြည့်ရှုပြီး အပြန်အလှန် တုံ့ပြန်နိုင်စေပါသည်။ ဤအရာများသည် ဤအထူးဆာဗာတွင် ပြုလုပ်ထားသော ခြွင်းချက်ဖြစ်သည်။",
+  "about.domain_blocks.preamble": "Mastodon သည် ယေဘုယျအားဖြင့် fediverse ရှိ အခြား​ဆာဗာ အသုံးပြုသူများထံမှ အကြောင်းအရာများကို ကြည့်ရှုနိုင်သည့်အပြင် အပြန်အလှန်တုံ့ပြန်နိုင်စေပါသည်။ ဤသည်တို့မှာ သီးခြားဆာဗာများအတွက် ပြုလုပ်ထားသောအရာများဖြစ်သည်။",
   "about.domain_blocks.silenced.explanation": "ရှင်းရှင်းလင်းလင်း ရှာကြည့်ခြင်း သို့မဟုတ် လိုက်ကြည့်ခြင်းဖြင့် ၎င်းကို ရွေးချယ်ခြင်းမှလွဲ၍ ဤဆာဗာမှ ပရိုဖိုင်များနှင့် အကြောင်းအရာများကို ယေဘုယျအားဖြင့် သင်သည် မမြင်ရပါ။",
   "about.domain_blocks.silenced.title": "ကန့်သတ်ထားသော",
   "about.domain_blocks.suspended.explanation": "ဤဆာဗာမှ ဒေတာများကို စီမံဆောင်ရွက်ခြင်း၊ သိမ်းဆည်းခြင်း သို့မဟုတ် ဖလှယ်ခြင်း မပြုဘဲ၊ ဤဆာဗာမှ အသုံးပြုသူများနှင့် အပြန်အလှန် ဆက်သွယ်မှု သို့မဟုတ် ဆက်သွယ်မှုတို့ကို မဖြစ်နိုင်အောင် ပြုလုပ်ပေးမည်မဟုတ်ပါ။",
@@ -31,7 +31,7 @@
   "account.featured_tags.last_status_never": "ပို့စ်တင်ထားခြင်းမရှိပါ",
   "account.featured_tags.title": "ဖော်ပြထားသောဟက်ရှ်တက်ခ်များ",
   "account.follow": "စောင့်ကြည့်",
-  "account.followers": "စောင့်ကြည့်သူ",
+  "account.followers": "စောင့်ကြည့်သူများ",
   "account.followers.empty": "ဤသူကို စောင့်ကြည့်သူ မရှိသေးပါ။",
   "account.followers_counter": "{count, plural, one {စောင့်ကြည့်သူ {counter}} other {စောင့်ကြည့်သူများ {counter}}}",
   "account.following": "စောင့်ကြည့်နေသည်",
@@ -181,6 +181,7 @@
   "confirmations.mute.explanation": "၎င်းသည် ၎င်းတို့ထံမှ ပို့စ်များနှင့် ၎င်းတို့ကို ဖော်ပြထားသော ပို့စ်များကို ဖျောက်ထားမည်ဖြစ်ပြီး၊ သို့သော် ၎င်းတို့သည် သင့်ပို့စ်များကို မြင်နိုင်ပြီး သင့်အား လိုက်ကြည့်နိုင်စေမည်ဖြစ်သည်။",
   "confirmations.mute.message": "{name} ကို မမြင်လိုသည်မှာ သေချာပါသလား။ ",
   "confirmations.redraft.confirm": "ဖျက်ပြီး ပြန်လည်ရေးမည်။",
+  "confirmations.redraft.message": "သင် ဒီပိုစ့်ကိုဖျက်ပြီး ပြန်တည်းဖြတ်မှာ သေချာပြီလား။ ကြယ်ပွင့်​တွေ နဲ့ ပြန်မျှ​ဝေမှု​တွေကိုဆုံးရှုံးမည်။မူရင်းပို့စ်ဆီကို ပြန်စာ​တွေမှာလည်း​ \nပိုစ့်ကို​တွေ့ရမည်မဟုတ်​တော့ပါ။.",
   "confirmations.reply.confirm": "စာပြန်မည်",
   "confirmations.reply.message": "စာပြန်လျှင်ယခင်စာများကိုအလိုအလျောက်ပျက်သွားစေမည်။ ဆက်လက်လုပ်ဆောင်မည်လား?",
   "confirmations.unfollow.confirm": "စောင့်ကြည့်ခြင်းအား ပယ်ဖျက်မည်",
@@ -190,7 +191,6 @@
   "conversation.open": "Conversation ကိုကြည့်မည်",
   "conversation.with": "{အမည်များ} ဖြင့်",
   "copypaste.copied": "ကူယူပြီးပါပြီ",
-  "copypaste.copy": "ကူးယူပါ",
   "copypaste.copy_to_clipboard": "ကလစ်ဘုတ်သို့ ကူးပါ",
   "directory.federated": "သင် သိသော ဖက်ဒီမှ",
   "directory.local": "{domain} မှသာလျှင်\n",
@@ -201,6 +201,7 @@
   "dismissable_banner.community_timeline": "အကောင့်များမှ လတ်တလောတင်ထားသည့်အများမြင်ပို့စ်များမှာ {domain} တွင် တင်ထားသောပို့စ်များဖြစ်သည်။",
   "dismissable_banner.dismiss": "ပယ်ရန်",
   "dismissable_banner.explore_links": "ဤသတင်းများကို ယခုအချိန်တွင် ဗဟိုချုပ်ကိုင်မှုလျှော့ချထားသော ကွန်ရက်၏ အခြားဆာဗာများမှ လူများက ပြောဆိုနေကြပါသည်။",
+  "dismissable_banner.explore_statuses": "ဒီ​နေ့အတွက် လူမှုကွန်ရက်​ပေါ်မှာ စိတ်ဝင်စားမှူများ​နေတဲ့ ပို့စ်​တွေရှိပါတယ်။ပြန်မျှ​ဝေမှုနဲ့ကြယ်ပွင့်များ တဲ့ပိုစ့်အသစ်​တွေကို ပိုမြင်ရမှာပါ။.",
   "dismissable_banner.explore_tags": "ဤ hashtag များသည် ယခုအချိန်တွင် ဗဟိုချုပ်ကိုင်မှုလျှော့ချထားသော ကွန်ရက်၏ အခြားဆာဗာများပေါ်ရှိ လူများကြားတွင် ဆွဲဆောင်မှုရှိလာပါသည်",
   "dismissable_banner.public_timeline": "ဤအရာများသည် {domain} ရှိလူများ လိုက်နာသော လူမှုဝဘ်ပေါ်ရှိ လူများထံမှ လတ်တလော အများမြင်ပို့စ်များဖြစ်သည်။",
   "embed.instructions": "Embed this status on your website by copying the code below.",
@@ -301,7 +302,7 @@
   "home.column_settings.basic": "အခြေခံ",
   "home.column_settings.show_reblogs": "Boost များကို ပြပါ",
   "home.column_settings.show_replies": "ပြန်စာများကို ပြပါ",
-  "home.explore_prompt.body": "သင့်ပင်မစာမျက်နှာတွင် သင်စောင့်ကြည့်ရန်ရွေးချယ်ထားသော hashtag များမှ ပို့စ်များ၊ စောင့်ကြည့်ထားသူများနှင့် ၎င်းတို့ boost လုပ်ထားသော ပို့စ်များ ပြထားပါလိမ့်မည်။ ယခု ပင်မစာမျက်နှာမှာ ငြိမ်သက်နေပါသည်။",
+  "home.explore_prompt.body": "သင့်ရဲ့သတင်းစဥ် မှာ သင် စောင့်ကြည့်​နေတယ့် ခေါင်းစဥ်​တွေ၊သင်​စောင့်ကြည့်​နေတယ့်အ​ကောင့်​တွေ နဲ့ အဆိုပါ အ​ကောင့်​တွေပြန်မျှ​ဝေထားတယ့် ပိုစ့်​တွေကို မြင်ရမှာပါ။:",
   "home.explore_prompt.title": "ဤသည်မှာ Mastodon ရှိ သင့်ပင်မစာမျက်နှာဖြစ်သည်။",
   "home.hide_announcements": "ကြေညာချက်များကို ဖျောက်ပါ",
   "home.show_announcements": "ကြေညာချက်များကို ပြပါ",
@@ -309,10 +310,13 @@
   "interaction_modal.description.follow": "Mastodon အကောင့်ဖြင့် သင်၏ ပင်မစာမျက်နှာတွင် ၎င်းတို့၏ ပို့စ်များကို ရရှိရန်အတွက် {name} ကို စောင့်ကြည့်နိုင်ပါသည်။",
   "interaction_modal.description.reblog": "Mastodon အကောင့်တစ်ခုဖြင့် သင်၏စောင့်ကြည့်သူများကို မျှဝေရန်အတွက် ဤပို့စ်ကို Boost လုပ်ပါ။",
   "interaction_modal.description.reply": "Mastodon အကောင့်တစ်ခုဖြင့် သင် ဤပို့စ်ကို တုံ့ပြန်နိုင်ပါသည်။",
+  "interaction_modal.login.action": "ပင်မစာမျက်နှာသို့",
+  "interaction_modal.login.prompt": "သင့်ပင်မဆာဗာ၏ ဒိုမိန်း၊ ဥပမာ၊ mastodon.social",
+  "interaction_modal.no_account_yet": "Mastodon မှာ မဟုတ်ဘူးလား။",
   "interaction_modal.on_another_server": "တခြားဆာဗာပေါ်တွင်",
   "interaction_modal.on_this_server": "ဤဆာဗာတွင်",
-  "interaction_modal.other_server_instructions": "သင်အကြိုက်ဆုံး Mastodon အက်ပ် သို့မဟုတ် သင့် Mastodon ဆာဗာ၏ ဝဘ်ရှိ ရှာဖွေမှုနေရာတွင် ဤ URL ကို ကူးယူပြီး ထည့်ပါ။",
-  "interaction_modal.preamble": "Mastodon မှာ ဗဟိုချုပ်ကိုင်မှု မရှိခြင်းကြောင့် ဤတစ်ခုအတွက် သင့်တွင်အကောင့်မရှိပါက အခြား Mastodon ဆာဗာ သို့မဟုတ် အဆင်ပြေသောပလက်ဖောင်းတွင် ရှိသော သင့်လက်ရှိအကောင့်ဖြင့် အသုံးပြုနိုင်ပါသည်။",
+  "interaction_modal.sign_in": "သင်သည် ဤဆာဗာတွင် လော့ဂ်အင်မဝင်ပါ။ သင့်အကောင့်ကို မည်သည့်ဆာဗာတွင် ဖွင့်ထားပါသလဲ။",
+  "interaction_modal.sign_in_hint": "အကြံပြုချက် - ၎င်းသည် သင် အကောင့်ဖွင့်ထားသည့် ဝဘ်ဆိုက်ဖြစ်သည်။ မမှတ်မိပါက သင့် ဝင်စာပုံးရှိ welcome e-mail ကို ရှာပါ။ သင့်အသုံးပြုသူအမည်အပြည့်အစုံကိုလည်း ထည့်သွင်းနိုင်သည်။ (ဥပမာ @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Favorite {name} ၏ ပို့စ်",
   "interaction_modal.title.follow": "{name} ကို စောင့်ကြည့်မယ်",
   "interaction_modal.title.reblog": "{name} ၏ ပို့စ်ကို Boost လုပ်ပါ",
@@ -361,6 +365,7 @@
   "lightbox.previous": "ရှေ့သို့",
   "limited_account_hint.action": "ဘာပဲဖြစ်ဖြစ် ပရိုဖိုင်ကို ပြပါ",
   "limited_account_hint.title": "ဤပရိုဖိုင်ကို {domain} ၏ စိစစ်သူများမှ ဖျောက်ထားသည်။",
+  "link_preview.author": "{name} ဖြင့်",
   "lists.account.add": "စာရင်းထဲသို့ထည့်ပါ",
   "lists.account.remove": "စာရင်းမှ ဖယ်ရှားလိုက်ပါ။",
   "lists.delete": "စာရင်းကိုဖျက်ပါ",
@@ -593,6 +598,8 @@
   "server_banner.server_stats": "ဆာဗာအား လက်ရှိအသုံးပြုသူများ -",
   "sign_in_banner.create_account": "အကောင့်ဖန်တီးမည်",
   "sign_in_banner.sign_in": "အကောင့်ဝင်မည်",
+  "sign_in_banner.sso_redirect": "အကောင့်ဝင်ပါ သို့မဟုတ် မှတ်ပုံတင်ပါ",
+  "sign_in_banner.text": "ပရိုဖိုင်များ သို့မဟုတ် hashtag များ၊ favorite၊ ပို့စ်မျှဝေမှုများနှင့် ပြန်ကြားစာများအသုံးပြုရန်အတွက် အကောင့်ဝင်ပါ။ အခြားဆာဗာပေါ်ရှိ သင့်အကောင့်မှလည်း အပြန်အလှန်ဖလှယ်နိုင်ပါသည်။",
   "status.admin_account": "@{name} အတွက် စိစစ်ခြင်းကြားခံနယ်ကို ဖွင့်ပါ",
   "status.admin_domain": "{domain} အတွက် စိစစ်ခြင်းကြားခံနယ်ကို ဖွင့်ပါ",
   "status.admin_status": "Open this status in the moderation interface",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index d09d472766..1a5dedd9ec 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -191,7 +191,6 @@
   "conversation.open": "Gesprek tonen",
   "conversation.with": "Met {names}",
   "copypaste.copied": "Gekopieerd",
-  "copypaste.copy": "Kopiëren",
   "copypaste.copy_to_clipboard": "Naar klembord kopiëren",
   "directory.federated": "Fediverse (wat bekend is)",
   "directory.local": "Alleen {domain}",
@@ -296,6 +295,9 @@
   "hashtag.column_settings.tag_mode.any": "Een van deze",
   "hashtag.column_settings.tag_mode.none": "Geen van deze",
   "hashtag.column_settings.tag_toggle": "Additionele tags aan deze kolom toevoegen",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} deelnemer} other {{counter} deelnemers}}",
+  "hashtag.counter_by_uses": "{count, plural, one {{counter} bericht} other {{counter} berichten}}",
+  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} bericht} other {{counter} berichten}} vandaag",
   "hashtag.follow": "Hashtag volgen",
   "hashtag.unfollow": "Hashtag ontvolgen",
   "home.actions.go_to_explore": "De huidige trends bekijken",
@@ -303,7 +305,7 @@
   "home.column_settings.basic": "Algemeen",
   "home.column_settings.show_reblogs": "Boosts tonen",
   "home.column_settings.show_replies": "Reacties tonen",
-  "home.explore_prompt.body": "Jouw starttijdlijn bevat een mix van berichten met hashtags die je hebt gekozen om te volgen, van mensen die je hebt gekozen om te volgen en berichten die ze boosten. Het ziet er nu vrij stil uit, dus wat dacht je ervan om:",
+  "home.explore_prompt.body": "Jouw starttijdlijn bevat een mix van berichten met hashtags die je volgt, van accounts die je volgt en van berichten die deze accounts boosten. Wanneer je dit te stil vind, kun je:",
   "home.explore_prompt.title": "Dit is jouw thuisbasis op Mastodon.",
   "home.hide_announcements": "Mededelingen verbergen",
   "home.show_announcements": "Mededelingen tonen",
@@ -311,10 +313,13 @@
   "interaction_modal.description.follow": "Je kunt met een Mastodon-account {name} volgen, om zo diens berichten op jouw starttijdlijn te ontvangen.",
   "interaction_modal.description.reblog": "Je kunt met een Mastodon-account dit bericht boosten, om het zo met jouw volgers te delen.",
   "interaction_modal.description.reply": "Je kunt met een Mastodon-account op dit bericht reageren.",
+  "interaction_modal.login.action": "Ga naar start",
+  "interaction_modal.login.prompt": "Domein van jouw server, bv. mastodon.social",
+  "interaction_modal.no_account_yet": "Niet op Mastodon?",
   "interaction_modal.on_another_server": "Op een andere server",
   "interaction_modal.on_this_server": "Op deze server",
-  "interaction_modal.other_server_instructions": "Kopieer en plak eenvoudig deze URL in het zoekveld van de door jou gebruikte Mastodon-app of op de website van de Mastodon-server waarop je bent ingelogd.",
-  "interaction_modal.preamble": "Mastodon is gedecentraliseerd. Daarom heb je geen account op deze Mastodon-server nodig, wanneer je al een account op een andere Mastodon-server of compatibel platform hebt.",
+  "interaction_modal.sign_in": "Je bent niet op deze server ingelogd. Op welke server bevindt zich jouw account?",
+  "interaction_modal.sign_in_hint": "Tip: Dat is de website waarop je je hebt geregistreerd. Wanneer je dit bent vergeten kun je naar de welkomstmail zoeken in je inbox. Je kunt ook je volledige gebruikersnaam invullen! (bv. @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Bericht van {name} als favoriet markeren",
   "interaction_modal.title.follow": "{name} volgen",
   "interaction_modal.title.reblog": "Bericht van {name} boosten",
@@ -596,6 +601,7 @@
   "server_banner.server_stats": "Serverstats:",
   "sign_in_banner.create_account": "Registreren",
   "sign_in_banner.sign_in": "Inloggen",
+  "sign_in_banner.sso_redirect": "Inloggen of Registreren",
   "sign_in_banner.text": "Wanneer je een account op deze server hebt, kun je inloggen om mensen of hashtags te volgen, op berichten te reageren of om deze te delen. Wanneer je een account op een andere server hebt, kun je daar inloggen en daar ook interactie met mensen op deze server hebben.",
   "status.admin_account": "Moderatie-omgeving van @{name} openen",
   "status.admin_domain": "Moderatie-omgeving van {domain} openen",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index fad76036fd..731a5b95f5 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -17,7 +17,7 @@
   "account.badges.group": "Gruppe",
   "account.block": "Blokker @{name}",
   "account.block_domain": "Skjul alt frå {domain}",
-  "account.block_short": "Blokkér",
+  "account.block_short": "Blokker",
   "account.blocked": "Blokkert",
   "account.browse_more_on_origin_server": "Sjå gjennom meir på den opphavlege profilen",
   "account.cancel_follow_request": "Trekk attende fylgeførespurnad",
@@ -49,10 +49,10 @@
   "account.mention": "Nemn @{name}",
   "account.moved_to": "{name} seier at deira nye konto no er:",
   "account.mute": "Målbind @{name}",
-  "account.mute_notifications_short": "Demp varsler",
+  "account.mute_notifications_short": "Demp varslingar",
   "account.mute_short": "Demp",
   "account.muted": "Målbunden",
-  "account.no_bio": "Ingen beskrivelse oppgitt.",
+  "account.no_bio": "Inga skildring er gjeven.",
   "account.open_original_page": "Opne originalsida",
   "account.posts": "Tut",
   "account.posts_with_replies": "Tut og svar",
@@ -68,7 +68,7 @@
   "account.unendorse": "Ikkje vis på profil",
   "account.unfollow": "Slutt å fylgja",
   "account.unmute": "Opphev målbinding av @{name}",
-  "account.unmute_notifications_short": "Opphev demping av varsler",
+  "account.unmute_notifications_short": "Opphev demping av varslingar",
   "account.unmute_short": "Opphev målbinding",
   "account_note.placeholder": "Klikk for å leggja til merknad",
   "admin.dashboard.daily_retention": "Mengda brukarar aktive ved dagar etter registrering",
@@ -76,10 +76,10 @@
   "admin.dashboard.retention.average": "Gjennomsnitt",
   "admin.dashboard.retention.cohort": "Registrert månad",
   "admin.dashboard.retention.cohort_size": "Nye brukarar",
-  "admin.impact_report.instance_accounts": "Kontoprofiler dette ville slettet",
-  "admin.impact_report.instance_followers": "Følgere våre brukere ville mistet",
-  "admin.impact_report.instance_follows": "Følgere deres brukere ville mistet",
-  "admin.impact_report.title": "Sammendrag av konsekvensene",
+  "admin.impact_report.instance_accounts": "Kontoprofilar dette vil sletta",
+  "admin.impact_report.instance_followers": "Følgjarar våre brukarar vil mista",
+  "admin.impact_report.instance_follows": "Følgjarar deira brukarar vil mista",
+  "admin.impact_report.title": "Samandrag av konsekvensane",
   "alert.rate_limited.message": "Ver venleg å prøv på nytt etter {retry_time, time, medium}.",
   "alert.rate_limited.title": "Redusert kapasitet",
   "alert.unexpected.message": "Det oppstod eit uventa problem.",
@@ -113,6 +113,7 @@
   "column.direct": "Private omtaler",
   "column.directory": "Sjå gjennom profilar",
   "column.domain_blocks": "Skjulte domene",
+  "column.favourites": "Favorittar",
   "column.firehose": "Tidslinjer",
   "column.follow_requests": "Fylgjeførespurnadar",
   "column.home": "Heim",
@@ -180,6 +181,7 @@
   "confirmations.mute.explanation": "Dette vil skjula innlegg som kjem frå og som nemner dei, men vil framleis la dei sjå innlegga dine og fylgje deg.",
   "confirmations.mute.message": "Er du sikker på at du vil målbinda {name}?",
   "confirmations.redraft.confirm": "Slett & skriv på nytt",
+  "confirmations.redraft.message": "Er du sikker på at du vil sletta denne statusen og skriva han på nytt? Då misser du favorittar og framhevingar, og svar til det opprinnelege innlegget vert foreldrelause.",
   "confirmations.reply.confirm": "Svar",
   "confirmations.reply.message": "Å svara no vil overskriva den meldinga du er i ferd med å skriva. Er du sikker på at du vil halda fram?",
   "confirmations.unfollow.confirm": "Slutt å fylgja",
@@ -189,7 +191,6 @@
   "conversation.open": "Sjå samtale",
   "conversation.with": "Med {names}",
   "copypaste.copied": "Kopiert",
-  "copypaste.copy": "Kopier",
   "copypaste.copy_to_clipboard": "Kopier til utklyppstavla",
   "directory.federated": "Frå den kjende allheimen",
   "directory.local": "Berre frå {domain}",
@@ -200,8 +201,9 @@
   "dismissable_banner.community_timeline": "Dette er dei nylegaste offentlege innlegga frå personar med kontoar frå {domain}.",
   "dismissable_banner.dismiss": "Avvis",
   "dismissable_banner.explore_links": "Desse nyhendesakene snakkast om av folk på denne og andre tenarar på det desentraliserte nettverket no.",
+  "dismissable_banner.explore_statuses": "Dette er innlegg frå det desentraliserte nettverket som er i støytet i dag. Nye statusar som er mykje framheva og merkte som favorittar er rangert høgare.",
   "dismissable_banner.explore_tags": "Desse emneknaggane er populære blant folk på denne tenaren og andre tenarar i det desentraliserte nettverket nett no.",
-  "dismissable_banner.public_timeline": "Dette er de siste offentlige innleggene fra mennesker på det sosiale nettet som folk på {domain} følger.",
+  "dismissable_banner.public_timeline": "Dette er dei nyaste offentlege innlegga frå menneske på det sosiale nettet som folk på {domain} følgjer.",
   "embed.instructions": "Bygg inn denne statusen på nettsida di ved å kopiera koden nedanfor.",
   "embed.preview": "Slik kjem det til å sjå ut:",
   "emoji_button.activity": "Aktivitet",
@@ -228,6 +230,8 @@
   "empty_column.direct": "Du har ingen private omtaler enda. Etter du har sendt eller mottatt en, så vil den dukke opp her.",
   "empty_column.domain_blocks": "Det er ingen skjulte domene til no.",
   "empty_column.explore_statuses": "Ingenting er i støytet nett no. Prøv igjen seinare!",
+  "empty_column.favourited_statuses": "Du har ingen favoritt-statusar ennå. Når du merkjer ein som favoritt, dukkar han opp her.",
+  "empty_column.favourites": "Ingen har merkt denne statusen som favoritt enno. Når nokon gjer det, dukkar dei opp her.",
   "empty_column.follow_requests": "Du har ingen følgjeførespurnadar ennå. Når du får ein, så vil den dukke opp her.",
   "empty_column.followed_tags": "Du fylgjer ingen emneknaggar enno. Når du gjer det, vil dei syna her.",
   "empty_column.hashtag": "Det er ingenting i denne emneknaggen enno.",
@@ -265,9 +269,9 @@
   "filter_modal.select_filter.subtitle": "Bruk ein eksisterande kategori eller opprett ein ny",
   "filter_modal.select_filter.title": "Filtrer dette innlegget",
   "filter_modal.title.status": "Filtrer eit innlegg",
-  "firehose.all": "Alt",
-  "firehose.local": "Denne serveren",
-  "firehose.remote": "Andre servere",
+  "firehose.all": "Alle",
+  "firehose.local": "Denne tenaren",
+  "firehose.remote": "Andre tenarar",
   "follow_request.authorize": "Autoriser",
   "follow_request.reject": "Avvis",
   "follow_requests.unlocked_explanation": "Sjølv om kontoen din ikkje er låst tenkte dei som driv {domain} at du kanskje ville gå gjennom førespurnadar frå desse kontoane manuelt.",
@@ -291,23 +295,32 @@
   "hashtag.column_settings.tag_mode.any": "Kva som helst av desse",
   "hashtag.column_settings.tag_mode.none": "Ingen av desse",
   "hashtag.column_settings.tag_toggle": "Inkluder fleire emneord for denne kolonna",
+  "hashtag.counter_by_accounts": "{count, plural,one {{counter} deltakar} other {{counter} deltakarar}}",
+  "hashtag.counter_by_uses": "{count, plural,one {{counter} innlegg} other {{counter} innlegg}}",
+  "hashtag.counter_by_uses_today": "{count, plural,one {{counter} innlegg} other {{counter} innlegg}} i dag",
   "hashtag.follow": "Fylg emneknagg",
   "hashtag.unfollow": "Slutt å fylgje emneknaggen",
-  "home.actions.go_to_explore": "Se hva som er populært",
-  "home.actions.go_to_suggestions": "Finn folk å følge",
+  "home.actions.go_to_explore": "Sjå kva som er populært",
+  "home.actions.go_to_suggestions": "Finn folk å følgje",
   "home.column_settings.basic": "Grunnleggjande",
   "home.column_settings.show_reblogs": "Vis framhevingar",
   "home.column_settings.show_replies": "Vis svar",
-  "home.explore_prompt.body": "Tidslinjen din vil ha en blanding av innlegg fra emneknagger du har valgt å følge, personene du har valgt å følge, og innleggene de fremhever. Det ser ganske stille ut akkurat nå, så hva med:",
-  "home.explore_prompt.title": "Dette er hjemmet ditt i Mastodon.",
+  "home.explore_prompt.body": "Tidslinja di vil ha ei blanding av innlegg frå emneknaggar du har vald å følgje, personane du har vald å følgje, og innlegga dei framhevar. Om det ser ganske stille ut akkurat no, så kan du:",
+  "home.explore_prompt.title": "Dette er heimen din i Mastodon.",
   "home.hide_announcements": "Skjul kunngjeringar",
   "home.show_announcements": "Vis kunngjeringar",
+  "interaction_modal.description.favourite": "Med ein konto på Mastodon kan du favorittmerkja dette innlegget for å visa forfattaren at du set pris på det, og for å lagra det til seinare.",
   "interaction_modal.description.follow": "Med ein konto på Mastodon kan du fylgja {name} for å sjå innlegga deira i din heimestraum.",
   "interaction_modal.description.reblog": "Med ein konto på Mastodon kan du framheva dette innlegget for å dela det med dine eigne fylgjarar.",
   "interaction_modal.description.reply": "Med ein konto på Mastodon kan du svara på dette innlegget.",
+  "interaction_modal.login.action": "Ta meg heim",
+  "interaction_modal.login.prompt": "Domenenamnet til din heime-tenar. t.d. mastodon.social",
+  "interaction_modal.no_account_yet": "Ikkje på Mastodon?",
   "interaction_modal.on_another_server": "På ein annan tenar",
   "interaction_modal.on_this_server": "På denne tenaren",
-  "interaction_modal.preamble": "Sidan Mastodon er desentralisert, kan du bruke ein konto frå ein annan Mastodontenar eller frå ei anna kompatibel plattform dersom du ikkje har konto på denne tenaren.",
+  "interaction_modal.sign_in": "Du er ikkje logga inn på denne tenaren. På kva for ein tenar høyrer kontoen din heime?",
+  "interaction_modal.sign_in_hint": "Tips: Det er nettstaden der du registrerte deg. Om du har gløymt kvar det var, sjå om du finn velkomst-eposten i innboksen din. Du kan òg skriva inn ditt fulle brukarnamn! (t.d. @Mastodon@mastodon.social)",
+  "interaction_modal.title.favourite": "Marker innlegget til {name} som favoritt",
   "interaction_modal.title.follow": "Fylg {name}",
   "interaction_modal.title.reblog": "Framhev {name} sitt innlegg",
   "interaction_modal.title.reply": "Svar på innlegge til {name}",
@@ -323,6 +336,8 @@
   "keyboard_shortcuts.direct": "åpne kolonnen ned private omtaler",
   "keyboard_shortcuts.down": "Flytt nedover i lista",
   "keyboard_shortcuts.enter": "Opne innlegg",
+  "keyboard_shortcuts.favourite": "Marker innlegget som favoritt",
+  "keyboard_shortcuts.favourites": "Opne favorittlista",
   "keyboard_shortcuts.federated": "Opne den samla tidslina",
   "keyboard_shortcuts.heading": "Snøggtastar",
   "keyboard_shortcuts.home": "Opne heimetidslina",
@@ -353,12 +368,13 @@
   "lightbox.previous": "Førre",
   "limited_account_hint.action": "Vis profilen likevel",
   "limited_account_hint.title": "Denne profilen er skjult av moderatorane på {domain}.",
+  "link_preview.author": "Av {name}",
   "lists.account.add": "Legg til i liste",
   "lists.account.remove": "Fjern frå liste",
   "lists.delete": "Slett liste",
   "lists.edit": "Rediger liste",
   "lists.edit.submit": "Endre tittel",
-  "lists.exclusive": "Skjul disse innleggene i tidslinjen",
+  "lists.exclusive": "Skjul desse innlegga frå heimestraumen din",
   "lists.new.create": "Legg til liste",
   "lists.new.title_placeholder": "Ny listetittel",
   "lists.replies_policy.followed": "Alle fylgde brukarar",
@@ -375,7 +391,7 @@
   "mute_modal.hide_notifications": "Skjul varsel frå denne brukaren?",
   "mute_modal.indefinite": "På ubestemt tid",
   "navigation_bar.about": "Om",
-  "navigation_bar.advanced_interface": "Åpne i det avanserte nettgrensesnittet",
+  "navigation_bar.advanced_interface": "Opne i avansert nettgrensesnitt",
   "navigation_bar.blocks": "Blokkerte brukarar",
   "navigation_bar.bookmarks": "Bokmerke",
   "navigation_bar.community_timeline": "Lokal tidsline",
@@ -385,6 +401,7 @@
   "navigation_bar.domain_blocks": "Skjulte domene",
   "navigation_bar.edit_profile": "Rediger profil",
   "navigation_bar.explore": "Utforsk",
+  "navigation_bar.favourites": "Favorittar",
   "navigation_bar.filters": "Målbundne ord",
   "navigation_bar.follow_requests": "Fylgjeførespurnader",
   "navigation_bar.followed_tags": "Fylgde emneknaggar",
@@ -401,6 +418,7 @@
   "not_signed_in_indicator.not_signed_in": "Du må logga inn for å få tilgang til denne ressursen.",
   "notification.admin.report": "{name} rapporterte {target}",
   "notification.admin.sign_up": "{name} er registrert",
+  "notification.favourite": "{name} markerte innlegget ditt som favoritt",
   "notification.follow": "{name} fylgde deg",
   "notification.follow_request": "{name} har bedt om å fylgja deg",
   "notification.mention": "{name} nemnde deg",
@@ -414,6 +432,7 @@
   "notifications.column_settings.admin.report": "Nye rapportar:",
   "notifications.column_settings.admin.sign_up": "Nyleg registrerte:",
   "notifications.column_settings.alert": "Skrivebordsvarsel",
+  "notifications.column_settings.favourite": "Favorittar:",
   "notifications.column_settings.filter_bar.advanced": "Vis alle kategoriar",
   "notifications.column_settings.filter_bar.category": "Snarfilterlinje",
   "notifications.column_settings.filter_bar.show_bar": "Vis filterlinja",
@@ -431,6 +450,7 @@
   "notifications.column_settings.update": "Redigeringar:",
   "notifications.filter.all": "Alle",
   "notifications.filter.boosts": "Framhevingar",
+  "notifications.filter.favourites": "Favorittar",
   "notifications.filter.follows": "Fylgjer",
   "notifications.filter.mentions": "Omtalar",
   "notifications.filter.polls": "Røysteresultat",
@@ -476,7 +496,7 @@
   "picture_in_picture.restore": "Legg den tilbake",
   "poll.closed": "Lukka",
   "poll.refresh": "Oppdater",
-  "poll.reveal": "Vis resultater",
+  "poll.reveal": "Vis resultat",
   "poll.total_people": "{count, plural, one {# person} other {# folk}}",
   "poll.total_votes": "{count, plural, one {# røyst} other {# røyster}}",
   "poll.vote": "Røyst",
@@ -529,8 +549,8 @@
   "report.placeholder": "Tilleggskommentarar",
   "report.reasons.dislike": "Eg likar det ikkje",
   "report.reasons.dislike_description": "Det er ikkje noko du ønsker å sjå",
-  "report.reasons.legal": "Det er ulovlig",
-  "report.reasons.legal_description": "Du mener det bryter loven i ditt eller serverens land",
+  "report.reasons.legal": "Det er ulovleg",
+  "report.reasons.legal_description": "Du meinar det bryt lova i landet der du eller tenaren held til",
   "report.reasons.other": "Det er noko anna",
   "report.reasons.other_description": "Problemet passar ikkje inn i dei andre kategoriane",
   "report.reasons.spam": "Det er søppelpost",
@@ -550,7 +570,7 @@
   "report.unfollow": "Slutt å fylgje @{name}",
   "report.unfollow_explanation": "Du fylgjer denne kontoen. Slutt å fylgje dei for ikkje lenger å sjå innlegga deira i heimestraumen din.",
   "report_notification.attached_statuses": "{count, plural, one {{count} innlegg} other {{count} innlegg}} lagt ved",
-  "report_notification.categories.legal": "Juridiske",
+  "report_notification.categories.legal": "Juridisk",
   "report_notification.categories.other": "Anna",
   "report_notification.categories.spam": "Søppelpost",
   "report_notification.categories.violation": "Regelbrot",
@@ -581,6 +601,8 @@
   "server_banner.server_stats": "Tenarstatistikk:",
   "sign_in_banner.create_account": "Opprett konto",
   "sign_in_banner.sign_in": "Logg inn",
+  "sign_in_banner.sso_redirect": "Logg inn eller registrer deg",
+  "sign_in_banner.text": "Logg inn for å fylgja profilar eller emneknaggar, og for å lika, dela og svara på innlegg. Du kan òg samhandla med aktivitet på denne tenaren frå kontoar på andre tenarar.",
   "status.admin_account": "Opne moderasjonsgrensesnitt for @{name}",
   "status.admin_domain": "Opna moderatorgrensesnittet for {domain}",
   "status.admin_status": "Opne denne statusen i moderasjonsgrensesnittet",
@@ -597,13 +619,14 @@
   "status.edited": "Redigert {date}",
   "status.edited_x_times": "Redigert {count, plural, one {{count} gong} other {{count} gonger}}",
   "status.embed": "Bygg inn",
+  "status.favourite": "Favoritt",
   "status.filter": "Filtrer dette innlegget",
   "status.filtered": "Filtrert",
   "status.hide": "Skjul innlegget",
   "status.history.created": "{name} oppretta {date}",
   "status.history.edited": "{name} redigerte {date}",
   "status.load_more": "Last inn meir",
-  "status.media.open": "Klikk for å åpne",
+  "status.media.open": "Klikk for å opne",
   "status.media.show": "Klikk for å vise",
   "status.media_hidden": "Medium gøymd",
   "status.mention": "Nemn @{name}",
@@ -635,7 +658,7 @@
   "status.title.with_attachments": "{user} postet {attachmentCount, plural, one {et vedlegg} other {{attachmentCount} vedlegg}}",
   "status.translate": "Omset",
   "status.translated_from_with": "Omsett frå {lang} ved bruk av {provider}",
-  "status.uncached_media_warning": "Forhåndsvisning er ikke tilgjengelig",
+  "status.uncached_media_warning": "Førehandsvisning er ikkje tilgjengeleg",
   "status.unmute_conversation": "Opphev målbinding av samtalen",
   "status.unpin": "Løys frå profil",
   "subscribed_languages.lead": "Kun innlegg på valde språk vil bli dukke opp i heimestraumen din og i listene dine etter denne endringa. For å motta innlegg på alle språk, la vere å velje nokon.",
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index 77172517c4..e2563b60c8 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -1,5 +1,5 @@
 {
-  "about.blocks": "Modererte tjenere",
+  "about.blocks": "Modererte servere",
   "about.contact": "Kontakt:",
   "about.disclaimer": "Mastodon er gratis, åpen kildekode-programvare og et varemerke fra Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Årsak ikke tilgjengelig",
@@ -10,17 +10,17 @@
   "about.domain_blocks.suspended.title": "Suspendert",
   "about.not_available": "Denne informasjonen er ikke gjort tilgjengelig på denne tjeneren.",
   "about.powered_by": "Desentraliserte sosiale medier drevet av {mastodon}",
-  "about.rules": "Regler for tjeneren",
+  "about.rules": "Regler for serveren",
   "account.account_note_header": "Notat",
   "account.add_or_remove_from_list": "Legg til eller fjern fra lister",
-  "account.badges.bot": "Bot",
+  "account.badges.bot": "Automatisert",
   "account.badges.group": "Gruppe",
   "account.block": "Blokker @{name}",
   "account.block_domain": "Blokker domenet {domain}",
-  "account.block_short": "Blokkér",
+  "account.block_short": "Blokker",
   "account.blocked": "Blokkert",
   "account.browse_more_on_origin_server": "Bla mer på den opprinnelige profilen",
-  "account.cancel_follow_request": "Trekk tilbake følge-forespørselen",
+  "account.cancel_follow_request": "Avbryt følge forespørselen",
   "account.direct": "Nevn @{name} privat",
   "account.disable_notifications": "Slutt å varsle meg når @{name} legger ut innlegg",
   "account.domain_blocked": "Domene blokkert",
@@ -83,7 +83,7 @@
   "alert.rate_limited.message": "Vennligst prøv igjen etter kl. {retry_time, time, medium}.",
   "alert.rate_limited.title": "Hastighetsbegrenset",
   "alert.unexpected.message": "En uventet feil oppstod.",
-  "alert.unexpected.title": "Oi!",
+  "alert.unexpected.title": "Ups!",
   "announcement.announcement": "Kunngjøring",
   "attachments_list.unprocessed": "(ubehandlet)",
   "audio.hide": "Skjul lyd",
@@ -113,6 +113,7 @@
   "column.direct": "Private omtaler",
   "column.directory": "Bla gjennom profiler",
   "column.domain_blocks": "Skjulte domener",
+  "column.favourites": "Favoritter",
   "column.firehose": "Tidslinjer",
   "column.follow_requests": "Følgeforespørsler",
   "column.home": "Hjem",
@@ -165,7 +166,7 @@
   "confirmations.cancel_follow_request.confirm": "Trekk tilbake forespørsel",
   "confirmations.cancel_follow_request.message": "Er du sikker på at du vil trekke tilbake forespørselen din for å følge {name}?",
   "confirmations.delete.confirm": "Slett",
-  "confirmations.delete.message": "Er du sikker på at du vil slette denne statusen?",
+  "confirmations.delete.message": "Er du sikker på at du vil slette dette innlegget?",
   "confirmations.delete_list.confirm": "Slett",
   "confirmations.delete_list.message": "Er du sikker på at du vil slette denne listen permanent?",
   "confirmations.discard_edit_media.confirm": "Forkast",
@@ -180,6 +181,7 @@
   "confirmations.mute.explanation": "Dette vil skjule innlegg fra dem og innlegg som nevner dem, men det vil fortsatt la dem se dine innlegg og å følge deg.",
   "confirmations.mute.message": "Er du sikker på at du vil dempe {name}?",
   "confirmations.redraft.confirm": "Slett og skriv på nytt",
+  "confirmations.redraft.message": "Er du sikker på at du vil slette dette innlegget og lagre det på nytt? Favoritter og fremhevinger vil gå tapt, og svar til det originale innlegget vil bli foreldreløse.",
   "confirmations.reply.confirm": "Svar",
   "confirmations.reply.message": "Å svare nå vil overskrive meldingen du skriver for øyeblikket. Er du sikker på at du vil fortsette?",
   "confirmations.unfollow.confirm": "Slutt å følge",
@@ -189,7 +191,6 @@
   "conversation.open": "Vis samtale",
   "conversation.with": "Med {names}",
   "copypaste.copied": "Kopiert",
-  "copypaste.copy": "Kopier",
   "copypaste.copy_to_clipboard": "Kopier til utklippstavle",
   "directory.federated": "Fra det kjente strømiverset",
   "directory.local": "Kun fra {domain}",
@@ -200,6 +201,7 @@
   "dismissable_banner.community_timeline": "Dette er de nyeste offentlige innleggene fra personer med kontoer på {domain}.",
   "dismissable_banner.dismiss": "Avvis",
   "dismissable_banner.explore_links": "Disse nyhetene snakker folk om akkurat nå på denne og andre servere i det desentraliserte nettverket.",
+  "dismissable_banner.explore_statuses": "Disse innleggene fra denne og andre servere i det desentraliserte nettverket får økt oppmerksomhet på denne serveren akkurat nå. Nyere innlegg med flere fremhevinger og favoritter er rangert høyere.",
   "dismissable_banner.explore_tags": "Disse emneknaggene snakker folk om akkurat nå, på denne og andre servere i det desentraliserte nettverket.",
   "dismissable_banner.public_timeline": "Dette er de siste offentlige innleggene fra mennesker på det sosiale nettet som folk på {domain} følger.",
   "embed.instructions": "Kopier koden under for å bygge inn denne statusen på hjemmesiden din.",
@@ -228,6 +230,8 @@
   "empty_column.direct": "Du har ingen private omtaler enda. Etter du har sendt eller mottatt en, så vil den dukke opp her.",
   "empty_column.domain_blocks": "Det er ingen skjulte domener enda.",
   "empty_column.explore_statuses": "Ingenting er populært akkurat nå. Prøv igjen senere!",
+  "empty_column.favourited_statuses": "Du har ikke noen favorittinnlegg enda. Når du favorittmarkerer et inlegg, vil det dukke opp her.",
+  "empty_column.favourites": "Ingen har favorittmarkert dette innlegget ennå. Når noen gjør det, vil de dukke opp her.",
   "empty_column.follow_requests": "Du har ingen følgeforespørsler enda. Når du mottar en, vil den dukke opp her.",
   "empty_column.followed_tags": "Du har ikke fulgt noen emneknagger ennå. Når du gjør det, vil de vises her.",
   "empty_column.hashtag": "Det er ingenting i denne emneknaggen ennå.",
@@ -291,6 +295,9 @@
   "hashtag.column_settings.tag_mode.any": "Enhver av disse",
   "hashtag.column_settings.tag_mode.none": "Ingen av disse",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} deltaker} other {{counter} deltakere}}",
+  "hashtag.counter_by_uses": "{count, plural, one {ett innlegg} other {{counter} innlegg}}",
+  "hashtag.counter_by_uses_today": "{count, plural, one {ett innlegg} other {{counter} innlegg}} i dag",
   "hashtag.follow": "Følg emneknagg",
   "hashtag.unfollow": "Slutt å følge emneknagg",
   "home.actions.go_to_explore": "Se hva som er populært",
@@ -298,16 +305,22 @@
   "home.column_settings.basic": "Enkelt",
   "home.column_settings.show_reblogs": "Vis fremhevinger",
   "home.column_settings.show_replies": "Vis svar",
-  "home.explore_prompt.body": "Tidslinjen din vil ha en blanding av innlegg fra emneknagger du har valgt å følge, personene du har valgt å følge, og innleggene de fremhever. Det ser ganske stille ut akkurat nå, så hva med:",
+  "home.explore_prompt.body": "Tidslinjen din inneholder en blanding av innlegg fra emneknagger du har valgt å følge, personene du har valgt å følge, og innleggene de fremhever. Hvis det føles for stille, kan det være lurt å:",
   "home.explore_prompt.title": "Dette er hjemmet ditt i Mastodon.",
   "home.hide_announcements": "Skjul kunngjøring",
   "home.show_announcements": "Vis kunngjøring",
+  "interaction_modal.description.favourite": "Med en konto på Mastodon, kan du favorittmarkere dette innlegget for å la forfatteren vite at du satte pris på det, og lagre innlegget til senere.",
   "interaction_modal.description.follow": "Med en konto på Mastodon, kan du følge {name} for å få innleggene deres i tidslinjen din.",
   "interaction_modal.description.reblog": "Med en konto på Mastodon, kan du fremheve dette innlegget for å dele det med dine egne følgere.",
   "interaction_modal.description.reply": "Med en konto på Mastodon, kan du svare på dette innlegget.",
+  "interaction_modal.login.action": "Ta meg hjem",
+  "interaction_modal.login.prompt": "Domenet til serveren din, eks. mastodon.social",
+  "interaction_modal.no_account_yet": "Ennå ikke på Mastodon?",
   "interaction_modal.on_another_server": "På en annen server",
   "interaction_modal.on_this_server": "På denne serveren",
-  "interaction_modal.preamble": "Siden Mastodon er desentralisert, kan du bruke din eksisterende konto på en annen Mastodon-tjener eller en kompatibel plattform hvis du ikke har en konto her.",
+  "interaction_modal.sign_in": "Du er ikke logget inn på denne serveren. Hvor har du kontoen din?",
+  "interaction_modal.sign_in_hint": "Tips: Det er på nettstedet der du registrerte deg. Hvis du ikke husker det, kan du se etter velkomst e-posten i innboksen. Du kan også skrive inn hele brukernavnet ditt! (eks. @Mastodon@mastodon.social)",
+  "interaction_modal.title.favourite": "Favorittmarker innlegget til {name}",
   "interaction_modal.title.follow": "Følg {name}",
   "interaction_modal.title.reblog": "Fremhev {name} sitt innlegg",
   "interaction_modal.title.reply": "Svar på {name} sitt innlegg",
@@ -323,6 +336,8 @@
   "keyboard_shortcuts.direct": "åpne kolonnen ned private omtaler",
   "keyboard_shortcuts.down": "Flytt nedover i listen",
   "keyboard_shortcuts.enter": "Åpne innlegg",
+  "keyboard_shortcuts.favourite": "Favorittmarker innlegg",
+  "keyboard_shortcuts.favourites": "Åpne listen over favoritter",
   "keyboard_shortcuts.federated": "Åpne fellestidslinjen",
   "keyboard_shortcuts.heading": "Hurtigtaster",
   "keyboard_shortcuts.home": "Åpne hjemmetidslinjen",
@@ -353,6 +368,7 @@
   "lightbox.previous": "Forrige",
   "limited_account_hint.action": "Vis profil likevel",
   "limited_account_hint.title": "Denne profilen har blitt skjult av moderatorene til {domain}.",
+  "link_preview.author": "Av {name}",
   "lists.account.add": "Legg til i listen",
   "lists.account.remove": "Fjern fra listen",
   "lists.delete": "Slett listen",
@@ -385,6 +401,7 @@
   "navigation_bar.domain_blocks": "Skjulte domener",
   "navigation_bar.edit_profile": "Rediger profil",
   "navigation_bar.explore": "Utforsk",
+  "navigation_bar.favourites": "Favoritter",
   "navigation_bar.filters": "Stilnede ord",
   "navigation_bar.follow_requests": "Følgeforespørsler",
   "navigation_bar.followed_tags": "Fulgte emneknagger",
@@ -401,6 +418,7 @@
   "not_signed_in_indicator.not_signed_in": "Du må logge inn for å få tilgang til denne ressursen.",
   "notification.admin.report": "{name} rapporterte {target}",
   "notification.admin.sign_up": "{name} registrerte seg",
+  "notification.favourite": "{name} favorittmarkerte innlegget ditt",
   "notification.follow": "{name} fulgte deg",
   "notification.follow_request": "{name} har bedt om å få følge deg",
   "notification.mention": "{name} nevnte deg",
@@ -414,6 +432,7 @@
   "notifications.column_settings.admin.report": "Nye rapporter:",
   "notifications.column_settings.admin.sign_up": "Nye registreringer:",
   "notifications.column_settings.alert": "Skrivebordsvarslinger",
+  "notifications.column_settings.favourite": "Favoritter:",
   "notifications.column_settings.filter_bar.advanced": "Vis alle kategorier",
   "notifications.column_settings.filter_bar.category": "Hurtigfiltreringslinje",
   "notifications.column_settings.filter_bar.show_bar": "Vis filterlinjen",
@@ -431,6 +450,7 @@
   "notifications.column_settings.update": "Redigeringer:",
   "notifications.filter.all": "Alle",
   "notifications.filter.boosts": "Fremhevinger",
+  "notifications.filter.favourites": "Favoritter",
   "notifications.filter.follows": "Følginger",
   "notifications.filter.mentions": "Nevnelser",
   "notifications.filter.polls": "Avstemningsresultater",
@@ -581,6 +601,8 @@
   "server_banner.server_stats": "Serverstatistikk:",
   "sign_in_banner.create_account": "Opprett konto",
   "sign_in_banner.sign_in": "Logg inn",
+  "sign_in_banner.sso_redirect": "Logg inn eller registrer deg",
+  "sign_in_banner.text": "Logg inn for å følge profiler eller emneknagger, favorittmarkere, dele og svare på innlegg. Du kan også samhandle fra din konto på en annen server.",
   "status.admin_account": "Åpne moderatorgrensesnittet for @{name}",
   "status.admin_domain": "Åpne moderatorgrensesnittet for {domain}",
   "status.admin_status": "Åpne denne statusen i moderatorgrensesnittet",
@@ -597,6 +619,7 @@
   "status.edited": "Redigert {date}",
   "status.edited_x_times": "Redigert {count, plural,one {{count} gang} other {{count} ganger}}",
   "status.embed": "Bygge inn",
+  "status.favourite": "Favoritt",
   "status.filter": "Filtrer dette innlegget",
   "status.filtered": "Filtrert",
   "status.hide": "Skjul innlegg",
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index f3b9f04042..674b573592 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -160,7 +160,6 @@
   "conversation.open": "Veire la conversacion",
   "conversation.with": "Amb {names}",
   "copypaste.copied": "Copiat",
-  "copypaste.copy": "Copiar",
   "directory.federated": "Del fediverse conegut",
   "directory.local": "Solament de {domain}",
   "directory.new_arrivals": "Nòus-venguts",
diff --git a/app/javascript/mastodon/locales/pa.json b/app/javascript/mastodon/locales/pa.json
index ea30790115..d486fc13c0 100644
--- a/app/javascript/mastodon/locales/pa.json
+++ b/app/javascript/mastodon/locales/pa.json
@@ -57,7 +57,6 @@
   "confirmations.reply.confirm": "ਜਵਾਬ ਦੇਵੋ",
   "confirmations.unfollow.confirm": "ਪ੍ਰਸ਼ੰਸਕੀ ਰੱਦ ਕਰੋ",
   "copypaste.copied": "ਕਾਪੀ ਕੀਤਾ",
-  "copypaste.copy": "ਕਾਪੀ ਕਰੋ",
   "copypaste.copy_to_clipboard": "ਕਲਿੱਪਬੋਰਡ 'ਤੇ ਕਾਪੀ ਕਰੋ",
   "disabled_account_banner.account_settings": "ਖਾਤੇ ਦੀਆਂ ਸੈਟਿੰਗਾਂ",
   "dismissable_banner.dismiss": "ਰੱਦ ਕਰੋ",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 2fce76fc5d..7ad4829184 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -191,7 +191,6 @@
   "conversation.open": "Zobacz konwersację",
   "conversation.with": "Z {names}",
   "copypaste.copied": "Skopiowano",
-  "copypaste.copy": "Kopiuj",
   "copypaste.copy_to_clipboard": "Skopiuj do schowka",
   "directory.federated": "Ze znanego fediwersum",
   "directory.local": "Tylko z {domain}",
@@ -296,6 +295,9 @@
   "hashtag.column_settings.tag_mode.any": "Dowolne",
   "hashtag.column_settings.tag_mode.none": "Żadne",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} uczestnik} few {{counter} uczestnicy} many {{counter} uczestników} other {{counter} uczestników}}",
+  "hashtag.counter_by_uses": "{count, plural, one {{counter} wpis} few {{counter} wpisy} many {{counter} wpisów} other {{counter} wpisów}}",
+  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} wpis} few {{counter} wpisy} many {{counter} wpisów} other {{counter} wpisów}} z dzisiaj",
   "hashtag.follow": "Obserwuj hasztag",
   "hashtag.unfollow": "Przestań obserwować hashtag",
   "home.actions.go_to_explore": "Zobacz, co jest teraz popularne",
@@ -303,7 +305,7 @@
   "home.column_settings.basic": "Podstawowe",
   "home.column_settings.show_reblogs": "Pokazuj podbicia",
   "home.column_settings.show_replies": "Pokazuj odpowiedzi",
-  "home.explore_prompt.body": "Twój kanał główny będzie zawierał kombinację postów z tagów, które wybrano do obserwacji, osoby, które wybrano obserwować i wpisy, które one podbijają. Obecnie jest tu całkiem cicho, więc co myślisz o:",
+  "home.explore_prompt.body": "Twój kanał główny będzie zawierał kombinację postów z tagów i osób które obserwujesz oraz wpisów przezeń podbitych. Jeżeli wydaje się to za spokojnym, spróbuj czegoś poniżej.",
   "home.explore_prompt.title": "To twój punkt podparcia w Mastodonie.",
   "home.hide_announcements": "Ukryj ogłoszenia",
   "home.show_announcements": "Pokaż ogłoszenia",
@@ -311,10 +313,13 @@
   "interaction_modal.description.follow": "Mając konto na Mastodonie, możesz śledzić {name} by widzieć jego wpisy na swojej głównej osi czasu.",
   "interaction_modal.description.reblog": "Mając konto na Mastodonie, możesz podbić ten wpis i udostępnić go Twoim obserwującym.",
   "interaction_modal.description.reply": "Mając konto na Mastodonie, możesz odpowiedzieć na ten wpis.",
+  "interaction_modal.login.action": "Wróć na stronę główną",
+  "interaction_modal.login.prompt": "Domena twojego serwera domowego, np. \"mastodon.social\"",
+  "interaction_modal.no_account_yet": "Nie masz konta na Mastodonie?",
   "interaction_modal.on_another_server": "Na innym serwerze",
   "interaction_modal.on_this_server": "Na tym serwerze",
-  "interaction_modal.other_server_instructions": "Skopiuj i wklej ten adres URL do pola wyszukiwania w swojej ulubionej aplikacji Mastodon lub interfejsu internetowego swojego serwera Mastodon.",
-  "interaction_modal.preamble": "Ponieważ Mastodon jest zdecentralizowany, możesz użyć swojego istniejącego konta z innego serwera Mastodona lub innej kompatybilnej usługi, jeśli nie masz konta na tym serwerze.",
+  "interaction_modal.sign_in": "Nie jesteś zalogowany(-a) na tym serwerze. Gdzie masz konto?",
+  "interaction_modal.sign_in_hint": "To strona na której się rejestrowałeś(-aś). Jeżeli nie pamiętasz, poszukaj mejla z przywitaniem. Możesz też wprowadzić pełną nazwę użytkownika, à la @Mastodon@mastodon.social!",
   "interaction_modal.title.favourite": "Polub wpis użytkownika {name}",
   "interaction_modal.title.follow": "Śledź {name}",
   "interaction_modal.title.reblog": "Podbij wpis {name}",
@@ -596,6 +601,7 @@
   "server_banner.server_stats": "Statystyki serwera:",
   "sign_in_banner.create_account": "Załóż konto",
   "sign_in_banner.sign_in": "Zaloguj się",
+  "sign_in_banner.sso_redirect": "Zaloguj/zarejestruj się",
   "sign_in_banner.text": "Zaloguj się, aby obserwować profile lub hashtagi, polubić, udostępnić oraz odpowiedzieć na posty. Możesz również wejść w interakcję z konta na innym serwerze.",
   "status.admin_account": "Otwórz interfejs moderacyjny dla @{name}",
   "status.admin_domain": "Otwórz interfejs moderacyjny dla {domain}",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index e3889263d5..503cfed45c 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -189,7 +189,6 @@
   "conversation.open": "Ver conversa",
   "conversation.with": "Com {names}",
   "copypaste.copied": "Copiado",
-  "copypaste.copy": "Copiar",
   "copypaste.copy_to_clipboard": "Copiar para a área de transferência",
   "directory.federated": "Do fediverso conhecido",
   "directory.local": "Somente de {domain}",
@@ -298,7 +297,6 @@
   "home.column_settings.basic": "Básico",
   "home.column_settings.show_reblogs": "Mostrar boosts",
   "home.column_settings.show_replies": "Mostrar respostas",
-  "home.explore_prompt.body": "Seu feed inicial terá uma mistura de publicações das hashtags que você escolheu seguir, das pessoas que você escolheu seguir e das publicações que elas impulsionam. Está parecendo bem tranquilo no momento, então que tal:",
   "home.explore_prompt.title": "Esta é a sua base principal dentro do Mastodon.",
   "home.hide_announcements": "Ocultar comunicados",
   "home.show_announcements": "Mostrar comunicados",
@@ -307,7 +305,6 @@
   "interaction_modal.description.reply": "Com uma conta no Mastodon, você pode responder a esta publicação.",
   "interaction_modal.on_another_server": "Em um servidor diferente",
   "interaction_modal.on_this_server": "Neste servidor",
-  "interaction_modal.preamble": "Como o Mastodon é descentralizado, você pode usar sua conta existente em outro servidor Mastodon ou plataforma compatível se você não tiver uma conta neste servidor.",
   "interaction_modal.title.follow": "Seguir {name}",
   "interaction_modal.title.reblog": "Impulsionar publicação de {name}",
   "interaction_modal.title.reply": "Responder à publicação de {name}",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index 570fd4644c..2e22fbfbf0 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -191,7 +191,6 @@
   "conversation.open": "Ver conversa",
   "conversation.with": "Com {names}",
   "copypaste.copied": "Copiado",
-  "copypaste.copy": "Copiar",
   "copypaste.copy_to_clipboard": "Copiar para a área de transferência",
   "directory.federated": "Do fediverso conhecido",
   "directory.local": "Apenas de {domain}",
@@ -296,6 +295,9 @@
   "hashtag.column_settings.tag_mode.any": "Qualquer destes",
   "hashtag.column_settings.tag_mode.none": "Nenhum destes",
   "hashtag.column_settings.tag_toggle": "Incluir etiquetas adicionais para esta coluna",
+  "hashtag.counter_by_accounts": "{count, plural,one {{counter} participante} other {{counter} participantes}}",
+  "hashtag.counter_by_uses": "{count, plural, one {{counter} publicação} other {{counter} publicações}}",
+  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} publicação} other {{counter} publicações}} hoje",
   "hashtag.follow": "Seguir #etiqueta",
   "hashtag.unfollow": "Deixar de seguir #etiqueta",
   "home.actions.go_to_explore": "Veja as tendências atuais",
@@ -303,7 +305,7 @@
   "home.column_settings.basic": "Básico",
   "home.column_settings.show_reblogs": "Mostrar impulsos",
   "home.column_settings.show_replies": "Mostrar respostas",
-  "home.explore_prompt.body": "A sua página inicial terá uma mistura de publicações com as hashtags que escolheu seguir, das pessoas que escolheu seguir e as publicações que elas partilham. Parece bastante quieto por agora, então que tal:",
+  "home.explore_prompt.body": "A sua página inicial terá uma mistura de publicações com as hashtags que escolheu seguir, das pessoas que escolheu seguir e as publicações que elas partilham. Parece bastante sossegado por agora, talvez queira:",
   "home.explore_prompt.title": "Esta é a sua base principal dentro do Mastodon.",
   "home.hide_announcements": "Ocultar comunicações",
   "home.show_announcements": "Exibir comunicações",
@@ -311,10 +313,13 @@
   "interaction_modal.description.follow": "Com uma conta no Mastodon, pode seguir {name} para receber as suas publicações na sua página inicial.",
   "interaction_modal.description.reblog": "Com uma conta no Mastodon, pode impulsionar esta publicação para compartilhá-lo com os seus seguidores.",
   "interaction_modal.description.reply": "Com uma conta no Mastodon, pode responder a esta publicação.",
+  "interaction_modal.login.action": "Leve-me a casa",
+  "interaction_modal.login.prompt": "Domínio do seu servidor, por exemplo, mastodon.social",
+  "interaction_modal.no_account_yet": "Não está no Mastodon?",
   "interaction_modal.on_another_server": "Num servidor diferente",
   "interaction_modal.on_this_server": "Neste servidor",
-  "interaction_modal.other_server_instructions": "Copie e cole este URL no campo de pesquisa da sua aplicação Mastodon preferida, ou da interface web do seu servidor Mastodon.",
-  "interaction_modal.preamble": "Uma vez que o Mastodon é descentralizado, caso não tenha uma conta neste servidor, pode utilizar a sua conta existente noutro servidor Mastodon ou plataforma compatível.",
+  "interaction_modal.sign_in": "Não tem sessão iniciada neste servidor. Em que servidor tem a sua conta?",
+  "interaction_modal.sign_in_hint": "Dica: O domínio do seu servidor é o site onde se inscreveu. Se não se lembrar, procure o e-mail de boas-vindas na sua caixa de entrada. Também pode introduzir o seu nome de utilizador completo! (por exemplo, @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Assinalar a publicação de {name} como favorita",
   "interaction_modal.title.follow": "Seguir {name}",
   "interaction_modal.title.reblog": "Impulsionar a publicação de {name}",
@@ -363,6 +368,7 @@
   "lightbox.previous": "Anterior",
   "limited_account_hint.action": "Exibir perfil mesmo assim",
   "limited_account_hint.title": "Este perfil foi ocultado pelos moderadores de {domain}.",
+  "link_preview.author": "Por {name}",
   "lists.account.add": "Adicionar à lista",
   "lists.account.remove": "Remover da lista",
   "lists.delete": "Eliminar lista",
@@ -595,6 +601,7 @@
   "server_banner.server_stats": "Estatísticas do servidor:",
   "sign_in_banner.create_account": "Criar conta",
   "sign_in_banner.sign_in": "Iniciar sessão",
+  "sign_in_banner.sso_redirect": "Iniciar sessão ou inscrever-se",
   "sign_in_banner.text": "Inicie sessão para seguir perfis ou hashtags, assinalar como favorito, partilhar ou responder a publicações. Pode ainda interagir através da sua conta noutro servidor.",
   "status.admin_account": "Abrir a interface de moderação para @{name}",
   "status.admin_domain": "Abrir interface de moderação para {domain}",
diff --git a/app/javascript/mastodon/locales/ro.json b/app/javascript/mastodon/locales/ro.json
index 9dc98306fa..3c37d50c60 100644
--- a/app/javascript/mastodon/locales/ro.json
+++ b/app/javascript/mastodon/locales/ro.json
@@ -172,7 +172,6 @@
   "conversation.open": "Vizualizează conversația",
   "conversation.with": "Cu {names}",
   "copypaste.copied": "Copiat",
-  "copypaste.copy": "Copiere",
   "directory.federated": "Din fediversul cunoscut",
   "directory.local": "Doar din {domain}",
   "directory.new_arrivals": "Înscriși recent",
@@ -279,7 +278,6 @@
   "interaction_modal.description.reply": "Cu un cont pe Mastodon, poți răspunde acestei postări.",
   "interaction_modal.on_another_server": "Pe un alt server",
   "interaction_modal.on_this_server": "Pe acest server",
-  "interaction_modal.preamble": "De vreme ce Mastodon este descentralizat, poți folosi contul tău existent, găzduit de un alt server Mastodon, sau o platformă compatibilă dacă nu ai un cont pe acesta.",
   "interaction_modal.title.follow": "Urmărește pe {name}",
   "interaction_modal.title.reblog": "Distribuie postarea lui {name}",
   "interaction_modal.title.reply": "Răspunde postării lui {name}",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index a7bbdc9b41..7e72c93aa8 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -191,7 +191,6 @@
   "conversation.open": "Просмотр беседы",
   "conversation.with": "С {names}",
   "copypaste.copied": "Скопировано",
-  "copypaste.copy": "Скопировать",
   "copypaste.copy_to_clipboard": "Копировать в буфер обмена",
   "directory.federated": "Со всей федерации",
   "directory.local": "Только с {domain}",
@@ -202,6 +201,7 @@
   "dismissable_banner.community_timeline": "Это самые последние публичные сообщения от людей, чьи учетные записи размещены в {domain}.",
   "dismissable_banner.dismiss": "Закрыть",
   "dismissable_banner.explore_links": "Об этих новостях прямо сейчас говорят люди на этом и других серверах децентрализованной сети.",
+  "dismissable_banner.explore_statuses": "Эти сообщения со связанных серверов сети сейчас набирают популярность.",
   "dismissable_banner.explore_tags": "Эти хэштеги привлекают людей на этом и других серверах децентрализованной сети прямо сейчас.",
   "dismissable_banner.public_timeline": "Это самые последние публичные сообщения от людей в социальной сети, за которыми подписались пользователи {domain}.",
   "embed.instructions": "Встройте этот пост на свой сайт, скопировав следующий код:",
@@ -310,10 +310,13 @@
   "interaction_modal.description.follow": "С учётной записью Mastodon вы можете подписаться на {name}, чтобы получать их посты в своей домашней ленте.",
   "interaction_modal.description.reblog": "С учётной записью Mastodon, вы можете продвинуть этот пост, чтобы поделиться им со своими подписчиками.",
   "interaction_modal.description.reply": "Вы можете ответить на этот пост с учётной записью Mastodon.",
+  "interaction_modal.login.action": "Перейти на домашнюю страницу",
+  "interaction_modal.login.prompt": "Домен вашего домашнего сервера, например, mastodon.social",
+  "interaction_modal.no_account_yet": "Еще не на Mastodon?",
   "interaction_modal.on_another_server": "На другом сервере",
   "interaction_modal.on_this_server": "На этом сервере",
-  "interaction_modal.other_server_instructions": "Скопируйте и вставьте этот URL в поле поиска вашего любимого приложения Mastodon или веб-интерфейс вашего сервера Mastodon.",
-  "interaction_modal.preamble": "Поскольку Mastodon децентрализован, вы можете использовать существующую учётную запись, размещенную на другом сервере Mastodon или совместимой платформе, если у вас нет учётной записи на этом сервере.",
+  "interaction_modal.sign_in": "Вы не вошли в систему на этом сервере. Где размещена ваша учетная запись?",
+  "interaction_modal.sign_in_hint": "Совет: Это сайт, на котором вы зарегистрировались. Если вы не помните, найдите приветственное письмо в своем почтовом ящике. Вы также можете ввести свое полное имя пользователя! (например, @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Добавить пост {name} в избранное",
   "interaction_modal.title.follow": "Подписаться на {name}",
   "interaction_modal.title.reblog": "Продвинуть публикацию {name}",
@@ -595,6 +598,7 @@
   "server_banner.server_stats": "Статистика сервера:",
   "sign_in_banner.create_account": "Создать учётную запись",
   "sign_in_banner.sign_in": "Войти",
+  "sign_in_banner.sso_redirect": "Войдите или Зарегистрируйтесь",
   "sign_in_banner.text": "Войдите, чтобы отслеживать профили, хэштеги или избранное, делиться сообщениями и отвечать на них. Вы также можете взаимодействовать с вашей учётной записью на другом сервере.",
   "status.admin_account": "Открыть интерфейс модератора для @{name}",
   "status.admin_domain": "Открыть интерфейс модерации {domain}",
diff --git a/app/javascript/mastodon/locales/sa.json b/app/javascript/mastodon/locales/sa.json
index ee60315863..071061058d 100644
--- a/app/javascript/mastodon/locales/sa.json
+++ b/app/javascript/mastodon/locales/sa.json
@@ -177,7 +177,6 @@
   "conversation.open": "वार्तालापो दृश्यताम्",
   "conversation.with": "{names} जनैः साकम्",
   "copypaste.copied": "प्रतिलिपिंकृतम्",
-  "copypaste.copy": "प्रतिलिपिः",
   "copypaste.copy_to_clipboard": "क्लिप्बोर्दमनुलिपिं कुरु",
   "directory.federated": "सुपरिचितं Fediverse इति स्थानात्",
   "directory.local": "{domain} प्रदेशात्केवलम्",
@@ -287,7 +286,6 @@
   "interaction_modal.description.reply": "मास्टोडोनि एकौण्टा पत्रमिदं प्रतिवादयितुं शक्नोषि।",
   "interaction_modal.on_another_server": "अन्यस्मिन्सर्वरि",
   "interaction_modal.on_this_server": "अस्मिन्सर्वरि",
-  "interaction_modal.preamble": "यतो मास्टोडोन्विकेन्द्रीयकृतोऽस्ति, अन्येन मास्टोडोन्सर्वरा उत सुसङ्गतेन आश्रयेण ते वर्तमानौकौण्टं प्रयोक्तुं शक्नोषि यदि अस्मिन्कोऽपि ते एकौण्ट् नास्ति।",
   "interaction_modal.title.follow": "{name} अनुसर",
   "interaction_modal.title.reblog": "{name} नाम्ना उपभोक्तुः पत्रं बुस्त्कुरु",
   "interaction_modal.title.reply": "{name} नाम्ना उपभोक्तुःपत्रं प्रतिवादय",
diff --git a/app/javascript/mastodon/locales/sco.json b/app/javascript/mastodon/locales/sco.json
index ad5c9e28d3..8fe9944676 100644
--- a/app/javascript/mastodon/locales/sco.json
+++ b/app/javascript/mastodon/locales/sco.json
@@ -171,7 +171,6 @@
   "conversation.open": "Luik at conversation",
   "conversation.with": "Wi {names}",
   "copypaste.copied": "Copied",
-  "copypaste.copy": "Copy",
   "directory.federated": "Fae a kent fediverse",
   "directory.local": "Fae {domain} ainly",
   "directory.new_arrivals": "New arrivals",
@@ -272,7 +271,6 @@
   "interaction_modal.description.reply": "Wi a accoont on Mastodon, ye kin sen a repone tae this post.",
   "interaction_modal.on_another_server": "On a different server",
   "interaction_modal.on_this_server": "On this server",
-  "interaction_modal.preamble": "Seein Mastodon is decentralized, ye kin uise the accoont thit ye awriddy hae hostit on anither Mastodon server or compatable platforn gien thit dinnae hae a accoont in this yin.",
   "interaction_modal.title.follow": "Follae {name}",
   "interaction_modal.title.reblog": "Heeze {name}'s post",
   "interaction_modal.title.reply": "Reply tae {name}'s post",
diff --git a/app/javascript/mastodon/locales/si.json b/app/javascript/mastodon/locales/si.json
index c83c97e932..e045387fcf 100644
--- a/app/javascript/mastodon/locales/si.json
+++ b/app/javascript/mastodon/locales/si.json
@@ -136,7 +136,6 @@
   "conversation.open": "සංවාදය බලන්න",
   "conversation.with": "{names} සමඟ",
   "copypaste.copied": "පිටපත් විය",
-  "copypaste.copy": "පිටපතක්",
   "directory.federated": "දන්නා fediverse වලින්",
   "directory.local": "{domain} වෙතින් පමණි",
   "directory.new_arrivals": "නව පැමිණීම්",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index 71a4228395..94562d2bb2 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -76,6 +76,10 @@
   "admin.dashboard.retention.average": "Priemer",
   "admin.dashboard.retention.cohort": "Mesiac zaregistrovania sa",
   "admin.dashboard.retention.cohort_size": "Noví užívatelia",
+  "admin.impact_report.instance_accounts": "Profily účtov, ktoré by boli odstránené",
+  "admin.impact_report.instance_followers": "Sledovatelia, o ktorých by naši používatelia prišli",
+  "admin.impact_report.instance_follows": "Sledovatelia, o ktorých by ich používatelia prišli",
+  "admin.impact_report.title": "Zhrnutie dopadu",
   "alert.rate_limited.message": "Prosím, skús to znova za {retry_time, time, medium}.",
   "alert.rate_limited.title": "Tempo obmedzené",
   "alert.unexpected.message": "Vyskytla sa nečakaná chyba.",
@@ -110,6 +114,7 @@
   "column.directory": "Prehľadávaj profily",
   "column.domain_blocks": "Skryté domény",
   "column.favourites": "Obľúbené",
+  "column.firehose": "Živé kanály",
   "column.follow_requests": "Žiadosti o sledovanie",
   "column.home": "Domov",
   "column.lists": "Zoznamy",
@@ -176,6 +181,7 @@
   "confirmations.mute.explanation": "Toto nastavenie skryje ich príspevky, alebo príspevky od iných v ktorých sú spomenutí, ale umožní im vidieť tvoje príspevky, aj ťa nasledovať.",
   "confirmations.mute.message": "Naozaj si chceš nevšímať {name}?",
   "confirmations.redraft.confirm": "Vyčisti a prepíš",
+  "confirmations.redraft.message": "Ste si istý, že chcete premazať a prepísať tento príspevok? Jeho nadobudnuté vyzdvihnutia a obľúbenia, ale i odpovede na pôvodný príspevok budú odlúčené.",
   "confirmations.reply.confirm": "Odpovedz",
   "confirmations.reply.message": "Odpovedaním akurát teraz prepíšeš správu, ktorú máš práve rozpísanú. Si si istý/á, že chceš pokračovať?",
   "confirmations.unfollow.confirm": "Nesleduj",
@@ -185,7 +191,6 @@
   "conversation.open": "Ukáž konverzáciu",
   "conversation.with": "S {names}",
   "copypaste.copied": "Skopírované",
-  "copypaste.copy": "Kopíruj",
   "copypaste.copy_to_clipboard": "Skopíruj do schránky",
   "directory.federated": "Zo známého fedivesmíru",
   "directory.local": "Iba z {domain}",
@@ -196,7 +201,9 @@
   "dismissable_banner.community_timeline": "Toto sú najnovšie verejné príspevky od ľudí, ktorých účty sú hostované na {domain}.",
   "dismissable_banner.dismiss": "Zrušiť",
   "dismissable_banner.explore_links": "O týchto správach práve teraz hovoria ľudia na tomto a ďalších serveroch decentralizovanej siete.",
+  "dismissable_banner.explore_statuses": "Tieto príspevky naberajú na ťahu naprieč celej sociálnej sieti. Novšie príspevky s viacerými vyzdvihnutiami sú radené vyššie.",
   "dismissable_banner.explore_tags": "Tieto hashtagy práve teraz získavajú popularitu medzi ľuďmi na tomto a ďalších serveroch decentralizovanej siete.",
+  "dismissable_banner.public_timeline": "Toto sú najnovšie verejné príspevky od ľudí, ktorí sledujú {domain}, cez celú sociálnu sieť.",
   "embed.instructions": "Umiestni kód uvedený nižšie pre pridanie tohto statusu na tvoju web stránku.",
   "embed.preview": "Tu je ako to bude vyzerať:",
   "emoji_button.activity": "Aktivita",
@@ -223,6 +230,8 @@
   "empty_column.direct": "Ešte nemáš žiadne priame zmienky. Keď nejakú pošleš alebo dostaneš, ukáže sa tu.",
   "empty_column.domain_blocks": "Žiadne domény ešte niesú skryté.",
   "empty_column.explore_statuses": "Momentálne nie je nič trendové. Pozrite sa neskôr!",
+  "empty_column.favourited_statuses": "Zatiaľ nemáš žiadne obľúbené príspevky. Akonáhle označíš nejaký ako obľúbený, zobrazí sa tu.",
+  "empty_column.favourites": "Nikto si zatiaľ tento príspevok neobľúbil. Akonáhle tak niekto urobí, zobrazí sa tu.",
   "empty_column.follow_requests": "Ešte nemáš žiadne požiadavky o následovanie. Keď nejaké dostaneš, budú tu zobrazené.",
   "empty_column.followed_tags": "Ešte nenasleduješ žiadne haštagy. Keď tak urobíš, zobrazia sa tu.",
   "empty_column.hashtag": "Pod týmto hashtagom sa ešte nič nenachádza.",
@@ -288,6 +297,7 @@
   "hashtag.column_settings.tag_toggle": "Vlož dodatočné haštagy pre tento stĺpec",
   "hashtag.follow": "Nasleduj haštag",
   "hashtag.unfollow": "Nesleduj haštag",
+  "home.actions.go_to_explore": "Pozrieť, čo je trendy",
   "home.actions.go_to_suggestions": "Nájdi ľudí na sledovanie",
   "home.column_settings.basic": "Základné",
   "home.column_settings.show_reblogs": "Ukáž vyzdvihnuté",
@@ -297,9 +307,10 @@
   "interaction_modal.description.follow": "Ak máte konto na Mastodone, môžete sledovať {name} a dostávať príspevky do svojho domovského kanála.",
   "interaction_modal.description.reblog": "Ak máte účet na Mastodone, môžete tento príspevok posilniť a zdieľať ho s vlastnými sledovateľmi.",
   "interaction_modal.description.reply": "Ak máte účet na Mastodone, môžete reagovať na tento príspevok.",
+  "interaction_modal.login.action": "Prejsť domov",
   "interaction_modal.on_another_server": "Na inom serveri",
   "interaction_modal.on_this_server": "Na tomto serveri",
-  "interaction_modal.preamble": "Keďže Mastodon je decentralizovaný, ak nemáte účet na tomto serveri, môžete použiť svoj existujúci účet hostovaný na inom serveri Mastodon alebo kompatibilnej platforme.",
+  "interaction_modal.title.favourite": "Obľúb si {name} ov/in príspevok",
   "interaction_modal.title.follow": "Nasleduj {name}",
   "interaction_modal.title.reblog": "Vyzdvihni {name}ov/in príspevok",
   "interaction_modal.title.reply": "Odpovedz na {name}ov/in príspevok",
@@ -315,6 +326,8 @@
   "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "posunúť sa dole v zozname",
   "keyboard_shortcuts.enter": "Otvor príspevok",
+  "keyboard_shortcuts.favourite": "Obľúb si príspevok",
+  "keyboard_shortcuts.favourites": "Otvor zoznam obľúbených",
   "keyboard_shortcuts.federated": "otvor federovanú časovú os",
   "keyboard_shortcuts.heading": "Klávesové skratky",
   "keyboard_shortcuts.home": "otvor domácu časovú os",
@@ -345,6 +358,7 @@
   "lightbox.previous": "Predchádzajúci",
   "limited_account_hint.action": "Ukáž profil aj tak",
   "limited_account_hint.title": "Tento profil bol skrytý moderátormi stránky {domain}.",
+  "link_preview.author": "Podľa {name}",
   "lists.account.add": "Pridaj do zoznamu",
   "lists.account.remove": "Odober zo zoznamu",
   "lists.delete": "Vymaž list",
@@ -375,6 +389,7 @@
   "navigation_bar.domain_blocks": "Skryté domény",
   "navigation_bar.edit_profile": "Uprav profil",
   "navigation_bar.explore": "Objavuj",
+  "navigation_bar.favourites": "Obľúbené",
   "navigation_bar.filters": "Filtrované slová",
   "navigation_bar.follow_requests": "Žiadosti o sledovanie",
   "navigation_bar.followed_tags": "Nasledované haštagy",
@@ -391,6 +406,7 @@
   "not_signed_in_indicator.not_signed_in": "Ak chcete získať prístup k tomuto zdroju, musíte sa prihlásiť.",
   "notification.admin.report": "{name} nahlásil/a {target}",
   "notification.admin.sign_up": "{name} sa zaregistroval/a",
+  "notification.favourite": "{name} si obľúbil/a tvoj príspevok",
   "notification.follow": "{name} ťa začal/a nasledovať",
   "notification.follow_request": "{name} ťa žiada nasledovať",
   "notification.mention": "{name} ťa spomenul/a",
@@ -443,6 +459,7 @@
   "onboarding.compose.template": "Nazdar #Mastodon!",
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
   "onboarding.follows.title": "Popular on Mastodon",
+  "onboarding.share.next_steps": "Ďalšie možné kroky:",
   "onboarding.share.title": "Zdieľaj svoj profil",
   "onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:",
   "onboarding.start.skip": "Want to skip right ahead?",
@@ -531,6 +548,7 @@
   "report_notification.attached_statuses": "{count, plural, one {# post} other {# posts}} attached",
   "report_notification.categories.legal": "Právne ujednania",
   "report_notification.categories.other": "Ostatné",
+  "report_notification.categories.spam": "Spam",
   "report_notification.categories.violation": "Porušenie pravidla",
   "report_notification.open": "Otvor hlásenie",
   "search.no_recent_searches": "Žiadne nedávne vyhľadávania",
@@ -557,6 +575,7 @@
   "server_banner.server_stats": "Serverové štatistiky:",
   "sign_in_banner.create_account": "Vytvor účet",
   "sign_in_banner.sign_in": "Prihlás sa",
+  "sign_in_banner.sso_redirect": "Prihlás sa, alebo zaregistruj",
   "status.admin_account": "Otvor moderovacie rozhranie užívateľa @{name}",
   "status.admin_status": "Otvor tento príspevok v moderovacom rozhraní",
   "status.block": "Blokuj @{name}",
@@ -571,6 +590,7 @@
   "status.edited": "Upravené {date}",
   "status.edited_x_times": "Upravený {count, plural, one {{count} krát} other {{count} krát}}",
   "status.embed": "Vložiť",
+  "status.favourite": "Páči sa mi",
   "status.filter": "Filtrovanie tohto príspevku",
   "status.filtered": "Filtrované",
   "status.hide": "Skry príspevok",
@@ -609,6 +629,7 @@
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
   "status.translate": "Preložiť",
   "status.translated_from_with": "Preložené z {lang} pomocou {provider}",
+  "status.uncached_media_warning": "Náhľad nie je k dispozícii",
   "status.unmute_conversation": "Prestaň si nevšímať konverzáciu",
   "status.unpin": "Odopni z profilu",
   "subscribed_languages.save": "Ulož zmeny",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index e513f6a436..5449fe903f 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -68,6 +68,7 @@
   "account.unendorse": "Ne vključi v profil",
   "account.unfollow": "Prenehaj slediti",
   "account.unmute": "Odtišaj @{name}",
+  "account.unmute_notifications_short": "Izklopi utišanje obvestil",
   "account.unmute_short": "Odtišaj",
   "account_note.placeholder": "Kliknite za dodajanje opombe",
   "admin.dashboard.daily_retention": "Mera ohranjanja uporabnikov po dnevih od registracije",
@@ -190,7 +191,6 @@
   "conversation.open": "Pokaži pogovor",
   "conversation.with": "Z {names}",
   "copypaste.copied": "Kopirano",
-  "copypaste.copy": "Kopiraj",
   "copypaste.copy_to_clipboard": "Kopiraj na odložišče",
   "directory.federated": "Iz znanega fediverzuma",
   "directory.local": "Samo iz {domain}",
@@ -203,6 +203,7 @@
   "dismissable_banner.explore_links": "O teh novicah ravno zdaj veliko govorijo osebe na tem in drugih strežnikih decentraliziranega omrežja.",
   "dismissable_banner.explore_statuses": "Te objave s tega in drugih strežnikov v decentraliziranem omrežju pridobivajo ravno zdaj veliko pozornosti na tem strežniku.",
   "dismissable_banner.explore_tags": "Ravno zdaj dobivajo ti ključniki veliko pozoronosti med osebami na tem in drugih strežnikih decentraliziranega omrežja.",
+  "dismissable_banner.public_timeline": "To so najnovejše javne objave oseb z družabnega omrežja, ki jim sledijo osebe na {domain}.",
   "embed.instructions": "Vstavite to objavo na svojo spletno stran tako, da kopirate spodnjo kodo.",
   "embed.preview": "Tako bo izgledalo:",
   "emoji_button.activity": "Dejavnost",
@@ -301,6 +302,7 @@
   "home.column_settings.basic": "Osnovno",
   "home.column_settings.show_reblogs": "Pokaži izpostavitve",
   "home.column_settings.show_replies": "Pokaži odgovore",
+  "home.explore_prompt.body": "Vaš domači vir bo vseboval mešanico objav ključnikov, ki ste jih izbrali za sledenje, oseb, ki ste jih izbrali za sledenje, in objav, ki jih ti izpostavljajo. Če se vam to zdi preveč tiho, morda želite:",
   "home.explore_prompt.title": "To je vaš dom v okviru Mastodona.",
   "home.hide_announcements": "Skrij obvestila",
   "home.show_announcements": "Pokaži obvestila",
@@ -308,10 +310,13 @@
   "interaction_modal.description.follow": "Z računom na Mastodonu lahko sledite {name}, da prejemate njihove objave v svoj domači vir.",
   "interaction_modal.description.reblog": "Z računom na Mastodonu lahko izpostavite to objavo, tako da jo delite s svojimi sledilci.",
   "interaction_modal.description.reply": "Z računom na Mastodonu lahko odgovorite na to objavo.",
+  "interaction_modal.login.action": "Vrni me domov",
+  "interaction_modal.login.prompt": "Domena vašega domačega strežnika, npr. mastodon.social",
+  "interaction_modal.no_account_yet": "Niste na Mastodonu?",
   "interaction_modal.on_another_server": "Na drugem strežniku",
   "interaction_modal.on_this_server": "Na tem strežniku",
-  "interaction_modal.other_server_instructions": "Kopirajte in prilepite ta URL v polje iskanja vašega priljubljenega programa Mastodon ali spletnega vmesnika vašega strežnika Mastodon.",
-  "interaction_modal.preamble": "Ker je Mastodon decentraliziran, lahko uporabite svoj obstoječi račun, ki gostuje na drugem strežniku Mastodon ali združljivi platformi, če nimate računa na tej.",
+  "interaction_modal.sign_in": "Niste prijavljeni v ta strežnik. Kje gostuje vaš račun?",
+  "interaction_modal.sign_in_hint": "Nasvet: To je spletno mesto, na katerem ste se prijavili. Če se ne spomnite, poiščite pozdravno e-poštno sporočilo v svojem e-poštnem predalu. Vpišete lahko tudi svoje celotno uporabniško ime (npr. @Mastodon@mastodon.social)!",
   "interaction_modal.title.favourite": "Daj objavo {name} med priljubljene",
   "interaction_modal.title.follow": "Sledi {name}",
   "interaction_modal.title.reblog": "Izpostavi objavo {name}",
@@ -360,6 +365,7 @@
   "lightbox.previous": "Prejšnji",
   "limited_account_hint.action": "Vseeno pokaži profil",
   "limited_account_hint.title": "Profil so moderatorji strežnika {domain} skrili.",
+  "link_preview.author": "Avtor_ica {name}",
   "lists.account.add": "Dodaj na seznam",
   "lists.account.remove": "Odstrani s seznama",
   "lists.delete": "Izbriši seznam",
@@ -592,6 +598,7 @@
   "server_banner.server_stats": "Statistika strežnika:",
   "sign_in_banner.create_account": "Ustvari račun",
   "sign_in_banner.sign_in": "Prijava",
+  "sign_in_banner.sso_redirect": "Prijavite ali registrirajte se",
   "sign_in_banner.text": "Prijavite se, da sledite profilom ali ključnikom, dodajate med priljubljene, delite z drugimi ter odgovarjate na objave. V interakciji ste lahko tudi iz svojega računa na drugem strežniku.",
   "status.admin_account": "Odpri vmesnik za moderiranje za @{name}",
   "status.admin_domain": "Odpri vmesnik za moderiranje za {domain}",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index 915d374312..4add2f063a 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -189,7 +189,6 @@
   "conversation.open": "Shfaq bisedën",
   "conversation.with": "Me {names}",
   "copypaste.copied": "U kopjua",
-  "copypaste.copy": "Kopjoje",
   "copypaste.copy_to_clipboard": "Kopjoje në të papastër",
   "directory.federated": "Nga fedivers i njohur",
   "directory.local": "Vetëm nga {domain}",
@@ -298,7 +297,6 @@
   "home.column_settings.basic": "Bazë",
   "home.column_settings.show_reblogs": "Shfaq përforcime",
   "home.column_settings.show_replies": "Shfaq përgjigje",
-  "home.explore_prompt.body": "Prurja juaj bazë do të përmbajë një përzierje prej postimesh me hashtag-ët që keni zgjedhur të ndiqen, personat që keni zgjedhur të ndiqen dhe postimet që ata përforcojnë. Duket goxha bukur që tani, ndaj po sikur:",
   "home.explore_prompt.title": "Kjo është baza juaj brenda Mastodon-it.",
   "home.hide_announcements": "Fshihi lajmërimet",
   "home.show_announcements": "Shfaqi lajmërimet",
@@ -307,7 +305,6 @@
   "interaction_modal.description.reply": "Me një llogari në Mastodon, mund t’i përgjigjeni këtij postimi.",
   "interaction_modal.on_another_server": "Në një tjetër shërbyes",
   "interaction_modal.on_this_server": "Në këtë shërbyes",
-  "interaction_modal.preamble": "Ngaqë Mastodon-i është i decentralizuar, mund të përdorni llogarinë tuaj ekzistuese të strehuar nga një tjetër shërbyes Mastodon, ose platformë e përputhshme, nëse s’keni një llogari në këtë shërbyes.",
   "interaction_modal.title.follow": "Ndiq {name}",
   "interaction_modal.title.reblog": "Përforconi postimin e {name}",
   "interaction_modal.title.reply": "Përgjigjuni postimit të {name}",
diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json
index 4ea3f74dcf..ae893141f5 100644
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@@ -191,7 +191,6 @@
   "conversation.open": "Prikaži razgovor",
   "conversation.with": "Sa {names}",
   "copypaste.copied": "Kopirano",
-  "copypaste.copy": "Kopiraj",
   "copypaste.copy_to_clipboard": "Kopiraj",
   "directory.federated": "Sa znanog fediverzuma",
   "directory.local": "Samo sa {domain}",
@@ -296,6 +295,9 @@
   "hashtag.column_settings.tag_mode.any": "Bilo koje od ovih",
   "hashtag.column_settings.tag_mode.none": "Nijedan od ovih",
   "hashtag.column_settings.tag_toggle": "Uključi dodatne oznake za ovu kolonu",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} učesnik} few {{counter} učesnika} other {{counter} učesnika}}",
+  "hashtag.counter_by_uses": "{count, plural, one {{counter} objava} few {{counter} objave} other {{counter} objava}}",
+  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} objava} few {{counter} objave} other {{counter} objava}} danas",
   "hashtag.follow": "Zaprati heš oznaku",
   "hashtag.unfollow": "Otprati heš oznaku",
   "home.actions.go_to_explore": "Pogledaj šta je u trendu",
@@ -303,7 +305,7 @@
   "home.column_settings.basic": "Osnovna",
   "home.column_settings.show_reblogs": "Prikaži podržavanja",
   "home.column_settings.show_replies": "Prikaži odgovore",
-  "home.explore_prompt.body": "Vaša početna stranica će imati mešavinu ovjava od heštegova koje ste izabrali da pratite, ljudi koje ste izabrali da pratite i objava koje su podržali. Trenutno izgleda prilično tiho, pa šta kažete na:",
+  "home.explore_prompt.body": "Vaša početna stranica će imati mešavinu objava od heš oznaka koje ste izabrali da pratite, ljudi koje ste izabrali da pratite i objava koje su podržali. Ako izgleda previše tiho, možda ćete želeti da:",
   "home.explore_prompt.title": "Ovo je vaša matična baza u Mastodon-u.",
   "home.hide_announcements": "Sakrij najave",
   "home.show_announcements": "Prijaži najave",
@@ -311,10 +313,13 @@
   "interaction_modal.description.follow": "Sa nalogom na Mastodon-u, možete pratiti korisnika {name} kako biste primali njegove objave na početnoj stranici.",
   "interaction_modal.description.reblog": "Sa nalogom na Mastodon-u, možete podržati ovu objavu kako bite je podelili sa svojim pratiocima.",
   "interaction_modal.description.reply": "Sa nalogom na Mastodon-u, možete odgovoriti na ovu objavu.",
+  "interaction_modal.login.action": "Vodi me na početnu stranicu",
+  "interaction_modal.login.prompt": "Domen vašeg matičnog servera, npr. mastodon.social",
+  "interaction_modal.no_account_yet": "Niste na Mastodon-u?",
   "interaction_modal.on_another_server": "Na drugom serveru",
   "interaction_modal.on_this_server": "Na ovom serveru",
-  "interaction_modal.other_server_instructions": "Kopirajte i nalepite ovu URL adresu u polje pretrage svoje omiljene Mastodon aplikacije ili veb okruženje svog Mastodon servera.",
-  "interaction_modal.preamble": "Pošto je Mastodon decentralizovan, možete koristiti svoj postojeći nalog koji hostuje drugi Mastodon server ili kompatibilna platforma ako nemate nalog na ovom.",
+  "interaction_modal.sign_in": "Niste prijavljeni na ovaj server. Gde je hostovan vaš nalog?",
+  "interaction_modal.sign_in_hint": "Savet: To je veb sajt na kome ste se registrovali. Ako se ne sećate, potražite e-poruku dobrodošlice u svom prijemnom sandučetu. Takođe možete uneti svoje puno korisničko ime! (npr. @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Označi objavu korisnika {name} kao omiljenu",
   "interaction_modal.title.follow": "Zaprati {name}",
   "interaction_modal.title.reblog": "Podrži objavu korisnika {name}",
@@ -466,7 +471,7 @@
   "onboarding.compose.template": "Zdravo #Mastodon!",
   "onboarding.follows.empty": "Nažalost, trenutno se ne mogu prikazati rezultati. Možete pokušati sa korišćenjem pretrage ili pregledanjem stranice za istraživanje da biste pronašli ljude koje ćete pratiti ili pokušajte ponovo kasnije.",
   "onboarding.follows.lead": "Vi sami birate svoju početnu stranicu. Što više ljudi pratite, to će biti aktivnije i zanimljivije. Ovi profili mogu biti dobra polazna tačka—uvek možete da ih prestanete pratiti kasnije!",
-  "onboarding.follows.title": "Popularno na Mastodon-u",
+  "onboarding.follows.title": "Personalizujte svoju početnu stranicu",
   "onboarding.share.lead": "Neka ljudi znaju kako mogu da vas pronađu na Mastodon-u!",
   "onboarding.share.message": "Ja sam {username} na #Mastodon-u! Pratite me na {url}",
   "onboarding.share.next_steps": "Mogući sledeći koraci:",
@@ -475,7 +480,7 @@
   "onboarding.start.skip": "Želite da preskočite?",
   "onboarding.start.title": "Uspeli ste!",
   "onboarding.steps.follow_people.body": "Vi sami birate svoju početnu stranicu. Hajde da ga ispunimo zanimljivim ljudima.",
-  "onboarding.steps.follow_people.title": "Pratite {count, plural, one {# osobu} few {# osobe} other {# osoba}}",
+  "onboarding.steps.follow_people.title": "Personalizujte svoju početnu stranicu",
   "onboarding.steps.publish_status.body": "Reci zdravo svetu.",
   "onboarding.steps.publish_status.title": "Napišite svoju prvu objavu",
   "onboarding.steps.setup_profile.body": "Veća je verovatnoća da će drugi komunicirati sa vama sa popunjenim profilom.",
@@ -596,6 +601,7 @@
   "server_banner.server_stats": "Statistike servera:",
   "sign_in_banner.create_account": "Napravite nalog",
   "sign_in_banner.sign_in": "Prijavite se",
+  "sign_in_banner.sso_redirect": "Prijavite se ili se registrujte",
   "sign_in_banner.text": "Prijavite se da biste pratili profile ili heš oznake, označili objave kao omiljene, delili i odgovarali na njih. Takođe možete komunicirati sa svog naloga na drugom serveru.",
   "status.admin_account": "Otvori moderatorsko okruženje za @{name}",
   "status.admin_domain": "Otvori moderatorsko okruženje za {domain}",
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index e1a5315e94..66e63c8a13 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@ -191,7 +191,6 @@
   "conversation.open": "Прикажи разговор",
   "conversation.with": "Са {names}",
   "copypaste.copied": "Копирано",
-  "copypaste.copy": "Копирај",
   "copypaste.copy_to_clipboard": "Копирај",
   "directory.federated": "Са знаног федиверзума",
   "directory.local": "Само са {domain}",
@@ -296,6 +295,9 @@
   "hashtag.column_settings.tag_mode.any": "Било које од ових",
   "hashtag.column_settings.tag_mode.none": "Ниједан од ових",
   "hashtag.column_settings.tag_toggle": "Укључи додатне ознаке за ову колону",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} учесник} few {{counter} учесника} other {{counter} учесника}}",
+  "hashtag.counter_by_uses": "{count, plural, one {{counter} објава} few {{counter} објаве} other {{counter} објава}}",
+  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} објава} few {{counter} објаве} other {{counter} објава}} данас",
   "hashtag.follow": "Запрати хеш ознаку",
   "hashtag.unfollow": "Отпрати хеш ознаку",
   "home.actions.go_to_explore": "Погледај шта је у тренду",
@@ -303,7 +305,7 @@
   "home.column_settings.basic": "Основна",
   "home.column_settings.show_reblogs": "Прикажи подржавања",
   "home.column_settings.show_replies": "Прикажи одговоре",
-  "home.explore_prompt.body": "Ваша почетна страница ће имати мешавину овјава од хештегова које сте изабрали да пратите, људи које сте изабрали да пратите и објава које су подржали. Тренутно изгледа прилично тихо, па шта кажете на:",
+  "home.explore_prompt.body": "Ваша почетна страница ће имати мешавину објава од хеш ознака које сте изабрали да пратите, људи које сте изабрали да пратите и објава које су подржали. Ако изгледа превише тихо, можда ћете желети да:",
   "home.explore_prompt.title": "Ово је ваша матична база у Mastodon-у.",
   "home.hide_announcements": "Сакриј најаве",
   "home.show_announcements": "Пријажи најаве",
@@ -311,10 +313,13 @@
   "interaction_modal.description.follow": "Са налогом на Mastodon-у, можете пратити корисника {name} како бисте примали његове објаве на почетној страници.",
   "interaction_modal.description.reblog": "Са налогом на Mastodon-у, можете подржати ову објаву како бите је поделили са својим пратиоцима.",
   "interaction_modal.description.reply": "Са налогом на Mastodon-у, можете одговорити на ову објаву.",
+  "interaction_modal.login.action": "Води ме на почетну страницу",
+  "interaction_modal.login.prompt": "Домен вашег матичног сервера, нпр. mastodon.social",
+  "interaction_modal.no_account_yet": "Нисте на Mastodon-у?",
   "interaction_modal.on_another_server": "На другом серверу",
   "interaction_modal.on_this_server": "На овом серверу",
-  "interaction_modal.other_server_instructions": "Копирајте и налепите ову URL адресу у поље претраге своје омиљене Mastodon апликације или веб окружење свог Mastodon сервера.",
-  "interaction_modal.preamble": "Пошто је Mastodon децентрализован, можете користити свој постојећи налог који хостује други Mastodon сервер или компатибилна платформа ако немате налог на овом.",
+  "interaction_modal.sign_in": "Нисте пријављени на овај сервер. Где је хостован ваш налог?",
+  "interaction_modal.sign_in_hint": "Савет: То је веб сајт на коме сте се регистровали. Ако се не сећате, потражите е-поруку добродошлице у свом пријемном сандучету. Такође можете унети своје пуно корисничко име! (нпр. @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Означи објаву корисника {name} као омиљену",
   "interaction_modal.title.follow": "Запрати {name}",
   "interaction_modal.title.reblog": "Подржи објаву корисника {name}",
@@ -466,7 +471,7 @@
   "onboarding.compose.template": "Здраво #Mastodon!",
   "onboarding.follows.empty": "Нажалост, тренутно се не могу приказати резултати. Можете покушати са коришћењем претраге или прегледањем странице за истраживање да бисте пронашли људе које ћете пратити или покушајте поново касније.",
   "onboarding.follows.lead": "Ви сами бирате своју почетну страницу. Што више људи пратите, то ће бити активније и занимљивије. Ови профили могу бити добра полазна тачка—увек можете да их престанете пратити касније!",
-  "onboarding.follows.title": "Популарно на Mastodon-у",
+  "onboarding.follows.title": "Персонализујте своју почетну страницу",
   "onboarding.share.lead": "Нека људи знају како могу да вас пронађу на Mastodon-у!",
   "onboarding.share.message": "Ја сам {username} на #Mastodon-у! Пратите ме на {url}",
   "onboarding.share.next_steps": "Могући следећи кораци:",
@@ -475,7 +480,7 @@
   "onboarding.start.skip": "Желите да прескочите?",
   "onboarding.start.title": "Успели сте!",
   "onboarding.steps.follow_people.body": "Ви сами бирате своју почетну страницу. Хајде да га испунимо занимљивим људима.",
-  "onboarding.steps.follow_people.title": "Пратите {count, plural, one {# особу} few {# особе} other {# особа}}",
+  "onboarding.steps.follow_people.title": "Персонализујте своју почетну страницу",
   "onboarding.steps.publish_status.body": "Реци здраво свету.",
   "onboarding.steps.publish_status.title": "Напишите своју прву објаву",
   "onboarding.steps.setup_profile.body": "Већа је вероватноћа да ће други комуницирати са вама са попуњеним профилом.",
@@ -596,6 +601,7 @@
   "server_banner.server_stats": "Статистике сервера:",
   "sign_in_banner.create_account": "Направите налог",
   "sign_in_banner.sign_in": "Пријавите се",
+  "sign_in_banner.sso_redirect": "Пријавите се или се региструјте",
   "sign_in_banner.text": "Пријавите се да бисте пратили профиле или хеш ознаке, означили објаве као омиљене, делили и одговарали на њих. Такође можете комуницирати са свог налога на другом серверу.",
   "status.admin_account": "Отвори модераторско окружење за @{name}",
   "status.admin_domain": "Отвори модераторско окружење за {domain}",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index ea0d2205d0..44db96cc71 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -76,6 +76,10 @@
   "admin.dashboard.retention.average": "Genomsnittlig",
   "admin.dashboard.retention.cohort": "Registreringsmånad",
   "admin.dashboard.retention.cohort_size": "Nya användare",
+  "admin.impact_report.instance_accounts": "Kontoprofiler som det här skulle ta bort",
+  "admin.impact_report.instance_followers": "Följare som våra användare skulle förlora",
+  "admin.impact_report.instance_follows": "Följare som deras användare skulle förlora",
+  "admin.impact_report.title": "Sammanfattning av påverkan",
   "alert.rate_limited.message": "Vänligen försök igen efter {retry_time, time, medium}.",
   "alert.rate_limited.title": "Mängd begränsad",
   "alert.unexpected.message": "Ett oväntat fel uppstod.",
@@ -186,7 +190,6 @@
   "conversation.open": "Visa konversation",
   "conversation.with": "Med {names}",
   "copypaste.copied": "Kopierad",
-  "copypaste.copy": "Kopiera",
   "copypaste.copy_to_clipboard": "Kopiera till urklipp",
   "directory.federated": "Från känt fediversum",
   "directory.local": "Endast från {domain}",
@@ -198,6 +201,7 @@
   "dismissable_banner.dismiss": "Avfärda",
   "dismissable_banner.explore_links": "Dessa nyheter pratas det om just nu, på denna och på andra servrar i det decentraliserade nätverket.",
   "dismissable_banner.explore_tags": "Dessa hashtaggar pratas det om just nu bland folk på denna och andra servrar i det decentraliserade nätverket.",
+  "dismissable_banner.public_timeline": "De här är de aktuella publika inlägg från personer på det sociala nätet som personer i {domain} följer.",
   "embed.instructions": "Bädda in detta inlägg på din webbplats genom att kopiera koden nedan.",
   "embed.preview": "Så här kommer det att se ut:",
   "emoji_button.activity": "Aktivitet",
@@ -224,6 +228,7 @@
   "empty_column.direct": "Du har inga privata nämningar. När du skickar eller tar emot ett direktmeddelande kommer det att visas här.",
   "empty_column.domain_blocks": "Det finns ännu inga dolda domäner.",
   "empty_column.explore_statuses": "Ingenting är trendigt just nu. Kom tillbaka senare!",
+  "empty_column.favourited_statuses": "Du har inga favoritmarkerade inlägg ännu. När du favoritmärker ett så kommer det att dyka upp här.",
   "empty_column.follow_requests": "Du har inga följarförfrågningar än. När du får en kommer den visas här.",
   "empty_column.followed_tags": "Du följer inga hashtaggar ännu. När du gör det kommer de att dyka upp här.",
   "empty_column.hashtag": "Det finns inget i denna hashtag ännu.",
@@ -287,6 +292,9 @@
   "hashtag.column_settings.tag_mode.any": "Någon av dessa",
   "hashtag.column_settings.tag_mode.none": "Ingen av dessa",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} deltagare} other {{counter} deltagare}}",
+  "hashtag.counter_by_uses": "{count, plural, one {{counter} inlägg} other {{counter} inlägg}}",
+  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} inlägg} other {{counter} inlägg}} i dag",
   "hashtag.follow": "Följ hashtagg",
   "hashtag.unfollow": "Avfölj hashtagg",
   "home.actions.go_to_suggestions": "Hitta personer att följa",
@@ -298,9 +306,9 @@
   "interaction_modal.description.follow": "Med ett Mastodon-konto kan du följa {name} för att se hens inlägg i ditt hemflöde.",
   "interaction_modal.description.reblog": "Med ett Mastodon-konto kan du boosta detta inlägg för att dela den med dina egna följare.",
   "interaction_modal.description.reply": "Med ett Mastodon-konto kan du svara på detta inlägg.",
+  "interaction_modal.no_account_yet": "Inte på Mastodon?",
   "interaction_modal.on_another_server": "På en annan server",
   "interaction_modal.on_this_server": "På denna server",
-  "interaction_modal.preamble": "Eftersom Mastodon är decentraliserat kan du använda ditt befintliga konto från en annan Mastodonserver, eller annan kompatibel plattform, om du inte har ett konto på denna.",
   "interaction_modal.title.follow": "Följ {name}",
   "interaction_modal.title.reblog": "Boosta {name}s inlägg",
   "interaction_modal.title.reply": "Svara på {name}s inlägg",
@@ -360,7 +368,7 @@
   "lists.replies_policy.title": "Visa svar till:",
   "lists.search": "Sök bland personer du följer",
   "lists.subheading": "Dina listor",
-  "load_pending": "{count, plural, other {# objekt}}",
+  "load_pending": "{count, plural, one {# nytt objekt} other {# nya objekt}}",
   "loading_indicator.label": "Laddar...",
   "media_gallery.toggle_visible": "Växla synlighet",
   "moved_to_account_banner.text": "Ditt konto {disabledAccount} är för närvarande inaktiverat eftersom du flyttat till {movedToAccount}.",
@@ -407,6 +415,7 @@
   "notifications.column_settings.admin.report": "Nya rapporter:",
   "notifications.column_settings.admin.sign_up": "Nya registreringar:",
   "notifications.column_settings.alert": "Skrivbordsaviseringar",
+  "notifications.column_settings.favourite": "Favoriter:",
   "notifications.column_settings.filter_bar.advanced": "Visa alla kategorier",
   "notifications.column_settings.filter_bar.category": "Snabbfilter",
   "notifications.column_settings.filter_bar.show_bar": "Visa filterfält",
@@ -462,8 +471,8 @@
   "poll.closed": "Stängd",
   "poll.refresh": "Ladda om",
   "poll.reveal": "Visa resultat",
-  "poll.total_people": "{persons, plural, one {# person} other {# personer}}",
-  "poll.total_votes": "{count, plural, one {1 röst} other {# röster}}",
+  "poll.total_people": "{count, plural, one {# person} other {# personer}}",
+  "poll.total_votes": "{count, plural, one {# röst} other {# röster}}",
   "poll.vote": "Rösta",
   "poll.voted": "Du röstade för detta svar",
   "poll.votes": "{votes, plural, one {# röst} other {# röster}}",
@@ -554,7 +563,7 @@
   "search_results.statuses": "Inlägg",
   "search_results.statuses_fts_disabled": "Att söka efter inlägg baserat på innehåll är inte aktiverat på denna Mastodon-server.",
   "search_results.title": "Sök efter {q}",
-  "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "search_results.total": "{count, number} {count, plural, one {resultat} other {resultat}}",
   "server_banner.about_active_users": "Personer som använt denna server de senaste 30 dagarna (månatligt aktiva användare)",
   "server_banner.active_users": "aktiva användare",
   "server_banner.administered_by": "Administrerad av:",
@@ -563,6 +572,7 @@
   "server_banner.server_stats": "Serverstatistik:",
   "sign_in_banner.create_account": "Skapa konto",
   "sign_in_banner.sign_in": "Logga in",
+  "sign_in_banner.sso_redirect": "Logga in eller registrera dig",
   "status.admin_account": "Öppet modereringsgränssnitt för @{name}",
   "status.admin_domain": "Öppet modereringsgränssnitt för @{domain}",
   "status.admin_status": "Öppna detta inlägg i modereringsgränssnittet",
@@ -625,10 +635,10 @@
   "tabs_bar.home": "Hem",
   "tabs_bar.notifications": "Aviseringar",
   "time_remaining.days": "{number, plural, one {# dag} other {# dagar}} kvar",
-  "time_remaining.hours": "{hours, plural, one {# timme} other {# timmar}} kvar",
-  "time_remaining.minutes": "{minutes, plural, one {1 minut} other {# minuter}} kvar",
+  "time_remaining.hours": "{number, plural, one {# timme} other {# timmar}} kvar",
+  "time_remaining.minutes": "{number, plural, one {# minut} other {# minuter}} kvar",
   "time_remaining.moments": "Återstående tillfällen",
-  "time_remaining.seconds": "{hours, plural, one {# sekund} other {# sekunder}} kvar",
+  "time_remaining.seconds": "{number, plural, one {# sekund} other {# sekunder}} kvar",
   "timeline_hint.remote_resource_not_displayed": "{resource} från andra servrar visas inte.",
   "timeline_hint.resources.followers": "Följare",
   "timeline_hint.resources.follows": "Följer",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 8f0cc74564..d4c33ce9d4 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -191,7 +191,6 @@
   "conversation.open": "ดูการสนทนา",
   "conversation.with": "กับ {names}",
   "copypaste.copied": "คัดลอกแล้ว",
-  "copypaste.copy": "คัดลอก",
   "copypaste.copy_to_clipboard": "คัดลอกไปยังคลิปบอร์ด",
   "directory.federated": "จากจักรวาลสหพันธ์ที่รู้จัก",
   "directory.local": "จาก {domain} เท่านั้น",
@@ -296,6 +295,9 @@
   "hashtag.column_settings.tag_mode.any": "ใดก็ตามนี้",
   "hashtag.column_settings.tag_mode.none": "ไม่ใช่ทั้งหมดนี้",
   "hashtag.column_settings.tag_toggle": "รวมแท็กเพิ่มเติมสำหรับคอลัมน์นี้",
+  "hashtag.counter_by_accounts": "{count, plural, other {{counter} ผู้มีส่วนร่วม}}",
+  "hashtag.counter_by_uses": "{count, plural, other {{counter} โพสต์}}",
+  "hashtag.counter_by_uses_today": "{count, plural, other {{counter} โพสต์}}วันนี้",
   "hashtag.follow": "ติดตามแฮชแท็ก",
   "hashtag.unfollow": "เลิกติดตามแฮชแท็ก",
   "home.actions.go_to_explore": "ดูสิ่งที่กำลังนิยม",
@@ -303,7 +305,7 @@
   "home.column_settings.basic": "พื้นฐาน",
   "home.column_settings.show_reblogs": "แสดงการดัน",
   "home.column_settings.show_replies": "แสดงการตอบกลับ",
-  "home.explore_prompt.body": "ฟีดหน้าแรกของคุณจะมีการผสมผสานของโพสต์จากแฮชแท็กที่คุณได้เลือกติดตาม, ผู้คนที่คุณได้เลือกติดตาม และโพสต์ที่เขาดัน ฟีดดูค่อนข้างเงียบในตอนนี้ ดังนั้นแล้วถ้าเป็น:",
+  "home.explore_prompt.body": "ฟีดหน้าแรกของคุณจะมีการผสมผสานของโพสต์จากแฮชแท็กที่คุณได้เลือกติดตาม, ผู้คนที่คุณได้เลือกติดตาม และโพสต์ที่เขาดัน หากนั่นรู้สึกเงียบเกินไป คุณอาจต้องการ:",
   "home.explore_prompt.title": "นี่คือฐานหน้าแรกของคุณภายใน Mastodon",
   "home.hide_announcements": "ซ่อนประกาศ",
   "home.show_announcements": "แสดงประกาศ",
@@ -311,10 +313,13 @@
   "interaction_modal.description.follow": "ด้วยบัญชีใน Mastodon คุณสามารถติดตาม {name} เพื่อรับโพสต์ของเขาในฟีดหน้าแรกของคุณ",
   "interaction_modal.description.reblog": "ด้วยบัญชีใน Mastodon คุณสามารถดันโพสต์นี้เพื่อแบ่งปันโพสต์กับผู้ติดตามของคุณเอง",
   "interaction_modal.description.reply": "ด้วยบัญชีใน Mastodon คุณสามารถตอบกลับโพสต์นี้",
+  "interaction_modal.login.action": "นำฉันกลับบ้าน",
+  "interaction_modal.login.prompt": "โดเมนของเซิร์ฟเวอร์บ้านของคุณ เช่น mastodon.social",
+  "interaction_modal.no_account_yet": "ไม่ได้อยู่ใน Mastodon?",
   "interaction_modal.on_another_server": "ในเซิร์ฟเวอร์อื่น",
   "interaction_modal.on_this_server": "ในเซิร์ฟเวอร์นี้",
-  "interaction_modal.other_server_instructions": "คัดลอกแล้ววาง URL นี้ลงในช่องค้นหาของแอป Mastodon โปรดของคุณหรือส่วนติดต่อเว็บของเซิร์ฟเวอร์ Mastodon ของคุณ",
-  "interaction_modal.preamble": "เนื่องจาก Mastodon เป็นแบบกระจายศูนย์ คุณสามารถใช้บัญชีที่มีอยู่ของคุณที่ได้รับการโฮสต์โดยเซิร์ฟเวอร์ Mastodon อื่นหรือแพลตฟอร์มที่เข้ากันได้หากคุณไม่มีบัญชีในเซิร์ฟเวอร์นี้",
+  "interaction_modal.sign_in": "คุณไม่ได้เข้าสู่ระบบเซิร์ฟเวอร์นี้ บัญชีของคุณโฮสต์อยู่ที่ไหน?",
+  "interaction_modal.sign_in_hint": "เคล็ดลับ: นั่นคือเว็บไซต์ที่คุณได้ลงทะเบียน หากคุณจำไม่ได้ มองหาอีเมลต้อนรับในกล่องขาเข้าของคุณ คุณยังสามารถป้อนชื่อผู้ใช้เต็มของคุณ! (เช่น @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "ชื่นชอบโพสต์ของ {name}",
   "interaction_modal.title.follow": "ติดตาม {name}",
   "interaction_modal.title.reblog": "ดันโพสต์ของ {name}",
@@ -596,6 +601,7 @@
   "server_banner.server_stats": "สถิติเซิร์ฟเวอร์:",
   "sign_in_banner.create_account": "สร้างบัญชี",
   "sign_in_banner.sign_in": "เข้าสู่ระบบ",
+  "sign_in_banner.sso_redirect": "เข้าสู่ระบบหรือลงทะเบียน",
   "sign_in_banner.text": "เข้าสู่ระบบเพื่อติดตามโปรไฟล์หรือแฮชแท็ก ชื่นชอบ แบ่งปัน และตอบกลับโพสต์ คุณยังสามารถโต้ตอบจากบัญชีของคุณในเซิร์ฟเวอร์อื่น",
   "status.admin_account": "เปิดส่วนติดต่อการควบคุมสำหรับ @{name}",
   "status.admin_domain": "เปิดส่วนติดต่อการควบคุมสำหรับ {domain}",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index c0f917ddd9..991d3f8c92 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -60,7 +60,7 @@
   "account.requested": "Onay bekleniyor. Takip isteğini iptal etmek için tıklayın",
   "account.requested_follow": "{name} size takip isteği gönderdi",
   "account.share": "@{name} adlı kişinin profilini paylaş",
-  "account.show_reblogs": "@{name} kişisinin boostlarını göster",
+  "account.show_reblogs": "@{name} kişisinin yeniden paylaşımlarını göster",
   "account.statuses_counter": "{count, plural, one {{counter} Gönderi} other {{counter} Gönderi}}",
   "account.unblock": "@{name} adlı kişinin engelini kaldır",
   "account.unblock_domain": "{domain} alan adının engelini kaldır",
@@ -109,11 +109,11 @@
   "column.about": "Hakkında",
   "column.blocks": "Engellenen kullanıcılar",
   "column.bookmarks": "Yer İşaretleri",
-  "column.community": "Yerel zaman tüneli",
+  "column.community": "Yerel ağ akışı",
   "column.direct": "Özel değinmeler",
   "column.directory": "Profillere göz at",
   "column.domain_blocks": "Engellenen alan adları",
-  "column.favourites": "Gözdeler",
+  "column.favourites": "Favorilerin",
   "column.firehose": "Anlık Akışlar",
   "column.follow_requests": "Takip istekleri",
   "column.home": "Anasayfa",
@@ -121,7 +121,7 @@
   "column.mutes": "Sessize alınmış kullanıcılar",
   "column.notifications": "Bildirimler",
   "column.pins": "Sabitlenmiş gönderiler",
-  "column.public": "Federe zaman tüneli",
+  "column.public": "Federe ağ akışı",
   "column_back_button.label": "Geri",
   "column_header.hide_settings": "Ayarları gizle",
   "column_header.moveLeft_settings": "Sütunu sola taşı",
@@ -138,7 +138,7 @@
   "compose.published.body": "Gönderi yayınlandı.",
   "compose.published.open": "Aç",
   "compose_form.direct_message_warning_learn_more": "Daha fazla bilgi edinin",
-  "compose_form.encryption_warning": "Mastodon gönderileri uçtan uca şifrelemeli değildir. Hassas olabilecek herhangi bir bilgiyi Mastodon'da paylaşmayın.",
+  "compose_form.encryption_warning": "Mastodon gönderileri uçtan uca şifreli değildir. Hassas olabilecek herhangi bir bilgiyi Mastodon'da paylaşmayınız.",
   "compose_form.hashtag_warning": "Bu gönderi herkese açık olmadığı için hiç bir etikette yer almayacak. Sadece herkese açık gönderiler etiketlerde bulunabilir.",
   "compose_form.lock_disclaimer": "Hesabın {locked} değil. Yalnızca takipçilere özel gönderilerini görüntülemek için herkes seni takip edebilir.",
   "compose_form.lock_disclaimer.lock": "kilitli",
@@ -149,8 +149,8 @@
   "compose_form.poll.remove_option": "Bu seçeneği kaldır",
   "compose_form.poll.switch_to_multiple": "Birden çok seçeneğe izin vermek için anketi değiştir",
   "compose_form.poll.switch_to_single": "Tek bir seçeneğe izin vermek için anketi değiştir",
-  "compose_form.publish": "Tootla",
-  "compose_form.publish_form": "Tootla",
+  "compose_form.publish": "Gönder",
+  "compose_form.publish_form": "Gönder",
   "compose_form.publish_loud": "{publish}!",
   "compose_form.save_changes": "Değişiklikleri kaydet",
   "compose_form.sensitive.hide": "{count, plural, one {Medyayı hassas olarak işaretle} other {Medyayı hassas olarak işaretle}}",
@@ -181,7 +181,7 @@
   "confirmations.mute.explanation": "Bu, onlardan gelen ve bahseden gönderileri gizler. Ancak yine de gönderilerini görmelerine ve seni takip etmelerine izin verilir.",
   "confirmations.mute.message": "{name} kullanıcısını sessize almak istediğinden emin misin?",
   "confirmations.redraft.confirm": "Sil Düzenle ve yeniden paylaş",
-  "confirmations.redraft.message": "Bu gönderiyi silmek ve yeniden paylaşmak istediğinizden emin misiniz? Favoriler ve güncelemeler kaybolacak ve özgün gönderiye verilen yanıtlar silinecek.",
+  "confirmations.redraft.message": "Bu gönderiyi silip taslak haline getirmek istediğinize emin misiniz? Mevcut favoriler ve boostlar silinecek ve gönderiye verilen yanıtlar başıboş kalacak.",
   "confirmations.reply.confirm": "Yanıtla",
   "confirmations.reply.message": "Şimdi yanıtlarken o an oluşturduğun mesajın üzerine yazılır. Devam etmek istediğine emin misin?",
   "confirmations.unfollow.confirm": "Takibi bırak",
@@ -191,7 +191,6 @@
   "conversation.open": "Sohbeti görüntüle",
   "conversation.with": "{names} ile",
   "copypaste.copied": "Kopyalandı",
-  "copypaste.copy": "Kopyala",
   "copypaste.copy_to_clipboard": "Panoya kopyala",
   "directory.federated": "Bilinen fediverse'lerden",
   "directory.local": "Yalnızca {domain} adresinden",
@@ -201,10 +200,10 @@
   "disabled_account_banner.text": "{disabledAccount} hesabınız şu an devre dışı.",
   "dismissable_banner.community_timeline": "Bunlar, {domain} sunucusunda hesabı olanların yakın zamandaki herkese açık gönderileridir.",
   "dismissable_banner.dismiss": "Yoksay",
-  "dismissable_banner.explore_links": "Bu haberler, merkeziyetsiz ağın bu ve diğer sunucularındaki insanlar tarafından şimdilerde konuşuluyor.",
-  "dismissable_banner.explore_statuses": "Merkeziyetsiz ağın bu ve diğer sunucularındaki bu gönderiler, mevcut sunucuda şimdilerde ilgi çekiyorlar.",
+  "dismissable_banner.explore_links": "Bunlar şimdilerde sosyal ağlarda en çok paylaşılan haberler. Farklı kişilerin yayınladığı daha yeni haberler daha üst sıralarda yer alır.",
+  "dismissable_banner.explore_statuses": "Bunlar, sosyal ağ genelinde bugün ilgi gören gönderiler. Daha çok yinelenen ve favorilenen yeni gönderiler daha üst sıralarda yer alır.",
   "dismissable_banner.explore_tags": "Bu etiketler, merkeziyetsiz ağda bulunan bu ve diğer sunuculardaki insanların şimdilerde ilgisini çekiyor.",
-  "dismissable_banner.public_timeline": "Bunlar, {domain} üzeirndeki insanların, sosyal medyada takip ettiği insanlarca gönderilen en son herkese açık gönderilerdir.",
+  "dismissable_banner.public_timeline": "Bunlar, {domain} üzerindeki insanların, sosyal ağ da takip ettiği insanlarca gönderilen en son ve herkese açık gönderilerdir.",
   "embed.instructions": "Aşağıdaki kodu kopyalayarak bu durumu sitenize gömün.",
   "embed.preview": "İşte nasıl görüneceği:",
   "emoji_button.activity": "Aktivite",
@@ -228,10 +227,10 @@
   "empty_column.blocks": "Henüz herhangi bir kullanıcıyı engellemedin.",
   "empty_column.bookmarked_statuses": "Henüz yer imine eklediğin toot yok. Bir tanesi yer imine eklendiğinde burada görünür.",
   "empty_column.community": "Yerel zaman çizelgesi boş. Daha fazla eğlence için herkese açık bir gönderi paylaşın!",
-  "empty_column.direct": "Henüz doğrudan değinmeniz yok. Bir tane gönderdiğinizde veya aldığınızda burada listelenecekler.",
+  "empty_column.direct": "Henüz doğrudan değinmeniz yok. Bir tane gönderdiğinizde veya aldığınızda burada listelenecek.",
   "empty_column.domain_blocks": "Henüz engellenmiş bir alan adı yok.",
   "empty_column.explore_statuses": "Şu an öne çıkan birşey yok. Daha sonra tekrar bakın!",
-  "empty_column.favourited_statuses": "Henüz gözde gönderileriniz yok. En sevdiğin zaman, burada görünecek.",
+  "empty_column.favourited_statuses": "Henüz bir gönderiyi favorilerinize eklememişsiniz. Bir gönderiyi favorilerinize eklediğinizde burada görünecek.",
   "empty_column.favourites": "Bu yazıyı henüz hiç kimse beğenmedi. Biri geldiğinde, buraya gelecekler.",
   "empty_column.follow_requests": "Hiç takip isteğiniz yok. Bir tane aldığınızda burada görünecek.",
   "empty_column.followed_tags": "Henüz hiç bir etiket takip etmiyorsunuz. Takip ettiğiniz etiketler burada görüntülenecek.",
@@ -258,7 +257,7 @@
   "filter_modal.added.context_mismatch_title": "Bağlam uyumsuzluğu!",
   "filter_modal.added.expired_explanation": "Bu süzgeç kategorisinin süresi dolmuş, süzgeci uygulamak için bitiş tarihini değiştirmeniz gerekiyor.",
   "filter_modal.added.expired_title": "Süresi dolmuş süzgeç!",
-  "filter_modal.added.review_and_configure": "Bu süzgeç kategorisini gözden geçirmek ve daha ayrıntılı bir şekilde yapılandırmak için {settings_link} adresine gidin.",
+  "filter_modal.added.review_and_configure": "Bu filtre kategorisini gözden geçirmek ve daha ayrıntılı bir şekilde yapılandırmak için {settings_link} adresine gidin.",
   "filter_modal.added.review_and_configure_title": "Süzgeç ayarları",
   "filter_modal.added.settings_link": "ayarlar sayfası",
   "filter_modal.added.short_explanation": "Bu gönderi şu süzgeç kategorisine eklendi: {title}.",
@@ -275,7 +274,7 @@
   "firehose.remote": "Diğer sunucular",
   "follow_request.authorize": "İzin Ver",
   "follow_request.reject": "Reddet",
-  "follow_requests.unlocked_explanation": "Hesabınız kilitli olmasa bile, {domain} personeli bu hesaplardan gelen takip isteklerini gözden geçirmek isteyebileceğinizi düşündü.",
+  "follow_requests.unlocked_explanation": "Hesabınız kilitli olmasa da, {domain} personeli bu hesaplardan gelen takip isteklerini gözden geçirmek isteyebileceğinizi düşündü.",
   "followed_tags": "Takip edilen etiketler",
   "footer.about": "Hakkında",
   "footer.directory": "Profil dizini",
@@ -296,43 +295,49 @@
   "hashtag.column_settings.tag_mode.any": "Herhangi biri",
   "hashtag.column_settings.tag_mode.none": "Bunların hiçbiri",
   "hashtag.column_settings.tag_toggle": "Bu sütundaki ek etiketleri içer",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} katılımcı} other {{counter} katılımcı}}",
+  "hashtag.counter_by_uses": "{count, plural, one {{counter} gönderi} other {{counter} gönderi}}",
+  "hashtag.counter_by_uses_today": "bugün {count, plural, one {{counter} gönderi} other {{counter} gönderi}}",
   "hashtag.follow": "Etiketi takip et",
   "hashtag.unfollow": "Etiketi takibi bırak",
   "home.actions.go_to_explore": "Öne çıkanları gör",
   "home.actions.go_to_suggestions": "Takip edecek kişileri bulun",
   "home.column_settings.basic": "Temel",
-  "home.column_settings.show_reblogs": "Boostları göster",
+  "home.column_settings.show_reblogs": "Yeniden paylaşımları göster",
   "home.column_settings.show_replies": "Yanıtları göster",
-  "home.explore_prompt.body": "Ana sayfa akışınızda, takip etmeyi seçtiğiniz hashtag'lerden, takip etmeyi seçtiğiniz kişilerden ve öne çıkardıkları gönderilerden oluşan bir karışım bulunur. Şu anda oldukça sessiz görünüyor, peki ya:",
+  "home.explore_prompt.body": "Ana sayfa akışınızda, takip etmeyi seçtiğiniz ETİKETlerden, takip etmeyi seçtiğiniz kişilerden ve öne çıkardıkları gönderilerden oluşan bir karışım bulunur. Şu anda oldukça sessiz görünüyor, gör ve takip et :",
   "home.explore_prompt.title": "Burası Mastodon'daki Anasayfanız.",
   "home.hide_announcements": "Duyuruları gizle",
   "home.show_announcements": "Duyuruları göster",
-  "interaction_modal.description.favourite": "Mastodon'da bir hesapla, yazarı takdir ettiğinizi bildirmek ve daha sonraya saklamak için bu gönderiyi gözdelerinize ekleyebilirsiniz.",
+  "interaction_modal.description.favourite": "Bir Mastodon hesabıyla bu gönderiyi favorilerinize ekleyerek yazara gönderiyi beğendiğinizi bildirebilir ve daha sonrası için kaydedebilirsiniz.",
   "interaction_modal.description.follow": "Mastodon'daki bir hesapla, {name} kişisini, ana akışınızdaki gönderilerini görmek üzere takip edebilirsiniz.",
   "interaction_modal.description.reblog": "Mastodon'daki bir hesapla, bu gönderiyi takipçilerinizle paylaşmak için tuşlayabilirsiniz.",
   "interaction_modal.description.reply": "Mastodon'daki bir hesapla, bu gönderiye yanıt verebilirsiniz.",
+  "interaction_modal.login.action": "Anasayfaya geri dön",
+  "interaction_modal.login.prompt": "Ev sunucunuzun etki alanı, örneğin mastodon.social",
+  "interaction_modal.no_account_yet": "Mastodon açık değil?",
   "interaction_modal.on_another_server": "Farklı bir sunucuda",
   "interaction_modal.on_this_server": "Bu sunucuda",
-  "interaction_modal.other_server_instructions": "Bu bağlamtıyı kopyalayıp gözde Mastodon uygulamanızın arama alanına veya Mastodon sunucunuzun web arayüzüne yapıştırın.",
-  "interaction_modal.preamble": "Mastodon merkeziyetsiz olduğu için, bu sunucuda bir hesabınız yoksa bile başka bir Mastodon sunucusunda veya uyumlu bir platformda barındırılan mevcut hesabınızı kullanabilirsiniz.",
-  "interaction_modal.title.favourite": "Gözde {name}'s gönderisi",
+  "interaction_modal.sign_in": "Bu sunucuya giriş yapmadınız. Hesabınız nerede barındırılıyor?",
+  "interaction_modal.sign_in_hint": "İpucu: Kaydolduğunuz web sitesi budur. Hatırlamıyorsanız, gelen kutunuzdaki hoş geldiniz e-postasını arayın. Tam kullanıcı adınızı da girebilirsiniz! (örneğin @Mastodon@mastodon.social)",
+  "interaction_modal.title.favourite": "{name} kişisinin gönderisini favorilerine ekle",
   "interaction_modal.title.follow": "{name} kişisini takip et",
-  "interaction_modal.title.reblog": "{name} kişisinin gönderisini boostla",
+  "interaction_modal.title.reblog": "{name} kişisinin gönderisini yeniden paylaş",
   "interaction_modal.title.reply": "{name} kişisinin gönderisine yanıt ver",
   "intervals.full.days": "{number, plural, one {# gün} other {# gün}}",
   "intervals.full.hours": "{number, plural, one {# saat} other {# saat}}",
   "intervals.full.minutes": "{number, plural, one {# dakika} other {# dakika}}",
   "keyboard_shortcuts.back": "Geriye git",
   "keyboard_shortcuts.blocked": "Engellenen kullanıcılar listesini aç",
-  "keyboard_shortcuts.boost": "Gönderiyi boostla",
+  "keyboard_shortcuts.boost": "Gönderiyi yeniden paylaş",
   "keyboard_shortcuts.column": "Sütunlardan birindeki duruma odaklanmak için",
   "keyboard_shortcuts.compose": "Yazma alanına odaklanmak için",
   "keyboard_shortcuts.description": "Açıklama",
   "keyboard_shortcuts.direct": "özel değinmeler sütununu açmak için",
   "keyboard_shortcuts.down": "Listede aşağıya inmek için",
   "keyboard_shortcuts.enter": "gönderiyi aç",
-  "keyboard_shortcuts.favourite": "Gözde gönderi",
-  "keyboard_shortcuts.favourites": "Gözdendeki listeni aç",
+  "keyboard_shortcuts.favourite": "Gönderiyi favorilerine ekle",
+  "keyboard_shortcuts.favourites": "Favoriler listeni aç",
   "keyboard_shortcuts.federated": "Federe akışı aç",
   "keyboard_shortcuts.heading": "Klavye kısayolları",
   "keyboard_shortcuts.home": "Ana akışı aç",
@@ -389,14 +394,14 @@
   "navigation_bar.advanced_interface": "Gelişmiş web arayüzünde aç",
   "navigation_bar.blocks": "Engellenen kullanıcılar",
   "navigation_bar.bookmarks": "Yer İşaretleri",
-  "navigation_bar.community_timeline": "Yerel Zaman Tüneli",
+  "navigation_bar.community_timeline": "Yerel ağ akışı",
   "navigation_bar.compose": "Yeni gönderi yaz",
   "navigation_bar.direct": "Özel değinmeler",
   "navigation_bar.discover": "Keşfet",
   "navigation_bar.domain_blocks": "Engellenen alan adları",
   "navigation_bar.edit_profile": "Profili düzenle",
   "navigation_bar.explore": "Keşfet",
-  "navigation_bar.favourites": "Gözdelerin",
+  "navigation_bar.favourites": "Favorilerin",
   "navigation_bar.filters": "Sessize alınmış kelimeler",
   "navigation_bar.follow_requests": "Takip istekleri",
   "navigation_bar.followed_tags": "Takip edilen etiketler",
@@ -407,7 +412,7 @@
   "navigation_bar.personal": "Kişisel",
   "navigation_bar.pins": "Sabitlenmiş gönderiler",
   "navigation_bar.preferences": "Tercihler",
-  "navigation_bar.public_timeline": "Federe zaman tüneli",
+  "navigation_bar.public_timeline": "Federe ağ akışı",
   "navigation_bar.search": "Arama",
   "navigation_bar.security": "Güvenlik",
   "not_signed_in_indicator.not_signed_in": "Bu kaynağa erişmek için oturum açmanız gerekir.",
@@ -419,7 +424,7 @@
   "notification.mention": "{name} senden bahsetti",
   "notification.own_poll": "Anketiniz sona erdi",
   "notification.poll": "Oy verdiğiniz bir anket sona erdi",
-  "notification.reblog": "{name} gönderini boostladı",
+  "notification.reblog": "{name} gönderini yeniden paylaştı",
   "notification.status": "{name} az önce gönderdi",
   "notification.update": "{name} bir gönderiyi düzenledi",
   "notifications.clear": "Bildirimleri temizle",
@@ -427,16 +432,16 @@
   "notifications.column_settings.admin.report": "Yeni bildirimler:",
   "notifications.column_settings.admin.sign_up": "Yeni kayıtlar:",
   "notifications.column_settings.alert": "Masaüstü bildirimleri",
-  "notifications.column_settings.favourite": "Gözdelerin:",
+  "notifications.column_settings.favourite": "Favorilerin:",
   "notifications.column_settings.filter_bar.advanced": "Tüm kategorileri görüntüle",
-  "notifications.column_settings.filter_bar.category": "Hızlı filtre çubuğu",
-  "notifications.column_settings.filter_bar.show_bar": "Süzme çubuğunu göster",
+  "notifications.column_settings.filter_bar.category": "Hızlı süzgeç çubuğu",
+  "notifications.column_settings.filter_bar.show_bar": "Süzgeç çubuğunu göster",
   "notifications.column_settings.follow": "Yeni takipçiler:",
   "notifications.column_settings.follow_request": "Yeni takip istekleri:",
   "notifications.column_settings.mention": "Değinmeler:",
   "notifications.column_settings.poll": "Anket sonuçları:",
   "notifications.column_settings.push": "Anlık bildirimler",
-  "notifications.column_settings.reblog": "Boostlar:",
+  "notifications.column_settings.reblog": "Yeniden paylaşanlar:",
   "notifications.column_settings.show": "Sütunda göster",
   "notifications.column_settings.sound": "Ses çal",
   "notifications.column_settings.status": "Yeni gönderiler:",
@@ -444,8 +449,8 @@
   "notifications.column_settings.unread_notifications.highlight": "Okunmamış bildirimleri öne çıkar",
   "notifications.column_settings.update": "Düzenlemeler:",
   "notifications.filter.all": "Tümü",
-  "notifications.filter.boosts": "Boostlar",
-  "notifications.filter.favourites": "Gözdelerin",
+  "notifications.filter.boosts": "Yeniden paylaşımlar",
+  "notifications.filter.favourites": "Favorilerin",
   "notifications.filter.follows": "Takip edilenler",
   "notifications.filter.mentions": "Değinmeler",
   "notifications.filter.polls": "Anket sonuçları",
@@ -467,14 +472,14 @@
   "onboarding.follows.empty": "Maalesef şu an bir sonuç gösterilemiyor. Takip edilecek kişileri bulmak için arama veya keşfet sayfasına gözatmayı kullanabilirsiniz veya daha sonra tekrar deneyin.",
   "onboarding.follows.lead": "Kendi ana akışınızı siz düzenliyorsunuz. Siz daha fazla insanı takip ettikçe, daha etkin ve ilgi çekici olacaktır. Bu profiller iyi bir başlangıç olabilir, isterseniz izlemeyi daha sonra bırakabilirsiniz:",
   "onboarding.follows.title": "Mastodon'da Popüler",
-  "onboarding.share.lead": "Kullanıcılara Mastodon'da size nasıl ulaşabileceklerini söyleyin!",
+  "onboarding.share.lead": "Kullanıcılara Mastodon'da size nasıl ulaşabileceklerini ifade edin!",
   "onboarding.share.message": "#Mastodon'da kullanıcı adım {username}! Beni takip etmek için {url} bağlantısını kullanın",
   "onboarding.share.next_steps": "Olası sonraki adımlar:",
   "onboarding.share.title": "Profilinizi paylaşın",
   "onboarding.start.lead": "Yeni Mastodon hesabınız kullanıma hazır. Ondan nasıl yararlanabilirsiniz:",
   "onboarding.start.skip": "Şimdilik bunların hepsini atlamak mı istiyorsunuz?",
   "onboarding.start.title": "Başardınız!",
-  "onboarding.steps.follow_people.body": "Kendi akışınızı düzenliyorsunuz. Hadi onu ilginç insanlarla dolduralım.",
+  "onboarding.steps.follow_people.body": "Kendi akışınızı düzenliyorsunuz. Hadi onu ilginç kullacılarla dolduralım.",
   "onboarding.steps.follow_people.title": "{count, plural, one {Bir kişiyi} other {# kişiyi}} takip edin",
   "onboarding.steps.publish_status.body": "Dünyaya merhaba deyin.",
   "onboarding.steps.publish_status.title": "İlk gönderinizi oluşturun",
@@ -482,7 +487,7 @@
   "onboarding.steps.setup_profile.title": "Profilinizi özelleştirin",
   "onboarding.steps.share_profile.body": "Arkadaşlarınıza Mastodon'da size nasıl ulaşabileceklerini söyleyin!",
   "onboarding.steps.share_profile.title": "Profilinizi paylaşın",
-  "onboarding.tips.2fa": "<strong>Biliyor muydunuz?</strong> Hesabınızı, hesap ayarlarında iki aşamalı doğrılamayı ayarlayarak güvenli kılabilirsiniz. Sizin seçiminiz olan herhangi bir TOTP uygulamasıyla çalışır, telefon numarası da gerekmiyor!",
+  "onboarding.tips.2fa": "<strong>Biliyor muydunuz?</strong> Hesabınızı, hesap ayarlarında iki aşamalı doğrılamayı ayarlayarak güvenli kılabilirsiniz. Sizin seçiminiz olan herhangi bir İki Faktörlü TOTP uygulamasıyla çalışır, telefon numarası da gerekmiyor!",
   "onboarding.tips.accounts_from_other_servers": "<strong>Biliyor muydunuz?</strong> Mastodon ademi merkeziyetçi olduğu için, karşılaştığınız bazı profiller sizinkinden farklı bir sunucuda barındırılacaktır. Buna rağmen onlarla sorunsuz bir şekilde etkileşebilirsiniz! Sunucuları, kullanıcı adlarının ikinci yarısıdır!",
   "onboarding.tips.migration": "<strong>Biliyor muydunuz?</strong> Eğer gelecekte {domain} sunucusunu çok iyi bulmazsanız, takipçilerinizi kaybetmeden başka bir Mastodon sunucusuna taşınabilirsiniz. Kendi sunucunuzu bile oluşturabilirsiniz!",
   "onboarding.tips.verification": "<strong>Biliyor muydunuz?</strong> Hesabınızı, kendi web sitenize Mastodon profilinize bir bağlantı koyarak, sonra da web sitenizin bağlantısını profilinize ekleyerek doğrulayabilirsiniz. Ne ücret ne de bir belge gerekiyor!",
@@ -513,15 +518,15 @@
   "refresh": "Yenile",
   "regeneration_indicator.label": "Yükleniyor…",
   "regeneration_indicator.sublabel": "Ana akışın hazırlanıyor!",
-  "relative_time.days": "{number}g",
+  "relative_time.days": "{number}d",
   "relative_time.full.days": "{number, plural, one {# gün} other {# gün}} önce",
   "relative_time.full.hours": "{number, plural, one {# saat} other {# saat}} önce",
   "relative_time.full.just_now": "şimdi",
   "relative_time.full.minutes": "{number, plural, one {# dakika} other {# dakika}} önce",
   "relative_time.full.seconds": "{number, plural, one {# saniye} other {# saniye}} önce",
-  "relative_time.hours": "{number}s",
+  "relative_time.hours": "{number}h",
   "relative_time.just_now": "şimdi",
-  "relative_time.minutes": "{number}dk",
+  "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}sn",
   "relative_time.today": "bugün",
   "reply_indicator.cancel": "İptal",
@@ -542,7 +547,7 @@
   "report.mute_explanation": "Gönderilerini göremeyeceksiniz. Sizi takip etmeyi sürdürebilir ve gönderilerinizi görebilirler ama sessize alındıklarını anlamayacaklar.",
   "report.next": "Sonraki",
   "report.placeholder": "Ek yorumlar",
-  "report.reasons.dislike": "Beğenmedim",
+  "report.reasons.dislike": "Hoşlanmadım",
   "report.reasons.dislike_description": "Görmek isteyeceğiniz bir şey değil",
   "report.reasons.legal": "Bu yasalara aykırı",
   "report.reasons.legal_description": "Kendi veya sunucunuzun ülkesinin yasalarını ihlal ettiğini düşünüyorsunuz",
@@ -575,9 +580,9 @@
   "search.quick_action.account_search": "Eşleşen profiller {x}",
   "search.quick_action.go_to_account": "Profile git {x}",
   "search.quick_action.go_to_hashtag": "Etikete git {x}",
-  "search.quick_action.open_url": "URL'yi Mastodon'da Aç",
+  "search.quick_action.open_url": "Bağlantıyı Mastodon'da Aç",
   "search.quick_action.status_search": "Eşleşen gönderiler {x}",
-  "search.search_or_paste": "Ara veya URL gir",
+  "search.search_or_paste": "Ara veya bağlantıyı yapıştır",
   "search_popout.quick_actions": "Hızlı eylemler",
   "search_popout.recent": "Son aramalar",
   "search_results.accounts": "Profiller",
@@ -596,15 +601,16 @@
   "server_banner.server_stats": "Sunucu istatistikleri:",
   "sign_in_banner.create_account": "Hesap oluştur",
   "sign_in_banner.sign_in": "Giriş yap",
-  "sign_in_banner.text": "Profilleri veya etiketleri takip etmek, gözdelerin, paylaşımlar ve gönderileri yanıtlamak için giriş yapın. Hesabınızdan farklı bir sunucuda da etkileşim içinde bulunabilirsiniz.",
+  "sign_in_banner.sso_redirect": "Giriş yap veya kaydol",
+  "sign_in_banner.text": "Profilleri ve hashtagleri takip etmek, gönderileri favorilerine eklemek, paylaşmak ve yanıtlamak için giriş yap. Farklı bir sunucudaki hesabınla da etkileşimde bulunabilirsin.",
   "status.admin_account": "@{name} için denetim arayüzünü açın",
   "status.admin_domain": "{domain} için denetim arayüzünü açın",
   "status.admin_status": "Denetim arayüzünde bu gönderiyi açın",
   "status.block": "@{name} adlı kişiyi engelle",
   "status.bookmark": "Yer işareti ekle",
-  "status.cancel_reblog_private": "Boostu geri al",
-  "status.cannot_reblog": "Bu gönderi boost edilemez",
-  "status.copy": "Bağlantı durumunu kopyala",
+  "status.cancel_reblog_private": "Yeniden paylaşımı geri al",
+  "status.cannot_reblog": "Bu gönderi yeniden paylaşılamaz",
+  "status.copy": "Gönderi bağlantısını kopyala",
   "status.delete": "Sil",
   "status.detailed_status": "Ayrıntılı sohbet görünümü",
   "status.direct": "@{name} kullanıcısına özelden değin",
@@ -613,9 +619,9 @@
   "status.edited": "{date} tarihinde düzenlenmiş",
   "status.edited_x_times": "{count, plural, one {{count} kez} other {{count} kez}} düzenlendi",
   "status.embed": "Gömülü",
-  "status.favourite": "Gözdem",
-  "status.filter": "Bu gönderiyi filtrele",
-  "status.filtered": "Filtrelenmiş",
+  "status.favourite": "Favori",
+  "status.filter": "Bu gönderiyi süzgeçle",
+  "status.filtered": "Süzgeçlenmiş",
   "status.hide": "Gönderiyi gizle",
   "status.history.created": "{name} oluşturdu {date}",
   "status.history.edited": "{name} düzenledi {date}",
@@ -631,13 +637,13 @@
   "status.pin": "Profile sabitle",
   "status.pinned": "Sabitlenmiş gönderi",
   "status.read_more": "Devamını okuyun",
-  "status.reblog": "Boostla",
-  "status.reblog_private": "Orijinal görünürlük ile boostla",
-  "status.reblogged_by": "{name} boostladı",
-  "status.reblogs.empty": "Henüz hiç kimse bu Toot'u Boost'lamadı. Biri yaptığında burada görünecek.",
-  "status.redraft": "Sil ve yeniden taslak yap",
+  "status.reblog": "Yeniden paylaş",
+  "status.reblog_private": "Özgün görünürlük ile yeniden paylaş",
+  "status.reblogged_by": "{name} yeniden paylaştı",
+  "status.reblogs.empty": "Henüz hiç kimse bu Gönderiyi Yeniden Paylaşmadı. Herhangi bir kullanıcı yeniden paylaştığında burada görüntülenecek.",
+  "status.redraft": "Sil,Düzenle ve Yeniden paylaş",
   "status.remove_bookmark": "Yer işaretini kaldır",
-  "status.replied_to": "{name} kullanıcısına yanıt verildi",
+  "status.replied_to": "{name} kullanıcısına yanıt verdi",
   "status.reply": "Yanıtla",
   "status.replyAll": "Konuyu yanıtla",
   "status.report": "@{name} adlı kişiyi bildir",
diff --git a/app/javascript/mastodon/locales/tt.json b/app/javascript/mastodon/locales/tt.json
index 2b9262e695..536e0a5333 100644
--- a/app/javascript/mastodon/locales/tt.json
+++ b/app/javascript/mastodon/locales/tt.json
@@ -175,7 +175,6 @@
   "conversation.open": "Сөйләшүне карау",
   "conversation.with": "{names} белән",
   "copypaste.copied": "Күчереп алынган",
-  "copypaste.copy": "Күчереп алу",
   "copypaste.copy_to_clipboard": "Алмашу буферына күчереп алу",
   "directory.federated": "Билгеле галәмнән",
   "directory.local": "Кемнән {domain} гына",
@@ -259,7 +258,6 @@
   "interaction_modal.description.reply": "Mastodon аккаунты белән сез бу язмага җавап бирә аласыз.",
   "interaction_modal.on_another_server": "Башка серверда",
   "interaction_modal.on_this_server": "Бу серверда",
-  "interaction_modal.preamble": "Mastodon үзәкләштерелмәгәнгә, Сез үзегезнең Mastodon серверына урнаштырылган счетыгызны яки бу серверда счетыгыз булмаса, платформага туры килгән платформаны куллана аласыз.",
   "interaction_modal.title.follow": "Иярү {name}",
   "interaction_modal.title.reblog": "Арттыру {name} сак",
   "interaction_modal.title.reply": "Җавап {name} сак",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index 8c811423a0..9217219b77 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -191,7 +191,6 @@
   "conversation.open": "Переглянути бесіду",
   "conversation.with": "З {names}",
   "copypaste.copied": "Скопійовано",
-  "copypaste.copy": "Копіювати",
   "copypaste.copy_to_clipboard": "Копіювати до буфера обміну",
   "directory.federated": "З відомого федесвіту",
   "directory.local": "Лише з домену {domain}",
@@ -296,6 +295,9 @@
   "hashtag.column_settings.tag_mode.any": "Який-небудь зі списку",
   "hashtag.column_settings.tag_mode.none": "Жоден зі списку",
   "hashtag.column_settings.tag_toggle": "Додати додаткові теґи до цього стовпчика",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} учасник} few {{counter} учасники} many {{counter} учасників} other {{counter} учасник}}",
+  "hashtag.counter_by_uses": "{count, plural, one {{counter} допис} few {{counter} дописи} many {{counter} дописів} other {{counter} допис}}",
+  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} допис} few {{counter} дописи} many {{counter} дописів} other {{counter} допис}} сьогодні",
   "hashtag.follow": "Стежити за хештегом",
   "hashtag.unfollow": "Не стежити за хештегом",
   "home.actions.go_to_explore": "Переглянути тенденції",
@@ -303,7 +305,7 @@
   "home.column_settings.basic": "Основні",
   "home.column_settings.show_reblogs": "Показувати поширення",
   "home.column_settings.show_replies": "Показувати відповіді",
-  "home.explore_prompt.body": "Ваша домашня стрічка буде сумішшю дописів з обраних для стеження хештегів, людей і поширених ними дописів. Зараз тут досить порожньо, тож:",
+  "home.explore_prompt.body": "Ваша домашня стрічка буде сумішшю дописів з обраних для стеження хештегів, людей і поширених ними дописів. Якщо цього замало, ви також можете:",
   "home.explore_prompt.title": "Це ваша домашня база у Mastodon.",
   "home.hide_announcements": "Приховати оголошення",
   "home.show_announcements": "Показати оголошення",
@@ -311,10 +313,13 @@
   "interaction_modal.description.follow": "Маючи обліковий запис на Mastodon, ви можете підписатися на {name}, щоб отримувати дописи цього користувача у свою стрічку.",
   "interaction_modal.description.reblog": "Маючи обліковий запис на Mastodon, ви можете поширити цей допис, щоб поділитися ним зі своїми підписниками.",
   "interaction_modal.description.reply": "Маючи обліковий запис на Mastodon, ви можете відповісти на цей допис.",
+  "interaction_modal.login.action": "На домашню сторінку",
+  "interaction_modal.login.prompt": "Домен вашого домашнього сервера, наприклад, mastodon.social",
+  "interaction_modal.no_account_yet": "Не зареєстровані в Mastodon?",
   "interaction_modal.on_another_server": "На іншому сервері",
   "interaction_modal.on_this_server": "На цьому сервері",
-  "interaction_modal.other_server_instructions": "Скопіюйте та вставте цю URL-адресу в поле пошуку вашого улюбленого застосунку Mastodon або вебінтерфейсу вашого сервера Mastodon.",
-  "interaction_modal.preamble": "Оскільки Mastodon децентралізований, ви можете використовувати свій наявний обліковий запис, розміщений на іншому сервері Mastodon або сумісній платформі, якщо у вас немає облікового запису на цьому сервері.",
+  "interaction_modal.sign_in": "Ви не ввійшли на цей сервер. Де розміщений ваш обліковий запис?",
+  "interaction_modal.sign_in_hint": "Підказка: це сайт, на якому ви зареєструвалися. Якщо ви не пам'ятаєте, знайдіть привітальний електронний лист у теці \"Вхідні\". Ви також можете ввести повне ім'я користувача! (наприклад, @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Уподобати допис {name}",
   "interaction_modal.title.follow": "Підписатися на {name}",
   "interaction_modal.title.reblog": "Поширити допис {name}",
@@ -596,6 +601,7 @@
   "server_banner.server_stats": "Статистика сервера:",
   "sign_in_banner.create_account": "Створити обліковий запис",
   "sign_in_banner.sign_in": "Увійти",
+  "sign_in_banner.sso_redirect": "Увійдіть або зареєструйтесь",
   "sign_in_banner.text": "Увійдіть, щоб слідкувати за профілями або хештегами, вподобаними, ділитися і відповідати на дописи. Ви також можете взаємодіяти з вашого облікового запису на іншому сервері.",
   "status.admin_account": "Відкрити інтерфейс модерації для @{name}",
   "status.admin_domain": "Відкрити інтерфейс модерації для {domain}",
diff --git a/app/javascript/mastodon/locales/ur.json b/app/javascript/mastodon/locales/ur.json
index 0004e38486..52d9454d57 100644
--- a/app/javascript/mastodon/locales/ur.json
+++ b/app/javascript/mastodon/locales/ur.json
@@ -1,52 +1,73 @@
 {
   "about.blocks": "معتدل سرورز",
   "about.contact": "رابطہ:",
+  "about.disclaimer": "میسٹادان مفت، اوپن سورس سافٹ ویئر ہے، اور میسٹادان غیر منافع بخش کا ٹریڈ مارک ہے۔",
   "about.domain_blocks.no_reason_available": "وجوہات نہیں دستیاب",
   "about.domain_blocks.silenced.title": "محدود",
   "about.domain_blocks.suspended.title": "معطل شدہ",
+  "about.rules": "سرور کے اصول",
   "account.account_note_header": "نوٹ",
   "account.add_or_remove_from_list": "فہرست میں شامل یا برطرف کریں",
   "account.badges.bot": "روبوٹ",
   "account.badges.group": "گروپ",
   "account.block": "مسدود @{name}",
   "account.block_domain": "{domain} سے سب چھپائیں",
+  "account.block_short": "بلاک",
   "account.blocked": "مسدود کردہ",
   "account.browse_more_on_origin_server": "اصل پروفائل پر مزید براؤز کریں",
   "account.cancel_follow_request": "Withdraw follow request",
+  "account.direct": "نجی طور پر @{name} کا ذکر کریں",
   "account.disable_notifications": "جب @{name} پوسٹ کرے تو مجھ مطلع نہ کریں",
   "account.domain_blocked": "پوشیدہ ڈومین",
   "account.edit_profile": "مشخص ترمیم کریں",
   "account.enable_notifications": "جب @{name} پوسٹ کرے تو مجھ مطلع کریں",
   "account.endorse": "مشکص پر نمایاں کریں",
+  "account.featured_tags.last_status_at": "آخری پوسٹ {date} کو",
   "account.featured_tags.last_status_never": "کوئی مراسلہ نہیں",
+  "account.featured_tags.title": "{name} کے نمایاں ہیش ٹیگز",
   "account.follow": "پیروی کریں",
   "account.followers": "پیروکار",
   "account.followers.empty": "\"ہنوز اس صارف کی کوئی پیروی نہیں کرتا\".",
   "account.followers_counter": "{count, plural,one {{counter} پیروکار} other {{counter} پیروکار}}",
+  "account.following": "فالو کر رہے ہیں",
   "account.following_counter": "{count, plural, one {{counter} پیروی کر رہے ہیں} other {{counter} پیروی کر رہے ہیں}}",
   "account.follows.empty": "\"یہ صارف ہنوز کسی کی پیروی نہیں کرتا ہے\".",
   "account.follows_you": "آپ کا پیروکار ہے",
+  "account.go_to_profile": "پروفائل پر جائیں",
   "account.hide_reblogs": "@{name} سے فروغ چھپائیں",
+  "account.in_memoriam": "یادگار میں۔",
   "account.joined_short": "شمولیت",
+  "account.languages": "سبسکرائب شدہ زبانیں بدلیں",
   "account.link_verified_on": "اس لنک کی ملکیت کی توثیق {date} پر کی گئی تھی",
   "account.locked_info": "اس اکاونٹ کا اخفائی ضابطہ مقفل ہے۔ صارف کی پیروی کون کر سکتا ہے اس کا جائزہ وہ خود لیتا ہے.",
   "account.media": "وسائل",
   "account.mention": "ذکر @{name}",
+  "account.moved_to": "{name} نے اشارہ کیا ہے کہ ان کا نیا اکاؤنٹ اب ہے:",
   "account.mute": "خاموش @{name}",
+  "account.mute_notifications_short": "نوٹیفیکیشنز کو خاموش کریں",
+  "account.mute_short": "خاموش",
   "account.muted": "خاموش کردہ",
+  "account.no_bio": "کوئی تفصیل نہیں دی گئی۔",
+  "account.open_original_page": "اصل صفحہ کھولیں",
   "account.posts": "ٹوٹ",
   "account.posts_with_replies": "ٹوٹ اور جوابات",
   "account.report": "@{name} اطلاع کریں",
   "account.requested": "منظوری کا منتظر۔ درخواستِ پیروی منسوخ کرنے کیلئے کلک کریں",
+  "account.requested_follow": "{name} آپ کو فالو کرنا چھاتا ہے۔",
   "account.share": "@{name} کے مشخص کو بانٹیں",
   "account.show_reblogs": "@{name} کی افزائشات کو دکھائیں",
   "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
   "account.unblock": "@{name} کو بحال کریں",
   "account.unblock_domain": "{domain} کو نہ چھپائیں",
+  "account.unblock_short": "بلاک ختم کریں",
   "account.unendorse": "مشخص پر نمایاں نہ کریں",
   "account.unfollow": "پیروی ترک کریں",
   "account.unmute": "@{name} کو با آواز کریں",
+  "account.unmute_notifications_short": "نوٹیفیکیشنز کو خاموش نہ کریں",
+  "account.unmute_short": "کو خاموش نہ کریں",
   "account_note.placeholder": "Click to add a note",
+  "admin.dashboard.retention.average": "اوسط",
+  "admin.dashboard.retention.cohort_size": "نئے یسرز",
   "alert.rate_limited.message": "\"{retry_time, time, medium} کے بعد کوشش کریں\".",
   "alert.rate_limited.title": "محدود شرح",
   "alert.unexpected.message": "ایک غیر متوقع سہو ہوا ہے.",
@@ -54,7 +75,11 @@
   "announcement.announcement": "اعلان",
   "autosuggest_hashtag.per_week": "{count} فی ہفتہ",
   "boost_modal.combo": "آئیندہ یہ نہ دیکھنے کیلئے آپ {combo} دبا سکتے ہیں",
+  "bundle_column_error.error.title": "اوف، نہیں!",
+  "bundle_column_error.network.title": "نیٹ ورک کی خرابی",
   "bundle_column_error.retry": "دوبارہ کوشش کریں",
+  "bundle_column_error.return": "واپس گھر جاؤ",
+  "bundle_column_error.routing.title": "۴۰۴",
   "bundle_modal_error.close": "بند کریں",
   "bundle_modal_error.message": "اس عنصر کو برآمد کرتے وقت کچھ خرابی پیش آئی ہے.",
   "bundle_modal_error.retry": "دوبارہ کوشش کریں",
@@ -64,6 +89,7 @@
   "column.community": "مقامی زمانی جدول",
   "column.directory": "مشخصات کا مطالعہ کریں",
   "column.domain_blocks": "پوشیدہ ڈومین",
+  "column.favourites": "پسندیدہ",
   "column.follow_requests": "پیروی درخواست",
   "column.home": "خانہ",
   "column.lists": "فہرستیں",
@@ -130,7 +156,6 @@
   "conversation.mark_as_read": "بطور پڑھا ہوا دکھائیں",
   "conversation.open": "گفتگو دیکھیں",
   "conversation.with": "{names} کے ساتھ",
-  "copypaste.copy": "کاپی کریں",
   "directory.federated": "معروف فیڈی ورس سے",
   "directory.local": "صرف {domain} سے",
   "directory.new_arrivals": "نئے آنے والے",
@@ -165,6 +190,7 @@
   "errors.unexpected_crash.report_issue": "مسئلہ کی اطلاع کریں",
   "follow_request.authorize": "اجازت دیں",
   "follow_request.reject": "انکار کریں",
+  "footer.about": "متعلق",
   "getting_started.heading": "آغاز کریں",
   "hashtag.column_header.tag_mode.all": "اور {additional}",
   "hashtag.column_header.tag_mode.any": "یا {additional}",
diff --git a/app/javascript/mastodon/locales/uz.json b/app/javascript/mastodon/locales/uz.json
index b6b10b8d1d..9edbcab353 100644
--- a/app/javascript/mastodon/locales/uz.json
+++ b/app/javascript/mastodon/locales/uz.json
@@ -172,7 +172,6 @@
   "conversation.open": "Suhbatni ko'rish",
   "conversation.with": "{names} bilan",
   "copypaste.copied": "Ko‘chirildi",
-  "copypaste.copy": "Nusxa olish",
   "directory.federated": "Faqat bilingan fediversdan",
   "directory.local": "Faqat {domain}dan",
   "directory.new_arrivals": "Yangi kelganlar",
@@ -278,7 +277,6 @@
   "interaction_modal.description.reply": "Mastodondagi akkaunt bilan siz ushbu xabarga javob berishingiz mumkin.",
   "interaction_modal.on_another_server": "Boshqa serverda",
   "interaction_modal.on_this_server": "Shu serverda",
-  "interaction_modal.preamble": "Mastodon markazlashtirilmaganligi sababli, boshqa Mastodon serverida joylashgan mavjud hisob qaydnomangizdan yoki bu serverda akkauntingiz bo'lmasa, unga mos platformadan foydalanishingiz mumkin.",
   "interaction_modal.title.follow": "{name} ga ergashing",
   "interaction_modal.title.reblog": "{name}ning postini boost qilish",
   "interaction_modal.title.reply": "{name} postiga javob bering",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index 7ed79545fe..df632ac02e 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -12,7 +12,7 @@
   "about.powered_by": "Mạng xã hội liên hợp {mastodon}",
   "about.rules": "Nội quy máy chủ",
   "account.account_note_header": "Ghi chú",
-  "account.add_or_remove_from_list": "Thêm hoặc xóa khỏi danh sách",
+  "account.add_or_remove_from_list": "Thêm vào danh sách",
   "account.badges.bot": "Bot",
   "account.badges.group": "Nhóm",
   "account.block": "Chặn @{name}",
@@ -29,7 +29,7 @@
   "account.endorse": "Tôn vinh người này",
   "account.featured_tags.last_status_at": "Tút gần nhất {date}",
   "account.featured_tags.last_status_never": "Chưa có tút",
-  "account.featured_tags.title": "Hashtag {name} thường dùng",
+  "account.featured_tags.title": "Hashtag của {name}",
   "account.follow": "Theo dõi",
   "account.followers": "Người theo dõi",
   "account.followers.empty": "Chưa có người theo dõi nào.",
@@ -59,7 +59,7 @@
   "account.report": "Báo cáo @{name}",
   "account.requested": "Đang chờ chấp thuận. Nhấp vào đây để hủy yêu cầu theo dõi",
   "account.requested_follow": "{name} yêu cầu theo dõi bạn",
-  "account.share": "Chia sẻ trang @{name}",
+  "account.share": "Chia sẻ @{name}",
   "account.show_reblogs": "Hiện tút do @{name} đăng lại",
   "account.statuses_counter": "{count, plural, one {{counter} Tút} other {{counter} Tút}}",
   "account.unblock": "Bỏ chặn @{name}",
@@ -104,8 +104,8 @@
   "closed_registrations.other_server_instructions": "Vì Mastodon liên hợp nên bạn có thể tạo tài khoản trên máy chủ khác và vẫn tương tác với máy chủ này.",
   "closed_registrations_modal.description": "{domain} hiện tắt đăng ký, nhưng hãy lưu ý rằng bạn không cần một tài khoản riêng trên {domain} để sử dụng Mastodon.",
   "closed_registrations_modal.find_another_server": "Tìm máy chủ khác",
-  "closed_registrations_modal.preamble": "Mastodon liên hợp, vì vậy bất kể bạn tạo tài khoản ở đâu, bạn sẽ có thể theo dõi và tương tác với bất kỳ ai trên máy chủ này. Bạn thậm chí có thể tự mở máy chủ!",
-  "closed_registrations_modal.title": "Đăng ký trên Mastodon",
+  "closed_registrations_modal.preamble": "Mastodon liên hợp nên bất kể bạn tạo tài khoản ở đâu, bạn cũng sẽ có thể theo dõi và tương tác với mọi người trên máy chủ này. Bạn thậm chí có thể tự mở máy chủ!",
+  "closed_registrations_modal.title": "Đăng ký Mastodon",
   "column.about": "Giới thiệu",
   "column.blocks": "Người đã chặn",
   "column.bookmarks": "Đã lưu",
@@ -114,9 +114,9 @@
   "column.directory": "Tìm người cùng sở thích",
   "column.domain_blocks": "Máy chủ đã chặn",
   "column.favourites": "Lượt thích",
-  "column.firehose": "Bản tin trực tiếp",
+  "column.firehose": "Bảng tin",
   "column.follow_requests": "Yêu cầu theo dõi",
-  "column.home": "Bảng tin",
+  "column.home": "Trang chính",
   "column.lists": "Danh sách",
   "column.mutes": "Người đã ẩn",
   "column.notifications": "Thông báo",
@@ -131,7 +131,7 @@
   "column_header.unpin": "Không ghim",
   "column_subheading.settings": "Cài đặt",
   "community.column_settings.local_only": "Chỉ máy chủ của bạn",
-  "community.column_settings.media_only": "Chỉ xem media",
+  "community.column_settings.media_only": "Chỉ hiện tút có media",
   "community.column_settings.remote_only": "Chỉ người ở máy chủ khác",
   "compose.language.change": "Chọn ngôn ngữ tút",
   "compose.language.search": "Tìm ngôn ngữ...",
@@ -185,13 +185,12 @@
   "confirmations.reply.confirm": "Trả lời",
   "confirmations.reply.message": "Nội dung bạn đang soạn thảo sẽ bị ghi đè, bạn có tiếp tục?",
   "confirmations.unfollow.confirm": "Bỏ theo dõi",
-  "confirmations.unfollow.message": "Bạn thật sự muốn ngưng theo dõi {name}?",
+  "confirmations.unfollow.message": "Bạn thật sự muốn bỏ theo dõi {name}?",
   "conversation.delete": "Xóa tin nhắn này",
   "conversation.mark_as_read": "Đánh dấu là đã đọc",
   "conversation.open": "Xem toàn bộ tin nhắn",
   "conversation.with": "Với {names}",
   "copypaste.copied": "Đã sao chép",
-  "copypaste.copy": "Sao chép",
   "copypaste.copy_to_clipboard": "Sao chép vào bộ nhớ tạm",
   "directory.federated": "Từ mạng liên hợp",
   "directory.local": "Từ {domain}",
@@ -199,12 +198,12 @@
   "directory.recently_active": "Hoạt động gần đây",
   "disabled_account_banner.account_settings": "Cài đặt tài khoản",
   "disabled_account_banner.text": "Tài khoản {disabledAccount} của bạn hiện không khả dụng.",
-  "dismissable_banner.community_timeline": "Những tút gần đây của những người có tài khoản thuộc máy chủ {domain}.",
+  "dismissable_banner.community_timeline": "Đây là những tút công khai gần đây trong mạng liên hợp của máy chủ {domain}.",
   "dismissable_banner.dismiss": "Bỏ qua",
-  "dismissable_banner.explore_links": "Những sự kiện đang được thảo luận nhiều trên máy chủ này và những máy chủ khác thuộc mạng liên hợp của nó.",
-  "dismissable_banner.explore_statuses": "Những tút đang phổ biến trên máy chủ này và mạng liên hợp của nó.",
-  "dismissable_banner.explore_tags": "Những hashtag đang được sử dụng nhiều trên máy chủ này và những máy chủ khác thuộc mạng liên hợp của nó.",
-  "dismissable_banner.public_timeline": "Đây là những tút công khai gần đây nhất của những người trong mạng liên hợp của {domain}.",
+  "dismissable_banner.explore_links": "Đây là những liên kết đang được chia sẻ nhiều trong mạng liên hợp của máy chủ này.",
+  "dismissable_banner.explore_statuses": "Đây là những tút đang phổ biến trong mạng liên hợp của máy chủ này.",
+  "dismissable_banner.explore_tags": "Đây là những hashtag đang được sử dụng nhiều trong mạng liên hợp của máy chủ này.",
+  "dismissable_banner.public_timeline": "Đây là những tút công khai gần đây trong mạng liên hợp của máy chủ {domain}.",
   "embed.instructions": "Sao chép đoạn mã dưới đây và chèn vào trang web của bạn.",
   "embed.preview": "Nó sẽ hiển thị như vầy:",
   "emoji_button.activity": "Hoạt động",
@@ -236,11 +235,11 @@
   "empty_column.follow_requests": "Bạn chưa có yêu cầu theo dõi nào.",
   "empty_column.followed_tags": "Bạn chưa theo dõi hashtag nào. Khi bạn theo dõi, chúng sẽ hiện lên ở đây.",
   "empty_column.hashtag": "Chưa có tút nào dùng hashtag này.",
-  "empty_column.home": "Bảng tin của bạn đang trống! Hãy theo dõi nhiều người hơn. {suggestions}",
+  "empty_column.home": "Trang chính của bạn đang trống! Hãy theo dõi nhiều người hơn để lấp đầy.",
   "empty_column.list": "Chưa có tút. Khi những người trong danh sách này đăng tút mới, chúng sẽ xuất hiện ở đây.",
   "empty_column.lists": "Bạn chưa tạo danh sách nào.",
   "empty_column.mutes": "Bạn chưa ẩn bất kỳ ai.",
-  "empty_column.notifications": "Bạn chưa có thông báo nào. Hãy thử theo dõi hoặc nhắn riêng cho một ai đó.",
+  "empty_column.notifications": "Bạn chưa có thông báo nào. Hãy thử theo dõi hoặc nhắn riêng cho ai đó.",
   "empty_column.public": "Trống trơn! Bạn hãy viết gì đó hoặc bắt đầu theo dõi những người khác",
   "error.unexpected_crash.explanation": "Trang này có thể không hiển thị chính xác do lỗi lập trình Mastodon hoặc vấn đề tương thích trình duyệt.",
   "error.unexpected_crash.explanation_addons": "Trang này không thể hiển thị do xung khắc với add-on của trình duyệt hoặc công cụ tự động dịch ngôn ngữ.",
@@ -296,25 +295,31 @@
   "hashtag.column_settings.tag_mode.any": "Một phần",
   "hashtag.column_settings.tag_mode.none": "Không chọn",
   "hashtag.column_settings.tag_toggle": "Bao gồm thêm hashtag cho cột này",
+  "hashtag.counter_by_accounts": "{count, plural, other {{counter} người dùng}}",
+  "hashtag.counter_by_uses": "{count, plural, other {{counter} tút}}",
+  "hashtag.counter_by_uses_today": "{count, plural, other {{counter} tút}} hôm nay",
   "hashtag.follow": "Theo dõi hashtag",
-  "hashtag.unfollow": "Ngưng theo dõi hashtag",
+  "hashtag.unfollow": "Bỏ theo dõi hashtag",
   "home.actions.go_to_explore": "Khám phá xu hướng",
-  "home.actions.go_to_suggestions": "Đề xuất theo dõi",
+  "home.actions.go_to_suggestions": "Tìm người theo dõi",
   "home.column_settings.basic": "Tùy chỉnh",
   "home.column_settings.show_reblogs": "Hiện những lượt đăng lại",
   "home.column_settings.show_replies": "Hiện những tút dạng trả lời",
-  "home.explore_prompt.body": "Bảng tin của bạn sẽ có sự kết hợp của các tút gắn hashtag mà bạn đã chọn để theo dõi, những người bạn đã chọn để theo dõi và các bài đăng lại từ họ. Lúc này có vẻ hơi trống, sao bạn không:",
+  "home.explore_prompt.body": "Bảng tin của bạn sẽ bao gồm các tút có hashtag bạn theo dõi, những người bạn theo dõi và các tút mà họ đăng lại. Lúc này có vẻ hơi trống, sao bạn không:",
   "home.explore_prompt.title": "Đây là ngôi nhà Mastodon của bạn.",
   "home.hide_announcements": "Ẩn thông báo máy chủ",
-  "home.show_announcements": "Hiện thông báo máy chủ",
+  "home.show_announcements": "Xem thông báo máy chủ",
   "interaction_modal.description.favourite": "Với tài khoản Mastodon, bạn có thể cho người đăng biết bạn thích tút này và lưu lại tút.",
-  "interaction_modal.description.follow": "Với tài khoản Mastodon, bạn có thể theo dõi {name} để nhận những tút của họ trên bảng tin của mình.",
+  "interaction_modal.description.follow": "Với tài khoản Mastodon, bạn có thể theo dõi {name} để tút của họ hiện trên bảng tin của mình.",
   "interaction_modal.description.reblog": "Với tài khoản Mastodon, bạn có thể đăng lại tút này để chia sẻ nó với những người đang theo dõi bạn.",
-  "interaction_modal.description.reply": "Với tài khoản Mastodon, bạn có thể bình luận tút này.",
-  "interaction_modal.on_another_server": "Trên một máy chủ khác",
+  "interaction_modal.description.reply": "Với tài khoản Mastodon, bạn có thể trả lời tút này.",
+  "interaction_modal.login.action": "Đăng nhập ngay",
+  "interaction_modal.login.prompt": "Địa chỉ máy chủ của bạn, vd: mastodon.social",
+  "interaction_modal.no_account_yet": "Chưa có tài khoản Mastodon?",
+  "interaction_modal.on_another_server": "Trên máy chủ khác",
   "interaction_modal.on_this_server": "Trên máy chủ này",
-  "interaction_modal.other_server_instructions": "Sao chép và dán URL này vào thanh tìm kiếm của ứng dụng Mastodon hoặc giao diện web máy chủ Mastodon mà bạn hiện dùng.",
-  "interaction_modal.preamble": "Do Mastodon phi tập trung, bạn có thể sử dụng tài khoản hiện có trên một máy chủ Mastodon khác hoặc một nền tảng tương thích nếu bạn chưa có tài khoản trên máy chủ này.",
+  "interaction_modal.sign_in": "Bạn chưa đăng nhập. Bạn đã có tài khoản ở máy chủ khác?",
+  "interaction_modal.sign_in_hint": "Mẹo: Đó là trang web nơi bạn đã đăng ký. Nếu không nhớ, lục lại trong email của bạn. Bạn cũng có thể nhập địa chỉ Mastodon đầy đủ! (vd: @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Thích tút của {name}",
   "interaction_modal.title.follow": "Theo dõi {name}",
   "interaction_modal.title.reblog": "Đăng lại tút của {name}",
@@ -334,8 +339,8 @@
   "keyboard_shortcuts.favourite": "Thích tút",
   "keyboard_shortcuts.favourites": "Mở lượt thích",
   "keyboard_shortcuts.federated": "mở mạng liên hợp",
-  "keyboard_shortcuts.heading": "Các phím tắt",
-  "keyboard_shortcuts.home": "mở bảng tin",
+  "keyboard_shortcuts.heading": "Danh sách phím tắt",
+  "keyboard_shortcuts.home": "mở trang chính",
   "keyboard_shortcuts.hotkey": "Phím tắt",
   "keyboard_shortcuts.legend": "hiện bảng hướng dẫn này",
   "keyboard_shortcuts.local": "mở máy chủ của bạn",
@@ -462,26 +467,26 @@
   "onboarding.action.back": "Quay lại",
   "onboarding.actions.back": "Quay lại",
   "onboarding.actions.go_to_explore": "Xem những gì đang thịnh hành",
-  "onboarding.actions.go_to_home": "Đi đến bảng tin",
+  "onboarding.actions.go_to_home": "Đến trang chính",
   "onboarding.compose.template": "Xin chào #Mastodon!",
   "onboarding.follows.empty": "Không có kết quả có thể được hiển thị lúc này. Bạn có thể thử sử dụng tính năng tìm kiếm hoặc duyệt qua trang khám phá để tìm những người theo dõi hoặc thử lại sau.",
-  "onboarding.follows.lead": "Bạn quản lý bảng tin của riêng bạn. Bạn càng theo dõi nhiều người, nó sẽ càng sôi động và thú vị. Những hồ sơ này có thể là một điểm khởi đầu tốt—bạn luôn có thể hủy theo dõi họ sau!",
+  "onboarding.follows.lead": "Bạn quản lý bảng tin của riêng bạn. Bạn càng theo dõi nhiều người, nó sẽ càng sôi động và thú vị. Để bắt đầu, đây là vài gợi ý:",
   "onboarding.follows.title": "Thịnh hành trên Mastodon",
   "onboarding.share.lead": "Hãy cho mọi người biết làm thế nào họ có thể tìm thấy bạn trên Mastodon!",
   "onboarding.share.message": "Tôi là {username} trên #Mastodon! Hãy theo dõi tôi tại {url}",
   "onboarding.share.next_steps": "Các bước kế tiếp:",
-  "onboarding.share.title": "Chia sẻ hồ sơ của bạn",
+  "onboarding.share.title": "Chia sẻ hồ sơ",
   "onboarding.start.lead": "Tài khoản Mastodon mới của bạn đã sẵn sàng hoạt động. Đây là cách bạn có thể tận dụng tối đa nó:",
   "onboarding.start.skip": "Muốn bỏ qua luôn?",
   "onboarding.start.title": "Xong rồi bạn!",
-  "onboarding.steps.follow_people.body": "Bạn quản lý bảng tin của riêng bạn. Hãy lấp đầy nó với những người thú vị.",
-  "onboarding.steps.follow_people.title": "Theo dõi {count, plural, other {# người}}",
-  "onboarding.steps.publish_status.body": "Gửi lời chào tới thế giới mới.",
-  "onboarding.steps.publish_status.title": "Đăng tút đầu tiên của bạn",
-  "onboarding.steps.setup_profile.body": "Những người khác có nhiều khả năng tương tác với bạn hơn nếu hồ sơ bạn được điền đầy đủ thông tin.",
+  "onboarding.steps.follow_people.body": "Theo dõi những người thú vị trên Mastodon.",
+  "onboarding.steps.follow_people.title": "Cá nhân hóa trang chính",
+  "onboarding.steps.publish_status.body": "Chào cộng đồng bằng lời nói, ảnh hoặc video {emoji}",
+  "onboarding.steps.publish_status.title": "Đăng tút đầu tiên",
+  "onboarding.steps.setup_profile.body": "Tạo sự tương tác bằng một hồ sơ hoàn chỉnh.",
   "onboarding.steps.setup_profile.title": "Tùy biến hồ sơ",
   "onboarding.steps.share_profile.body": "Hãy để bạn bè của bạn biết cách tìm thấy bạn trên Mastodon!",
-  "onboarding.steps.share_profile.title": "Chia sẻ hồ sơ của bạn",
+  "onboarding.steps.share_profile.title": "Chia sẻ hồ sơ Mastodon của bạn",
   "onboarding.tips.2fa": "<strong>Bạn có biết?</strong> Bạn có thể bảo mật tài khoản của mình bằng cách thiết lập xác thực hai yếu tố trong cài đặt tài khoản của mình. Nó hoạt động với bất kỳ ứng dụng OTP nào bạn chọn, không cần số điện thoại!",
   "onboarding.tips.accounts_from_other_servers": "<strong>Bạn có biết?</strong> Vì Mastodon liên hợp, một số hồ sơ bạn gặp sẽ được lưu trữ trên các máy chủ không giống bạn. Tuy nhiên, bạn có thể tương tác với họ một cách liền mạch! Máy chủ của họ nằm ở nửa sau tên người dùng của họ!",
   "onboarding.tips.migration": "<strong>Bạn có biết?</strong> Nếu bạn thấy {domain} không phải là lựa chọn máy chủ tuyệt vời cho bạn trong tương lai, bạn có thể chuyển sang máy chủ Mastodon khác mà không bị mất người theo dõi. Bạn thậm chí có thể lưu trữ máy chủ của riêng bạn!",
@@ -489,7 +494,7 @@
   "password_confirmation.exceeds_maxlength": "Mật khẩu vượt quá độ dài mật khẩu tối đa",
   "password_confirmation.mismatching": "Mật khẩu không trùng khớp",
   "picture_in_picture.restore": "Hiển thị bình thường",
-  "poll.closed": "Kết thúc",
+  "poll.closed": "Đóng",
   "poll.refresh": "Làm mới",
   "poll.reveal": "Xem kết quả",
   "poll.total_people": "{count, plural, other {# người bình chọn}}",
@@ -499,7 +504,7 @@
   "poll.votes": "{votes, plural, other {# lượt bình chọn}}",
   "poll_button.add_poll": "Tạo bình chọn",
   "poll_button.remove_poll": "Hủy cuộc bình chọn",
-  "privacy.change": "Thay đổi quyền riêng tư",
+  "privacy.change": "Chọn kiểu tút",
   "privacy.direct.long": "Chỉ người được nhắc đến mới thấy",
   "privacy.direct.short": "Nhắn riêng",
   "privacy.private.long": "Dành riêng cho người theo dõi",
@@ -512,7 +517,7 @@
   "privacy_policy.title": "Chính sách bảo mật",
   "refresh": "Làm mới",
   "regeneration_indicator.label": "Đang tải…",
-  "regeneration_indicator.sublabel": "Bảng tin của bạn đang được cập nhật!",
+  "regeneration_indicator.sublabel": "Trang chính của bạn đang được cập nhật!",
   "relative_time.days": "{number} ngày",
   "relative_time.full.days": "{number, plural, other {# ngày}}",
   "relative_time.full.hours": "{number, plural, other {# giờ}}",
@@ -526,22 +531,22 @@
   "relative_time.today": "hôm nay",
   "reply_indicator.cancel": "Hủy bỏ",
   "report.block": "Chặn",
-  "report.block_explanation": "Bạn sẽ không thấy tút của họ nữa. Họ cũng không thể theo dõi hoặc thấy tút của bạn. Họ sẽ biết là họ đã bị chặn.",
+  "report.block_explanation": "Bạn sẽ không còn thấy tút của người này. Họ sẽ không thể thấy tút của bạn hoặc theo dõi bạn. Họ biết là bạn đã chặn họ.",
   "report.categories.other": "Khác",
   "report.categories.spam": "Spam",
   "report.categories.violation": "Vi phạm nội quy máy chủ",
-  "report.category.subtitle": "Chọn mục gần khớp nhất",
-  "report.category.title": "Có vấn đề gì với {type}",
-  "report.category.title_account": "người này",
-  "report.category.title_status": "tút",
+  "report.category.subtitle": "Chọn lý do phù hợp nhất:",
+  "report.category.title": "{type} này có vấn đề gì?",
+  "report.category.title_account": "Người",
+  "report.category.title_status": "Tút",
   "report.close": "Xong",
-  "report.comment.title": "Bạn nghĩ chúng tôi nên biết thêm điều gì?",
+  "report.comment.title": "Có điều gì mà chúng tôi cần biết không?",
   "report.forward": "Chuyển đến {target}",
   "report.forward_hint": "Người này thuộc máy chủ khác. Gửi một báo cáo ẩn danh tới máy chủ đó?",
   "report.mute": "Ẩn",
-  "report.mute_explanation": "Bạn sẽ không thấy tút của họ nữa. Họ cũng không thể theo dõi hoặc thấy tút của bạn. Họ sẽ không biết là họ đã bị bạn ẩn.",
+  "report.mute_explanation": "Bạn sẽ không còn thấy tút của người này. Họ vẫn có thể thấy tút của bạn hoặc theo dõi bạn. Họ không biết là bạn đã chặn họ.",
   "report.next": "Tiếp theo",
-  "report.placeholder": "Bổ sung thêm",
+  "report.placeholder": "Thêm lưu ý",
   "report.reasons.dislike": "Tôi không thích nó",
   "report.reasons.dislike_description": "Đó không phải là thứ gì mà bạn muốn thấy",
   "report.reasons.legal": "Vi phạm pháp luật",
@@ -558,12 +563,12 @@
   "report.statuses.title": "Bạn muốn báo cáo tút nào?",
   "report.submit": "Gửi đi",
   "report.target": "Báo cáo {target}",
-  "report.thanks.take_action": "Đây là một số cách để kiểm soát thứ bạn nhìn thấy trên Mastodon:",
+  "report.thanks.take_action": "Đây là cách kiểm soát những thứ mà bạn thấy:",
   "report.thanks.take_action_actionable": "Trong lúc chờ chúng tôi xem xét, bạn có thể áp dụng hành động với @{name}:",
   "report.thanks.title": "Không muốn xem thứ này?",
   "report.thanks.title_actionable": "Cảm ơn đã báo cáo, chúng tôi sẽ xem xét kỹ.",
-  "report.unfollow": "Ngưng theo dõi @{name}",
-  "report.unfollow_explanation": "Bạn đang theo dõi người này. Để không thấy tút của họ trong bảng tin nữa, hãy ngưng theo dõi.",
+  "report.unfollow": "Bỏ theo dõi @{name}",
+  "report.unfollow_explanation": "Bạn đang theo dõi người này. Để không thấy tút của họ trên trang chính nữa, hãy bỏ theo dõi.",
   "report_notification.attached_statuses": "{count, plural, other {{count} tút}} đính kèm",
   "report_notification.categories.legal": "Pháp lý",
   "report_notification.categories.other": "Khác",
@@ -572,18 +577,18 @@
   "report_notification.open": "Mở báo cáo",
   "search.no_recent_searches": "Không có tìm kiếm gần đây",
   "search.placeholder": "Tìm kiếm",
-  "search.quick_action.account_search": "Người trùng khớp {x}",
+  "search.quick_action.account_search": "Người có tên {x}",
   "search.quick_action.go_to_account": "Xem trang {x}",
   "search.quick_action.go_to_hashtag": "Xem hashtag {x}",
   "search.quick_action.open_url": "Mở liên kết trong Mastodon",
-  "search.quick_action.status_search": "Tút trùng khớp {x}",
+  "search.quick_action.status_search": "Tút nhắc đến {x}",
   "search.search_or_paste": "Tìm kiếm hoặc nhập URL",
   "search_popout.quick_actions": "Thao tác nhanh",
   "search_popout.recent": "Tìm kiếm gần đây",
   "search_results.accounts": "Mọi người",
   "search_results.all": "Toàn bộ",
-  "search_results.hashtags": "Hashtags",
-  "search_results.nothing_found": "Không tìm thấy kết quả trùng khớp",
+  "search_results.hashtags": "Hashtag",
+  "search_results.nothing_found": "Không tìm thấy gì",
   "search_results.statuses": "Tút",
   "search_results.statuses_fts_disabled": "Máy chủ của bạn không bật tính năng tìm kiếm tút.",
   "search_results.title": "Tìm kiếm {q}",
@@ -596,6 +601,7 @@
   "server_banner.server_stats": "Thống kê:",
   "sign_in_banner.create_account": "Đăng ký",
   "sign_in_banner.sign_in": "Đăng nhập",
+  "sign_in_banner.sso_redirect": "Đăng nhập",
   "sign_in_banner.text": "Đăng nhập để theo dõi người hoặc hashtag, thích, chia sẻ và trả lời tút. Bạn cũng có thể tương tác từ tài khoản của mình trên một máy chủ khác.",
   "status.admin_account": "Mở giao diện quản trị @{name}",
   "status.admin_domain": "Mở giao diện quản trị @{domain}",
@@ -617,17 +623,17 @@
   "status.filter": "Lọc tút này",
   "status.filtered": "Bộ lọc",
   "status.hide": "Ẩn tút",
-  "status.history.created": "{name} tạo vào {date}",
-  "status.history.edited": "{name} sửa vào {date}",
+  "status.history.created": "{name} đăng {date} trước",
+  "status.history.edited": "{name} đã sửa {date} trước",
   "status.load_more": "Tải thêm",
   "status.media.open": "Nhấn để mở",
   "status.media.show": "Nhấn để xem",
   "status.media_hidden": "Đã ẩn",
   "status.mention": "Nhắc đến @{name}",
-  "status.more": "Thêm",
+  "status.more": "Xem thêm",
   "status.mute": "Ẩn @{name}",
   "status.mute_conversation": "Không quan tâm nữa",
-  "status.open": "Xem nguyên văn",
+  "status.open": "Đọc tút",
   "status.pin": "Ghim lên hồ sơ",
   "status.pinned": "Tút đã ghim",
   "status.read_more": "Đọc tiếp",
@@ -637,9 +643,9 @@
   "status.reblogs.empty": "Tút này chưa có ai đăng lại. Nếu có, nó sẽ hiển thị ở đây.",
   "status.redraft": "Xóa và viết lại",
   "status.remove_bookmark": "Bỏ lưu",
-  "status.replied_to": "{name} viết tiếp",
+  "status.replied_to": "Trả lời {name}",
   "status.reply": "Trả lời",
-  "status.replyAll": "Trả lời người đăng tút",
+  "status.replyAll": "Trả lời",
   "status.report": "Báo cáo @{name}",
   "status.sensitive_warning": "Nhạy cảm",
   "status.share": "Chia sẻ",
@@ -652,7 +658,7 @@
   "status.title.with_attachments": "{user} đã đăng {attachmentCount, plural, other {{attachmentCount} đính kèm}}",
   "status.translate": "Dịch tút",
   "status.translated_from_with": "Dịch từ {lang} bằng {provider}",
-  "status.uncached_media_warning": "Xem trước không sẵn có",
+  "status.uncached_media_warning": "Không bản xem trước",
   "status.unmute_conversation": "Quan tâm",
   "status.unpin": "Bỏ ghim trên hồ sơ",
   "subscribed_languages.lead": "Chỉ các tút đăng bằng các ngôn ngữ đã chọn mới được xuất hiện trên bảng tin của bạn. Không chọn gì cả để đọc tút đăng bằng mọi ngôn ngữ.",
@@ -660,7 +666,7 @@
   "subscribed_languages.target": "Đổi ngôn ngữ mong muốn cho {target}",
   "suggestions.dismiss": "Tắt đề xuất",
   "suggestions.header": "Có thể bạn quan tâm…",
-  "tabs_bar.home": "Bảng tin",
+  "tabs_bar.home": "Trang chính",
   "tabs_bar.notifications": "Thông báo",
   "time_remaining.days": "{number, plural, other {# ngày}}",
   "time_remaining.hours": "{number, plural, other {# giờ}}",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 075643c9eb..f7c7d5f785 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -1,5 +1,5 @@
 {
-  "about.blocks": "被限制的服务器",
+  "about.blocks": "服务器被限制",
   "about.contact": "联系方式：",
   "about.disclaimer": "Mastodon 是自由的开源软件，商标由 Mastodon gGmbH 持有。",
   "about.domain_blocks.no_reason_available": "原因不可用",
@@ -172,7 +172,7 @@
   "confirmations.discard_edit_media.confirm": "丢弃",
   "confirmations.discard_edit_media.message": "您还有未保存的媒体描述或预览修改，仍要丢弃吗？",
   "confirmations.domain_block.confirm": "屏蔽整个域名",
-  "confirmations.domain_block.message": "你真的确定要屏蔽所有来自 {domain} 的内容吗？多数情况下，屏蔽或隐藏几个特定的用户就已经足够了。来自该网站的内容将不再出现在你的任何公共时间轴或通知列表里。来自该网站的关注者将会被移除。",
+  "confirmations.domain_block.message": "你真的确定要屏蔽所有来自 {domain} 的内容吗？多数情况下，对几个特定的用户进行屏蔽或禁用对他们的消息提醒就足够了。屏蔽后，来自该域名的内容将不再出现在你任何的公共时间轴或通知列表里，你来自该域名下的关注者也将被移除。",
   "confirmations.edit.confirm": "编辑",
   "confirmations.edit.message": "编辑此消息将会覆盖当前正在撰写的信息。仍要继续吗？",
   "confirmations.logout.confirm": "退出登录",
@@ -191,7 +191,6 @@
   "conversation.open": "查看对话",
   "conversation.with": "与 {names}",
   "copypaste.copied": "已复制",
-  "copypaste.copy": "复制",
   "copypaste.copy_to_clipboard": "复制到剪贴板",
   "directory.federated": "来自已知联邦宇宙",
   "directory.local": "仅来自 {domain}",
@@ -303,7 +302,7 @@
   "home.column_settings.basic": "基本设置",
   "home.column_settings.show_reblogs": "显示转嘟",
   "home.column_settings.show_replies": "显示回复",
-  "home.explore_prompt.body": "你的主页动态会推送一系列关注的话题标签和用户，以及转发的嘟文。目前看起来比较清静，不妨试一下：",
+  "home.explore_prompt.body": "你的主页动态会推送一系列关注的话题标签和用户，以及转发的嘟文。如果你觉得过于清净，不妨试一下：",
   "home.explore_prompt.title": "这是你在 Mastodon 的主页。",
   "home.hide_announcements": "隐藏公告",
   "home.show_announcements": "显示公告",
@@ -311,10 +310,13 @@
   "interaction_modal.description.follow": "拥有一个 Mastodon 账号，你可以关注 {name} 并在自己的主页上接收对方的新嘟文。",
   "interaction_modal.description.reblog": "拥有一个 Mastodon 账号，你可以向自己的关注者们转发此嘟文。",
   "interaction_modal.description.reply": "拥有一个 Mastodon 账号，你可以回复此嘟文。",
+  "interaction_modal.login.action": "转到主页",
+  "interaction_modal.login.prompt": "您所入驻的服务器域名，如：mastodon.social",
+  "interaction_modal.no_account_yet": "不在 Mastodon 上？",
   "interaction_modal.on_another_server": "在另一服务器",
   "interaction_modal.on_this_server": "在此服务器",
-  "interaction_modal.other_server_instructions": "将此URL复制并粘贴到您喜欢的Mastodon应用程序的搜索栏中，或者粘贴到你的Mastodon实例的Web界面中。",
-  "interaction_modal.preamble": "基于 Mastodon 去中心化的特性，如果你在本站没有账号，也可以使用在另一 Mastodon 服务器或其他兼容平台上的已有账号。",
+  "interaction_modal.sign_in": "您尚未登录此服务器，您的账号托管在哪？",
+  "interaction_modal.sign_in_hint": "提示：这是您注册的网站，如果您不记得了，请在邮箱的收件箱中查找欢迎邮件。您还可以输入完整的用户名！(例如 @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "喜欢 {name} 的嘟文",
   "interaction_modal.title.follow": "关注 {name}",
   "interaction_modal.title.reblog": "转发 {name} 的嘟文",
@@ -596,6 +598,7 @@
   "server_banner.server_stats": "服务器统计数据：",
   "sign_in_banner.create_account": "创建账户",
   "sign_in_banner.sign_in": "登录",
+  "sign_in_banner.sso_redirect": "登录或注册",
   "sign_in_banner.text": "登录关注用户和话题标签，喜欢、分享和回复嘟文。您还可以与其他服务器上的用户进行互动。",
   "status.admin_account": "打开 @{name} 的管理界面",
   "status.admin_domain": "打开 {domain} 的管理界面",
@@ -667,7 +670,7 @@
   "time_remaining.minutes": "剩余 {number, plural, one {# 分钟} other {# 分钟}}",
   "time_remaining.moments": "即将结束",
   "time_remaining.seconds": "剩余 {number, plural, one {# 秒} other {# 秒}}",
-  "timeline_hint.remote_resource_not_displayed": "不会显示来自其它服务器的 {resource}",
+  "timeline_hint.remote_resource_not_displayed": "不会显示来自其它服务器的{resource}",
   "timeline_hint.resources.followers": "关注者",
   "timeline_hint.resources.follows": "关注",
   "timeline_hint.resources.statuses": "更早的嘟文",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index 7a7c39d5c7..b2f73f6a06 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -188,7 +188,6 @@
   "conversation.open": "檢視對話",
   "conversation.with": "與 {names}",
   "copypaste.copied": "已複製",
-  "copypaste.copy": "複製",
   "copypaste.copy_to_clipboard": "複製到剪貼簿",
   "directory.federated": "來自已知的聯盟網絡",
   "directory.local": "僅來自 {domain}",
@@ -301,7 +300,6 @@
   "interaction_modal.description.reply": "在 Mastodon 上擁有帳號的話，您可以回覆此帖文。",
   "interaction_modal.on_another_server": "於不同伺服器",
   "interaction_modal.on_this_server": "於此伺服器",
-  "interaction_modal.preamble": "由於 Mastodon 是去中心化的，即使您於此伺服器上沒有帳號，仍可以利用託管於其他 Mastodon 伺服器或相容平台上的既存帳號。",
   "interaction_modal.title.follow": "追蹤 {name}",
   "interaction_modal.title.reblog": "轉發 {name} 的帖文",
   "interaction_modal.title.reply": "回覆 {name} 的帖文",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index a13504e23e..052cef8b4b 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -33,9 +33,9 @@
   "account.follow": "跟隨",
   "account.followers": "跟隨者",
   "account.followers.empty": "尚未有人跟隨這位使用者。",
-  "account.followers_counter": "被 {count, plural,one {{counter} 人}other {{counter} 人}} 跟隨",
+  "account.followers_counter": "被 {count, plural,one {{counter} 人}other {{counter} 人}}跟隨",
   "account.following": "跟隨中",
-  "account.following_counter": "正在跟隨 {count, plural,one {{counter}}other {{counter} 人}}",
+  "account.following_counter": "正在跟隨 {count, plural, one {{counter} 人} other {{counter} 人}}",
   "account.follows.empty": "這位使用者尚未跟隨任何人。",
   "account.follows_you": "跟隨了您",
   "account.go_to_profile": "前往個人檔案",
@@ -191,7 +191,6 @@
   "conversation.open": "檢視對話",
   "conversation.with": "與 {names}",
   "copypaste.copied": "已複製",
-  "copypaste.copy": "複製",
   "copypaste.copy_to_clipboard": "複製到剪貼簿",
   "directory.federated": "來自已知聯邦宇宙",
   "directory.local": "僅來自 {domain} 網域",
@@ -296,6 +295,9 @@
   "hashtag.column_settings.tag_mode.any": "任一",
   "hashtag.column_settings.tag_mode.none": "全不",
   "hashtag.column_settings.tag_toggle": "將額外標籤加入到這個欄位",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} 名} other {{counter} 名}}參與者",
+  "hashtag.counter_by_uses": "{count, plural, one {{counter} 則} other {{counter} 則}}嘟文",
+  "hashtag.counter_by_uses_today": "本日有 {count, plural, one {{counter} 則} other {{counter} 則}}嘟文",
   "hashtag.follow": "追蹤主題標籤",
   "hashtag.unfollow": "取消追蹤主題標籤",
   "home.actions.go_to_explore": "看看發生什麼新鮮事",
@@ -303,7 +305,7 @@
   "home.column_settings.basic": "基本設定",
   "home.column_settings.show_reblogs": "顯示轉嘟",
   "home.column_settings.show_replies": "顯示回覆",
-  "home.explore_prompt.body": "您的首頁時間軸將由您所跟隨之主題標籤、帳號以及其轉嘟所組成。目前似乎有點空，是否要考慮這些：",
+  "home.explore_prompt.body": "您的首頁時間軸將由您所跟隨之主題標籤、帳號以及其轉嘟所組成。若目前流速有點慢，您可以考慮以下幾點：",
   "home.explore_prompt.title": "這是您於 Mastodon 的基地",
   "home.hide_announcements": "隱藏公告",
   "home.show_announcements": "顯示公告",
@@ -311,10 +313,13 @@
   "interaction_modal.description.follow": "在 Mastodon 上有個帳號的話，您可以跟隨 {name} 以於首頁時間軸接收他們的嘟文。",
   "interaction_modal.description.reblog": "在 Mastodon 上有個帳號的話，您可以轉嘟此嘟文以分享給您的跟隨者們。",
   "interaction_modal.description.reply": "在 Mastodon 上有個帳號的話，您可以回覆此嘟文。",
+  "interaction_modal.login.action": "返回首頁",
+  "interaction_modal.login.prompt": "您帳號所屬伺服器之網域，例如：mastodon.social",
+  "interaction_modal.no_account_yet": "還沒有 Mastodon 帳號嗎？",
   "interaction_modal.on_another_server": "於不同伺服器",
   "interaction_modal.on_this_server": "於此伺服器",
-  "interaction_modal.other_server_instructions": "複製貼上此 URL 至您愛用的 Mastodon 應用程式或您 Mastodon 伺服器網頁介面之搜尋欄。",
-  "interaction_modal.preamble": "由於 Mastodon 是去中心化的，即便您於此沒有帳號，仍可以利用託管於其他 Mastodon 伺服器或相容平台上的既存帳號。",
+  "interaction_modal.sign_in": "您未登入於此伺服器。您的帳號是於何方託管呢？",
+  "interaction_modal.sign_in_hint": "提示：這是您所註冊之網站。若您無法回想起，請檢查您電子信箱收件夾內之歡迎信。您也能輸入完整帳號名稱！(如：@Mastodon@mastodon.social）",
   "interaction_modal.title.favourite": "將 {name} 之嘟文加入最愛",
   "interaction_modal.title.follow": "跟隨 {name}",
   "interaction_modal.title.reblog": "轉嘟 {name} 的嘟文",
@@ -596,6 +601,7 @@
   "server_banner.server_stats": "伺服器統計：",
   "sign_in_banner.create_account": "新增帳號",
   "sign_in_banner.sign_in": "登入",
+  "sign_in_banner.sso_redirect": "登入或註冊",
   "sign_in_banner.text": "登入以跟隨個人檔案和主題標籤，或收藏、分享和回覆嘟文。您也可以使用您的帳號在其他伺服器上進行互動。",
   "status.admin_account": "開啟 @{name} 的管理介面",
   "status.admin_domain": "開啟 {domain} 的管理介面",
diff --git a/app/javascript/packs/public.jsx b/app/javascript/packs/public.jsx
index 36de18a4b1..9f959036a4 100644
--- a/app/javascript/packs/public.jsx
+++ b/app/javascript/packs/public.jsx
@@ -48,201 +48,198 @@ function loaded() {
     };
   };
 
-  ready(() => {
-    const locale = document.documentElement.lang;
+  const locale = document.documentElement.lang;
 
-    const dateTimeFormat = new Intl.DateTimeFormat(locale, {
-      year: 'numeric',
-      month: 'long',
-      day: 'numeric',
-      hour: 'numeric',
-      minute: 'numeric',
-    });
-
-    const dateFormat = new Intl.DateTimeFormat(locale, {
-      year: 'numeric',
-      month: 'short',
-      day: 'numeric',
-      timeFormat: false,
-    });
-
-    const timeFormat = new Intl.DateTimeFormat(locale, {
-      timeStyle: 'short',
-      hour12: false,
-    });
-
-    const formatMessage = ({ id, defaultMessage }, values) => {
-      const messageFormat = new IntlMessageFormat(localeData[id] || defaultMessage, locale);
-      return messageFormat.format(values);
-    };
-
-    [].forEach.call(document.querySelectorAll('.emojify'), (content) => {
-      content.innerHTML = emojify(content.innerHTML);
-    });
-
-    [].forEach.call(document.querySelectorAll('time.formatted'), (content) => {
-      const datetime = new Date(content.getAttribute('datetime'));
-      const formattedDate = dateTimeFormat.format(datetime);
-
-      content.title = formattedDate;
-      content.textContent = formattedDate;
-    });
-
-    const isToday = date => {
-      const today = new Date();
-
-      return date.getDate() === today.getDate() &&
-        date.getMonth() === today.getMonth() &&
-        date.getFullYear() === today.getFullYear();
-    };
-    const todayFormat = new IntlMessageFormat(localeData['relative_format.today'] || 'Today at {time}', locale);
-
-    [].forEach.call(document.querySelectorAll('time.relative-formatted'), (content) => {
-      const datetime = new Date(content.getAttribute('datetime'));
-
-      let formattedContent;
-
-      if (isToday(datetime)) {
-        const formattedTime = timeFormat.format(datetime);
-
-        formattedContent = todayFormat.format({ time: formattedTime });
-      } else {
-        formattedContent = dateFormat.format(datetime);
-      }
-
-      content.title = formattedContent;
-      content.textContent = formattedContent;
-    });
-
-    [].forEach.call(document.querySelectorAll('time.time-ago'), (content) => {
-      const datetime = new Date(content.getAttribute('datetime'));
-      const now      = new Date();
-
-      const timeGiven = content.getAttribute('datetime').includes('T');
-      content.title = timeGiven ? dateTimeFormat.format(datetime) : dateFormat.format(datetime);
-      content.textContent = timeAgoString({
-        formatMessage,
-        formatDate: (date, options) => (new Intl.DateTimeFormat(locale, options)).format(date),
-      }, datetime, now, now.getFullYear(), timeGiven);
-    });
-
-    const reactComponents = document.querySelectorAll('[data-component]');
-
-    if (reactComponents.length > 0) {
-      import(/* webpackChunkName: "containers/media_container" */ '../mastodon/containers/media_container')
-        .then(({ default: MediaContainer }) => {
-          [].forEach.call(reactComponents, (component) => {
-            [].forEach.call(component.children, (child) => {
-              component.removeChild(child);
-            });
-          });
-
-          const content = document.createElement('div');
-
-          const root = createRoot(content);
-          root.render(<MediaContainer locale={locale} components={reactComponents} />);
-          document.body.appendChild(content);
-          scrollToDetailedStatus();
-        })
-        .catch(error => {
-          console.error(error);
-          scrollToDetailedStatus();
-        });
-    } else {
-      scrollToDetailedStatus();
-    }
-
-    delegate(document, '#user_account_attributes_username', 'input', throttle(() => {
-      const username = document.getElementById('user_account_attributes_username');
-
-      if (username.value && username.value.length > 0) {
-        axios.get('/api/v1/accounts/lookup', { params: { acct: username.value } }).then(() => {
-          username.setCustomValidity(formatMessage(messages.usernameTaken));
-        }).catch(() => {
-          username.setCustomValidity('');
-        });
-      } else {
-        username.setCustomValidity('');
-      }
-    }, 500, { leading: false, trailing: true }));
-
-    delegate(document, '#user_password,#user_password_confirmation', 'input', () => {
-      const password = document.getElementById('user_password');
-      const confirmation = document.getElementById('user_password_confirmation');
-      if (!confirmation) return;
-
-      if (confirmation.value && confirmation.value.length > password.maxLength) {
-        confirmation.setCustomValidity(formatMessage(messages.passwordExceedsLength));
-      } else if (password.value && password.value !== confirmation.value) {
-        confirmation.setCustomValidity(formatMessage(messages.passwordDoesNotMatch));
-      } else {
-        confirmation.setCustomValidity('');
-      }
-    });
-
-    delegate(document, '.custom-emoji', 'mouseover', getEmojiAnimationHandler('data-original'));
-    delegate(document, '.custom-emoji', 'mouseout', getEmojiAnimationHandler('data-static'));
-
-    delegate(document, '.status__content__spoiler-link', 'click', function() {
-      const statusEl = this.parentNode.parentNode;
-
-      if (statusEl.dataset.spoiler === 'expanded') {
-        statusEl.dataset.spoiler = 'folded';
-        this.textContent = (new IntlMessageFormat(localeData['status.show_more'] || 'Show more', locale)).format();
-      } else {
-        statusEl.dataset.spoiler = 'expanded';
-        this.textContent = (new IntlMessageFormat(localeData['status.show_less'] || 'Show less', locale)).format();
-      }
-
-      return false;
-    });
-
-    [].forEach.call(document.querySelectorAll('.status__content__spoiler-link'), (spoilerLink) => {
-      const statusEl = spoilerLink.parentNode.parentNode;
-      const message = (statusEl.dataset.spoiler === 'expanded') ? (localeData['status.show_less'] || 'Show less') : (localeData['status.show_more'] || 'Show more');
-      spoilerLink.textContent = (new IntlMessageFormat(message, locale)).format();
-    });
+  const dateTimeFormat = new Intl.DateTimeFormat(locale, {
+    year: 'numeric',
+    month: 'long',
+    day: 'numeric',
+    hour: 'numeric',
+    minute: 'numeric',
   });
 
-  const toggleSidebar = () => {
-    const sidebar = document.querySelector('.sidebar ul');
-    const toggleButton = document.querySelector('.sidebar__toggle__icon');
+  const dateFormat = new Intl.DateTimeFormat(locale, {
+    year: 'numeric',
+    month: 'short',
+    day: 'numeric',
+    timeFormat: false,
+  });
 
-    if (sidebar.classList.contains('visible')) {
-      document.body.style.overflow = null;
-      toggleButton.setAttribute('aria-expanded', 'false');
-    } else {
-      document.body.style.overflow = 'hidden';
-      toggleButton.setAttribute('aria-expanded', 'true');
-    }
+  const timeFormat = new Intl.DateTimeFormat(locale, {
+    timeStyle: 'short',
+    hour12: false,
+  });
 
-    toggleButton.classList.toggle('active');
-    sidebar.classList.toggle('visible');
+  const formatMessage = ({ id, defaultMessage }, values) => {
+    const messageFormat = new IntlMessageFormat(localeData[id] || defaultMessage, locale);
+    return messageFormat.format(values);
   };
 
-  delegate(document, '.sidebar__toggle__icon', 'click', () => {
-    toggleSidebar();
+  [].forEach.call(document.querySelectorAll('.emojify'), (content) => {
+    content.innerHTML = emojify(content.innerHTML);
   });
 
-  delegate(document, '.sidebar__toggle__icon', 'keydown', e => {
-    if (e.key === ' ' || e.key === 'Enter') {
-      e.preventDefault();
-      toggleSidebar();
+  [].forEach.call(document.querySelectorAll('time.formatted'), (content) => {
+    const datetime = new Date(content.getAttribute('datetime'));
+    const formattedDate = dateTimeFormat.format(datetime);
+
+    content.title = formattedDate;
+    content.textContent = formattedDate;
+  });
+
+  const isToday = date => {
+    const today = new Date();
+
+    return date.getDate() === today.getDate() &&
+      date.getMonth() === today.getMonth() &&
+      date.getFullYear() === today.getFullYear();
+  };
+  const todayFormat = new IntlMessageFormat(localeData['relative_format.today'] || 'Today at {time}', locale);
+
+  [].forEach.call(document.querySelectorAll('time.relative-formatted'), (content) => {
+    const datetime = new Date(content.getAttribute('datetime'));
+
+    let formattedContent;
+
+    if (isToday(datetime)) {
+      const formattedTime = timeFormat.format(datetime);
+
+      formattedContent = todayFormat.format({ time: formattedTime });
+    } else {
+      formattedContent = dateFormat.format(datetime);
+    }
+
+    content.title = formattedContent;
+    content.textContent = formattedContent;
+  });
+
+  [].forEach.call(document.querySelectorAll('time.time-ago'), (content) => {
+    const datetime = new Date(content.getAttribute('datetime'));
+    const now      = new Date();
+
+    const timeGiven = content.getAttribute('datetime').includes('T');
+    content.title = timeGiven ? dateTimeFormat.format(datetime) : dateFormat.format(datetime);
+    content.textContent = timeAgoString({
+      formatMessage,
+      formatDate: (date, options) => (new Intl.DateTimeFormat(locale, options)).format(date),
+    }, datetime, now, now.getFullYear(), timeGiven);
+  });
+
+  const reactComponents = document.querySelectorAll('[data-component]');
+
+  if (reactComponents.length > 0) {
+    import(/* webpackChunkName: "containers/media_container" */ '../mastodon/containers/media_container')
+      .then(({ default: MediaContainer }) => {
+        [].forEach.call(reactComponents, (component) => {
+          [].forEach.call(component.children, (child) => {
+            component.removeChild(child);
+          });
+        });
+
+        const content = document.createElement('div');
+
+        const root = createRoot(content);
+        root.render(<MediaContainer locale={locale} components={reactComponents} />);
+        document.body.appendChild(content);
+        scrollToDetailedStatus();
+      })
+      .catch(error => {
+        console.error(error);
+        scrollToDetailedStatus();
+      });
+  } else {
+    scrollToDetailedStatus();
+  }
+
+  delegate(document, '#user_account_attributes_username', 'input', throttle(() => {
+    const username = document.getElementById('user_account_attributes_username');
+
+    if (username.value && username.value.length > 0) {
+      axios.get('/api/v1/accounts/lookup', { params: { acct: username.value } }).then(() => {
+        username.setCustomValidity(formatMessage(messages.usernameTaken));
+      }).catch(() => {
+        username.setCustomValidity('');
+      });
+    } else {
+      username.setCustomValidity('');
+    }
+  }, 500, { leading: false, trailing: true }));
+
+  delegate(document, '#user_password,#user_password_confirmation', 'input', () => {
+    const password = document.getElementById('user_password');
+    const confirmation = document.getElementById('user_password_confirmation');
+    if (!confirmation) return;
+
+    if (confirmation.value && confirmation.value.length > password.maxLength) {
+      confirmation.setCustomValidity(formatMessage(messages.passwordExceedsLength));
+    } else if (password.value && password.value !== confirmation.value) {
+      confirmation.setCustomValidity(formatMessage(messages.passwordDoesNotMatch));
+    } else {
+      confirmation.setCustomValidity('');
     }
   });
 
-  // Empty the honeypot fields in JS in case something like an extension
-  // automatically filled them.
-  delegate(document, '#registration_new_user,#new_user', 'submit', () => {
-    ['user_website', 'user_confirm_password', 'registration_user_website', 'registration_user_confirm_password'].forEach(id => {
-      const field = document.getElementById(id);
-      if (field) {
-        field.value = '';
-      }
-    });
+  delegate(document, '.custom-emoji', 'mouseover', getEmojiAnimationHandler('data-original'));
+  delegate(document, '.custom-emoji', 'mouseout', getEmojiAnimationHandler('data-static'));
+
+  delegate(document, '.status__content__spoiler-link', 'click', function() {
+    const statusEl = this.parentNode.parentNode;
+
+    if (statusEl.dataset.spoiler === 'expanded') {
+      statusEl.dataset.spoiler = 'folded';
+      this.textContent = (new IntlMessageFormat(localeData['status.show_more'] || 'Show more', locale)).format();
+    } else {
+      statusEl.dataset.spoiler = 'expanded';
+      this.textContent = (new IntlMessageFormat(localeData['status.show_less'] || 'Show less', locale)).format();
+    }
+
+    return false;
+  });
+
+  [].forEach.call(document.querySelectorAll('.status__content__spoiler-link'), (spoilerLink) => {
+    const statusEl = spoilerLink.parentNode.parentNode;
+    const message = (statusEl.dataset.spoiler === 'expanded') ? (localeData['status.show_less'] || 'Show less') : (localeData['status.show_more'] || 'Show more');
+    spoilerLink.textContent = (new IntlMessageFormat(message, locale)).format();
   });
 }
 
+const toggleSidebar = () => {
+  const sidebar = document.querySelector('.sidebar ul');
+  const toggleButton = document.querySelector('.sidebar__toggle__icon');
+
+  if (sidebar.classList.contains('visible')) {
+    document.body.style.overflow = null;
+    toggleButton.setAttribute('aria-expanded', 'false');
+  } else {
+    document.body.style.overflow = 'hidden';
+    toggleButton.setAttribute('aria-expanded', 'true');
+  }
+
+  toggleButton.classList.toggle('active');
+  sidebar.classList.toggle('visible');
+};
+
+delegate(document, '.sidebar__toggle__icon', 'click', () => {
+  toggleSidebar();
+});
+
+delegate(document, '.sidebar__toggle__icon', 'keydown', e => {
+  if (e.key === ' ' || e.key === 'Enter') {
+    e.preventDefault();
+    toggleSidebar();
+  }
+});
+
+// Empty the honeypot fields in JS in case something like an extension
+// automatically filled them.
+delegate(document, '#registration_new_user,#new_user', 'submit', () => {
+  ['user_website', 'user_confirm_password', 'registration_user_website', 'registration_user_confirm_password'].forEach(id => {
+    const field = document.getElementById(id);
+    if (field) {
+      field.value = '';
+    }
+  });
+});
 
 function main() {
   ready(loaded);
diff --git a/app/javascript/packs/sign_up.js b/app/javascript/packs/sign_up.js
index 9aae9c11b8..cf9c837773 100644
--- a/app/javascript/packs/sign_up.js
+++ b/app/javascript/packs/sign_up.js
@@ -13,4 +13,30 @@ ready(() => {
       console.error(error);
     });
   }, 5000);
+
+  document.querySelectorAll('.timer-button').forEach(button => {
+    let counter = 30;
+
+    const container = document.createElement('span');
+
+    const updateCounter = () => {
+      container.innerText = ` (${counter})`;
+    };
+
+    updateCounter();
+
+    const countdown = setInterval(() => {
+      counter--;
+
+      if (counter === 0) {
+        button.disabled = false;
+        button.removeChild(container);
+        clearInterval(countdown);
+      } else {
+        updateCounter();
+      }
+    }, 1000);
+
+    button.appendChild(container);
+  });
 });
diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss
index 601d515765..3777fccbfb 100644
--- a/app/javascript/styles/mastodon-light/diff.scss
+++ b/app/javascript/styles/mastodon-light/diff.scss
@@ -424,6 +424,10 @@ html {
   border-bottom: 0;
 }
 
+.column-settings__hashtags .column-select__option {
+  color: $white;
+}
+
 .dashboard__quick-access,
 .focal-point__preview strong,
 .admin-wrapper .content__heading__tabs a.selected {
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 4f44b61e5d..a5d4eee5ef 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -170,11 +170,6 @@
     display: block;
     width: 100%;
   }
-
-  .layout-multiple-columns &.button--with-bell {
-    font-size: 12px;
-    padding: 0 8px;
-  }
 }
 
 .column__wrapper {
@@ -1116,7 +1111,8 @@ body > [data-popper-placement] {
     .audio-player,
     .attachment-list,
     .picture-in-picture-placeholder,
-    .status-card {
+    .status-card,
+    .hashtag-bar {
       margin-inline-start: $thread-margin;
       width: calc(100% - ($thread-margin));
     }
@@ -4249,16 +4245,19 @@ a.status-card {
     display: flex;
     align-items: center;
     justify-content: center;
-    background: rgba($black, 0.5);
+    background: transparent;
     width: 100%;
     height: 100%;
     padding: 0;
     margin: 0;
     border: 0;
-    border-radius: 4px;
     color: $white;
 
     &__label {
+      background-color: rgba($black, 0.45);
+      backdrop-filter: blur(10px) saturate(180%) contrast(75%) brightness(70%);
+      border-radius: 6px;
+      padding: 10px 15px;
       display: flex;
       align-items: center;
       justify-content: center;
@@ -4272,6 +4271,13 @@ a.status-card {
       font-weight: 400;
       font-size: 13px;
     }
+
+    &:hover,
+    &:focus {
+      .spoiler-button__overlay__label {
+        background-color: rgba($black, 0.9);
+      }
+    }
   }
 }
 
@@ -5119,6 +5125,7 @@ a.status-card {
 
     &.active {
       transform: rotate(90deg);
+      opacity: 1;
     }
 
     &:hover {
@@ -5815,15 +5822,16 @@ a.status-card {
   }
 
   .button.button-secondary {
-    border-color: $ui-button-secondary-border-color;
-    color: $ui-button-secondary-color;
+    border-color: $inverted-text-color;
+    color: $inverted-text-color;
     flex: 0 0 auto;
 
     &:hover,
     &:focus,
     &:active {
-      border-color: $ui-button-secondary-focus-background-color;
-      color: $ui-button-secondary-focus-color;
+      background: transparent;
+      border-color: $ui-button-background-color;
+      color: $ui-button-background-color;
     }
   }
 
@@ -8532,6 +8540,44 @@ noscript {
     }
   }
 
+  &__choices {
+    display: flex;
+    gap: 40px;
+
+    &__choice {
+      flex: 1;
+      box-sizing: border-box;
+
+      h3 {
+        margin-bottom: 20px;
+      }
+
+      p {
+        color: $darker-text-color;
+        margin-bottom: 20px;
+        font-size: 15px;
+      }
+
+      .button {
+        margin-bottom: 10px;
+
+        &:last-child {
+          margin-bottom: 0;
+        }
+      }
+    }
+  }
+
+  @media screen and (max-width: $no-gap-breakpoint - 1px) {
+    &__choices {
+      flex-direction: column;
+
+      &__choice {
+        margin-top: 40px;
+      }
+    }
+  }
+
   .link-button {
     font-size: inherit;
     display: inline;
@@ -9220,3 +9266,55 @@ noscript {
     background: rgba($ui-base-color, 0.85);
   }
 }
+
+.hashtag-header {
+  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  padding: 15px;
+  font-size: 17px;
+  line-height: 22px;
+  color: $darker-text-color;
+
+  strong {
+    font-weight: 700;
+  }
+
+  &__header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 15px;
+    gap: 15px;
+
+    h1 {
+      color: $primary-text-color;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      overflow: hidden;
+      font-size: 22px;
+      line-height: 33px;
+      font-weight: 700;
+    }
+  }
+}
+
+.hashtag-bar {
+  margin-top: 16px;
+  display: flex;
+  flex-wrap: wrap;
+  font-size: 14px;
+  gap: 4px;
+
+  a {
+    display: inline-flex;
+    color: $dark-text-color;
+    text-decoration: none;
+
+    &:hover {
+      text-decoration: none;
+
+      span {
+        text-decoration: underline;
+      }
+    }
+  }
+}
diff --git a/app/javascript/styles/mastodon/forms.scss b/app/javascript/styles/mastodon/forms.scss
index f69b699a0a..beb45ab6e9 100644
--- a/app/javascript/styles/mastodon/forms.scss
+++ b/app/javascript/styles/mastodon/forms.scss
@@ -309,9 +309,19 @@ code {
       border-radius: 4px;
       background: url('images/void.png');
 
+      &[src$='missing.png'] {
+        visibility: hidden;
+      }
+
       &:last-child {
         margin-bottom: 0;
       }
+
+      &#account_avatar-preview {
+        width: 90px;
+        height: 90px;
+        object-fit: cover;
+      }
     }
   }
 
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb
index b1254fc4c5..bb13f3f8cc 100644
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@@ -4,6 +4,8 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
   include FormattingHelper
 
   def perform
+    @account.schedule_refresh_if_stale!
+
     dereference_object!
 
     case @object['type']
diff --git a/app/lib/activitypub/activity/update.rb b/app/lib/activitypub/activity/update.rb
index 8e72e08237..0a7762ee39 100644
--- a/app/lib/activitypub/activity/update.rb
+++ b/app/lib/activitypub/activity/update.rb
@@ -2,6 +2,8 @@
 
 class ActivityPub::Activity::Update < ActivityPub::Activity
   def perform
+    @account.schedule_refresh_if_stale!
+
     dereference_object!
 
     if equals_or_includes_any?(@object['type'], %w(Application Group Organization Person Service))
diff --git a/app/lib/admin/system_check/elasticsearch_check.rb b/app/lib/admin/system_check/elasticsearch_check.rb
index 0b55be3501..91070756cb 100644
--- a/app/lib/admin/system_check/elasticsearch_check.rb
+++ b/app/lib/admin/system_check/elasticsearch_check.rb
@@ -1,6 +1,13 @@
 # frozen_string_literal: true
 
 class Admin::SystemCheck::ElasticsearchCheck < Admin::SystemCheck::BaseCheck
+  INDEXES = [
+    InstancesIndex,
+    AccountsIndex,
+    TagsIndex,
+    StatusesIndex,
+  ].freeze
+
   def skip?
     !current_user.can?(:view_devops)
   end
@@ -8,11 +15,15 @@ class Admin::SystemCheck::ElasticsearchCheck < Admin::SystemCheck::BaseCheck
   def pass?
     return true unless Chewy.enabled?
 
-    running_version.present? && compatible_version?
+    running_version.present? && compatible_version? && cluster_health['status'] == 'green' && indexes_match? && preset_matches?
+  rescue Faraday::ConnectionFailed, Elasticsearch::Transport::Transport::Error
+    false
   end
 
   def message
-    if running_version.present?
+    if running_version.blank?
+      Admin::SystemCheck::Message.new(:elasticsearch_running_check)
+    elsif !compatible_version?
       Admin::SystemCheck::Message.new(
         :elasticsearch_version_check,
         I18n.t(
@@ -21,13 +32,32 @@ class Admin::SystemCheck::ElasticsearchCheck < Admin::SystemCheck::BaseCheck
           required_version: required_version
         )
       )
+    elsif !indexes_match?
+      Admin::SystemCheck::Message.new(
+        :elasticsearch_index_mismatch,
+        mismatched_indexes.join(' ')
+      )
+    elsif cluster_health['status'] == 'red'
+      Admin::SystemCheck::Message.new(:elasticsearch_health_red)
+    elsif cluster_health['number_of_nodes'] < 2 && es_preset != 'single_node_cluster'
+      Admin::SystemCheck::Message.new(:elasticsearch_preset_single_node, nil, 'https://docs.joinmastodon.org/admin/optional/elasticsearch/#scaling')
+    elsif Chewy.client.indices.get_settings[Chewy::Stash::Specification.index_name]&.dig('settings', 'index', 'number_of_replicas')&.to_i&.positive? && es_preset == 'single_node_cluster'
+      Admin::SystemCheck::Message.new(:elasticsearch_reset_chewy)
+    elsif cluster_health['status'] == 'yellow'
+      Admin::SystemCheck::Message.new(:elasticsearch_health_yellow)
     else
-      Admin::SystemCheck::Message.new(:elasticsearch_running_check)
+      Admin::SystemCheck::Message.new(:elasticsearch_preset, nil, 'https://docs.joinmastodon.org/admin/optional/elasticsearch/#scaling')
     end
+  rescue Faraday::ConnectionFailed, Elasticsearch::Transport::Transport::Error
+    Admin::SystemCheck::Message.new(:elasticsearch_running_check)
   end
 
   private
 
+  def cluster_health
+    @cluster_health ||= Chewy.client.cluster.health
+  end
+
   def running_version
     @running_version ||= begin
       Chewy.client.info['version']['number']
@@ -49,5 +79,30 @@ class Admin::SystemCheck::ElasticsearchCheck < Admin::SystemCheck::BaseCheck
 
     Gem::Version.new(running_version) >= Gem::Version.new(required_version) ||
       Gem::Version.new(compatible_wire_version) >= Gem::Version.new(required_version)
+  rescue ArgumentError
+    false
+  end
+
+  def mismatched_indexes
+    @mismatched_indexes ||= INDEXES.filter_map do |klass|
+      klass.index_name if Chewy.client.indices.get_mapping[klass.index_name]&.deep_symbolize_keys != klass.mappings_hash
+    end
+  end
+
+  def indexes_match?
+    mismatched_indexes.empty?
+  end
+
+  def es_preset
+    ENV.fetch('ES_PRESET', 'single_node_cluster')
+  end
+
+  def preset_matches?
+    case es_preset
+    when 'single_node_cluster'
+      cluster_health['number_of_nodes'] == 1
+    else
+      cluster_health['number_of_nodes'] > 1
+    end
   end
 end
diff --git a/app/lib/cache_buster.rb b/app/lib/cache_buster.rb
index 035611518e..c54b0da1a1 100644
--- a/app/lib/cache_buster.rb
+++ b/app/lib/cache_buster.rb
@@ -2,8 +2,14 @@
 
 class CacheBuster
   def initialize(options = {})
-    @secret_header = options[:secret_header] || 'Secret-Header'
-    @secret        = options[:secret] || 'True'
+    ActiveSupport::Deprecation.warn('Default values for the cache buster secret header name and values will be removed in Mastodon 4.3. Please set them explicitely if you rely on those.') unless options[:http_method] || (options[:secret] && options[:secret_header])
+
+    @secret_header = options[:secret_header] ||
+                     (options[:http_method] ? nil : 'Secret-Header')
+    @secret = options[:secret] ||
+              (options[:http_method] ? nil : 'True')
+
+    @http_method = options[:http_method] || 'GET'
   end
 
   def bust(url)
@@ -21,8 +27,9 @@ class CacheBuster
   end
 
   def build_request(url, http_client)
-    Request.new(:get, url, http_client: http_client).tap do |request|
-      request.add_headers(@secret_header => @secret)
-    end
+    request = Request.new(@http_method.downcase.to_sym, url, http_client: http_client)
+    request.add_headers(@secret_header => @secret) if @secret_header.present? && @secret && !@secret.empty?
+
+    request
   end
 end
diff --git a/app/lib/importer/base_importer.rb b/app/lib/importer/base_importer.rb
index 07be4650ec..cc1b7b44d7 100644
--- a/app/lib/importer/base_importer.rb
+++ b/app/lib/importer/base_importer.rb
@@ -68,8 +68,8 @@ class Importer::BaseImporter
 
   protected
 
-  def in_work_unit(*args, &block)
-    work_unit = Concurrent::Promises.future_on(@executor, *args, &block)
+  def in_work_unit(...)
+    work_unit = Concurrent::Promises.future_on(@executor, ...)
 
     work_unit.on_fulfillment!(&@on_progress)
     work_unit.on_rejection!(&@on_failure)
diff --git a/app/lib/link_details_extractor.rb b/app/lib/link_details_extractor.rb
index 4ee07acdc0..b95ec80519 100644
--- a/app/lib/link_details_extractor.rb
+++ b/app/lib/link_details_extractor.rb
@@ -113,6 +113,7 @@ class LinkDetailsExtractor
       title: title || '',
       description: description || '',
       image_remote_url: image,
+      image_description: image_alt || '',
       type: type,
       link_type: link_type,
       width: width || 0,
@@ -168,6 +169,10 @@ class LinkDetailsExtractor
     valid_url_or_nil(opengraph_tag('og:image'))
   end
 
+  def image_alt
+    opengraph_tag('og:image:alt')
+  end
+
   def canonical_url
     valid_url_or_nil(link_tag('canonical') || opengraph_tag('og:url'), same_origin_only: true) || @original_url.to_s
   end
diff --git a/app/lib/request.rb b/app/lib/request.rb
index adc9a48f3d..fa0e3472f6 100644
--- a/app/lib/request.rb
+++ b/app/lib/request.rb
@@ -117,7 +117,7 @@ class Request
 
   def perform
     begin
-      response = http_client.public_send(@verb, @url.to_s, @options.merge(headers: headers))
+      response = http_client.request(@verb, @url.to_s, @options.merge(headers: headers))
     rescue => e
       raise e.class, "#{e.message} on #{@url}", e.backtrace[0]
     end
@@ -346,7 +346,7 @@ class Request
       end
 
       def private_address_exceptions
-        @private_address_exceptions = (ENV['ALLOWED_PRIVATE_ADDRESSES'] || '').split(',').map { |addr| IPAddr.new(addr) }
+        @private_address_exceptions = (ENV['ALLOWED_PRIVATE_ADDRESSES'] || '').split(/(?:\s*,\s*|\s+)/).map { |addr| IPAddr.new(addr) }
       end
     end
   end
diff --git a/app/lib/video_metadata_extractor.rb b/app/lib/video_metadata_extractor.rb
index 2896620cb2..f27d34868a 100644
--- a/app/lib/video_metadata_extractor.rb
+++ b/app/lib/video_metadata_extractor.rb
@@ -43,6 +43,9 @@ class VideoMetadataExtractor
         @height      = video_stream[:height]
         @frame_rate  = video_stream[:avg_frame_rate] == '0/0' ? nil : Rational(video_stream[:avg_frame_rate])
         @r_frame_rate = video_stream[:r_frame_rate] == '0/0' ? nil : Rational(video_stream[:r_frame_rate])
+        # For some video streams the frame_rate reported by `ffprobe` will be 0/0, but for these streams we
+        # should use `r_frame_rate` instead. Video screencast generated by Gnome Screencast have this issue.
+        @frame_rate ||= @r_frame_rate
       end
 
       if (audio_stream = audio_streams.first)
diff --git a/app/models/account.rb b/app/models/account.rb
index f011cba4d0..a829a87096 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -50,6 +50,7 @@
 #  trendable                     :boolean
 #  reviewed_at                   :datetime
 #  requested_review_at           :datetime
+#  indexable                     :boolean          default(FALSE), not null
 #
 
 class Account < ApplicationRecord
@@ -62,6 +63,8 @@ class Account < ApplicationRecord
     trust_level
   )
 
+  BACKGROUND_REFRESH_INTERVAL = 1.week.freeze
+
   USERNAME_RE   = /[a-z0-9_]+([a-z0-9_.-]+[a-z0-9_]+)?/i
   MENTION_RE    = %r{(?<=^|[^/[:word:]])@((#{USERNAME_RE})(?:@[[:word:].-]+[[:word:]]+)?)}i
   URL_PREFIX_RE = %r{\Ahttp(s?)://[^/]+}
@@ -212,6 +215,12 @@ class Account < ApplicationRecord
     last_webfingered_at.nil? || last_webfingered_at <= 1.day.ago
   end
 
+  def schedule_refresh_if_stale!
+    return unless last_webfingered_at.present? && last_webfingered_at <= BACKGROUND_REFRESH_INTERVAL.ago
+
+    AccountRefreshWorker.perform_in(rand(6.hours.to_i), id)
+  end
+
   def refresh!
     ResolveAccountService.new.call(acct) unless local?
   end
@@ -439,8 +448,21 @@ class Account < ApplicationRecord
         EntityCache.instance.mention(username, domain)
       end
     end
+
+    def inverse_alias(key, original_key)
+      define_method("#{key}=") do |value|
+        public_send("#{original_key}=", !ActiveModel::Type::Boolean.new.cast(value))
+      end
+
+      define_method(key) do
+        !public_send(original_key)
+      end
+    end
   end
 
+  inverse_alias :show_collections, :hide_collections
+  inverse_alias :unlocked, :locked
+
   def emojis
     @emojis ||= CustomEmoji.from_text(emojifiable_text, domain)
   end
diff --git a/app/models/application_record.rb b/app/models/application_record.rb
index efff5cdad5..567542f91d 100644
--- a/app/models/application_record.rb
+++ b/app/models/application_record.rb
@@ -5,7 +5,7 @@ class ApplicationRecord < ActiveRecord::Base
 
   include Remotable
 
-  connects_to database: { writing: :primary, reading: ENV['DB_REPLICA_NAME'] || ENV['READ_DATABASE_URL'] ? :read : :primary }
+  connects_to database: { writing: :primary, reading: ENV['REPLICA_DB_NAME'] || ENV['REPLICA_DATABASE_URL'] ? :replica : :primary }
 
   class << self
     def update_index(_type_name, *_args, &_block)
diff --git a/app/models/follow_recommendation.rb b/app/models/follow_recommendation.rb
index 123570b124..9d2648394b 100644
--- a/app/models/follow_recommendation.rb
+++ b/app/models/follow_recommendation.rb
@@ -2,7 +2,7 @@
 
 # == Schema Information
 #
-# Table name: follow_recommendations
+# Table name: global_follow_recommendations
 #
 #  account_id :bigint(8)        primary key
 #  rank       :decimal(, )
@@ -11,6 +11,7 @@
 
 class FollowRecommendation < ApplicationRecord
   self.primary_key = :account_id
+  self.table_name = :global_follow_recommendations
 
   belongs_to :account_summary, foreign_key: :account_id, inverse_of: false
   belongs_to :account
diff --git a/app/models/preview_card.rb b/app/models/preview_card.rb
index 2c52b751d3..74e3650879 100644
--- a/app/models/preview_card.rb
+++ b/app/models/preview_card.rb
@@ -31,6 +31,7 @@
 #  trendable                    :boolean
 #  link_type                    :integer
 #  published_at                 :datetime
+#  image_description            :string           default(""), not null
 #
 
 class PreviewCard < ApplicationRecord
diff --git a/app/models/public_feed.rb b/app/models/public_feed.rb
index a987bb72c6..8a7c3a4512 100644
--- a/app/models/public_feed.rb
+++ b/app/models/public_feed.rb
@@ -51,11 +51,11 @@ class PublicFeed
   end
 
   def local_only?
-    options[:local]
+    options[:local] && !options[:remote]
   end
 
   def remote_only?
-    options[:remote]
+    options[:remote] && !options[:local]
   end
 
   def account?
diff --git a/app/models/report.rb b/app/models/report.rb
index f6fd23cf3a..eaf662d1e2 100644
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -48,7 +48,10 @@ class Report < ApplicationRecord
 
   validate :validate_rule_ids
 
-  # entries here needs to be kept in sync with app/javascript/mastodon/features/notifications/components/report.jsx
+  # entries here need to be kept in sync with the front-end:
+  # - app/javascript/mastodon/features/notifications/components/report.jsx
+  # - app/javascript/mastodon/features/report/category.jsx
+  # - app/javascript/mastodon/components/admin/ReportReasonSelector.jsx
   enum category: {
     other: 0,
     spam: 1_000,
diff --git a/app/models/status.rb b/app/models/status.rb
index 4b7a4834d8..2ecc132a1f 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -184,7 +184,7 @@ class Status < ApplicationRecord
   REAL_TIME_WINDOW = 6.hours
 
   def cache_key
-    "v2:#{super}"
+    "v3:#{super}"
   end
 
   def searchable_by(preloaded = nil)
@@ -433,13 +433,25 @@ class Status < ApplicationRecord
 
       account_ids.uniq!
 
+      status_ids = cached_items.map { |item| item.reblog? ? item.reblog_of_id : item.id }.uniq
+
       return if account_ids.empty?
 
       accounts = Account.where(id: account_ids).includes(:account_stat, :user).index_by(&:id)
 
+      status_stats = StatusStat.where(status_id: status_ids).index_by(&:status_id)
+
       cached_items.each do |item|
         item.account = accounts[item.account_id]
         item.reblog.account = accounts[item.reblog.account_id] if item.reblog?
+
+        if item.reblog?
+          status_stat = status_stats[item.reblog.id]
+          item.reblog.status_stat = status_stat if status_stat.present?
+        else
+          status_stat = status_stats[item.id]
+          item.status_stat = status_stat if status_stat.present?
+        end
       end
     end
 
diff --git a/app/models/user_settings.rb b/app/models/user_settings.rb
index 22a90d3de4..7a64159d84 100644
--- a/app/models/user_settings.rb
+++ b/app/models/user_settings.rb
@@ -19,6 +19,9 @@ class UserSettings
   setting :default_content_type, default: 'text/plain'
   setting :hide_followers_count, default: false
 
+  setting_inverse_alias :indexable, :noindex
+  setting_inverse_alias :show_followers_count, :hide_followers_count
+
   namespace :web do
     setting :advanced_layout, default: false
     setting :trends, default: true
@@ -62,31 +65,26 @@ class UserSettings
   end
 
   def [](key)
-    key = key.to_sym
+    definition = self.class.definition_for(key)
 
-    raise KeyError, "Undefined setting: #{key}" unless self.class.definition_for?(key)
+    raise KeyError, "Undefined setting: #{key}" if definition.nil?
 
-    if @original_hash.key?(key)
-      @original_hash[key]
-    else
-      self.class.definition_for(key).default_value
-    end
+    definition.value_for(key, @original_hash[definition.key])
   end
 
   def []=(key, value)
-    key = key.to_sym
+    definition = self.class.definition_for(key)
 
-    raise KeyError, "Undefined setting: #{key}" unless self.class.definition_for?(key)
+    raise KeyError, "Undefined setting: #{key}" if definition.nil?
 
-    setting_definition = self.class.definition_for(key)
-    typecast_value = setting_definition.type_cast(value)
+    typecast_value = definition.type_cast(value)
 
-    raise ArgumentError, "Invalid value for setting #{key}: #{typecast_value}" if setting_definition.in.present? && setting_definition.in.exclude?(typecast_value)
+    raise ArgumentError, "Invalid value for setting #{definition.key}: #{typecast_value}" if definition.in.present? && definition.in.exclude?(typecast_value)
 
     if typecast_value.nil?
-      @original_hash.delete(key)
+      @original_hash.delete(definition.key)
     else
-      @original_hash[key] = typecast_value
+      @original_hash[definition.key] = definition.value_for(key, typecast_value)
     end
   end
 
diff --git a/app/models/user_settings/dsl.rb b/app/models/user_settings/dsl.rb
index 26238bbbe8..4282830711 100644
--- a/app/models/user_settings/dsl.rb
+++ b/app/models/user_settings/dsl.rb
@@ -10,6 +10,10 @@ module UserSettings::DSL
       end
     end
 
+    def setting_inverse_alias(key, original_key)
+      @definitions[key] = @definitions[original_key].inverse_of(key)
+    end
+
     def namespace(key, &block)
       @definitions ||= {}
 
diff --git a/app/models/user_settings/setting.rb b/app/models/user_settings/setting.rb
index 5f5504254a..9c17017440 100644
--- a/app/models/user_settings/setting.rb
+++ b/app/models/user_settings/setting.rb
@@ -10,6 +10,27 @@ class UserSettings::Setting
     @in            = options[:in]
   end
 
+  def inverse_of(name)
+    @inverse_of = name.to_sym
+    self
+  end
+
+  def value_for(name, original_value)
+    value = begin
+      if original_value.nil?
+        default_value
+      else
+        original_value
+      end
+    end
+
+    if !@inverse_of.nil? && @inverse_of == name.to_sym
+      !value
+    else
+      value
+    end
+  end
+
   def default_value
     if @default_value.respond_to?(:call)
       @default_value.call
diff --git a/app/presenters/language_presenter.rb b/app/presenters/language_presenter.rb
new file mode 100644
index 0000000000..69ea991d54
--- /dev/null
+++ b/app/presenters/language_presenter.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class LanguagePresenter < ActiveModelSerializers::Model
+  attributes :code, :name, :native_name
+
+  def initialize(code)
+    super()
+
+    @code = code
+    @item = LanguagesHelper::SUPPORTED_LOCALES[code]
+  end
+
+  def name
+    @item[0]
+  end
+
+  def native_name
+    @item[1]
+  end
+end
diff --git a/app/serializers/activitypub/actor_serializer.rb b/app/serializers/activitypub/actor_serializer.rb
index 36397857f0..4998d00399 100644
--- a/app/serializers/activitypub/actor_serializer.rb
+++ b/app/serializers/activitypub/actor_serializer.rb
@@ -7,13 +7,14 @@ class ActivityPub::ActorSerializer < ActivityPub::Serializer
   context :security
 
   context_extensions :manually_approves_followers, :featured, :also_known_as,
-                     :moved_to, :property_value, :discoverable, :olm, :suspended
+                     :moved_to, :property_value, :discoverable, :olm, :suspended,
+                     :memorial
 
   attributes :id, :type, :following, :followers,
              :inbox, :outbox, :featured, :featured_tags,
              :preferred_username, :name, :summary,
              :url, :manually_approves_followers,
-             :discoverable, :published
+             :discoverable, :published, :memorial
 
   has_one :public_key, serializer: ActivityPub::PublicKeySerializer
 
diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb
index 1caf0a9400..3903b444b0 100644
--- a/app/serializers/initial_state_serializer.rb
+++ b/app/serializers/initial_state_serializer.rb
@@ -46,6 +46,7 @@ class InitialStateSerializer < ActiveModel::Serializer
       single_user_mode: Rails.configuration.x.single_user_mode,
       trends_as_landing_page: Setting.trends_as_landing_page,
       status_page_url: Setting.status_page_url,
+      sso_redirect: sso_redirect,
     }
 
     if object.current_account
@@ -125,4 +126,8 @@ class InitialStateSerializer < ActiveModel::Serializer
   def instance_presenter
     @instance_presenter ||= InstancePresenter.new
   end
+
+  def sso_redirect
+    "/auth/auth/#{Devise.omniauth_providers[0]}" if ENV['OMNIAUTH_ONLY'] == 'true' && Devise.omniauth_providers.length == 1
+  end
 end
diff --git a/app/serializers/rest/language_serializer.rb b/app/serializers/rest/language_serializer.rb
new file mode 100644
index 0000000000..e07956465c
--- /dev/null
+++ b/app/serializers/rest/language_serializer.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class REST::LanguageSerializer < ActiveModel::Serializer
+  attributes :code, :name
+end
diff --git a/app/serializers/rest/preview_card_serializer.rb b/app/serializers/rest/preview_card_serializer.rb
index cf700ff24e..3e1c4bde3c 100644
--- a/app/serializers/rest/preview_card_serializer.rb
+++ b/app/serializers/rest/preview_card_serializer.rb
@@ -6,7 +6,7 @@ class REST::PreviewCardSerializer < ActiveModel::Serializer
   attributes :url, :title, :description, :language, :type,
              :author_name, :author_url, :provider_name,
              :provider_url, :html, :width, :height,
-             :image, :embed_url, :blurhash, :published_at
+             :image, :image_description, :embed_url, :blurhash, :published_at
 
   def image
     object.image? ? full_asset_url(object.image.url(:original)) : nil
diff --git a/app/services/account_search_service.rb b/app/services/account_search_service.rb
index b732fbcec3..b437ff4759 100644
--- a/app/services/account_search_service.rb
+++ b/app/services/account_search_service.rb
@@ -8,6 +8,143 @@ class AccountSearchService < BaseService
   # Min. number of characters to look for non-exact matches
   MIN_QUERY_LENGTH = 5
 
+  class QueryBuilder
+    def initialize(query, account, options = {})
+      @query = query
+      @account = account
+      @options = options
+    end
+
+    def build
+      AccountsIndex.query(
+        bool: {
+          must: {
+            function_score: {
+              query: {
+                bool: {
+                  must: must_clauses,
+                },
+              },
+
+              functions: [
+                reputation_score_function,
+                followers_score_function,
+                time_distance_function,
+              ],
+            },
+          },
+
+          should: should_clauses,
+        }
+      )
+    end
+
+    private
+
+    def must_clauses
+      if @account && @options[:following]
+        [core_query, only_following_query]
+      else
+        [core_query]
+      end
+    end
+
+    def should_clauses
+      if @account && !@options[:following]
+        [boost_following_query]
+      else
+        []
+      end
+    end
+
+    # This function limits results to only the accounts the user is following
+    def only_following_query
+      {
+        terms: {
+          id: following_ids,
+        },
+      }
+    end
+
+    # This function promotes accounts the user is following
+    def boost_following_query
+      {
+        terms: {
+          id: following_ids,
+          boost: 100,
+        },
+      }
+    end
+
+    # This function deranks accounts that follow more people than follow them
+    def reputation_score_function
+      {
+        script_score: {
+          script: {
+            source: "(Math.max(doc['followers_count'].value, 0) + 0.0) / (Math.max(doc['followers_count'].value, 0) + Math.max(doc['following_count'].value, 0) + 1)",
+          },
+        },
+      }
+    end
+
+    # This function promotes accounts that have more followers
+    def followers_score_function
+      {
+        script_score: {
+          script: {
+            source: "(Math.max(doc['followers_count'].value, 0) / (Math.max(doc['followers_count'].value, 0) + 1))",
+          },
+        },
+      }
+    end
+
+    # This function deranks accounts that haven't posted in a long time
+    def time_distance_function
+      {
+        gauss: {
+          last_status_at: {
+            scale: '30d',
+            offset: '30d',
+            decay: 0.3,
+          },
+        },
+      }
+    end
+
+    def following_ids
+      @following_ids ||= @account.active_relationships.pluck(:target_account_id) + [@account.id]
+    end
+  end
+
+  class AutocompleteQueryBuilder < QueryBuilder
+    private
+
+    def core_query
+      {
+        multi_match: {
+          query: @query,
+          type: 'bool_prefix',
+          fields: %w(username^2 username.*^2 display_name display_name.*),
+        },
+      }
+    end
+  end
+
+  class FullQueryBuilder < QueryBuilder
+    private
+
+    def core_query
+      {
+        multi_match: {
+          query: @query,
+          type: 'most_fields',
+          fields: %w(username^2 display_name^2 text text.*),
+          operator: 'and',
+        },
+      }
+    end
+  end
+
   def call(query, account = nil, options = {})
     @query   = query&.strip&.gsub(/\A@/, '')
     @limit   = options[:limit].to_i
@@ -71,27 +208,15 @@ class AccountSearchService < BaseService
   end
 
   def from_elasticsearch
-    must_clauses   = must_clause
-    should_clauses = should_clause
-
-    if account
-      return [] if options[:following] && following_ids.empty?
-
-      if options[:following]
-        must_clauses << { terms: { id: following_ids } }
-      elsif following_ids.any?
-        should_clauses << { terms: { id: following_ids, boost: 100 } }
+    query_builder = begin
+      if options[:use_searchable_text]
+        FullQueryBuilder.new(terms_for_query, account, options.slice(:following))
+      else
+        AutocompleteQueryBuilder.new(terms_for_query, account, options.slice(:following))
       end
     end
 
-    query     = { bool: { must: must_clauses, should: should_clauses } }
-    functions = [reputation_score_function, followers_score_function, time_distance_function]
-
-    records = AccountsIndex.query(function_score: { query: query, functions: functions })
-                           .limit(limit_for_non_exact_results)
-                           .offset(offset)
-                           .objects
-                           .compact
+    records = query_builder.build.limit(limit_for_non_exact_results).offset(offset).objects.compact
 
     ActiveRecord::Associations::Preloader.new(records: records, associations: :account_stat)
 
@@ -100,76 +225,6 @@ class AccountSearchService < BaseService
     nil
   end
 
-  def reputation_score_function
-    {
-      script_score: {
-        script: {
-          source: "(Math.max(doc['followers_count'].value, 0) + 0.0) / (Math.max(doc['followers_count'].value, 0) + Math.max(doc['following_count'].value, 0) + 1)",
-        },
-      },
-    }
-  end
-
-  def followers_score_function
-    {
-      script_score: {
-        script: {
-          source: "Math.log10(Math.max(doc['followers_count'].value, 0) + 2)",
-        },
-      },
-    }
-  end
-
-  def time_distance_function
-    {
-      gauss: {
-        last_status_at: {
-          scale: '30d',
-          offset: '30d',
-          decay: 0.3,
-        },
-      },
-    }
-  end
-
-  def must_clause
-    if options[:start_with_hashtag]
-      fields = %w(text text.*)
-    else
-      fields = %w(username username.* display_name display_name.*)
-      fields << 'text' << 'text.*' if options[:use_searchable_text]
-    end
-
-    [
-      {
-        multi_match: {
-          query: terms_for_query,
-          fields: fields,
-          type: 'best_fields',
-          operator: 'or',
-        },
-      },
-    ]
-  end
-
-  def should_clause
-    [
-      {
-        multi_match: {
-          query: terms_for_query,
-          fields: %w(username username.* display_name display_name.*),
-          type: 'best_fields',
-          operator: 'and',
-          boost: 10,
-        },
-      },
-    ]
-  end
-
-  def following_ids
-    @following_ids ||= account.active_relationships.pluck(:target_account_id) + [account.id]
-  end
-
   def limit_for_non_exact_results
     return 0 if @account.nil? && query.size < MIN_QUERY_LENGTH
 
diff --git a/app/services/activitypub/process_account_service.rb b/app/services/activitypub/process_account_service.rb
index c116fab733..1304ca8242 100644
--- a/app/services/activitypub/process_account_service.rb
+++ b/app/services/activitypub/process_account_service.rb
@@ -115,6 +115,8 @@ class ActivityPub::ProcessAccountService < BaseService
     @account.fields                  = property_values || {}
     @account.also_known_as           = as_array(@json['alsoKnownAs'] || []).map { |item| value_or_id(item) }
     @account.discoverable            = @json['discoverable'] || false
+    @account.indexable               = @json['indexable'] || false
+    @account.memorial                = @json['memorial'] || false
   end
 
   def set_fetchable_key!
diff --git a/app/services/bulk_import_service.rb b/app/services/bulk_import_service.rb
index 5c14adc499..591b112127 100644
--- a/app/services/bulk_import_service.rb
+++ b/app/services/bulk_import_service.rb
@@ -162,10 +162,9 @@ class BulkImportService < BaseService
 
   def import_lists!
     rows = @import.rows.to_a
+    included_lists = rows.map { |row| row.data['list_name'] }.uniq
 
     if @import.overwrite?
-      included_lists = rows.map { |row| row.data['list_name'] }.uniq
-
       @account.owned_lists.where.not(title: included_lists).destroy_all
 
       # As list membership changes do not retroactively change timeline
@@ -175,6 +174,10 @@ class BulkImportService < BaseService
       end
     end
 
+    included_lists.each do |title|
+      @account.owned_lists.find_or_create_by!(title: title)
+    end
+
     Import::RowWorker.push_bulk(rows) do |row|
       [row.id]
     end
diff --git a/app/services/fetch_link_card_service.rb b/app/services/fetch_link_card_service.rb
index feb4638f3e..8312d5f8f4 100644
--- a/app/services/fetch_link_card_service.rb
+++ b/app/services/fetch_link_card_service.rb
@@ -61,9 +61,13 @@ class FetchLinkCardService < BaseService
   end
 
   def attach_card
-    @status.preview_cards << @card
-    Rails.cache.delete(@status)
-    Trends.links.register(@status)
+    with_redis_lock("attach_card:#{@status.id}") do
+      return if @status.preview_cards.any?
+
+      @status.preview_cards << @card
+      Rails.cache.delete(@status)
+      Trends.links.register(@status)
+    end
   end
 
   def parse_urls
diff --git a/app/views/auth/setup/show.html.haml b/app/views/auth/setup/show.html.haml
index 913b0c9132..ab9b00bed6 100644
--- a/app/views/auth/setup/show.html.haml
+++ b/app/views/auth/setup/show.html.haml
@@ -17,6 +17,6 @@
     = f.input :email, required: true, hint: false, input_html: { 'aria-label': t('simple_form.labels.defaults.email'), autocomplete: 'off' }
 
   .actions
-    = f.submit t('auth.resend_confirmation'), class: 'button'
+    = f.button :button, t('auth.resend_confirmation'), type: :submit, class: 'button timer-button', disabled: true
 
 .form-footer= render 'auth/shared/links'
diff --git a/app/views/settings/preferences/notifications/show.html.haml b/app/views/settings/preferences/notifications/show.html.haml
index cfc468eef3..a366dbad5b 100644
--- a/app/views/settings/preferences/notifications/show.html.haml
+++ b/app/views/settings/preferences/notifications/show.html.haml
@@ -18,16 +18,21 @@
       = ff.input :'notification_emails.reblog', wrapper: :with_label, label: I18n.t('simple_form.labels.notification_emails.reblog')
       = ff.input :'notification_emails.favourite', wrapper: :with_label, label: I18n.t('simple_form.labels.notification_emails.favourite')
       = ff.input :'notification_emails.mention', wrapper: :with_label, label: I18n.t('simple_form.labels.notification_emails.mention')
-      = ff.input :'notification_emails.report', wrapper: :with_label, label: I18n.t('simple_form.labels.notification_emails.report') if current_user.can?(:manage_reports)
-      = ff.input :'notification_emails.appeal', as: :boolean, wrapper: :with_label, label: I18n.t('simple_form.labels.notification_emails.appeal') if current_user.can?(:manage_appeals)
-      = ff.input :'notification_emails.pending_account', wrapper: :with_label, label: I18n.t('simple_form.labels.notification_emails.pending_account') if current_user.can?(:manage_users)
-      = ff.input :'notification_emails.trends', wrapper: :with_label, label: I18n.t('simple_form.labels.notification_emails.trending_tag') if current_user.can?(:manage_taxonomies)
-      = ff.input :'notification_emails.link_trends', wrapper: :with_label, label: I18n.t('simple_form.labels.notification_emails.trending_link') if current_user.can?(:manage_taxonomies)
-      = ff.input :'notification_emails.status_trends', wrapper: :with_label, label: I18n.t('simple_form.labels.notification_emails.trending_status') if current_user.can?(:manage_taxonomies)
 
     .fields-group
       = ff.input :always_send_emails, wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_always_send_emails'), hint: I18n.t('simple_form.hints.defaults.setting_always_send_emails')
 
+    - if current_user.can?(:manage_reports, :manage_appeals, :manage_users, :manage_taxonomies)
+      %h4= t 'notifications.administration_emails'
+
+      .fields-group
+        = ff.input :'notification_emails.report', wrapper: :with_label, label: I18n.t('simple_form.labels.notification_emails.report') if current_user.can?(:manage_reports)
+        = ff.input :'notification_emails.appeal', as: :boolean, wrapper: :with_label, label: I18n.t('simple_form.labels.notification_emails.appeal') if current_user.can?(:manage_appeals)
+        = ff.input :'notification_emails.pending_account', wrapper: :with_label, label: I18n.t('simple_form.labels.notification_emails.pending_account') if current_user.can?(:manage_users)
+        = ff.input :'notification_emails.trends', wrapper: :with_label, label: I18n.t('simple_form.labels.notification_emails.trending_tag') if current_user.can?(:manage_taxonomies)
+        = ff.input :'notification_emails.link_trends', wrapper: :with_label, label: I18n.t('simple_form.labels.notification_emails.trending_link') if current_user.can?(:manage_taxonomies)
+        = ff.input :'notification_emails.status_trends', wrapper: :with_label, label: I18n.t('simple_form.labels.notification_emails.trending_status') if current_user.can?(:manage_taxonomies)
+
   %h4= t 'notifications.other_settings'
 
   .fields-group
diff --git a/app/views/settings/preferences/other/show.html.haml b/app/views/settings/preferences/other/show.html.haml
index 0029b4c6fe..afe8529e00 100644
--- a/app/views/settings/preferences/other/show.html.haml
+++ b/app/views/settings/preferences/other/show.html.haml
@@ -8,16 +8,9 @@
   = render 'shared/error_messages', object: current_user
 
   = f.simple_fields_for :settings, current_user.settings do |ff|
-    .fields-group
-      = ff.input :noindex, wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_noindex'), hint: I18n.t('simple_form.hints.defaults.setting_noindex')
-
     .fields-group
       = ff.input :aggregate_reblogs, wrapper: :with_label, recommended: true, label: I18n.t('simple_form.labels.defaults.setting_aggregate_reblogs'), hint: I18n.t('simple_form.hints.defaults.setting_aggregate_reblogs')
 
-    - unless Setting.hide_followers_count
-      .fields-group
-        = ff.input :hide_followers_count, wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_hide_followers_count'), glitch_only: true
-
     %h4= t 'preferences.posting_defaults'
 
     .fields-row
@@ -30,9 +23,6 @@
     .fields-group
       = ff.input :default_sensitive, wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_default_sensitive'), hint: I18n.t('simple_form.hints.defaults.setting_default_sensitive')
 
-    .fields-group
-      = ff.input :show_application, wrapper: :with_label, recommended: true, label: I18n.t('simple_form.labels.defaults.setting_show_application'), hint: I18n.t('simple_form.hints.defaults.setting_show_application')
-
     .fields-group
       = ff.input :default_content_type, collection: ['text/plain', 'text/markdown', 'text/html'], wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_default_content_type'), include_blank: false, label_method: lambda { |item| safe_join([t("simple_form.labels.defaults.setting_default_content_type_#{item.split('/')[1]}"), content_tag(:span, t("simple_form.hints.defaults.setting_default_content_type_#{item.split('/')[1]}"), class: 'hint')]) }, required: false, as: :radio_buttons, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li', glitch_only: true
 
diff --git a/app/views/settings/privacy/show.html.haml b/app/views/settings/privacy/show.html.haml
new file mode 100644
index 0000000000..6b7ae14e94
--- /dev/null
+++ b/app/views/settings/privacy/show.html.haml
@@ -0,0 +1,47 @@
+- content_for :page_title do
+  = t('privacy.title')
+
+- content_for :heading do
+  %h2= t('settings.profile')
+  = render partial: 'settings/shared/profile_navigation'
+
+= simple_form_for @account, url: settings_privacy_path, html: { method: :put } do |f|
+  = render 'shared/error_messages', object: @account
+
+  %p.lead= t('privacy.hint_html')
+
+  %h4= t('privacy.reach')
+
+  %p.lead= t('privacy.reach_hint_html')
+
+  .fields-group
+    = f.input :discoverable, as: :boolean, wrapper: :with_label, recommended: true
+
+  .fields-group
+    = f.input :unlocked, as: :boolean, wrapper: :with_label
+
+  %h4= t('privacy.search')
+
+  %p.lead= t('privacy.search_hint_html')
+
+  = f.simple_fields_for :settings, current_user.settings do |ff|
+    .fields-group
+      = ff.input :indexable, wrapper: :with_label
+
+  %h4= t('privacy.privacy')
+
+  %p.lead= t('privacy.privacy_hint_html')
+
+  .fields-group
+    = f.input :show_collections, as: :boolean, wrapper: :with_label
+
+  = f.simple_fields_for :settings, current_user.settings do |ff|
+    - unless Setting.hide_followers_count
+      .fields-group
+        = ff.input :show_followers_count, wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_show_followers_count'), hint: I18n.t('simple_form.hints.defaults.setting_show_followers_count'), glitch_only: true
+
+    .fields-group
+      = ff.input :show_application, wrapper: :with_label
+
+  .actions
+    = f.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/settings/profiles/show.html.haml b/app/views/settings/profiles/show.html.haml
index 161a95f782..2ef912d079 100644
--- a/app/views/settings/profiles/show.html.haml
+++ b/app/views/settings/profiles/show.html.haml
@@ -35,10 +35,10 @@
       .fields-group
         = f.input :avatar, wrapper: :with_block_label, input_html: { accept: AccountAvatar::IMAGE_MIME_TYPES.join(',') }, hint: t('simple_form.hints.defaults.avatar', dimensions: '400x400', size: number_to_human_size(AccountAvatar::LIMIT))
 
-    - if @account.avatar.present?
-      .fields-row__column.fields-row__column-6
-        .fields-group
-          = image_tag @account.avatar.url, class: 'fields-group__thumbnail', width: 90, height: 90
+    .fields-row__column.fields-row__column-6
+      .fields-group
+        = image_tag @account.avatar.url, class: 'fields-group__thumbnail', id: 'account_avatar-preview'
+        - if @account.avatar.present?
           = link_to settings_profile_picture_path('avatar'), data: { method: :delete }, class: 'link-button link-button--destructive' do
             = fa_icon 'trash fw'
             = t('generic.delete')
@@ -48,25 +48,14 @@
       .fields-group
         = f.input :header, wrapper: :with_block_label, input_html: { accept: AccountHeader::IMAGE_MIME_TYPES.join(',') }, hint: t('simple_form.hints.defaults.header', dimensions: '1500x500', size: number_to_human_size(AccountHeader::LIMIT))
 
-    - if @account.header.present?
-      .fields-row__column.fields-row__column-6
-        .fields-group
-          = image_tag @account.header.url, class: 'fields-group__thumbnail'
+    .fields-row__column.fields-row__column-6
+      .fields-group
+        = image_tag @account.header.url, class: 'fields-group__thumbnail', id: 'account_header-preview'
+        - if @account.header.present?
           = link_to settings_profile_picture_path('header'), data: { method: :delete }, class: 'link-button link-button--destructive' do
             = fa_icon 'trash fw'
             = t('generic.delete')
 
-  %h4= t('edit_profile.safety_and_privacy')
-
-  .fields-group
-    = f.input :discoverable, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.discoverable'), recommended: true
-
-  .fields-group
-    = f.input :locked, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.locked')
-
-  .fields-group
-    = f.input :hide_collections, as: :boolean, wrapper: :with_label, label: t('simple_form.labels.defaults.setting_hide_network'), hint: t('simple_form.hints.defaults.setting_hide_network')
-
   %h4= t('edit_profile.other')
 
   .fields-group
diff --git a/app/views/settings/shared/_profile_navigation.html.haml b/app/views/settings/shared/_profile_navigation.html.haml
index 54425c27b3..3a657c5bde 100644
--- a/app/views/settings/shared/_profile_navigation.html.haml
+++ b/app/views/settings/shared/_profile_navigation.html.haml
@@ -2,5 +2,6 @@
   = render_navigation renderer: :links do |primary|
     :ruby
       primary.item :profile, safe_join([fa_icon('user fw'), t('settings.edit_profile')]), settings_profile_path
+      primary.item :privacy, safe_join([fa_icon('lock fw'), t('privacy.title')]), settings_privacy_path
       primary.item :verification, safe_join([fa_icon('check fw'), t('verification.verification')]), settings_verification_path
       primary.item :featured_tags, safe_join([fa_icon('hashtag fw'), t('settings.featured_tags')]), settings_featured_tags_path
diff --git a/app/workers/account_refresh_worker.rb b/app/workers/account_refresh_worker.rb
new file mode 100644
index 0000000000..08b5bab8da
--- /dev/null
+++ b/app/workers/account_refresh_worker.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class AccountRefreshWorker
+  include Sidekiq::Worker
+
+  sidekiq_options queue: 'pull', retry: 3, dead: false, lock: :until_executed, lock_ttl: 1.day.to_i
+
+  def perform(account_id)
+    account = Account.find_by(id: account_id)
+    return if account.nil? || account.last_webfingered_at > Account::BACKGROUND_REFRESH_INTERVAL.ago
+
+    ResolveAccountService.new.call(account)
+  end
+end
diff --git a/app/workers/scheduler/follow_recommendations_scheduler.rb b/app/workers/scheduler/follow_recommendations_scheduler.rb
index 17cf3f2cc3..ea59ad986b 100644
--- a/app/workers/scheduler/follow_recommendations_scheduler.rb
+++ b/app/workers/scheduler/follow_recommendations_scheduler.rb
@@ -4,7 +4,7 @@ class Scheduler::FollowRecommendationsScheduler
   include Sidekiq::Worker
   include Redisable
 
-  sidekiq_options retry: 0
+  sidekiq_options retry: 0, lock: :until_executed, lock_ttl: 1.day.to_i
 
   # The maximum number of accounts that can be requested in one page from the
   # API is 80, and the suggestions API does not allow pagination. This number
diff --git a/app/workers/scheduler/indexing_scheduler.rb b/app/workers/scheduler/indexing_scheduler.rb
index d622f5586e..2868a3b715 100644
--- a/app/workers/scheduler/indexing_scheduler.rb
+++ b/app/workers/scheduler/indexing_scheduler.rb
@@ -4,7 +4,7 @@ class Scheduler::IndexingScheduler
   include Sidekiq::Worker
   include Redisable
 
-  sidekiq_options retry: 0
+  sidekiq_options retry: 0, lock: :until_executed, lock_ttl: 1.day.to_i
 
   IMPORT_BATCH_SIZE = 1000
   SCAN_BATCH_SIZE = 10 * IMPORT_BATCH_SIZE
@@ -16,9 +16,7 @@ class Scheduler::IndexingScheduler
       with_redis do |redis|
         redis.sscan_each("chewy:queue:#{type.name}", count: SCAN_BATCH_SIZE).each_slice(IMPORT_BATCH_SIZE) do |ids|
           type.import!(ids)
-          redis.pipelined do |pipeline|
-            pipeline.srem("chewy:queue:#{type.name}", ids)
-          end
+          redis.srem("chewy:queue:#{type.name}", ids)
         end
       end
     end
diff --git a/app/workers/scheduler/instance_refresh_scheduler.rb b/app/workers/scheduler/instance_refresh_scheduler.rb
index 59f91dc623..818682a5d2 100644
--- a/app/workers/scheduler/instance_refresh_scheduler.rb
+++ b/app/workers/scheduler/instance_refresh_scheduler.rb
@@ -3,7 +3,7 @@
 class Scheduler::InstanceRefreshScheduler
   include Sidekiq::Worker
 
-  sidekiq_options retry: 0
+  sidekiq_options retry: 0, lock: :until_executed, lock_ttl: 1.day.to_i
 
   def perform
     Instance.refresh
diff --git a/app/workers/scheduler/ip_cleanup_scheduler.rb b/app/workers/scheduler/ip_cleanup_scheduler.rb
index 8f607db037..f78c0584d7 100644
--- a/app/workers/scheduler/ip_cleanup_scheduler.rb
+++ b/app/workers/scheduler/ip_cleanup_scheduler.rb
@@ -6,7 +6,7 @@ class Scheduler::IpCleanupScheduler
   IP_RETENTION_PERIOD = ENV.fetch('IP_RETENTION_PERIOD', 1.year).to_i.seconds.freeze
   SESSION_RETENTION_PERIOD = ENV.fetch('SESSION_RETENTION_PERIOD', 1.year).to_i.seconds.freeze
 
-  sidekiq_options retry: 0
+  sidekiq_options retry: 0, lock: :until_executed, lock_ttl: 1.day.to_i
 
   def perform
     clean_ip_columns!
diff --git a/app/workers/scheduler/pghero_scheduler.rb b/app/workers/scheduler/pghero_scheduler.rb
index a756b13b93..49bf2db7a6 100644
--- a/app/workers/scheduler/pghero_scheduler.rb
+++ b/app/workers/scheduler/pghero_scheduler.rb
@@ -3,7 +3,7 @@
 class Scheduler::PgheroScheduler
   include Sidekiq::Worker
 
-  sidekiq_options retry: 0
+  sidekiq_options retry: 0, lock: :until_executed, lock_ttl: 1.day.to_i
 
   def perform
     PgHero.capture_space_stats
diff --git a/app/workers/scheduler/scheduled_statuses_scheduler.rb b/app/workers/scheduler/scheduled_statuses_scheduler.rb
index 3bf6300b3c..b5801248f2 100644
--- a/app/workers/scheduler/scheduled_statuses_scheduler.rb
+++ b/app/workers/scheduler/scheduled_statuses_scheduler.rb
@@ -3,7 +3,7 @@
 class Scheduler::ScheduledStatusesScheduler
   include Sidekiq::Worker
 
-  sidekiq_options retry: 0
+  sidekiq_options retry: 0, lock: :until_executed, lock_ttl: 1.day.to_i
 
   def perform
     publish_scheduled_statuses!
diff --git a/app/workers/scheduler/suspended_user_cleanup_scheduler.rb b/app/workers/scheduler/suspended_user_cleanup_scheduler.rb
index 87e22161bc..90feead676 100644
--- a/app/workers/scheduler/suspended_user_cleanup_scheduler.rb
+++ b/app/workers/scheduler/suspended_user_cleanup_scheduler.rb
@@ -16,7 +16,7 @@ class Scheduler::SuspendedUserCleanupScheduler
   # has the capacity for it.
   MAX_DELETIONS_PER_JOB = 10
 
-  sidekiq_options retry: 0
+  sidekiq_options retry: 0, lock: :until_executed, lock_ttl: 1.day.to_i
 
   def perform
     return if Sidekiq::Queue.new('pull').size > MAX_PULL_SIZE
diff --git a/app/workers/scheduler/user_cleanup_scheduler.rb b/app/workers/scheduler/user_cleanup_scheduler.rb
index 4aee7935a2..2d2efc731a 100644
--- a/app/workers/scheduler/user_cleanup_scheduler.rb
+++ b/app/workers/scheduler/user_cleanup_scheduler.rb
@@ -3,7 +3,7 @@
 class Scheduler::UserCleanupScheduler
   include Sidekiq::Worker
 
-  sidekiq_options retry: 0
+  sidekiq_options retry: 0, lock: :until_executed, lock_ttl: 1.day.to_i
 
   def perform
     clean_unconfirmed_accounts!
diff --git a/app/workers/scheduler/vacuum_scheduler.rb b/app/workers/scheduler/vacuum_scheduler.rb
index 9c040f6e47..1c9a2aabe3 100644
--- a/app/workers/scheduler/vacuum_scheduler.rb
+++ b/app/workers/scheduler/vacuum_scheduler.rb
@@ -3,7 +3,7 @@
 class Scheduler::VacuumScheduler
   include Sidekiq::Worker
 
-  sidekiq_options retry: 0, lock: :until_executed
+  sidekiq_options retry: 0, lock: :until_executed, lock_ttl: 1.day.to_i
 
   def perform
     vacuum_operations.each do |operation|
diff --git a/config/application.rb b/config/application.rb
index a3bd3dfa4e..2a62c37e8b 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -41,6 +41,8 @@ require_relative '../lib/mastodon/rack_middleware'
 require_relative '../lib/public_file_server_middleware'
 require_relative '../lib/devise/two_factor_ldap_authenticatable'
 require_relative '../lib/devise/two_factor_pam_authenticatable'
+require_relative '../lib/chewy/settings_extensions'
+require_relative '../lib/chewy/index_extensions'
 require_relative '../lib/chewy/strategy/mastodon'
 require_relative '../lib/chewy/strategy/bypass_with_warning'
 require_relative '../lib/webpacker/manifest_extensions'
@@ -49,6 +51,7 @@ require_relative '../lib/rails/engine_extensions'
 require_relative '../lib/active_record/database_tasks_extensions'
 require_relative '../lib/active_record/batches'
 require_relative '../lib/simple_navigation/item_extensions'
+require_relative '../lib/http_extensions'
 
 Dotenv::Railtie.load
 
diff --git a/config/database.yml b/config/database.yml
index d1fd65a0fb..b995f23178 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -15,7 +15,7 @@ development:
     password: <%= (ENV['DB_PASS'] || '').to_json %>
     host: <%= ENV['DB_HOST'] %>
     port: <%= ENV['DB_PORT'] %>
-  read:
+  replica:
     <<: *default
     database: <%= ENV['DB_NAME'] || 'mastodon_development' %>
     username: <%= ENV['DB_USER'] %>
@@ -35,7 +35,7 @@ test:
     password: <%= (ENV['DB_PASS'] || '').to_json %>
     host: <%= ENV['DB_HOST'] %>
     port: <%= ENV['DB_PORT'] %>
-  read:
+  replica:
     <<: *default
     database: <%= ENV['DB_NAME'] || 'mastodon' %>_test<%= ENV['TEST_ENV_NUMBER'] %>
     username: <%= ENV['DB_USER'] %>
@@ -53,12 +53,12 @@ production:
     host: <%= ENV['DB_HOST'] || 'localhost' %>
     port: <%= ENV['DB_PORT'] || 5432 %>
     prepared_statements: <%= ENV['PREPARED_STATEMENTS'] || 'true' %>
-  read:
+  replica:
     <<: *default
-    database: <%= ENV['DB_REPLICA_NAME'] ||ENV['DB_NAME'] || 'mastodon_production' %>
-    username: <%= ENV['DB_REPLICA_USER'] ||ENV['DB_USER'] || 'mastodon' %>
-    password: <%= (ENV['DB_REPLICA_PASS'] || ENV['DB_PASS'] || '').to_json %>
-    host: <%= ENV['DB_REPLICA_HOST'] ||ENV['DB_HOST'] || 'localhost' %>
-    port: <%= ENV['DB_REPLICA_PORT'] ||ENV['DB_PORT'] || 5432 %>
+    database: <%= ENV['REPLICA_DB_NAME'] ||ENV['DB_NAME'] || 'mastodon_production' %>
+    username: <%= ENV['REPLICA_DB_USER'] ||ENV['DB_USER'] || 'mastodon' %>
+    password: <%= (ENV['REPLICA_DB_PASS'] || ENV['DB_PASS'] || '').to_json %>
+    host: <%= ENV['REPLICA_DB_HOST'] ||ENV['DB_HOST'] || 'localhost' %>
+    port: <%= ENV['REPLICA_DB_PORT'] ||ENV['DB_PORT'] || 5432 %>
     prepared_statements: <%= ENV['PREPARED_STATEMENTS'] || 'true' %>
     replica: true
diff --git a/config/initializers/cache_buster.rb b/config/initializers/cache_buster.rb
index 227e450f35..a49fba671b 100644
--- a/config/initializers/cache_buster.rb
+++ b/config/initializers/cache_buster.rb
@@ -6,5 +6,6 @@ Rails.application.configure do
   config.x.cache_buster = {
     secret_header: ENV['CACHE_BUSTER_SECRET_HEADER'],
     secret: ENV['CACHE_BUSTER_SECRET'],
+    http_method: ENV['CACHE_BUSTER_HTTP_METHOD'] || 'GET',
   }
 end
diff --git a/config/initializers/chewy.rb b/config/initializers/chewy.rb
index dc90176213..66008a0009 100644
--- a/config/initializers/chewy.rb
+++ b/config/initializers/chewy.rb
@@ -15,6 +15,9 @@ Chewy.settings = {
   journal: false,
   user: user,
   password: password,
+  index: {
+    number_of_replicas: ['single_node_cluster', nil].include?(ENV['ES_PRESET'].presence) ? 0 : 1,
+  },
 }
 
 # We use our own async strategy even outside the request-response
@@ -25,14 +28,6 @@ Chewy.root_strategy              = :bypass_with_warning if Rails.env.production?
 Chewy.request_strategy           = :mastodon
 Chewy.use_after_commit_callbacks = false
 
-module Chewy
-  class << self
-    def enabled?
-      settings[:enabled]
-    end
-  end
-end
-
 # Elasticsearch uses Faraday internally. Faraday interprets the
 # http_proxy env variable by default which leads to issues when
 # Mastodon is run with hidden services enabled, because
diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb
index 12d8d69341..02943ce091 100644
--- a/config/initializers/paperclip.rb
+++ b/config/initializers/paperclip.rb
@@ -90,13 +90,19 @@ if ENV['S3_ENABLED'] == 'true'
 
   # Some S3-compatible providers might not actually be compatible with some APIs
   # used by kt-paperclip, see https://github.com/mastodon/mastodon/issues/16822
-  if ENV['S3_FORCE_SINGLE_REQUEST'] == 'true'
+  # and https://github.com/mastodon/mastodon/issues/26394
+  if ENV['S3_FORCE_SINGLE_REQUEST'] == 'true' || ENV['S3_DISABLE_CHECKSUM_MODE'] == 'true'
     module Paperclip
       module Storage
         module S3Extensions
           def copy_to_local_file(style, local_dest_path)
             log("copying #{path(style)} to local file #{local_dest_path}")
-            s3_object(style).download_file(local_dest_path, { mode: 'single_request' })
+
+            options = {}
+            options[:mode] = 'single_request' if ENV['S3_FORCE_SINGLE_REQUEST'] == 'true'
+            options[:checksum_mode] = 'DISABLED' if ENV['S3_DISABLE_CHECKSUM_MODE'] == 'true'
+
+            s3_object(style).download_file(local_dest_path, options)
           rescue Aws::Errors::ServiceError => e
             warn("#{e} - cannot copy #{path(style)} to local file #{local_dest_path}")
             false
diff --git a/config/initializers/statsd.rb b/config/initializers/statsd.rb
new file mode 100644
index 0000000000..a655c10716
--- /dev/null
+++ b/config/initializers/statsd.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+if ENV['STATSD_ADDR'].present?
+  host, port = ENV['STATSD_ADDR'].split(':')
+
+  statsd = Statsd.new(host, port)
+  statsd.namespace = ENV.fetch('STATSD_NAMESPACE') { ['Mastodon', Rails.env].join('.') }
+
+  NSA.inform_statsd(statsd) do |informant|
+    informant.collect(:action_controller, :web)
+    informant.collect(:active_record, :db)
+    informant.collect(:active_support_cache, :cache)
+    informant.collect(:sidekiq, :sidekiq) if ENV['STATSD_SIDEKIQ'] == 'true'
+  end
+end
diff --git a/config/locales-glitch/da.yml b/config/locales-glitch/da.yml
index 347c94d5e3..77ec1953ca 100644
--- a/config/locales-glitch/da.yml
+++ b/config/locales-glitch/da.yml
@@ -1 +1,7 @@
+---
 da:
+  appearance:
+    localization:
+      glitch_guide_link_text: Det gælder også glitch-soc!
+  settings:
+    flavours: Varianter
diff --git a/config/locales-glitch/ja.yml b/config/locales-glitch/ja.yml
index 54ebfaeca6..c8c6da1093 100644
--- a/config/locales-glitch/ja.yml
+++ b/config/locales-glitch/ja.yml
@@ -1,10 +1,18 @@
 ---
 ja:
   admin:
+    custom_emojis:
+      batch_copy_error: '選択したいくつかの絵文字のコピー中にエラーが発生しました: %{message}'
+      batch_error: 'エラーが発生しました: %{message}'
     settings:
+      flavour_and_skin:
+        title: フレーバーとスキン
       hide_followers_count:
         desc_html: プロフィールページのフォロワー数を見られないようにします
         title: フォロワー数を隠す
+      other:
+        preamble: 他のカテゴリに該当しない多様なglitch-socの設定。
+        title: その他
       outgoing_spoilers:
         desc_html: トゥートが連合される際、閲覧注意としてマークされていないトゥートにこの警告が追加されます。これはあなたのインスタンスが他のインスタンスに警告をして欲しいとされる投稿に特化している場合に便利です。 メディアは閲覧注意にマークされます。
         title: 発信するトゥートへの警告
@@ -14,6 +22,13 @@ ja:
       show_replies_in_public_timelines:
         desc_html: 自分への公開投稿の返信に加えて、すべての公開投稿の返信をローカルタイムラインと連合タイムラインに表示します。
         title: 公開タイムラインに返信を表示
+      trending_status_cw:
+        desc_html: トレンド投稿が有効な場合、コンテンツワーニング付きの投稿がトレンドに掲載されるのを許可します。この設定の変更は遡及的ではありません。
+        title: 閲覧注意付きの投稿がトレンドに載るのを許可する
+  appearance:
+    localization:
+      glitch_guide_link: https://crowdin.com/project/glitch-soc
+      glitch_guide_link_text: そしてglitch-socへも同様に！
   generic:
     use_this: これを使う
   settings:
diff --git a/config/locales-glitch/simple_form.cs.yml b/config/locales-glitch/simple_form.cs.yml
index 5d50f040a7..ac07d6175f 100644
--- a/config/locales-glitch/simple_form.cs.yml
+++ b/config/locales-glitch/simple_form.cs.yml
@@ -7,14 +7,12 @@ cs:
         setting_default_content_type_markdown: Předpokládat, že nové příspěvky používají pro formátování Markdown, pokud není uvedeno jinak
         setting_default_content_type_plain: Předpokládat, že nové příspěvky nejsou nijak formátované, pokud není uvedeno jinak (standardní chování Mastodonu)
         setting_default_language: Jazyk vašich příspěvků lze detekovat automaticky, ale není to vždycky přesné
-        setting_hide_followers_count: Počet vašich sledujících se nebude nikomu zobrazovat, ani vám. Některé aplikace mohou zobrazit negativní počet sledujících.
         setting_skin: Aplikuje barevný styl na zvolené rozhraní Mastodonu
     labels:
       defaults:
         setting_default_content_type: Výchozí formát příspěvků
         setting_default_content_type_plain: Prostý text
         setting_favourite_modal: Před oblíbením příspěvku zobrazit potvrzovací dialog (pouze pro rozhraní Glitch)
-        setting_hide_followers_count: Skrýt počet vašich sledujících
         setting_skin: Styl
         setting_system_emoji_font: Použít výchozí emoji systému (pouze pro rozhraní Glitch)
       notification_emails:
diff --git a/config/locales-glitch/simple_form.da.yml b/config/locales-glitch/simple_form.da.yml
index 347c94d5e3..c05e9c0129 100644
--- a/config/locales-glitch/simple_form.da.yml
+++ b/config/locales-glitch/simple_form.da.yml
@@ -1 +1,15 @@
+---
 da:
+  simple_form:
+    hints:
+      defaults:
+        setting_show_followers_count: Vis antal følgere på din profil. Hvis du skjuler antallet af følgere, vil det også være skjult for dig selv, og nogle apps kan vise et negativt antal.
+    labels:
+      defaults:
+        setting_default_content_type: Standardformat for indlæg
+        setting_default_content_type_html: HTML
+        setting_default_content_type_markdown: Markdown
+        setting_default_content_type_plain: Simpel tekst
+        setting_favourite_modal: Vis bekræftelsesdialog før favoritmarkering (gælder kun for Glitch-varianten)
+        setting_show_followers_count: Vis antal følgere
+        setting_system_emoji_font: Brug systemets standardskrifttype til emojis (gælder kun for Glitch-varianten)
diff --git a/config/locales-glitch/simple_form.de.yml b/config/locales-glitch/simple_form.de.yml
index 93e97639e6..ff4566b852 100644
--- a/config/locales-glitch/simple_form.de.yml
+++ b/config/locales-glitch/simple_form.de.yml
@@ -8,7 +8,6 @@ de:
         setting_default_content_type_markdown: Beim Schreiben von Toots annehmen, dass sie in Markdown für Rich-Text-Formatierung geschrieben sind, sofern nicht anders angegeben
         setting_default_content_type_plain: Beim Schreiben von Toots annehmen, dass sie in Klartext ohne spezielle Formatierung geschrieben sind, sofern nicht anders angegeben (standardmäßiges Mastodon-Verhalten)
         setting_default_language: Die Sprache deiner Toots kann automatisch erkannt werden, aber sie ist nicht immer korrekt
-        setting_hide_followers_count: Verberge deine Follower-Anzahl vor allen, einschließlich dir. Manche Anwendungen könnten eine negative Follower-Anzahl anzeigen.
         setting_skin: Verändert die ausgewählte Mastodon-Variante
     labels:
       defaults:
@@ -17,7 +16,6 @@ de:
         setting_default_content_type_markdown: Markdown
         setting_default_content_type_plain: Unformatierter Text
         setting_favourite_modal: Bestätigungsdialog vor dem Favorisieren anzeigen (gilt nur für Glitch-Variante)
-        setting_hide_followers_count: Anzahl der Follower verbergen
         setting_skin: Skin
         setting_system_emoji_font: Systemschriftart für Emojis verwenden (nur für Glitch-Variante)
       notification_emails:
diff --git a/config/locales-glitch/simple_form.en.yml b/config/locales-glitch/simple_form.en.yml
index 2507894a8c..9e943133bd 100644
--- a/config/locales-glitch/simple_form.en.yml
+++ b/config/locales-glitch/simple_form.en.yml
@@ -8,7 +8,7 @@ en:
         setting_default_content_type_markdown: When writing toots, assume they are using Markdown for rich text formatting, unless specified otherwise
         setting_default_content_type_plain: When writing toots, assume they are plain text with no special formatting, unless specified otherwise (default Mastodon behavior)
         setting_default_language: The language of your toots can be detected automatically, but it's not always accurate
-        setting_hide_followers_count: Hide your followers count from everybody, including you. Some applications may display a negative followers count.
+        setting_show_followers_count: Show your followers count on your profile. If you hide your followers count, it will be hidden even from yourself, and some applications may display a negative followers count.
         setting_skin: Reskins the selected Mastodon flavour
     labels:
       defaults:
@@ -17,7 +17,7 @@ en:
         setting_default_content_type_markdown: Markdown
         setting_default_content_type_plain: Plain text
         setting_favourite_modal: Show confirmation dialog before favouriting (applies to Glitch flavour only)
-        setting_hide_followers_count: Hide your followers count
+        setting_show_followers_count: Show your followers count
         setting_skin: Skin
         setting_system_emoji_font: Use system's default font for emojis (applies to Glitch flavour only)
       notification_emails:
diff --git a/config/locales-glitch/simple_form.es-AR.yml b/config/locales-glitch/simple_form.es-AR.yml
index ddad4b1d51..491ec7ce8c 100644
--- a/config/locales-glitch/simple_form.es-AR.yml
+++ b/config/locales-glitch/simple_form.es-AR.yml
@@ -8,7 +8,7 @@ es-AR:
         setting_default_content_type_markdown: Al escribir toots, asume que estás usando Markdown para dar formato de texto enriquecido, a menos que se especifique lo contrario
         setting_default_content_type_plain: Al escribir toots, asume que estás usando texto sin formato, a menos que se especifique lo contrario (predeterminado de Mastodon)
         setting_default_language: El idioma de tus toots se puede detectar automáticamente, pero no siempre es correcto
-        setting_hide_followers_count: Ocultar el conteo de seguidores de todos, incluyendo tú. Algunas aplicaciones pueden mostrar un conteo de seguidores negativos.
+        setting_show_followers_count: Mostrá el conteo de tus seguidores en tu perfil. Si ocultás el conteo de tus seguidores, se ocultará incluso a vos mismo, y algunas aplicaciones pueden mostrar un recuento negativo de seguidores.
         setting_skin: Cambia el diseño de la edición seleccionada de Mastodon
     labels:
       defaults:
@@ -17,7 +17,7 @@ es-AR:
         setting_default_content_type_markdown: Markdown
         setting_default_content_type_plain: Sin formato
         setting_favourite_modal: Mostrar diálogo de confirmación antes de marcar como favorito (sólo aplica a la edición Glich)
-        setting_hide_followers_count: Ocultar tu conteo de seguidorxs
+        setting_show_followers_count: Mostrá el conteo de tus seguidores
         setting_skin: Diseño
         setting_system_emoji_font: Usar la fuente predeterminada del sistema para emojis (sólo aplica a la edición Glitch)
       notification_emails:
diff --git a/config/locales-glitch/simple_form.es-MX.yml b/config/locales-glitch/simple_form.es-MX.yml
index 492786c016..39a88a3113 100644
--- a/config/locales-glitch/simple_form.es-MX.yml
+++ b/config/locales-glitch/simple_form.es-MX.yml
@@ -8,7 +8,6 @@ es-MX:
         setting_default_content_type_markdown: Al escribir toots, asume que estás usando Markdown para dar formato de texto enriquecido, a menos que se especifique lo contrario
         setting_default_content_type_plain: Al escribir toots, asume que estás usando texto sin formato, a menos que se especifique lo contrario (predeterminado de Mastodon)
         setting_default_language: El idioma de tus toots se puede detectar automáticamente, pero no siempre es correcto
-        setting_hide_followers_count: Ocultar el conteo de seguidores de todos, incluyendo tú. Algunas aplicaciones pueden mostrar un conteo de seguidores negativos.
         setting_skin: Cambia el diseño de la edición seleccionada de Mastodon
     labels:
       defaults:
@@ -17,7 +16,6 @@ es-MX:
         setting_default_content_type_markdown: Markdown
         setting_default_content_type_plain: Sin formato
         setting_favourite_modal: Mostrar diálogo de confirmación antes de marcar como favorito (sólo aplica a la edición Glich)
-        setting_hide_followers_count: Ocultar tu conteo de seguidorxs
         setting_skin: Diseño
         setting_system_emoji_font: Usar la fuente predeterminada del sistema para emojis (sólo aplica a la edición Glitch)
       notification_emails:
diff --git a/config/locales-glitch/simple_form.es.yml b/config/locales-glitch/simple_form.es.yml
index 1d478b92a5..d817bc7e57 100644
--- a/config/locales-glitch/simple_form.es.yml
+++ b/config/locales-glitch/simple_form.es.yml
@@ -8,7 +8,6 @@ es:
         setting_default_content_type_markdown: Al escribir toots, asume que estás usando Markdown para dar formato de texto enriquecido, a menos que se especifique lo contrario
         setting_default_content_type_plain: Al escribir toots, asume que estás usando texto sin formato, a menos que se especifique lo contrario (predeterminado de Mastodon)
         setting_default_language: El idioma de tus toots se puede detectar automáticamente, pero no siempre es correcto
-        setting_hide_followers_count: Ocultar el conteo de seguidores de todos, incluyendo tú. Algunas aplicaciones pueden mostrar un conteo de seguidores negativos.
         setting_skin: Cambia el diseño de la edición seleccionada de Mastodon
     labels:
       defaults:
@@ -17,7 +16,6 @@ es:
         setting_default_content_type_markdown: Markdown
         setting_default_content_type_plain: Sin formato
         setting_favourite_modal: Mostrar diálogo de confirmación antes de marcar como favorito (sólo aplica a la edición Glich)
-        setting_hide_followers_count: Ocultar tu conteo de seguidorxs
         setting_skin: Diseño
         setting_system_emoji_font: Usar la fuente predeterminada del sistema para emojis (sólo aplica a la edición Glitch)
       notification_emails:
diff --git a/config/locales-glitch/simple_form.fr-QC.yml b/config/locales-glitch/simple_form.fr-QC.yml
index bf3f7c3ede..dd0d4ba31d 100644
--- a/config/locales-glitch/simple_form.fr-QC.yml
+++ b/config/locales-glitch/simple_form.fr-QC.yml
@@ -8,7 +8,7 @@ fr-QC:
         setting_default_content_type_markdown: Vos posts utilisent Markdown pour un formatage de texte enrichi, sauf indication contraire
         setting_default_content_type_plain: Vos posts sont écrits en texte brut sans formatage spécial, sauf indication contraire (comportement par défaut de Mastodon)
         setting_default_language: La langue utilisée pour vos posts peut être automatiquement détectée, cependant cette détection n'est pas toujours fiable
-        setting_hide_followers_count: Cacher votre nombre d'abonné·e·s à tout le monde, y compris vous. Certaines applications peuvent afficher un nombre négatif d'abonné·e·s.
+        setting_show_followers_count: Montrer votre nombre d'abonné·e·s sur votre profil. Si vous cachez votre nombre d'abonné·e·s, il le sera de vous-même également, et certaines applications pourraient indiquer un compte d'abonné·e·s négatif.
         setting_skin: Relooke le mode de Mastodon choisi
     labels:
       defaults:
@@ -17,7 +17,7 @@ fr-QC:
         setting_default_content_type_markdown: Markdown
         setting_default_content_type_plain: Texte brut
         setting_favourite_modal: Afficher une fenêtre de confirmation avant de mettre en favori un post (s'applique uniquement au mode Glitch)
-        setting_hide_followers_count: Cacher votre nombre d'abonné·e·s
+        setting_show_followers_count: Cacher votre nombre d'abonné·e·s
         setting_skin: Thème
         setting_system_emoji_font: Utiliser la police par défaut du système pour les émojis (s'applique uniquement au mode Glitch)
       notification_emails:
diff --git a/config/locales-glitch/simple_form.fr.yml b/config/locales-glitch/simple_form.fr.yml
index 379269feb2..a01d9a5f0f 100644
--- a/config/locales-glitch/simple_form.fr.yml
+++ b/config/locales-glitch/simple_form.fr.yml
@@ -8,7 +8,7 @@ fr:
         setting_default_content_type_markdown: Vos posts utilisent Markdown pour un formatage de texte enrichi, sauf indication contraire
         setting_default_content_type_plain: Vos posts sont écrits en texte brut sans formatage spécial, sauf indication contraire (comportement par défaut de Mastodon)
         setting_default_language: La langue utilisée pour vos posts peut être automatiquement détectée, cependant cette détection n'est pas toujours fiable
-        setting_hide_followers_count: Cacher votre nombre d'abonné·e·s à tout le monde, y compris vous. Certaines applications peuvent afficher un nombre négatif d'abonné·e·s.
+        setting_show_followers_count: Montrer votre nombre d'abonné·e·s sur votre profil. Si vous cachez votre nombre d'abonné·e·s, il le sera de vous-même également, et certaines applications pourraient indiquer un compte d'abonné·e·s négatif.
         setting_skin: Relooke le mode de Mastodon choisi
     labels:
       defaults:
@@ -17,7 +17,7 @@ fr:
         setting_default_content_type_markdown: Markdown
         setting_default_content_type_plain: Texte brut
         setting_favourite_modal: Afficher une fenêtre de confirmation avant de mettre en favori un post (s'applique uniquement au mode Glitch)
-        setting_hide_followers_count: Cacher votre nombre d'abonné·e·s
+        setting_show_followers_count: Cacher votre nombre d'abonné·e·s
         setting_skin: Thème
         setting_system_emoji_font: Utiliser la police par défaut du système pour les émojis (s'applique uniquement au mode Glitch)
       notification_emails:
diff --git a/config/locales-glitch/simple_form.it.yml b/config/locales-glitch/simple_form.it.yml
index 94481ab572..85830635a7 100644
--- a/config/locales-glitch/simple_form.it.yml
+++ b/config/locales-glitch/simple_form.it.yml
@@ -1,9 +1 @@
----
 it:
-  simple_form:
-    hints:
-      defaults:
-        setting_hide_followers_count: Nascondi il numero di seguaci di chiunque, incluso il tuo profilo. Alcune applicazioni potrebbero mostrare un numero negativo di seguaci.
-    labels:
-      defaults:
-        setting_hide_followers_count: Nascondi il tuo numero di seguaci
diff --git a/config/locales-glitch/simple_form.ja.yml b/config/locales-glitch/simple_form.ja.yml
index 558d9da9c3..1137420097 100644
--- a/config/locales-glitch/simple_form.ja.yml
+++ b/config/locales-glitch/simple_form.ja.yml
@@ -1,6 +1,7 @@
 ---
 ja:
   simple_form:
+    glitch_only: glitch-soc
     hints:
       defaults:
         setting_default_content_type_html: トゥートを作成するとき特に指定がない限り生のHTMLで書かれているとします
@@ -11,9 +12,13 @@ ja:
     labels:
       defaults:
         setting_default_content_type: 既定のトゥート形式
+        setting_default_content_type_html: HTML
         setting_default_content_type_markdown: マークダウン
         setting_default_content_type_plain: プレーンテキスト
         setting_favourite_modal: お気に入りをする前に確認ダイアログを表示する
-        setting_hide_followers_count: フォロワー数を隠す
         setting_skin: スキン
         setting_system_emoji_font: 絵文字にシステム既定のフォントを使用する（Glitch Edition フレーバーのみに適用されます）
+      notification_emails:
+        trending_link: 新しいトレンドリンクのレビューが必要
+        trending_status: 新しいトレンド投稿のレビューが必要
+        trending_tag: 新しいトレンドタグにはレビューが必要
diff --git a/config/locales-glitch/simple_form.ko.yml b/config/locales-glitch/simple_form.ko.yml
index c5ebabdc61..f9420f1336 100644
--- a/config/locales-glitch/simple_form.ko.yml
+++ b/config/locales-glitch/simple_form.ko.yml
@@ -8,7 +8,6 @@ ko:
         setting_default_content_type_markdown: 게시물을 작성할 때, 형식을 지정하지 않았다면, 마크다운이라고 가정합니다
         setting_default_content_type_plain: 게시물을 작성할 때, 형식을 지정하지 않았다면, 일반적인 텍스트라고 가정합니다. (마스토돈의 기본 동작)
         setting_default_language: 작성하는 게시물의 언어는 자동으로 설정될 수 있습니다, 하지만 언제나 정확하지는 않습니다
-        setting_hide_followers_count: 나를 포함해서 모든 사람들에게서 내 팔로워 수를 숨깁니다. 몇몇 앱에서는 팔로워 수가 음수로 표시될 수 있습니다.
         setting_skin: 선택한 마스토돈 풍미의 스킨을 바꿉니다
     labels:
       defaults:
@@ -17,7 +16,6 @@ ko:
         setting_default_content_type_markdown: 마크다운
         setting_default_content_type_plain: 일반 텍스트
         setting_favourite_modal: 관심글을 지정할 때 확인 창을 띄웁니다(글리치 풍미에만 적용됨)
-        setting_hide_followers_count: 내 팔로워 수 숨기기
         setting_skin: 스킨
         setting_system_emoji_font: 에모지에 시스템 기본 폰트 적용하기 (글리치 풍미에만 적용됨)
       notification_emails:
diff --git a/config/locales-glitch/simple_form.pl.yml b/config/locales-glitch/simple_form.pl.yml
index e540a06be4..bec84b6429 100644
--- a/config/locales-glitch/simple_form.pl.yml
+++ b/config/locales-glitch/simple_form.pl.yml
@@ -8,7 +8,6 @@ pl:
         setting_default_content_type_markdown: Jeżeli nie powiedziano inaczej, załóż, że wpisy są pisane w Markdown
         setting_default_content_type_plain: Jeżeli nie powiedziano inaczej, załóż, że wpisy zawierają jedynie czysty tekst (domyślne zachowane Mastodonu)
         setting_default_language: Język Twoich wpisów może zostać wykryty automatycznie, aczkolwiek poprawność działania tej fukcji nie jest gwarantowana
-        setting_hide_followers_count: Ukryj ilość Twoich obserwujących przed wszystkimi (równiej przed Tobą). Może to spowodować wyświetlanie ujemnej liczby obserwujących przez niektóre aplikacje.
         setting_skin: Zmienia wygląd używanej odmiany Mastodona
     labels:
       defaults:
@@ -17,7 +16,6 @@ pl:
         setting_default_content_type_markdown: Markdown
         setting_default_content_type_plain: Czysty tekst
         setting_favourite_modal: Pytaj o potwierdzenie przed dodaniem do ulubionych
-        setting_hide_followers_count: Ukryj liczbę Twoich obserwujących
         setting_skin: Motyw
         setting_system_emoji_font: Użyj systemowej czcionki emotikon (tylko w wypadku odmiany „Glitch”)
       notification_emails:
diff --git a/config/locales-glitch/simple_form.pt-BR.yml b/config/locales-glitch/simple_form.pt-BR.yml
index 3c677d0977..be3e215f40 100644
--- a/config/locales-glitch/simple_form.pt-BR.yml
+++ b/config/locales-glitch/simple_form.pt-BR.yml
@@ -8,7 +8,6 @@ pt-BR:
         setting_default_content_type_markdown: Ao escrever toots, assume que ele está usando Markdown para formatação de texto, a menos que especificado seja diferente
         setting_default_content_type_plain: Ao escrever toots, assume que eles são textos simples sem formatação especial, a menos que esteja especificado de outra forma (comportamento padrão do Mastodon)
         setting_default_language: O idioma dos seus toots pode ser detectado automaticamente, mas nem sempre é preciso
-        setting_hide_followers_count: Ocultar a contagem de seguidores de todos, incluindo você. Algumas aplicações podem exibir uma contagem de seguidores negativa.
         setting_skin: Reaplica o sabor Mastodon selecionado
     labels:
       defaults:
@@ -17,7 +16,6 @@ pt-BR:
         setting_default_content_type_markdown: Markdown
         setting_default_content_type_plain: Texto sem formatação
         setting_favourite_modal: Mostrar diálogo antes de favoritar (aplica-se somente ao sabor Glitch)
-        setting_hide_followers_count: Ocultar sua contagem de seguidores
         setting_skin: Tema
         setting_system_emoji_font: Usar fonte padrão do sistema para emojis (aplica-se somente ao sabor Glitch)
       notification_emails:
diff --git a/config/locales-glitch/simple_form.uk.yml b/config/locales-glitch/simple_form.uk.yml
index 9858072907..dcd932bb17 100644
--- a/config/locales-glitch/simple_form.uk.yml
+++ b/config/locales-glitch/simple_form.uk.yml
@@ -8,7 +8,6 @@ uk:
         setting_default_content_type_markdown: При написанні дмухів вони використовують Markdown для форматування розширеного тексту, якщо не вказано інше
         setting_default_content_type_plain: При написанні дмухів , дмух буде звичайним текстом без спеціального форматування, якщо не вказано інше (поведінка Mastodon за замовчуванням).
         setting_default_language: Мова ваших дмухів може визначатися автоматично, але не завжди точно
-        setting_hide_followers_count: Приховати кількість підписників у всіх, включаючи вас. Деякі застосунки можуть відображати негативну кількість послідовників.
         setting_skin: Відновлює звичайну тему Mastodon
     labels:
       defaults:
@@ -17,7 +16,6 @@ uk:
         setting_default_content_type_markdown: Markdown
         setting_default_content_type_plain: Звичайний текст
         setting_favourite_modal: Показувати діалогове вікно підтвердження перед додаванням до улюблених (стосується лише теми Glitch)
-        setting_hide_followers_count: Приховати кількість підписників
         setting_skin: Тема оформлення
         setting_system_emoji_font: Використовувати типовий системний шрифт для емодзі (застосовується лише до теми Glitch)
       notification_emails:
diff --git a/config/locales-glitch/simple_form.zh-CN.yml b/config/locales-glitch/simple_form.zh-CN.yml
index 9763ce9426..44cb08f5a2 100644
--- a/config/locales-glitch/simple_form.zh-CN.yml
+++ b/config/locales-glitch/simple_form.zh-CN.yml
@@ -8,7 +8,7 @@ zh-CN:
         setting_default_content_type_markdown: 在撰写嘟文时，除非另有指定，假定它们使用 Markdown 进行富文本格式化
         setting_default_content_type_plain: 在撰写嘟文时，除非另有指定，假定它们是没有特殊格式的纯文本（默认的 Mastodon 行为）
         setting_default_language: 你的嘟文语言可以自动检测，但不一定准确
-        setting_hide_followers_count: 对所有人隐藏您的粉丝数，包括您在内。一些应用程序可能显示负粉丝数。
+        setting_show_followers_count: 在您的个人资料页上显示您的粉丝数。如果隐藏了您的粉丝数，即使自己也将无法看到，并且某些应用可能会显示负的粉丝数。
         setting_skin: 更换为所选择的 Mastodon 风格
     labels:
       defaults:
@@ -17,7 +17,7 @@ zh-CN:
         setting_default_content_type_markdown: Markdown
         setting_default_content_type_plain: 纯文本
         setting_favourite_modal: 在点赞嘟文前询问我 (仅限于 Glitch 风格)
-        setting_hide_followers_count: 隐藏你的粉丝数
+        setting_show_followers_count: 显示粉丝数
         setting_skin: 皮肤
         setting_system_emoji_font: 使用系统自带表情 (仅限于 Glitch 风格)
       notification_emails:
diff --git a/config/locales/activerecord.cs.yml b/config/locales/activerecord.cs.yml
index 505828112f..6f4fe86e3f 100644
--- a/config/locales/activerecord.cs.yml
+++ b/config/locales/activerecord.cs.yml
@@ -53,3 +53,7 @@ cs:
             position:
               elevated: nemůže být vyšší než vaše aktuální role
               own_role: nelze změnit s vaší aktuální rolí
+        webhook:
+          attributes:
+            events:
+              invalid_permissions: nelze zahrnout události, k nimž nemáte práva
diff --git a/config/locales/activerecord.ms.yml b/config/locales/activerecord.ms.yml
index 6b84248dec..5f282702f1 100644
--- a/config/locales/activerecord.ms.yml
+++ b/config/locales/activerecord.ms.yml
@@ -53,3 +53,7 @@ ms:
             position:
               elevated: tidak boleh lebih tinggi daripada peranan semasa anda
               own_role: tidak boleh diubah dengan peranan semasa anda
+        webhook:
+          attributes:
+            events:
+              invalid_permissions: tidak boleh memasukkan acara yang anda tidak mempunyai hak untuk melakukannya
diff --git a/config/locales/activerecord.nn.yml b/config/locales/activerecord.nn.yml
index 30afb8b079..a303af6247 100644
--- a/config/locales/activerecord.nn.yml
+++ b/config/locales/activerecord.nn.yml
@@ -53,3 +53,7 @@ nn:
             position:
               elevated: kan ikkje vere høgare enn di noverande rolle
               own_role: kan ikkje endrast med di noverande rolle
+        webhook:
+          attributes:
+            events:
+              invalid_permissions: kan ikkje inkludere hendingar du ikkje har rettar til
diff --git a/config/locales/activerecord.no.yml b/config/locales/activerecord.no.yml
index eb1793ca76..5abe3fdc38 100644
--- a/config/locales/activerecord.no.yml
+++ b/config/locales/activerecord.no.yml
@@ -8,7 +8,7 @@
       user:
         agreement: Tjenesteavtale
         email: E-postadresse
-        locale: Landstandard
+        locale: Språk
         password: Passord
       user/account:
         username: Brukernavn
@@ -24,11 +24,11 @@
         admin/webhook:
           attributes:
             url:
-              invalid: er ikke en gyldig nettadresse
+              invalid: er ikke en gyldig lenke
         doorkeeper/application:
           attributes:
             website:
-              invalid: er ikke en gyldig nettadresse
+              invalid: er ikke en gyldig lenke
         import:
           attributes:
             data:
@@ -53,3 +53,7 @@
             position:
               elevated: kan ikke være høyere enn din nåværende rolle
               own_role: kan ikke endres med din nåværende rolle
+        webhook:
+          attributes:
+            events:
+              invalid_permissions: kan ikke inkludere hendelser du ikke har rettigheter til
diff --git a/config/locales/activerecord.ru.yml b/config/locales/activerecord.ru.yml
index 17b13fc7b4..14f9f61f6c 100644
--- a/config/locales/activerecord.ru.yml
+++ b/config/locales/activerecord.ru.yml
@@ -53,3 +53,7 @@ ru:
             position:
               elevated: не может быть выше, чем ваша текущая роль
               own_role: невозможно изменить с вашей текущей ролью
+        webhook:
+          attributes:
+            events:
+              invalid_permissions: нельзя включать события, к которым у вас нет прав
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index e69f3d708e..5abc5d700f 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -399,6 +399,12 @@ ar:
       confirm_suspension:
         cancel: إلغاء
         confirm: علّق الحساب
+        permanent_action: لن يستعيد رفع الحظر أي بيانات أو علاقات.
+        preamble_html: أنت على وشك تعليق <strong>%{domain}</strong> وجميع نطاقاته الفرعيّة.
+        remove_all_data: ستُحذف كل المحتوى والوسائط وبيانات حسابات هذا النطاق من خادومك.
+        stop_communication: سيتوقّف خادومك عن التواصل مع كل هذه الخادومات.
+        title: تأكيد حظر نطاق %{domain}
+        undo_relationships: سيتم التراجع عن أي علاقات متابعة ما بين الحسابات على هذه الخادومات وخادومك.
       created_msg: إنّ حجب النطاق حيز التشغيل
       destroyed_msg: تم إلغاء الحجب المفروض على النطاق
       domain: النطاق
@@ -779,6 +785,7 @@ ar:
           approved: طلب الموافقة لازم عند إنشاء حساب
           none: لا أحد يمكنه إنشاء حساب
           open: يمكن للجميع إنشاء حساب
+      title: إعدادات الخادم
     site_uploads:
       delete: احذف الملف الذي تم تحميله
       destroyed_msg: تم حذف التحميل مِن الموقع بنجاح!
@@ -1039,6 +1046,7 @@ ar:
       back: العودة
       invited_by: 'يمكنك الانضمام إلى %{domain} بفضل الدعوة التي تلقيتها من:'
       preamble: يتم تعيين هذه القوانين وفرضها من قبل مشرفي %{domain}.
+      preamble_invited: قبل المتابعة، يرجى قراءة القواعد الأساسية التي وضعها مشرفو %{domain}.
       title: بعض القواعد الأساسية.
       title_invited: لقد تلقيت دعوة.
     security: الأمان
@@ -1142,8 +1150,8 @@ ar:
   domain_validator:
     invalid_domain: ليس بإسم نطاق صالح
   edit_profile:
+    basic_information: معلومات أساسية
     other: أخرى
-    safety_and_privacy: الأمان والخصوصية
   errors:
     '400': الطلب الذي قدمته غير صالح أو أنّ شكله غير سليم.
     '403': ليس لك الصلاحيات الكافية لعرض هذه الصفحة.
@@ -1264,12 +1272,17 @@ ar:
       overwrite: إعادة الكتابة
       overwrite_long: استبدال التسجيلات الحالية بالجديدة
     preface: بإمكانك استيراد بيانات قد قُمتَ بتصديرها مِن مثيل خادم آخَر، كقوائم المستخدِمين الذين كنتَ تتابِعهم أو قُمتَ بحظرهم.
+    states:
+      finished: تم
+      in_progress: قيد الإنجاز
     success: تم تحميل بياناتك بنجاح وسيتم معالجتها في الوقت المناسب
+    type: نوع الاستيراد
     types:
       blocking: قائمة المحظورين
       bookmarks: الفواصل المرجعية
       domain_blocking: قائمة النطاقات المحظورة
       following: قائمة المستخدمين المتبوعين
+      lists: القوائم
       muting: قائمة الكتم
     upload: تحميل
   invites:
@@ -1315,6 +1328,7 @@ ar:
   mail_subscriptions:
     unsubscribe:
       complete: إلغاء الاشتراك
+      title: إلغاء الاشتراك
   media_attachments:
     validations:
       images_and_video: ليس بالإمكان إرفاق فيديو في منشور يحتوي مسبقا على صور
@@ -1430,6 +1444,7 @@ ar:
       expired: لقد انتهى استطلاع الرأي
       invalid_choice: خيار التصويت الذي قُمتَ يتحديده غير موجود
       over_character_limit: لا يمكن أن يكون أطول من %{max} حرف لكل واحد
+      self_vote: لا يمكنك التصويت في استطلاعاتك الخاصة
       too_few_options: يجب أن يحتوي على أكثر من عنصر واحد
       too_many_options: لا يمكنه أن يحتوي أكثر مِن %{max} عناصر
   preferences:
@@ -1748,12 +1763,15 @@ ar:
       title: أهلاً بك، %{name}!
   users:
     follow_limit_reached: لا يمكنك متابعة أكثر مِن %{limit} أشخاص
+    go_to_sso_account_settings: انتقل إلى إعدادات حساب مزود الهوية الخاص بك
     invalid_otp_token: رمز المصادقة بخطوتين غير صالح
     otp_lost_help_html: إن فقدتَهُما ، يمكنك الاتصال بـ %{email}
     seamless_external_login: لقد قمت بتسجيل الدخول عبر خدمة خارجية، إنّ إعدادات الكلمة السرية و البريد الإلكتروني غير متوفرة.
     signed_in_as: 'تم تسجيل دخولك بصفة:'
   verification:
+    here_is_how: إليك كيف ذلك
     verification: التحقق
+    verified_links: روابطك التي تم التحقق منها
   webauthn_credentials:
     add: إضافة مفتاح أمان جديد
     create:
diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index 4bcbd554c7..598cb73325 100644
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -528,8 +528,6 @@ ast:
       your_appeal_approved: Aprobóse la to apellación
       your_appeal_pending: Unviesti una apellación
       your_appeal_rejected: Refugóse la to apellación
-  edit_profile:
-    safety_and_privacy: Seguranza ya privacidá
   errors:
     '400': La solicitú qu'unviesti nun yera válida o yera incorreuta.
     '403': Nun tienes permisu pa ver esta páxina.
diff --git a/config/locales/be.yml b/config/locales/be.yml
index bb08532bab..849299fc95 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -798,6 +798,7 @@ be:
           approved: Для рэгістрацыі патрабуецца пацвярджэнне
           none: Нікому не магчыма зарэгістравацца
           open: Любому магчыма зарэгістравацца
+      title: Налады сервера
     site_uploads:
       delete: Выдаліць запампаваны файл
       destroyed_msg: Загрузка сайту паспяхова выдалена!
@@ -1175,7 +1176,6 @@ be:
     basic_information: Асноўная інфармацыя
     hint_html: "<strong>Наладзьце тое, што людзі будуць бачыць у вашым профілі і побач з вашымі паведамленнямі.</strong> Іншыя людзі з большай верагоднасцю будуць сачыць і ўзаемадзейнічаць з вамі, калі ў вас ёсць запоўнены профіль і фота профілю."
     other: Іншае
-    safety_and_privacy: Бяспека і прыватнасць
   errors:
     '400': Запыт, які вы адправілі, памылковы або няправільны.
     '403': У вас няма дазволу на прагляд гэтай старонкі.
@@ -1314,12 +1314,14 @@ be:
       bookmarks_html: Вы збіраецеся <strong>замяніць свае закладкі</strong> на <strong>%{total_items} допісаў</strong> з файла <strong>%{filename}</strong>.
       domain_blocking_html: Вы збіраецеся <strong>замяніць свой спіс блакіроўкі даменаў</strong> на <strong>%{total_items} даменаў</strong> з файла <strong>%{filename}</strong>.
       following_html: Вы збіраецеся <strong>падпісацца</strong> на <strong>%{total_items} уліковых запісаў</strong> з файла <strong>%{filename}</strong> і <strong> адпісацца ад усіх іншых карыстальнікаў</strong>.
+      lists_html: Вы збіраецеся <strong>замяніць свае спісы</strong> змесцівам з <strong>%{filename}</strong>. Да <strong>%{total_items} уліковых запісаў</strong> будуць дададзены ў новыя спісы.
       muting_html: Вы збіраецеся <strong>замяніць свой спіс ігнараваных уліковых запісаў</strong> на <strong>%{total_items} уліковых запісаў</strong> з файла <strong>%{filename}</strong>.
     preambles:
       blocking_html: Вы збіраецеся <strong>заблакіраваць</strong> да <strong>%{total_items} уліковых запісаў</strong> з файла<strong>%{filename}</strong>.
       bookmarks_html: Вы збіраецеся дадаць да <strong>%{total_items} паведамленняў</strong> з файла <strong>%{filename}</strong> у вашы <strong>закладкі</strong>.
       domain_blocking_html: Вы збіраецеся <strong>заблакіраваць</strong> да <strong>%{total_items} даменаў</strong> з файла <strong>%{filename}</strong>.
       following_html: Вы збіраецеся <strong>падпісацца </strong> на<strong>%{total_items} уліковых запісаў</strong> з файла <strong>%{filename}</strong>.
+      lists_html: Вы збіраецеся дадаць да <strong>%{total_items} уліковых запісаў</strong> з <strong>%{filename}</strong> у вашы <strong>спісы</strong>. Новыя спісы будуць створаны, калі іх няма.
       muting_html: Вы збіраецеся <strong>ігнараваць</strong> да <strong>%{total_items} уліковых запісаў</strong> з файла <strong>%{filename}</strong>.
     preface: Вы можаце імпартаваць даныя, экспартаваныя вамі з іншага сервера, напрыклад, спіс людзей, на якіх вы падпісаны або якіх блакуеце.
     recent_imports: Нядаўнія імпарты
@@ -1336,6 +1338,7 @@ be:
       bookmarks: Імпарт закладак
       domain_blocking: Імпарт заблакіраваных даменаў
       following: Імпарт падпісаных уліковых запісаў
+      lists: Імпартаванне спісаў
       muting: Імпарт ігнараваных уліковых запісаў
     type: Тып імпарту
     type_groups:
@@ -1346,6 +1349,7 @@ be:
       bookmarks: Закладкі
       domain_blocking: Спіс заблакіраваных даменаў
       following: Падпіскі
+      lists: Спісы
       muting: Спіс ігнаравання
     upload: Запампаваць
   invites:
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index f16758498f..51860a261a 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -1139,7 +1139,6 @@ bg:
     basic_information: Основна информация
     hint_html: "<strong>Персонализирайте какво хората виждат в обществения ви профил и до публикациите ви.</strong> Другите хора са по-склонни да ви последват и да взаимодействат с вас, когато имате попълнен профил и снимка на профила."
     other: Друго
-    safety_and_privacy: Безопасност и поверителност
   errors:
     '400': Подадохте невалидна или деформирана заявка.
     '403': Нямате позволение да разгледате тази страница.
diff --git a/config/locales/bn.yml b/config/locales/bn.yml
index 84eb59a08e..9637169090 100644
--- a/config/locales/bn.yml
+++ b/config/locales/bn.yml
@@ -5,12 +5,14 @@ bn:
     contact_missing: নেই
     contact_unavailable: প্রযোজ্য নয়
     hosted_on: এই মাস্টাডনটি আছে %{domain} এ
+    title: পরিচিতি
   accounts:
     follow: যুক্ত
     followers:
       one: যুক্ত আছে
       other: যারা যুক্ত হয়েছে
     following: যুক্ত করা
+    instance_actor_flash: এই অ্যাকাউন্টটি একটি ভার্চুয়াল সত্তা যা সার্ভারের প্রতিনিধিত্ব করতে ব্যবহৃত হয় এবং কোনও স্বতন্ত্র ব্যবহারকারী নয়। এটি ফেডারেশনের উদ্দেশ্যে ব্যবহার করা হয় এবং স্থগিত করা উচিত নয়.
     last_active: শেষ সক্রিয় ছিল
     link_verified_on: এই লিংকের মালিকানা শেষ চেক করা হয়  %{date} তারিখে
     nothing_here: এখানে কিছুই নেই!
@@ -31,21 +33,32 @@ bn:
     accounts:
       add_email_domain_block: নিষিদ্ধ করা ই-মেইল ডোমেইন
       approve: অনুমোদন দিন
+      approved_msg: "%{username}-এর অ্যাকাউন্ট সৃষ্টি আবেদন সফলভাবে অনুমোদিত হয়েছে"
       are_you_sure: আপনি কি নিশ্চিত ?
       avatar: অবতার
       by_domain: ওয়েবসাইট/কার্যক্ষেত্র
       change_email:
+        changed_msg: ইমেল সফলভাবে পরিবর্তিত হয়েছে!
         current_email: এখনকার ইমেইল
         label: ইমেইল পরিবর্তন
         new_email: নতুন ইমেইল
         submit: ইমেইল পরিবর্তন
         title: "%{username} এর ইমেইল পরিবর্তন"
+      change_role:
+        changed_msg: ভূমিকা সফলভাবে পরিবর্তিত!
+        label: ভূমিকা পরিবর্তন করুন
+        no_role: কোন ভূমিকা বরাদ্দ করা হয়নি
+        title: "%{username}-এর ভূমিকা পরিবর্তন করুন"
       confirm: নিশ্চিত করুন
       confirmed: নিশ্চিত হয়েছে
       confirming: নিশ্চিত করা হচ্ছে
+      custom: বিশেষ
+      delete: ডেটা মুছুন
       deleted: মুছে ফেলা হয়েছে
       demote: নিচের পদে দিন
+      destroyed_msg: "%{username}-এর ডেটা এখন সারিবদ্ধভাবে মুছে ফেলা হবে"
       disable: বন্ধ করুন
+      disable_sign_in_token_auth: ই-মেইল টোকেন প্রমাণীকরণ অক্ষম করুন
       disable_two_factor_authentication: দুই পদ্ধতির প্রমাণীকরণ(2FA) বন্ধ করুন
       disabled: বন্ধ করা হয়েছে
       display_name: দেখানোর জন্য নাম
@@ -54,11 +67,14 @@ bn:
       email: ইমেইল
       email_status: ইমেইলের অবস্থা
       enable: চালু করুন
+      enable_sign_in_token_auth: ই-মেইল টোকেন প্রমাণীকরণ সক্ষম করুন
       enabled: চালু করুন
+      enabled_msg: "%{username}-এর অ্যাকাউন্ট সফলভাবে আনফ্রোজ করা হয়েছে"
       followers: অনুসরকারীরা
       follows: অনুসরণ করে
       header: শিরোলেখা
       inbox_url: চিঠি পাওয়ার বক্স লিংক
+      invite_request_text: যোগদানের কারণ
       invited_by: আমন্ত্রণ করেছে
       ip: আইপি(IP)
       joined: যোগ দিয়েছে
diff --git a/config/locales/br.yml b/config/locales/br.yml
index d2c24cb383..24d934fdeb 100644
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -289,8 +289,10 @@ br:
     view_status: Gwelet ar c'hannad
   auth:
     delete_account: Dilemel ar gont
+    delete_account_html: Ma fell deoc'h dilemel ho kont e c'hellit <a href="%{path}">klikañ amañ</a>. Goulennet e vo ganeoc'h kadarnaat an obererezh.
     login: Mont tre
     logout: Digennaskañ
+    migrate_account_html: Ma fell deoc'h adkas ar gont-mañ war-zu unan all e c'hellit <a href="%{path}">arventenniñ an dra-se amañ</a>.
     providers:
       cas: CAS
       saml: SAML
@@ -390,6 +392,8 @@ br:
     table:
       uses: Implijoù
     title: Pediñ tud
+  migrations:
+    incoming_migrations_html: Evit dilojañ ur gont all da homañ e rankit <a href="%{path}">sevel un alias</a> da gentañ.
   moderation:
     title: Habaskadur
   notification_mailer:
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 519670864b..ef66280cc7 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -448,7 +448,7 @@ ca:
       no_file: No s'ha seleccionat cap fitxer
     export_domain_blocks:
       import:
-        description_html: Estàs a punt d'importar una llista de dominis blocats. Si us plau, revisa aquesta llista amb molta cura, especialment si no l'has creada tu mateix.
+        description_html: Esteu a punt d'importar una llista de dominis blocats. Reviseu aquesta llista amb molta cura, especialment si no l'heu creada vós mateix.
         existing_relationships_warning: Relacions de seguiment existents
         private_comment_description_html: 'Per a ajudar-te a fer un seguiment d''on provenen els bloquejos importats, es crearan amb el següent comentari privat: <q>%{comment}</q>'
         private_comment_template: Importar des de %{source} el %{date}
@@ -458,7 +458,7 @@ ca:
         title: Importa dominis bloquejats
       no_file: No s'ha seleccionat cap fitxer
     follow_recommendations:
-      description_html: "<strong>Seguir les recomanacions ajuda als nous usuaris a trobar ràpidament contingut interessant</strong>. Quan un usuari no ha interactuat prou amb d'altres com per a formar a qui seguir personalment, aquests comptes li seran recomanats. Es recalculen a diari a partir d'una barreja de comptes amb els compromisos recents més alts i el nombre més alt de seguidors locals per a un idioma determinat."
+      description_html: "<strong>Seguir les recomanacions ajuda als nous usuaris a trobar ràpidament contingut interessant</strong>. Quan un usuari no ha interactuat prou amb altres per a formar a qui seguir personalment, aquests comptes li seran recomanats. Es recalculen diàriament a partir d'una barreja de comptes amb els compromisos recents més alts i el nombre més alt de seguidors locals per a un idioma determinat."
       language: Per idioma
       status: Estat
       suppress: Suprimeix les recomanacions de seguiment
@@ -813,9 +813,9 @@ ca:
       appeal_rejected: Apel·lació rebutjada
     system_checks:
       database_schema_check:
-        message_html: Hi ha pendents migracions de la base de dades. Si us plau executa-les per a assegurar que l'aplicació es comporta com s'espera
+        message_html: Hi ha pendents migracions de la base de dades. Executeu-les per a assegurar que l'aplicació es comporta com s'espera
       elasticsearch_running_check:
-        message_html: No s'ha pogut connectar a Elasticsearch. Si us plau verifica que estigui funcionant o desactiva la cerca de text complet
+        message_html: No s'ha pogut connectar a Elasticsearch. Verifiqueu que funciona o desactiveu la cerca de text complet
       elasticsearch_version_check:
         message_html: 'Versió incompatible de Elasticsearch: %{value}'
         version_comparison: Elasticsearch %{running_version} està funcionant mentre %{required_version} és requerida
@@ -823,7 +823,7 @@ ca:
         action: Gestiona les normes del servidor
         message_html: No has definit cap norma del servidor.
       sidekiq_process_check:
-        message_html: No hi ha cap procés de Sidekiq executant-se per a la cua (o cues) de %{value}. Si us plau revisa la teva configuració de Sidekiq
+        message_html: No hi ha cap procés de Sidekiq executant-se per a la cua (o cues) de %{value}. Reviseu la configuració de Sidekiq
       upload_check_privacy_error:
         action: Consulta aquí per a més informació
         message_html: "<strong>El teu servidor no està ben configurat. La privacitat dels teus usuaris està en risc.</strong>"
@@ -1094,7 +1094,7 @@ ca:
     proceed: Elimina el compte
     success_msg: El compte s'ha eliminat correctament
     warning:
-      before: 'Abans de procedir si us plau llegeix amb cura aquestes notes:'
+      before: 'Abans de procedir, llegiu amb cura aquestes notes:'
       caches: El contingut que ha estat memoritzat en la memòria cau per altres servidors pot persistir
       data_removal: Els teus tuts i altres dades seran permanentment eliminades
       email_change_html: Pots <a href="%{path}">canviar la teva adreça de correu electrònic</a> sense eliminar el teu compte
@@ -1140,7 +1140,6 @@ ca:
     basic_information: Informació bàsica
     hint_html: "<strong>Personalitza el que la gent veu en el teu perfil públic i a prop dels teus tuts..</strong> És més probable que altres persones et segueixin i interaccionin amb tu quan tens emplenat el teu perfil i amb la teva imatge."
     other: Altres
-    safety_and_privacy: Seguretat i privacitat
   errors:
     '400': La sol·licitud que vas emetre no era vàlida o no era correcta.
     '403': No tens permís per a veure aquesta pàgina.
@@ -1244,7 +1243,7 @@ ca:
     today: avui
     validation_errors:
       one: Alguna cosa no va bé! Si us plau, revisa l'error
-      other: Alguna cosa no va bé! Si us plau, revisa %{count} errors més a baix
+      other: Alguna cosa no va bé! Reviseu els %{count} errors següents
   imports:
     errors:
       empty: Fitxer CSV buit
@@ -1366,7 +1365,7 @@ ca:
     cancelled_msg: Redirecció cancel·lada amb èxit.
     errors:
       already_moved: és el mateix compte al que ja t'has mogut
-      missing_also_known_as: no fa referencia a aquest compte
+      missing_also_known_as: no fa referència a aquest compte
       move_to_self: no pot ser el compte actual
       not_found: podria no ser trobat
       on_cooldown: Estàs en temps de refredament
@@ -1383,7 +1382,7 @@ ca:
     set_redirect: Ajusta la redirecció
     warning:
       backreference_required: El compte nou primer ha de ser configurat per a referenciar aquest
-      before: 'Abans de procedir si us plau llegeix amb cura aquestes notes:'
+      before: 'Abans de procedir, llegiu amb cura aquestes notes:'
       cooldown: Després de moure't hi ha un període de recuperació durant el qual no seràs capaç de moure't un altre cop
       disabled_account: El teu compte actual no serà plenament utilitzable després. Tanmateix, tindràs accés a exportació de dades així com reactivació.
       followers: Aquesta acció mourà tots els seguidors des de l'actual al compte nou
@@ -1791,5 +1790,5 @@ ca:
     nickname_hint: Introdueix el sobrenom de la teva clau de seguretat nova
     not_enabled: Encara no has activat WebAuthn
     not_supported: Aquest navegador no suporta claus de seguretat
-    otp_required: Per emprar claus de seguretat si us plau activa primer l'autenticació de dos factors.
+    otp_required: Per a usar claus de seguretat, activeu primer l'autenticació de dos factors.
     registered_on: Registrat en %{date}
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 7cb2ba2225..c866d7e386 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -845,7 +845,7 @@ cy:
       language: Iaith
       media:
         title: Cyfryngau
-      metadata: Metaddata
+      metadata: Metadata
       no_status_selected: Heb newid postiad gan na ddewiswyd dim un
       open: Agor postiad
       original_status: Postiad gwreiddiol
@@ -1049,7 +1049,7 @@ cy:
     notification_preferences: Newid gosodiadau e-bost
     salutation: "%{name},"
     settings: 'Newid gosodiadau e-bost: %{link}'
-    unsubscribe: Datdanysgrifio
+    unsubscribe: Dad-danysgrifio
     view: 'Gweld:'
     view_profile: Gweld proffil
     view_status: Gweld postiad
@@ -1212,7 +1212,6 @@ cy:
     basic_information: Gwybodaeth Sylfaenol
     hint_html: "<strong>Addaswch yr hyn y mae pobl yn ei weld ar eich proffil cyhoeddus ac wrth ymyl eich postiadau.</strong> Mae pobl eraill yn fwy tebygol o'ch dilyn yn ôl a rhyngweithio â chi pan fydd gennych broffil wedi'i lenwi a llun proffil."
     other: Arall
-    safety_and_privacy: Diogelwch a phreifatrwydd
   errors:
     '400': Roedd y cais a gyflwynwyd gennych yn annilys neu wedi'i gamffurfio.
     '403': Nid oes gennych ganiatâd i weld y dudalen hon.
@@ -1321,7 +1320,7 @@ cy:
       other: Mae pob un o'r <strong>%{count}</strong> eitem sy'n cyfateb i'ch chwiliad wedi'u dewis.
       two: Mae pob un o'r <strong>%{count}</strong> eitem sy'n cyfateb i'ch chwiliad wedi'u dewis.
       zero: Does <strong>%{count}</strong> o eitemau sy'n cyfateb i'ch chwiliad wedi'u dewis.
-    cancel: Diddymu
+    cancel: Canslo
     changes_saved_msg: Llwyddwyd i gadw'r newidiadau!
     confirm: Cadarnhau
     copy: Copïo
@@ -1365,12 +1364,14 @@ cy:
       bookmarks_html: Rydych ar fin <strong>amnewid eich nodau tudalen</strong> gyda hyd at <strong>%{total_items} o bostiadau</strong> gan <strong>%{filename}</strong> .
       domain_blocking_html: Rydych ar fin <strong>amnewid eich rhestr rhwystro parth</strong> gyda hyd at <strong>%{total_items} parth</strong> o <strong>%{filename}</strong> .
       following_html: Rydych ar fin <strong>dilyn</strong> hyd at <strong>%{total_items} o gyfrifon</strong> o <strong>%{filename}</strong> a <strong>pheidio a ddilyn unrhyw un arall</strong> .
+      lists_html: Rydych ar fin <strong>amnewid eich rhestrau</strong> gyda chynnwys <strong>%{filename}</strong> . Bydd hyd at <strong>%{total_items} o gyfrifon</strong> yn cael eu hychwanegu at restrau newydd.
       muting_html: Rydych ar fin <strong>amnewid eich rhestr o gyfrifon tawel</strong> gyda hyd at <strong>%{total_items} o gyfrifon</strong> o <strong>%{filename}</strong> .
     preambles:
       blocking_html: Rydych ar fin <strong>rhwystro</strong> hyd at <strong>%{total_items} o gyfrifon</strong> o <strong>%{filename}</strong> .
       bookmarks_html: Rydych ar fin ychwanegu hyd at <strong>%{total_items} o bostiadau</strong> o <strong>%{filename}</strong> at eich <strong>nodau tudalen</strong> .
       domain_blocking_html: Rydych ar fin <strong>rhwystro</strong> hyd at <strong>%{total_items} parth</strong> o <strong>%{filename}</strong> .
       following_html: Rydych ar fin <strong>dilyn</strong> hyd at <strong>%{total_items} cyfrif</strong> gan <strong>%{filename}</strong> .
+      lists_html: Rydych ar fin ychwanegu hyd at <strong>%{total_items} o gyfrifon</strong> o <strong>%{filename}</strong> at eich <strong>rhestrau</strong> . Bydd rhestrau newydd yn cael eu creu os nad oes rhestr i ychwanegu ati.
       muting_html: Rydych ar fin <strong>tewi</strong> hyd at <strong>%{total_items} cyfrif</strong> o <strong>%{filename}</strong> .
     preface: Gallwch fewnforio data rydych chi wedi'i allforio o weinydd arall, fel rhestr o'r bobl rydych chi'n eu dilyn neu'n eu blocio.
     recent_imports: Mewnforion diweddar
@@ -1387,6 +1388,7 @@ cy:
       bookmarks: Mewnforio nodau tudalen
       domain_blocking: Mewnforio parthau sydd wedi'u rhwystro
       following: Mewnforio cyfrifon yn cael eu dilyn
+      lists: Mewnforio rhestrau
       muting: Mewnforio cyfrifon wedi'u tewi
     type: Math o fewnforion
     type_groups:
@@ -1397,6 +1399,7 @@ cy:
       bookmarks: Llyfrnodau
       domain_blocking: Rhestr rhwystro parth
       following: Rhestr ddilynion
+      lists: Rhestrau
       muting: Rhestr tewi
     upload: Llwytho
   invites:
@@ -1453,7 +1456,7 @@ cy:
           reblog: e-bost hysbysu hybu
       resubscribe_html: Os ydych wedi dad-danysgrifio trwy gamgymeriad, gallwch ail-danysgrifio o'ch <a href="%{settings_path}">gosodiadau hysbysiadau e-bost</a> .
       success_html: Os nad ydych bellach yn derbyn %{type} Mastodon %{domain} i'ch e-bost %{email}.
-      title: Datdanysgrifio
+      title: Dad-danysgrifio
   media_attachments:
     validations:
       images_and_video: Methu atodi fideo i bostiad sydd eisoes yn cynnwys delweddau
@@ -1679,7 +1682,7 @@ cy:
     migrate: Mudo cyfrif
     notifications: Hysbysiadau
     preferences: Dewisiadau
-    profile: Proffil
+    profile: Proffil cyhoeddus
     relationships: Yn dilyn a dilynwyr
     statuses_cleanup: Dileu postiadau'n awtomatig
     strikes: Rhybuddion cymedroli
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 0ffc3a51a6..db55defae7 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -1140,7 +1140,6 @@ da:
     basic_information: Oplysninger
     hint_html: "<strong>Tilpas hvad folk ser på din offentlige profil og ved siden af dine indlæg.</strong> Andre personer vil mere sandsynligt følge dig tilbage og interagere med dig, når du har en udfyldt profil og et profilbillede."
     other: Andre
-    safety_and_privacy: Sikkerhed og privatliv
   errors:
     '400': Din indsendte anmodning er ugyldig eller fejlbehæftet.
     '403': Du har ikke tilladelse til at se denne side.
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 9b9d9eea65..79a1051c65 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -58,7 +58,7 @@ de:
       demote: Zurückstufen
       destroyed_msg: Daten von %{username} wurden zum Löschen in die Warteschlange eingereiht
       disable: Einfrieren
-      disable_sign_in_token_auth: Zwei-Faktor-Authentisierung (2FA) per E-Mail deaktivieren
+      disable_sign_in_token_auth: E-Mail-Token-Authentisierung deaktivieren
       disable_two_factor_authentication: Zwei-Faktor-Authentisierung (2FA) deaktivieren
       disabled: Eingefroren
       display_name: Anzeigename
@@ -67,7 +67,7 @@ de:
       email: E-Mail-Adresse
       email_status: Status der E-Mail-Adresse
       enable: Freischalten
-      enable_sign_in_token_auth: Zwei-Faktor-Authentisierung (2FA) per E-Mail aktivieren
+      enable_sign_in_token_auth: E-Mail-Token-Authentisierung aktivieren
       enabled: Freigegeben
       enabled_msg: Konto von %{username} erfolgreich freigegeben
       followers: Follower
@@ -200,10 +200,10 @@ de:
         destroy_user_role: Rolle entfernen
         disable_2fa_user: 2FA deaktivieren
         disable_custom_emoji: Eigenes Emoji deaktivieren
-        disable_sign_in_token_auth_user: Zwei-Faktor-Authentisierung (2FA) per E-Mail für diesen Account deaktivieren
+        disable_sign_in_token_auth_user: E-Mail-Token-Authentisierung für dieses Konto deaktivieren
         disable_user: Benutzer*in deaktivieren
         enable_custom_emoji: Eigenes Emoji aktivieren
-        enable_sign_in_token_auth_user: Zwei-Faktor-Authentisierung (2FA) per E-Mail für diesen Account aktivieren
+        enable_sign_in_token_auth_user: E-Mail-Token-Authentisierung für dieses Konto aktivieren
         enable_user: Benutzer*in aktivieren
         memorialize_account: Gedenkkonto
         promote_user: Benutzer*in hochstufen
@@ -229,10 +229,10 @@ de:
         update_status: Beitrag aktualisieren
         update_user_role: Rolle bearbeiten
       actions:
-        approve_appeal_html: "%{name} genehmigte die Moderationsbeschlüsse von %{target}"
+        approve_appeal_html: "%{name} hat den Einspruch gegen eine Moderationsentscheidung von %{target} genehmigt"
         approve_user_html: "%{name} genehmigte die Registrierung von %{target}"
         assigned_to_self_report_html: "%{name} wies sich die Meldung %{target} selbst zu"
-        change_email_user_html: "%{name} hat die E-Mail-Adresse von %{target} geändert"
+        change_email_user_html: "%{name} änderte die E-Mail-Adresse von %{target}"
         change_role_user_html: "%{name} hat die Rolle von %{target} geändert"
         confirm_user_html: "%{name} bestätigte die E-Mail-Adresse von %{target}"
         create_account_warning_html: "%{name} sendete eine Warnung an %{target}"
@@ -259,14 +259,14 @@ de:
         destroy_user_role_html: "%{name} löschte die Rolle %{target}"
         disable_2fa_user_html: "%{name} deaktivierte die Zwei-Faktor-Authentisierung für %{target}"
         disable_custom_emoji_html: "%{name} deaktivierte das Emoji %{target}"
-        disable_sign_in_token_auth_user_html: "%{name} hat die E-Mail-Token-Authentisierung für %{target} deaktiviert"
+        disable_sign_in_token_auth_user_html: "%{name} deaktivierte die E-Mail-Token-Authentisierung für %{target}"
         disable_user_html: "%{name} deaktivierte den Zugang für %{target}"
         enable_custom_emoji_html: "%{name} aktivierte das Emoji %{target}"
-        enable_sign_in_token_auth_user_html: "%{name} hat die E-Mail-Token-Authentifizierung für %{target} aktiviert"
+        enable_sign_in_token_auth_user_html: "%{name} hat die E-Mail-Token-Authentisierung für %{target} aktiviert"
         enable_user_html: "%{name} aktivierte den Zugang für %{target}"
         memorialize_account_html: "%{name} wandelte das Konto von %{target} in eine Gedenkseite um"
         promote_user_html: "%{name} beförderte %{target}"
-        reject_appeal_html: "%{name} hat den Moderations-Beschlussantrag von %{target} abgelehnt"
+        reject_appeal_html: "%{name} hat den Einspruch gegen eine Moderationsentscheidung von %{target} abgelehnt"
         reject_user_html: "%{name} hat die Registrierung von %{target} abgelehnt"
         remove_avatar_user_html: "%{name} entfernte das Profilbild von %{target}"
         reopen_report_html: "%{name} öffnete die Meldung %{target} wieder"
@@ -348,20 +348,20 @@ de:
       interactions: Interaktionen
       media_storage: Medien
       new_users: neue Profile
-      opened_reports: ungelöste Meldungen
+      opened_reports: eingereichte Meldungen
       pending_appeals_html:
         one: "<strong>%{count}</strong> ausstehender Einspruch"
         other: "<strong>%{count}</strong> ausstehende Einsprüche"
       pending_reports_html:
-        one: "<strong>%{count}</strong> ausstehende Meldung"
-        other: "<strong>%{count}</strong> ausstehende Meldungen"
+        one: "<strong>%{count}</strong> offene Meldung"
+        other: "<strong>%{count}</strong> offene Meldungen"
       pending_tags_html:
-        one: "<strong>%{count}</strong> ausstehender Hashtag"
-        other: "<strong>%{count}</strong> ausstehende Hashtags"
+        one: "<strong>%{count}</strong> ungeprüfter Hashtag"
+        other: "<strong>%{count}</strong> ungeprüfte Hashtags"
       pending_users_html:
         one: "<strong>%{count}</strong> unerledigte*r Benutzer*in"
         other: "<strong>%{count}</strong> unerledigte Benutzer*innen"
-      resolved_reports: erledigte Meldungen
+      resolved_reports: geklärte Meldungen
       software: Programme
       sources: Registrierungsort
       space: Speicherplatz
@@ -386,7 +386,7 @@ de:
         cancel: Abbrechen
         confirm: Sperren
         permanent_action: Das Aufheben der Sperre wird keine Daten oder Beziehungen wiederherstellen.
-        preamble_html: Du bist dabei, <strong>%{domain}</strong> und alle Subdomains zu sperren.
+        preamble_html: Du bist dabei, <strong>%{domain}</strong> und seine Subdomains zu sperren.
         remove_all_data: Alle Inhalte, Medien und Profildaten werden für die Konten dieser Domain von deinem Server entfernt.
         stop_communication: Dein Server wird nicht länger mit diesen Servern kommunizieren.
         title: Sperre für Domain %{domain} bestätigen
@@ -501,7 +501,7 @@ de:
         instance_follows_measure: deren Follower hier
         instance_languages_dimension: Häufigste Sprachen
         instance_media_attachments_measure: deren Medien hier im Cache
-        instance_reports_measure: Meldungen zu deren Accounts
+        instance_reports_measure: Meldungen zu deren Konten
         instance_statuses_measure: deren Beiträge hier im Cache
       delivery:
         all: Alle
@@ -591,8 +591,8 @@ de:
         resolve_description_html: Es wird keine Maßnahme gegen das gemeldete Konto ergriffen und der Vorgang wird nicht aufgezeichnet – die Meldung wird hiermit geschlossen.
         silence_description_html: Das Konto wird nur für diejenigen sichtbar sein, die dem Konto bereits folgen oder es manuell suchen, was die Reichweite stark einschränkt. Kann jederzeit rückgängig gemacht werden. Alle Meldungen zu diesem Konto werden geschlossen.
         suspend_description_html: Das Konto und alle Inhalte werden unzugänglich und ggf. gelöscht. Eine Interaktion mit dem Konto wird unmöglich. Dies kann innerhalb von 30 Tagen rückgängig gemacht werden. Alle Meldungen zu diesem Konto werden geschlossen.
-      actions_description_html: Entscheide, welche Maßnahmen zur Lösung dieses Berichts zu ergreifen sind. Wenn du eine Strafmaßnahme gegen das gemeldete Konto ergreifst, wird eine E-Mail-Benachrichtigung an diese gesendet, außer wenn die <strong>Spam</strong>-Kategorie ausgewählt ist.
-      actions_description_remote_html: Entscheide, welche Maßnahmen du zur Lösung dieser Meldungen ergreifen möchtest. Dies wirkt sich lediglich darauf aus, wie <strong>dein</strong> Server mit diesem externen Konto kommuniziert und dessen Inhalt handhabt.
+      actions_description_html: Entscheide, welche Maßnahmen du zum Klären dieser Meldung ergreifen möchtest. Wenn du eine Strafmaßnahme gegen das gemeldete Konto ergreifst, wird eine E-Mail-Benachrichtigung an dieses gesendet, außer wenn die <strong>Spam</strong>-Kategorie ausgewählt ist.
+      actions_description_remote_html: Entscheide, welche Maßnahmen du zum Klären dieser Meldung ergreifen möchtest. Dies wirkt sich lediglich darauf aus, wie <strong>dein</strong> Server mit diesem externen Konto kommuniziert und dessen Inhalt handhabt.
       add_to_report: Meldung ergänzen
       are_you_sure: Bist du dir sicher?
       assign_to_self: Mir zuweisen
@@ -610,31 +610,31 @@ de:
       delete_and_resolve: Beiträge löschen
       forwarded: Weitergeleitet
       forwarded_to: Weitergeleitet an %{domain}
-      mark_as_resolved: Als gelöst markieren
+      mark_as_resolved: Als geklärt markieren
       mark_as_sensitive: Mit einer Inhaltswarnung versehen
-      mark_as_unresolved: Als ungelöst markieren
+      mark_as_unresolved: Als ungeklärt markieren
       no_one_assigned: Niemand
       notes:
         create: Notiz hinzufügen
-        create_and_resolve: Mit Notiz wieder lösen
+        create_and_resolve: Mit Notiz als geklärt markieren
         create_and_unresolve: Mit Notiz wieder öffnen
         delete: Löschen
         placeholder: Bitte beschreibe, welche Maßnahmen bzw. Sanktionen ergriffen worden sind, und führe alles auf, was es Erwähnenswertes zu diesem Profil zu berichten gibt …
         title: Notizen
       notes_description_html: Notiz an dich und andere Moderator*innen hinterlassen
-      processed_msg: 'Meldung #%{id} erfolgreich bearbeitet'
-      quick_actions_description_html: 'Eine schnelle Aktion ausführen oder nach unten rolle, um gemeldete Inhalte zu sehen:'
+      processed_msg: Meldung Nr. %{id} erfolgreich bearbeitet
+      quick_actions_description_html: 'Führe eine schnelle Aktion aus oder scrolle nach unten, um gemeldete Inhalte zu sehen:'
       remote_user_placeholder: das externe Profil von %{instance}
       reopen: Meldung wieder eröffnen
       report: "%{id}. Meldung"
       reported_account: Gemeldetes Konto
       reported_by: Gemeldet von
-      resolved: Gelöst
+      resolved: Geklärt
       resolved_msg: Meldung erfolgreich geklärt!
       skip_to_actions: Zur Maßnahme springen
       status: Status
       statuses: Gemeldeter Inhalt
-      statuses_description_html: Störende Inhalte werden in der Kommunikation mit dem gemeldeten Konto zitiert
+      statuses_description_html: Beanstandete Inhalte werden in der Kommunikation mit dem gemeldeten Konto erwähnt
       summary:
         action_preambles:
           delete_html: 'Du bist dabei, einige Beiträge von <strong>@%{acct}</strong> zu <strong>entfernen</strong>. Dies wird:'
@@ -642,22 +642,22 @@ de:
           silence_html: 'Du bist dabei, das Konto von <strong>@%{acct}</strong> <strong>einzuschränken</strong>. Dies wird:'
           suspend_html: 'Du bist dabei, das Konto von <strong>@%{acct}</strong> zu <strong>sperren</strong>. Dies wird:'
         actions:
-          delete_html: Die anstößigen Beiträge entfernen
-          mark_as_sensitive_html: Medien der anstößigen Beiträge mit einer Inhaltswarnung versehen
+          delete_html: Die beanstandeten Beiträge entfernen
+          mark_as_sensitive_html: Medien der beanstandeten Beiträge mit einer Inhaltswarnung versehen
           silence_html: Schränkt die Reichweite von <strong>@%{acct}</strong> stark ein, indem das Profil und dessen Inhalte nur für Personen sichtbar sind, die dem Profil bereits folgen oder es manuell aufrufen
           suspend_html: "<strong>@%{acct}</strong> sperren, sodass das Profil und dessen Inhalte nicht mehr zugänglich sind und keine Interaktion mehr möglich ist"
-        close_report: Meldung Nr. %{id} als erledigt markieren
-        close_reports_html: "<strong>Alle</strong> Meldungen gegen <strong>@%{acct}</strong> als erledigt markieren"
-        delete_data_html: Das Profil und die Inhalte von <strong>@%{acct}</strong> werden in 30 Tagen gelöscht, es sei denn, sie werden in der Zwischenzeit entsperrt
+        close_report: Meldung Nr. %{id} als geklärt markieren
+        close_reports_html: "<strong>Alle</strong> Meldungen gegen <strong>@%{acct}</strong> als geklärt markieren"
+        delete_data_html: Das Profil und die Inhalte von <strong>@%{acct}</strong> in 30 Tagen löschen, es sei denn, das Konto wird in der Zwischenzeit entsperrt
         preview_preamble_html: "<strong>@%{acct}</strong> wird eine Warnung mit folgenden Inhalten erhalten:"
-        record_strike_html: Einen Verstoß gegen <strong>@%{acct}</strong> eintragen, um bei zukünftigen Verstößen desselben Kontos besser reagieren zu können
-        send_email_html: "<strong>@%{acct}</strong> eine Verwarnung per E-Mail senden"
-        warning_placeholder: Optional zusätzliche Begründung für die Moderationsmaßnahme.
+        record_strike_html: Einen Verstoß gegen <strong>@%{acct}</strong> vermerken, um bei zukünftigen Verstößen desselben Kontos besser reagieren zu können
+        send_email_html: "<strong>@%{acct}</strong> eine Warnung per E-Mail senden"
+        warning_placeholder: "(Optional) Zusätzliche Begründung für die Moderationsaktion."
       target_origin: Domain des gemeldeten Kontos
       title: Meldungen
       unassign: Zuweisung aufheben
       unknown_action_msg: 'Unbekannte Aktion: %{action}'
-      unresolved: Ungelöst
+      unresolved: Ungeklärt
       updated_at: Aktualisiert
       view_profile: Profil anzeigen
     roles:
@@ -706,7 +706,7 @@ de:
         manage_rules_description: Erlaubt es Benutzer*innen, Serverregeln zu ändern
         manage_settings: Einstellungen verwalten
         manage_settings_description: Erlaubt Nutzer*innen, Einstellungen dieses Servers zu ändern
-        manage_taxonomies: Taxonomien verwalten
+        manage_taxonomies: Hashtags verwalten
         manage_taxonomies_description: Ermöglicht Benutzer*innen, die Trends zu überprüfen und die Hashtag-Einstellungen zu aktualisieren
         manage_user_access: Kontozugriff verwalten
         manage_user_access_description: Erlaubt es Benutzer*innen, die Zwei-Faktor-Authentisierung (2FA) anderer zu deaktivieren, ihre E-Mail-Adresse zu ändern und ihr Passwort zurückzusetzen
@@ -754,7 +754,7 @@ de:
         preamble: Das Auffinden interessanter Inhalte ist wichtig, um neue Nutzer einzubinden, die Mastodon noch nicht kennen. Bestimme, wie verschiedene Suchfunktionen auf deinem Server funktionieren.
         profile_directory: Profilverzeichnis
         public_timelines: Öffentliche Timeline
-        publish_discovered_servers: Publish discovered servers
+        publish_discovered_servers: Entdeckte Server offenlegen
         publish_statistics: Statistiken veröffentlichen
         title: Entdecken
         trends: Trends
@@ -804,7 +804,7 @@ de:
         delete_statuses: "%{name} entfernte die Beiträge von %{target}"
         disable: "%{name} fror das Konto von %{target} ein"
         mark_statuses_as_sensitive: "%{name} hat die Beiträge von %{target} mit einer Inhaltswarnung versehen"
-        none: "%{name} sendete eine Warnung an %{target}"
+        none: "%{name} hat eine Warnung an %{target} gesendet"
         sensitive: "%{name} versah das Konto von %{target} mit einer Inhaltswarnung"
         silence: "%{name} schaltete das Konto von %{target} stumm"
         suspend: "%{name} sperrte das Konto von %{target}"
@@ -846,7 +846,7 @@ de:
         disallow_provider: Herausgeber*in verbieten
         no_link_selected: Keine Links wurden geändert, da keine ausgewählt wurden
         publishers:
-          no_publisher_selected: Keine Herausgeber wurden geändert, da keine ausgewählt wurden
+          no_publisher_selected: Keine Herausgeber*innen wurden geändert, da keine ausgewählt wurden
         shared_by_over_week:
           one: In den vergangenen 7 Tagen von einem Profil geteilt
           other: In den vergangenen 7 Tagen von %{count} Profilen geteilt
@@ -874,16 +874,16 @@ de:
           other: "%{friendly_count}-mal geteilt oder favorisiert"
         title: Angesagte Beiträge
       tags:
-        current_score: Aktuelle Punktzahl %{score}
+        current_score: 'Aktueller Score: %{score}'
         dashboard:
-          tag_accounts_measure: eindeutige Verwendungen
+          tag_accounts_measure: Profile
           tag_languages_dimension: Häufigste Sprachen
           tag_servers_dimension: Aktivste Server
-          tag_servers_measure: verschiedene Server
-          tag_uses_measure: Gesamtnutzungen
+          tag_servers_measure: Server
+          tag_uses_measure: insgesamt
         description_html: Diese Hashtags werden derzeit in vielen Beiträgen verwendet, die dein Server sieht. Dies kann deinen Nutzer*innen helfen, herauszufinden, worüber die Leute im Moment am meisten schreiben. Hashtags werden erst dann öffentlich angezeigt, wenn du sie genehmigst.
         listable: Kann vorgeschlagen werden
-        no_tag_selected: Keine Tags wurden geändert, da keine ausgewählt wurden
+        no_tag_selected: Keine Hashtags wurden geändert, da keine ausgewählt wurden
         not_listable: Wird nicht vorgeschlagen
         not_trendable: Wird in den Trends nicht angezeigt
         not_usable: Kann nicht verwendet werden
@@ -894,8 +894,8 @@ de:
         usable: Darf verwendet werden
         usage_comparison: Heute %{today}-mal und gestern %{yesterday}-mal verwendet
         used_by_over_week:
-          one: In der letzten Woche von einem Profil verwendet
-          other: In der letzten Woche von %{count} Profilen verwendet
+          one: In den vergangenen 7 Tagen von einem Profil verwendet
+          other: In den vergangenen 7 Tagen von %{count} Profilen verwendet
       title: Trends
       trending: Angesagt
     warning_presets:
@@ -934,16 +934,16 @@ de:
         sensitive: das Markieren des Kontos mit einer Inhaltswarnung
         silence: das Beschränken des Kontos
         suspend: um deren Konto zu sperren
-      body: "%{target} hat etwas gegen eine Moderationsentscheidung von %{action_taken_by} vom %{date}, die %{type} war. Die Person schrieb:"
-      next_steps: Du kannst dem Einspruch zustimmen, womit die Entscheidung der Moderation rückgängig gemacht wird, oder ihn ignorieren.
-      subject: "%{username} hat Einspruch gegen eine Moderationsentscheidung von %{instance} eingelegt"
+      body: "%{target} erhebt Einspruch gegen eine Moderationsentscheidung von %{action_taken_by} vom %{date} (%{type}). Folgendes wurde geschrieben:"
+      next_steps: Du kannst dem Einspruch zustimmen, um die Moderationsentscheidung rückgängig zu machen, oder ihn ignorieren.
+      subject: "%{username} hat Einspruch gegen eine Moderationsentscheidung auf %{instance} erhoben"
     new_pending_account:
       body: Die Details von diesem neuem Konto sind unten. Du kannst die Anfrage akzeptieren oder ablehnen.
       subject: Neues Konto zur Überprüfung auf %{instance} verfügbar (%{username})
     new_report:
       body: "%{reporter} hat %{target} gemeldet"
       body_remote: Jemand von %{domain} hat %{target} gemeldet
-      subject: Neue Meldung auf %{instance} (#%{id})
+      subject: Neue Meldung auf %{instance} (Nr. %{id})
     new_trends:
       body: 'Die folgenden Einträge müssen überprüft werden, bevor sie öffentlich angezeigt werden können:'
       new_trending_links:
@@ -959,9 +959,9 @@ de:
     add_new: Alias erstellen
     created_msg: Neuer Alias erfolgreich erstellt. Du kannst nun den Umzug vom alten zum neuen Konto starten.
     deleted_msg: Der Alias wurde erfolgreich entfernt. Aus jenem Konto zu diesem zu verschieben, ist nicht mehr möglich.
-    empty: Du hast keine Aliase.
-    hint_html: Wenn du von einem anderen Konto auf dieses umziehen möchtest, dann kannst du hier einen Alias erstellen, der erforderlich ist, um deine Follower vom alten Konto auf dieses zu migrieren. Diese Aktion ist <strong>harmlos und wi­der­ruf­lich</strong>. <strong>Die Kontenmigration wird vom alten Konto aus eingeleitet</strong>.
-    remove: Alle Aliase aufheben
+    empty: Du hast keine Aliasse.
+    hint_html: Wenn du von einem anderen Konto auf dieses umziehen möchtest, dann kannst du hier einen Alias erstellen, der erforderlich ist, um deine Follower vom alten Konto auf dieses zu migrieren. Diese Aktion ist <strong>harmlos und wi­der­ruf­lich</strong>. <strong>Der Kontoumzug wird vom alten Konto aus eingeleitet</strong>.
+    remove: Alle Aliasse aufheben
   appearance:
     advanced_web_interface: Erweitertes Webinterface
     advanced_web_interface_hint: Wenn du mehr aus deiner Bildschirmbreite herausholen möchtest, kannst du mit dem erweiterten Webinterface weitere Spalten hinzufügen und dadurch mehr Informationen auf einmal sehen, z. B. deine Startseite, die Mitteilungen, die föderierte Timeline sowie beliebig viele deiner Listen und Hashtags.
@@ -1000,7 +1000,7 @@ de:
     delete_account: Konto löschen
     delete_account_html: Falls du dein Konto endgültig löschen möchtest, kannst du das <a href="%{path}">hier vornehmen</a>. Du musst dies zusätzlich bestätigen.
     description:
-      prefix_invited_by_user: "@%{name} lädt dich ein, diesem Server von Mastodon beizutreten!"
+      prefix_invited_by_user: "@%{name} lädt dich ein, diesem Mastodon-Server beizutreten!"
       prefix_sign_up: Registriere dich noch heute bei Mastodon!
       suffix: Mit einem Konto kannst du Profilen folgen, neue Beiträge veröffentlichen, Nachrichten mit Personen von jedem Mastodon-Server austauschen und vieles mehr!
     didnt_get_confirmation: Keinen Bestätigungslink erhalten?
@@ -1050,7 +1050,7 @@ de:
     sign_up:
       manual_review: Registrierungen für den Server %{domain} werden manuell durch unsere Moderator*innen überprüft. Um uns dabei zu unterstützen, schreibe etwas über dich und sage uns, weshalb du ein Konto auf %{domain} anlegen möchtest.
       preamble: Mit einem Konto auf diesem Mastodon-Server kannst du jeder anderen Person im Netzwerk folgen, unabhängig davon, wo ihr Konto registriert ist.
-      title: Okay, lass uns mit %{domain} anfangen.
+      title: Lass uns dein Konto auf %{domain} einrichten.
     status:
       account_status: Kontostatus
       confirming: Auf die Bestätigung deiner E-Mail-Adresse wird gewartet.
@@ -1094,7 +1094,7 @@ de:
     proceed: Konto löschen
     success_msg: Dein Konto wurde erfolgreich gelöscht
     warning:
-      before: 'Bevor du fortfährst, lies bitte diese Punkte sorgfältig durch:'
+      before: 'Bevor du fortfährst, lies bitte diese Hinweise sorgfältig durch:'
       caches: Inhalte, die von anderen Servern zwischengespeichert wurden, können fortbestehen
       data_removal: Deine Beiträge und alle anderen Daten werden für immer entfernt
       email_change_html: Du kannst <a href="%{path}">deine E-Mail-Adresse ändern</a>, ohne dein Konto zu löschen
@@ -1127,7 +1127,7 @@ de:
         delete_statuses: Beitragsentfernung
         disable: Konto einfrieren
         mark_statuses_as_sensitive: Beiträge mit einer Inhaltswarnung versehen
-        none: Verwarnung
+        none: Warnung
         sensitive: Profil mit einer Inhaltswarnung versehen
         silence: Kontobeschränkung
         suspend: Kontosperre
@@ -1140,7 +1140,6 @@ de:
     basic_information: Allgemeine Informationen
     hint_html: "<strong>Bestimme, was andere auf deinem öffentlichen Profil und neben deinen Beiträgen sehen können.</strong> Wenn du ein Profilbild festlegst und dein Profil vervollständigst, werden andere eher mit dir interagieren und dir folgen."
     other: Andere
-    safety_and_privacy: Sicherheit und Datenschutz
   errors:
     '400': Die Anfrage, die du gestellt hast, war ungültig oder fehlerhaft.
     '403': Dir fehlt die Berechtigung, diese Seite aufzurufen.
@@ -1335,10 +1334,10 @@ de:
       sign_in_token: E-Mail-Sicherheitscode
       webauthn: Sicherheitsschlüssel
     description_html: Wenn du verdächtige Aktivitäten bemerkst, die du nicht verstehst oder zuordnen kannst, solltest du dringend dein Passwort ändern und ungeachtet dessen die Zwei-Faktor-Authentisierung (2FA) aktivieren.
-    empty: Kein Authentisierungsverlauf verfügbar
-    failed_sign_in_html: Fehler beim Anmeldeversuch mit %{method} von %{ip} (%{browser})
-    successful_sign_in_html: Erfolgreiche Anmeldung mit %{method} von %{ip} (%{browser})
-    title: Authentisierungsverlauf
+    empty: Kein Anmeldeverlauf verfügbar
+    failed_sign_in_html: Fehlgeschlagener Anmeldeversuch mit %{method} von %{ip} (%{browser})
+    successful_sign_in_html: Erfolgreiches Anmelden mit %{method} von %{ip} (%{browser})
+    title: Anmeldeverlauf
   mail_subscriptions:
     unsubscribe:
       action: Ja, abbestellen
@@ -1366,7 +1365,7 @@ de:
     cancelled_msg: Die Weiterleitung wurde erfolgreich beendet.
     errors:
       already_moved: ist das gleiche Konto, zu dem du bereits umgezogen bist
-      missing_also_known_as: referenziert nicht zurück auf dieses Konto
+      missing_also_known_as: ist kein Alias für dieses Konto
       move_to_self: darf nicht das aktuelles Konto sein
       not_found: konnte nicht gefunden werden
       on_cooldown: Die Abklingzeit läuft gerade
@@ -1434,8 +1433,8 @@ de:
       subject: "%{name} bearbeitete einen Beitrag"
   notifications:
     email_events: Benachrichtigungen per E-Mail
-    email_events_hint: 'Bitte die Ereignisse auswählen, für die du Benachrichtigungen erhalten möchtest:'
-    other_settings: Weitere Einstellungen
+    email_events_hint: 'Bitte die Ereignisse auswählen, für die du Benachrichtigungen per E-Mail erhalten möchtest:'
+    other_settings: Erweitere Einstellungen
   number:
     human:
       decimal_units:
@@ -1565,7 +1564,7 @@ de:
   settings:
     account: Konto
     account_settings: Kontoeinstellungen
-    aliases: Kontoaliase
+    aliases: Konto-Aliasse
     appearance: Design
     authorized_apps: Autorisierte Anwendungen
     back: Zurück zu Mastodon
@@ -1579,7 +1578,7 @@ de:
     migrate: Kontoumzug
     notifications: Benachrichtigungen
     preferences: Einstellungen
-    profile: Öffentliches Profil
+    profile: Profil
     relationships: Follower und Folge ich
     statuses_cleanup: Automatische Löschung
     strikes: Maßnahmen
@@ -1628,8 +1627,8 @@ de:
     title: "%{name}: „%{quote}“"
     visibilities:
       direct: Direktnachricht
-      private: Nur eigene Follower
-      private_long: Nur für deine eigenen Follower sichtbar
+      private: Nur Follower
+      private_long: Nur für deine Follower sichtbar
       public: Öffentlich
       public_long: Für alle sichtbar
       unlisted: Nicht gelistet
@@ -1643,8 +1642,8 @@ de:
     ignore_reblogs: Geteilte Beiträge ignorieren
     interaction_exceptions: Ausnahmen basierend auf Interaktionen
     interaction_exceptions_explanation: Beachte, dass Beiträge nicht gelöscht werden, sobald deine Grenzwerte für Favoriten oder geteilte Beiträge einmal überschritten wurden – auch dann nicht, wenn diese Schwellenwerte mittlerweile nicht mehr erreicht werden.
-    keep_direct: Direktnachrichten behalten
-    keep_direct_hint: Löscht keine deiner privaten Nachrichten
+    keep_direct: Private Nachrichten behalten
+    keep_direct_hint: Löscht keinen deiner Beiträge, die nur für erwähnte Profile sichtbar sind
     keep_media: Beiträge mit Medien behalten
     keep_media_hint: Löscht keinen deiner Beiträge mit Medieninhalten
     keep_pinned: Angeheftete Beiträge behalten
@@ -1728,11 +1727,11 @@ de:
         spam: Spam
         violation: Inhalt verstößt gegen die folgenden Serverregeln
       explanation:
-        delete_statuses: Einige deiner Beiträge wurden als Verstoß gegen eine oder mehrere Serverregeln erkannt und von den Moderator*innen von %{instance} entfernt.
+        delete_statuses: Einige deiner Beiträge haben gegen eine oder mehrere Serverregeln verstoßen und wurden daher von den Moderator*innen von %{instance} entfernt.
         disable: Du kannst dein Konto nicht mehr verwenden, aber dein Profil und deine anderen Daten bleiben erhalten. Du kannst eine Sicherung deiner Daten anfordern, die Kontoeinstellungen ändern oder dein Konto löschen.
-        mark_statuses_as_sensitive: Ein oder mehrere deiner Beiträge wurden von den Moderator*innen von %{instance} mit einer Inhaltswarnung versehen. Das bedeutet, dass Besucher*innen diese Medien in den Beiträgen zunächst antippen müssen, um die Vorschau anzuzeigen. Beim Verfassen der nächsten Beiträge kannst du auch selbst eine Inhaltswarnung für hochgeladene Medien festlegen.
+        mark_statuses_as_sensitive: Ein oder mehrere deiner Beiträge wurden von den Moderator*innen von %{instance} mit einer Inhaltswarnung versehen. Das bedeutet, dass die Medien in den Beiträgen erst angeklickt werden müssen, bevor sie angezeigt werden. Beim Verfassen der nächsten Beiträge kannst du auch selbst eine Inhaltswarnung für hochgeladene Medien festlegen.
         sensitive: Von nun an werden alle deine hochgeladenen Medieninhalte mit einer Inhaltswarnung versehen und hinter einer Warnung versteckt.
-        silence: Du kannst dein Konto weiterhin verwenden, aber nur Personen, die dir bereits folgen, sehen deine Beiträge auf diesem Server. Ebenso kannst du von verschiedenen Entdeckungsfunktionen ausgeschlossen werden. Andere können dir jedoch weiterhin manuell folgen.
+        silence: Du kannst dein Konto weiterhin verwenden, aber nur Personen, die dir bereits folgen, sehen deine Beiträge auf diesem Server. Ebenso kannst du aus verschiedenen Suchfunktionen ausgeschlossen werden. Andere können dir jedoch weiterhin manuell folgen.
         suspend: Du kannst dein Konto nicht mehr verwenden und dein Profil und andere Daten sind nicht mehr verfügbar. Du kannst dich immer noch anmelden, um eine Sicherung deiner Daten anzufordern, bis die Daten innerhalb von 30 Tagen vollständig gelöscht wurden. Allerdings werden wir einige Daten speichern, um zu verhindern, dass du die Sperrung umgehst.
       reason: 'Begründung:'
       statuses: 'Betroffene Beiträge:'
@@ -1770,10 +1769,10 @@ de:
     seamless_external_login: Du bist über einen externen Dienst angemeldet, daher sind Passwort- und E-Mail-Einstellungen nicht verfügbar.
     signed_in_as: 'Angemeldet als:'
   verification:
-    extra_instructions_html: <strong>Tipp:</strong> Der Link auf deiner Website kann unsichtbar sein. Der wichtige Teil ist <code>rel="me"</code>, wodurch das Nachahmen von Personen auf Websites mit nutzergenerierten Inhalten verhindert wird. Du kannst auch ein <code>link</code>-Tag statt <code>a</code> im Header auf der Seite verwenden, jedoch muss der HTML-Code ohne das Ausführen von JavaScript zugänglich sein.
+    extra_instructions_html: <strong>Hinweis:</strong> Der Link auf deiner Website kann unsichtbar sein. Der wichtige Teil ist <code>rel="me"</code>, wodurch das Nachahmen von Personen auf Websites mit nutzergenerierten Inhalten verhindert wird. Du kannst auch ein <code>link</code>-Tag statt <code>a</code> im Header auf der Seite verwenden, jedoch muss der HTML-Code ohne das Ausführen von JavaScript zugänglich sein.
     here_is_how: So funktioniert's
-    hint_html: "<strong>Alle können ihre Identität auf Mastodon verifizieren.</strong> Basierend auf offenen Standards – jetzt und für immer kostenlos. Alles, was du brauchst, ist eine eigene Website. Wenn du von deinem Profil auf diese Website verlinkst, überprüfen wir, ob die Website zu deinem Profil zurückverlinkt und zeigen einen visuellen Hinweis an."
-    instructions_html: Kopiere und füge den untenstehenden Code in das HTML deiner Website ein. Füge anschließend die Adresse deiner Website in ein Zusatzfeld auf deinem Profil hinzu und speichere die Änderungen. Die Zusatzfelder befinden sich im Reiter „Profil bearbeiten“.
+    hint_html: "<strong>Alle können ihre Identität auf Mastodon verifizieren.</strong> Basierend auf offenen Standards – jetzt und für immer kostenlos. Alles, was du brauchst, ist eine eigene Website. Wenn du von deinem Profil auf diese Website verlinkst, überprüfen wir, ob die Website zu deinem Profil zurückverlinkt, und zeigen einen visuellen Hinweis an."
+    instructions_html: Kopiere den unten stehenden Code und füge ihn in das HTML deiner Website ein. Trage anschließend diese Website-Adresse in eines der Felder für die Metadaten deines Profils ein – und speichere die Änderungen.
     verification: Verifizierung
     verified_links: Deine verifizierten Links
   webauthn_credentials:
diff --git a/config/locales/devise.ca.yml b/config/locales/devise.ca.yml
index a724dae193..6ebdafb9ec 100644
--- a/config/locales/devise.ca.yml
+++ b/config/locales/devise.ca.yml
@@ -24,7 +24,7 @@ ca:
         action_with_app: Confirma i torna a %{app}
         explanation: Has creat un compte a %{host} amb aquesta adreça de correu electrònic. Estàs a un sol clic d'activar-lo. Si no ho has fet tu, ignora aquest correu electrònic.
         explanation_when_pending: Has sol·licitat una invitació a %{host} amb aquesta adreça-e. Revisarem la sol·licitud quan la confirmis. Pots iniciar la sessió per canviar els detalls o eliminar el compte, però no pots accedir a la majoria de les funcions fins que s'hagi aprovat. Si es rebutja la sol·licitud, les teves dades s’eliminaran, de manera que no se t’exigirà cap acció més. Si tu no has fet aquesta sol·licitud, ignora aquest correu-e.
-        extra_html: Si us plau, consulta també a <a href="%{terms_path}"> les regles del servidor</a> i a <a href="%{policy_path}"> les nostres condicions de servei</a>.
+        extra_html: Consulteu també a <a href="%{terms_path}"> les regles del servidor</a> i a <a href="%{policy_path}"> les nostres condicions de servei</a>.
         subject: 'Mastodon: Instruccions de confirmació de %{instance}'
         title: Verifica l'adreça-e
       email_changed:
diff --git a/config/locales/devise.de.yml b/config/locales/devise.de.yml
index b63e73a736..722ca01608 100644
--- a/config/locales/devise.de.yml
+++ b/config/locales/devise.de.yml
@@ -82,8 +82,8 @@ de:
       success: Du hast dich erfolgreich mit deinem Konto %{kind} angemeldet.
     passwords:
       no_token: Du kannst diese Seite nur über den Link aus der E-Mail zum Zurücksetzen des Passworts aufrufen. Wenn du einen solchen Link aufgerufen hast, vergewissere dich bitte, dass du die vollständige Adresse aufrufst.
-      send_instructions: Du erhältst in wenigen Minuten eine E-Mail. Darin wird erklärt, wie du dein Passwort zurücksetzen kannst.
-      send_paranoid_instructions: Falls deine E-Mail-Adresse in unserer Datenbank hinterlegt ist, erhältst du in wenigen Minuten eine E-Mail. Darin wird erklärt, wie du dein Passwort zurücksetzen kannst.
+      send_instructions: Du erhältst in wenigen Minuten eine E-Mail, sofern deine Adresse unserer Datenbank bekannt ist. In dieser Nachricht befindet sich ein Link. Wenn du diesen aufrufst, kannst du dein Passwort zurücksetzen. Sollte die E-Mail nicht im Posteingangsordner landen, überprüfe auch deinen Spam-/Junk-Ordner.
+      send_paranoid_instructions: Du erhältst in wenigen Minuten eine E-Mail, sofern deine Adresse unserer Datenbank bekannt ist. In dieser Nachricht befindet sich ein Link. Wenn du diesen aufrufst, kannst du dein Passwort zurücksetzen. Sollte die E-Mail nicht im Posteingangsordner landen, überprüfe auch deinen Spam-/Junk-Ordner.
       updated: Dein Passwort wurde erfolgreich geändert. Du bist jetzt angemeldet.
       updated_not_active: Dein Passwort wurde erfolgreich geändert.
     registrations:
@@ -100,8 +100,8 @@ de:
       signed_in: Erfolgreich angemeldet.
       signed_out: Erfolgreich abgemeldet.
     unlocks:
-      send_instructions: Du erhältst in wenigen Minuten eine E-Mail. Darin wird erklärt, wie du dein Konto entsperren kannst.
-      send_paranoid_instructions: Falls deine E-Mail-Adresse in unserer Datenbank hinterlegt ist, erhältst du in wenigen Minuten eine E-Mail. Darin wird erklärt, wie du dein Konto entsperren kannst.
+      send_instructions: Du erhältst in wenigen Minuten eine E-Mail. Darin wird erklärt, wie du dein Konto entsperren kannst. Sollte die E-Mail nicht im Posteingangsordner landen, überprüfe auch deinen Spam-/Junk-Ordner.
+      send_paranoid_instructions: Falls deine E-Mail-Adresse in unserer Datenbank hinterlegt ist, erhältst du in wenigen Minuten eine E-Mail. Darin wird erklärt, wie du dein Konto entsperren kannst. Sollte die E-Mail nicht im Posteingangsordner landen, überprüfe auch deinen Spam-/Junk-Ordner.
       unlocked: Dein Konto wurde erfolgreich entsperrt. Bitte melde dich an, um fortzufahren.
   errors:
     messages:
diff --git a/config/locales/devise.ms.yml b/config/locales/devise.ms.yml
index c1165e47da..30eceb239d 100644
--- a/config/locales/devise.ms.yml
+++ b/config/locales/devise.ms.yml
@@ -81,17 +81,39 @@ ms:
       failure: Tidak dapat mengesahkan anda daripada %{kind} disebabkan oleh “%{reason}”.
       success: Berjaya disahkan daripada akaun %{kind}.
     passwords:
+      no_token: Anda tidak boleh mengakses halaman ini tanpa datang daripada e-mel tetapan semula kata laluan. Jika anda datang daripada e-mel tetapan semula kata laluan, sila pastikan anda menggunakan URL penuh yang disediakan.
+      send_instructions: Jika alamat e-mel anda wujud dalam pangkalan data kami, anda akan menerima pautan pemulihan kata laluan di alamat e-mel anda dalam beberapa minit. Sila semak folder spam anda jika anda tidak menerima e-mel ini.
+      send_paranoid_instructions: Jika alamat e-mel anda wujud dalam pangkalan data kami, anda akan menerima pautan pemulihan kata laluan di alamat e-mel anda dalam beberapa minit. Sila semak folder spam anda jika anda tidak menerima e-mel ini.
       updated: Kata laluan anda telah berjaya ditukar. Anda telah didaftar masuk.
       updated_not_active: Kata laluan anda telah berjaya ditukar.
     registrations:
       destroyed: Selamat tinggal! Akaun anda telah berjaya dibatalkan. Kami harap berjumpa lagi.
       signed_up: Selamat datang! Anda telah berjaya mendaftar.
       signed_up_but_inactive: Anda telah berjaya mendaftar. Namun, kami tidak dapat mendaftar masuk anda kerana akaun anda belum diaktifkan.
+      signed_up_but_locked: Anda telah berjaya mendaftar. Walau bagaimanapun, kami tidak dapat melog masuk anda kerana akaun anda dikunci.
+      signed_up_but_pending: Mesej dengan pautan pengesahan telah dihantar ke alamat e-mel anda. Selepas anda mengklik pautan, kami akan menyemak permohonan anda. Anda akan dimaklumkan jika ia diluluskan.
+      signed_up_but_unconfirmed: Mesej dengan pautan pengesahan telah dihantar ke alamat e-mel anda. Sila ikuti pautan untuk mengaktifkan akaun anda. Sila semak folder spam anda jika anda tidak menerima e-mel ini.
+      update_needs_confirmation: Anda berjaya mengemas kini akaun anda, tetapi kami perlu mengesahkan alamat e-mel baharu anda. Sila semak e-mel anda dan ikuti pautan pengesahan untuk mengesahkan alamat e-mel baharu anda. Sila semak folder spam anda jika anda tidak menerima e-mel ini.
+      updated: Akaun anda telah berjaya dikemas kini.
     sessions:
       already_signed_out: Daftar keluar berjaya.
       signed_in: Daftar masuk berjaya.
       signed_out: Daftar keluar berjaya.
+    unlocks:
+      send_instructions: Anda akan menerima e-mel dengan arahan tentang cara membuka kunci akaun anda dalam beberapa minit. Sila semak folder spam anda jika anda tidak menerima e-mel ini.
+      send_paranoid_instructions: Jika akaun anda wujud, anda akan menerima e-mel dengan arahan cara membuka kuncinya dalam beberapa minit. Sila semak folder spam anda jika anda tidak menerima e-mel ini.
+      unlocked: Akaun anda telah berjaya dibuka. Sila log masuk untuk meneruskan.
   errors:
     messages:
       already_confirmed: sudah disahkan, sila cuba mendaftar masuk
+      confirmation_period_expired: perlu disahkan dalam %{period}, sila minta yang baharu
+      expired: telah tamat tempoh, sila minta yang baharu
       not_found: tidak dijumpai
+      not_locked: tidak dikunci
+      not_saved:
+        other: |-
+          satu
+          1 ralat melarang %{resource} ini daripada disimpan:
+
+          Lain-lain
+          %{count} ralat melarang %{resource} ini daripada disimpan:
diff --git a/config/locales/devise.vi.yml b/config/locales/devise.vi.yml
index 2139daca75..904cc51fe9 100644
--- a/config/locales/devise.vi.yml
+++ b/config/locales/devise.vi.yml
@@ -14,7 +14,7 @@ vi:
       not_found_in_database: "%{authentication_keys} không có trong dữ liệu."
       pending: Tài khoản của bạn vẫn đang được xem xét.
       timeout: Phiên của bạn đã hết hạn. Vui lòng đăng nhập lại để tiếp tục.
-      unauthenticated: Bạn cần đăng nhập hoặc đăng ký trước khi tiếp tục.
+      unauthenticated: Bạn cần đăng nhập để tiếp tục.
       unconfirmed: Bạn phải xác minh địa chỉ email trước khi tiếp tục.
     mailer:
       confirmation_instructions:
diff --git a/config/locales/doorkeeper.ar.yml b/config/locales/doorkeeper.ar.yml
index a396742d84..8d36a3f06e 100644
--- a/config/locales/doorkeeper.ar.yml
+++ b/config/locales/doorkeeper.ar.yml
@@ -127,6 +127,7 @@ ar:
         bookmarks: الفواصل المرجعية
         conversations: المحادثات
         crypto: التشفير من الطرف إلى نهاية الطرف
+        favourites: المفضلة
         filters: عوامل التصفية
         follow: الإشتراكات والحسابات المكتومة والحسابات المحجوبة
         follows: الإشتراكات
diff --git a/config/locales/doorkeeper.be.yml b/config/locales/doorkeeper.be.yml
index 3166f7b20c..4524dd707e 100644
--- a/config/locales/doorkeeper.be.yml
+++ b/config/locales/doorkeeper.be.yml
@@ -127,6 +127,7 @@ be:
         bookmarks: Закладкі
         conversations: Размовы
         crypto: Скразное шыфраванне
+        favourites: Упадабанае
         filters: Фільтры
         follow: Падпіскі, ігнараванне і блакіроўка
         follows: Падпіскі
@@ -169,6 +170,7 @@ be:
       read:accounts: бачыць інфармацыю аб уліковых запісах
       read:blocks: бачыць свае блакіроўкі
       read:bookmarks: бачыць свае закладкі
+      read:favourites: бачыць сваё упадабанае
       read:filters: бачыць свае фільтры
       read:follows: бачыць свае падпіскі
       read:lists: бачыць свае спісы
@@ -182,6 +184,7 @@ be:
       write:blocks: блакіраваць уліковыя запісы і дамены
       write:bookmarks: закладкі допісаў
       write:conversations: ігнараваць і выдаляць размовы
+      write:favourites: упадабаныя допісы
       write:filters: ствараць фільтры
       write:follows: Сачыць за людзьмі
       write:lists: ствараць спiсы
diff --git a/config/locales/doorkeeper.ca.yml b/config/locales/doorkeeper.ca.yml
index d4c694d587..9706f3db70 100644
--- a/config/locales/doorkeeper.ca.yml
+++ b/config/locales/doorkeeper.ca.yml
@@ -150,11 +150,11 @@ ca:
       admin:read: llegeix totes les dades en el servidor
       admin:read:accounts: llegir informació confidencial de tots els comptes
       admin:read:canonical_email_blocks: llegeix informació sensible de tots els blocs canònics de correu-e
-      admin:read:domain_allows: llegeix informació sensible de tots els dominis permesos
-      admin:read:domain_blocks: llegeix informació sensible de tots els blocs de domini
-      admin:read:email_domain_blocks: llegeix informació sensible de tots els blocs de domini de correu-e
-      admin:read:ip_blocks: llegeix informació sensible de tots els blocs d'IP
-      admin:read:reports: llegir informació confidencial de tots els informes i comptes reportats
+      admin:read:domain_allows: llegeix informació confidencial de tots els dominis permesos
+      admin:read:domain_blocks: llegeix informació confidencial de tots els blocs de domini
+      admin:read:email_domain_blocks: llegeix informació confidencial de tots els blocs de domini de correu-e
+      admin:read:ip_blocks: llegeix informació confidencial de tots els blocs d'IP
+      admin:read:reports: llegeix informació confidencial de tots els informes i comptes reportats
       admin:write: modificar totes les dades en el servidor
       admin:write:accounts: fer l'acció de moderació en els comptes
       admin:write:canonical_email_blocks: executa accions de moderació en blocs canònics de correu-e
diff --git a/config/locales/doorkeeper.cs.yml b/config/locales/doorkeeper.cs.yml
index 49d7acad66..ba2100edfd 100644
--- a/config/locales/doorkeeper.cs.yml
+++ b/config/locales/doorkeeper.cs.yml
@@ -127,6 +127,7 @@ cs:
         bookmarks: Záložky
         conversations: Konverzace
         crypto: End-to-end šifrování
+        favourites: Oblíbené
         filters: Filtry
         follow: Sledování, ztlumení a blokování
         follows: Sledovaní
@@ -169,6 +170,7 @@ cs:
       read:accounts: vidět informace o účtech
       read:blocks: vidět vaše blokace
       read:bookmarks: vidět vaše záložky
+      read:favourites: zobrazit vaše oblíbené
       read:filters: vidět vaše filtry
       read:follows: vidět vaše sledování
       read:lists: vidět vaše seznamy
@@ -182,6 +184,7 @@ cs:
       write:blocks: blokovat účty a domény
       write:bookmarks: přidávat příspěvky do záložek
       write:conversations: skrývat a mazat konverzace
+      write:favourites: oblíbené příspěvky
       write:filters: vytvářet filtry
       write:follows: sledovat lidi
       write:lists: vytvářet seznamy
diff --git a/config/locales/doorkeeper.es-MX.yml b/config/locales/doorkeeper.es-MX.yml
index 76f5eace7c..4d91b74af4 100644
--- a/config/locales/doorkeeper.es-MX.yml
+++ b/config/locales/doorkeeper.es-MX.yml
@@ -127,6 +127,7 @@ es-MX:
         bookmarks: Marcadores
         conversations: Conversaciones
         crypto: Cifrado de extremo a extremo
+        favourites: Favoritos
         filters: Filtros
         follow: Seguimientos, silenciados y bloqueos
         follows: Seguidos
@@ -169,6 +170,7 @@ es-MX:
       read:accounts: ver información de cuentas
       read:blocks: ver a quién has bloqueado
       read:bookmarks: ver tus marcadores
+      read:favourites: ver tus favoritos
       read:filters: ver tus filtros
       read:follows: ver a quién sigues
       read:lists: ver tus listas
@@ -182,6 +184,7 @@ es-MX:
       write:blocks: bloquear cuentas y dominios
       write:bookmarks: guardar estados como marcadores
       write:conversations: silenciar y eliminar conversaciones
+      write:favourites: marcar publicaciones como favoritas
       write:filters: crear filtros
       write:follows: seguir usuarios
       write:lists: crear listas
diff --git a/config/locales/doorkeeper.es.yml b/config/locales/doorkeeper.es.yml
index 0a7382a245..002f813b32 100644
--- a/config/locales/doorkeeper.es.yml
+++ b/config/locales/doorkeeper.es.yml
@@ -127,6 +127,7 @@ es:
         bookmarks: Marcadores
         conversations: Conversaciones
         crypto: Cifrado de extremo a extremo
+        favourites: Favoritos
         filters: Filtros
         follow: Seguimientos, silenciados y bloqueos
         follows: Seguidos
@@ -169,6 +170,7 @@ es:
       read:accounts: ver información de cuentas
       read:blocks: ver a quién has bloqueado
       read:bookmarks: ver tus marcadores
+      read:favourites: ver tus favoritos
       read:filters: ver tus filtros
       read:follows: ver a quién sigues
       read:lists: ver tus listas
@@ -182,6 +184,7 @@ es:
       write:blocks: bloquear cuentas y dominios
       write:bookmarks: guardar publicaciones como marcadores
       write:conversations: silenciar y eliminar conversaciones
+      write:favourites: marcar publicaciones como favoritas
       write:filters: crear filtros
       write:follows: seguir usuarios
       write:lists: crear listas
diff --git a/config/locales/doorkeeper.gd.yml b/config/locales/doorkeeper.gd.yml
index 2541fce889..4db4497b4e 100644
--- a/config/locales/doorkeeper.gd.yml
+++ b/config/locales/doorkeeper.gd.yml
@@ -127,6 +127,7 @@ gd:
         bookmarks: Comharran-lìn
         conversations: Còmhraidhean
         crypto: Crioptachadh o cheann gu ceann
+        favourites: Annsachdan
         filters: Criathragan
         follow: Leantainn, mùchaidhean is bacaidhean
         follows: Leantainn
@@ -146,47 +147,49 @@ gd:
       application:
         title: Tha feum air ùghdarrachadh OAuth
     scopes:
-      admin:read: dàta sam bith a leughadh air an fhrithealaiche
-      admin:read:accounts: fiosrachadh dìomhair air a h-uile cunntas a leughadh
-      admin:read:canonical_email_blocks: fiosrachadh dìomhair air a h-uile bacadh puist-d gnàthach a leughadh
-      admin:read:domain_allows: fiosrachadh dìomhair air a h-uile cead àrainne a leughadh
-      admin:read:domain_blocks: fiosrachadh dìomhair air a h-uile bacadh àrainne a leughadh
-      admin:read:email_domain_blocks: fiosrachadh dìomhair air a h-uile bacadh àrainn puist-d a leughadh
-      admin:read:ip_blocks: fiosrachadh dìomhair air a h-uile bacadh IP a leughadh
-      admin:read:reports: fiosrachadh dìomhair air a h-uile gearan is cunntasan a chaidh a ghearan mun dèidhinn a leughadh
-      admin:write: dàta sam bith atharrachadh air an fhrithealaiche
-      admin:write:accounts: gnìomhan na maorsainneachd a ghabhail air cunntasan
-      admin:write:canonical_email_blocks: gnìomhan na maorsainneachd a ghabhail air bacaidhean puist-d gnàthach
-      admin:write:domain_allows: gnìomhan na maorsainneachd a ghabhail air ceadan àrainn
-      admin:write:domain_blocks: gnìomhan na maorsainneachd a ghabhail air bacaidhean àrainne
-      admin:write:email_domain_blocks: gnìomhan na maorsainneachd a ghabhail air bacaidhean àrainn puist-d
-      admin:write:ip_blocks: gnìomhan na maorsainneachd a ghabhail air bacaidhean IP
-      admin:write:reports: gnìomhan na maorsainneachd a ghabhail air gearanan
-      crypto: crioptachadh o cheann gu ceann a chleachdadh
-      follow: dàimhean chunntasan atharrachadh
-      push: na brathan putaidh agad fhaighinn
-      read: dàta sam bith a’ cunntais agad a leughadh
-      read:accounts: fiosrachadh nan cunntasan fhaicinn
-      read:blocks: na bacaidhean agad fhaicinn
-      read:bookmarks: na comharran-lìn agad fhaicinn
-      read:filters: na criathragan agad fhaicinn
-      read:follows: faicinn cò a tha thu a’ leantainn
-      read:lists: na liostaichean agad fhaicinn
-      read:mutes: na mùchaidhean agad fhaicinn
-      read:notifications: na brathan agad faicinn
-      read:reports: na gearanan agad fhaicinn
-      read:search: lorg a dhèanamh às do leth
-      read:statuses: na postaichean uile fhaicinn
-      write: dàta sam bith a’ cunntais agad atharrachadh
-      write:accounts: a’ phròifil agad atharrachadh
-      write:blocks: cunntasan is àrainnean a bhacadh
-      write:bookmarks: comharran-lìn a dhèanamh de phostaichean
-      write:conversations: còmhraidhean a mhùchadh is a sguabadh às
-      write:filters: criathragan a chruthachadh
+      admin:read: leughadh dàta sam bith air an fhrithealaiche
+      admin:read:accounts: leughadh fiosrachaidh dhìomhair air a h-uile cunntas
+      admin:read:canonical_email_blocks: leughadh fiosrachaidh dhìomhair air a h-uile bacadh puist-d gnàthach
+      admin:read:domain_allows: leughadh fiosrachaidh dhìomhair air a h-uile cead àrainne
+      admin:read:domain_blocks: leughadh fiosrachaidh dhìomhair air a h-uile bacadh àrainne
+      admin:read:email_domain_blocks: leughadh fiosrachaidh dhìomhair air a h-uile bacadh àrainn puist-d
+      admin:read:ip_blocks: leughadh fiosrachaidh dhìomhair air a h-uile bacadh IP
+      admin:read:reports: leughadh fiosrachaidh dhìomhair air a h-uile gearan is cunntasan a chaidh a ghearan mun dèidhinn
+      admin:write: atharrachadh dàta sam bith air an fhrithealaiche
+      admin:write:accounts: gnìomhan na maorsainneachd air cunntasan
+      admin:write:canonical_email_blocks: gnìomhan na maorsainneachd air bacaidhean puist-d gnàthach
+      admin:write:domain_allows: gnìomhan na maorsainneachd air ceadan àrainn
+      admin:write:domain_blocks: gnìomhan na maorsainneachd air bacaidhean àrainne
+      admin:write:email_domain_blocks: gnìomhan na maorsainneachd air bacaidhean àrainn puist-d
+      admin:write:ip_blocks: gnìomhan na maorsainneachd air bacaidhean IP
+      admin:write:reports: gnìomhan na maorsainneachd air gearanan
+      crypto: cleachdadh crioptachaidh o cheann gu ceann
+      follow: atharrachadh dàimhean chunntasan
+      push: faighinn nam brathan putaidh agad
+      read: leughadh dàta sam bith a’ cunntais agad
+      read:accounts: sealltainn fiosrachadh nan cunntasan
+      read:blocks: sealltainn nam bacaidhean agad
+      read:bookmarks: sealltainn nan comharran-lìn agad
+      read:favourites: sealltainn nan annsachdan agad
+      read:filters: sealltainn nan criathragan agad
+      read:follows: sealltainn cò a tha thu a’ leantainn
+      read:lists: sealltainn nan liostaichean agad
+      read:mutes: sealltainn nam mùchaidhean agad
+      read:notifications: sealltainn nam brathan agad
+      read:reports: sealltainn nan gearanan agad
+      read:search: lorg às do leth
+      read:statuses: sealltainn nam postaichean uile
+      write: atharrachadh dàta sam bith a’ cunntais agad
+      write:accounts: atharrachadh na pròifile agad
+      write:blocks: bacadh chunntasan is àrainnean
+      write:bookmarks: cruthachadh chomharran-lìn de phostaichean
+      write:conversations: mùchadh is sguabadh às chòmhraidhean
+      write:favourites: cur phostaichean ris na h-annsachdan
+      write:filters: cruthachadh chriathragan
       write:follows: leantainn dhaoine
-      write:lists: liostaichean a chruthachadh
-      write:media: faidhlichean meadhain a luchdadh suas
-      write:mutes: daoine is còmhraidhean a mhùchadh
-      write:notifications: na brathan agad fhalamhachadh
-      write:reports: gearan a dhèanamh mu chàch
-      write:statuses: postaichean fhoillseachadh
+      write:lists: cruthachadh liostaichean
+      write:media: luchdadh suas fhaidhlichean meadhain
+      write:mutes: mùchadh dhaoine is chòmhraidhean
+      write:notifications: falamhachadh nam brathan agad
+      write:reports: gearan mu chàch
+      write:statuses: foillseachadh phostaichean
diff --git a/config/locales/doorkeeper.ms.yml b/config/locales/doorkeeper.ms.yml
index c8d3043298..32fb0044bb 100644
--- a/config/locales/doorkeeper.ms.yml
+++ b/config/locales/doorkeeper.ms.yml
@@ -4,21 +4,103 @@ ms:
     attributes:
       doorkeeper/application:
         name: Nama aplikasi
+        redirect_uri: Ubah hala URI
+        scopes: Skop
+        website: Laman web permohonan
+    errors:
+      models:
+        doorkeeper/application:
+          attributes:
+            redirect_uri:
+              fragment_present: tidak boleh mengandungi serpihan.
+              invalid_uri: mestilah URI yang sah.
+              relative_uri: mestilah URI mutlak.
+              secured_uri: mestilah URI HTTPS/SSL.
   doorkeeper:
     applications:
       buttons:
+        authorize: Benarkan
         cancel: Batal
+        destroy: Musnah
         edit: Sunting
         submit: Hantar
       confirmations:
         destroy: Anda pasti?
+      edit:
+        title: Mengedit permohonan
+      form:
+        error: Alamak! Semak borang anda untuk kemungkinan kesilapan
+      help:
+        native_redirect_uri: Gunakan %{native_redirect_uri} untuk ujian tempatan
+        redirect_uri: Gunakan satu barisan setiap URI
+        scopes: Asingkan skop dengan ruang. Biarkan kosong untuk menggunakan skop lalai.
       index:
+        application: Aplikasi
+        callback_url: URL callback
         delete: Padam
+        empty: Anda tidak mempunyai aplikasi.
         name: Nama
+        new: Aplikasi baru
+        scopes: Skop
         show: Paparkan
+        title: Aplikasi anda
+      new:
+        title: Aplikasi baru
+      show:
+        actions: Tindakan
+        application_id: Kunci klien
+        callback_urls: URLs Callback
+        scopes: Skop
+        secret: Rahsia klien
+        title: 'Aplikasi: %{name}'
+    authorizations:
+      buttons:
+        authorize: Benarkan
+        deny: Nafikan
+      error:
+        title: Ralat telah berlaku
+      new:
+        prompt_html: "%{client_name} ingin mendapatkan kebenaran untuk mengakses akaun anda. Ia adalah aplikasi pihak ketiga. <strong>Jika anda tidak mempercayainya, maka anda tidak seharusnya membenarkannya.</strong>"
+        review_permissions: Semak kebenaran
+        title: Kebenaran diperlukan
+      show:
+        title: Salin kod kebenaran ini dan tampalkannya pada aplikasi.
     authorized_applications:
+      buttons:
+        revoke: Batalkan
+      confirmations:
+        revoke: Adakah anda pasti?
       index:
+        authorized_at: Dibenarkan on %{date}
+        description_html: Ini adalah aplikasi yang boleh mengakses akaun lalui kegunaan API. Jika terdapat aplikasi yang anda tidak kenali di sini, atau aplikasi tidak berfungsi, anda boleh membatalkan aksesnya.
+        last_used_at: Terakhir digunakan pada %{date}
+        never_used: Tidak pernah digunakan
+        scopes: Kebenaran
         superapp: Dalaman
+        title: Aplikasi anda your dibenarkan
+    errors:
+      messages:
+        access_denied: Pemilik sumber atau server kebenaran menolak permintaan.
+        credential_flow_not_configured: Carian Pemilik Sumber gagal kerana Doorkeeper.configure.resource_owner_authenticator tidak dikonfigurasikan.
+        invalid_client: Pengesahan pelanggan gagal disebabkan oleh pelanggan yang tidak diketahui, tiada pengesahan pelanggan disertakan atau kaedah pengesahan yang tidak disokong.
+        invalid_grant: Pemberian kebenaran yang diberikan adalah tidak sah, tamat tempoh, dibatalkan, tidak sepadan dengan URI pengalihan yang digunakan dalam permintaan kebenaran atau telah dikeluarkan kepada klien lain.
+        invalid_redirect_uri: Uri ubah hala yang disertakan tidak sah.
+        invalid_request:
+          missing_param: 'Parameter yang diperlukan hilang: %{value}.'
+          request_not_authorized: Permintaan perlu dibenarkan. Parameter yang diperlukan untuk membenarkan permintaan tiada atau tidak sah.
+          unknown: Permintaan itu tidak mempunyai parameter yang diperlukan, termasuk nilai parameter yang tidak disokong, atau sebaliknya salah bentuk.
+        invalid_resource_owner: Bukti kelayakan pemilik sumber yang diberikan tidak sah atau pemilik sumber tidak dapat ditemui
+        invalid_scope: Skop yang diminta tidak sah, tidak diketahui atau salah bentuk.
+        invalid_token:
+          expired: Token akses telah tamat tempoh
+          revoked: Token akses telah dibatalkan
+          unknown: Token akses tidak sah
+        resource_owner_authenticator_not_configured: Carian Pemilik Sumber gagal kerana Doorkeeper.configure.resource_owner_authenticator tidak dikonfigurasikan.
+        server_error: Server kebenaran mengalami keadaan yang tidak dijangka yang menghalangnya daripada memenuhi permintaan.
+        temporarily_unavailable: Server kebenaran pada masa ini tidak dapat mengendalikan permintaan kerana beban berlebihan sementara atau penyelenggaraan server.
+        unauthorized_client: Klien tidak dibenarkan untuk melaksanakan permintaan ini menggunakan kaedah ini.
+        unsupported_grant_type: Jenis pemberian kebenaran tidak disokong oleh server kebenaran.
+        unsupported_response_type: Server kebenaran tidak menyokong jenis respons ini.
     flash:
       applications:
         create:
@@ -27,25 +109,87 @@ ms:
           notice: Aplikasi dipadamkan.
         update:
           notice: Aplikasi dikemaskini.
+      authorized_applications:
+        destroy:
+          notice: Aplikasi dipadamkan.
     grouped_scopes:
+      access:
+        read: Akses baca sahaja
+        read/write: Akses baca dan tulis
+        write: Akses tulis sahaja
       title:
         accounts: Akaun
         admin/accounts: Pengurusan akaun
         admin/all: Semua fungsi pengurusan
         admin/reports: Pengurusan laporan
+        all: Akses penuh ke akaun Mastodon anda
+        blocks: Blok
+        bookmarks: Penanda buku
         conversations: Perbualan
+        crypto: Penyulitan hujung ke hujung
+        favourites: Kegemaran
+        filters: Penapis
+        follow: Ikut, Senyap dan Blok
         follows: Ikutan
+        lists: Senarai
         media: Lampiran media
+        mutes: Senyapkan
         notifications: Pemberitahuan
         push: Pemberitahuan segera
         reports: Laporan
         search: Cari
         statuses: Hantaran
+    layouts:
+      admin:
+        nav:
+          applications: Aplikasi
+          oauth2_provider: Pembekal OAuth2
+      application:
+        title: Keizinan OAuth diperlukan
     scopes:
       admin:read: baca semua data pada pelayan
       admin:read:accounts: baca maklumat sensitif untuk semua akaun
+      admin:read:canonical_email_blocks: baca maklumat sensitif semua blok e-mel kanonik
+      admin:read:domain_allows: baca maklumat sensitif semua domain yang dibenarkan
+      admin:read:domain_blocks: baca maklumat sensitif semua blok domain
+      admin:read:email_domain_blocks: baca maklumat sensitif semua blok domain e-mel
+      admin:read:ip_blocks: baca maklumat sensitif semua blok IP
       admin:read:reports: baca maklumat sensitif untuk semua laporan dan akaun-akaun yang dilaporkan
       admin:write: mengubah semua data pada pelayan
+      admin:write:accounts: melakukan tindakan penyederhanaan pada akaun
+      admin:write:canonical_email_blocks: melakukan tindakan penyederhanaan pada blok e-mel kanonik
+      admin:write:domain_allows: melakukan tindakan penyederhanaan pada domain yang dibenarkan
+      admin:write:domain_blocks: melakukan tindakan penyederhanaan pada blok domain
+      admin:write:email_domain_blocks: melakukan tindakan penyederhanaan pada blok domain e-mel
+      admin:write:ip_blocks: melakukan tindakan penyederhanaan pada blok IP
+      admin:write:reports: melakukan tindakan penyederhanaan ke atas laporan
+      crypto: gunakan penyulitan hujung ke hujung
+      follow: mengubah suai perhubungan akaun
+      push: terima pemberitahuan tolak anda
+      read: baca semua data akaun anda
+      read:accounts: lihat maklumat akaun
+      read:blocks: lihat blok anda
+      read:bookmarks: lihat penanda halaman anda
+      read:favourites: lihat kegemaran anda
+      read:filters: lihat penapis anda
+      read:follows: lihat senarai yang anda ikuti
+      read:lists: lihat senarai anda
+      read:mutes: lihat senarai yang anda senyapkan
+      read:notifications: lihat notifikasi anda
+      read:reports: lihat laporan anda
+      read:search: cari bagi pihak anda
       read:statuses: lihat semua hantaran
+      write: ubahsuai semua data akaun anda
+      write:accounts: ubaisuai profail anda
+      write:blocks: domain dan akaun blok
       write:bookmarks: menandabuku hantaran
+      write:conversations: senyapkan dan padamkan perbualan
+      write:favourites: pos kesukaan
+      write:filters: cipta penapis
+      write:follows: ikut orang
+      write:lists: cipta senarai
+      write:media: memuat naik fail media
+      write:mutes: membisukan orang dan perbualan
+      write:notifications: kosongkan pemberitahuan anda
+      write:reports: melaporkan orang lain
       write:statuses: terbitkan hantaran
diff --git a/config/locales/doorkeeper.nn.yml b/config/locales/doorkeeper.nn.yml
index 594b6e27b0..66dd0f9093 100644
--- a/config/locales/doorkeeper.nn.yml
+++ b/config/locales/doorkeeper.nn.yml
@@ -127,6 +127,7 @@ nn:
         bookmarks: Bokmerke
         conversations: Samtalar
         crypto: Ende-til-ende-kryptering
+        favourites: Favorittar
         filters: Filter
         follow: Dei du fylgjer, målbind og blokkerer
         follows: Fylgjer
@@ -169,6 +170,7 @@ nn:
       read:accounts: sjå informasjon om kontoar
       read:blocks: sjå dine blokkeringar
       read:bookmarks: sjå bokmerka dine
+      read:favourites: sjå favorittane dine
       read:filters: sjå filtera dine
       read:follows: sjå fylgjarane dine
       read:lists: sjå listene dine
@@ -182,6 +184,7 @@ nn:
       write:blocks: blokker kontoar og domene
       write:bookmarks: bokmerk innlegg
       write:conversations: målbind og slett samtalar
+      write:favourites: favorittmarker innlegg
       write:filters: lag filter
       write:follows: fylg folk
       write:lists: lag lister
diff --git a/config/locales/doorkeeper.no.yml b/config/locales/doorkeeper.no.yml
index ed0c6da108..c432f6645c 100644
--- a/config/locales/doorkeeper.no.yml
+++ b/config/locales/doorkeeper.no.yml
@@ -127,6 +127,7 @@
         bookmarks: Bokmerker
         conversations: Samtaler
         crypto: Ende-til-ende-kryptering
+        favourites: Favoritter
         filters: Filtre
         follow: Hvem du følger, demper og blokkerer
         follows: Følger
@@ -169,6 +170,7 @@
       read:accounts: se informasjon om kontoer
       read:blocks: se blokkeringene dine
       read:bookmarks: se bokmerkene dine
+      read:favourites: se favorittene dine
       read:filters: se filtrene dine
       read:follows: se hvem du følger
       read:lists: se listene dine
@@ -182,6 +184,7 @@
       write:blocks: blokkere kontoer og domener
       write:bookmarks: bokmerke innlegg
       write:conversations: dempe og slette samtaler
+      write:favourites: favorittmarker innlegg
       write:filters: opprette filtre
       write:follows: følge personer
       write:lists: opprette lister
diff --git a/config/locales/doorkeeper.sv.yml b/config/locales/doorkeeper.sv.yml
index 4014397dc3..acf0ddd676 100644
--- a/config/locales/doorkeeper.sv.yml
+++ b/config/locales/doorkeeper.sv.yml
@@ -127,6 +127,7 @@ sv:
         bookmarks: Bokmärken
         conversations: Konversationer
         crypto: Ände-till-ände-kryptering
+        favourites: Favoriter
         filters: Filter
         follow: Följare, mjutade och blockerade
         follows: Följer
diff --git a/config/locales/doorkeeper.vi.yml b/config/locales/doorkeeper.vi.yml
index aecedbe443..d6e62d82b1 100644
--- a/config/locales/doorkeeper.vi.yml
+++ b/config/locales/doorkeeper.vi.yml
@@ -71,7 +71,7 @@ vi:
       confirmations:
         revoke: Bạn có chắc không?
       index:
-        authorized_at: Cho phép vào %{date}
+        authorized_at: Cho phép %{date}
         description_html: Đây là những ứng dụng có thể truy cập tài khoản của bạn bằng API. Nếu có ứng dụng bạn không nhận ra ở đây hoặc ứng dụng hoạt động sai, bạn có thể thu hồi quyền truy cập của ứng dụng đó.
         last_used_at: Dùng lần cuối %{date}
         never_used: Chưa dùng
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 9ae8e85409..f6fa1336c1 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1140,7 +1140,6 @@ en-GB:
     basic_information: Basic information
     hint_html: "<strong>Customise what people see on your public profile and next to your posts.</strong> Other people are more likely to follow you back and interact with you when you have a filled out profile and a profile picture."
     other: Other
-    safety_and_privacy: Safety and privacy
   errors:
     '400': The request you submitted was invalid or malformed.
     '403': You don't have permission to view this page.
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7c14b89b9b..71121bb2e2 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -814,6 +814,20 @@ en:
     system_checks:
       database_schema_check:
         message_html: There are pending database migrations. Please run them to ensure the application behaves as expected
+      elasticsearch_health_red:
+        message_html: Elasticsearch cluster is unhealthy (red status), search features are unavailable
+      elasticsearch_health_yellow:
+        message_html: Elasticsearch cluster is unhealthy (yellow status), you may want to investigate the reason
+      elasticsearch_index_mismatch:
+        message_html: Elasticsearch index mappings are outdated. Please run <code>tootctl search deploy --only=%{value}</code>
+      elasticsearch_preset:
+        action: See documentation
+        message_html: Your Elasticsearch cluster has more than one node, but Mastodon is not configured to use them.
+      elasticsearch_preset_single_node:
+        action: See documentation
+        message_html: Your Elasticsearch cluster has only one node, <code>ES_PRESET</code> should be set to <code>single_node_cluster</code>.
+      elasticsearch_reset_chewy:
+        message_html: Your Elasticsearch system index is outdated due to a setting change. Please run <code>tootctl search deploy --reset-chewy</code> to update it.
       elasticsearch_running_check:
         message_html: Could not connect to Elasticsearch. Please check that it is running, or disable full-text search
       elasticsearch_version_check:
@@ -1140,7 +1154,6 @@ en:
     basic_information: Basic information
     hint_html: "<strong>Customize what people see on your public profile and next to your posts.</strong> Other people are more likely to follow you back and interact with you when you have a filled out profile and a profile picture."
     other: Other
-    safety_and_privacy: Safety and privacy
   errors:
     '400': The request you submitted was invalid or malformed.
     '403': You don't have permission to view this page.
@@ -1433,6 +1446,7 @@ en:
     update:
       subject: "%{name} edited a post"
   notifications:
+    administration_emails: Admin e-mail notifications
     email_events: Events for e-mail notifications
     email_events_hint: 'Select events that you want to receive notifications for:'
     other_settings: Other notifications settings
@@ -1477,6 +1491,15 @@ en:
     other: Other
     posting_defaults: Posting defaults
     public_timelines: Public timelines
+  privacy:
+    hint_html: "<strong>Customize how you want your profile and your posts to be found.</strong> A variety of features in Mastodon can help you reach a wider audience when enabled. Take a moment to review these settings to make sure they fit your use case."
+    privacy: Privacy
+    privacy_hint_html: Control how much you want to disclose for the benefit of others. People discover interesting profiles and cool apps by browsing other people's follows and seeing which apps they post from, but you may prefer to keep it hidden.
+    reach: Reach
+    reach_hint_html: Control whether you want to be discovered and followed by new people. Do you want your posts to appear on the Explore screen? Do you want other people to see you in their follow recommendations? Do you want to accept all new followers automatically, or have granular control over each one?
+    search: Search
+    search_hint_html: Control how you want to be found. Do you want people to find you by what you've publicly posted about? Do you want people outside Mastodon to find your profile when searching the web? Please mind that total exclusion from all search engines cannot be guaranteed for public information.
+    title: Privacy and reach
   privacy_policy:
     title: Privacy Policy
   reactions:
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 245771b8e6..d06f759101 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -1135,7 +1135,6 @@ eo:
   edit_profile:
     basic_information: Baza informo
     other: Alia
-    safety_and_privacy: Sekureco kaj privateco
   errors:
     '400': La peto kiun vi sendis estas nevalida au malformas.
     '403': Vi ne havas la rajton por vidi ĉi tiun paĝon.
diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml
index bcbde8f65b..7d730d1405 100644
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@@ -1140,7 +1140,6 @@ es-AR:
     basic_information: Información básica
     hint_html: "<strong>Personalizá lo que la gente ve en tu perfil público y junto a tus publicaciones.</strong> Es más probable que otras personas te sigan e interactúen con vos cuando tengas un perfil completo y una foto de perfil."
     other: Otros
-    safety_and_privacy: Seguridad y privacidad
   errors:
     '400': La solicitud que enviaste no era válida o estaba corrompida.
     '403': No tenés permiso para ver esta página.
diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml
index c05d4d242a..3271a32fcd 100644
--- a/config/locales/es-MX.yml
+++ b/config/locales/es-MX.yml
@@ -1140,7 +1140,6 @@ es-MX:
     basic_information: Información básica
     hint_html: "<strong>Personaliza lo que la gente ve en tu perfil público junto a tus publicaciones.</strong> Es más probable que otras personas te sigan e interactúen contigo cuando completes tu perfil y agregues una foto."
     other: Otro
-    safety_and_privacy: Seguridad y privacidad
   errors:
     '400': La solicitud que has enviado no es valida o estaba malformada.
     '403': No tienes permiso para acceder a esta página.
@@ -1265,12 +1264,14 @@ es-MX:
       bookmarks_html: Estás a punto de <strong>reemplazar tus marcadores</strong> por hasta <strong>%{total_items} publicaciones</strong> provenientes de <strong>%{filename}</strong>.
       domain_blocking_html: Estás a punto de <strong>reemplazar tu lista de bloqueos de dominio</strong> por hasta <strong>%{total_items} dominios</strong> provenientes de <strong>%{filename}</strong>.
       following_html: Estás a punto de <strong>seguir</strong> hasta <strong>%{total_items} cuentas</strong> provenientes de <strong>%{filename}</strong> y <strong>dejar de seguir a cualquier otra cuenta</strong>.
+      lists_html: Estás a punto de <strong>reemplazar tus listas</strong> con contenidos de <strong>%{filename}</strong>. Se añadirán <strong>%{total_items} cuentas</strong> a nuevas listas.
       muting_html: Estás a punto de <strong>reemplazar tu lista de cuentas silenciadas</strong> con hasta <strong>%{total_items} cuentas</strong> proveninetes de <strong>%{filename}</strong>.
     preambles:
       blocking_html: Estás a punto de <strong>bloquear</strong> hasta <strong>%{total_items} cuentas</strong> proveninetes de <strong>%{filename}</strong>.
       bookmarks_html: Estás a punto de añadir hasta <strong>%{total_items} publicaciones</strong> proveninetes de <strong>%{filename}</strong> a tus <strong>marcadores</strong>.
       domain_blocking_html: Estás a punto de <strong>bloquear</strong> hasta <strong>%{total_items} dominios</strong> provenientes de <strong>%{filename}</strong>.
       following_html: Estás a punto de <strong>seguir</strong> hasta <strong>cuentas%{total_items}</strong> provenientes de <strong>%{filename}</strong>.
+      lists_html: Estás a punto de añadir <strong>%{total_items} cuentas</strong> desde <strong>%{filename}</strong> a tus <strong>listas</strong>. Se crearán nuevas listas si no hay listas para añadirlas.
       muting_html: Estás a punto de <strong>silenciar</strong> hasta <strong>%{total_items} cuentas</strong> provenientes de <strong>%{filename}</strong>.
     preface: Puedes importar ciertos datos, como todas las personas que estás siguiendo o bloqueando en tu cuenta en esta instancia, desde archivos exportados de otra instancia.
     recent_imports: Importaciones recientes
@@ -1287,6 +1288,7 @@ es-MX:
       bookmarks: Importando marcadores
       domain_blocking: Importando dominios bloqueados
       following: Importando cuentas seguidas
+      lists: Importando listas
       muting: Importando cuentas silenciadas
     type: Importar tipo
     type_groups:
@@ -1297,6 +1299,7 @@ es-MX:
       bookmarks: Marcadores
       domain_blocking: Lista de dominios bloqueados
       following: Lista de seguidos
+      lists: Listas
       muting: Lista de silenciados
     upload: Cargar
   invites:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 8bb99c42ed..265b15f01c 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1140,7 +1140,6 @@ es:
     basic_information: Información básica
     hint_html: "<strong>Personaliza lo que la gente ve en tu perfil público junto a tus publicaciones.</strong> Es más probable que otras personas te sigan e interactúen contigo cuando completas tu perfil y foto."
     other: Otros
-    safety_and_privacy: Seguridad y privacidad
   errors:
     '400': La solicitud que has enviado no es valida o estaba malformada.
     '403': No tienes permiso para acceder a esta página.
@@ -1265,12 +1264,14 @@ es:
       bookmarks_html: Estás a punto de <strong>reemplazar tus marcadores</strong> por hasta <strong>%{total_items} publicaciones</strong> provenientes de <strong>%{filename}</strong>.
       domain_blocking_html: Estás a punto de <strong>reemplazar tu lista de bloqueos de dominio</strong> por hasta <strong>%{total_items} dominios</strong> provenientes de <strong>%{filename}</strong>.
       following_html: Estás a punto de <strong>seguir</strong> hasta <strong>%{total_items} cuentas</strong> provenientes de <strong>%{filename}</strong> y <strong>dejar de seguir a cualquier otra cuenta</strong>.
+      lists_html: Estás a punto de <strong>reemplazar tus listas</strong> con contenidos de <strong>%{filename}</strong>. Se añadirán <strong>%{total_items} cuentas</strong> a nuevas listas.
       muting_html: Estás a punto de <strong>reemplazar tu lista de cuentas silenciadas</strong> con hasta <strong>%{total_items} cuentas</strong> proveninetes de <strong>%{filename}</strong>.
     preambles:
       blocking_html: Estás a punto de <strong>bloquear</strong> hasta <strong>%{total_items} cuentas</strong> proveninetes de <strong>%{filename}</strong>.
       bookmarks_html: Está a punto de añadir hasta <strong>%{total_items} publicaciones</strong> proveninetes de <strong>%{filename}</strong> a tus <strong>marcadores</strong>.
       domain_blocking_html: Estás a punto de <strong>bloquear</strong> hasta <strong>%{total_items} dominios</strong> provenientes de <strong>%{filename}</strong>.
       following_html: Estás a punto de <strong>seguir</strong> hasta <strong>cuentas%{total_items}</strong> provenientes de <strong>%{filename}</strong>.
+      lists_html: Estás a punto de añadir <strong>%{total_items} cuentas</strong> desde <strong>%{filename}</strong> a tus <strong>listas</strong>. Se crearán nuevas listas si no hay listas para añadirlas.
       muting_html: Estás a punto de <strong>silenciar</strong> hasta <strong>%{total_items} cuentas</strong> provenientes de <strong>%{filename}</strong>.
     preface: Puedes importar ciertos datos, como todas las personas que estás siguiendo o bloqueando en tu cuenta en esta instancia, desde archivos exportados de otra instancia.
     recent_imports: Importaciones recientes
@@ -1287,6 +1288,7 @@ es:
       bookmarks: Importando marcadores
       domain_blocking: Importando dominios bloqueados
       following: Importando cuentas seguidas
+      lists: Importando listas
       muting: Importando cuentas silenciadas
     type: Importar tipo
     type_groups:
@@ -1297,6 +1299,7 @@ es:
       bookmarks: Marcadores
       domain_blocking: Lista de dominios bloqueados
       following: Lista de seguidos
+      lists: Listas
       muting: Lista de silenciados
     upload: Cargar
   invites:
diff --git a/config/locales/et.yml b/config/locales/et.yml
index 9d9fa45c44..9869852ef7 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -1140,7 +1140,6 @@ et:
     basic_information: Põhiinfo
     hint_html: "<strong>Kohanda, mida inimesed näevad su avalikul profiilil ja postituste kõrval.</strong> Inimesed alustavad tõenäolisemalt sinu jälgimist ja interakteeruvad sinuga, kui sul on täidetud profiil ja profiilipilt."
     other: Muu
-    safety_and_privacy: Turvalisus ja privaatsus
   errors:
     '400': Esitatud päring oli vigane või valesti vormindatud.
     '403': Sul puudub õigus seda lehte vaadata.
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 9fa0d51d7d..774f6b3277 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -387,7 +387,7 @@ fi:
         confirm: Jäädytä
         permanent_action: Jäädytyksen kumoaminen ei palauta mitään tietoja tai suhteita.
         preamble_html: Olet jäädyttämässä verkkotunnuksen <strong>%{domain}</strong> ja sen aliverkkotunnukset.
-        remove_all_data: Tämä poistaa palvelimeltasi kaiken sisällön, median ja profiilitiedot tämän verkkotunnuksen tileiltä.
+        remove_all_data: Tämä toiminto poistaa palvelimeltasi kaiken sisällön, median ja profiilitiedot tämän palvelun tileiltä.
         stop_communication: Palvelimesi lopettaa näiden palvelinten viestinnän.
         title: Vahvista verkkotunnuksen %{domain} esto
         undo_relationships: Tämä kumoaa näiden palvelimien ja sinun tilien välisen seurannan.
@@ -1140,7 +1140,6 @@ fi:
     basic_information: Perustiedot
     hint_html: "<strong>Mukauta mitä ihmiset näkevät julkisessa profiilissasi ja sinun julkaisujen vieressä.</strong> Ihmiset todennäköisesti seuraavat ja kirjoittavat sinulle, kun sinulla on täytetty profiili ja profiilikuva."
     other: Muu
-    safety_and_privacy: Turvallisuus ja yksityisyys
   errors:
     '400': Lähettämäsi pyyntö oli virheellinen tai muotoiltu virheellisesti.
     '403': Sinulla ei ole lupaa nähdä tätä sivua.
@@ -1343,6 +1342,7 @@ fi:
     unsubscribe:
       action: Kyllä, peru tilaus
       complete: Tilaus lopetettiin
+      confirmation_html: Olethan varma, että haluat lopettaa %{type} -aiheisten Mastodonin sähköposti-ilmoitusten vastaanoton palvelimelta %{domain} osoitteeseesi %{email}? Voit toki milloin tahansa ottaa jälleen käyttöön muun muassa nämä viestit <a href="%{settings_path}">sähköposti-ilmoitusasetusten</a> kautta.
       emails:
         notification_emails:
           favourite: sähköpostit ilmoituksille
@@ -1350,6 +1350,8 @@ fi:
           follow_request: seuraa pyyntöjä sähköpostiin
           mention: mainitse sähköpostin ilmoitukset
           reblog: tehosta sähköpostien ilmoituksia
+      resubscribe_html: Jos olet perunut ilmoitusviestien vastaanottamisen suotta, pääset jälleentilaamaan ilmoitusviestejä <a href="%{settings_path}">sähköposti-ilmoitusasetusten</a> kautta.
+      success_html: Sinulle ei vastedes lähetetä %{type} -aihepiirin Mastodon-sähköposti-ilmoituksia palvelimelta %{domain} osoitteeseen %{email}.
       title: Lopeta tilaus
   media_attachments:
     validations:
@@ -1767,6 +1769,10 @@ fi:
     seamless_external_login: Olet kirjautunut ulkoisen palvelun kautta, joten salasana- ja sähköpostiasetukset eivät ole käytettävissä.
     signed_in_as: 'Kirjautunut tilillä:'
   verification:
+    extra_instructions_html: <strong>Vinkki:</strong> Tämä linkitys verkkosivustollasi voidaan toteuttaa myös näkymättömänä. Tärkeä osuus on <code>rel="me"</code> -määre, jolla ehkäistään valeprofiilikäyttötarkoituksia sivustoilla, joiden sisältö perustuu käyttäjiensä julkaisuihin. Voit siis käyttää linkkiviittauselementtiä <code>link</code> HTML-lähdekoodin otsakeosassa (head) sen sijaan, että käyttäisit näkyvää hyperlinkkielementtiä <code>a</code>. HTML-lähdekoodin tulee tuolta osin kuitenkin olla JavaScriptistä riippumatonta.
+    here_is_how: Näin voit tehdä sen
+    hint_html: "<strong>Mastodonissa henkilöllisyyden vahventaminen on jokaisen käyttäjän ulottuvilla.</strong> Tämä perustuu avoimiin standardeihin, maksuttomasti nyt ja aina. Kaikki mitä tarvitset on henkilökohtainen verkkosivusto, jonka avulla sinut voidaan tunnistaa. Kun Mastodon-profiilistasi on linkki kyseiselle verkkosivustollesi, ja sieltä löytyy vastaviittaus tai -linkitys profiiliisi, näkyy profiilissasi vahvistustunniste."
+    instructions_html: Kopioi ja liitä alla oleva koodi verkkosivusi HTML-lähdekoodiin. Lisää sitten verkkosivustosi osoite johonkin ylimääräisistä kentistä profiiliasetuksissa, "Muokkaa profiilia" -välilehdestä, ja tallenna muutokset.
     verification: Vahvistus
     verified_links: Vahvistetut linkkisi
   webauthn_credentials:
diff --git a/config/locales/fo.yml b/config/locales/fo.yml
index 872c258248..145d3972b6 100644
--- a/config/locales/fo.yml
+++ b/config/locales/fo.yml
@@ -1140,7 +1140,6 @@ fo:
     basic_information: Grundleggjandi upplýsingar
     hint_html: "<strong>Tillaga tað, sum fólk síggja á tínum almenna vanga og við síðna av tínum postum.</strong> Sannlíkindini fyri, at onnur fylgja tær og virka saman við tær eru størri, tá tú hevur fylt út vangan og eina vangamynd."
     other: Onnur
-    safety_and_privacy: Trygd og privatlív
   errors:
     '400': Umbønin, sum tú sendi inn, var ógildug ella hevði skeivt skap.
     '403': Tú hevur ikki loyvi at síggja hesa síðuna.
diff --git a/config/locales/fr-QC.yml b/config/locales/fr-QC.yml
index c7e69ca963..6603db0012 100644
--- a/config/locales/fr-QC.yml
+++ b/config/locales/fr-QC.yml
@@ -1140,7 +1140,6 @@ fr-QC:
     basic_information: Informations de base
     hint_html: "<strong>Personnalisez ce que les gens voient sur votre profil public et à côté de vos messages.</strong> Les autres personnes seront plus susceptibles de vous suivre et d’interagir avec vous lorsque vous avez un profil complet et une photo."
     other: Autre
-    safety_and_privacy: Sécurité et confidentialité
   errors:
     '400': La demande que vous avez soumise est invalide ou mal formée.
     '403': Vous n’avez pas accès à cette page.
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 61f6410460..c1d3775e18 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -1140,7 +1140,6 @@ fr:
     basic_information: Informations de base
     hint_html: "<strong>Personnalisez ce que les gens voient sur votre profil public et à côté de vos messages.</strong> Les autres personnes seront plus susceptibles de vous suivre et d’interagir avec vous lorsque vous avez un profil complet et une photo."
     other: Autre
-    safety_and_privacy: Sécurité et confidentialité
   errors:
     '400': La demande que vous avez soumise est invalide ou mal formée.
     '403': Vous n’avez pas accès à cette page.
diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index d3279a65bb..85cf23586e 100644
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -1140,7 +1140,6 @@ fy:
     basic_information: Algemiene ynformaasje
     hint_html: "<strong>Pas oan wat minsken op jo iepenbiere profyl en njonken jo berjochten sjogge.</strong> Oare minsken sille jo earder folgje en mei jo kommunisearje wannear’t jo profyl ynfolle is en jo in profylfoto hawwe."
     other: Oars
-    safety_and_privacy: Feilichheid en privacy
   errors:
     '400': De oanfraach dy’t jo yntsjinne hawwe wie ûnjildich of fout.
     '403': Jo hawwe gjin tastimming om dizze side te besjen.
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index 0ce2c4c30f..9be86a20e2 100644
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -593,7 +593,7 @@ gd:
       pending: A’ feitheamh ri aontachadh an ath-sheachadain
       save_and_enable: Sàbhail ’s cuir an comas
       setup: Suidhich ceangal ri ath-sheachadain
-      signatures_not_enabled: Chan obraich ath-sheachadain mar bu chòir nuair a bhios am modh tèarainte no modh a’ cho-nasgaidh chuingichte an comas
+      signatures_not_enabled: Dh’fhaoidte nach obraich ath-sheachadain mar bu chòir nuair a bhios am modh tèarainte no modh a’ cho-nasgaidh chuingichte an comas
       status: Staid
       title: Ath-sheachadain
     report_notes:
@@ -798,6 +798,7 @@ gd:
           approved: Tha aontachadh riatanach airson clàradh
           none: Chan fhaod neach sam bith clàradh
           open: "’S urrainn do neach sam bith clàradh"
+      title: Roghainnean an fhrithealaiche
     site_uploads:
       delete: Sguab às am faidhle a chaidh a luchdadh suas
       destroyed_msg: Chaidh an luchdadh suas dhan làrach a sguabadh às!
@@ -899,10 +900,10 @@ gd:
         no_status_selected: Cha deach post a’ treandadh sam bith atharrachadh o nach deach gin dhiubh a thaghadh
         not_discoverable: Cha do chuir an t-ùghdar roimhe gun gabh a rùrachadh
         shared_by:
-          few: Chaidh a cho-roinneadh no ’na annsachd %{friendly_count} tursan
-          one: Chaidh a cho-roinneadh no ’na annsachd %{friendly_count} turas
-          other: Chaidh a cho-roinneadh no ’na annsachd %{friendly_count} turas
-          two: Chaidh a cho-roinneadh no ’na annsachd %{friendly_count} thuras
+          few: Chaidh a cho-roinneadh no a chur ris na h-annsachdan %{friendly_count} tursan
+          one: Chaidh a cho-roinneadh no a chur ris na h-annsachdan %{friendly_count} turas
+          other: Chaidh a cho-roinneadh no a chur ris na h-annsachdan %{friendly_count} turas
+          two: Chaidh a cho-roinneadh no a chur ris na h-annsachdan %{friendly_count} thuras
         title: Postaichean a’ treandadh
       tags:
         current_score: Sgòr làithreach de %{score}
@@ -1175,7 +1176,6 @@ gd:
     basic_information: Fiosrachadh bunasach
     hint_html: "<strong>Gnàthaich na chithear air a’ phròifil phoblach agad is ri taobh nam postaichean agad.</strong> Bidh càch nas buailtiche do leantainn agus conaltradh leat nuair a bhios tu air a’ phròifil agad a lìonadh agus dealbh rithe."
     other: Eile
-    safety_and_privacy: Sàbhailteachd is prìobhaideachd
   errors:
     '400': Cha robh an t-iarrtas a chuir thu a-null dligheach no bha droch-chruth air.
     '403': Chan eil cead agad gus an duilleag seo a shealltainn.
@@ -1314,12 +1314,14 @@ gd:
       bookmarks_html: Tha thu an impis suas ri <strong>%{total_items} post(aichean)</strong> o <strong>%{filename}</strong> a chur <strong>an àite nan comharra-lìn</strong> agad.
       domain_blocking_html: Tha thu an impis suas ri <strong>%{total_items} àrainn(ean)</strong> o <strong>%{filename}</strong> a chur <strong>an àite liosta nam bacaidhean àrainne</strong> agad.
       following_html: Tha thu an impis suas ri <strong>%{total_items} cunntas(an)</strong> o <strong>%{filename}</strong> <strong>a leantainn</strong> agus <strong>sguiridh tu a leantainn duine sam bith eile</strong>.
+      lists_html: Tha thu an impis susbaint <strong>%{filename}</strong> a chur <strong>an àite nan liostaichean agad</strong>. Thèid suas ri <strong>%{total_items}cunntas(an)</strong> a chur ri liostaichean ùra.
       muting_html: Tha thu an impis suas ri <strong>%{total_items} cunntas(an)</strong> o <strong>%{filename}</strong> a chur <strong>an àite liosta nan cunntasan mùchte</strong> agad.
     preambles:
       blocking_html: Tha thu an impis suas ri <strong>%{total_items} cunntas(an)</strong> o <strong>%{filename}</strong> a <strong>bhacadh</strong>.
       bookmarks_html: Tha thu an impis suas ri <strong>%{total_items} post(aichean)</strong> o <strong>%{filename}</strong> a chur ris na h-<strong>annsachdan</strong> agad.
       domain_blocking_html: Tha thu an impis suas ri <strong>%{total_items} àrainn(ean)</strong> o <strong>%{filename}</strong> a <strong>bhacadh</strong>.
       following_html: Tha thu an impis suas ri <strong>%{total_items} cunntas(an)</strong> o <strong>%{filename}</strong> a <strong>leantainn</strong>.
+      lists_html: Tha thu an impis suas ri <strong>%{total_items} cunntas(an)</strong> o <strong>%{filename}</strong> a chur ris na <strong>liostaichean</strong> agad. Thèid liostaichean ùra a chruthachadh mur eil liostaichean ann airson nan cunntasan a chur ris.
       muting_html: Tha thu an impis suas ri <strong>%{total_items} cunntas(an)</strong> o <strong>%{filename}</strong> a <strong>mhùchadh</strong>.
     preface: "’S urrainn dhut dàta ion-phortadh a dh’às-phortaich thu o fhrithealaiche eile, can liosta nan daoine a leanas tu no a tha thu a’ bacadh."
     recent_imports: Ion-phortaidhean o chionn goirid
@@ -1336,6 +1338,7 @@ gd:
       bookmarks: Ag ion-phortadh comharran-leabhair
       domain_blocking: Ag ion-phortadh àrainnean bacte
       following: Ion-phortaich cunntasan ’gan leantainn
+      lists: Ag ion-phortadh liostaichean
       muting: Ag ion-phortadh cunntasan mùchte
     type: Seòrsa an ion-phortaidh
     type_groups:
@@ -1346,6 +1349,7 @@ gd:
       bookmarks: Comharran-lìn
       domain_blocking: Liosta-bhacaidh àrainnean
       following: Liosta dhen fheadhainn a leanas tu
+      lists: Liostaichean
       muting: Liosta a’ mhùchaidh
     upload: Luchdaich suas
   invites:
@@ -1626,7 +1630,7 @@ gd:
     migrate: Imrich cunntais
     notifications: Brathan
     preferences: Roghainnean
-    profile: Pròifil
+    profile: Pròifil phoblach
     relationships: Dàimhean leantainn
     statuses_cleanup: Sguabadh às fèin-obrachail phostaichean
     strikes: Rabhaidhean na maorsainneachd
@@ -1712,7 +1716,7 @@ gd:
     keep_polls_hint: Cha dèid gin dhe na cunntasan-bheachd agad a sguabadh às
     keep_self_bookmark: Cùm na chuir thu ris comharran-lìn
     keep_self_bookmark_hint: Cha dèid gin dhe na postaichean agad fhèin a chuir thu ris na comharran-lìn agad a sguabadh às
-    keep_self_fav: Cùm na chuir thu ris na h-annsachdan
+    keep_self_fav: Cùm na postaichean a chuir thu ris na h-annsachdan
     keep_self_fav_hint: Cha dèid gin dhe na postaichean agad fhèin a chuir thu ris na h-annsachdan agad a sguabadh às
     min_age:
       '1209600': 2 sheachdain
@@ -1724,8 +1728,8 @@ gd:
       '63113904': 2 bhliadhna
       '7889238': 3 mìosan
     min_age_label: Stairsneach aoise
-    min_favs: Cùm na tha ’na annsachd aig co-dhiù
-    min_favs_hint: Cha dèid gin dhe na postaichean agad a sguabadh às a tha ’nan annsachd an àireamh de thursan seo air a char as lugha. Fàg seo bàn airson postaichean a sguabadh às ge b’ e co mheud turas a tha iad ’nan annsachd
+    min_favs: Cùm na postaichean a chaidh a chur ris na h-annsachdan co-dhiù
+    min_favs_hint: Cha dèid gin dhe na postaichean agad a sguabadh às a chaidh a chur ris na h-annsachdan an àireamh seo de thursan air a char as lugha. Fàg seo bàn airson na postaichean a sguabadh às ge b’ e co mheud neach a chuir ris na h-annsachdan iad
     min_reblogs: Cùm na tha ’ga bhrosnachadh le co-dhiù
     min_reblogs_hint: Cha dèid gin dhe na postaichean agad a sguabadh às a tha ’gam brosnachadh an àireamh de thursan seo air a char as lugha. Fàg seo bàn airson postaichean a sguabadh às ge b’ e co mheud turas a tha iad ’gam brosnachadh
   stream_entries:
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index f3a4647cf5..0e23b2dd6f 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -1140,7 +1140,6 @@ gl:
     basic_information: Información básica
     hint_html: "<strong>Personaliza o que van ver no teu perfil público e ao lado das túas publicacións.</strong> As outras persoas estarán máis animadas a seguirte e interactuar contigo se engades algún dato sobre ti así como unha imaxe de perfil."
     other: Outros
-    safety_and_privacy: Seguridade e privacidade
   errors:
     '400': A solicitude que enviou non é válida ou ten formato incorrecto.
     '403': Non ten permiso para ver esta páxina.
diff --git a/config/locales/he.yml b/config/locales/he.yml
index ef33453351..404b9f2de5 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -1176,7 +1176,6 @@ he:
     basic_information: מידע בסיסי
     hint_html: "<strong>התאמה אישית של מה שיראו אחרים בפרופיל הציבורי שלך וליד הודעותיך.</strong> אחרים עשויים יותר להחזיר עוקב וליצור אתך שיחה אם הפרופיל והתמונה יהיו מלאים."
     other: אחר
-    safety_and_privacy: בטחון ופרטיות
   errors:
     '400': הבקשה שהגשת לא תקינה.
     '403': חסרות לך הרשאות לצפיה בעמוד זה.
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index b4cfde5903..7d15cb133c 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -1140,7 +1140,6 @@ hu:
     basic_information: Általános információk
     hint_html: "<strong>Tedd egyedivé, mi látnak mások a profilodon és a bejegyzéseid mellett.</strong> Mások nagyobb eséllyel követnek vissza és lépnek veled kapcsolatba, ha van kitöltött profilod és profilképed."
     other: Egyéb
-    safety_and_privacy: Biztonság és személyes adatok
   errors:
     '400': A küldött kérés érvénytelen vagy hibás volt.
     '403': Nincs jogosultságod az oldal megtekintéséhez.
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 346eeeb56d..183c32b54e 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -1144,7 +1144,6 @@ is:
     basic_information: Grunnupplýsingar
     hint_html: "<strong>Sérsníddu hvað fólk sér á opinbera notandasniðinu þínu og næst færslunum þínum.</strong> Annað fólk er líklegra til að fylgjast með þér og eiga í samskiptum við þig ef þú fyllir út notandasniðið og setur auðkennismynd."
     other: Annað
-    safety_and_privacy: Öryggi og friðhelgi
   errors:
     '400': Beiðnin sem þú sendir er ógild eða rangt uppsett.
     '403': Þú hefur ekki heimildir til að skoða þessari síðu.
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 950e5eca31..5a4e00cbb6 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -1142,7 +1142,6 @@ it:
     basic_information: Informazioni di base
     hint_html: "<strong>Personalizza ciò che le persone vedono sul tuo profilo pubblico e accanto ai tuoi post.</strong> È più probabile che altre persone ti seguano e interagiscano con te quando hai un profilo compilato e un'immagine del profilo."
     other: Altro
-    safety_and_privacy: Sicurezza e privacy
   errors:
     '400': La richiesta che hai inviato non è valida o non è corretta.
     '403': Non sei autorizzato a visualizzare questa pagina.
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index e56e131e79..c47a1a4a66 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1122,7 +1122,6 @@ ja:
     basic_information: 基本情報
     hint_html: "<strong>アカウントのトップページや投稿の隣に表示される公開情報です。</strong>プロフィールとアイコンを設定することで、ほかのユーザーは親しみやすく、またフォローしやすくなります。"
     other: その他
-    safety_and_privacy: 安全とプライバシー
   errors:
     '400': 送信されたリクエストは無効であるか、または不正なフォーマットです。
     '403': このページを表示する権限がありません。
diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index 4223467032..eeb8f16ae4 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -101,6 +101,7 @@ kab:
       search: Nadi
       search_same_email_domain: Iseqdacen-nniḍen s yiwet n taɣult n yimayl
       search_same_ip: Imseqdacen-nniḍen s tansa IP am tinn-ik
+      security: Taɣellist
       security_measures:
         only_password: Awal uffir kan
         password_and_2fa: Awal uffir d 2FA
@@ -253,6 +254,8 @@ kab:
       undo: Kkes seg tebdart tamellalt
     domain_blocks:
       add_new: Rni iḥder amaynut n taɣult
+      confirm_suspension:
+        cancel: Sefsex
       domain: Taγult
       export: Sifeḍ
       import: Kter
@@ -283,6 +286,7 @@ kab:
     instances:
       back_to_all: Akk
       back_to_limited: Ɣur-s talast
+      back_to_warning: Γur-wat
       by_domain: Taγult
       content_policies:
         policy: Tasertit
@@ -353,6 +357,7 @@ kab:
       category: Taggayt
       comment:
         none: Ula yiwen
+      confirm: Sentem
       mark_as_resolved: Creḍ-it yefra
       mark_as_unresolved: Creḍ-it ur yefra ara
       notes:
@@ -407,6 +412,7 @@ kab:
       application: Asnas
       back_to_account: Tuγalin γer usebter n umiḍan
       deleted: Yettwakkes
+      favourites: Imenyafen
       language: Tutlayt
       media:
         title: Taγwalt
@@ -437,9 +443,11 @@ kab:
     view_profile: Ssken-d amaɣnu
     view_status: Ssken-d tasuffiɣt
   applications:
+    logout: Ffeɣ
     token_regenerated: Ajuṭu n unekcum yettusirew i tikkelt-nniḍen akken iwata
     your_token: Ajiṭun-ik·im n unekcum
   auth:
+    apply_for_account: Suter amiḍan
     delete_account: Kkes amiḍan
     description:
       prefix_invited_by_user: "@%{name} inced-ik·ikem ad ternuḍ ɣer uqeddac-a n Mastodon!"
@@ -456,6 +464,8 @@ kab:
     register: Jerred
     registration_closed: "%{instance} ur yeqbil ara imttekkiyen imaynuten"
     reset_password: Wennez awal uffir
+    rules:
+      back: Tuɣalin
     security: Taγellist
     set_new_password: Egr-d awal uffir amaynut
     status:
@@ -489,15 +499,8 @@ kab:
       username_available: Isem-ik·im n useqdac ad yuɣal yella i tikkelt-nniḍen
       username_unavailable: Isem-ik·im n useqdac ad yeqqim ulac-it
   errors:
-    '400': The request you submitted was invalid or malformed.
-    '403': You don't have permission to view this page.
-    '404': The page you are looking for isn't here.
-    '406': This page is not available in the requested format.
-    '410': The page you were looking for doesn't exist here anymore.
-    '429': Too many requests
     '500':
       title: Asebter-ayi d arameγtu
-    '503': The page could not be served due to a temporary server failure.
   existing_username_validator:
     not_found_multiple: ur yezmir ara ad yaf %{usernames}
   exports:
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index fe195ee09f..c12e4dcf31 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -269,7 +269,7 @@ ko:
         reopen_report_html: "%{name} 님이 신고 %{target}을 다시 열었습니다"
         resend_user_html: "%{name} 님이 %{target} 님에 대한 확인 메일을 다시 보냈습니다"
         reset_password_user_html: "%{name} 님이 사용자 %{target}의 암호를 초기화했습니다"
-        resolve_report_html: "%{name} 님이 신고 %{target}를 처리됨으로 변경하였습니다"
+        resolve_report_html: "%{name} 중재자가 %{target}번 신고를 해결로 변경하였습니다"
         sensitive_account_html: "%{name} 님이 %{target}의 미디어를 민감함으로 표시했습니다"
         silence_account_html: "%{name} 님이 %{target}의 계정을 제한시켰습니다"
         suspend_account_html: "%{name} 님이 %{target}의 계정을 정지시켰습니다"
@@ -354,7 +354,7 @@ ko:
         other: "<strong>%{count}</strong>개의 대기 중인 해시태그"
       pending_users_html:
         other: "<strong>%{count}</strong>명의 대기 중인 사용자"
-      resolved_reports: 신고 해결됨
+      resolved_reports: 해결된 신고
       software: 소프트웨어
       sources: 가입 출처
       space: 디스크 사용량
@@ -600,7 +600,7 @@ ko:
       delete_and_resolve: 게시물 삭제
       forwarded: 전달됨
       forwarded_to: "%{domain}에게 전달됨"
-      mark_as_resolved: 해결 완료 처리
+      mark_as_resolved: 해결로 표시
       mark_as_sensitive: 민감함으로 설정
       mark_as_unresolved: 미해결로 표시
       no_one_assigned: 아무도 없음
@@ -619,7 +619,7 @@ ko:
       report: '신고 #%{id}'
       reported_account: 신고 대상 계정
       reported_by: 신고자
-      resolved: 해결됨
+      resolved: 해결
       resolved_msg: 신고를 잘 해결했습니다!
       skip_to_actions: 작업으로 건너뛰기
       status: 상태
@@ -712,7 +712,7 @@ ko:
     rules:
       add_new: 규칙 추가
       delete: 삭제
-      description_html: 대부분의 경우 사람들이 이용약관을 반드시 읽고 동의하도록 하지만, 보통의 사람들은 문제가 일어나기 전까지는 읽지 않습니다. <strong>여러분의 서버 규칙을 목록으로 정리해서 한 번에 읽기 쉽게 만드세요.</strong> 규칙 각각을 짧고 단순하게 만들고, 하나를 여러 개로 쪼개지도 마세요.
+      description_html: 대부분의 사람들은 서비스 약관을 읽고 동의한다고 밝힙니다만, 대개 문제가 발생하기 전까지는 약관을 자세히 읽어보지 않습니다. <strong>서버의 운영원칙을 단일한 글머리 기호 목록으로 제공하여 한 눈에 쉽게 확인할 수 있도록 하세요.</strong> 각 규칙을 짧고 간결하게 유지하되, 많은 항목으로 나누지 않도록 하세요.
       edit: 규칙 수정
       empty: 아직 정의된 서버 규칙이 없습니다.
       title: 서버 규칙
@@ -851,7 +851,7 @@ ko:
       statuses:
         allow: 게시물 허용
         allow_account: 작성자 허용
-        description_html: 당신의 서버가 알기로 현재 많은 수의 공유와 좋아요가 되고 있는 게시물들입니다. 새로운 사용자나 돌아오는 사용자들이 팔로우 할 사람들을 찾는 데 도움이 될 수 있습니다. 작성자를 승인하고, 작성자가 그들의 계정이 다른 계정에게 탐색되도록 설정하지 않는 한 게시물들은 공개적으로 표시되지 않습니다. 또한 각각의 게시물을 별개로 거절할 수도 있습니다.
+        description_html: 여러분의 서버가 알기로 현재 많은 수의 공유와 좋아요가 되고 있는 게시물들입니다. 새로운 사용자나 돌아오는 사용자들이 팔로우 할 사람들을 찾는 데 도움이 될 수 있습니다. 작성자를 승인하고, 작성자가 그들의 계정이 다른 계정에게 탐색되도록 설정하지 않는 한 게시물들은 공개적으로 표시되지 않습니다. 또한 각각의 게시물을 별개로 거절할 수도 있습니다.
         disallow: 게시물 비허용
         disallow_account: 작성자 비허용
         no_status_selected: 아무 것도 선택 되지 않아 어떤 유행중인 게시물도 바뀌지 않았습니다
@@ -1124,7 +1124,6 @@ ko:
     basic_information: 기본 정보
     hint_html: "<strong>내 공개 프로필과 게시물 옆에 보이는 부분을 꾸미세요.</strong> 다른 사람들은 프로필 내용과 사진이 채워진 계정과 더 상호작용하고 팔로우를 하고 싶어합니다."
     other: 기타
-    safety_and_privacy: 안전과 개인정보
   errors:
     '400': 제출한 요청이 올바르지 않습니다.
     '403': 이 페이지를 표시할 권한이 없습니다.
@@ -1229,7 +1228,7 @@ ko:
       invalid_csv_file: '올바르지 않은 CSV 파일입니다. 오류: %{error}'
       over_rows_processing_limit: "%{count}개 이상의 열을 포함합니다"
       too_large: 파일이 너무 큼
-    failures: 실패함
+    failures: 실패
     imported: 가져옴
     mismatched_types_warning: 가져오기할 때 잘못된 유형을 선택했을 수 있으니, 꼭 두 번 체크해주세요.
     modes:
@@ -1276,9 +1275,9 @@ ko:
       blocking: 차단한 계정 목록
       bookmarks: 북마크
       domain_blocking: 도메인 차단 목록
-      following: 팔로우 중인 계정 목록
+      following: 팔로잉 목록
       lists: 리스트
-      muting: 뮤트 중인 계정 목록
+      muting: 뮤트한 계정 목록
     upload: 업로드
   invites:
     delete: 비활성화
@@ -1363,7 +1362,7 @@ ko:
       cooldown: 이주 뒤에는 새로운 이주를 하지 못하는 휴식기간이 존재합니다
       disabled_account: 이 계정은 완전한 사용이 불가능하게 됩니다. 하지만, 데이터 내보내기나 재활성화를 위해 접근할 수 있습니다.
       followers: 이 행동은 현재 계정의 모든 팔로워를 새 계정으로 이동시킵니다
-      only_redirect_html: 대신, <a href="%{path}">프로필에 리디렉션만 표시</a>할 수 있습니다.
+      only_redirect_html: 대신, <a href="%{path}">프로필에 리디렉션만 표시</a>할 수도 있습니다.
       other_data: 다른 어떤 데이터도 자동적으로 옮겨지지 않을 것입니다
       redirect: 현재 계정 프로필은 리다이렉트 알림과 함께 업데이트 되며 검색에서 제외 됩니다
   moderation:
@@ -1395,8 +1394,8 @@ ko:
       title: 새 팔로우 요청
     mention:
       action: 답장
-      body: "%{name} 님이 나를 언급했습니다:"
-      subject: "%{name} 님이 나를 언급했습니다"
+      body: "%{name} 님이 나를 멘션했습니다:"
+      subject: "%{name} 님이 나를 멘션했습니다"
       title: 새 답글
     poll:
       subject: "%{name}의 투표가 종료되었습니다"
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 74b5f51eeb..d03b1e5dbe 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -3,9 +3,16 @@ lt:
   about:
     about_mastodon_html: Mastodon, tai socialinis tinklas pagrįstas atviro kodo programavimu, ir atvirais web protokolais. Visiškai nemokamas. Ši sistema decantrilizuota kaip jūsų elektroninis paštas.
     contact_missing: Nenustatyta
+    contact_unavailable: Nėra duomenų
     hosted_on: Mastodon palaikomas naudojantis %{domain} talpinimu
+    title: Apie
   accounts:
     follow: Sekti
+    followers:
+      few: Sekėjai
+      many: Sekėjai
+      one: Sekėjas
+      other: Sekėjai
     following: Sekami
     last_active: paskutinį kartą aktyvus
     link_verified_on: Nuorodos nuosavybė paskutinį kartą tikrinta %{date}
@@ -22,6 +29,7 @@ lt:
       created_msg: Moderavimo žinutė sėkimngai sukurta!
       destroyed_msg: Moderacijos žinutė sėkmingai ištrinta!
     accounts:
+      approve: Patvirtinti
       are_you_sure: Ar esate įsitikinęs?
       avatar: Profilio nuotrauka
       by_domain: Domenas
@@ -51,6 +59,7 @@ lt:
       header: Antraštė
       inbox_url: Gautųjų URL
       invited_by: Pakvietė
+      ip: IP
       joined: Prisijungė
       location:
         all: Visi
@@ -84,6 +93,7 @@ lt:
       reset_password: Atkurti slaptažodį
       resubscribe: Per prenumeruoti
       search: Ieškoti
+      sensitized: Pažymėti kaip jautrią informaciją
       shared_inbox_url: Bendroji gautųjų URL
       show:
         created_reports: Parašyti raportai
diff --git a/config/locales/ml.yml b/config/locales/ml.yml
index 5f8de52987..ae2a93a33a 100644
--- a/config/locales/ml.yml
+++ b/config/locales/ml.yml
@@ -76,6 +76,14 @@ ml:
     invites:
       filter:
         all: എല്ലാം
+  errors:
+    '400': The request you submitted was invalid or malformed.
+    '403': You don't have permission to view this page.
+    '404': The page you are looking for isn't here.
+    '406': This page is not available in the requested format.
+    '410': The page you were looking for doesn't exist here anymore.
+    '429': Too many requests
+    '503': The page could not be served due to a temporary server failure.
   filters:
     contexts:
       notifications: അറിയിപ്പുകൾ
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index 678dbcd762..c0d0c1eecc 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -89,6 +89,7 @@ ms:
       moderation:
         active: Aktif
         all: Semua
+        disabled: Dimatikan
         pending: Menunggu
         silenced: Terhad
         suspended: Digantungkan
@@ -113,12 +114,16 @@ ms:
       redownloaded_msg: Berjaya segarkan semula profil %{username} daripada asalnya
       reject: Tolak
       rejected_msg: Berjaya menolak permohonan pendaftaran %{username}
+      remote_suspension_irreversible: Data akaun ini telah dipadamkan secara tidak dapat dipulihkan.
+      remote_suspension_reversible_hint_html: Akaun telah digantung pada server mereka dan data akan dialih keluar sepenuhnya pada %{date}. Sehingga itu, server jauh boleh memulihkan akaun ini tanpa sebarang kesan buruk. Jika anda ingin mengalih keluar semua data akaun dengan segera, anda boleh berbuat demikian di bawah.
       remove_avatar: Buang avatar
       remove_header: Buang pengepala
       removed_avatar_msg: Berjaya membuang imej avatar %{username}
       removed_header_msg: Berjaya membuang imej pengepala %{username}
       resend_confirmation:
         already_confirmed: Pengguna ini telah disahkan
+        send: Hantar semula pautan pengesahan
+        success: Pautan pengesahan berjaya dihantar!
       reset: Tetapkan semula
       reset_password: Tetapkan semula kata laluan
       resubscribe: Langgan semula
@@ -126,6 +131,7 @@ ms:
       search: Cari
       search_same_email_domain: Pengguna lain dengan domain e-mel yang sama
       search_same_ip: Pengguna lain dengan alamat IP yang sama
+      security: Keselamatan
       security_measures:
         only_password: Kata laluan sahaja
         password_and_2fa: Kata laluan dan 2FA
@@ -369,6 +375,15 @@ ms:
       undo: Buang kebenaran persekutuan dengan domain
     domain_blocks:
       add_new: Tambah penyekatan domain baharu
+      confirm_suspension:
+        cancel: Batal
+        confirm: Gantung
+        permanent_action: Membuat asal penggantungan tidak akan memulihkan sebarang data atau perhubungan.
+        preamble_html: Anda akan menggantung <strong>%{domain}</strong> dan subdomainnya.
+        remove_all_data: Ini akan mengalih keluar semua kandungan, media dan data profil untuk akaun domain ini daripada sever anda.
+        stop_communication: Server anda akan berhenti berkomunikasi dengan server ini.
+        title: Sahkan blok domain untuk %{domain}
+        undo_relationships: Ini akan membuat asal sebarang hubungan ikut antara akaun server ini dan akaun anda.
       created_msg: Sekatan domain sedang diproses
       destroyed_msg: Sekatan domain telah diundurkan
       domain: Domain
@@ -381,6 +396,7 @@ ms:
         create: Cipta sekatan
         hint: Sekatan domain tidak akan menghindarkan penciptaan entri akaun dalam pangkalan data, tetapi akan dikenakan kaedah penyederhanaan khusus tertentu pada akaun-akaun tersebut secara retroaktif dan automatik.
         severity:
+          desc_html: "<strong>Had</strong> akan menjadikan siaran daripada akaun di domain ini tidak kelihatan kepada sesiapa sahaja yang tidak mengikutinya. <strong>Tangguhkan</strong> akan mengalih keluar semua kandungan, media dan data profil untuk akaun domain ini daripada server anda. Gunakan <strong>Tiada</strong> jika anda hanya mahu menolak fail media."
           noop: Tiada
           silence: Hadkan
           suspend: Gantungkan
@@ -414,6 +430,8 @@ ms:
         resolve: Menyelesaikan domain
         title: Sekat domain e-mel baharu
       no_email_domain_block_selected: Tiada sekatan domain e-mel diubah kerana tiada yang dipilih
+      not_permitted: Tidak dibenarkan
+      resolved_dns_records_hint_html: Nama domain diselesaikan kepada domain MX berikut, yang akhirnya bertanggungjawab untuk menerima e-mel. Menyekat domain MX akan menyekat pendaftaran daripada mana-mana alamat e-mel yang menggunakan domain MX yang sama, walaupun nama domain yang kelihatan berbeza. <strong>Berhati-hati untuk tidak menyekat penyedia e-mel utama.</strong>
       resolved_through_html: Diselesaikan melalui %{domain}
       title: Domain e-mel disekat
     export_domain_allows:
@@ -422,7 +440,14 @@ ms:
       no_file: Tiada fail dipilih
     export_domain_blocks:
       import:
+        description_html: Anda akan mengimport senarai blok domain. Sila semak senarai ini dengan teliti, terutamanya jika anda belum mengarang senarai ini sendiri.
         existing_relationships_warning: Hubungan ikut sedia ada
+        private_comment_description_html: 'Untuk membantu anda menjejak dari mana datangnya blok yang diimport, blok yang diimport akan dibuat dengan ulasan peribadi berikut: <q>%{comment}</q>'
+        private_comment_template: Diimport daripada %{source} pada %{date}
+        title: Import blok domain
+      invalid_domain_block: 'Satu atau lebih blok domain telah dilangkau kerana ralat berikut: %{error}'
+      new:
+        title: Import blok domain
       no_file: Tiada fail yang dipilih
     follow_recommendations:
       description_html: "<strong>Saranan ikutan membantu pengguna baharu mencari kandungan menarik dengan cepat</strong>. Apabila pengguna belum cukup berinteraksi dengan akaun lain untuk membentuk saranan ikutan tersendiri, akaun-akaun inilah yang akan disarankan. Ia dinilai semula setiap hari dari gabungan keterlibatan tertinggi terkini dan juga jumlah pengikut tempatan tertinggi mengikut bahasa masing-masing."
@@ -434,6 +459,8 @@ ms:
       unsuppress: Tetap semula saranan ikutan
     instances:
       availability:
+        failure_threshold_reached: Ambang kegagalan dicapai pada %{date}.
+        no_failures_recorded: Tiada kegagalan dalam rekod.
         title: Ketersediaan
         warning: Percubaan terakhir untuk menyambung ke pelayan ini tidak berjaya
       back_to_all: Semua
@@ -443,8 +470,13 @@ ms:
       confirm_purge: Adakah anda pasti mahu menghapuskan senarai ini secara kekal daripada domain ini?
       content_policies:
         comment: Catatan dalaman
+        description_html: Anda boleh menentukan dasar kandungan yang akan digunakan pada semua akaun daripada domain ini dan mana-mana subdomainnya.
+        limited_federation_mode_description_html: Anda boleh memilih sama ada untuk membenarkan persekutuan dengan domain ini.
         policies:
+          reject_media: Tolak media
+          reject_reports: Tolak laporan
           silence: Hadkan
+          suspend: Gantung
         policy: Dasar
         reason: Sebab awam
         title: Dasar kandungan
@@ -454,6 +486,7 @@ ms:
         instance_followers_measure: pengikut kami di situ
         instance_follows_measure: pengikut mereka di sini
         instance_languages_dimension: Bahasa teratas
+        instance_media_attachments_measure: lampiran media yang disimpan
         instance_reports_measure: laporan mengenai mereka
         instance_statuses_measure: Hantaran yang disimpan
       delivery:
@@ -466,19 +499,25 @@ ms:
       delivery_available: Penghantaran tersedia
       delivery_error_days: Hari ralat penghantaran
       delivery_error_hint: Jika penghantaran tidak berjaya selama %{count} hari, ia akan ditanda sebagai tidak boleh dihantar.
+      destroyed_msg: Data daripada %{domain} kini beratur untuk pemadaman segera.
       empty: Tiada domain dijumpai.
+      known_accounts:
+        other: "%{count} akaun dikenali"
       moderation:
         all: Semua
         limited: Terhad
         title: Penyederhanaan
       private_comment: Ulasan peribadi
       public_comment: Ulasan awam
+      purge: Singkir
+      purge_description_html: Jika anda percaya domain ini berada di luar talian selama-lamanya, anda boleh memadamkan semua rekod akaun dan data yang berkaitan daripada domain ini daripada storan anda. Ini mungkin mengambil sedikit masa.
       title: Persekutuan
       total_blocked_by_us: Disekati kami
       total_followed_by_them: Diikuti mereka
       total_followed_by_us: Diikuti kami
       total_reported: Laporan tentang mereka
       total_storage: Lampiran media
+      totals_time_period_hint_html: Jumlah yang dipaparkan di bawah termasuk data untuk sepanjang masa.
     invites:
       deactivate_all: Nyahaktifkan semua
       filter:
@@ -532,15 +571,25 @@ ms:
       actions:
         delete_description_html: Hantaran yang dilaporkan akan dihapuskan dan pelanggaran itu akan direkodkan bagi membantu anda menguruskan pelanggaran pada akaun yang sama di masa akan datang.
         mark_as_sensitive_description_html: Media di dalam hantaran yang dilaporkan akan ditandakan sebagai sensitif dan pelanggaran itu akan direkodkan bagi membantu anda menguruskan pelanggaran pada akaun yang sama di masa akan datang.
+        other_description_html: Lihat lebih banyak pilihan untuk mengawal tingkah laku akaun dan menyesuaikan komunikasi ke akaun yang dilaporkan.
         resolve_description_html: Tiada tindakan akan diambil terhadap akaun yang dilaporkan, tiada pelanggaran direkodkan dan laporan akan ditutup.
+        silence_description_html: Akaun itu akan kelihatan hanya kepada mereka yang telah mengikutinya atau mencarinya secara manual, mengehadkan capaiannya dengan teruk. Sentiasa boleh dikembalikan. Menutup semua laporan terhadap akaun ini.
+        suspend_description_html: Akaun dan semua kandungannya akan tidak boleh diakses dan akhirnya dipadamkan, dan berinteraksi dengannya adalah mustahil. Boleh diterbalikkan dalam masa 30 hari. Menutup semua laporan terhadap akaun ini.
+      actions_description_html: Tentukan tindakan yang perlu diambil untuk menyelesaikan laporan ini. Jika anda mengambil tindakan menghukum terhadap akaun yang dilaporkan, pemberitahuan e-mel akan dihantar kepada mereka, kecuali apabila kategori <strong>Spam</strong> dipilih.
+      actions_description_remote_html: Tentukan tindakan yang perlu diambil untuk menyelesaikan laporan ini. Ini hanya akan menjejaskan cara server<strong>anda</strong> berkomunikasi dengan akaun jauh ini dan mengendalikan kandungannya.
       add_to_report: Tambahkan lebih banyak pada laporan
       are_you_sure: Adakah anda pasti?
       assign_to_self: Menugaskan kepada saya
       assigned: Penyederhana yang ditugaskan
       by_target_domain: Domain bagi akaun yang dilaporkan
+      cancel: Batal
       category: Kumpulan
+      category_description_html: Sebab akaun dan/atau kandungan ini dilaporkan akan disebut dalam komunikasi dengan akaun yang dilaporkan
       comment:
         none: Tiada
+      comment_description_html: 'Untuk memberikan maklumat lanjut, %{name} menulis:'
+      confirm: Konfirm
+      confirm_action: Sahkan tindakan penyederhanaan terhadap @%{acct}
       created_at: Dilaporkan
       delete_and_resolve: Padam hantaran
       forwarded: Dipanjangkan
@@ -556,6 +605,10 @@ ms:
         delete: Padam
         placeholder: Terangkan tindakan apa yang telah diambil, atau sebarang kemas kini lain yang berkaitan...
         title: Catatan
+      notes_description_html: Lihat dan tinggalkan nota kepada moderator lain dan diri masa depan anda
+      processed_msg: 'Laporan #%{id} berjaya diproses'
+      quick_actions_description_html: 'Ambil tindakan pantas atau tatal ke bawah untuk melihat kandungan yang dilaporkan:'
+      remote_user_placeholder: pengguna jauh dari %{instance}
       reopen: Buka semula laporan
       report: 'Laporan #%{id}'
       reported_account: Akaun yang dilaporkan
@@ -565,9 +618,29 @@ ms:
       skip_to_actions: Langkau ke tindakan
       status: Status
       statuses: Kandungan yang dilaporkan
+      statuses_description_html: Kandungan yang menyinggung perasaan akan disebut dalam komunikasi dengan akaun yang dilaporkan
+      summary:
+        action_preambles:
+          delete_html: 'Anda akan <strong>mengalih keluar</strong> beberapa siaran <strong>@%{acct}</strong>. Ini akan:'
+          mark_as_sensitive_html: 'Anda akan <strong>menandai</strong> beberapa siaran <strong>@%{acct}</strong> sebagai <strong>sensitif</strong>. Ini akan:'
+          silence_html: 'Anda akan <strong>menghadkan</strong> akaun <strong>@%{acct}</strong>. Ini akan:'
+          suspend_html: 'Anda akan <strong>menggantung</strong> akaun <strong>@%{acct}</strong>. Ini akan:'
+        actions:
+          delete_html: Alih keluar pos yang menyinggung perasaan
+          mark_as_sensitive_html: Tandai media pos yang menyinggung perasaan sebagai sensitif
+          silence_html: Hadkan capaian <strong>@%{acct}</strong> dengan ketat dengan menjadikan profil dan kandungan mereka hanya kelihatan kepada orang yang sudah mengikuti mereka atau melihat profil itu secara manual
+          suspend_html: Gantung <strong>@%{acct}</strong>, menjadikan profil dan kandungan mereka tidak boleh diakses dan mustahil untuk berinteraksi dengannya
+        close_report: 'Tandai laporan #%{id} sebagai diselesaikan'
+        close_reports_html: Tandai <strong>semua</strong> laporan terhadap <strong>@%{acct}</strong> sebagai telah diselesaikan
+        delete_data_html: Padamkan profil dan kandungan <strong>@%{acct}</strong> 30 hari dari sekarang melainkan mereka dibatalkan penggantungan buat sementara waktu
+        preview_preamble_html: "<strong>@%{acct}</strong> akan menerima amaran dengan kandungan berikut:"
+        record_strike_html: Rakam bantahan terhadap <strong>@%{acct}</strong> untuk membantu anda mempertingkatkan tentang pelanggaran akaun ini pada masa hadapan
+        send_email_html: Hantar <strong>@%{acct}</strong> e-mel amaran
+        warning_placeholder: Penaakulan tambahan pilihan untuk tindakan penyederhanaan.
       target_origin: Asalan akaun yang dilaporkan
       title: Laporan
       unassign: Nyahtugaskan
+      unknown_action_msg: 'Tindakan tidak diketahui: %{action}'
       unresolved: Nyahselesaikan
       updated_at: Dikemaskini
       view_profile: Lihat profil
@@ -582,12 +655,15 @@ ms:
         moderation: Penyederhanaan
         special: Khas
       delete: Padam
+      description_html: Dengan <strong>peranan pengguna</strong>, anda boleh menyesuaikan fungsi dan kawasan Mastodon yang boleh diakses oleh pengguna anda.
       edit: Sunting peranan '%{name}'
       everyone: Kebenaran lalai
+      everyone_full_description_html: Ini ialah <strong>peranan asas</strong> yang mempengaruhi <strong>semua pengguna</strong>, walaupun mereka yang tidak mempunyai peranan yang ditetapkan. Semua peranan lain mewarisi kebenaran daripadanya.
       permissions_count:
         other: "%{count} kebenaran"
       privileges:
         administrator: Pentadbir
+        administrator_description: Users with this permission will bypass every permission
         delete_user_data: Padamkan Data Pengguna
         delete_user_data_description: Membenarkan pengguna menghapuskan data pengguna lain tanpa bertangguh
         invite_users: Mengundang pengguna
@@ -644,12 +720,24 @@ ms:
         preamble: Menyesuaikan antara muka web Mastodon.
         title: Penampilan
       branding:
+        preamble: Penjenamaan server anda membezakannya daripada server lain dalam rangkaian. Maklumat ini mungkin dipaparkan merentasi pelbagai persekitaran, seperti antara muka web Mastodon, aplikasi asli, dalam pratonton pautan di tapak web lain dan dalam aplikasi pemesejan, dan sebagainya. Atas sebab ini, adalah lebih baik untuk memastikan maklumat ini jelas, pendek dan padat.
         title: Penjenamaan
+      captcha_enabled:
+        desc_html: Ini bergantung pada skrip luaran daripada hCaptcha, yang mungkin menjadi kebimbangan keselamatan dan privasi. Selain itu, <strong>ini boleh menjadikan proses pendaftaran menjadi kurang dapat diakses oleh sesetengah orang (terutamanya orang kurang upaya)</strong>. Atas sebab ini, sila pertimbangkan langkah alternatif seperti pendaftaran berasaskan kelulusan atau jemputan.
+        title: Memerlukan pengguna baharu menyelesaikan CAPTCHA untuk mengesahkan akaun mereka
       content_retention:
+        preamble: Kawal cara kandungan yang dijana pengguna disimpan dalam Mastodon.
         title: Pengekalan kandungan
+      default_noindex:
+        desc_html: Mempengaruhi semua pengguna yang tidak menukar tetapan ini sendiri
+        title: Tarik pengguna keluar daripada pengindeksan enjin carian secara lalai
       discovery:
+        follow_recommendations: Ikut cadangan
+        preamble: Memaparkan kandungan yang menarik adalah penting dalam memasukkan pengguna baharu yang mungkin tidak mengenali sesiapa Mastodon. Kawal cara pelbagai ciri penemuan berfungsi pada server anda.
         profile_directory: Direktori profil
         public_timelines: Garis masa awam
+        publish_discovered_servers: Terbitkan pelayan yang ditemui
+        publish_statistics: Terbitkan statistik
         title: Penemuan
         trends: Sohor kini
       domain_blocks:
@@ -664,14 +752,22 @@ ms:
           approved: Kelulusan diperlukan untuk pendaftaran
           none: Tiada siapa boleh mendaftar
           open: Sesiapapun boleh mendaftar
+      title: Tetapan server
     site_uploads:
       delete: Hapuskan fail yang dimuat naik
       destroyed_msg: Muat naik tapak berjaya dihapuskan!
     statuses:
       account: Penulis
+      application: Aplikasi
+      back_to_account: Kembali ke halaman akaun
+      back_to_report: Kembali ke halaman laporan
+      batch:
+        remove_from_report: Alih keluar daripada laporan
+        report: Laporan
       deleted: Dipadamkan
       favourites: Gemaran
       history: Sejarah versi
+      in_reply_to: Membalas kepada
       language: Bahasa
       media:
         title: Media
@@ -683,6 +779,8 @@ ms:
       status_changed: Hantaran diubah
       title: Hantaran akaun
       trending: Sohor kini
+      visibility: Visibiliti
+      with_media: Dengan media
     strikes:
       actions:
         delete_statuses: "%{name} memadam hantaran %{target}"
@@ -694,17 +792,50 @@ ms:
         suspend: "%{name} telah menggantungkan akaun %{target}"
       appeal_approved: Dirayu
       appeal_pending: Rayuan yang belum selesai
+      appeal_rejected: Rayuan ditolak
+    system_checks:
+      database_schema_check:
+        message_html: Terdapat migrasi pangkalan data yang belum selesai. Sila jalankannya untuk memastikan aplikasi berfungsi seperti yang diharapkan
+      elasticsearch_running_check:
+        message_html: Tidak dapat menyambung ke Elasticsearch. Sila semak sama ada ia sedang berjalan atau lumpuhkan carian teks penuh
+      elasticsearch_version_check:
+        message_html: 'Versi Elasticsearch tidak serasi: %{value}'
+        version_comparison: Elasticsearch %{running_version} sedang berjalan manakala %{required_version} diperlukan
+      rules_check:
+        action: Urus peraturan server
+        message_html: Anda belum menentukan sebarang peraturan server.
+      sidekiq_process_check:
+        message_html: Tiada proses Sidekiq berjalan untuk baris gilir %{value}. Sila semak konfigurasi Sidekiq anda
+      upload_check_privacy_error:
+        action: Semak di sini untuk maklumat lanjut
+        message_html: "<strong>Server web anda salah konfigurasi. Privasi pengguna anda berisiko</strong>"
+      upload_check_privacy_error_object_storage:
+        action: Semak di sini untuk maklumat lanjut
+        message_html: "<strong>Ruang objek anda salah konfigurasi. Privasi pengguna anda berisiko</strong>"
     tags:
       review: Semak status
+      updated_msg: Tetapan hashtag berjaya dikemas kini
     title: Pentadbiran
     trends:
       allow: Izin
       approved: Diluluskan
+      disallow: Tidak membenarkan
       links:
         allow: Membenarkan pautan
         allow_provider: Membenarkan penerbit
+        description_html: Ini ialah pautan yang sedang banyak dikongsi oleh akaun tempat server anda melihat siaran daripadanya. Ia boleh membantu pengguna anda mengetahui perkara yang berlaku di dunia. Tiada pautan dipaparkan secara terbuka sehingga anda meluluskan penerbit. Anda juga boleh membenarkan atau menolak pautan individu.
+        disallow: Tidak membenarkan pautan
+        disallow_provider: Tolak penerbit
+        no_link_selected: Tiada pautan ditukar kerana tiada pautan dipilih
+        publishers:
+          no_publisher_selected: Tiada penerbit ditukar kerana tiada penerbit dipilih
         title: Pautan yang sedang sohor kini
+        usage_comparison: Dikongsi %{today} kali hari ini, berbanding %{yesterday} semalam
+      not_allowed_to_trend: Tidak dibenarkan menjadi trend
+      only_allowed: Hanya dibenarkan
+      pending_review: Menunggu semak semula
       preview_card_providers:
+        description_html: Ini adalah domain dari mana pautan sering dikongsi pada server anda. Pautan tidak akan menjadi aliran secara terbuka melainkan domain pautan itu diluluskan. Kelulusan (atau penolakan) anda dilanjutkan kepada subdomain.
         rejected: Pautan daripada penerbit ini tidak akan menjadi sohor kini
         title: Penerbit
       rejected: Ditolak
@@ -735,33 +866,88 @@ ms:
       delete: Padam
     webhooks:
       delete: Padam
+      empty: You don't have any webhook endpoints configured yet.
       enable: Dayakan
       enabled: Aktif
+      new: Webhook baru
+      rotate_secret: Putar rahsia
+      secret: Menandatangani rahsia
+      status: Status
+      title: Webhook
+      webhook: Webhook
   admin_mailer:
     new_appeal:
       actions:
+        delete_statuses: untuk memadamkan pos mereka
+        disable: untuk membekukan akaun mereka
+        mark_statuses_as_sensitive: untuk menandakan pos mereka sebagai sensitif
+        none: amaran
+        sensitive: untuk menandakan akaun mereka sebagai sensitif
         silence: untuk mengehadkan akaun mereka
+        suspend: untuk menggantung akaun mereka
+      body: "%{target} sedang merayu keputusan penyederhanaan sebanyak %{action_taken_by} dari %{date}, iaitu %{type}. Mereka tulis:"
+      next_steps: Anda boleh meluluskan rayuan untuk membuat asal keputusan penyederhanaan atau mengabaikannya.
+      subject: "%{username} sedang merayu keputusan penyederhanaan pada %{instance}"
+    new_pending_account:
+      body: Butiran akaun baharu ada di bawah. Anda boleh meluluskan atau menolak aplikasi ini.
+      subject: Akaun baharu disediakan untuk semakan pada %{instance} (%{username})
+    new_report:
+      body: "%{reporter} telah melaporkan %{target}"
+      body_remote: Seseorang daripada %{domain} telah melaporkan %{target}
+      subject: Laporan baharu untuk %{instance} (#%{id})
+    new_trends:
+      body: 'Item berikut memerlukan semakan sebelum boleh dipaparkan secara terbuka:'
+      new_trending_links:
+        title: Pautan sohor kini
+      new_trending_statuses:
+        title: Pos sohor kini
+      new_trending_tags:
+        no_approved_tags: Pada masa ini tiada hashtag sohor kini yang diluluskan.
+        requirements: 'Mana-mana calon ini boleh melepasi hashtag arah aliran #%{rank} yang diluluskan, yang pada masa ini ialah #%{lowest_tag_name} dengan markah %{lowest_tag_score}.'
   appearance:
+    advanced_web_interface_hint: 'Jika anda ingin menggunakan keseluruhan lebar skrin anda, antara muka web lanjutan membolehkan anda mengkonfigurasi banyak lajur berbeza untuk melihat seberapa banyak maklumat pada masa yang sama seperti yang anda mahu: Laman Utama, pemberitahuan, garis masa bersekutu, sebarang bilangan senarai dan hashteg.'
+    discovery: Penemuan
     localization:
       guide_link_text: Sesiapa sahaja boleh memberi sumbangan.
     sensitive_content: Kandungan sensitif
   application_mailer:
     notification_preferences: Tukar keutamaan e-mel
+    salutation: "%{name},"
     view: 'Lihat:'
     view_profile: Lihat profil
     view_status: Lihat hantaran
+  applications:
+    logout: Log keluar
+    your_token: Token akses anda
   auth:
+    apply_for_account: Minta akaun
+    captcha_confirmation:
+      title: Pemeriksaan keselamatan
     delete_account: Padam akaun
     description:
       prefix_sign_up: Daftar pada Mastodon hari ini!
+      suffix: Dengan akaun, anda akan dapat mengikuti orang, menyiarkan kemas kini dan bertukar-tukar mesej dengan pengguna dari mana-mana server Mastodon dan banyak lagi!
+    didnt_get_confirmation: Tidak menerima pautan pengesahan?
+    dont_have_your_security_key: Tiada kunci keselamatan anda?
     forgot_password: Terlupa kata laluan anda?
+    invalid_reset_password_token: Token tetapan semula kata laluan tidak sah atau tamat tempoh. Sila minta yang baharu.
     log_in_with: Daftar masuk dengan
     login: Daftar masuk
     logout: Daftar keluar
     migrate_account: Pindah kepada akaun lain
+    migrate_account_html: Jika anda ingin mengubah hala akaun ini kepada akaun lain, anda boleh <a href="%{path}">konfigurasikannya di sini</a>.
     or_log_in_with: Atau daftar masuk dengan
+    progress:
+      confirm: Sahkan E-mel
+      details: Maklumat anda
+    providers:
+      cas: CAS
+      saml: SAML
     register: Daftar
     registration_closed: "%{instance} tidak menerima ahli-ahli baru"
+    rules:
+      accept: Terima
+      back: Kembali
     security: Keselamatan
     status:
       account_status: Status akaun
@@ -774,6 +960,7 @@ ms:
   datetime:
     distance_in_words:
       half_a_minute: Sebentar tadi
+      less_than_x_seconds: Baru sahaja
   deletes:
     proceed: Padam akaun
   disputes:
@@ -818,8 +1005,11 @@ ms:
     '503': Halaman tidak dapat disampaikan kerana kegagalan pelayan sementara.
   exports:
     archive_takeout:
+      date: Tarikh
       in_progress: Mengkompil arkib anda...
       request: Minta arkib anda
+      size: Saiz
+    blocks: Blok anda
     csv: CSV
     domain_blocks: Domain disekat
     lists: Senarai
@@ -832,6 +1022,7 @@ ms:
       keywords: Kata kunci
       title: Sunting penapis
     index:
+      delete: Padam
       empty: Anda tiada penapis.
       keywords:
         other: "%{count} kata kunci"
@@ -852,8 +1043,18 @@ ms:
     deselect: Nyahpilih semua
     none: Tiada
   imports:
+    errors:
+      too_large: Fail terlalu besar
+    states:
+      finished: Selesai
+      in_progress: Dalam proses
+      scheduled: Dijadualkan
+    status: Status
+    types:
+      lists: Senarai
     upload: Muat naik
   invites:
+    expired: Tamat tempoh
     expires_in:
       '1800': 30 minit
       '21600': 6 jam
@@ -867,9 +1068,16 @@ ms:
       password: kata laluan
       sign_in_token: e-mel kod keselamatan
       webauthn: kunci keselamatan
+  mail_subscriptions:
+    unsubscribe:
+      title: Hentikan langganan
   migrations:
     acct: Dipindah ke
+    errors:
+      not_found: tidak dapat dicarikan
     proceed_with_move: Pindah pengikut
+    warning:
+      backreference_required: Akaun baharu mesti terlebih dahulu dikonfigurasikan untuk merujuk semula akaun ini
   notification_mailer:
     follow:
       title: Pengikut baru
diff --git a/config/locales/my.yml b/config/locales/my.yml
index 2ce63d2725..8eef41b369 100644
--- a/config/locales/my.yml
+++ b/config/locales/my.yml
@@ -1122,7 +1122,6 @@ my:
     basic_information: အခြေခံသတင်းအချက်အလက်
     hint_html: "<strong>သင်၏ အများမြင်ပရိုဖိုင်နှင့် သင့်ပို့စ်များဘေးရှိ တွေ့မြင်ရသည့်အရာကို စိတ်ကြိုက်ပြင်ဆင်ပါ။ </strong> သင့်တွင် ပရိုဖိုင်နှင့် ပရိုဖိုင်ပုံတစ်ခု ဖြည့်သွင်းထားပါက အခြားသူများအနေဖြင့် သင်နှင့် အပြန်အလှန် တုံ့ပြန်နိုင်ခြေပိုများပါသည်။"
     other: အခြား
-    safety_and_privacy: ဘေးကင်းရေးနှင့် လျှို့ဝှက်ရေး
   errors:
     '400': သင်တင်ပြသော တောင်းဆိုချက်မှာ မမှန်ကန်ပါ သို့မဟုတ် ပုံစံမမှန်ပါ။
     '403': ဤစာမျက်နှာကြည့်ရှုရန် သင့်တွင် ခွင့်ပြုချက်မရှိပါ။
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index ab3bcfac61..ca7eedb95d 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -1140,7 +1140,6 @@ nl:
     basic_information: Algemene informatie
     hint_html: "<strong>Pas aan wat mensen op jouw openbare profiel en naast je berichten zien.</strong> Andere mensen zullen je eerder volgen en met je communiceren wanneer je profiel is ingevuld en je een profielfoto hebt."
     other: Overige
-    safety_and_privacy: Veiligheid en privacy
   errors:
     '400': De aanvraag die je hebt ingediend was ongeldig of foutief.
     '403': Jij hebt geen toestemming om deze pagina te bekijken.
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index 90616bf863..401cbad05c 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -385,7 +385,12 @@ nn:
       confirm_suspension:
         cancel: Avbryt
         confirm: Suspender
-        permanent_action: Å oppheve suspensjonen vil ikke gjenopprette noe data eller koblinger.
+        permanent_action: Å oppheve suspensjonen vil ikkje gjenopprette data eller koplingar.
+        preamble_html: Du er i ferd med å suspendera <strong>%{domain}</strong> inkludert underdomener.
+        remove_all_data: Dette vil fjerna alt innhald, media og profildata for kontoar som tilhøyrer dette domenet frå din tenar.
+        stop_communication: Tenaren din vil slutta å kommunisera med desse tenarane.
+        title: Stadfest domeneblokkering for %{domain}
+        undo_relationships: Dette vil oppheve alle følgar-relasjonar mellom kontoane dine og kontoar på desse tenerane.
       created_msg: Domeneblokkering blir nå behandlet
       destroyed_msg: Domeneblokkering har nå blitt angret
       domain: Domene
@@ -735,6 +740,9 @@ nn:
       branding:
         preamble: Profileringa av tenaren din skil den frå andre tenarar i nettverket. Informasjonen kan bli vist ulike stadar, til dømes i Mastodon sitt web-grensesnitt, i eigne applikasjonar, i førehandsvisningar på andre nettsider, i meldingsappar og så bortetter. På grunn av dette er det best å halde informasjonen enkel, kort og treffande.
         title: Profilering
+      captcha_enabled:
+        desc_html: Dette baserer seg på eksterne skript frå hCaptcha, noko som kan vera eit tryggleiks- og personvernsproblem. <strong>I tillegg kan dette gjera registreringsprosessen monaleg mindre tilgjengeleg (særleg for folk med nedsett funksjonsevne)</strong>. Dette gjer at du bør du vurdera alternative tiltak, som til dømes godkjennings- eller invitasjonsbasert registrering.
+        title: Krev at nye brukarar løyser ein CAPTCHA for å bekrefte kontoen sin
       content_retention:
         preamble: Styr korleis brukargenerert innhald blir lagra i Mastodon.
         title: Bevaring av innhald
@@ -762,6 +770,7 @@ nn:
           approved: Godkjenning kreves for påmelding
           none: Ingen kan melda seg inn
           open: Kven som helst kan melda seg inn
+      title: Tenarinstillingar
     site_uploads:
       delete: Slett opplasta fil
       destroyed_msg: Vellukka sletting av sideopplasting!
@@ -968,7 +977,7 @@ nn:
     notification_preferences: Endr e-post-innstillingane
     salutation: Hei %{name},
     settings: 'Endr e-post-innstillingar: %{link}'
-    unsubscribe: Avslutt abonnement
+    unsubscribe: Meld av
     view: 'Sjå:'
     view_profile: Sjå profil
     view_status: Sjå status
@@ -983,7 +992,9 @@ nn:
   auth:
     apply_for_account: Søk om ein konto
     captcha_confirmation:
-      title: Sikkerhetskontroll
+      help_html: Om du har problem med å løyse CAPTCHA, kan kontakte oss på %{email} og vi kan hjelpe deg.
+      hint_html: Berre ein ting til! Vi må bekrefte at du er et menneske (så vi kan halde spam ute!). Løys CAPTCHA-en nedanfor og klikk "Fortsett".
+      title: Sikkerheitssjekk
     confirmations:
       wrong_email_hint: Viss epostadressa er feil, kan du endra ho i kontoinnstillingane.
     delete_account: Slett konto
@@ -1020,9 +1031,9 @@ nn:
     rules:
       accept: Godkjenn
       back: Attende
-      invited_by: 'Du kan bli med %{domain} takket være invitasjonen du fikk fra:'
+      invited_by: 'Du kan bli med i %{domain} takka vere invitasjonen du har fått frå:'
       preamble: Disse angis og håndheves av %{domain}-moderatorene.
-      preamble_invited: Før du fortsetter, vennligst gå gjennom reglene som er satt av moderatorene av %{domain}.
+      preamble_invited: Før du held fram, ver snill og sjå gjennom reglane bestemt av moderatorane av %{domain}.
       title: Noen grunnregler.
       title_invited: Du har blitt invitert.
     security: Tryggleik
@@ -1126,10 +1137,9 @@ nn:
   domain_validator:
     invalid_domain: er ikkje eit gangbart domenenamn
   edit_profile:
-    basic_information: Grunnleggende informasjon
-    hint_html: "<strong>Tilpass hva folk ser på din offentlige profil og ved siden av dine innlegg.</strong> Det er mer sannsynlig at andre mennesker følger deg tilbake og samhandler med deg når du har fylt ut en profil og et profilbilde."
-    other: Annet
-    safety_and_privacy: Sikkerhet og personvern
+    basic_information: Grunnleggande informasjon
+    hint_html: "<strong>Tilpass kva folk ser på den offentlege profilen din og ved sida av innlegga dine.</strong> Andre vil i større grad fylgja og samhandla med deg når du har eit profilbilete og har fyllt ut profilen din."
+    other: Anna
   errors:
     '400': Søknaden du sende var ugyldig eller sett opp feil.
     '403': Du har ikkje løyve til å sjå denne sida.
@@ -1193,6 +1203,12 @@ nn:
       keywords:
         one: "%{count} stikkord"
         other: "%{count} stikkord"
+      statuses:
+        one: "%{count} innlegg"
+        other: "%{count} innlegg"
+      statuses_long:
+        one: "%{count} individuelt innlegg er gøymd"
+        other: "%{count} individuelle innlegg er gøymde"
       title: Filter
     new:
       save: Lagre nytt filter
@@ -1206,6 +1222,12 @@ nn:
         title: Filtrerte innlegg
   generic:
     all: Alle
+    all_items_on_page_selected_html:
+      one: Du har valt <strong>%{count}</strong> element på denne sida.
+      other: Du har valt <strong>%{count}</strong> element på denne sida.
+    all_matching_items_selected_html:
+      one: "<strong>%{count}</strong> element som passar til søket ditt er vald."
+      other: Du har valt <strong>%{count}</strong> element som passar til søket ditt.
     cancel: Avbryt
     changes_saved_msg: Alle endringane vart lagra!
     confirm: Stadfest
@@ -1215,6 +1237,9 @@ nn:
     none: Ingen
     order_by: Sorter etter
     save_changes: Lagr endringar
+    select_all_matching_items:
+      one: Vel %{count} element som passar til søket ditt.
+      other: Vel %{count} element som passar til søket ditt.
     today: i dag
     validation_errors:
       one: Noe er ikke helt riktig ennå. Vennligst se etter en gang til
@@ -1239,12 +1264,14 @@ nn:
       bookmarks_html: Du skal til å <strong>byta ut bokmerka dine</strong> med opp til <strong>%{total_items} innlegg</strong> frå <strong>%{filename}</strong>.
       domain_blocking_html: Du skal til å <strong>byta ut domeneblokkeringslista di</strong> med opp til <strong>%{total_items} domene</strong> frå <strong>%{filename}</strong>.
       following_html: Du skal til å <strong>fylgja</strong> opp til <strong>%{total_items} brukarkontoar</strong> frå <strong>%{filename}</strong> og <strong>slutta å fylgja alle andre</strong>.
+      lists_html: Du er i ferd med å <strong>erstatta listene dine</strong> med innhaldet i <strong>%{filename}</strong>. Opptil <strong>%{total_items} kontoar</strong> vil bli lagt til i nye lister.
       muting_html: Du skal til å <strong>byta ut lista di over dempa brukarkontoar</strong> med opp til <strong>%{total_items} brukarkontoar</strong> frå <strong>%{filename}</strong>.
     preambles:
       blocking_html: Du skal til å <strong>blokkera</strong> opp til <strong>%{total_items} brukarkontoar</strong> frå <strong>%{filename}</strong>.
       bookmarks_html: Du skal til å leggja til opp til <strong>%{total_items} innlegg</strong> frå <strong>%{filename}</strong> til <strong>bokmerka dine</strong>.
       domain_blocking_html: Du skal til å <strong>blokkera</strong> opp til <strong>%{total_items} domene</strong> frå <strong>%{filename}</strong>.
       following_html: Du skal til å <strong>fylgja</strong> opp til <strong>%{total_items} brukarkontoar</strong> frå <strong>%{filename}</strong>.
+      lists_html: Du er i ferd med å leggja til opptil <strong>%{total_items} kontoar</strong> frå <strong>%{filename}</strong> til i <strong>listene</strong> dine. Nye lister vil blir oppretta om ingen lister finst frå før.
       muting_html: Du skal til å <strong>dempa</strong> opp til <strong>%{total_items} brukarkontoar</strong> frå <strong>%{filename}</strong>.
     preface: Du kan henta inn data som du har eksportert frå ein annan tenar, som t.d. ei liste over folka du fylgjer eller blokkerer.
     recent_imports: Siste importar
@@ -1261,6 +1288,7 @@ nn:
       bookmarks: Importerer bokmerke
       domain_blocking: Importerer blokkerte domene
       following: Importerer fylgde brukarkontoar
+      lists: Importerer lister
       muting: Importerer dempa brukarkontoar
     type: Type import
     type_groups:
@@ -1271,6 +1299,7 @@ nn:
       bookmarks: Bokmerker
       domain_blocking: Liste over blokkerte domene
       following: Fylgjeliste
+      lists: Lister
       muting: Dempeliste
     upload: Last opp
   invites:
@@ -1311,19 +1340,19 @@ nn:
     title: Autentiseringshistorikk
   mail_subscriptions:
     unsubscribe:
-      action: Ja, avslutt abonnement
-      complete: Abonnement avsluttet
-      confirmation_html: Er du sikker på at du vil slutte å motta %{type} fra Mastodon %{domain} i e-posten din på %{email}? Du kan når som helst gjenoppta i <a href="%{settings_path}">innstillinger for e-postvarsling</a>.
+      action: Ja, meld av
+      complete: Meldt av
+      confirmation_html: Er du sikker på at du ikkje lenger ynskjer å motta %{type} frå Mastodon på %{domain} til e-posten din %{email}? Du kan alltids gjera om på dette i <a href="%{settings_path}">innstillingar for e-postvarsling</a>.
       emails:
         notification_emails:
-          favourite: e-poster om favorittmarkeringer
-          follow: e-poster om følgere
-          follow_request: e-poster om følgeforespørsler
-          mention: e-poster om nevninger
-          reblog: e-poster om fremhevinger
-      resubscribe_html: Hvis du har avsluttet abonnementet ved en feiltakelse, kan du abonnere på nytt i <a href="%{settings_path}">innstillinger for e-postvarsling</a>.
-      success_html: Du vil ikke lenger motta %{type} fra Mastodon på %{domain} i e-posten din på %{email}.
-      title: Avslutt abonnement
+          favourite: e-postar om favorittmarkeringar
+          follow: e-postar om nye fylgjarar
+          follow_request: e-postar om fylgjeførespurnadar
+          mention: e-postar om nemningar
+          reblog: e-postar om framhevingar
+      resubscribe_html: Om du har avslutta avslutta abonnementet ved ein feil, kan du abonnera på nytt i <a href="%{settings_path}">innstillingar for e-postvarsling</a>.
+      success_html: Du vil ikkje lenger motta %{type} frå Mastodon på %{domain} til din e-post %{email}.
+      title: Meld av
   media_attachments:
     validations:
       images_and_video: Kan ikkje leggja ved video til status som allereie inneheld bilete
@@ -1439,7 +1468,7 @@ nn:
       expired: Denne rundspørjinga er allereie ferdig
       invalid_choice: Det valgte stemmealternativet eksisterer ikke
       over_character_limit: kan ikkje vera lengre enn %{max} teikn kvar
-      self_vote: Du kan ikke stemme i dine egne avstemninger
+      self_vote: Du kan ikkje stemme i di eiga avstemming
       too_few_options: må ha meir enn eitt element
       too_many_options: kan ikkje ha meir enn %{max} element
   preferences:
@@ -1740,12 +1769,12 @@ nn:
     seamless_external_login: Du er logga inn gjennom eit eksternt reiskap, so passord og e-postinstillingar er ikkje tilgjengelege.
     signed_in_as: 'Logga inn som:'
   verification:
-    extra_instructions_html: <strong>Tips:</strong> Lenken på din nettside kan være usynlig. Den viktige delen er <code>rel="me"</code> som sikrer at nettsteder med brukergenerert innhold ikke kan utgi seg for å være deg. Du kan til og med bruke en <code>link</code> lenke i sidens topptekst i stedet for <code>a</code>, men HTML-koden må være tilgjengelig uten å kjøre JavaScript.
-    here_is_how: Slik gjør du
-    hint_html: "<strong>Verifisering av identiteten din på Mastodon er for alle.</strong> Basert på åpne nettstandarder, gratis nå og for alltid. Alt du trenger er en personlig nettside som gjør at folk kjenner deg igjen. Når du lenker til dette nettstedet fra din profil, vil vi sjekke at nettstedet lenker tilbake til profilen din og viser dette på profilen din."
-    instructions_html: Kopier og lim inn koden nedenfor i HTML til ditt nettsted. Deretter legger du til adressen til nettstedet ditt i et av ekstrafeltene på profilen din fra fanen "Rediger profil" og lagre endringer.
+    extra_instructions_html: <strong>Tips:</strong> Linken på nettsida di kan vera usynleg. Den viktige delen er <code>rel="me"</code>, som på nettstader med brukargenerert innhald vil hindra at andre kan låst som dei er deg. Du kan til og med bruka <code>link</code> i staden for <code>a</code> i toppteksten til sida, men HTML-koden må vera tilgjengeleg utan å måtte køyra JavaScript.
+    here_is_how: Slik gjer du
+    hint_html: "<strong>Stadfesting av eigen identitet på Mastodon er for alle.</strong> Basert på opne nettstandardar, gratis no og for alltid. Alt du treng er ei personleg nettside der folk kjenner deg att. Om du lagar ein link som peikar på denne nettsida frå profilen din, vil profilen din få ein synleg indikator i dei tilfella der nettsida har ein link som peikar attende på profilen."
+    instructions_html: Kopier og lim inn i koden nedanfor i HTML-koden for nettsida di. Legg deretter adressa til nettsida di til i ei av ekstrafelta på profilen din frå fana "Rediger profil" og lagre endringane.
     verification: Stadfesting
-    verified_links: Dine bekreftede lenker
+    verified_links: Dine verifiserte lenker
   webauthn_credentials:
     add: Legg til ny sikkerhetsnøkkel
     create:
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 336c19e3dd..fc8f75ce7e 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -386,6 +386,11 @@
         cancel: Avbryt
         confirm: Suspender
         permanent_action: Å oppheve suspensjonen vil ikke gjenopprette noe data eller koblinger.
+        preamble_html: Du er i ferd med å suspendere <strong>%{domain}</strong> og dens underdomener.
+        remove_all_data: Dette vil fjerne alt innhold, medier og profildata for domenets kontoer på serveren din.
+        stop_communication: Serveren din vil slutte å kommunisere med disse serverne.
+        title: Bekreft domene blokkering for %{domain}
+        undo_relationships: Dette vil angre ethvert følgeforhold mellom kontoene til disse serverne og dine.
       created_msg: Domeneblokkering blir nå behandlet
       destroyed_msg: Domeneblokkering har nå blitt angret
       domain: Domene
@@ -636,9 +641,22 @@
           mark_as_sensitive_html: 'Du er i ferd med å <strong>markere</strong> noen av <strong>@%{acct}</strong> sine innlegg som <strong>sensitivt</strong>. Dette vil:'
           silence_html: 'Du er i ferd med å <strong>avgrense</strong> <strong>@%{acct}</strong> sin konto. Dette vil:'
           suspend_html: 'Du er i ferd med å <strong>stoppe</strong> <strong>@%{acct}</strong> sin konto. Dette vil:'
+        actions:
+          delete_html: Fjerne fornærmede innlegg
+          mark_as_sensitive_html: Merk fornærmede innlegg medier som sensitivt
+          silence_html: Sterkt begrense <strong>@%{acct}</strong>ved å gjøre deres profil og innhold kun synlig for personer som allerede følger dem, eller manuelt ser etter den
+          suspend_html: Suspender <strong>@%{acct}</strong>, og gjøre profilen og innholdet utilgjengelig og umulig å samhandle med
+        close_report: 'Marker rapport #%{id} som løst'
+        close_reports_html: Merk <strong>alle</strong> rapporter mot <strong>@%{acct}</strong> som løst
+        delete_data_html: Slett <strong>@%{acct}</strong> sin profil og innhold 30 dager fra nå med mindre de blir suspendert i mellomtiden
+        preview_preamble_html: "<strong>@%{acct}</strong> vil motta en advarsel med følgende innhold:"
+        record_strike_html: Ta opp en streik mot <strong>@%{acct}</strong> for å hjelpe deg med å eskalere fremtidige brudd fra denne kontoen
+        send_email_html: Send <strong>@%{acct}</strong> en advarsels e-post
+        warning_placeholder: Valgfritt ytterligere resonnement for moderasjonstiltaket.
       target_origin: Opprinnelse for innrapportert konto
       title: Rapporter
       unassign: Fjern tilegning
+      unknown_action_msg: 'Ukjent handling: %{action}'
       unresolved: Uløst
       updated_at: Oppdatert
       view_profile: Vis profil
@@ -670,7 +688,10 @@
         invite_users_description: Lar brukere invitere nye personer til serveren
         manage_announcements: Behandle Kunngjøringer
         manage_announcements_description: Lar brukere endre kunngjøringer på serveren
+        manage_appeals: Behandle klager
+        manage_appeals_description: Lar brukere gjennomgå klager mot modereringsaktiviteter
         manage_blocks: Behandle Blokker
+        manage_blocks_description: Lar brukere blokkere e-postleverandører og IP-adresser
         manage_custom_emojis: Administrer egendefinerte Emojier
         manage_custom_emojis_description: Lar brukere endre egendefinert emojis på serveren
         manage_federation: Administrer Føderasjon
@@ -680,15 +701,21 @@
         manage_reports: Administrer Rapporter
         manage_reports_description: Lar brukere se på rapporter og utføre moderasjonshandlinger mot dem
         manage_roles: Behandle Roller
+        manage_roles_description: Lar brukere administrere og tildele roller under sine rettigheter
         manage_rules: Administrer Regler
         manage_rules_description: La brukere endre serverregler
         manage_settings: Administrer Innstillinger
         manage_settings_description: La brukere endre sideinnstillinger
+        manage_taxonomies: Administrer taksonomier
+        manage_taxonomies_description: Lar brukere gjennomgå populære innhold og oppdatere emneknagg innstillinger
         manage_user_access: Administrer Brukertilgang
         manage_user_access_description: Lar brukere deaktivere andre brukeres 2-trinnsinnlogging, endre sin e-postadresse, og tilbakestille passordet deres
         manage_users: Behandle Brukere
         manage_users_description: Lar brukere se detaljer om andre brukere og utføre moderasjonshandlinger mot dem
         manage_webhooks: Administrer Webhooks
+        manage_webhooks_description: Lar brukere sette opp webhooks for administrative hendelser
+        view_audit_log: Vis overvåkingslogg
+        view_audit_log_description: La brukere se en logg over administrative handlinger på serveren
         view_dashboard: Vis dashbord
         view_dashboard_description: Gir brukere tilgang til dashbordet og ulike metrikker
         view_devops: DevOps
@@ -711,15 +738,24 @@
         preamble: Tilpass Mastodons webgrensesnitt.
         title: Utseende
       branding:
+        preamble: Serverens merkevarebygging skiller den fra andre servere i nettverket. Denne informasjonen kan vises på tvers av en rekke miljøer, for eksempel Mastodons webgrensesnitt, native applikasjoner, i forhåndsvisning av lenker på andre nettsteder og i meldingsapper, osv. Av denne grunn er det best å holde denne informasjonen klar, kort og kortfattet.
         title: Merkevare
+      captcha_enabled:
+        desc_html: Dette er avhengig av eksterne skript fra hCaptcha, som kan være et sikkerhets- og personvernproblem.<strong> I tillegg kan dette gjøre registreringsprosessen betydelig mindre tilgjengelig for noen (spesielt funksjonshemmede) personer</strong>. Av disse grunnene bør du vurdere alternative tiltak som godkjenningsbasert eller invitasjonsbasert registrering.
+        title: Krev at nye brukere løser en CAPTCHA for å bekrefte kontoen sin
       content_retention:
         preamble: Kontroller hvordan brukergenerert innhold lagres i Mastodon.
+        title: Oppbevaring av innhold
       default_noindex:
         desc_html: Påvirker alle brukerne som ikke selv har justert denne innstillingen
         title: Ikke la brukere indekseres av søkemotorer som standard
       discovery:
         follow_recommendations: Følg anbefalinger
+        preamble: Overflater interessant innhold er medvirkende til ombordstigning av nye brukere som kanskje ikke kjenner noen Mastodon. Kontroller hvordan ulike oppdagelsesfunksjoner fungerer på serveren.
+        profile_directory: Profilkatalog
         public_timelines: Offentlige tidslinjer
+        publish_discovered_servers: Publiser liste over oppdagede servere
+        publish_statistics: Publiser statistikk
         title: Oppdagelse
         trends: Trender
       domain_blocks:
@@ -734,6 +770,7 @@
           approved: Godkjenning kreves for påmelding
           none: Ingen kan melde seg inn
           open: Hvem som helst kan melde seg inn
+      title: Serverinnstillinger
     site_uploads:
       delete: Slett den opplastede filen
       destroyed_msg: Vellykket sletting av sideopplasting!
@@ -820,6 +857,7 @@
       pending_review: Avventer gjennomgang
       preview_card_providers:
         allowed: Lenker fra denne utgiveren kan "trende"
+        description_html: Dette er domener som lenker ofte deles fra på serveren din. Lenker vil ikke bli populært offentlig med mindre domenet til lenken er godkjent. Din godkjenning (eller avvisning) strekker seg til underdomener.
         rejected: Lenker fra denne utgiveren vil ikke "trende"
         title: Utgivere
       rejected: Avvist
@@ -829,6 +867,11 @@
         description_html: Dette er innlegg som serveren din vet om at de blir delt og favorisert for øyeblikket. Dette kan hjelpe dine nye og returnerede brukere med å finne flere å følge. Ingen innlegg vises offentlig før du godkjenner forfatteren, og forfatteren tillater at kontoen deres foreslås til andre. Du kan også tillate eller avvise individuelle innlegg.
         disallow: Ikke tillat innlegg
         disallow_account: Forby forfatter
+        no_status_selected: Ingen populære innlegg ble endret da ingen ble valgt
+        not_discoverable: Forfatter har valgt å ikke være synlig
+        shared_by:
+          one: Delt eller lagt til som favoritt én gang
+          other: Delt og favorittmarkert %{friendly_count} ganger
         title: Populære innlegg
       tags:
         current_score: Gjeldende poengsum %{score}
@@ -840,10 +883,16 @@
           tag_uses_measure: samlet bruk
         description_html: Dette er emneknagger som for øyeblikket vises i mange innlegg som serveren din ser. Det kan hjelpe dine brukere med å finne ut hva folk snakker mest om i øyeblikket. Ingen emneknagger vises offentlig før du godkjenner dem.
         listable: Kan bli foreslått
+        no_tag_selected: Ingen emneknagger ble endret da ingen ble valgt
         not_listable: Vil ikke bli foreslått
         not_trendable: Kunne ikke vises under trender
         not_usable: Kan ikke brukes
+        peaked_on_and_decaying: Høyeste på %{date}, nå faller
+        title: Populære emneknagger
+        trendable: Kan vises under populært
+        trending_rank: 'Populært #%{rank}'
         usable: Kan brukes
+        usage_comparison: Brukt %{today} ganger i dag, sammenlignet med %{yesterday} i går
         used_by_over_week:
           one: Brukt av en person i løpet av siste uke
           other: Brukes av %{count} personer i løpet av den siste uken
@@ -869,7 +918,12 @@
         one: 1 aktivert hendelse
         other: "%{count} aktiverte hendelser"
       events: Hendelser
+      new: Ny webhook
+      rotate_secret: Roter hemmelighet
+      secret: Signer hemmelighet
       status: Status
+      title: Webhooks
+      webhook: Webhook
   admin_mailer:
     new_appeal:
       actions:
@@ -880,6 +934,9 @@
         sensitive: å merke kontoen sin som følsom
         silence: for å begrense deres konto
         suspend: for å avslutte kontoen
+      body: "%{target} klager på en moderasjonsbeslutning av %{action_taken_by} fra %{date}, noe som var %{type}. De skrev:"
+      next_steps: Du kan godkjenne anken for å angre på moderasjonsvedtaket eller ignorere det.
+      subject: "%{username} klager på en moderasjonsbeslutning for %{instance}"
     new_pending_account:
       body: Detaljer om den nye kontoen er nedenfor. Du kan godkjenne eller avvise denne søknaden.
       subject: Ny konto opp til vurdering på %{instance} (%{username})
@@ -888,11 +945,14 @@
       body_remote: Noen fra %{domain} har rapportert %{target}
       subject: Ny rapport for %{instance} (#%{id})
     new_trends:
+      body: 'Følgende elementer trenger en gjennomgang før de kan vises offentlig:'
       new_trending_links:
         title: Populære lenker
       new_trending_statuses:
         title: Populære innlegg
       new_trending_tags:
+        no_approved_tags: Det er for øyeblikket ingen godkjente populære emneknagger.
+        requirements: 'Enhver av disse kandidatene kan overgå #%{rank} godkjent populære emneknagger, som for øyeblikket er #%{lowest_tag_name} med en poengsum på %{lowest_tag_score}.'
         title: Populære emneknagger
       subject: Ny trender for gjennomsyn av %{instance}
   aliases:
@@ -932,7 +992,11 @@
   auth:
     apply_for_account: Be om en konto
     captcha_confirmation:
+      help_html: Hvis du har problemer med å løse CAPTCHA, kan du komme i kontakt med oss via %{email} og vi kan hjelpe deg.
+      hint_html: Bare en ting til! Vi må bekrefte at du er et menneske (dette er slik at vi kan holde spam ute!). Løs CAPTCHA nedenfor og klikk "Fortsett".
       title: Sikkerhetskontroll
+    confirmations:
+      wrong_email_hint: Hvis e-postadressen ikke er riktig, kan du endre den i kontoinnstillingene.
     delete_account: Slett konto
     delete_account_html: Hvis du ønsker å slette kontoen din, kan du <a href="%{path}">gå hit</a>. Du vil bli spurt om bekreftelse.
     description:
@@ -962,6 +1026,7 @@
       saml: SAML
     register: Meld deg på
     registration_closed: "%{instance} tar ikke imot nye medlemmer"
+    resend_confirmation: Send bekreftelse lenke på nytt
     reset_password: Tilbakestill passord
     rules:
       accept: Godta
@@ -973,10 +1038,17 @@
       title_invited: Du har blitt invitert.
     security: Sikkerhet
     set_new_password: Angi nytt passord
+    setup:
+      email_below_hint_html: Sjekk søppelpostmappen din, eller be om en ny. Du kan korrigere e-postadressen din hvis den er feil.
+      email_settings_hint_html: Klikk på lenken vi sendte deg for å bekrefte %{email}. Vi venter her.
+      link_not_received: Fikk du ikke lenken?
+      new_confirmation_instructions_sent: Du vil motta en ny e-post med bekreftelse lenke om noen minutter!
+      title: Sjekk innboksen din
     sign_in:
       preamble_html: Logg inn med ditt <strong>%{domain}</strong> brukeropplysninger. Hvis kontoen din er plassert på en annen server, vil du ikke kunne logge inn her.
       title: Logg inn på %{domain}
     sign_up:
+      manual_review: Registreringer på %{domain} går gjennom manuell gjennomgang av moderatorene våre. For å hjelpe oss med å behandle registreringen din, skriv litt om deg selv og hvorfor du vil ha en konto på %{domain}.
       preamble: Med en konto på denne Mastodon-tjeneren vil du kunne følge andre personer på nettverket, uansett hvor kontoen deres holder til.
       title: La oss få deg satt i gang på %{domain}.
     status:
@@ -1068,7 +1140,6 @@
     basic_information: Grunnleggende informasjon
     hint_html: "<strong>Tilpass hva folk ser på din offentlige profil og ved siden av dine innlegg.</strong> Det er mer sannsynlig at andre mennesker følger deg tilbake og samhandler med deg når du har fylt ut en profil og et profilbilde."
     other: Annet
-    safety_and_privacy: Sikkerhet og personvern
   errors:
     '400': Forespørselen du sendte inn var ugyldig eller feil.
     '403': Du har ikke tillatelse til å vise denne siden.
@@ -1118,7 +1189,11 @@
       add_keyword: Legg til stikkord
       keywords: Nøkkelord
       statuses: Individuelle innlegg
+      statuses_hint_html: Dette filteret gjelder for utvalgte enkeltinnlegg, uavhengig av om de samsvarer med søkeordene nedenfor.<a href="%{path}">Se gjennom eller fjern innlegg fra filteret.</a>.
       title: Rediger filter
+    errors:
+      deprecated_api_multiple_keywords: Disse parameterne kan ikke endres fra dette programmet fordi de gjelder for mer enn ett filter nøkkelord. Bruk et nyere program eller webgrensesnittet.
+      invalid_context: Ingen eller ugyldig kontekst angitt
     index:
       contexts: Filtre i %{contexts}
       delete: Slett
@@ -1189,12 +1264,14 @@
       bookmarks_html: Du er i ferd med å <strong>erstatte dine bokmerker</strong> med inntil <strong>%{total_items} innlegg</strong> fra <strong>%{filename}</strong>.
       domain_blocking_html: Du er i ferd med å <strong>erstatte din domene-blokkeringsliste</strong> med inntil <strong>%{total_items} domener</strong> fra <strong>%{filename}</strong>.
       following_html: Du er i ferd med å <strong>følge</strong> inntil <strong>%{total_items} kontoer</strong> fra <strong>%{filename}</strong> og <strong>slutte å følge alle andre</strong>.
+      lists_html: Du er i ferd med å <strong>erstatte dine lister</strong> med innholdet i <strong>%{filename}</strong>. Inntil <strong>%{total_items} kontoer</strong> legges til i nye lister.
       muting_html: Du er i ferd med å <strong>erstatte listen over dempede kontoer</strong> med inntil <strong>%{total_items} kontoer</strong> fra <strong>%{filename}</strong>.
     preambles:
       blocking_html: Du er i ferd med å <strong>blokkere</strong> inntil <strong>%{total_items} kontoer</strong> fra <strong>%{filename}</strong>.
       bookmarks_html: Du er i ferd med å legge til inntil <strong>%{total_items} innlegg</strong> fra <strong>%{filename}</strong> til dine <strong>bokmerker</strong>.
       domain_blocking_html: Du er i ferd med å <strong>blokkere</strong> inntil <strong>%{total_items} domener</strong> fra <strong>%{filename}</strong>.
       following_html: Du er i ferd med å <strong>følge</strong> inntil <strong>%{total_items} kontoer</strong> fra <strong>%{filename}</strong>.
+      lists_html: Du er i ferd med å legge inntil <strong>%{total_items} kontoer</strong> fra <strong>%{filename}</strong> til dine <strong>lister</strong>. Nye lister vil bli opprettet hvis det ikke finnes noen liste å legge til.
       muting_html: Du er i ferd med å <strong>dempe</strong> inntil <strong>%{total_items} kontoer</strong> fra <strong>%{filename}</strong>.
     preface: Du kan importere data om brukere du følger eller blokkerer til kontoen din på denne instansen med eksportfiler fra andre instanser.
     recent_imports: Siste importer
@@ -1211,6 +1288,7 @@
       bookmarks: Importerer bokmerker
       domain_blocking: Importerer blokkerte domener
       following: Importerer fulgte kontoer
+      lists: Importerer lister
       muting: Importerer dempede kontoer
     type: Type import
     type_groups:
@@ -1221,6 +1299,7 @@
       bookmarks: Bokmerker
       domain_blocking: Domeneblokkeringsliste
       following: Følgeliste
+      lists: Lister
       muting: Dempeliste
     upload: Opplastning
   invites:
@@ -1404,6 +1483,9 @@
       unrecognized_emoji: er ikke en gjenkjent emoji
   relationships:
     activity: Kontoaktivitet
+    confirm_follow_selected_followers: Er du sikker på at du vil følge utvalgte følgere?
+    confirm_remove_selected_followers: Er du sikker på at du vil fjerne valgte følgere?
+    confirm_remove_selected_follows: Er du sikker på at du vil fjerne valgte følger?
     dormant: Dormende
     follow_failure: Kunne ikke følge noen av de valgte kontoene.
     follow_selected_followers: Følg valgte tilhengere
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index c1b34ee966..62ec21294e 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -1176,7 +1176,6 @@ pl:
     basic_information: Podstawowe informacje
     hint_html: "<strong>Dostosuj to, co ludzie widzą na Twoim profilu publicznym i obok Twoich wpisów.</strong> Inne osoby są bardziej skłonne obserwować Cię i wchodzić z Tobą w interakcje, gdy masz wypełniony profil i zdjęcie profilowe."
     other: Inne
-    safety_and_privacy: Bezpieczeństwo i prywatność
   errors:
     '400': Wysłane zgłoszenie jest nieprawidłowe lub uszkodzone.
     '403': Nie masz uprawnień, aby wyświetlić tę stronę.
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index d47b946272..7e088dd397 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -1139,7 +1139,6 @@ pt-BR:
     basic_information: Informações básicas
     hint_html: "<strong>Personalize o que as pessoas veem no seu perfil público e ao lado de suas publicações.</strong> É mais provável que outras pessoas o sigam de volta e interajam com você quando você tiver um perfil preenchido e uma foto de perfil."
     other: Outro
-    safety_and_privacy: Segurança e privacidade
   errors:
     '400': A solicitação enviada é inválida ou incorreta.
     '403': Você não tem permissão para ver esta página.
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 4c4aaa415e..40cbc6bf9e 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -1140,7 +1140,6 @@ pt-PT:
     basic_information: Informação básica
     hint_html: "<strong>Personalize o que as pessoas veem no seu perfil público e junto das suas publicações.</strong> É mais provável que as outras pessoas o sigam de volta ou interajam consigo se tiver um perfil preenchido e uma imagem de perfil."
     other: Outro
-    safety_and_privacy: Segurança e privacidade
   errors:
     '400': O pedido que submeteu foi inválido ou mal formulado.
     '403': Não tens a permissão necessária para ver esta página.
@@ -1265,12 +1264,14 @@ pt-PT:
       bookmarks_html: Está prestes a <strong>substituir os seus marcadores</strong> com até <strong>%{total_items} publicações</strong> de <strong>%{filename}</strong>.
       domain_blocking_html: Está prestes a <strong>substituir a sua lista de bloqueios de domínio</strong> com até <strong>%{total_items} domínios</strong> de <strong>%{filename}</strong>.
       following_html: Está prestes a <strong>seguir</strong> até <strong>%{total_items} contas</strong> de <strong>%{filename}</strong> e <strong>parar de seguir quaisquer outras contas</strong>.
+      lists_html: Está prestes a substituir <strong>as suas listas</strong> pelo conteúdo de <strong>%{filename}</strong>. Até <strong>%{total_items} contas</strong> serão adicionadas a novas listas.
       muting_html: Está prestes a <strong>substituir a sua lista de contas silenciadas</strong> com até <strong>%{total_items} contas</strong> de <strong>%{filename}</strong>.
     preambles:
       blocking_html: Está prestes a <strong>bloquear</strong> até <strong>%{total_items} contas</strong> de <strong>%{filename}</strong>.
       bookmarks_html: Está prestes a adicionar até <strong>%{total_items} publicações</strong> de <strong>%{filename}</strong> aos seus <strong>marcadores</strong>.
       domain_blocking_html: Está prestes a <strong>bloquear</strong> até <strong>%{total_items} domínios</strong> de <strong>%{filename}</strong>.
       following_html: Está prestes a <strong>seguir</strong> até <strong>%{total_items} contas</strong> de <strong>%{filename}</strong>.
+      lists_html: Está prestes a adicionar até <strong>%{total_items} contas</strong> do ficheiro <strong>%{filename}</strong> para <strong>as suas listas</strong>. Novas listas serão criadas se não existir uma lista onde as adicionar.
       muting_html: Está prestes a <strong>silenciar</strong> até <strong>%{total_items} contas</strong> de <strong>%{filename}</strong>.
     preface: Podes importar dados que tenhas exportado de outra instância, como a lista de pessoas que segues ou bloqueadas.
     recent_imports: Importações recentes
@@ -1287,6 +1288,7 @@ pt-PT:
       bookmarks: Importando marcadores
       domain_blocking: Importando domínios bloqueados
       following: Importando contas seguidas
+      lists: A importar listas
       muting: Importando contas silenciadas
     type: Tipo de importação
     type_groups:
@@ -1297,6 +1299,7 @@ pt-PT:
       bookmarks: Itens salvos
       domain_blocking: Lista de domínios bloqueados
       following: Lista de pessoas que estás a seguir
+      lists: Listas
       muting: Lista de utilizadores silenciados
     upload: Carregar
   invites:
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index c6fdff9aa8..e80d230973 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -1069,7 +1069,9 @@ ru:
       back: Назад
       invited_by: 'Вы можете присоединиться к %{domain} благодаря приглашению полученному от:'
       preamble: Они устанавливаются и применяются модераторами %{domain}.
+      preamble_invited: Прежде чем продолжить, ознакомьтесь с основными правилами, установленными модераторами сервера %{domain}.
       title: Несколько основных правил.
+      title_invited: Вы были приглашены.
     security: Безопасность
     set_new_password: Задать новый пароль
     setup:
@@ -1170,6 +1172,10 @@ ru:
       your_appeal_rejected: Ваша апелляция отклонена
   domain_validator:
     invalid_domain: не является корректным доменным именем
+  edit_profile:
+    basic_information: Основная информация
+    hint_html: "<strong>Настройте то, что люди видят в вашем публичном профиле и рядом с вашими сообщениями.</strong> Другие люди с большей вероятностью подпишутся на Вас и будут взаимодействовать с вами, если у Вас заполнен профиль и добавлено изображение."
+    other: Прочее
   errors:
     '400': Ваш запрос был недействительным или неправильным.
     '403': У Вас нет доступа к просмотру этой страницы.
@@ -1384,6 +1390,20 @@ ru:
     failed_sign_in_html: Неудачная попытка входа используя %{method} через %{browser} (%{ip})
     successful_sign_in_html: Успешный вход используя %{method} через %{browser} (%{ip})
     title: История входов
+  mail_subscriptions:
+    unsubscribe:
+      action: Да, отписаться
+      complete: Подписка отменена
+      confirmation_html: Вы уверены, что хотите отписаться от получения на ваш адрес электронной почты %{email} %{type} от Сообщества Mastodon %{domain}?  Вы всегда можете заново подписаться на уведомления по электронной почте в разделе настройки <a href="%{settings_path}"></a>.
+      emails:
+        notification_emails:
+          favourite: Избранные уведомления по электронной почте
+          follow: подписаться на уведомления по электронной почте
+          follow_request: Уведомлять по электронной почте о новых запросах
+          mention: получать уведомления с упоминаниями
+          reblog: подписаться на уведомления по электронной почте
+      resubscribe_html: Если вы отказались от подписки по ошибке, вы всегда можете заново подписаться на уведомления по электронной почте по этой ссылке <a href="%{settings_path}"></a>.
+      title: Отписаться
   media_attachments:
     validations:
       images_and_video: Нельзя добавить видео к посту с изображениями
@@ -1499,6 +1519,7 @@ ru:
       expired: Опрос уже завершился
       invalid_choice: Выбранного варианта голосования не существует
       over_character_limit: каждый не вариант не может быть длиннее %{max} символов
+      self_vote: Вы не можете голосовать в своих опросах
       too_few_options: должно быть больше 1 варианта
       too_many_options: может содержать не больше %{max} вариантов
   preferences:
@@ -1811,7 +1832,9 @@ ru:
     seamless_external_login: Вы залогинены через сторонний сервис, поэтому настройки e-mail и пароля недоступны.
     signed_in_as: 'Выполнен вход под именем:'
   verification:
+    instructions_html: Скопируйте и вставьте код ниже в HTML вашего сайта. Затем, добавьте адрес вашего  веб сайта в одно из дополнительных полей на вкладке "Редактировать профиль" и сохраните изменения.
     verification: Верификация ссылок
+    verified_links: Ваши ссылки подтверждения
   webauthn_credentials:
     add: Добавить новый ключ безопасности
     create:
diff --git a/config/locales/simple_form.an.yml b/config/locales/simple_form.an.yml
index 51e7910786..f354e5ba82 100644
--- a/config/locales/simple_form.an.yml
+++ b/config/locales/simple_form.an.yml
@@ -37,13 +37,11 @@ an:
         current_password: Per razons de seguranza per favor ingrese la clau d'a cuenta actual
         current_username: Pa confirmar, per favor ingrese lo nombre d'usuario d'a cuenta actual
         digest: Solo ninviau dimpués d'un largo periodo d'inactividat y nomás si has recibiu mensaches personals entre la tuya ausencia
-        discoverable: Permite que la tuya cuenta sía descubierta per extranyos a traviés de recomendacions, tendencias y atras caracteristicas
         email: Se le ninviará un correu de confirmación
         header: PNG, GIF u JPG. Maximo %{size}. Será escalau a %{dimensions}px
         inbox_url: Copia la URL d'a pachina prencipal d'o relés que quiers utilizar
         irreversible: Las publicacions filtradas desapareixerán irreversiblement, mesmo si este filtro ye eliminau mas abance
         locale: L'idioma d'a interficie d'usuario, correus y notificacions push
-        locked: Requiere que manualment aprebes seguidores y las publicacions serán amostradas nomás a las tuyas seguidores
         password: Utilice a lo menos 8 caracters
         phrase: S'aplicará sin importar las mayusclas u los avisos de conteniu d'una publicación
         scopes: Qué APIs de l'aplicación tendrán acceso. Si trías l'aconsiga de libel pero alto, no amenestes triar las individuals.
@@ -53,9 +51,6 @@ an:
         setting_display_media_default: Amagar conteniu multimedia marcau como sensible
         setting_display_media_hide_all: Siempre amagar tot lo conteniu multimedia
         setting_display_media_show_all: Amostrar siempre conteniu multimedia marcau como sensible
-        setting_hide_network: A quí sigues y quí te sigue no será amostrau en o tuyo perfil
-        setting_noindex: Afecta a lo tuyo perfil publico y pachinas d'estau
-        setting_show_application: L'aplicación que utiliza vusté pa publicar publicacions s'amostrará en a vista detallada d'as suyas publicacions
         setting_use_blurhash: Los gradientes se basan en as colors d'as imachens amagadas pero fendo borrosos los detalles
         setting_use_pending_items: Amagar nuevos estaus dezaga d'un clic en cuenta de desplazar automaticament lo feed
         whole_word: Quan la parola clau u frase ye nomás alfanumerica, nomás será aplicau si concuerda con tota la parola
@@ -170,7 +165,6 @@ an:
         context: Filtrar contextos
         current_password: Clau actual
         data: Información
-        discoverable: Sucherir la cuenta a atros
         display_name: Nombre pa amostrar
         email: Adreza de correu electronico
         expires_in: Expirar dimpués de
@@ -180,7 +174,6 @@ an:
         inbox_url: URL d'a dentrada de relés
         irreversible: Refusar en cuenta d'amagar
         locale: Idioma
-        locked: Fer privada esta cuenta
         max_uses: Máx. numero d'usos
         new_password: Nueva clau
         note: Biografía
@@ -203,9 +196,7 @@ an:
         setting_display_media_show_all: Amostrar tot
         setting_expand_spoilers: Siempre expandir las publicacions marcadas con alvertencias de conteniu
         setting_hide_network: Amagar lo tuyo ret
-        setting_noindex: Excluyir-se d'o indexado de motors de busqueda
         setting_reduce_motion: Reducir lo movimiento d'as animacions
-        setting_show_application: Amostrar aplicación usada pa publicar publicacions
         setting_system_font_ui: Utilizar la tipografía per defecto d'o sistema
         setting_theme: Tema d'o puesto
         setting_trends: Amostrar las tendencias de hue
diff --git a/config/locales/simple_form.ar.yml b/config/locales/simple_form.ar.yml
index 907221cdd7..db10b4b0b8 100644
--- a/config/locales/simple_form.ar.yml
+++ b/config/locales/simple_form.ar.yml
@@ -41,13 +41,11 @@ ar:
         current_password: لأسباب أمنية ، يرجى إدخال الكلمة السرية الخاصة بالحساب الحالي
         current_username: يرجى إدخال اسم المستخدم الخاص بالحساب الحالي قصد التأكيد
         digest: تُرسَل إليك بعد مُضيّ مدة مِن خمول نشاطك و فقط إذا ما تلقيت رسائل شخصية مباشِرة أثناء فترة غيابك مِن الشبكة
-        discoverable: السماح للغرباء اكتشاف حسابك من خلال التوصيات والمتداولة وغيرها من الميزات
         email: سوف تتلقى رسالة إلكترونية للتأكيد
         header: ملف PNG أو GIF أو JPG. حجمه على أقصى تصدير %{size}. سيتم تصغيره إلى %{dimensions}px
         inbox_url: نسخ العنوان الذي تريد استخدامه مِن صفحة الاستقبال للمُرحَّل
         irreversible: المنشورات التي تم تصفيتها ستختفي لا محالة حتى و إن تمت إزالة عامِل التصفية لاحقًا
         locale: لغة واجهة المستخدم و الرسائل الإلكترونية و الإشعارات
-        locked: يتطلب منك الموافقة يدويا على طلبات المتابعة
         password: يُنصح باستخدام 8 أحرف على الأقل
         phrase: سوف يتم العثور عليه مهما كان نوع النص أو حتى و إن كان داخل الويب فيه تحذير عن المحتوى
         scopes: ما هي المجالات المسموح بها في التطبيق ؟ إن قمت باختيار أعلى المجالات فيمكنك الاستغناء عن الخَيار اليدوي.
@@ -57,9 +55,6 @@ ar:
         setting_display_media_default: إخفاء الوسائط المُعيَّنة كحساسة
         setting_display_media_hide_all: إخفاء كافة الوسائط دائمًا
         setting_display_media_show_all: دائمًا عرض الوسائط المُعيَّنة كحساسة
-        setting_hide_network: الحسابات التي تُتابعها و التي تُتابِعك على حد سواء لن تُعرَض على صفحتك التعريفية
-        setting_noindex: ذلك يؤثر على صفحتك التعريفية وصفحات المنشورات
-        setting_show_application: سيُعرَض اسم التطبيق الذي تستخدمه عند النشر في العرض المفصّل لمنشوراتك
         setting_use_blurhash: الألوان التدرّجية مبنية على ألوان المرئيات المخفية ولكنها تحجب كافة التفاصيل
         setting_use_pending_items: إخفاء تحديثات الخط وراء نقرة بدلًا مِن التمرير التلقائي للتدفق
         username: يمكنك استخدام الأحرف والأرقام والسطور السفلية
@@ -178,7 +173,6 @@ ar:
         context: تصفية السياقات
         current_password: كلمة السر الحالية
         data: البيانات
-        discoverable: القيام بإدراج هذا الحساب في قائمة دليل الحسابات
         display_name: الاسم المعروض
         email: عنوان البريد الإلكتروني
         expires_in: تنتهي مدة صلاحيته بعد
@@ -188,7 +182,6 @@ ar:
         inbox_url: عنوان رابط صندوق المُرَحِّل
         irreversible: إسقاط بدلا من إخفائها
         locale: لغة الواجهة
-        locked: تجميد الحساب
         max_uses: عدد مرات استخدام الرابط
         new_password: كلمة السر الجديدة
         note: السيرة الذاتية
@@ -211,9 +204,7 @@ ar:
         setting_display_media_show_all: عرض الكل
         setting_expand_spoilers: توسيع المنشورات التي تحتوي على تحذيرات عن المحتوى دائما
         setting_hide_network: إخفِ شبكتك
-        setting_noindex: الطلب مِن محركات البحث بعدم فهرسة معلوماتك وصفحتك التعريفية الشخصية
         setting_reduce_motion: تخفيض عدد الصور في الوسائط المتحركة
-        setting_show_application: اكشف اسم التطبيق المستخدَم لإرسال المنشورات
         setting_system_font_ui: استخدم الخطوط الافتراضية للنظام
         setting_theme: سمة الموقع
         setting_trends: اعرض ما يُتداوَل اليوم
diff --git a/config/locales/simple_form.ast.yml b/config/locales/simple_form.ast.yml
index 3269605618..4ffc4bd166 100644
--- a/config/locales/simple_form.ast.yml
+++ b/config/locales/simple_form.ast.yml
@@ -18,11 +18,9 @@ ast:
         avatar: Ficheros PNG, GIF o JPG de %{size} como muncho. La semeya va redimensionase a %{dimensions} px
         bot: Avisa a otres persones de qu'esta cuenta fai principalmente aiciones automatizaes ya de que ye posible que nun tean supervisaes
         digest: Namás s'unvia dempués d'un periodu llongu d'inactividá ya namás si recibiesti dalgún mensaxe personal demientres la to ausencia
-        discoverable: Permite que persones desconocíes descubran la to cuenta pente recomendaciones, tendencies ya otres funciones
         header: Ficheros PNG, GIF o JPG de %{size} como muncho. La semeya va redimensionase a %{dimensions} px
         irreversible: Los artículos peñeraos desapaecen de forma irreversible, magar que la peñera se quite dempués
         locale: La llingua de la interfaz, los mensaxes per corréu electrónicu ya los avisos push
-        locked: Controla manualmente quién pue siguite pente l'aprobación de les solicitúes de siguimientu
         password: Usa polo menos 8 caráuteres
         setting_aggregate_reblogs: Nun amuesa los artículos compartíos nuevos que xá se compartieren de recién (namás afeuta a los artículos compartíos d'agora)
         setting_always_send_emails: Los avisos nun se suelen unviar per corréu electrónicu si uses activamente Mastodon
@@ -30,9 +28,6 @@ ast:
         setting_display_media_default: Anubrilu cuando se marque como sensible
         setting_display_media_hide_all: Anubrilu siempres
         setting_display_media_show_all: Amosalu siempres
-        setting_hide_network: Les persones que sigas ya les que te sigan nun van apaecer nel to perfil
-        setting_noindex: Afeuta al perfil públicu ya a les páxines de los artículos
-        setting_show_application: L'aplicación qu'uses pa espublizar apaez na vista detallada de los tos artículos
         setting_use_blurhash: Los dilíos básense nos colores del conteníu multimedia anubríu mas desenfonca los detalles
       featured_tag:
         name: 'Equí tán dalgunes de les etiquetes qu''usesti apocayá:'
@@ -91,7 +86,6 @@ ast:
         confirm_password: Confirmación de la contraseña
         current_password: Contraseña actual
         data: Datos
-        discoverable: Suxerir esta cuenta a otres persones
         display_name: Nome visible
         email: Direición de corréu electrónicu
         expires_in: Caduca dempués de
@@ -99,7 +93,6 @@ ast:
         header: Semeya de la testera
         irreversible: Escartar en cuentes d'anubrir
         locale: Llingua de la interfaz
-        locked: Riquir solicitúes de siguimientu
         max_uses: Númberu máximu d'usos
         new_password: Contraseña nueva
         note: Biografía
@@ -119,9 +112,7 @@ ast:
         setting_display_media: Conteníu multimedia
         setting_expand_spoilers: Espander siempres los artículos marcaos con alvertencies de conteníu
         setting_hide_network: Anubrir les cuentes que sigas ya te sigan
-        setting_noindex: Arrenunciar a apaecer nos índices de los motores de busca
         setting_reduce_motion: Amenorgar el movimientu de les animaciones
-        setting_show_application: Dicir les aplicaciones que s'usen pa unviar artículos
         setting_system_font_ui: Usar la fonte predeterminada del sistema
         setting_theme: Estilu del sitiu
         setting_trends: Amosar les tendencies de güei
diff --git a/config/locales/simple_form.be.yml b/config/locales/simple_form.be.yml
index 3298745c4c..1f8279fbca 100644
--- a/config/locales/simple_form.be.yml
+++ b/config/locales/simple_form.be.yml
@@ -41,13 +41,11 @@ be:
         current_password: У мэтах бяспекі, калі ласка, увядзіце пароль бягучага ўліковага запісу
         current_username: Каб пацвердзіць, увядзіце, калі ласка імя карыстальніка бягучага ўліковага запісу
         digest: Будзе даслана толькі пасля доўгага перыяду неактыўнасці і толькі калі вы атрымалі асабістыя паведамленні падчас вашай адсутнасці
-        discoverable: Дазволіць незнаёмым людзям знаходзіць ваш уліковы запіс праз рэкамендацыі, трэнды і іншыя функцыі
         email: Пацвярджэнне будзе выслана па электроннай пошце
         header: PNG, GIF ці JPG. Не больш за %{size}. Будзе сціснуты да памеру %{dimensions}} пікселяў
         inbox_url: Капіраваць URL са старонкі рэтранслятара, якім вы хочаце карыстацца
         irreversible: Адфільтраваныя пасты прападуць незваротна, нават калі фільтр потым будзе выдалены
         locale: Мова карыстальніцкага інтэрфейсу, электронных паведамленняў і апавяшчэнняў
-        locked: Уручную кантралюйце, хто можа быць вашым падпісантам, ухваляючы запросы на падпіску
         password: Не менш за 8 сімвалаў
         phrase: Параўнанне адбудзецца нягледзячы на рэгістр тэксту і папярэджанні аб змесціве допісу
         scopes: Якімі API праграм будзе дазволена карыстацца. Калі вы абярэце найвышэйшы ўзровень, не трэба абіраць асобныя.
@@ -57,9 +55,6 @@ be:
         setting_display_media_default: Хаваць медыя пазначаныя як далікатныя
         setting_display_media_hide_all: Заўсёды хаваць медыя
         setting_display_media_show_all: Заўсёды паказваць медыя
-        setting_hide_network: Вашы падпіскі і вашы падпісчыкі будуць нябачны ў вашым профілі
-        setting_noindex: Уплывае на бачнасць старонкі вашага профілю і вашых допісаў
-        setting_show_application: Праграма, праз якую вы ствараеце допісы, будзе паказвацца ў падрабязнасцях пра допісы
         setting_use_blurhash: Градыенты заснаваны на колерах схаваных выяў, але размываюць дэталі
         setting_use_pending_items: Схаваць абнаўленні стужкі за клікам замест аўтаматычнага пракручвання стужкі
         username: Вы можаце выкарыстоўваць літары, лічбы і падкрэсліванне
@@ -178,7 +173,6 @@ be:
         context: Фільтр кантэкстаў
         current_password: Бягучы пароль
         data: Даныя
-        discoverable: Рэкамендаваць уліковы запіс іншым карыстальнікам
         display_name: Адлюстраванае імя
         email: Адрас электроннай пошты
         expires_in: Заканчваецца пасля
@@ -188,7 +182,6 @@ be:
         inbox_url: URL паштовай скрыні-рэтранслятара
         irreversible: Выдаляць, а не хаваць
         locale: Мова інтэрфейсу
-        locked: Зрабіць уліковы запіс закрытым
         max_uses: Максімальная колькасць выкарыстанняў
         new_password: Новы пароль
         note: Пра сябе
@@ -211,9 +204,7 @@ be:
         setting_display_media_show_all: Паказаць усё
         setting_expand_spoilers: Заўжды разгортваць допісы з папярэджаннем аб змесціве
         setting_hide_network: Схаваць вашы сувязі
-        setting_noindex: Адмовіцца ад індэксавання пашуковымі рухавікамі
         setting_reduce_motion: Памяншэнне руху ў анімацыях
-        setting_show_application: Паказваць праграмы, праз якія дасылаюцца допісы
         setting_system_font_ui: Выкарыстоўваць прадвызначаны сістэмны шрыфт
         setting_theme: Тэма сайта
         setting_trends: Паказваць трэнды дня
diff --git a/config/locales/simple_form.bg.yml b/config/locales/simple_form.bg.yml
index 6b319e2721..560031e41f 100644
--- a/config/locales/simple_form.bg.yml
+++ b/config/locales/simple_form.bg.yml
@@ -41,13 +41,11 @@ bg:
         current_password: От съображения за сигурност, въведете паролата на текущия акаунт
         current_username: Въведете потребителското име на текущия профил, за да потвърдите
         digest: Изпраща се само след дълъг период на бездействие и само ако сте получили лични съобщения във ваше отсъствие
-        discoverable: Позволяване на странници да откриват вашия акаунт чрез препоръки, нашумели и други неща
         email: Ще ви се изпрати имейл за потвърждение
         header: PNG, GIF или JPG. До най-много %{size}. Ще се смали до %{dimensions} пиксела
         inbox_url: Копирайте URL адреса от заглавната страница на предаващия сървър, който искате да използвате
         irreversible: Филтрираните публикации ще изчезнат безвъзвратно, дори филтърът да бъде премахнат по-късно
         locale: Езикът на потребителския интерфейс, известиятата по имейл и насочените известия
-        locked: Ръчно управляване кой може да ви последва, одобрявайки заявките за последване
         password: Използвайте поне 8 символа
         phrase: Ще съвпадне без значение дали са главни или малки букви, или ако е предупреждение към публикация
         scopes: Указва до кои API има достъп приложението. Ако изберете диапазон от най-високо ниво, няма нужда да избирате индивидуални.
@@ -57,9 +55,6 @@ bg:
         setting_display_media_default: Скриване на мултимедия отбелязана като деликатна
         setting_display_media_hide_all: Винаги скриване на мултимедията
         setting_display_media_show_all: Винаги показване на мултимедията
-        setting_hide_network: В профила ви ще бъде скрито кой може да последвате и кой може да ви последва
-        setting_noindex: Влияе на вашите обществен профил и страници с публикации
-        setting_show_application: Приложението, което ползвате за публикуване, ще се показва в подробностите на публикацията ви
         setting_use_blurhash: Преливането е въз основа на цветовете на скритите визуализации, но се замъгляват подробностите
         setting_use_pending_items: Да се показват обновявания на часовата ос само след щракване вместо автоматично превъртане на инфоканала
         username: Може да ползвате букви, цифри и долни черти
@@ -178,7 +173,6 @@ bg:
         context: Прецеждане на контекста
         current_password: Текуща парола
         data: Данни
-        discoverable: Предложете акаунта на други
         display_name: Показвано име
         email: Адрес на имейла
         expires_in: Изтича след
@@ -188,7 +182,6 @@ bg:
         inbox_url: URL адрес за входящи съобщения на предаващия сървър
         irreversible: Премахване, вместо скриване
         locale: Език на интерфейса
-        locked: Направи акаунта поверителен
         max_uses: Макс брой употреби
         new_password: Нова парола
         note: Биогр.
@@ -211,9 +204,7 @@ bg:
         setting_display_media_show_all: Показване на всичко
         setting_expand_spoilers: Винаги разширяване на публикации, отбелязани с предупреждения за съдържание
         setting_hide_network: Скриване на социалния ви свързан граф
-        setting_noindex: Отказвам се от индексирането от търсачки
         setting_reduce_motion: Обездвижване на анимациите
-        setting_show_application: Разкриване на приложението, изпращащо публикации
         setting_system_font_ui: Употреба на стандартния шрифт на системата
         setting_theme: Тема на сайта
         setting_trends: Показване на днешното налагащо се
diff --git a/config/locales/simple_form.ca.yml b/config/locales/simple_form.ca.yml
index 3c6635c0f0..a80fe5a19b 100644
--- a/config/locales/simple_form.ca.yml
+++ b/config/locales/simple_form.ca.yml
@@ -38,16 +38,14 @@ ca:
         avatar: PNG, GIF o JPG de com a màxim %{size}. S'escalarà a %{dimensions}px
         bot: Notifica que aquest compte realitza principalment accions automatitzades i que pot estar no monitorat
         context: Un o diversos contextos en què s'ha d'aplicar el filtre
-        current_password: Per motius de seguretat, introdueix la contrasenya del compte actual
-        current_username: Per a confirmar, si us plau entra el nom d'usuari del compte actual
+        current_password: Per motius de seguretat, introduïu la contrasenya del compte actual
+        current_username: Per a confirmar, entreu el nom d'usuari del compte actual
         digest: Només s'envia després d'un llarg període d'inactivitat i només si has rebut algun missatge personal durant la teva absència
-        discoverable: Permet que el teu compte sigui descobert per desconeguts a través de recomanacions, etiquetes i altres característiques
         email: Se t'enviarà un correu electrònic de confirmació
         header: PNG, GIF o JPG de com a màxim %{size}. S'escalarà a %{dimensions}px
         inbox_url: Copia l'enllaç de la pàgina principal del relay que vols usar
         irreversible: Els tuts filtrats desapareixeran de manera irreversible, fins i tot si el filtre es retira més tard
         locale: L'idioma de la interfície d’usuari, els correus i les notificacions push
-        locked: Controla manualment qui et pot seguir, aprovant sol·licituds
         password: Utilitza com a mínim 8 caràcters
         phrase: Es combinarà independentment del format en el text o l'avís de contingut del tut
         scopes: API permeses per a accedir a l'aplicació. Si selecciones un àmbit de nivell superior, no cal que en seleccionis un d'individual.
@@ -57,9 +55,6 @@ ca:
         setting_display_media_default: Amaga el contingut gràfic marcat com a sensible
         setting_display_media_hide_all: Oculta sempre tot el contingut multimèdia
         setting_display_media_show_all: Mostra sempre el contingut gràfic
-        setting_hide_network: Qui segueixes i els que et segueixen no es mostraran en el teu perfil
-        setting_noindex: Afecta el teu perfil públic i les pàgines d'estat
-        setting_show_application: L'aplicació que fas servir per a publicar es mostrarà a la vista detallada dels teus tuts
         setting_use_blurhash: Els degradats es basen en els colors de les imatges ocultes, però n'enfosqueixen els detalls
         setting_use_pending_items: Amaga les actualitzacions de la línia de temps després de fer un clic, en lloc de desplaçar-les automàticament
         username: Pots emprar lletres, números i subratllats
@@ -85,7 +80,7 @@ ca:
         custom_css: Pots aplicar estils personalitzats en la versió web de Mastodon.
         mascot: Anul·la la il·lustració en la interfície web avançada.
         media_cache_retention_period: Els fitxers multimèdia descarregats s'esborraran després del nombre de dies especificat quan el valor configurat és positiu, i tornats a descarregats sota demanda.
-        peers_api_enabled: Una llista de noms de domini que aquest servidor ha trobat al fedivers. No inclou cap dada sobre si estàs federat amb un servidor determinat, només si el teu en sap res. La fan servir, en un sentit general, serveis que recoŀlecten estadístiques sobre la federació.
+        peers_api_enabled: Una llista de noms de domini que aquest servidor ha trobat al fedivers. No inclou cap dada sobre si estàs federat amb un servidor determinat, només si el teu en sap res. La fan servir, en un sentit general, serveis que recol·lecten estadístiques sobre la federació.
         profile_directory: El directori de perfils llista tots els usuaris que tenen activat ser descoberts.
         require_invite_text: Quan el registre requereixi aprovació manual, fes que sigui obligatori en lloc d'opcional d'escriure el text de la sol·licitud d'invitació "Per què vols unir-te?"
         site_contact_email: Com pot la gent comunicar amb tu per a consultes legals o de recolzament.
@@ -178,7 +173,6 @@ ca:
         context: Filtre els contextos
         current_password: Contrasenya actual
         data: Informació
-        discoverable: Mostra aquest compte en el directori de perfils
         display_name: Nom visible
         email: Adreça de correu electrònic
         expires_in: Expira després
@@ -188,7 +182,6 @@ ca:
         inbox_url: Enllaç de la safata d'entrada del relay
         irreversible: Cau en lloc d'ocultar
         locale: Idioma de la interfície
-        locked: Requereix sol·licituds de seguiment
         max_uses: Nombre màxim d'usos
         new_password: Contrasenya nova
         note: Biografia
@@ -211,9 +204,7 @@ ca:
         setting_display_media_show_all: Mostra-ho tot
         setting_expand_spoilers: Desplega sempre els tuts marcats amb advertències de contingut
         setting_hide_network: Amaga la teva xarxa
-        setting_noindex: Desactiva la indexació dels motors de cerca
         setting_reduce_motion: Redueix el moviment de les animacions
-        setting_show_application: Revela l'aplicació utilitzada per enviar tuts
         setting_system_font_ui: Usa la lletra predeterminada del sistema
         setting_theme: Tema del lloc
         setting_trends: Mostra les tendències d'avui
diff --git a/config/locales/simple_form.ckb.yml b/config/locales/simple_form.ckb.yml
index 0d129dd702..a6110e2034 100644
--- a/config/locales/simple_form.ckb.yml
+++ b/config/locales/simple_form.ckb.yml
@@ -36,7 +36,6 @@ ckb:
         inbox_url: نیشانەی پەڕەی سەرەکی ئەو رێڵە کە هەرەکتە بەکاریببەیت ڕوونووس دەکات
         irreversible: توتە فلتەرکراوەکە بە شێوەیەکی نەگەڕاو فرەدەدرێن، تەنانەت ئەگەر فلتەردواتر لاببرێت
         locale: زمانی ڕووکاری بەکارهێنەر، ئیمەیلەکان و ئاگانامەکان
-        locked: خۆت بڕیار بدە کێ دەتوانێت شوێنت بکەوێت بە وەرگتنی داوای شوێنکەوتن
         password: لایەنی کەم 8 نووسە بەکار بهێنە
         phrase: سەربەخۆ لە بچکۆلی و گەورەیی پیتەکان، لەگەڵ دەقی ئەسڵی یان ئاگانامەکانی ناوەرۆکی توتەکان هاوئاهەنگ دەکرێت
         scopes: APIـیەکانی بەرنامەنووسی کە ئەم ماڵپەڕە دەستپێگەیشتنی لەگەڵیان هیە. ئەگەر بەرزترین ئاست هەڵبژێرن ئیتر نیاز بە بژاردەی ئاستی نزم نییە.
@@ -45,9 +44,6 @@ ckb:
         setting_display_media_default: ئەو میدیایانە بشارەوە کە هەستیارن
         setting_display_media_hide_all: هەمیشە میدیا بشارەوە
         setting_display_media_show_all: هەمیشە میدیا نیشان بدە
-        setting_hide_network: شوێنکەوتوو و شوێنکەوتنەکانت لە پرۆفایلەکەت نیشان نادرێن
-        setting_noindex: کاردەکاتە سەر پرۆفایل و لاپەڕە گشتیەکانت
-        setting_show_application: بەرنامەیەک کە بە یارمەتیت توت دەکەیت، لە دیمەنی وردی توتەکان پیشان دەدرێت
         setting_use_blurhash: سێبەرەکان لە سەر بنەمای ڕەنگەکانی بەکارهاتوو لە وێنە داشاراوەکان دروست دەبن بەڵام وردەزانیاری وێنە تێیدا ڕوون نییە
         setting_use_pending_items: لەجیاتی ئەوەی بە خۆکارانە کێشان هەبێت لە نووسراوەکان بە کرتەیەک بەڕۆژبوونی پێرستی نووسراوەکان بشارەوە
         whole_word: کاتێک کلیل‌وشە بریتییە لە ژمارە و پیت، تنەها کاتێک پەیدا دەبێت کە لەگەڵ گشتی وشە لە نێو دەقەکە هاوئاهەنگ بێت، نە تەنها لەگەڵ بەشێک لە وشە
@@ -116,7 +112,6 @@ ckb:
         context: چوارچێوەی پاڵافتن
         current_password: تێپەروشەی ئێستا
         data: دراوه
-        discoverable: ئەم هەژمێرە لە پێرستی بژاردەی بەکارهێنەران نیشان بدە
         display_name: ناوی پیشاندان
         email: ناونیشانی ئیمەیڵ
         expires_in: بەسەردەچێت پاش
@@ -125,7 +120,6 @@ ckb:
         inbox_url: بەستەری سندوقی گواستنەوەی
         irreversible: فرێدان لەجیاتی شاردنەوە
         locale: زمانی پەڕەی بەکارهێنەر
-        locked: داخستنی هەژمارە
         max_uses: زۆرترین ژمارەی بەکاربەرەکان
         new_password: تێپەروشەی نوێ
         note: دەربارەی ئیوە
@@ -147,9 +141,7 @@ ckb:
         setting_display_media_show_all: هەموو نیشان بدە
         setting_expand_spoilers: هەمیشە ئەو توتانەی کە بە ئاگادارکردنەوەکانی ناوەڕۆکەوە نیشانەکراون، پیسان بدە
         setting_hide_network: شاردنەوەی تۆڕەکەت
-        setting_noindex: داوا لە مەکینەی گەڕان بۆ پیشاننەدان لە دەئەنجامی گەڕانەکان
         setting_reduce_motion: کەمکردنەوەی جوڵە لە ئەنیمەکان
-        setting_show_application: ئاشکراکردنی ئەپەکان بۆ ناردنی توتەکان
         setting_system_font_ui: فۆنتی بنەڕەتی سیستەم بەکاربهێنە
         setting_theme: ڕووکاری ماڵپەڕ
         setting_trends: پیشاندانی نووسراوە بەرچاوکراوەی ئەمڕۆ
diff --git a/config/locales/simple_form.co.yml b/config/locales/simple_form.co.yml
index 105c67efbf..fd6f595e91 100644
--- a/config/locales/simple_form.co.yml
+++ b/config/locales/simple_form.co.yml
@@ -34,7 +34,6 @@ co:
         inbox_url: Cupiate l'URL di a pagina d'accolta di u ripetitore chì vulete utilizà
         irreversible: I statuti filtrati saranu sguassati di manera irreversibile, ancu s'ellu hè toltu u filtru
         locale: A lingua di l'interfaccia utilizatore, di l'e-mail è di e nutificazione push
-        locked: Duvarete appruvà e dumande d’abbunamentu
         password: Ci volenu almenu 8 caratteri
         phrase: Sarà trovu senza primura di e maiuscule o di l'avertimenti
         scopes: L'API à quelle l'applicazione averà accessu. S'è voi selezziunate un parametru d'altu livellu, un c'hè micca bisognu di selezziunà quell'individuali.
@@ -43,9 +42,6 @@ co:
         setting_display_media_default: Piattà i media marcati cum'è sensibili
         setting_display_media_hide_all: Sempre piattà tutti i media
         setting_display_media_show_all: Sempre affissà i media marcati cum'è sensibili
-        setting_hide_network: I vostri abbunati è abbunamenti ùn saranu micca mustrati nant’à u vostru prufile
-        setting_noindex: Tocca à u vostru prufile pubblicu è i vostri statuti
-        setting_show_application: L'applicazione chì voi utilizate per mandà statuti sarà affissata indè a vista ditagliata di quelli
         setting_use_blurhash: I digradati blurhash sò basati nant'à i culori di u ritrattu piattatu ma senza i ditagli
         setting_use_pending_items: Clicchi per messe à ghjornu i statuti invece di fà sfilà a linea autumaticamente
         whole_word: Quandu a parolla o a frasa sana hè alfanumerica, sarà applicata solu s'ella currisponde à a parolla sana
@@ -116,7 +112,6 @@ co:
         context: Cuntesti di u filtru
         current_password: Chjave d’accessu attuale
         data: Dati
-        discoverable: Arregistrà stu contu indè l'annuariu
         display_name: Nome pubblicu
         email: Indirizzu e-mail
         expires_in: Spira dopu à
@@ -126,7 +121,6 @@ co:
         inbox_url: URL di l'inbox di u ripetitore
         irreversible: Sguassà invece di piattà
         locale: Lingua di l'interfaccia
-        locked: Privatizà u contu
         max_uses: Numeru massimale d’utilizazione
         new_password: Nova chjave d’accessu
         note: Descrizzione
@@ -148,9 +142,7 @@ co:
         setting_display_media_show_all: Affissà tuttu
         setting_expand_spoilers: Sempre slibrà i statutu marcati cù un'avertimentu CW
         setting_hide_network: Piattà a vostra rete
-        setting_noindex: Dumandà à i motori di ricerca internet d’un pudè micca esse truvatu·a cusì
         setting_reduce_motion: Fà chì l’animazione vanu più pianu
-        setting_show_application: Indicà u nome di l'applicazione utilizata per mandà statuti
         setting_system_font_ui: Pulizza di caratteri di u sistemu
         setting_theme: Tema di u situ
         setting_trends: Vede e tendenze per oghji
diff --git a/config/locales/simple_form.cs.yml b/config/locales/simple_form.cs.yml
index 05dd9c54b1..dff9378098 100644
--- a/config/locales/simple_form.cs.yml
+++ b/config/locales/simple_form.cs.yml
@@ -2,6 +2,10 @@
 cs:
   simple_form:
     hints:
+      account:
+        display_name: Vaše celé jméno nebo přezdívka.
+        fields: Vaše domovská stránka, zájmena, věk, cokoliv chcete.
+        note: 'Můžete @zmínit jiné osoby nebo #hashtagy.'
       account_alias:
         acct: Zadejte svůj účet, ze kterého se chcete přesunout jinam, ve formátu přezdívka@doména
       account_migration:
@@ -37,13 +41,11 @@ cs:
         current_password: Z bezpečnostních důvodů prosím zadejte heslo současného účtu
         current_username: Potvrďte prosím tuto akci zadáním uživatelského jména aktuálního účtu
         digest: Odesíláno pouze po dlouhé době nečinnosti a pouze, pokud jste během své nepřítomnosti obdrželi osobní zprávy
-        discoverable: Umožnit, aby mohli váš účet objevit neznámí lidé pomocí doporučení, trendů a dalších funkcí
         email: Bude vám poslán potvrzovací e-mail
         header: PNG, GIF či JPG. Maximálně %{size}. Bude zmenšen na %{dimensions} px
         inbox_url: Zkopírujte URL z hlavní stránky mostu, který chcete použít
         irreversible: Filtrované příspěvky nenávratně zmizí, i pokud bude filtr později odstraněn
         locale: Jazyk uživatelského rozhraní, e-mailů a push notifikací
-        locked: Kontrolujte, kdo vás může sledovat pomocí schvalování žádostí o sledování
         password: Použijte alespoň 8 znaků
         phrase: Shoda bude nalezena bez ohledu na velikost písmen v textu příspěvku či varování o obsahu
         scopes: Která API bude aplikace moct používat. Pokud vyberete rozsah nejvyššího stupně, nebudete je muset vybírat jednotlivě.
@@ -53,9 +55,6 @@ cs:
         setting_display_media_default: Skrývat média označená jako citlivá
         setting_display_media_hide_all: Vždy skrývat média
         setting_display_media_show_all: Vždy zobrazovat média
-        setting_hide_network: Koho sledujete a kdo sleduje vás bude na vašem profilu skryto
-        setting_noindex: Ovlivňuje váš veřejný profil a stránky příspěvků
-        setting_show_application: Aplikace, kterou používáte k odeslání příspěvků, bude zobrazena jejich detailním zobrazení
         setting_use_blurhash: Gradienty jsou založeny na barvách skryté grafiky, ale zakrývají jakékoliv detaily
         setting_use_pending_items: Aktualizovat časovou osu až po kliknutí namísto automatického rolování kanálu
         username: Pouze písmena, číslice a podtržítka
@@ -130,6 +129,7 @@ cs:
         position: Vyšší role rozhoduje o řešení konfliktů v určitých situacích. Některé akce lze provádět pouze na rolích s nižší prioritou
       webhook:
         events: Zvolte odesílané události
+        template: Sestavte si vlastní JSON payload pomocí interpolace proměnných. Pro výchozí JSON ponechte prázdné.
         url: Kam budou události odesílány
     labels:
       account:
@@ -173,7 +173,6 @@ cs:
         context: Kontexty filtrů
         current_password: Současné heslo
         data: Data
-        discoverable: Navrhovat účet ostatním
         display_name: Zobrazované jméno
         email: E-mailová adresa
         expires_in: Vypršet za
@@ -183,7 +182,6 @@ cs:
         inbox_url: URL příchozí schránky mostu
         irreversible: Zahodit místo skrytí
         locale: Jazyk rozhraní
-        locked: Vynutit žádosti o sledování
         max_uses: Maximální počet použití
         new_password: Nové heslo
         note: O vás
@@ -206,9 +204,7 @@ cs:
         setting_display_media_show_all: Zobrazit vše
         setting_expand_spoilers: Vždy rozbalit příspěvky označené varováními o obsahu
         setting_hide_network: Skrýt mou síť
-        setting_noindex: Neindexovat svůj profil vyhledávači
         setting_reduce_motion: Omezit pohyb v animacích
-        setting_show_application: Odhalit aplikaci použitou k odeslání příspěvků
         setting_system_font_ui: Použít výchozí písmo systému
         setting_theme: Vzhled stránky
         setting_trends: Zobrazit dnešní trendy
@@ -294,6 +290,7 @@ cs:
         usable: Povolit používat tento hashtag v příspěvcích
       user:
         role: Role
+        time_zone: Časové pásmo
       user_role:
         color: Barva odznaku
         highlighted: Zobrazit roli jako odznak na profilech uživatelů
@@ -302,6 +299,7 @@ cs:
         position: Priorita
       webhook:
         events: Zapnuté události
+        template: Šablona payloadu
         url: URL koncového bodu
     'no': Ne
     not_recommended: Nedoporučuje se
diff --git a/config/locales/simple_form.cy.yml b/config/locales/simple_form.cy.yml
index 0c85f0667a..f5ae0c7060 100644
--- a/config/locales/simple_form.cy.yml
+++ b/config/locales/simple_form.cy.yml
@@ -41,13 +41,11 @@ cy:
         current_password: At ddibenion diogelwch, nodwch gyfrinair y cyfrif cyfredol
         current_username: I gadarnhau, nodwch enw defnyddiwr y cyfrif cyfredol
         digest: Ond yn cael eu hanfon ar ôl cyfnod hir o anweithgarwch ac ond os ydych wedi derbyn unrhyw negeseuon personol yn eich absenoldeb
-        discoverable: Caniatáu i'ch cyfrif gael ei ddarganfod gan ddieithriaid trwy argymhellion, pynciau llosg a nodweddion eraill
         email: Byddwch yn derbyn e-bost cadarnhau
         header: PNG, GIF neu JPG. %{size} ar y mwyaf. Bydd yn cael ei israddio i %{dimensions}px
         inbox_url: Copïwch yr URL o dudalen flaen y relái yr ydych am ei ddefnyddio
         irreversible: Bydd postiadau wedi'u hidlo'n diflannu'n ddiwrthdro, hyd yn oed os caiff yr hidlydd ei dynnu'n ddiweddarach
         locale: Iaith y rhyngwyneb, e-byst a hysbysiadau gwthiadwy
-        locked: Mae hyn yn eich galluogi i reoli pwy sy'n gallu eich dilyn drwy gymeradwyo ceisiadau dilyn
         password: Defnyddiwch o leiaf 8 nod
         phrase: Caiff ei gyfateb heb ystyriaeth o briflythrennu mewn testun neu rhybudd ynghylch cynnwys postiad
         scopes: Pa APIs y bydd y rhaglen yn cael mynediad iddynt. Os dewiswch gwmpas lefel uchaf, nid oes angen i chi ddewis rhai unigol.
@@ -57,9 +55,6 @@ cy:
         setting_display_media_default: Cuddio cyfryngau wedi eu marcio'n sensitif
         setting_display_media_hide_all: Cuddio cyfryngau bob tro
         setting_display_media_show_all: Dangos cyfryngau bob tro
-        setting_hide_network: Ni fydd y pobl yr ydych chi'n eu dilyn a'ch dilynwyr yn ymddangos ar eich proffil
-        setting_noindex: Mae hyn yn effeithio ar eich proffil cyhoeddus a'ch tudalennau statws
-        setting_show_application: Bydd y cymhwysiad a ddefnyddiwch i bostio yn cael ei arddangos yng ngolwg fanwl eich postiadau
         setting_use_blurhash: Mae graddiannau wedi'u seilio ar liwiau'r delweddau cudd ond maen nhw'n cuddio unrhyw fanylion
         setting_use_pending_items: Cuddio diweddariadau llinell amser y tu ôl i glic yn lle sgrolio'n awtomatig
         username: Gallwch ddefnyddio nodau, rhifau a thanlinellau
@@ -178,7 +173,6 @@ cy:
         context: Hidlo cyd-destunau
         current_password: Cyfrinair cyfredol
         data: Data
-        discoverable: Awgrymu cyfrif i eraill
         display_name: Enw dangos
         email: Cyfeiriad e-bost
         expires_in: Yn dod i ben ar ôl
@@ -188,7 +182,6 @@ cy:
         inbox_url: URL y mewnflwch relái
         irreversible: Gollwng yn hytrach na chuddio
         locale: Iaith y rhyngwyneb
-        locked: Angen ceisiadau dilyn
         max_uses: Nifer y ddefnyddiau uchafswm
         new_password: Cyfrinair newydd
         note: Bywgraffiad
@@ -211,9 +204,7 @@ cy:
         setting_display_media_show_all: Dangos popeth
         setting_expand_spoilers: Dangos postiadau wedi'u marcio â rhybudd cynnwys bob tro
         setting_hide_network: Cuddio eich graff cymdeithasol
-        setting_noindex: Eithrio rhag gael eich mynegeio gan beiriannau chwilio
         setting_reduce_motion: Lleihau mudiant mewn animeiddiadau
-        setting_show_application: Datgelu rhaglen a ddefnyddir i anfon postiadau
         setting_system_font_ui: Defnyddio ffont rhagosodedig y system
         setting_theme: Thema'r wefan
         setting_trends: Dangos pynciau llosg heddiw
diff --git a/config/locales/simple_form.da.yml b/config/locales/simple_form.da.yml
index 4e8972cb96..d47b547230 100644
--- a/config/locales/simple_form.da.yml
+++ b/config/locales/simple_form.da.yml
@@ -41,13 +41,11 @@ da:
         current_password: Angiv af sikkerhedsårsager adgangskoden til den aktuelle konto
         current_username: For at bekræfte, angiv brugernavnet for den aktuelle konto
         digest: Sendes kun efter en lang inaktivitetsperiode, og kun hvis du har modtaget personlige beskeder under fraværet
-        discoverable: Tillad kontoen at blive fundet af fremmede via anbefalinger og øvrige funktioner
         email: En bekræftelses-e-mail fremsendes
         header: PNG, GIF eller JPG. Maks. %{size}. Auto-nedskaleres til %{dimensions}px
         inbox_url: Kopiér URL'en fra forsiden af den videreformidler, der skal anvendes
         irreversible: Filtrerede indlæg forsvinder permanent, selv hvis filteret senere fjernes
         locale: Sprog til brug for brugerflade, e-mails og push-notifikationer
-        locked: Godkend manuelt følgeanmodninger for at styre, hvem der følger dig
         password: Brug mindst 8 tegn
         phrase: Matches uanset uanset brug af store/små bogstaver i teksten eller indholdsadvarsel for et indlæg
         scopes: De API'er, som applikationen vil kunne tilgå. Vælges en topniveaudstrækning, vil detailvalg være unødvendige.
@@ -57,9 +55,6 @@ da:
         setting_display_media_default: Skjul medier med sensitiv-markering
         setting_display_media_hide_all: Skjul altid medier
         setting_display_media_show_all: Vis altid medier
-        setting_hide_network: Hvem du følger, og hvem som følger dig, skjules på din profil
-        setting_noindex: Påvirker din offentlige profil samt indlægssider
-        setting_show_application: Applikationen, hvormed der postes, vil fremgå af detailvisningen af dine indlæg
         setting_use_blurhash: Gradienter er baseret på de skjulte grafikelementers farver, men slører alle detaljer
         setting_use_pending_items: Skjul tidslinjeopdateringer bag et klik i stedet for brug af auto-feedrulning
         username: Bogstaver, cifre og understregningstegn kan benyttes
@@ -178,7 +173,6 @@ da:
         context: Kontekstfiltrering
         current_password: Aktuel adgangskode
         data: Data
-        discoverable: Foreslå konto til andre
         display_name: Visningsnavn
         email: E-mailadresse
         expires_in: Udløb efter
@@ -188,7 +182,6 @@ da:
         inbox_url: URL til videreformidlingsindbakken
         irreversible: Fjern istedet for skjul
         locale: Grænsefladesprog
-        locked: Kræv følgeanmodninger
         max_uses: Maks. antal afbenyttelser
         new_password: Ny adgangskode
         note: Biografi
@@ -211,9 +204,7 @@ da:
         setting_display_media_show_all: Vis alle
         setting_expand_spoilers: Ekspandér altid indlæg markeret med indholdsadvarsler
         setting_hide_network: Skjul din sociale graf
-        setting_noindex: Fravælg søgemaskineindeksering
         setting_reduce_motion: Reducér animationsbevægelse
-        setting_show_application: Vis applikationen brugt til at poste indlæg
         setting_system_font_ui: Brug systemets standardskrifttype
         setting_theme: Webstedstema
         setting_trends: Vis dagens tendenser
diff --git a/config/locales/simple_form.de.yml b/config/locales/simple_form.de.yml
index 012989244d..f89ed2d22c 100644
--- a/config/locales/simple_form.de.yml
+++ b/config/locales/simple_form.de.yml
@@ -20,7 +20,7 @@ de:
         type_html: Wähle aus, wie mit <strong>%{acct}</strong> vorgegangen werden soll
         types:
           disable: Benutzer*in daran hindern, das Konto verwenden zu können, aber die Inhalte nicht löschen oder ausblenden.
-          none: Dem Konto eine Verwarnung zusenden, ohne dabei eine andere Aktion vorzunehmen.
+          none: Dem Konto eine Warnung zusenden, ohne dabei eine andere Aktion vorzunehmen.
           sensitive: Erzwingen, dass alle Medieninhalte dieses Profils mit einer Inhaltswarnung versehen werden.
           silence: Verhindert, dass dieses Profil öffentlich sichtbare Beiträge verfassen kann, und verbirgt alle Beiträge und Benachrichtigungen vor Personen, die diesem Profil nicht folgen. Alle Meldungen zu diesem Konto werden geschlossen.
           suspend: Verhindert jegliche Interaktion von oder zu diesem Konto und löscht dessen Inhalt. Dies kann innerhalb von 30 Tagen rückgängig gemacht werden. Alle Meldungen zu diesem Konto werden geschlossen.
@@ -40,26 +40,21 @@ de:
         context: Orte, an denen der Filter aktiv sein soll
         current_password: Gib aus Sicherheitsgründen bitte das Passwort des aktuellen Kontos ein
         current_username: Um das zu bestätigen, gib den Profilnamen des aktuellen Kontos ein
-        digest: Wenn du eine längere Zeit inaktiv bist oder du in deiner Abwesenheit eine Direktnachricht erhalten hast
-        discoverable: Dein Konto kann von Fremden durch Empfehlungen, Trends und andere Funktionen entdeckt werden
+        digest: Wenn du eine längere Zeit inaktiv bist oder du während deiner Abwesenheit in einer privaten Nachricht erwähnt worden bist
         email: Du wirst eine E-Mail zur Verifizierung dieser E-Mail-Adresse erhalten
         header: PNG, GIF oder JPG. Höchstens %{size} groß. Wird auf %{dimensions} px verkleinert
         inbox_url: Kopiere die URL von der Startseite des gewünschten Relays
         irreversible: Bereinigte Beiträge verschwinden unwiderruflich für dich, auch dann, wenn dieser Filter zu einem späteren wieder entfernt wird
         locale: Die Sprache der Bedienoberfläche, E-Mails und Push-Benachrichtigungen
-        locked: Wer dir folgen möchte, muss um deine Erlaubnis bitten
         password: Verwende mindestens 8 Zeichen
         phrase: Wird unabhängig von der Groß- und Kleinschreibung im Text oder der Inhaltswarnung eines Beitrags abgeglichen
         scopes: Welche Schnittstellen der Applikation erlaubt sind. Wenn du einen Top-Level-Scope auswählst, dann musst du nicht jeden einzelnen darunter auswählen.
-        setting_aggregate_reblogs: Keine geteilten Beiträge anzeigen, die bereits kürzlich geteilt wurden (wirkt sich nur auf zukünftige geteilte Beiträge aus)
+        setting_aggregate_reblogs: Beiträge, die erst kürzlich geteilt wurden, werden nicht noch einmal angezeigt (wirkt sich nur auf zukünftige geteilte Beiträge aus)
         setting_always_send_emails: Normalerweise werden Benachrichtigungen nicht per E-Mail versendet, wenn du gerade auf Mastodon aktiv bist
         setting_default_sensitive: Medien, die mit einer Inhaltswarnung versehen worden sind, werden – je nach Einstellung – erst nach einem zusätzlichen Klick angezeigt
         setting_display_media_default: Medien mit Inhaltswarnung ausblenden
         setting_display_media_hide_all: Medien immer ausblenden
         setting_display_media_show_all: Medien mit Inhaltswarnung immer anzeigen
-        setting_hide_network: Wem du folgst und wer dir folgt, wird auf deinem Profil nicht angezeigt
-        setting_noindex: Betrifft dein öffentliches Profil und deine Beiträge
-        setting_show_application: Die Anwendung die du nutzt wird in der detaillierten Ansicht deiner Beiträge angezeigt
         setting_use_blurhash: Der Farbverlauf basiert auf den Farben der ausgeblendeten Medien, verschleiert aber jegliche Details
         setting_use_pending_items: Neue Beiträge hinter einem Klick verstecken, anstatt automatisch zu scrollen
         username: Du kannst Buchstaben, Zahlen und Unterstriche verwenden
@@ -151,7 +146,7 @@ de:
       admin_account_action:
         include_statuses: Gemeldete Beiträge der E-Mail beifügen
         send_email_notification: Benachrichtigung per E-Mail
-        text: Individuelle Verwarnung
+        text: Individuelle Warnung
         type: Aktion
         types:
           disable: Einfrieren
@@ -178,17 +173,15 @@ de:
         context: Nach Bereichen filtern
         current_password: Derzeitiges Passwort
         data: Daten
-        discoverable: Anderen dieses Konto empfehlen
         display_name: Anzeigename
         email: E-Mail-Adresse
         expires_in: Läuft ab
-        fields: Zusatzfelder
+        fields: Metadaten
         header: Titelbild
         honeypot: "%{label} (nicht ausfüllen)"
         inbox_url: Inbox-URL des Relais
         irreversible: Endgültig, nicht nur temporär ausblenden
         locale: Sprache des Webinterface
-        locked: Geschütztes Profil
         max_uses: Maximale Anzahl von Verwendungen
         new_password: Neues Passwort
         note: Biografie
@@ -211,9 +204,7 @@ de:
         setting_display_media_show_all: Alle Medien anzeigen
         setting_expand_spoilers: Beiträge mit Inhaltswarnung immer ausklappen
         setting_hide_network: Follower und „Folge ich“ nicht anzeigen
-        setting_noindex: Suchmaschinen-Indexierung verhindern
         setting_reduce_motion: Bewegung in Animationen verringern
-        setting_show_application: Anwendung für das Veröffentlichen von Beiträgen offenlegen
         setting_system_font_ui: Standardschriftart des Browsers verwenden
         setting_theme: Design
         setting_trends: Heutige Trends anzeigen
@@ -226,7 +217,7 @@ de:
         type: Typ
         username: Profilname
         username_or_email: Profilname oder E-Mail
-        whole_word: Phrasensuche mit exakter Zeichenfolge erzwingen
+        whole_word: Exakte Zeichenfolge
       email_domain_block:
         with_dns_records: MX-Einträge und IP-Adressen der Domain einbeziehen
       featured_tag:
@@ -259,14 +250,14 @@ de:
         status_page_url: Statusseite (URL)
         theme: Standard-Design
         thumbnail: Vorschaubild des Servers
-        timeline_preview: Nicht-authentifizierten Zugriff auf die öffentliche Timeline gestatten
+        timeline_preview: Nicht-authentisierten Zugriff auf öffentliche Timelines gestatten
         trendable_by_default: Trends ohne vorherige Überprüfung erlauben
         trends: Trends aktivieren
         trends_as_landing_page: Trends als Landingpage verwenden
       interactions:
-        must_be_follower: Benachrichtigungen von Profilen unterdrücken, die mir nicht folgen
-        must_be_following: Benachrichtigungen von Profilen unterdrücken, denen ich nicht folge
-        must_be_following_dm: Direktnachrichten von Profilen, denen ich nicht folge, ablehnen
+        must_be_follower: Benachrichtigungen von Profilen, die mir nicht folgen, ausblenden
+        must_be_following: Benachrichtigungen von Profilen, denen ich nicht folge, ausblenden
+        must_be_following_dm: Private Nachrichten von Profilen, denen ich nicht folge, ausblenden
       invite:
         comment: Kommentar
       invite_request:
diff --git a/config/locales/simple_form.el.yml b/config/locales/simple_form.el.yml
index 339b4b5303..dc140a199f 100644
--- a/config/locales/simple_form.el.yml
+++ b/config/locales/simple_form.el.yml
@@ -37,13 +37,11 @@ el:
         current_password: Για λόγους ασφαλείας παρακαλώ γράψε τον κωδικό του τρέχοντος λογαριασμού
         current_username: Για επιβεβαίωση, παρακαλώ γράψε το όνομα χρήστη του τρέχοντος λογαριασμού
         digest: Αποστέλλεται μόνο μετά από μακρά περίοδο αδράνειας και μόνο αν έχεις λάβει προσωπικά μηνύματα κατά την απουσία σου
-        discoverable: Επέτρεψε στον λογαριασμό σου να ανακαλυφθεί από αγνώστους μέσω συστάσεων, τάσεων και άλλων χαρακτηριστικών
         email: Θα σου σταλεί email επιβεβαίωσης
         header: PNG, GIF ή JPG. Έως %{size}. Θα περιοριστεί σε διάσταση %{dimensions}px
         inbox_url: Αντέγραψε το URL της αρχικής σελίδας του ανταποκριτή που θέλεις να χρησιμοποιήσεις
         irreversible: Οι φιλτραρισμένες αναρτήσεις θα εξαφανιστούν αμετάκλητα, ακόμα και αν το φίλτρο αργότερα αφαιρεθεί
         locale: Η γλώσσα χρήσης, των email και των ειδοποιήσεων push
-        locked: Απαιτεί να εγκρίνεις χειροκίνητα τους ακόλουθούς σου
         password: Χρησιμοποίησε τουλάχιστον 8 χαρακτήρες
         phrase: Θα ταιριάζει ανεξαρτήτως πεζών/κεφαλαίων ή προειδοποίησης περιεχομένου μιας ανάρτησης
         scopes: Ποια API θα επιτρέπεται στην εφαρμογή να χρησιμοποιήσεις. Αν επιλέξεις κάποιο υψηλό εύρος εφαρμογής, δε χρειάζεται να επιλέξεις και το καθένα ξεχωριστά.
@@ -53,9 +51,6 @@ el:
         setting_display_media_default: Απόκρυψη ευαίσθητων πολυμέσων
         setting_display_media_hide_all: Μόνιμη απόκρυψη όλων των πολυμέσων
         setting_display_media_show_all: Πάντα εμφάνιση πολυμέσων
-        setting_hide_network: Δε θα εμφανίζεται στο προφίλ σου ποιους ακολουθείς και ποιοι σε ακολουθούν
-        setting_noindex: Επηρεάζει το δημόσιο προφίλ και τις αναρτήσεις σου
-        setting_show_application: Η εφαρμογή που χρησιμοποιείς για να κάνεις τις αναρτήσεις σου θα εμφανίζεται στις αναλυτικές λεπτομέρειες των αναρτήσεων σου
         setting_use_blurhash: Οι χρωματισμοί βασίζονται στα χρώματα του κρυμμένου πολυμέσου αλλά θολώνουν τις λεπτομέρειες
         setting_use_pending_items: Εμφάνιση ενημερώσεων ροής μετά από κλικ αντί για αυτόματη κύλισή τους
         username: Μπορείς να χρησιμοποιήσεις γράμματα, αριθμούς και κάτω παύλες
@@ -173,7 +168,6 @@ el:
         context: Πλαίσια φιλτραρίσματος
         current_password: Τρέχον συνθηματικό
         data: Δεδομένα
-        discoverable: Εμφάνιση αυτού του λογαριασμού στον κατάλογο
         display_name: Όνομα εμφάνισης
         email: Διεύθυνση email
         expires_in: Λήξη μετά από
@@ -183,7 +177,6 @@ el:
         inbox_url: Το URL του inbox του ανταποκριτή (relay)
         irreversible: Απόρριψη αντί για κρύψιμο
         locale: Γλώσσα χρήσης
-        locked: Κλείδωμα λογαριασμού
         max_uses: Μέγιστος αριθμός χρήσεων
         new_password: Νέο συνθηματικό
         note: Βιογραφικό
@@ -206,9 +199,7 @@ el:
         setting_display_media_show_all: Εμφάνιση όλων
         setting_expand_spoilers: Μόνιμη ανάπτυξη των τουτ με προειδοποίηση περιεχομένου
         setting_hide_network: Κρύψε τις διασυνδέσεις σου
-        setting_noindex: Επέλεξε να μην συμμετέχεις στα αποτελέσματα μηχανών αναζήτησης
         setting_reduce_motion: Μείωση κίνησης κινουμένων στοιχείων
-        setting_show_application: Αποκάλυψη εφαρμογής που χρησιμοποιήθηκε για την αποστολή των τουτ
         setting_system_font_ui: Χρήση της προεπιλεγμένης γραμματοσειράς του συστήματος
         setting_theme: Θέμα ιστότοπου
         setting_trends: Εμφάνιση σημερινών τάσεων
diff --git a/config/locales/simple_form.en-GB.yml b/config/locales/simple_form.en-GB.yml
index 150ce85023..3aa52fde22 100644
--- a/config/locales/simple_form.en-GB.yml
+++ b/config/locales/simple_form.en-GB.yml
@@ -41,13 +41,11 @@ en-GB:
         current_password: For security purposes please enter the password of the current account
         current_username: To confirm, please enter the username of the current account
         digest: Only sent after a long period of inactivity and only if you have received any personal messages in your absence
-        discoverable: Allow your account to be discovered by strangers through recommendations, trends and other features
         email: You will be sent a confirmation e-mail
         header: PNG, GIF or JPG. At most %{size}. Will be downscaled to %{dimensions}px
         inbox_url: Copy the URL from the frontpage of the relay you want to use
         irreversible: Filtered posts will disappear irreversibly, even if filter is later removed
         locale: The language of the user interface, e-mails and push notifications
-        locked: Manually control who can follow you by approving follow requests
         password: Use at least 8 characters
         phrase: Will be matched regardless of casing in text or content warning of a post
         scopes: Which APIs the application will be allowed to access. If you select a top-level scope, you don't need to select individual ones.
@@ -57,9 +55,6 @@ en-GB:
         setting_display_media_default: Hide media marked as sensitive
         setting_display_media_hide_all: Always hide media
         setting_display_media_show_all: Always show media
-        setting_hide_network: Who you follow and who follows you will be hidden on your profile
-        setting_noindex: Affects your public profile and post pages
-        setting_show_application: The application you use to post will be displayed in the detailed view of your posts
         setting_use_blurhash: Gradients are based on the colors of the hidden visuals but obfuscate any details
         setting_use_pending_items: Hide timeline updates behind a click instead of automatically scrolling the feed
         username: You can use letters, numbers, and underscores
@@ -178,7 +173,6 @@ en-GB:
         context: Filter contexts
         current_password: Current password
         data: Data
-        discoverable: Suggest account to others
         display_name: Display name
         email: E-mail address
         expires_in: Expire after
@@ -188,7 +182,6 @@ en-GB:
         inbox_url: URL of the relay inbox
         irreversible: Drop instead of hide
         locale: Interface language
-        locked: Require follow requests
         max_uses: Max number of uses
         new_password: New password
         note: Bio
@@ -211,9 +204,7 @@ en-GB:
         setting_display_media_show_all: Show all
         setting_expand_spoilers: Always expand posts marked with content warnings
         setting_hide_network: Hide your social graph
-        setting_noindex: Opt-out of search engine indexing
         setting_reduce_motion: Reduce motion in animations
-        setting_show_application: Disclose application used to send posts
         setting_system_font_ui: Use system's default font
         setting_theme: Site theme
         setting_trends: Show today's trends
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index c9b60689af..e8cbba7c07 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -3,9 +3,12 @@ en:
   simple_form:
     hints:
       account:
+        discoverable: Your public posts and profile may be featured or recommended in various areas of Mastodon and your profile may be suggested to other users.
         display_name: Your full name or your fun name.
         fields: Your homepage, pronouns, age, anything you want.
         note: 'You can @mention other people or #hashtags.'
+        show_collections: People will be able to browse through your follows and followers. People that you follow will see that you follow them regardless.
+        unlocked: People will be able to follow you without requesting approval. Uncheck if you want to review follow requests and chose whether to accept or reject new followers.
       account_alias:
         acct: Specify the username@domain of the account you want to move from
       account_migration:
@@ -41,13 +44,11 @@ en:
         current_password: For security purposes please enter the password of the current account
         current_username: To confirm, please enter the username of the current account
         digest: Only sent after a long period of inactivity and only if you have received any personal messages in your absence
-        discoverable: Allow your account to be discovered by strangers through recommendations, trends and other features
         email: You will be sent a confirmation e-mail
         header: PNG, GIF or JPG. At most %{size}. Will be downscaled to %{dimensions}px
         inbox_url: Copy the URL from the frontpage of the relay you want to use
         irreversible: Filtered posts will disappear irreversibly, even if filter is later removed
         locale: The language of the user interface, e-mails and push notifications
-        locked: Manually control who can follow you by approving follow requests
         password: Use at least 8 characters
         phrase: Will be matched regardless of casing in text or content warning of a post
         scopes: Which APIs the application will be allowed to access. If you select a top-level scope, you don't need to select individual ones.
@@ -57,9 +58,6 @@ en:
         setting_display_media_default: Hide media marked as sensitive
         setting_display_media_hide_all: Always hide media
         setting_display_media_show_all: Always show media
-        setting_hide_network: Who you follow and who follows you will be hidden on your profile
-        setting_noindex: Affects your public profile and post pages
-        setting_show_application: The application you use to post will be displayed in the detailed view of your posts
         setting_use_blurhash: Gradients are based on the colors of the hidden visuals but obfuscate any details
         setting_use_pending_items: Hide timeline updates behind a click instead of automatically scrolling the feed
         username: You can use letters, numbers, and underscores
@@ -121,6 +119,9 @@ en:
       sessions:
         otp: 'Enter the two-factor code generated by your phone app or use one of your recovery codes:'
         webauthn: If it's an USB key be sure to insert it and, if necessary, tap it.
+      settings:
+        indexable: Your profile page may appear in search results on Google, Bing, and others.
+        show_application: You will always be able to see which app published your post regardless.
       tag:
         name: You can only change the casing of the letters, for example, to make it more readable
       user:
@@ -138,9 +139,12 @@ en:
         url: Where events will be sent to
     labels:
       account:
+        discoverable: Feature profile and posts in discovery algorithms
         fields:
           name: Label
           value: Content
+        show_collections: Show follows and followers on profile
+        unlocked: Automatically accept new followers
       account_alias:
         acct: Handle of the old account
       account_migration:
@@ -178,7 +182,6 @@ en:
         context: Filter contexts
         current_password: Current password
         data: Data
-        discoverable: Suggest account to others
         display_name: Display name
         email: E-mail address
         expires_in: Expire after
@@ -188,7 +191,6 @@ en:
         inbox_url: URL of the relay inbox
         irreversible: Drop instead of hide
         locale: Interface language
-        locked: Require follow requests
         max_uses: Max number of uses
         new_password: New password
         note: Bio
@@ -211,9 +213,7 @@ en:
         setting_display_media_show_all: Show all
         setting_expand_spoilers: Always expand posts marked with content warnings
         setting_hide_network: Hide your social graph
-        setting_noindex: Opt-out of search engine indexing
         setting_reduce_motion: Reduce motion in animations
-        setting_show_application: Disclose application used to send posts
         setting_system_font_ui: Use system's default font
         setting_theme: Site theme
         setting_trends: Show today's trends
@@ -292,6 +292,9 @@ en:
         trending_tag: New trend requires review
       rule:
         text: Rule
+      settings:
+        indexable: Include profile page in search engines
+        show_application: Display from which app you sent a post
       tag:
         listable: Allow this hashtag to appear in searches and suggestions
         name: Hashtag
diff --git a/config/locales/simple_form.eo.yml b/config/locales/simple_form.eo.yml
index f7adede7c7..434da61976 100644
--- a/config/locales/simple_form.eo.yml
+++ b/config/locales/simple_form.eo.yml
@@ -41,13 +41,11 @@ eo:
         current_password: Pro sekuraj kialoj, bonvolu enigi la pasvorton de la nuna konto
         current_username: Por konfirmi, bonvolu enigi la uzantnomon de la nuna konto
         digest: Sendita nur post longa tempo de neaktiveco, kaj nur se vi ricevis personan mesaĝon en via foresto
-        discoverable: Permesi vian konton esti malkovrita de fremduloj per rekomendoj, tendencoj kaj aliaj funkcioj
         email: Vi ricevos konfirman retpoŝton
         header: Formato PNG, GIF aŭ JPG. Ĝis %{size}. Estos malgrandigita al %{dimensions}px
         inbox_url: Kopiu la URL de la ĉefpaĝo de la ripetilo, kiun vi volas uzi
         irreversible: La filtritaj mesaĝoj malaperos por eterne, eĉ se la filtrilo poste estas forigita
         locale: La lingvo de la fasado, retpoŝtaĵoj, kaj sciigoj
-        locked: Vi devos aprobi ĉiun peton de sekvado mane
         password: Uzu almenaŭ 8 signojn
         phrase: Estos provita senzorge pri la uskleco de teksto aŭ averto pri enhavo de mesaĝo
         scopes: Kiujn API-ojn la aplikaĵo permesiĝos atingi. Se vi elektas supran amplekson, vi ne bezonas elekti la individuajn.
@@ -57,9 +55,6 @@ eo:
         setting_display_media_default: Kaŝi plurmediojn markitajn kiel tiklaj
         setting_display_media_hide_all: Ĉiam kaŝi la plurmediojn
         setting_display_media_show_all: Ĉiam montri la plurmediojn
-        setting_hide_network: Tiuj kiujn vi sekvas, kaj tiuj kiuj sekvas vin estos kaŝitaj en via profilo
-        setting_noindex: Influas vian publikan profilon kaj afiŝajn paĝojn
-        setting_show_application: La aplikaĵo, kiun vi uzas por afiŝi, estos montrita en la detala vido de viaj afiŝoj
         setting_use_blurhash: Transirojn estas bazita sur la koloroj de la kaŝitaj aŭdovidaĵoj sed ne montri iun ajn detalon
         setting_use_pending_items: Kaŝi tempoliniajn ĝisdatigojn malantaŭ klako anstataŭ aŭtomate rulumi la fluon
         username: Vi povas uzi literojn, ciferojn kaj substrekojn
@@ -178,7 +173,6 @@ eo:
         context: Filtri kuntekstojn
         current_password: Nuna pasvorto
         data: Datumoj
-        discoverable: Montri ĉi tiun konton en la profilujo
         display_name: Publika nomo
         email: Retadreso
         expires_in: Eksvalidiĝas post
@@ -188,7 +182,6 @@ eo:
         inbox_url: URL de la ripetila enirkesto
         irreversible: Forĵeti anstataŭ kaŝi
         locale: Lingvo de la fasado
-        locked: Ŝlosi konton
         max_uses: Maksimuma nombro de uzoj
         new_password: Nova pasvorto
         note: Sinprezento
@@ -211,9 +204,7 @@ eo:
         setting_display_media_show_all: Montri ĉiujn
         setting_expand_spoilers: Ĉiam malfoldas mesaĝojn markitajn per averto pri enhavo
         setting_hide_network: Kaŝi viajn sekvantojn kaj sekvatojn
-        setting_noindex: Ellistiĝi de retserĉila indeksado
         setting_reduce_motion: Redukti la movecojn de la animacioj
-        setting_show_application: Publikigi la aplikaĵon uzatan por sendi mesaĝojn
         setting_system_font_ui: Uzi la dekomencan tiparon de la sistemo
         setting_theme: Etoso de la retejo
         setting_trends: Montri hodiaŭajn furoraĵojn
diff --git a/config/locales/simple_form.es-AR.yml b/config/locales/simple_form.es-AR.yml
index ec00f5dd1d..7fcda1a733 100644
--- a/config/locales/simple_form.es-AR.yml
+++ b/config/locales/simple_form.es-AR.yml
@@ -41,13 +41,11 @@ es-AR:
         current_password: Por razones de seguridad, por favor, ingresá la contraseña de la cuenta actual
         current_username: Para confirmar, por favor, ingresá el nombre de usuario de la cuenta actual
         digest: Sólo enviado tras un largo periodo de inactividad, y sólo si recibiste mensajes personales en tu ausencia
-        discoverable: Permití que tu cuenta sea descubierta por extraños a través de recomendaciones, tendencias y otras funciones
         email: Se te enviará un correo electrónico de confirmación
         header: 'PNG, GIF o JPG. Máximo: %{size}. Será subescalado a %{dimensions} píxeles.'
         inbox_url: Copiá la dirección web desde la página principal del relé que querés usar
         irreversible: Los mensajes filtrados desaparecerán irreversiblemente, incluso si este filtro es eliminado después
         locale: El idioma de la interface de usuario, correos electrónicos y notificaciones push
-        locked: Controlá manualmente quién puede seguirte al aprobar solicitudes de seguimiento
         password: Usá al menos 8 caracteres
         phrase: Se aplicará sin importar las mayúsculas o las advertencias de contenido de un mensaje
         scopes: Qué APIs de la aplicación tendrán acceso. Si seleccionás el alcance de nivel más alto, no necesitás seleccionar las individuales.
@@ -57,9 +55,6 @@ es-AR:
         setting_display_media_default: Ocultar medios marcados como sensibles
         setting_display_media_hide_all: Siempre ocultar todos los medios
         setting_display_media_show_all: Siempre mostrar todos los medios
-        setting_hide_network: Las cuentas que seguís y tus seguidores serán ocultados en tu perfil
-        setting_noindex: Afecta a tu perfil público y páginas de mensajes
-        setting_show_application: La aplicación que usás para enviar mensajes se mostrará en la vista detallada de tus mensajes
         setting_use_blurhash: Los gradientes se basan en los colores de las imágenes ocultas pero haciendo borrosos los detalles
         setting_use_pending_items: Ocultar actualizaciones de la línea temporal detrás de un clic en lugar de desplazar automáticamente el flujo
         username: Podés usar letras, números y subguiones ("_")
@@ -178,7 +173,6 @@ es-AR:
         context: Filtrar contextos
         current_password: Contraseña actual
         data: Datos
-        discoverable: Sugerir cuenta a otros
         display_name: Nombre para mostrar
         email: Dirección de correo electrónico
         expires_in: Vence después de
@@ -188,7 +182,6 @@ es-AR:
         inbox_url: Dirección web de la bandeja de entrada del relé
         irreversible: Dejar en lugar de ocultar
         locale: Idioma de la interface
-        locked: Requerir solicitudes de seguimiento
         max_uses: Número máximo de usos
         new_password: Nueva contraseña
         note: Biografía
@@ -211,9 +204,7 @@ es-AR:
         setting_display_media_show_all: Mostrar todo
         setting_expand_spoilers: Siempre expandir los mensajes marcados con advertencias de contenido
         setting_hide_network: Ocultá tu gráfica social
-        setting_noindex: Excluirse del indexado de motores de búsqueda
         setting_reduce_motion: Reducir el movimiento de las animaciones
-        setting_show_application: Mostrar aplicación usada para enviar mensajes
         setting_system_font_ui: Utilizar la tipografía predeterminada del sistema
         setting_theme: Tema del sitio
         setting_trends: Mostrar las tendencias de hoy
diff --git a/config/locales/simple_form.es-MX.yml b/config/locales/simple_form.es-MX.yml
index 7a1577cdb0..85e920f6fb 100644
--- a/config/locales/simple_form.es-MX.yml
+++ b/config/locales/simple_form.es-MX.yml
@@ -41,13 +41,11 @@ es-MX:
         current_password: Por razones de seguridad por favor ingrese la contraseña de la cuenta actual
         current_username: Para confirmar, por favor ingrese el nombre de usuario de la cuenta actual
         digest: Solo enviado tras un largo periodo de inactividad y solo si has recibido mensajes personales durante tu ausencia
-        discoverable: Permite que tu cuenta sea descubierta por extraños a través de recomendaciones, tendencias y otras características
         email: Se le enviará un correo de confirmación
         header: PNG, GIF o JPG. Máximo %{size}. Será escalado a %{dimensions}px
         inbox_url: Copia la URL de la página principal del relés que quieres utilizar
         irreversible: Los toots filtrados desaparecerán irreversiblemente, incluso si este filtro es eliminado más adelante
         locale: El idioma de la interfaz de usuario, correos y notificaciones push
-        locked: Requiere que manualmente apruebes seguidores y las publicaciones serán mostradas solamente a tus seguidores
         password: Utilice al menos 8 caracteres
         phrase: Se aplicará sin importar las mayúsculas o los avisos de contenido de un toot
         scopes: Qué APIs de la aplicación tendrán acceso. Si seleccionas el alcance de nivel mas alto, no necesitas seleccionar las individuales.
@@ -57,9 +55,6 @@ es-MX:
         setting_display_media_default: Ocultar contenido multimedia marcado como sensible
         setting_display_media_hide_all: Siempre ocultar todo el contenido multimedia
         setting_display_media_show_all: Mostrar siempre contenido multimedia marcado como sensible
-        setting_hide_network: A quién sigues y quién te sigue no será mostrado en tu perfil
-        setting_noindex: Afecta a tu perfil público y páginas de estado
-        setting_show_application: La aplicación que utiliza usted para publicar toots se mostrará en la vista detallada de sus toots
         setting_use_blurhash: Los gradientes se basan en los colores de las imágenes ocultas pero haciendo borrosos los detalles
         setting_use_pending_items: Ocultar nuevos estados detrás de un clic en lugar de desplazar automáticamente el feed
         username: Puedes usar letras, números y guiones bajos
@@ -178,7 +173,6 @@ es-MX:
         context: Filtrar contextos
         current_password: Contraseña actual
         data: Información
-        discoverable: Listar esta cuenta en el directorio
         display_name: Nombre para mostrar
         email: Dirección de correo electrónico
         expires_in: Expirar tras
@@ -188,7 +182,6 @@ es-MX:
         inbox_url: URL de la entrada de relés
         irreversible: Dejar en lugar de ocultar
         locale: Idioma
-        locked: Hacer privada esta cuenta
         max_uses: Máx. número de usos
         new_password: Nueva contraseña
         note: Biografía
@@ -211,9 +204,7 @@ es-MX:
         setting_display_media_show_all: Mostrar todo
         setting_expand_spoilers: Siempre expandir los toots marcados con advertencias de contenido
         setting_hide_network: Ocultar tu red
-        setting_noindex: Excluirse del indexado de motores de búsqueda
         setting_reduce_motion: Reducir el movimiento de las animaciones
-        setting_show_application: Mostrar aplicación usada para publicar toots
         setting_system_font_ui: Utilizar la tipografía por defecto del sistema
         setting_theme: Tema del sitio
         setting_trends: Mostrar las tendencias de hoy
diff --git a/config/locales/simple_form.es.yml b/config/locales/simple_form.es.yml
index 75f83b17cc..2b648ad901 100644
--- a/config/locales/simple_form.es.yml
+++ b/config/locales/simple_form.es.yml
@@ -41,13 +41,11 @@ es:
         current_password: Por razones de seguridad por favor ingrese la contraseña de la cuenta actual
         current_username: Para confirmar, por favor ingrese el nombre de usuario de la cuenta actual
         digest: Solo enviado tras un largo periodo de inactividad y solo si has recibido mensajes personales durante tu ausencia
-        discoverable: Permite que tu cuenta sea descubierta por extraños a través de recomendaciones, tendencias y otras características
         email: Se le enviará un correo de confirmación
         header: PNG, GIF o JPG. Máximo %{size}. Será escalado a %{dimensions}px
         inbox_url: Copia la URL de la página principal del relés que quieres utilizar
         irreversible: Las publicaciones filtradas desaparecerán irreversiblemente, incluso si este filtro es eliminado más adelante
         locale: El idioma de la interfaz de usuario, correos y notificaciones push
-        locked: Requiere que manualmente apruebes seguidores y las publicaciones serán mostradas solamente a tus seguidores
         password: Utilice al menos 8 caracteres
         phrase: Se aplicará sin importar las mayúsculas o los avisos de contenido de una publicación
         scopes: Qué APIs de la aplicación tendrán acceso. Si seleccionas el alcance de nivel mas alto, no necesitas seleccionar las individuales.
@@ -57,9 +55,6 @@ es:
         setting_display_media_default: Ocultar contenido multimedia marcado como sensible
         setting_display_media_hide_all: Siempre ocultar todo el contenido multimedia
         setting_display_media_show_all: Mostrar siempre contenido multimedia marcado como sensible
-        setting_hide_network: A quién sigues y quién te sigue no será mostrado en tu perfil
-        setting_noindex: Afecta a tu perfil público y a tus publicaciones
-        setting_show_application: La aplicación que utiliza usted para publicar publicaciones se mostrará en la vista detallada de sus publicaciones
         setting_use_blurhash: Los gradientes se basan en los colores de las imágenes ocultas pero haciendo borrosos los detalles
         setting_use_pending_items: Ocultar nuevas publicaciones detrás de un clic en lugar de desplazar automáticamente el feed
         username: Puedes usar letras, números y guiones bajos
@@ -178,7 +173,6 @@ es:
         context: Filtrar contextos
         current_password: Contraseña actual
         data: Información
-        discoverable: Sugerir la cuenta a otros
         display_name: Nombre para mostrar
         email: Dirección de correo electrónico
         expires_in: Expirar tras
@@ -188,7 +182,6 @@ es:
         inbox_url: URL de la entrada de relés
         irreversible: Rechazar en lugar de ocultar
         locale: Idioma
-        locked: Hacer privada esta cuenta
         max_uses: Máx. número de usos
         new_password: Nueva contraseña
         note: Biografía
@@ -211,9 +204,7 @@ es:
         setting_display_media_show_all: Mostrar todo
         setting_expand_spoilers: Siempre expandir las publicaciones marcadas con advertencias de contenido
         setting_hide_network: Ocultar tu red
-        setting_noindex: Excluirse del indexado de motores de búsqueda
         setting_reduce_motion: Reducir el movimiento de las animaciones
-        setting_show_application: Mostrar aplicación usada para publicar publicaciones
         setting_system_font_ui: Utilizar la tipografía por defecto del sistema
         setting_theme: Tema del sitio
         setting_trends: Mostrar las tendencias de hoy
diff --git a/config/locales/simple_form.et.yml b/config/locales/simple_form.et.yml
index 142ed483f6..b4bb40c6c5 100644
--- a/config/locales/simple_form.et.yml
+++ b/config/locales/simple_form.et.yml
@@ -41,13 +41,11 @@ et:
         current_password: Sisesta turvalisuse huvides oma siinse konto salasõna
         current_username: Kinnitamiseks palun sisesta oma konto kasutajanimi
         digest: Saadetakse ainult pärast pikka tegevusetuse perioodi ja ainult siis, kui on saadetud otsesõnumeid
-        discoverable: Konto on leitav võhivõõraste jaoks soovituste ja trendide sirvimise teel vm sarnaste vahenditega
         email: Sulle saadetakse e-posti teel kinnituskiri
         header: PNG, GIF või JPG. Kõige rohkem %{size}. Vähendatakse %{dimensions} pikslini
         inbox_url: Kopeeri soovitud vahendaja avalehe URL
         irreversible: Filtreeritud postitused kaovad taastamatult, isegi kui filter on hiljem eemaldatud
         locale: Kasutajaliidese, e-kirjade ja tõuketeadete keel
-        locked: Nõuab käsitsi jälgijate kinnitamist
         password: Vajalik on vähemalt 8 märki
         phrase: Kattub olenemata postituse teksti suurtähtedest või sisuhoiatusest
         scopes: Milliseid API-sid see rakendus tohib kasutada. Kui valid kõrgeima taseme, ei pea üksikuid eraldi valima.
@@ -57,9 +55,6 @@ et:
         setting_display_media_default: Peida tundlikuks märgitud meedia
         setting_display_media_hide_all: Alati peida kõik meedia
         setting_display_media_show_all: Alati näita tundlikuks märgistatud meedia
-        setting_hide_network: Profiilil ei kuvata, keda sa jälgid ja kes sind jälgib
-        setting_noindex: Mõjutab avalikku profiili ja postituste lehekülgi
-        setting_show_application: Postitamiseks kasutatud rakenduse infot kuvatakse postituse üksikasjavaates
         setting_use_blurhash: Värvid põhinevad peidetud visuaalidel, kuid hägustavad igasuguseid detaile
         setting_use_pending_items: Voo automaatse kerimise asemel peida ajajoone uuendused kliki taha
         username: Võid kasutada ladina tähti, numbreid ja allkriipsu
@@ -134,6 +129,7 @@ et:
         position: Kõrgem roll otsustab teatud olukordades konfliktide lahendamise. Teatud toiminguid saab teha ainult madalama prioriteediga rollidega
       webhook:
         events: Saadetavate sündmuste valik
+        template: Koosta oma JSON manus kasutades muutujateasendust. Jäta tühaks tavalise JSONi jaoks.
         url: Kuhu sündmused saadetakse
     labels:
       account:
@@ -177,7 +173,6 @@ et:
         context: Filtreeri kontekste
         current_password: Kehtiv salasõna
         data: Andmed
-        discoverable: Lisa see konto kataloogi
         display_name: Kuvanimi
         email: E-posti aadress
         expires_in: Aegu pärast
@@ -187,7 +182,6 @@ et:
         inbox_url: Vahendaja sisendkausta URL
         irreversible: Kustuta selle asemel, et peita
         locale: Kasutajaliidese keel
-        locked: Lukusta konto
         max_uses: Maksimum kasutajate arv
         new_password: Uus salasõna
         note: Elulugu
@@ -210,9 +204,7 @@ et:
         setting_display_media_show_all: Kuva kõik
         setting_expand_spoilers: Alati näita tundlikuks märgitud postituste sisu
         setting_hide_network: Peida oma võrk
-        setting_noindex: Keeldu otsingumootorite indekseerimistest
         setting_reduce_motion: Vähenda animatsioonides liikumist
-        setting_show_application: Avalikusta postituste tegemisel kasutatud rakendus
         setting_system_font_ui: Kasuta süsteemi vaikefonti
         setting_theme: Saidi teema
         setting_trends: Näita tänaseid trende
@@ -307,6 +299,7 @@ et:
         position: Positsioon
       webhook:
         events: Lubatud sündmused
+        template: Manuse mall
         url: Lõpp-punkti URL
     'no': Ei
     not_recommended: Pole soovitatav
diff --git a/config/locales/simple_form.eu.yml b/config/locales/simple_form.eu.yml
index 5ab8ab612d..2fc73ac172 100644
--- a/config/locales/simple_form.eu.yml
+++ b/config/locales/simple_form.eu.yml
@@ -37,13 +37,11 @@ eu:
         current_password: Segurtasunagatik sartu uneko kontuaren pasahitza
         current_username: Berresteko sartu uneko kontuaren erabiltzaile-izena
         digest: Jarduerarik gabeko epe luze bat eta gero mezu pertsonalen bat jaso baduzu, besterik ez
-        discoverable: Baimendu zure kontua ezezagunek aurkitu ahal izatea gomendio, joera eta beste ezaugarrien bidez
         email: Baieztapen e-mail bat bidaliko zaizu
         header: PNG, GIF edo JPG. Gehienez %{size}. %{dimensions}px eskalara txikituko da
         inbox_url: Kopiatu erabili nahi duzun errelearen hasiera orriaren URLa
         irreversible: Iragazitako tootak betirako galduko dira, geroago iragazkia kentzen baduzu ere
         locale: Erabiltzaile-interfazea, e-mail mezuen eta jakinarazpenen hizkuntza
-        locked: Jarraitzaileak eskuz onartu behar dituzu
         password: Erabili 8 karaktere gutxienez
         phrase: Bat egingo du Maiuskula/minuskula kontuan hartu gabe eta edukiaren abisua kontuan hartu gabe
         scopes: Zeintzuk API atzitu ditzakeen aplikazioak. Goi mailako arloa aukeratzen baduzu, ez dituzu azpikoak aukeratu behar.
@@ -53,9 +51,6 @@ eu:
         setting_display_media_default: Ezkutatu hunkigarri gisa markatutako multimedia
         setting_display_media_hide_all: Ezkutatu multimedia guztia beti
         setting_display_media_show_all: Erakutsi beti hunkigarri gisa markatutako multimedia
-        setting_hide_network: Nor jarraitzen duzun eta nork jarraitzen zaituen ez da bistaratuko zure profilean
-        setting_noindex: Zure profil publiko eta tooten orrietan eragina du
-        setting_show_application: Tootak bidaltzeko erabiltzen duzun aplikazioa zure tooten ikuspegi xehetsuan bistaratuko da
         setting_use_blurhash: Gradienteak ezkutatutakoaren koloreetan oinarritzen dira, baina xehetasunak ezkutatzen dituzte
         setting_use_pending_items: Ezkutatu denbora-lerroko eguneraketak klik baten atzean jarioa automatikoki korritu ordez
         username: Hizkiak, zenbakiak eta azpimarrak erabil ditzakezu
@@ -173,7 +168,6 @@ eu:
         context: Iragazkiaren testuinguruak
         current_password: Oraingo pasahitza
         data: Datuak
-        discoverable: Zerrendatu kontu hau direktorioan
         display_name: Pantaila-izena
         email: E-mail helbidea
         expires_in: Iraungitzea
@@ -183,7 +177,6 @@ eu:
         inbox_url: Errelearen sarrera ontziaren URLa
         irreversible: Baztertu ezkutatu ordez
         locale: Interfazearen hizkuntza
-        locked: Giltzapetu kontua
         max_uses: Gehieneko erabiltzaile kopurua
         new_password: Pasahitz berria
         note: Biografia
@@ -206,9 +199,7 @@ eu:
         setting_display_media_show_all: Erakutsi guztia
         setting_expand_spoilers: Hedatu beti edukia abisua (CW) duten  tootak
         setting_hide_network: Ezkutatu zure sarea
-        setting_noindex: Atera bilaketa motorraren indexaziotik
         setting_reduce_motion: Murriztu animazioen mugimenduak
-        setting_show_application: Utzi agerian tootak bidaltzeko erabilitako aplikazioa
         setting_system_font_ui: Erabili sistemako tipografia lehenetsia
         setting_theme: Gunearen azala
         setting_trends: Erakutsi gaurko joerak
diff --git a/config/locales/simple_form.fa.yml b/config/locales/simple_form.fa.yml
index 0d6cf3e565..ca382f387e 100644
--- a/config/locales/simple_form.fa.yml
+++ b/config/locales/simple_form.fa.yml
@@ -37,13 +37,11 @@ fa:
         current_password: به دلایل امنیتی لطفاً گذرواژه این حساب را وارد کنید
         current_username: برای تأیید، لطفاً نام کاربری حساب فعلی را وارد کنید
         digest: تنها وقتی فرستاده می‌شود که مدتی طولانی فعالیتی نداشته باشید و در این مدت برای شما پیغام خصوصی‌ای نوشته شده باشد
-        discoverable: اجازه دهید حساب‌تان از طریق پیشنهادها، پرطرفدارها و سایر قابلیت‌ها، توسط افراد غریبه قابل کشف باشد
         email: به شما ایمیل تأییدی فرستاده خواهد شد
         header: یکی از قالب‌های PNG یا  GIF یا JPG. بیشترین اندازه %{size}. تصویر به اندازهٔ %{dimensions} پیکسل تبدیل خواهد شد
         inbox_url: نشانی صفحهٔ اصلی رله‌ای را که می‌خواهید به کار ببرید کپی کنید
         irreversible: فرسته‌های پالوده به طور برگشت‌ناپذیری ناپدید می‌شوند، حتا اگر بعدها پالایه برداشته شود
         locale: زبان واسط کاربری، رایانامه‌ها و آگاهی‌های ارسالی
-        locked: باید پیگیران تازه را خودتان تأیید کنید
         password: دست‌کم باید ۸ نویسه داشته باشد
         phrase: مستقل از کوچکی و بزرگی حروف، با متن اصلی یا هشدار محتوای فرسته‌ها مقایسه می‌شود
         scopes: واسط‌های برنامه‌نویسی که این برنامه به آن دسترسی دارد. اگر بالاترین سطح دسترسی را انتخاب کنید، دیگر نیازی به انتخاب سطح‌های پایینی ندارید.
@@ -53,9 +51,6 @@ fa:
         setting_display_media_default: تصویرهایی را که به عنوان حساس علامت زده شده‌اند پنهان کن
         setting_display_media_hide_all: همیشه همهٔ عکس‌ها و ویدیوها را پنهان کن
         setting_display_media_show_all: همیشه تصویرهایی را که به عنوان حساس علامت زده شده‌اند را نشان بده
-        setting_hide_network: فهرست پیگیران شما و فهرست کسانی که شما پی می‌گیرید روی نمایهٔ شما دیده نخواهد شد
-        setting_noindex: روی نمایهٔ عمومی و صفحهٔ نوشته‌های شما تأثیر می‌گذارد
-        setting_show_application: برنامه‌ای که به کمک آن فرسته می‌زنید، در جزئیات فرسته شما نمایش خواهد یافت
         setting_use_blurhash: سایه‌ها بر اساس رنگ‌های به‌کاررفته در تصویر پنهان‌شده ساخته می‌شوند ولی جزئیات تصویر در آن‌ها آشکار نیست
         setting_use_pending_items: به جای پیش‌رفتن خودکار در فهرست، به‌روزرسانی فهرست نوشته‌ها را پشت یک کلیک پنهان کن
         username: تنها می‌توانید از حروف، اعداد، و زیرخط استفاده کنید
@@ -147,7 +142,6 @@ fa:
         context: زمینه‌های پالایش
         current_password: گذرواژه کنونی
         data: داده‌ها
-        discoverable: پیشنهاد حساب به دیگران
         display_name: نمایش به نام
         email: نشانی ایمیل
         expires_in: تاریخ انقضا
@@ -157,7 +151,6 @@ fa:
         inbox_url: نشانی صندوق ورودی رله
         irreversible: به جای پنهان‌سازی، حذف کن
         locale: زبان محیط کاربری
-        locked: خصوصی‌کردن حساب
         max_uses: بیشترین شمار استفاده
         new_password: گذرواژه تازه
         note: دربارهٔ شما
@@ -180,9 +173,7 @@ fa:
         setting_display_media_show_all: نمایش همه
         setting_expand_spoilers: همیشه فرسته‌هایی را که هشدار محتوا دارند کامل نشان بده
         setting_hide_network: نهفتن شبکهٔ ارتباطی
-        setting_noindex: درخواست از موتورهای جستجوگر برای ظاهر نشدن در نتایج جستجو
         setting_reduce_motion: کاستن از حرکت در پویانمایی‌ها
-        setting_show_application: برنامه‌ای که به کار می‌برید آشکار شود
         setting_system_font_ui: به‌کاربردن قلم پیش‌فرض سیستم
         setting_theme: تم سایت
         setting_trends: نشان‌دادن موضوعات پرطرفدار روز
diff --git a/config/locales/simple_form.fi.yml b/config/locales/simple_form.fi.yml
index a3a45ebea7..72d29c6114 100644
--- a/config/locales/simple_form.fi.yml
+++ b/config/locales/simple_form.fi.yml
@@ -41,13 +41,11 @@ fi:
         current_password: Turvallisuussyistä kirjoita nykyisen tilin salasana
         current_username: Vahvista kirjoittamalla nykyisen tilin käyttäjätunnus
         digest: Lähetetään vain pitkän poissaolon jälkeen ja vain, jos olet saanut suoria viestejä poissaolosi aikana
-        discoverable: Salli tuntemattomien löytää tilisi suositusten, trendien ja muiden ominaisuuksien kautta
         email: Sinulle lähetetään vahvistussähköposti
         header: PNG, GIF tai JPG. Enintään %{size}. Skaalataan kokoon %{dimensions} px
         inbox_url: Kopioi URL-osoite haluamasi välittäjän etusivulta
         irreversible: Suodatetut julkaisut katoavat lopullisesti, vaikka suodatin poistettaisiin myöhemmin
         locale: Käyttöliittymän, sähköpostien ja ilmoitusten kieli
-        locked: Sinun täytyy hyväksyä seuraajat manuaalisesti
         password: Käytä vähintään 8 merkkiä
         phrase: Täytetään riippumatta julkaisun kirjainkoon tai sisällön varoituksesta
         scopes: Mihin sovellusliittymiin sovellus pääsee käsiksi. Jos valitset ylätason laajuuden, sinun ei tarvitse valita yksittäisiä.
@@ -57,9 +55,6 @@ fi:
         setting_display_media_default: Piilota arkaluonteiseksi merkitty media
         setting_display_media_hide_all: Piilota aina kaikki media
         setting_display_media_show_all: Näytä aina arkaluonteiseksi merkitty media
-        setting_hide_network: Ketä seuraat ja kuka seuraa sinua, piilotetaan profiiliisi
-        setting_noindex: Vaikuttaa julkiseen profiiliisi ja tilasivuihisi
-        setting_show_application: Viestittelyyn käyttämäsi sovellus näkyy viestiesi yksityiskohtaisessa näkymässä
         setting_use_blurhash: Liukuvärit perustuvat piilotettujen kuvien väreihin, mutta sumentavat yksityiskohdat
         setting_use_pending_items: Piilota aikajanan päivitykset napsautuksen taakse syötteen automaattisen vierityksen sijaan
         username: Voit käyttää kirjaimia, numeroita ja alaviivoja
@@ -134,6 +129,7 @@ fi:
         position: Korkeampi rooli ratkaisee konfliktit tietyissä tilanteissa. Tiettyjä toimintoja voidaan suorittaa vain rooleille, joiden prioriteetti on pienempi
       webhook:
         events: Valitse lähetettävät tapahtumat
+        template: Luo oma JSON-hyötykuorma käyttäen muuttujainterpolointia. Jättäessäsi kentän tyhjäksi, käytetään vakio-JSON-kuormaa.
         url: Mihin tapahtumat lähetetään
     labels:
       account:
@@ -177,7 +173,6 @@ fi:
         context: Suodata konteksteista
         current_password: Nykyinen salasana
         data: Tiedot
-        discoverable: Listaa tämä tili hakemistoon
         display_name: Nimimerkki
         email: Sähköpostiosoite
         expires_in: Vanhenee
@@ -187,7 +182,6 @@ fi:
         inbox_url: Välittäjän postilaatikon URL-osoite
         irreversible: Pudota piilottamisen sijaan
         locale: Kieli
-        locked: Lukitse tili
         max_uses: Käyttökertoja enintään
         new_password: Uusi salasana
         note: Kuvaus
@@ -210,9 +204,7 @@ fi:
         setting_display_media_show_all: Näytä kaikki
         setting_expand_spoilers: Laajenna aina sisältövaroituksilla merkityt viestit
         setting_hide_network: Piilota verkkosi
-        setting_noindex: Jättäydy hakukoneindeksoinnin ulkopuolelle
         setting_reduce_motion: Vähennä animaatioiden liikettä
-        setting_show_application: Näytä sovellus mistä lähetät viestejä
         setting_system_font_ui: Käytä järjestelmän oletusfonttia
         setting_theme: Sivuston teema
         setting_trends: Näytä päivän trendit
@@ -307,6 +299,7 @@ fi:
         position: Prioriteetti
       webhook:
         events: Tapahtumat käytössä
+        template: Hyötykuormapohja
         url: Päätepisteen URL
     'no': Ei
     not_recommended: Ei suositella
diff --git a/config/locales/simple_form.fo.yml b/config/locales/simple_form.fo.yml
index 27edf181bd..2e100e54e2 100644
--- a/config/locales/simple_form.fo.yml
+++ b/config/locales/simple_form.fo.yml
@@ -41,13 +41,11 @@ fo:
         current_password: Av trygdarávum vinarliga les inn loyniorðið hjá verandi kontu
         current_username: Fyri at vátta, vinarliga les inn brúkaranavnið á verandi kontu
         digest: Einans sent eftir eitt langt tíðarskeið við óvirkni og einans um tú hevur móttikið persónlig boð meðan tú var burtur
-        discoverable: Loyv kontu tíni at verða funnin av fremmandum gjøgnum viðmæli, rák og aðrar hentleikar
         email: Tú fær sendandi ein váttanarteldupost
         header: PNG, GIF ella JPG. Ikki størri enn %{size}. Verður minkað til %{dimensions}px
         inbox_url: Avrita URL'in frá forsíðuni hjá reiðlagnum, sum tú vilt brúka
         irreversible: Filtreraðir postar blíva burtur med alla, eisini sjálvt um filtrið seinni verður strikað
         locale: Málið, sum verður brúkt í brúkaramarkamótinum, teldupostum og skumpiboðum
-        locked: Stýr hvør kann fylgja tær við at góðtaka ella vraka umbønir um at fylgja
         password: Skriva minst 8 tekin
         phrase: Fer at samsvara óanæsð um tað er skrivað við lítlum ella stórum ella um postar hava innihaldsávaringar
         scopes: Hvørji API nýtsluskipanin fær atgongd til. Velur tú eitt vav á hægsta stigi, so er ikki neyðugt at velja tey einstøku.
@@ -57,9 +55,6 @@ fo:
         setting_display_media_default: Fjal miðlafílur, sum eru merktar sum viðkvæmar
         setting_display_media_hide_all: Fjal altíð miðlafílur
         setting_display_media_show_all: Vís altíð miðlafílur
-        setting_hide_network: Tey, ið tú fylgir og tey, ið fylgja tær, verða ikki víst á tínum vanga
-        setting_noindex: Ávirkar almenna vangan og síður við postum hjá tær
-        setting_show_application: Nýtsluskipanin, sum tú brúkar at posta við, verður víst í nágreinligu vísingini av postum tínum
         setting_use_blurhash: Gradientar eru grundaðir á litirnar av fjaldu myndunum, men grugga allar smálutir
         setting_use_pending_items: Fjal tíðarlinjudagføringar aftan fyri eitt klikk heldur enn at skrulla tilføringina sjálvvirkandi
         username: Tú kanst brúka bókstavir, tøl og botnstrikur
@@ -178,7 +173,6 @@ fo:
         context: Filtrera kontekstir
         current_password: Núverandi loyniorð
         data: Dáta
-        discoverable: Skjót kontuna upp fyri øðrum
         display_name: Navn, sum skal vísast
         email: Teldubrævabústaður
         expires_in: Endar aftan á
@@ -188,7 +182,6 @@ fo:
         inbox_url: URL'ur hjá innbakkanum hjá reiðlagnum
         irreversible: Strika heldur enn at fjala
         locale: Markamótsmál
-        locked: Krev umbønir um at fylgja
         max_uses: Ikki brúka oftari enn
         new_password: Nýtt loyniorð
         note: Ævilýsing
@@ -211,9 +204,7 @@ fo:
         setting_display_media_show_all: Vís alt
         setting_expand_spoilers: Víðka altíð postar, sum eru merktir við innihaldsávaringum
         setting_hide_network: Fjal sosiala grafin hjá tær
-        setting_noindex: Frábið tær indeksering á leitimaskinum
         setting_reduce_motion: Minka um rørslu í teknimyndum
-        setting_show_application: Avdúka serskipan, sum verður brúkt til at senda postar
         setting_system_font_ui: Brúka vanliga skriftaslagið hjá skipanini
         setting_theme: Uppsetingareyðkenni
         setting_trends: Vís dagsins rák
diff --git a/config/locales/simple_form.fr-QC.yml b/config/locales/simple_form.fr-QC.yml
index ba81508365..ea81a0229d 100644
--- a/config/locales/simple_form.fr-QC.yml
+++ b/config/locales/simple_form.fr-QC.yml
@@ -41,13 +41,11 @@ fr-QC:
         current_password: Par mesure de sécurité, veuillez saisir le mot de passe de ce compte
         current_username: Pour confirmer, veuillez saisir le nom d'utilisateur de ce compte
         digest: Uniquement envoyé après une longue période d’inactivité en cas de messages personnels reçus pendant votre absence
-        discoverable: Permet à votre compte d’être découvert par des inconnus par le biais de recommandations, de tendances et autres fonctionnalités
         email: Vous recevrez un courriel de confirmation
         header: Au format PNG, GIF ou JPG. %{size} maximum. Sera réduit à %{dimensions}px
         inbox_url: Copiez l’URL depuis la page d’accueil du relai que vous souhaitez utiliser
         irreversible: Les messages filtrés disparaîtront irrévocablement, même si le filtre est supprimé plus tard
         locale: La langue de l’interface, des courriels et des notifications
-        locked: Nécessite que vous approuviez manuellement chaque abonné·e
         password: Utilisez au moins 8 caractères
         phrase: Sera filtré peu importe la casse ou l’avertissement de contenu du message
         scopes: À quelles APIs l’application sera autorisée à accéder. Si vous sélectionnez une permission générale, vous n’avez pas besoin de sélectionner les permissions plus précises.
@@ -57,9 +55,6 @@ fr-QC:
         setting_display_media_default: Masquer les médias marqués comme sensibles
         setting_display_media_hide_all: Toujours masquer les médias
         setting_display_media_show_all: Toujours afficher les médias
-        setting_hide_network: Ceux que vous suivez et ceux qui vous suivent ne seront pas affichés sur votre profil
-        setting_noindex: Affecte votre profil public ainsi que vos messages
-        setting_show_application: Le nom de l’application que vous utilisez pour publier sera affichée dans la vue détaillée de vos messages
         setting_use_blurhash: Les dégradés sont basés sur les couleurs des images cachées mais n’en montrent pas les détails
         setting_use_pending_items: Cacher les mises à jour des fils d’actualités derrière un clic, au lieu de les afficher automatiquement
         username: Vous pouvez utiliser des lettres, des chiffres, et des tirets bas
@@ -178,7 +173,6 @@ fr-QC:
         context: Contextes du filtre
         current_password: Mot de passe actuel
         data: Données
-        discoverable: Suggérer ce compte aux autres
         display_name: Nom public
         email: Adresse courriel
         expires_in: Expire après
@@ -188,7 +182,6 @@ fr-QC:
         inbox_url: URL de la boîte de relais
         irreversible: Supprimer plutôt que masquer
         locale: Langue de l’interface
-        locked: Verrouiller le compte
         max_uses: Nombre maximum d’utilisations
         new_password: Nouveau mot de passe
         note: Présentation
@@ -211,9 +204,7 @@ fr-QC:
         setting_display_media_show_all: Montrer tout
         setting_expand_spoilers: Toujours déplier les messages marqués d’un avertissement de contenu
         setting_hide_network: Cacher votre réseau
-        setting_noindex: Demander aux moteurs de recherche de ne pas indexer vos informations personnelles
         setting_reduce_motion: Réduire la vitesse des animations
-        setting_show_application: Dévoiler l’application utilisée pour envoyer les messages
         setting_system_font_ui: Utiliser la police par défaut du système
         setting_theme: Thème du site
         setting_trends: Afficher les tendances du jour
diff --git a/config/locales/simple_form.fr.yml b/config/locales/simple_form.fr.yml
index 45494e8748..d4915c3be2 100644
--- a/config/locales/simple_form.fr.yml
+++ b/config/locales/simple_form.fr.yml
@@ -41,13 +41,11 @@ fr:
         current_password: Par mesure de sécurité, veuillez saisir le mot de passe de ce compte
         current_username: Pour confirmer, veuillez saisir l’identifiant de ce compte
         digest: Uniquement envoyé après une longue période d’inactivité en cas de messages personnels reçus pendant votre absence
-        discoverable: Permet à votre compte d’être découvert par des inconnus par le biais de recommandations, de tendances et autres fonctionnalités
         email: Vous recevrez un courriel de confirmation
         header: Au format PNG, GIF ou JPG. %{size} maximum. Sera réduit à %{dimensions}px
         inbox_url: Copiez l’URL depuis la page d’accueil du relais que vous souhaitez utiliser
         irreversible: Les messages filtrés disparaîtront irrévocablement, même si le filtre est supprimé plus tard
         locale: La langue de l’interface, des courriels et des notifications
-        locked: Nécessite que vous approuviez manuellement chaque abonné·e
         password: Utilisez au moins 8 caractères
         phrase: Sera filtré peu importe la casse ou l’avertissement de contenu du message
         scopes: À quelles APIs l’application sera autorisée à accéder. Si vous sélectionnez une permission générale, vous n’avez pas besoin de sélectionner les permissions plus précises.
@@ -57,9 +55,6 @@ fr:
         setting_display_media_default: Masquer les médias marqués comme sensibles
         setting_display_media_hide_all: Toujours masquer les médias
         setting_display_media_show_all: Toujours afficher les médias
-        setting_hide_network: Ceux que vous suivez et ceux qui vous suivent ne seront pas affichés sur votre profil
-        setting_noindex: Affecte votre profil public ainsi que vos messages
-        setting_show_application: Le nom de l’application que vous utilisez pour publier sera affichée dans la vue détaillée de vos messages
         setting_use_blurhash: Les dégradés sont basés sur les couleurs des images cachées mais n’en montrent pas les détails
         setting_use_pending_items: Cacher les mises à jour des fils d’actualités derrière un clic, au lieu de les afficher automatiquement
         username: Vous pouvez utiliser des lettres, des chiffres, et des tirets bas
@@ -178,7 +173,6 @@ fr:
         context: Contextes du filtre
         current_password: Mot de passe actuel
         data: Données
-        discoverable: Suggérer ce compte aux autres
         display_name: Nom public
         email: Adresse de courriel
         expires_in: Expire après
@@ -188,7 +182,6 @@ fr:
         inbox_url: URL de la boîte de relais
         irreversible: Supprimer plutôt que masquer
         locale: Langue de l’interface
-        locked: Verrouiller le compte
         max_uses: Nombre maximum d’utilisations
         new_password: Nouveau mot de passe
         note: Présentation
@@ -211,9 +204,7 @@ fr:
         setting_display_media_show_all: Montrer tout
         setting_expand_spoilers: Toujours déplier les messages marqués d’un avertissement de contenu
         setting_hide_network: Cacher votre réseau
-        setting_noindex: Demander aux moteurs de recherche de ne pas indexer vos informations personnelles
         setting_reduce_motion: Réduire la vitesse des animations
-        setting_show_application: Dévoiler l’application utilisée pour envoyer les messages
         setting_system_font_ui: Utiliser la police par défaut du système
         setting_theme: Thème du site
         setting_trends: Afficher les tendances du jour
diff --git a/config/locales/simple_form.fy.yml b/config/locales/simple_form.fy.yml
index ea50164bcb..023203b557 100644
--- a/config/locales/simple_form.fy.yml
+++ b/config/locales/simple_form.fy.yml
@@ -41,13 +41,11 @@ fy:
         current_password: Fier foar feilichheidsredenen it wachtwurd fan jo aktuele account yn
         current_username: Fier ta befêstiging de brûkersnamme fan jo aktuele account yn
         digest: Wurdt allinnich nei in lange perioade fan ynaktiviteit ferstjoerd en allinnich wannear’t jo wylst jo ôfwêzigens persoanlike berjochten ûntfongen hawwe
-        discoverable: Tastean dat jo account te finen is foar ûnbekenden, fia oanrekommandaasjes, trends en op oare manieren
         email: Jo krije in befêstigings-e-mailberjocht
         header: PNG, GIF of JPG. Maksimaal %{size}. Wurdt weromskeald nei %{dimensions}px
         inbox_url: Kopiearje de URL fan de foarside fan de relayserver dy’t jo brûke wolle
         irreversible: Filtere berjochten ferdwine definityf, sels as it filter letter fuortsmiten wurdt
         locale: De taal fan de brûkersomjouwing, e-mailberjochten en pushmeldingen
-        locked: Troch it goedkarren fan folgers hânmjittich bepale wa’t jo folgje mei
         password: Brûk op syn minst 8 tekens
         phrase: Komt oerien nettsjinsteande haad-/lytse letters of in ynhâldswarskôging
         scopes: Ta hokker API’s hat de tapassing tagong. Wannear’t jo in tastimming fan it boppeste nivo kieze, hoege jo gjin yndividuele tastimmingen mear te kiezen.
@@ -57,9 +55,6 @@ fy:
         setting_display_media_default: As gefoelich markearre media ferstopje
         setting_display_media_hide_all: Media altyd ferstopje
         setting_display_media_show_all: Media altyd toane
-        setting_hide_network: Wa’t jo folgje en wa’t jo folget wurdt net op jo profyl toand
-        setting_noindex: Hat ynfloed op jo iepenbiere profyl en siden mei berjochten
-        setting_show_application: De tapassing dy’t jo brûke om berjochten te pleatsen, wurdt yn de detaillearre werjefte fan it berjocht toand
         setting_use_blurhash: Dizige kleuroergongen binne basearre op de kleuren fan de ferstoppe media, wêrmei elk detail ferdwynt
         setting_use_pending_items: De tiidline wurdt bywurke troch op it oantal nije items te klikken, yn stee fan dat dizze automatysk bywurke wurdt
         username: Jo kinne letters, sifers en ûnderstreekjes brûke
@@ -178,7 +173,6 @@ fy:
         context: Filterlokaasjes
         current_password: Aktueel wachtwurd
         data: Gegevens
-        discoverable: Dizze account oanrekommandearje litte en yn de brûkersgids toane
         display_name: Werjeftenamme
         email: E-mailadres
         expires_in: Ferrint nei
@@ -188,7 +182,6 @@ fy:
         inbox_url: Relais-ynboks-URL
         irreversible: Fuortsmite yn stee fan ferstopje
         locale: Taal fan de brûkersomjouwing
-        locked: Folchfersyk fereaskje
         max_uses: Maksimaal tal kear te brûken
         new_password: Nije wachtwurd
         note: Bio
@@ -211,9 +204,7 @@ fy:
         setting_display_media_show_all: Alles toane
         setting_expand_spoilers: Berjochten mei ynhâldswarskôgingen altyd útklappe
         setting_hide_network: Jo folgers en wa’t jo folget ferstopje
-        setting_noindex: Jo berjochten net troch sykmasinen yndeksearje litte
         setting_reduce_motion: Stadigere animaasjes
-        setting_show_application: Tapassing dy’t jo foar it ferstjoeren fan berjochten brûke toane
         setting_system_font_ui: Standertlettertype fan jo systeem brûke
         setting_theme: Websitetema
         setting_trends: Trends fan hjoed toane
diff --git a/config/locales/simple_form.gd.yml b/config/locales/simple_form.gd.yml
index f1b1e06ad1..ad7adc8f7c 100644
--- a/config/locales/simple_form.gd.yml
+++ b/config/locales/simple_form.gd.yml
@@ -41,13 +41,11 @@ gd:
         current_password: A chùm tèarainteachd, cuir a-steach facal-faire a’ chunntais làithrich
         current_username: Airson seo a dhearbhadh, cuir a-steach ainm-cleachdaiche a’ chunntais làithrich
         digest: Cha dèid seo a chur ach nuair a bhios tu air ùine mhòr gun ghnìomh a ghabhail agus ma fhuair thu teachdaireachd phearsanta fhad ’s a bha thu air falbh
-        discoverable: Ceadaich gun rùraich coigrich an cunntas agad le taic o mholaidhean, treandaichean is gleusan eile
         email: Thèid post-d dearbhaidh a chur thugad
         header: PNG, GIF or JPG. %{size} air a char as motha. Thèid a sgèileadh sìos gu %{dimensions}px
         inbox_url: Dèan lethbhreac dhen URL o phrìomh-dhuilleag an ath-sheachadain a bu mhiann leat cleachdadh
         irreversible: Thèid postaichean criathraichte à sealladh gu buan fiù ’s ma bheir thu a’ chriathrag air falbh às dèidh làimhe
         locale: Cànan eadar-aghaidh a’ chleachdaiche, nam post-d ’s nam brathan putaidh
-        locked: Stiùirich cò dh’fhaodas ’gad leantainn le gabhail ri iarrtasan leantainn a làimh
         password: Cleachd co-dhiù 8 caractaran
         phrase: Thèid a mhaidseadh gun aire air litrichean mòra ’s beaga no air rabhadh susbainte puist
         scopes: Na APIan a dh’fhaodas an aplacaid inntrigeadh. Ma thaghas tu sgòp air ìre as àirde, cha leig thu leas sgòpaichean fa leth a thaghadh.
@@ -57,9 +55,6 @@ gd:
         setting_display_media_default: Falaich meadhanan ris a bheil comharra gu bheil iad frionasach
         setting_display_media_hide_all: Falaich na meadhanan an-còmhnaidh
         setting_display_media_show_all: Seall na meadhanan an-còmhnaidh
-        setting_hide_network: Thèid cò a tha thu a’ leantainn ’s an luchd-leantainn agad fhèin a chur am falach air a’ phròifil agad
-        setting_noindex: Bheir seo buaidh air a’ phròifil phoblach ’s air duilleagan nam postaichean agad
-        setting_show_application: Chithear cò an aplacaid a chleachd thu airson post a sgrìobhadh ann an seallaidhean mionaideach nam postaichean agad
         setting_use_blurhash: Tha caiseadan stèidhichte air dathan nan nithean lèirsinneach a chaidh fhalach ach chan fhaicear am mion-fhiosrachadh
         setting_use_pending_items: Falaich ùrachaidhean na loidhne-ama air cùlaibh briogaidh seach a bhith a’ sgroladh nam postaichean gu fèin-obrachail
         username: Faodaidh tu litrichean, àireamhan is fo-loidhnichean a chleachdadh
@@ -170,25 +165,23 @@ gd:
         text: Mìnich carson a bu chòir an caochladh a chur orra
       defaults:
         autofollow: Thoir cuireadh dhaibh airson an cunntas agad a leantainn
-        avatar: Avatar
-        bot: Seo cunntas bot
+        avatar: Dealbh na pròifil
+        bot: Seo cunntas fèin-obrachail
         chosen_languages: Criathraich na cànain
         confirm_new_password: Dearbh am facal-faire ùr
         confirm_password: Dearbh am facal-faire
         context: Co-theacsaichean na criathraige
         current_password: Am facal-faire làithreach
         data: Dàta
-        discoverable: Mol an cunntas do chàch
         display_name: Ainm-taisbeanaidh
         email: Seòladh puist-d
         expires_in: Falbhaidh an ùine air às dèidh
-        fields: Meata-dàta na pròifile
-        header: Bann-cinn
+        fields: Raointean a bharrachd
+        header: Dealbh a’ bhanna-chinn
         honeypot: "%{label} (na lìon seo)"
         inbox_url: URL bogsa a-steach an ath-sheachadain
         irreversible: Leig seachad seach falach
         locale: Cànan na h-eadar-aghaidh
-        locked: Iarr iarrtasan leantainn
         max_uses: An àireamh as motha de chleachdaidhean
         new_password: Facal-faire ùr
         note: Mu mo dhèidhinn
@@ -211,9 +204,7 @@ gd:
         setting_display_media_show_all: Seall na h-uile
         setting_expand_spoilers: Leudaich postaichean ris a bheil rabhadh susbainte an-còmhnaidh
         setting_hide_network: Falaich an graf sòisealta agad
-        setting_noindex: Thoir air falbh an ro-aonta air inneacsadh le einnseanan-luirg
         setting_reduce_motion: Ìslich an gluasad sna beòthachaidhean
-        setting_show_application: Foillsich dè an aplacaid a chleachdas tu airson postaichean a chur
         setting_system_font_ui: Cleachd cruth-clò bunaiteach an t-siostaim
         setting_theme: Ùrlar na làraich
         setting_trends: Seall na treandaichean an-diugh
diff --git a/config/locales/simple_form.gl.yml b/config/locales/simple_form.gl.yml
index 6ca24a2dcd..226f03186f 100644
--- a/config/locales/simple_form.gl.yml
+++ b/config/locales/simple_form.gl.yml
@@ -41,13 +41,11 @@ gl:
         current_password: Por razóns de seguridade, introduce o contrasinal da conta actual
         current_username: Para confirmar, introduce o nome de usuaria da conta actual
         digest: Enviar só tras un longo período de inactividade e só se recibiches algunha mensaxe directa na tua ausencia
-        discoverable: Permite que a túa conta poida ser descuberta por persoas descoñecidas a través de recomendacións, tendencias e outras ferramentas
         email: Ímosche enviar un correo de confirmación
         header: PNG, GIF ou JPG. Máximo %{size}. Será reducida a %{dimensions}px
         inbox_url: Copiar o URL desde a páxina de inicio do repetidor que queres utilizar
         irreversible: As publicacións filtradas desaparecerán de xeito irreversible, incluso se despois se elimina o filtro
         locale: O idioma da interface de usuaria, correos e notificacións
-        locked: Xestionar manualmente quen pode seguirte aprobando as solicitudes de seguimento
         password: Utiliza 8 caracteres ao menos
         phrase: Concordará independentemente das maiúsculas ou avisos de contido na publicación
         scopes: A que APIs terá acceso a aplicación. Se escolles un ámbito de alto nivel, non precisas seleccionar elementos individuais.
@@ -57,9 +55,6 @@ gl:
         setting_display_media_default: Ocultar medios marcados como sensibles
         setting_display_media_hide_all: Ocultar sempre os medios
         setting_display_media_show_all: Mostrar sempre os medios marcados como sensibles
-        setting_hide_network: Non se mostrará no teu perfil quen te segue e a quen estás a seguir
-        setting_noindex: Afecta ao teu perfil público e páxinas de publicación
-        setting_show_application: A aplicación que estás a utilizar para enviar publicacións mostrarase na vista detallada da publicación
         setting_use_blurhash: Os gradientes toman as cores da imaxe oculta pero esvaecendo tódolos detalles
         setting_use_pending_items: Agochar actualizacións da cronoloxía tras un click no lugar de desprazar automáticamente os comentarios
         username: Podes usar letras, números e trazos baixos
@@ -178,7 +173,6 @@ gl:
         context: Contextos do filtro
         current_password: Contrasinal actual
         data: Datos
-        discoverable: Suxerir esta conta a outras persoas
         display_name: Nome mostrado
         email: Enderezo de email
         expires_in: Caduca tras
@@ -188,7 +182,6 @@ gl:
         inbox_url: URL da caixa de entrada do repetidor
         irreversible: Desbotar en lugar de agochar
         locale: Idioma da interface
-        locked: Requerir aprobar seguimento
         max_uses: Número máximo de usos
         new_password: Novo contrasinal
         note: Acerca de ti
@@ -211,9 +204,7 @@ gl:
         setting_display_media_show_all: Mostrar todo
         setting_expand_spoilers: Despregar sempre as publicacións marcadas con avisos de contido
         setting_hide_network: Non mostrar contactos
-        setting_noindex: Pedir non aparecer nas buscas dos motores de busca
         setting_reduce_motion: Reducir o movemento nas animacións
-        setting_show_application: Mostrar a aplicación utilizada para publicar
         setting_system_font_ui: Utilizar a tipografía por defecto do sistema
         setting_theme: Decorado da instancia
         setting_trends: Mostrar as tendencias de hoxe
diff --git a/config/locales/simple_form.he.yml b/config/locales/simple_form.he.yml
index 994f4bd5d4..c15661ad29 100644
--- a/config/locales/simple_form.he.yml
+++ b/config/locales/simple_form.he.yml
@@ -41,13 +41,11 @@ he:
         current_password: מסיבות אבטחה נא להזין את הסיסמא של החשבון הנוכחי
         current_username: על מנת לאשר, נא להכניס את שם המשתמש של החשבון הנוכחי
         digest: נשלח לאחר תקופה ארוכה של אי-פעילות עם סיכום איזכורים שקיבלת בהעדרך
-        discoverable: אשר/י לחשבונך להתגלות לזרים על ידי המלצות, נושאים חמים ושאר דרכים
         email: דוא"ל אישור יישלח אליך
         header: PNG, GIF או JPG. מקסימום %{size}. גודל התמונה יוקטן %{dimensions}px
         inbox_url: נא להעתיק את הקישורית מדף הבית של הממסר בו תרצה/י להשתמש
         irreversible: הודעות מסוננות יעלמו באופן בלתי הפיך, אפילו אם מאוחר יותר יוסר המסנן
         locale: שפת ממשק המשתמש, הדוא"ל וההתראות בדחיפה
-        locked: מחייב אישור עוקבים באופן ידני. פרטיות ההודעות תהיה עוקבים-בלבד אלא אם יצוין אחרת
         password: נא להשתמש בלפחות 8 תוים
         phrase: התאמה תמצא ללא תלות באזהרת תוכן בהודעה
         scopes: לאיזה ממשק יורשה היישום לגשת. בבחירת תחום כללי, אין צורך לבחור ממשקים ספציפיים.
@@ -57,9 +55,6 @@ he:
         setting_display_media_default: הסתרת מדיה המסומנת כרגישה
         setting_display_media_hide_all: הסתר מדיה תמיד
         setting_display_media_show_all: גלה מדיה תמיד
-        setting_hide_network: עוקבייך ונעקבייך יוסתרו בפרופילך
-        setting_noindex: משפיע על הפרופיל הציבורי שלך ועמודי ההודעות
-        setting_show_application: היישום בו נעשה שימוש כדי לחצרץ יופיע בתצוגה המפורטת של החצרוץ
         setting_use_blurhash: הגראדיינטים מבוססים על תוכן התמונה המוסתרת, אבל מסתירים את כל הפרטים
         setting_use_pending_items: הסתר עדכוני פיד מאחורי קליק במקום לגלול את הפיד אוטומטית
         username: ניתן להשתמש בספרות, אותיות לטיניות ומקף תחתון
@@ -178,7 +173,6 @@ he:
         context: סינון לפי הקשר
         current_password: סיסמא נוכחית
         data: מידע
-        discoverable: הצע חשבון לאחרים
         display_name: שם להצגה
         email: כתובת דוא"ל
         expires_in: תפוגה לאחר
@@ -188,7 +182,6 @@ he:
         inbox_url: קישורית לתיבת ממסר
         irreversible: הסרה במקום הסתרה
         locale: שפה
-        locked: הפוך חשבון לפרטי
         max_uses: מספר מרבי של שימושים
         new_password: סיסמא חדשה
         note: אודות
@@ -211,9 +204,7 @@ he:
         setting_display_media_show_all: להציג הכול
         setting_expand_spoilers: להרחיב תמיד הודעות מסומנות באזהרת תוכן
         setting_hide_network: להחביא את הגרף החברתי שלך
-        setting_noindex: לבקש הסתרה ממנועי חיפוש
         setting_reduce_motion: הפחתת תנועה בהנפשות
-        setting_show_application: הצגת הישום ששימש לפרסום ההודעה
         setting_system_font_ui: להשתמש בגופן ברירת המחדל של המערכת
         setting_theme: ערכת העיצוב של האתר
         setting_trends: הצגת הנושאים החמים
diff --git a/config/locales/simple_form.hr.yml b/config/locales/simple_form.hr.yml
index b45c2f3574..0f2896fe05 100644
--- a/config/locales/simple_form.hr.yml
+++ b/config/locales/simple_form.hr.yml
@@ -5,7 +5,6 @@ hr:
       defaults:
         avatar: PNG, GIF ili JPG. Najviše %{size}. Bit će smanjeno na %{dimensions}px
         header: PNG, GIF ili JPG. Najviše %{size}. Bit će smanjeno na %{dimensions}px
-        locked: Zahtijeva ručno odobravanje pratitelja
         setting_display_media_default: Sakrij medijski sadržaj označen kao osjetljiv
         setting_display_media_hide_all: Uvijek sakrij medijski sadržaj
         setting_display_media_show_all: Uvijek prikaži medijski sadržaj
@@ -24,7 +23,6 @@ hr:
         display_name: Prikazano ime
         email: Adresa e-pošte
         locale: Jezik sučelja
-        locked: Zaključaj račun
         new_password: Nova lozinka
         note: Biografija
         otp_attempt: Dvofaktorski kôd
diff --git a/config/locales/simple_form.hu.yml b/config/locales/simple_form.hu.yml
index c9680fd012..d214ea7a2f 100644
--- a/config/locales/simple_form.hu.yml
+++ b/config/locales/simple_form.hu.yml
@@ -41,13 +41,11 @@ hu:
         current_password: Biztonsági okok miatt kérlek, írd be a jelenlegi fiók jelszavát
         current_username: A jóváhagyáshoz írd be a jelenlegi fiók felhasználói nevét
         digest: Csak hosszú távollét esetén küldődik és csak ha személyes üzenetet kaptál távollétedben
-        discoverable: Engedélyezés, hogy a fiókod idegenek által megtalálható legyen javaslatokon, trendeken és más funkciókon keresztül
         email: Kapsz egy megerősítő e-mailt
         header: PNG, GIF vagy JPG. Maximum %{size}. Átméretezzük %{dimensions} pixelre
         inbox_url: Másold ki a használandó relé szerver kezdőoldalának URL-jét
         irreversible: A kiszűrt bejegyzések visszafordíthatatlanul eltűnnek, a szűrő későbbi törlése esetén is
         locale: A felhasználói felület, e-mailek, push üzenetek nyelve
-        locked: Egyenként engedélyezned kell a követőidet
         password: Legalább 8 karakter
         phrase: Illeszkedni fog kis/nagybetű függetlenül, és tartalmi figyelmeztetések mögött is
         scopes: Mely API-kat érheti el az alkalmazás. Ha felső szintű hatáskört választasz, nem kell egyesével kiválasztanod az alatta lévőeket.
@@ -57,9 +55,6 @@ hu:
         setting_display_media_default: Kényes tartalomnak jelölt média elrejtése
         setting_display_media_hide_all: Mindig minden média elrejtése
         setting_display_media_show_all: Mindig mutasd a szenzitív tartalomként jelölt médiát
-        setting_hide_network: Nem látszik majd a profilodon, kik követnek és te kiket követsz
-        setting_noindex: A nyilvános profilodra és a bejegyzéseidre vonatkozik
-        setting_show_application: A bejegyzések részletes nézetében látszani fog, milyen alkalmazást használtál a bejegyzés közzétételéhez
         setting_use_blurhash: A kihomályosítás az eredeti képből történik, de minden részletet elrejt
         setting_use_pending_items: Idővonal frissítése csak kattintásra automatikus görgetés helyett
         username: Betűk, számok és alávonások használhatók
@@ -178,7 +173,6 @@ hu:
         context: Szűrés kontextusai
         current_password: Jelenlegi jelszó
         data: Adatok
-        discoverable: Fiók listázása a profilok adatbázisában
         display_name: Megjelenített név
         email: E-mail cím
         expires_in: Elévül
@@ -188,7 +182,6 @@ hu:
         inbox_url: Relé inbox-hoz tartozó URL
         irreversible: Eldobás elrejtés helyett
         locale: Felhasználói felület nyelve
-        locked: Felhasználói fiók lezárása
         max_uses: Hányszor használható
         new_password: Új jelszó
         note: Bemutatkozás
@@ -211,9 +204,7 @@ hu:
         setting_display_media_show_all: Mindent mutat
         setting_expand_spoilers: Tartalmi figyelmeztetéssel ellátott bejegyzések automatikus kinyitása
         setting_hide_network: Hálózatod elrejtése
-        setting_noindex: Megtiltom a keresőmotoroknak, hogy indexeljék a tartalmaimat
         setting_reduce_motion: Animációk mozgásának csökkentése
-        setting_show_application: Bejegyzések küldésére használt alkalmazás feltüntetése
         setting_system_font_ui: Rendszer betűtípusának használata
         setting_theme: Megjelenítési sablon
         setting_trends: Mai trend mutatása
diff --git a/config/locales/simple_form.hy.yml b/config/locales/simple_form.hy.yml
index 084c16863a..d2fab9e048 100644
--- a/config/locales/simple_form.hy.yml
+++ b/config/locales/simple_form.hy.yml
@@ -34,7 +34,6 @@ hy:
         inbox_url: Պատճէնիր URL այն շերտի դիմերեսից, որը ցանկանում ես օգտագործել
         irreversible: Զտուած գրառումները կորչելու են անդառնալիօրէն, նոյնիսկ եթէ զտիչը յետոյ հեռացնես
         locale: Ինտերֆեյսի լեզուն, էլ. նամակները եւ push ծանուցումները
-        locked: Անհրաժեշտ կը լինի ձեռքով հաստատել հետեւորդներին
         password: Օգտագործիր առնուազն 8 նիշ
         phrase: Կը համընկնի անկախ տեքստի ձեւից կամ զգուշացնող բովանդակութիւնից
         scopes: Որ API֊ին յաւելուածն ունի հասանելիութիւն։ Եթէ ընտրել ես բարձր մակարդակի դաշտ, ապա անհատական ընտրելու կարիք չկայ։
@@ -43,9 +42,6 @@ hy:
         setting_display_media_default: Թաքցնել կասկածելի բովանդակութիւնը
         setting_display_media_hide_all: Երբեք մեդիա ցոյց չտալ
         setting_display_media_show_all: Մեդիա միշտ ցոյց տալ
-        setting_hide_network: Ուրիշները չեն կարողանայ տեսնել ձեզ հետեւողներին եւ թե ում էք հետեւում դուք
-        setting_noindex: Ազդում է քո հրապարակային հաշուի եւ գրառումների էջի վրայ
-        setting_show_application: Գրառման մանրամասներում կերեւայ թէ որ ծրագրով ես հրապարակել այն
         setting_use_blurhash: Կտորները հիմնուում են թաքցուած վիզուալի վրայ՝ խամրեցնելով դետալները
         setting_use_pending_items: Թաքցնել հոսքի թարմացումները կտտոի ետեւում՝ աւտօմատ թարմացուող հոսքի փոխարէն
         whole_word: Եթէ բանալի բառը կամ արտայայտութիւնը պարունակում է միայն այբբենական նիշեր եւ թուեր, ապա այն կիրառուելու է ամբողջ բառի հետ համընկնելու դէպքում միայն
@@ -114,7 +110,6 @@ hy:
         context: Զտել կոնտեքստները
         current_password: Ներկայիս գաղտնաբառը
         data: Տուեալներ
-        discoverable: Աւելացնել հաշիւը հասցէագրքում
         display_name: Ցուցադրուող անուն
         email: Էլ․ հասցէ
         expires_in: Սպառուում է
@@ -124,7 +119,6 @@ hy:
         inbox_url: Ներմուծման շերտի URL
         irreversible: Թաքցնելու փոխարէն ջնջել
         locale: Ինտերֆեյսի լեզու
-        locked: Փակել հաշիւը
         max_uses: Օգտագործման առաւելագոյն քանակ
         new_password: Նոր գաղտնաբառ
         note: Բիո
@@ -146,9 +140,7 @@ hy:
         setting_display_media_show_all: Ցուցադրել բոլորը
         setting_expand_spoilers: Միշտ բացել բովանդակութեան զգուշացմամբ գրառումները
         setting_hide_network: Թաքցնել ցանցդ
-        setting_noindex: Խուսափել որոնողական համակարգերի ինդէքսաւորումից
         setting_reduce_motion: Կրճատել անիմացիաների շարժումը
-        setting_show_application: Բացայայտել գրառման համար օգտագործուած յաւելուածը
         setting_system_font_ui: Օգտագործել համակարգի լռելեայն տառատեսակը
         setting_theme: Կայքի թեման
         setting_trends: Ցուցադրել օրուայ թրենդները
diff --git a/config/locales/simple_form.id.yml b/config/locales/simple_form.id.yml
index ae99a256b4..51046ce9d4 100644
--- a/config/locales/simple_form.id.yml
+++ b/config/locales/simple_form.id.yml
@@ -35,13 +35,11 @@ id:
         current_password: Untuk tujuan keamanan mohon masukkan kata sandi akun ini
         current_username: Untuk konfirmasi, mohon masukkan nama pengguna akun ini
         digest: Hanya kirim setelah lama tidak aktif dan hanya jika Anda menerima pesan personal atas absensi Anda
-        discoverable: Izinkan akun Anda ditemukan orang lain lewat rekomendasi, tren, dan fitur lain
         email: Anda akan dikirimi email konfirmasi
         header: PNG, GIF atau JPG. Maksimal %{size}. Ukuran dikecilkan menjadi %{dimensions}px
         inbox_url: Salin URL dari halaman depan relai yang ingin Anda pakai
         irreversible: Toot tersaring akan hilang permanen bahkan jika saringan dihapus kemudian
         locale: Bahasa antar muka pengguna, email, dan notifikasi dorong
-        locked: Anda harus menerima permintaan pengikut secara manual dan setting privasi postingan akan diubah khusus untuk pengikut
         password: Gunakan minimal 8 karakter
         phrase: Akan dicocokkan terlepas dari luaran dalam teks atau peringatan konten dari toot
         scopes: API mana yang diizinkan untuk diakses aplikasi. Jika Anda memilih cakupan level-atas, Anda tidak perlu memilih yang individu.
@@ -51,9 +49,6 @@ id:
         setting_display_media_default: Sembunyikan media yang ditandai sebagai sensitif
         setting_display_media_hide_all: Selalu sembunyikan semua media
         setting_display_media_show_all: Selalu tampilkan media sensitif
-        setting_hide_network: Siapa yang Anda ikuti dan yang mengikuti Anda tak akan ditampilkan dalam profil
-        setting_noindex: Pengaruhi profil publik dan halaman status Anda
-        setting_show_application: Aplikasi yang Anda pakai untuk men-toot akan ditampilkan di tampilan detail toot
         setting_use_blurhash: Gradien didasarkan pada warna visual yang tersembunyi tetapi mengaburkan setiap detail
         setting_use_pending_items: Sembunyikan pembaruan linimasa di balik klik alih-alih bergulir secara otomatis
         whole_word: Ketika kata kunci/frasa hanya alfanumerik, maka itu hanya akan diterapkan jika cocok dengan semua kata
@@ -166,7 +161,6 @@ id:
         context: Saring konteks
         current_password: Kata sandi sekarang
         data: Data
-        discoverable: Daftarkan akun ini di direktori
         display_name: Nama yang ditampilkan
         email: Alamat e-mail
         expires_in: Kedaluwarsa setelah
@@ -176,7 +170,6 @@ id:
         inbox_url: URL kotak relai
         irreversible: Hapus alih-alih sembunyikan
         locale: Bahasa
-        locked: Buat akun menjadi pribadi
         max_uses: Jumlah maksimal penggunaan
         new_password: Password baru
         note: Bio
@@ -199,9 +192,7 @@ id:
         setting_display_media_show_all: Tunjukkan semua
         setting_expand_spoilers: Selalu bentangkan kiriman yang bertanda peringatan konten
         setting_hide_network: Sembunyikan jaringan Anda
-        setting_noindex: Opt-out dari pengindeksan mesin pencari
         setting_reduce_motion: Kurangi gerakan animasi
-        setting_show_application: Singkap aplikasi yang dipakai utk kirim toot
         setting_system_font_ui: Gunakan fon bawaan sistem
         setting_theme: Tema situs
         setting_trends: Tampilkan tren hari ini
diff --git a/config/locales/simple_form.io.yml b/config/locales/simple_form.io.yml
index 3291ba4cff..b21b86723c 100644
--- a/config/locales/simple_form.io.yml
+++ b/config/locales/simple_form.io.yml
@@ -35,13 +35,11 @@ io:
         current_password: Por sekuresorezoni, pozez pasvorto di ca konto
         current_username: Por konfirmar, pozez uzantonomo di ca konto
         digest: Nur sendesas pos longa neaktiveso e nur se vu ganis irga mesaji dum ke vu esas neprezenta
-        discoverable: Permisez vua konto deskovresar da nekonociti tra rekomendi, tendenci e altra traiti
         email: Vu sendesos konfirmretposto
         header: En la formato PNG, GIF o JPG. Til %{size}. Esos mikrigita a %{dimensions}px
         inbox_url: Kopiez URL de frontpagino de relayo quon vu volas uzar
         irreversible: Filtrita posti neinversigeble desaparos, mem se filtro efacesas pose
         locale: Linguo di uzantointervizajo, retposti e pulsavizi
-        locked: Tu devos aprobar omna demandi di sequado, e tua mesaji esos senchanje nur por tua sequanti.
         password: Uzes minime 8 litri
         phrase: Parigesos ne ye textosituaciono o konteneyoaverto di posto
         scopes: Quala API quon softwaro permisesas acesar. Se vu selektas alta skopo, vu ne mustas selektar individui.
@@ -51,9 +49,6 @@ io:
         setting_display_media_default: Celez medii quo markizesis quale sentoza
         setting_display_media_hide_all: Sempre celez medii
         setting_display_media_show_all: Sempre montrez medii
-        setting_hide_network: Vua sequato e sequanto celesos che vua profilo
-        setting_noindex: Efektigar vua publika profilo e postopagini
-        setting_show_application: Softwaro quon vu uzar por postigar montresos che detala vidajo di vua posti
         setting_use_blurhash: Inklini esas segun kolori di celesis vidaji ma kovras irga detali
         setting_use_pending_items: Celez tempolineonovi dop kliktar e ne automatike movigar niuzeto
         whole_word: Kande klefvorto o fraz esas nur litera e nombra, ol nur aplikesos se ol parigesas la tota vorto
@@ -164,7 +159,6 @@ io:
         context: Filtrez kuntexti
         current_password: Nuna pasvorto
         data: Datumi
-        discoverable: Sugestez konto a altra personi
         display_name: Publika nomo
         email: Retpost-adreso
         expires_in: Expiras pos
@@ -174,7 +168,6 @@ io:
         inbox_url: URL di relayomesajbuxo
         irreversible: Deslevez e ne celez
         locale: Linguo
-        locked: Privatigar la konto
         max_uses: Maxima uzi
         new_password: Nova pasvorto
         note: Suprizento
@@ -197,9 +190,7 @@ io:
         setting_display_media_show_all: Montrez omno
         setting_expand_spoilers: Sempre expansigez posti quo markizesis kun kontenajaverti
         setting_hide_network: Celez vua sociala grafiko
-        setting_noindex: Desjuntez trovmotorindexigo
         setting_reduce_motion: Diminutez moveso di animacii
-        setting_show_application: Montrez softwaro quo uzesis por sendar posti
         setting_system_font_ui: Uzez originala literfonto di sistemo
         setting_theme: Sittemo
         setting_trends: Montrez tendenco di hodie
diff --git a/config/locales/simple_form.is.yml b/config/locales/simple_form.is.yml
index 63f6c436e0..f7b1e08d73 100644
--- a/config/locales/simple_form.is.yml
+++ b/config/locales/simple_form.is.yml
@@ -41,13 +41,11 @@ is:
         current_password: Í öryggisskyni skaltu setja inn lykilorðið fyrir þennan notandaaðgang
         current_username: Til að staðfesta skaltu setja inn notandanafnið fyrir þennan notandaaðgang
         digest: Er aðeins sent eftir lengri tímabil án virkni og þá aðeins ef þú hefur fengið persónuleg skilaboð á meðan þú hefur ekki verið á línunni
-        discoverable: Gerðu öðrum kleift að finna aðganginn þinn í gegnum meðmæli, vinsældir og annað slíkt
         email: Þú munt fá sendan staðfestingarpóst
         header: PNG, GIF eða JPG. Mest %{size}. Verður smækkað í %{dimensions}px
         inbox_url: Afritaðu slóðina af forsíðu endurvarpans sem þú vilt nota
         irreversible: Síaðar færslur munu hverfa óendurkræft, jafnvel þó sían sé seinna fjarlægð
         locale: Tungumál notandaviðmótsins, tölvupósts og ýti-tilkynninga
-        locked: Krefst þess að þú samþykkir fylgjendur handvirkt
         password: Notaðu minnst 8 stafi
         phrase: Verður notað til samsvörunar burtséð frá stafstöðu texta eða viðvörunar vegna efnis í færslu
         scopes: Að hvaða API-kerfisviðmótum forritið fær aðgang. Ef þú velur efsta-stigs svið, þarftu ekki að gefa einstakar heimildir.
@@ -57,9 +55,6 @@ is:
         setting_display_media_default: Fela myndefni sem merkt er viðkvæmt
         setting_display_media_hide_all: Alltaf fela allt myndefni
         setting_display_media_show_all: Alltaf birta myndefni sem merkt er viðkvæmt
-        setting_hide_network: Hverjum þú fylgist með og hverjir fylgjast með þér verður ekki birt á notandasniðinu þínu
-        setting_noindex: Hefur áhrif á opinbera notandasniðið þitt og færslusíður
-        setting_show_application: Nafnið á forritinu sem þú notar til að senda færslur mun birtast í ítarlegri sýn á færslunum þínum
         setting_use_blurhash: Litstiglarnir byggja á litunum í földu myndunum, en gera öll smáatriði óskýr
         setting_use_pending_items: Fela uppfærslur tímalínu þar til smellt er, í stað þess að hún skruni streyminu sjálfvirkt
         username: Þú mátt nota bókstafi, tölur og undirstrik
@@ -178,7 +173,6 @@ is:
         context: Samhengi síu
         current_password: Núverandi lykilorð
         data: Gögn
-        discoverable: Hafa þennan aðgang með í notendaskránni
         display_name: Birtingarnafn
         email: Tölvupóstfang
         expires_in: Rennur út eftir
@@ -188,7 +182,6 @@ is:
         inbox_url: URL-slóð á innhólf endurvarpa
         irreversible: Fella niður í staðinn fyrir að fela
         locale: Tungumál viðmóts
-        locked: Krefjast fylgjendabeiðna
         max_uses: Hámarksfjöldi afnota
         new_password: Nýtt lykilorð
         note: Æviágrip
@@ -211,9 +204,7 @@ is:
         setting_display_media_show_all: Birta allt
         setting_expand_spoilers: Alltaf útfella færslur sem eru með aðvörun vegna efnisins
         setting_hide_network: Fela félagsnetið þitt
-        setting_noindex: Afþakka atriðaskráningu í leitarvélum
         setting_reduce_motion: Minnka hreyfingu í hreyfimyndum
-        setting_show_application: Upplýsa um forrit sem er til að senda færslur
         setting_system_font_ui: Nota sjálfgefið letur kerfisins
         setting_theme: Þema vefsvæðis
         setting_trends: Birta það sem er efst á baugi í dag
diff --git a/config/locales/simple_form.it.yml b/config/locales/simple_form.it.yml
index 1bd93243fa..df8e54737c 100644
--- a/config/locales/simple_form.it.yml
+++ b/config/locales/simple_form.it.yml
@@ -41,13 +41,11 @@ it:
         current_password: Per motivi di sicurezza inserisci la password dell'account attuale
         current_username: Per confermare, inserisci il nome utente dell'account attuale
         digest: Inviata solo dopo un lungo periodo di inattività e solo se hai ricevuto qualche messaggio personale in tua assenza
-        discoverable: Consenti al tuo account di essere scoperto da sconosciuti tramite consigli, tendenze e altre funzionalità
         email: Ti manderemo una email di conferma
         header: PNG, GIF o JPG. Al massimo %{size}. Verranno scalate a %{dimensions}px
         inbox_url: Copia la URL dalla pagina iniziale del ripetitore che vuoi usare
         irreversible: I post filtrati scompariranno in modo irreversibile, anche se il filtro viene eliminato
         locale: La lingua dell'interfaccia utente, di email e notifiche push
-        locked: Richiede che approvi i follower manualmente
         password: Usa almeno 8 caratteri
         phrase: Il confronto sarà eseguito ignorando minuscole/maiuscole e i content warning
         scopes: A quali API l'applicazione potrà avere accesso. Se selezionate un ambito di alto livello, non c'è bisogno di selezionare quelle singole.
@@ -57,9 +55,6 @@ it:
         setting_display_media_default: Nascondi media segnati come sensibili
         setting_display_media_hide_all: Nascondi sempre tutti i media
         setting_display_media_show_all: Mostra sempre i media segnati come sensibili
-        setting_hide_network: Chi segui e chi segue te non saranno mostrati sul tuo profilo
-        setting_noindex: Ha effetto sul tuo profilo pubblico e sulle pagine degli status
-        setting_show_application: L'applicazione che usi per pubblicare i toot sarà mostrata nella vista di dettaglio dei tuoi toot
         setting_use_blurhash: I gradienti sono basati sui colori delle immagini nascoste ma offuscano tutti i dettagli
         setting_use_pending_items: Fare clic per mostrare i nuovi messaggi invece di aggiornare la timeline automaticamente
         username: Puoi usare lettere, numeri e caratteri di sottolineatura
@@ -178,7 +173,6 @@ it:
         context: Contesti del filtro
         current_password: Password corrente
         data: Dati
-        discoverable: Inserisci questo account nella directory
         display_name: Nome visualizzato
         email: Indirizzo email
         expires_in: Scade dopo
@@ -188,7 +182,6 @@ it:
         inbox_url: URL della inbox del ripetitore
         irreversible: Elimina invece di nascondere
         locale: Lingua dell'interfaccia
-        locked: Blocca account
         max_uses: Numero massimo di utilizzi
         new_password: Nuova password
         note: Biografia
@@ -211,9 +204,7 @@ it:
         setting_display_media_show_all: Mostra tutti
         setting_expand_spoilers: Espandi sempre post con content warning
         setting_hide_network: Nascondi la tua rete
-        setting_noindex: Non farti indicizzare dai motori di ricerca
         setting_reduce_motion: Riduci movimento nelle animazioni
-        setting_show_application: Rendi pubblica l'applicazione usata per inviare i post
         setting_system_font_ui: Usa il carattere predefinito del sistema
         setting_theme: Tema del sito
         setting_trends: Mostra tendenze di oggi
diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml
index 4169a9abca..94657500d9 100644
--- a/config/locales/simple_form.ja.yml
+++ b/config/locales/simple_form.ja.yml
@@ -41,13 +41,11 @@ ja:
         current_password: 現在のアカウントのパスワードを入力してください
         current_username: 確認のため、現在のアカウントのユーザー名を入力してください
         digest: 長期間使用していない場合と不在時に返信を受けた場合のみ送信されます
-        discoverable: レコメンド、トレンド、その他の機能により、あなたのアカウントを他の人から見つけられるようにします
         email: 確認のメールが送信されます
         header: "%{size}までのPNG、GIF、JPGが利用可能です。 %{dimensions}pxまで縮小されます"
         inbox_url: 使用したいリレーサーバーのトップページからURLをコピーします
         irreversible: フィルターが後で削除されても、除外された投稿は元に戻せなくなります
         locale: ユーザーインターフェース、メールやプッシュ通知の言語
-        locked: フォロワーを手動で承認する必要があります
         password: 少なくとも8文字は入力してください
         phrase: 投稿内容の大文字小文字や閲覧注意に関係なく一致
         scopes: アプリの API に許可するアクセス権を選択してください。最上位のスコープを選択する場合、個々のスコープを選択する必要はありません。
@@ -57,9 +55,6 @@ ja:
         setting_display_media_default: 閲覧注意としてマークされたメディアは隠す
         setting_display_media_hide_all: メディアを常に隠す
         setting_display_media_show_all: メディアを常に表示する
-        setting_hide_network: フォローとフォロワーの情報がプロフィールページで見られないようにします
-        setting_noindex: 公開プロフィールおよび各投稿ページに影響します
-        setting_show_application: 投稿するのに使用したアプリが投稿の詳細ビューに表示されるようになります
         setting_use_blurhash: ぼかしはメディアの色を元に生成されますが、細部は見えにくくなっています
         setting_use_pending_items: 新着があってもタイムラインを自動的にスクロールしないようにします
         username: アルファベット大文字と小文字、数字、アンダーバー「_」が使えます
@@ -178,7 +173,6 @@ ja:
         context: 除外対象
         current_password: 現在のパスワード
         data: データ
-        discoverable: ディレクトリに掲載する
         display_name: 表示名
         email: メールアドレス
         expires_in: 有効期限
@@ -188,7 +182,6 @@ ja:
         inbox_url: リレーサーバーの inbox URL
         irreversible: 隠すのではなく除外する
         locale: 言語
-        locked: 承認制アカウントにする
         max_uses: 使用できる回数
         new_password: 新しいパスワード
         note: プロフィール
@@ -211,9 +204,7 @@ ja:
         setting_display_media_show_all: 表示
         setting_expand_spoilers: 閲覧注意としてマークされた投稿を常に展開する
         setting_hide_network: 繋がりを隠す
-        setting_noindex: 検索エンジンによるインデックスを拒否する
         setting_reduce_motion: アニメーションの動きを減らす
-        setting_show_application: 送信したアプリを開示する
         setting_system_font_ui: システムのデフォルトフォントを使う
         setting_theme: サイトテーマ
         setting_trends: 本日のトレンドタグを表示する
diff --git a/config/locales/simple_form.ka.yml b/config/locales/simple_form.ka.yml
index 574a2b07c7..e5d874c5a5 100644
--- a/config/locales/simple_form.ka.yml
+++ b/config/locales/simple_form.ka.yml
@@ -12,11 +12,8 @@ ka:
         inbox_url: ურლ დააკოირეთ გამოყენებისთვის სასურველი რილეის წინა გვერდიდან
         irreversible: გაფილტრული ტუტები გაუქმდება აღუდგენლად, იმ შემთხვევაშიც კი თუ ფილტრი სამომავლოდ გაუქმდება
         locale: მომხმარებლის ინტერფეისის, ელ-ფოსტის წერილების და ფუშ შეტყობინებების ენა
-        locked: საჭიროებს თქვენ მიერ მიმდევრების ხელით დადასტურებას
         phrase: დამთხვევა მოხდება დიდი და პატარა ასოების ან კონტენტის გაფრთხილების გათვალისწინების გარეშე
         scopes: რომელი აპიებისადმი ექნება აპლიკაციას ცვდომა. თუ არიჩევთ უმთავრეს ფარგლებს, არ დაგჭირდებათ ინდივიდუალურების ამორჩევა.
-        setting_hide_network: ვის მიყვებით და ვინ მოგყვებათ არ გამოჩნდება აქ
-        setting_noindex: გავლენას ახდენს თქვენს ღია პროფილისა და სტატუსის გვერდებზე
         whole_word: როდესაც სიტყვა ან ფრაზა მხოლოდ ალფა-ნუმერიკულია, ის დაფიქსირდება თუ ემთხვევა სრულ სიტყვას
       imports:
         data: ცსვ ფაილის ექსპორტი მოხდა მასტოდონის სხვა ინსტანციიდან
@@ -47,7 +44,6 @@ ka:
         inbox_url: რილეი ინბოქსის ურლ
         irreversible: გაუქმდეს დამალვის მაგივრად
         locale: ინტერფეისის ენა
-        locked: ანგარიშის ჩაკეტვა
         max_uses: მოხმარების მაქს. ოდენობა
         new_password: ახალი პაროლი
         note: ბიო.
@@ -61,7 +57,6 @@ ka:
         setting_default_sensitive: ყოველთვის მოინიშნოს მედია მგრძნობიარედ
         setting_delete_modal: ტუტის გაუქმებამდე გამოჩნდეს დადასტურების ფანჯარა
         setting_hide_network: თქვენი ქსელის დამალვა
-        setting_noindex: საძოები სისტემების ინდექსაციის შეჩერება
         setting_reduce_motion: მოძრაობის შემცირება ანიმაციებში
         setting_system_font_ui: მოხდეს სისტემის საწყისი ფონტის მოხმარება
         setting_theme: საიტის თემა
diff --git a/config/locales/simple_form.kab.yml b/config/locales/simple_form.kab.yml
index b55a3406db..1e1c52da24 100644
--- a/config/locales/simple_form.kab.yml
+++ b/config/locales/simple_form.kab.yml
@@ -14,12 +14,10 @@ kab:
         email: Ad n-teṭṭfeḍ imayl i usentem
         irreversible: Tijewwaqin i tessazedgeḍ ad ttwakksent i lebda, ula ma tekkseḍ imsizdeg-nni ar zdat
         locale: Tutlayt n ugrudem, imaylen d tilγa
-        locked: Isra asentem s wufus n ineḍfaren
         password: Seqdec ma drus 8 n yisekkilen
         setting_display_media_default: Ffer teywalt yettwacreḍ d tanafrit
         setting_display_media_hide_all: Ffer yal tikkelt akk taywalt
         setting_display_media_show_all: Ffer yal tikkelt teywalt yettwacreḍ d tanafrit
-        setting_hide_network: Wid i teṭṭafaṛeḍ d wid i k-yeṭṭafaṛen ur d-ttwaseknen ara deg umaγnu-inek
       imports:
         data: Afaylu CSV id yusan seg uqeddac-nniḍen n Maṣṭudun
       ip_block:
@@ -55,12 +53,10 @@ kab:
         confirm_password: Sentem awal uffir
         current_password: Awal uffir n tura
         data: Isefka
-        discoverable: Rnu amiḍan-a γer ukaram
         display_name: Isem ara d-yettwaskanen
         email: Tansa imayl
         header: Ixef
         locale: Tutlayt n wegrudem
-        locked: Rgel amiḍan
         max_uses: Amḍan afellay n iseqdacen
         new_password: Awal uffir amaynut
         note: Tameddurt
diff --git a/config/locales/simple_form.kk.yml b/config/locales/simple_form.kk.yml
index c1c7b4c2fd..5c1854d188 100644
--- a/config/locales/simple_form.kk.yml
+++ b/config/locales/simple_form.kk.yml
@@ -29,14 +29,12 @@ kk:
         context: Фильтр контекстері
         current_password: Ағымдағы кілтсөз
         data: Дата
-        discoverable: Бұл аккаунтты каталогта көрсету
         display_name: Атын көрсет
         email: Эл. пошта мекен жайы
         expires_in: Аяқталу мерзімі
         fields: Профиль метадатасы
         header: Басы
         locale: Интерфейс тілі
-        locked: Аккаунтты құлыптау
         max_uses: Максимум қолданушы саны
         new_password: Жаңа құпиясөз
         note: Био
diff --git a/config/locales/simple_form.ko.yml b/config/locales/simple_form.ko.yml
index 4c51117a13..38c07d5bef 100644
--- a/config/locales/simple_form.ko.yml
+++ b/config/locales/simple_form.ko.yml
@@ -41,13 +41,11 @@ ko:
         current_password: 보안을 위해 현재 계정의 암호를 입력해주세요
         current_username: 확인을 위해, 현재 계정의 사용자명을 입력해주세요
         digest: 오랫동안 활동하지 않았을 때 받은 멘션들에 대한 요약 받기
-        discoverable: 추천, 트렌드 및 기타 기능을 통해 낯선 사람이 내 계정을 발견할 수 있도록 허용합니다
         email: 확인용 이메일을 보냈습니다.
         header: PNG, GIF 혹은 JPG. 최대 %{size}. %{dimensions}px로 축소 됨
         inbox_url: 사용 할 릴레이 서버의 프론트페이지에서 URL을 복사합니다
         irreversible: 필터링 된 게시물은 나중에 필터가 사라지더라도 돌아오지 않게 됩니다
         locale: 사용자 인터페이스, 이메일, 푸시 알림 언어
-        locked: 팔로우 요청을 승인제로 두어 누가 당신을 팔로우 할 수 있는지를 수동으로 제어합니다.
         password: 최소 8글자
         phrase: 게시물 내용이나 열람주의 내용 안에서 대소문자 구분 없이 매칭 됩니다
         scopes: 애플리케이션에 허용할 API들입니다. 최상위 스코프를 선택하면 개별적인 것은 선택하지 않아도 됩니다.
@@ -57,9 +55,6 @@ ko:
         setting_display_media_default: 민감함으로 표시된 미디어 가리기
         setting_display_media_hide_all: 모든 미디어를 가리기
         setting_display_media_show_all: 모든 미디어를 보이기
-        setting_hide_network: 나를 팔로우 하는 사람들과 내가 팔로우 하는 사람들을 내 프로필에서 숨깁니다
-        setting_noindex: 공개 프로필 및 각 게시물 페이지에 영향을 미칩니다
-        setting_show_application: 게시물 작성에 사용한 애플리케이션이 게시물 상세정보에 표시됩니다.
         setting_use_blurhash: 그라디언트는 숨겨진 내용의 색상을 기반으로 하지만 상세 내용은 보이지 않게 합니다
         setting_use_pending_items: 타임라인의 새 게시물을 자동으로 보여 주는 대신, 클릭해서 나타내도록 합니다
         username: 문자, 숫자, 밑줄을 사용할 수 있습니다
@@ -178,7 +173,6 @@ ko:
         context: 필터 컨텍스트
         current_password: 현재 암호 입력
         data: 데이터
-        discoverable: 계정을 다른 사람들에게 추천하기
         display_name: 표시 이름
         email: 이메일 주소
         expires_in: 만기
@@ -188,7 +182,6 @@ ko:
         inbox_url: 릴레이 서버의 inbox URL
         irreversible: 숨기는 대신 삭제
         locale: 인터페이스 언어
-        locked: 팔로우 요청 필요
         max_uses: 사용 횟수 제한
         new_password: 새로운 암호 입력
         note: 소개
@@ -211,9 +204,7 @@ ko:
         setting_display_media_show_all: 모두 보이기
         setting_expand_spoilers: 내용 경고로 표시된 게시물을 항상 펼치기
         setting_hide_network: 내 인맥 숨기기
-        setting_noindex: 검색엔진의 인덱싱을 거절
         setting_reduce_motion: 애니메이션 줄이기
-        setting_show_application: 게시물 작성에 쓰인 애플리케이션 공개
         setting_system_font_ui: 시스템의 기본 글꼴을 사용
         setting_theme: 사이트 테마
         setting_trends: 오늘의 유행 보이기
diff --git a/config/locales/simple_form.ku.yml b/config/locales/simple_form.ku.yml
index 9194c8b122..fb7a45c34b 100644
--- a/config/locales/simple_form.ku.yml
+++ b/config/locales/simple_form.ku.yml
@@ -35,13 +35,11 @@ ku:
         current_password: Ji bo ewlehiyê ji kerema xwe borînpeyva ajimêrê xwe têxe
         current_username: Ji bo piştrastkirinê, ji kerema xwe navê bikarhêner ya ajimêrê niha binvîse
         digest: Tenê piştî demek dirêj neçalakiyê de û tenê di nebûna te da peyamên teybetî standî be tê şandin
-        discoverable: Mafê biden ku ajimêra te bi pêşniyar û taybetmendiyên din ji aliyê biyaniyan ve bê vedîtin
         email: Ji te re e-name ya pejirandinê were
         header: PNG, GIF an jî JPG. Herî zêde %{size} ber bi %{dimensions}px ve were kêmkirin
         inbox_url: Girêdanê ji rûpela pêşîn a guhêrkera ku tu dixwazî bi kar bînî jê bigire
         irreversible: Şandiyên parzûnkirî êdî bê veger wenda bibe, heger parzûn paşê were rakirin jî nabe
         locale: Zimanê navrûyê bikarhêner, agahdarîyên e-name û pêl kirin
-        locked: Bi pejirandina daxwazên şopandinê, kî dikare te bişopîne bi destan kontrol bike
         password: Herî kêm 8 tîpan bi kar bîne
         phrase: Ji rewşa nivîsê tîpên girdek/hûrdek an jî ji hişyariya naveroka ya şandiyê wek serbixwe wê were hevbeş kirin
         scopes: |-
@@ -53,9 +51,6 @@ ku:
         setting_display_media_default: Medyaya wekî hestyarî hatiye nîşankirî ye veşêre
         setting_display_media_hide_all: Medyayê tim veşêre
         setting_display_media_show_all: Medyayê tim nîşan bike
-        setting_hide_network: Kesên ku te dişopîne û kesên tu dişopînî ev ên profîla te de were veşartin
-        setting_noindex: Bandor li hemî profîla te û şandiyên rûpela te dike
-        setting_show_application: Navê sepana ku tu ji bo şandinê wê bi kar tîne dê di dîtinê berferh ên di şandiyên te de were xuyakirin
         setting_use_blurhash: Gradyen xwe bi rengên dîtbarîyên veşartî ve radigire, lê belê hûrgilîyan diveşêre
         setting_use_pending_items: Li şûna ku herkê wek bixweber bizivirînî nûvekirina demnameyê li paş tikandinekî veşêre
         whole_word: Dema peyvkilîd an jî hevok bi tenê alfahejmarî çêbe, bi tenê hemû bêjeyê re li hev bike wê pêk bê
@@ -168,7 +163,6 @@ ku:
         context: Parzûnê naverokan
         current_password: Borînpeyva heyî
         data: Dane
-        discoverable: Ji yên din re ajimêrê pêşniyar bike
         display_name: Navê nîşandanê
         email: Navnîşana E-nameyê
         expires_in: Dîroka xilasbûyînê
@@ -178,7 +172,6 @@ ku:
         inbox_url: Girêdana guhêrkera peymanên hatî
         irreversible: Li şûna veşartinê jê bibe
         locale: Zimanê navrûyê
-        locked: Ajimêr kilît bike
         max_uses: Hejmara bikaranîna herî zêde
         new_password: Borînpeyva nû
         note: Jiyanname
@@ -201,9 +194,7 @@ ku:
         setting_display_media_show_all: Hemûyan nîşan bide
         setting_expand_spoilers: Şandîyên ku bi agahdarîyên naverokê va hatine nîşankirin her dem berfireh bike
         setting_hide_network: Grafîka xwe ya civakî veşêre
-        setting_noindex: Bes e nexe di nav rêzên lêgerîna gerokan
         setting_reduce_motion: Lîstikên livoka kêm bike
-        setting_show_application: Sepana ku ji bo şandina şandiyan tê bikaranîn diyar bike
         setting_system_font_ui: Curenivîsa berdest a pergalê bi kar bîne
         setting_theme: Rûkarê malperê
         setting_trends: Rojeva îro nîşan bide
diff --git a/config/locales/simple_form.lv.yml b/config/locales/simple_form.lv.yml
index ab0decf986..b2b25b3deb 100644
--- a/config/locales/simple_form.lv.yml
+++ b/config/locales/simple_form.lv.yml
@@ -37,13 +37,11 @@ lv:
         current_password: Drošības nolūkos, lūdzu, ievadi pašreizējā konta paroli
         current_username: Lai apstiprinātu, lūdzu, ievadi pašreizējā konta paroli
         digest: Sūta tikai pēc ilgstošas neaktivitātes un tikai tad, ja savas prombūtnes laikā neesi saņēmis personiskas ziņas
-        discoverable: Ļauj svešiniekiem atklāt savu kontu caur ieteikumiem, tendencēm un citām iespējām
         email: Tev tiks nosūtīts apstiprinājuma e-pasts
         header: PNG, GIF vai JPG. Ne vairāk kā %{size}. Tiks samazināts līdz %{dimensions}px
         inbox_url: Nokopē URL no tā releja sākumlapas, kuru vēlies izmantot
         irreversible: Filtrētās ziņas neatgriezeniski pazudīs, pat ja filtrs vēlāk tiks noņemts
         locale: Lietotāja saskarnes, e-pasta ziņojumu un push paziņojumu valoda
-        locked: Manuāli kontrolē, kas var tev sekot, apstiprinot sekošanas pieprasījumus
         password: Izmanto vismaz 8 rakstzīmes
         phrase: Tiks saskaņots neatkarīgi no ziņas teksta reģistra vai satura brīdinājuma
         scopes: Kuriem API lietojumprogrammai būs atļauta piekļuve. Ja izvēlies augstākā līmeņa tvērumu, tev nav jāatlasa atsevišķi vienumi.
@@ -53,9 +51,6 @@ lv:
         setting_display_media_default: Paslēpt multividi, kas atzīmēta kā sensitīva
         setting_display_media_hide_all: Vienmēr slēpt multividi
         setting_display_media_show_all: Vienmēr rādīt multividi
-        setting_hide_network: Tavā profilā netiks rādīts, kam tu seko un kurš seko tev
-        setting_noindex: Ietekmē tavu publisko profilu un ziņu lapas
-        setting_show_application: Lietojumprogramma, ko tu izmanto publicēšanai, tiks parādīta tavu ziņu detalizētajā skatā
         setting_use_blurhash: Gradientu pamatā ir paslēpto vizuālo attēlu krāsas, bet neskaidras visas detaļas
         setting_use_pending_items: Paslēpt laika skalas atjauninājumus aiz klikšķa, nevis automātiski ritini plūsmu
         username: Tu vari lietot burtus, ciparus un zemsvītras
@@ -173,7 +168,6 @@ lv:
         context: Filtrēt kontekstus
         current_password: Pašreizējā parole
         data: Dati
-        discoverable: Ieteikt kontu citiem
         display_name: Parādāmais vārds
         email: E-pasta adrese
         expires_in: Beidzas pēc
@@ -183,7 +177,6 @@ lv:
         inbox_url: URL vai releja pastkaste
         irreversible: Nomest, nevis paslēpt
         locale: Saskarnes valoda
-        locked: Pieprasīt sekotāju pieprasījumus
         max_uses: Maksimālais lietojumu skaits
         new_password: Jauna parole
         note: Par sevi
@@ -206,9 +199,7 @@ lv:
         setting_display_media_show_all: Parādīt visu
         setting_expand_spoilers: Vienmēr izvērst ziņas, kas apzīmētas ar brīdinājumiem par saturu
         setting_hide_network: Slēpt savu sociālo grafu
-        setting_noindex: Atteikties no meklētājprogrammu indeksēšanas
         setting_reduce_motion: Ierobežot kustību animācijās
-        setting_show_application: Atklāt lietojumprogrammu, ko izmanto ziņu nosūtīšanai
         setting_system_font_ui: Lietot sistēmas noklusējuma fontu
         setting_theme: Vietnes motīvs
         setting_trends: Parādīt šodienas tendences
diff --git a/config/locales/simple_form.ms.yml b/config/locales/simple_form.ms.yml
index 57aff248b6..3d488814b3 100644
--- a/config/locales/simple_form.ms.yml
+++ b/config/locales/simple_form.ms.yml
@@ -2,6 +2,10 @@
 ms:
   simple_form:
     hints:
+      account:
+        display_name: Nama penuh anda atau nama anda yang menyeronokkan.
+        fields: Halaman utama anda, kata ganti nama, umur, apa sahaja yang anda mahukan.
+        note: 'Anda boleh @menyebut orang lain atau #hashtags.'
       account_alias:
         acct: Tentukan namapengguna@domain akaun yang ingin anda alihkan daripada
       account_migration:
@@ -18,6 +22,8 @@ ms:
           disable: Halang pengguna daripada menggunakan akaun mereka, tetapi jangan hapus atau sorokkan kandungan mereka.
           none: Gunakan ini untuk menghantar amaran kepada pengguna, tanpa mencetuskan sebarang tindakan lain.
           sensitive: Memaksa semua lampiran media pengguna ini ditandakan sebagai sensitif.
+          silence: Halang pengguna daripada dapat membuat siaran dengan keterlihatan awam, menyembunyikan siaran dan pemberitahuan mereka daripada orang yang tidak mengikutinya. Menutup semua laporan terhadap akaun ini.
+          suspend: Halang sebarang interaksi daripada atau ke akaun ini dan padamkan kandungannya. Boleh diterbalikkan dalam masa 30 hari. Menutup semua laporan terhadap akaun ini.
         warning_preset_id: Pilihan. Anda masih boleh menambah teks tersuai pada akhir praset
       announcement:
         all_day: Apabila diperiksa, hanya tarikh dalam julat masa yang akan dipaparkan
@@ -30,20 +36,38 @@ ms:
       defaults:
         autofollow: Orang yang mendaftar melalui undangan akan mengikuti anda secara automatik
         avatar: PNG, GIF atau JPG. Kebanyakannya %{size}. Saiz akan dikecilkan kepada %{dimensions}px
+        bot: Memberi isyarat kepada orang lain bahawa akaun itu kebanyakannya melakukan tindakan automatik dan mungkin tidak dipantau
+        context: Satu atau berbilang konteks di mana penapis harus digunakan
+        current_password: Untuk tujuan keselamatan sila masukkan kata laluan akaun semasa
+        current_username: Untuk mengesahkan, sila masukkan nama pengguna akaun semasa
+        digest: Hanya dihantar selepas tempoh yang lama tidak aktif dan hanya jika anda telah menerima sebarang mesej peribadi semasa ketiadaan anda
         email: Anda akan dihantar e-mel pengesahan
+        header: PNG, GIF atau JPG. Paling banyak %{size}. Akan diturunkan skala kepada %{dimensions}px
+        inbox_url: Salin URL dari muka depan geganti yang anda mahu gunakan
+        irreversible: Siaran yang ditapis akan hilang secara tidak dapat dipulihkan, walaupun penapis dialih keluar kemudian
         locale: Bahasa untuk antara muka pengguna, e-mel dan pemberitahuan segera
         password: Gunakan sekurang-kurangnya 8 aksara
+        phrase: Akan dipadankan tanpa mengira sarung dalam teks atau amaran kandungan siaran
+        scopes: API mana yang akan dibenarkan untuk diakses oleh aplikasi. Jika anda memilih skop peringkat atasan, anda tidak perlu memilih skop individu.
+        setting_aggregate_reblogs: Jangan tunjukkan rangsangan baharu untuk siaran yang telah dirangsang baru-baru ini (hanya menjejaskan rangsangan yang baru diterima)
         setting_always_send_emails: Biasanya pemberitahuan e-mel tidak akan dihantar apabila anda selalu menggunakan Mastodon
+        setting_default_sensitive: Media sensitif disembunyikan secara lalai dan boleh didedahkan dengan satu klik
         setting_display_media_default: Sembunyikan media yang ditanda sebagai sensitif
         setting_display_media_hide_all: Sentiasa sembunyikan media
         setting_display_media_show_all: Sentiasa paparkan media
-        setting_hide_network: Sesiapa yang anda ikuti dan sesiapa yang mengikuti anda akan disembunyi daripada profil anda
-        setting_noindex: Menjejaskan profil awam dan laman hantaran anda
       form_admin_settings:
         closed_registrations_message: Dipaparkan semasa pendaftaran ditutup
+        site_contact_email: Cara orang boleh menghubungi anda untuk pertanyaan undang-undang atau sokongan.
         site_contact_username: Bagaimana orang boleh menghubungi anda pada Mastodon.
         site_extended_description: Apa-apa maklumat tambahan yang mungkin berguna untuk pelawat dan pengguna anda. Boleh distruktur dengan sintaks Markdown.
+        site_short_description: Penerangan ringkas untuk membantu mengenal pasti server anda. Siapa yang menjalankannya, untuk siapa?
         site_terms: Gunakan dasar polisi anda atau biarkan kosong untuk menggunakan lalai. Boleh distruktur dengan sintaks Markdown.
+        site_title: Bagaimana orang boleh merujuk kepada server anda selain nama domainnya.
+        status_page_url: URL halaman yang membolehkan orang ramai melihat status server ini semasa gangguan
+        theme: Tema yang pelawat log keluar dan pengguna baharu lihat.
+        thumbnail: Imej kira-kira 2:1 dipaparkan bersama maklumat server anda.
+        timeline_preview: Pelawat yang log keluar akan dapat menyemak imbas siaran awam terkini yang tersedia pada server.
+        trendable_by_default: Langkau semakan manual kandungan sohor kini. Item individu masih boleh dialih keluar daripada trend selepas fakta itu.
       form_challenge:
         current_password: Anda sedang memasuki kawasan selamat
       imports:
@@ -59,9 +83,12 @@ ms:
         color: Warna yang akan digunakan untuk peranan ini dalam seluruh UI, sebagai RGB dalam format hex
         highlighted: Ini menjadikan peranan ini dipaparkan secara umum
         permissions_as_keys: Pengguna dengan peranan ini akan mempunyai akses kepada...
+      webhook:
+        url: Di mana acara akan dihantar
     labels:
       account:
         fields:
+          name: Label
           value: Kandungan
       account_warning_preset:
         title: Tajuk
@@ -75,10 +102,14 @@ ms:
           suspend: Gantung
         warning_preset_id: Gunakan amaran yang ditetapkan
       announcement:
+        all_day: Acara sepanjang hari
+        ends_at: Tamat acara
+        starts_at: Permulaan acara
         text: Pengumuman
       appeal:
         text: Jelaskan mengapa keputusan ini patut diterbalikkan
       defaults:
+        avatar: Gambar profil
         bot: Ini ialah akaun bot
         chosen_languages: Tapis bahasa
         confirm_new_password: Sahkan kata laluan baru
@@ -86,13 +117,15 @@ ms:
         context: Konteks penapis
         current_password: Kata laluan semasa
         data: Data
-        discoverable: Mencadangkan akaun kepada pengguna lain
         display_name: Nama paparan
         email: Alamat e-mel
         expires_in: Tamat tempoh selepas
         fields: Metadata profil
+        honeypot: "%{label} (jangan isi)"
+        irreversible: Sebaliknya sembunyikan, jatuhkan
         locale: Bahasa antara muka
         new_password: Kata laluan baru
+        note: Bio
         otp_attempt: Kod dua faktor
         password: Kata laluan
         phrase: Kata kunci atau frasa
@@ -104,6 +137,7 @@ ms:
         setting_display_media_default: Lalai
         setting_display_media_hide_all: Sembunyikan semua
         setting_display_media_show_all: Paparkan semua
+        setting_hide_network: Sembunyikan graf sosial anda
         setting_system_font_ui: Gunakan fon lalai sistem
         setting_theme: Tema halaman
         setting_trends: Paparkan trend hari ini
@@ -132,6 +166,7 @@ ms:
         site_short_description: Penerangan pelayan
         site_terms: Dasar Privasi
         site_title: Nama pelayan
+        status_page_url: URL halaman status
         theme: Tema asal
         trends: Dayakan trend
       invite:
@@ -162,6 +197,7 @@ ms:
         usable: Benarkan siaran untuk menggunakan tanda pagar ini
       user:
         role: Peranan
+        time_zone: Zon masa
       user_role:
         color: Warna lencana
         name: Nama
@@ -171,5 +207,6 @@ ms:
     not_recommended: Tidak disyorkan
     recommended: Disyorkan
     required:
+      mark: "*"
       text: diperlukan
     'yes': Ya
diff --git a/config/locales/simple_form.my.yml b/config/locales/simple_form.my.yml
index fc41c27f81..59d134137f 100644
--- a/config/locales/simple_form.my.yml
+++ b/config/locales/simple_form.my.yml
@@ -41,13 +41,11 @@ my:
         current_password: လုံခြုံရေးအတွက် ကျေးဇူးပြုပြီး လက်ရှိအကောင့်၏ စကားဝှက်ကို ထည့်ပါ
         current_username: အတည်ပြုရန်အတွက် လက်ရှိအကောင့်၏ အသုံးပြုသူအမည်ကို ရိုက်ထည့်ပါ
         digest: အချိန်အတော်ကြာ အသုံးမပြုသည့်သည့်နောက်တွင်သာ ပေးပို့ပြီး အသုံးမပြုသည့်ကာလအတွင်း ကိုယ်ရေးကိုယ်တာစာများသာ လက်ခံရန်
-        discoverable: အကြံပြုချက်များ၊ လက်ရှိခေတ်စားနေသောပို့စ်များနှင့် အခြားအကြောင်းအရာများမှတစ်ဆင့် သင့်အကောင့်ကို တခြားသူများက တွေ့ရှိနိုင်စေရန် ခွင့်ပြုပါ။
         email: သင့်ထံ အတည်ပြုချက်အီးမေးလ်တစ်စောင် ပေးပို့ပါမည်
         header: PNG၊ GIF သို့မဟုတ် JPG။ အများဆုံး %{size}။ %{dimensions}px သို့ လျှော့ချပါမည်
         inbox_url: သင်အသုံးပြုလိုသော relay ၏ ရှေ့စာမျက်နှာမှ URL ကို ကူးယူပါ
         irreversible: စစ်ထုတ်ခြင်းကိုဖယ်ရှားလိုက်ပါက စစ်ထုတ်ထားသော ပို့စ်များမှာ ပျောက်ကွယ်သွားပါမည်
         locale: အသုံးပြုသူမှ လက်ရှိသုံးနေသည့်ဘာသာစကား၊ အီးမေးလ်များနှင့် ရရှိစေရန်ပေးပို့သည့် အသိပေးချက်များ
-        locked: စောင့်ကြည့်ရန်အတွက် တောင်းဆိုမှုများကို အတည်ပြုခြင်းဖြင့် စောင့်ကြည့်သူများကို ထိန်းချုပ်နိုင်သည်
         password: အနည်းဆုံး စာလုံး ၈ လုံး အသုံးပြုပါ။
         phrase: ပို့စ်တစ်ခု၏ စာသား သို့မဟုတ် အကြောင်းအရာသတိပေးချက်တွင် စာသားသတ်မှတ်ထားမှုမရှိဘဲ ကိုက်ညီရပါမည်
         scopes: API အက်ပလီကေးရှင်းများကို ဝင်ရောက်ကြည့်ရှုခွင့်ပြုပါမည်။ ထိပ်တန်းအဆင့်နယ်ပယ်ကို ရွေးချယ်ထားပါက တစ်ခုချင်းစီရွေးချယ်ရန် မလိုအပ်တော့ပါ။
@@ -57,9 +55,6 @@ my:
         setting_display_media_default: သတိထားရသောမီဒီယာအဖြစ် သတ်မှတ်ထားမှုအား ဖျောက်ပါ
         setting_display_media_hide_all: မီဒီယာကို အမြဲတမ်းဖျောက်ထားပါ
         setting_display_media_show_all: မီဒီယာကို အမြဲတမ်းပြပါ
-        setting_hide_network: သင်စောင့်ကြည့်မည့်သူများနှင့် သင့်ကိုစောင့်ကြည့်မည့်သူများကို သင့်ပရိုဖိုင်တွင် ဖျောက်ထားနိုင်ပါသည်
-        setting_noindex: သင်၏ အများမြင်သည့်ပရိုဖိုင်နှင့် ပို့စ်စာမျက်နှာများကို အကျိုးသက်ရောက်သည်
-        setting_show_application: ပို့စ်တင်ရန်အတွက် သင်အသုံးပြုသည့် အက်ပလီကေးရှင်းကို သင့်ပို့စ်များ၏ အသေးစိတ်ကြည့်ရှုမှုတွင် ပြသမည်ဖြစ်သည်
         setting_use_blurhash: Gradients မှာ ဖျောက်ထားသောရုပ်ပုံများ၏ အရောင်များကိုအခြေခံသော်လည်း မည်သည့်အသေးစိတ်အချက်အလက်ကိုမဆို ရှုပ်ထွေးစေနိုင်ပါသည်။
         setting_use_pending_items: အပေါ်အောက်လှိမ့်မည့်အစား ကလစ်တစ်ခုနောက်တွင် စာမျက်နှာအပ်ဒိတ်များကို ဖျောက်ထားပါ။
         username: အက္ခရာများ၊ နံပါတ်များနှင့် underscore များကို အသုံးပြုနိုင်သည်
@@ -178,7 +173,6 @@ my:
         context: အကြောင်းအရာများကို စစ်ထုတ်ပါ။
         current_password: လက်ရှိစကားဝှက်
         data: အချက်အလက်
-        discoverable: အကောင့်ကို အခြားသူများအား အကြံပြုပါ
         display_name: ဖော်ပြမည့်အမည်
         email: အီးမေးလ်လိပ်စာ
         expires_in: သက်တမ်းကုန်ဆုံးမည့်ရက်
@@ -188,7 +182,6 @@ my:
         inbox_url: ထပ်ဆင့်ဝင်စာ၏ URL
         irreversible: ဖျောက်မယ့်အစား လွှတ်လိုက်ပါ။
         locale: ဘာသာစကား
-        locked: စောင့်ကြည့်တောင်းဆိုမှုများ လိုအပ်သည်
         max_uses: အများဆုံးအသုံးပြုမှုအရေအတွက်
         new_password: စကားဝှက်အသစ်
         note: ကိုယ်ရေးအကျဉ်း
@@ -211,9 +204,7 @@ my:
         setting_display_media_show_all: အားလုံးပြရန်
         setting_expand_spoilers: အကြောင်းအရာသတိပေးချက်များဖြင့် အမှတ်အသားပြုထားသော ပို့စ်များကို အမြဲချဲ့ပါ
         setting_hide_network: သင့် Social Graph ကို ဖျောက်ထားပါ
-        setting_noindex: ရှာဖွေရေးအညွှန်းမှ ဖယ်ထုတ်ပါ
         setting_reduce_motion: ကာတွန်းများတွင် လှုပ်ရှားမှုကို လျှော့ချပါ
-        setting_show_application: ပို့စ်များ ပေးပို့ရာတွင် အသုံးပြုသည့် အက်ပလီကေးရှင်း
         setting_system_font_ui: စနစ်ရှိ နဂိုမူလ စာလုံးပုံစံကို အသုံးပြုပါ
         setting_theme: ဆိုက်အပြင်အဆင်
         setting_trends: ယနေ့ ရေပန်းစားသည်များကို ပြပါ
diff --git a/config/locales/simple_form.nl.yml b/config/locales/simple_form.nl.yml
index d58a55e9ad..45a09b658a 100644
--- a/config/locales/simple_form.nl.yml
+++ b/config/locales/simple_form.nl.yml
@@ -41,13 +41,11 @@ nl:
         current_password: Voer voor veiligheidsredenen het wachtwoord van je huidige account in
         current_username: Voer ter bevestiging de gebruikersnaam van je huidige account in
         digest: Wordt alleen na een lange periode van inactiviteit verzonden en alleen wanneer je tijdens jouw afwezigheid persoonlijke berichten hebt ontvangen
-        discoverable: Toestaan dat jouw account vindbaar is voor onbekenden, via aanbevelingen, trends en op andere manieren
         email: Je krijgt een bevestigingsmail
         header: PNG, GIF of JPG. Maximaal %{size}. Wordt teruggeschaald naar %{dimensions}px
         inbox_url: Kopieer de URL van de voorpagina van de relayserver die je wil gebruiken
         irreversible: Gefilterde berichten verdwijnen onomkeerbaar, zelfs als de filter later wordt verwijderd
         locale: De taal van de gebruikersomgeving, e-mails en pushmeldingen
-        locked: Door het goedkeuren van volgers handmatig bepalen wie jou mag volgen
         password: Gebruik tenminste 8 tekens
         phrase: Komt overeen ongeacht hoofd-/kleine letters of een inhoudswaarschuwing
         scopes: Tot welke API's heeft de toepassing toegang. Wanneer je een toestemming van het bovenste niveau kiest, hoef je geen individuele toestemmingen meer te kiezen.
@@ -57,9 +55,6 @@ nl:
         setting_display_media_default: Als gevoelig gemarkeerde media verbergen
         setting_display_media_hide_all: Media altijd verbergen
         setting_display_media_show_all: Media altijd tonen
-        setting_hide_network: Wie jij volgt en wie jou volgen wordt niet op jouw profiel getoond
-        setting_noindex: Heeft invloed op jouw openbare profiel en pagina's met berichten
-        setting_show_application: De toepassing de je gebruikt om berichten te plaatsen wordt in de gedetailleerde weergave van het bericht getoond
         setting_use_blurhash: Wazige kleurovergangen zijn gebaseerd op de kleuren van de verborgen media, waarmee elk detail verdwijnt
         setting_use_pending_items: De tijdlijn wordt bijgewerkt door op het aantal nieuwe items te klikken, in plaats van dat deze automatisch wordt bijgewerkt
         username: Je kunt letters, cijfers en underscores gebruiken
@@ -178,7 +173,6 @@ nl:
         context: Filterlocaties
         current_password: Huidig wachtwoord
         data: Gegevens
-        discoverable: Dit account laten aanbevelen en in de gebruikersgids tonen
         display_name: Weergavenaam
         email: E-mailadres
         expires_in: Vervalt na
@@ -188,7 +182,6 @@ nl:
         inbox_url: Inbox-URL van de relayserver
         irreversible: Verwijderen in plaats van verbergen
         locale: Taal van de gebruikersomgeving
-        locked: Volgverzoek vereisen
         max_uses: Max. aantal keer te gebruiken
         new_password: Nieuwe wachtwoord
         note: Bio
@@ -211,9 +204,7 @@ nl:
         setting_display_media_show_all: Alles tonen
         setting_expand_spoilers: Berichten met inhoudswaarschuwingen altijd uitklappen
         setting_hide_network: Jouw volgers en wie je volgt verbergen
-        setting_noindex: Jouw berichten niet door zoekmachines laten indexeren
         setting_reduce_motion: Beweging in animaties verminderen
-        setting_show_application: Toepassing onthullen die je voor het verzenden van berichten gebruikt
         setting_system_font_ui: Standaardlettertype van het systeem gebruiken
         setting_theme: Thema website
         setting_trends: Trends van vandaag tonen
diff --git a/config/locales/simple_form.nn.yml b/config/locales/simple_form.nn.yml
index a8e9f474bc..b44ec1e6a6 100644
--- a/config/locales/simple_form.nn.yml
+++ b/config/locales/simple_form.nn.yml
@@ -2,6 +2,10 @@
 nn:
   simple_form:
     hints:
+      account:
+        display_name: Ditt fulle namn eller ditt tøysenamn.
+        fields: Heimesida di, pronomen, alder, eller kva du måtte ynskje.
+        note: 'Du kan @nemne folk eller #emneknaggar.'
       account_alias:
         acct: Angi brukarnamn@domene til brukaren du ynskjer å flytta frå
       account_migration:
@@ -37,13 +41,11 @@ nn:
         current_password: For sikkerhetsgrunner, vennligst oppgi passordet til den nåværende bruker
         current_username: Skriv inn brukarnamnet til den noverande kontoen for å stadfesta
         digest: Kun sendt etter en lang periode med inaktivitet og bare dersom du har mottatt noen personlige meldinger mens du var borte
-        discoverable: La kontoen din bli oppdaga av ukjende gjennom anbefalingar, trendar og andre funksjonar
         email: Du får snart ein stadfestings-e-post
         header: PNG, GIF eller JPG. Maksimalt %{size}. Minkast til %{dimensions}px
         inbox_url: Kopier URLen fra forsiden til overgangen du vil bruke
         irreversible: Filtrerte tut vil verta borte for evig, sjølv om filteret vert fjerna seinare
         locale: Språket til brukargrensesnittet, e-postar og push-varsel
-        locked: Krev at du manuelt godkjenner fylgjarar
         password: Nytt minst 8 teikn
         phrase: Vil bli samsvart med, uansett bruk av store/små bokstaver eller innholdsadvarselen til en tut
         scopes: API-ane som programmet vil få tilgjenge til. Ettersom du vel eit toppnivåomfang tarv du ikkje velja einskilde API-ar.
@@ -53,9 +55,6 @@ nn:
         setting_display_media_default: Gøym media som er merka som nærtakande
         setting_display_media_hide_all: Alltid skjul alt media
         setting_display_media_show_all: Vis alltid media
-        setting_hide_network: Kven du fylgjer og kven som fylgjer deg vert ikkje vist på profilen din
-        setting_noindex: Påverkar den offentlege profilen og statussidene dine
-        setting_show_application: Programmet du brukar for å tuta blir vist i den detaljerte visninga av tuta dine
         setting_use_blurhash: Overgangar er basert på fargane til skjulte grafikkelement, men gjer detaljar utydelege
         setting_use_pending_items: Gøym tidslineoppdateringar bak eit klikk, i staden for å rulla ned automatisk
         username: Du kan bruka bokstavar, tal og understrekar
@@ -130,6 +129,7 @@ nn:
         position: Høgare rolle avgjer konfliktløysing i visse situasjonar. Visse handlingar kan kun utførast på rollar med lågare prioritet
       webhook:
         events: Vel hendingar å senda
+        template: Skriv di eiga JSON nyttelast ved å bruka variabel interpolering. La stå tom for standard JSON.
         url: Kvar hendingar skal sendast
     labels:
       account:
@@ -173,7 +173,6 @@ nn:
         context: Filtrer kontekstar
         current_password: Noverande passord
         data: Data
-        discoverable: Før denne kontoen opp i mappa
         display_name: Synleg namn
         email: E-post-adresse
         expires_in: Vert ugyldig etter
@@ -183,7 +182,6 @@ nn:
         inbox_url: URL-addressen til overgangsinnboksen
         irreversible: Forkast i staden for å gøyma
         locale: Språk
-        locked: Lås konto
         max_uses: Grense på brukartal
         new_password: Nytt passord
         note: Om meg
@@ -206,9 +204,7 @@ nn:
         setting_display_media_show_all: Vis alle
         setting_expand_spoilers: Vid alltid ut tut som er merka med innhaldsåtvaringar
         setting_hide_network: Gøym nettverket ditt
-        setting_noindex: Vel bort søkjemotorregistrering
         setting_reduce_motion: Minsk rørsle i animasjonar
-        setting_show_application: Avdekk programmet bruka for å senda tut
         setting_system_font_ui: Bruk standardskrifttypen på systemet
         setting_theme: Sidetema
         setting_trends: Vis kva som er populært i dag
@@ -294,6 +290,7 @@ nn:
         usable: Gje tut lov til å nytta denne emneknaggen
       user:
         role: Rolle
+        time_zone: Tidssone
       user_role:
         color: Emblemfarge
         highlighted: Vis rolle som emblem på brukarprofil
@@ -302,6 +299,7 @@ nn:
         position: Prioritet
       webhook:
         events: Aktiverte hendingar
+        template: Nyttelastmal
         url: Endepunkts-URL
     'no': Nei
     not_recommended: Ikkje anbefalt
diff --git a/config/locales/simple_form.no.yml b/config/locales/simple_form.no.yml
index 6889638fa5..60eff4c8c4 100644
--- a/config/locales/simple_form.no.yml
+++ b/config/locales/simple_form.no.yml
@@ -2,6 +2,10 @@
 'no':
   simple_form:
     hints:
+      account:
+        display_name: Ditt fulle navn eller ditt morsomme navn.
+        fields: Din hjemmeside, uttalelse, alder, eller alt annet du vil.
+        note: 'Du kan @nevne andre eller #emneknagger.'
       account_alias:
         acct: Spesifiser brukernavn@domene til brukeren du vil flytte fra
       account_migration:
@@ -18,6 +22,8 @@
           disable: Forhindre brukeren fra å bruke kontoen sin, men ikke slett eller skjul innholdet deres.
           none: Bruk dette for å sende en advarsel til brukeren uten å utløse noen andre handlinger.
           sensitive: Tving alle denne brukerens medievedlegg til å bli merket som følsomme.
+          silence: Forhindre at brukeren kan legge ut innlegg med offentlig synlighet, skjule innleggene og varslene sine fra folk som ikke følger dem. Lukker alle rapporter mot denne kontoen.
+          suspend: Forhindre interaksjon fra eller til denne kontoen og slett innholdet. Tilbakestiller innholdet innen 30 dager. Lukk alle rapporter mot denne kontoen.
         warning_preset_id: Valgfritt. Du kan fortsatt legge til tilpasset tekst til slutten av forhåndsinnstillingen
       announcement:
         all_day: Hvis noen av dem er valgt, vil kun datoene av tidsrammen bli vist
@@ -35,13 +41,11 @@
         current_password: For sikkerhetsgrunner, vennligst oppgi passordet til den nåværende bruker
         current_username: For å bekrefte, vennligst skriv inn brukernavnet til den nåværende kontoen
         digest: Kun sendt etter en lang periode med inaktivitet og bare dersom du har mottatt noen personlige meldinger mens du var borte
-        discoverable: La kontoen din bli oppdaget av ukjente gjennom anbefalinger, trender og andre funksjoner
         email: Du vil bli tilsendt en bekreftelses-E-post
         header: PNG, GIF eller JPG. Maksimalt %{size}. Vil bli nedskalert til %{dimensions}px
         inbox_url: Kopier URLen fra forsiden til overgangen du vil bruke
         irreversible: Filtrerte innlegg vil ugjenkallelig forsvinne, selv om filteret senere blir fjernet
         locale: Språket til brukergrensesnittet, e-mailer og push-varsler
-        locked: Krever at du manuelt godkjenner følgere
         password: Bruk minst 8 tegn
         phrase: Vil bli samsvart med, uansett bruk av store/små bokstaver eller innholdsvarselet til et innlegg
         scopes: Hvilke API-er programmet vil bli gitt tilgang til. Dersom du velger et toppnivåomfang, trenger du ikke å velge individuelle API-er.
@@ -51,11 +55,9 @@
         setting_display_media_default: Skjul media som er merket som følsomt
         setting_display_media_hide_all: Skjul alltid all media
         setting_display_media_show_all: Alltid vis media som er merket som sensitivt
-        setting_hide_network: De som du følger, og de som følger deg, vil ikke bli vist på profilen din
-        setting_noindex: Påvirker din offentlige profil og statussider
-        setting_show_application: Appen du bruker til å publisere innlegg vil bli vist i den detaljerte visningen til innleggene dine
         setting_use_blurhash: Gradientene er basert på fargene til de skjulte visualitetene, men gjør alle detaljer uklare
         setting_use_pending_items: Skjul tidslinjeoppdateringer bak et klikk, i stedet for å automatisk la strømmen skrolle
+        username: Du kan bruke bokstaver, tall og understrekingstegn
         whole_word: Når søkeordet eller setningen bare er alfanumerisk, aktiveres det bare hvis det samsvarer med hele ordet
       domain_allow:
         domain: Dette domenet vil være i stand til å hente data fra denne serveren og dets innkommende data vil bli prosessert og lagret
@@ -70,6 +72,7 @@
           hide: Skjul filtrert innhold fullstendig, som om det ikke eksisterte
           warn: Skjul det filtrerte innholdet bak et varsel som omtaler filterets tittel
       form_admin_settings:
+        activity_api_enabled: Teller med lokale publiserte innlegg, aktive brukere og nye registreringer i ukentlige bøtter
         backups_retention_period: Behold genererte brukerarkiv i det angitte antall dager.
         bootstrap_timeline_accounts: Disse kontoene vil bli festet til toppen av nye brukeres følge-anbefalinger.
         closed_registrations_message: Vises når det er stengt for registrering
@@ -77,6 +80,7 @@
         custom_css: Du kan bruke egendefinerte stiler på nettversjonen av Mastodon.
         mascot: Overstyrer illustrasjonen i det avanserte webgrensesnittet.
         media_cache_retention_period: Mediafiler som lastes ned vil bli slettet etter det angitte antall dager når det settes til en positiv verdi, og blir lastet ned på nytt ved behov.
+        peers_api_enabled: En liste over domenenavn denne serveren har oppstått i fødiverset. Det finnes ikke data om du føderer med en gitt server, for akkurat det serveren din vet om. Dette brukes av tjenester som i all hovedsak innhenter føderasjonsstatistikk.
         profile_directory: Profilkatalogen viser alle brukere som har valgt å kunne bli oppdaget.
         require_invite_text: Når registreringer krever manuell godkjenning, må du gjøre «Hvorfor vil du bli med?»-tekstinput obligatorisk i stedet for valgfritt
         site_contact_email: Hvordan mennesker får tak i deg for rettslige spørsmål eller brukerstøtte.
@@ -87,6 +91,11 @@
         site_title: Hva man kan kalle tjeneren din utover domenenavnet.
         status_page_url: URL-adressen til en side hvor folk kan se tilstanden til denne tjeneren under et avbrudd
         theme: Tema som vises for nye brukere og besøkende som ikke er logget inn.
+        thumbnail: Et omtrent 2:1 bilde vist sammen med serverinformasjonen din.
+        timeline_preview: Logget ut besøkende vil kunne bla gjennom de siste offentlige innlegg tilgjengelig på serveren.
+        trendable_by_default: Hopp over manuell gjennomgang av populære innhold. Individuelle elementer kan fjernes fra populært etter faktaen.
+        trends: Trender viser hvilke innlegg, emneknagger og nyheter som får trekkraft på serveren din.
+        trends_as_landing_page: Vis populære innhold til innloggede brukere og besøkende i stedet for en beskrivelse av tjeneren. Krever populært for å bli aktivert.
       form_challenge:
         current_password: Du går inn i et sikkert område
       imports:
@@ -106,10 +115,12 @@
         text: Beskriv en regel eller krav til brukere på denne serveren. Prøv å holde den kort og enkelt
       sessions:
         otp: Angi tofaktorkoden fra din telefon eller bruk en av dine gjenopprettingskoder.
+        webauthn: Hvis det er en USB-nøkkel må du sette den inn og om nødvendig trykke på den.
       tag:
         name: Du kan bare forandre bruken av store/små bokstaver, f.eks. for å gjøre det mer lesbart
       user:
         chosen_languages: Hvis noen av dem er valgt, vil kun innlegg i de valgte språkene bli vist i de offentlige tidslinjene
+        role: Rollekontroller som bestemmer rettigheter brukeren har
       user_role:
         color: Farge som skal brukes for rollen gjennom hele UI, som RGB i hex-format
         highlighted: Dette gjør rollen offentlig synlig
@@ -118,6 +129,7 @@
         position: Høyere rolle bestemmer konfliktløsning i visse situasjoner. Enkelte tiltak kan bare utføres på roller med lavere prioritet
       webhook:
         events: Velg hendelser som skal sendes
+        template: Skriv din egen JSON nyttelast ved å bruke variabel interpolering. La stå tom for standard JSON.
         url: Hvor hendelser vil bli sendt til
     labels:
       account:
@@ -161,7 +173,6 @@
         context: Filtersammenhenger
         current_password: Nåværende passord
         data: Data
-        discoverable: Før opp denne kontoen i mappen
         display_name: Visningsnavn
         email: E-postadresse
         expires_in: Utløper etter
@@ -171,7 +182,6 @@
         inbox_url: URL til overgangsinnboksen
         irreversible: Forkast i stedet for å skjule
         locale: Språk
-        locked: Lås konto
         max_uses: Maksimalt antall bruk
         new_password: Nytt passord
         note: Om meg
@@ -194,9 +204,7 @@
         setting_display_media_show_all: Vis alle
         setting_expand_spoilers: Utvid alltid innlegg som er merket med innholdsvarsler
         setting_hide_network: Skjul nettverket ditt
-        setting_noindex: Avmeld fra søkemotorindeksering
         setting_reduce_motion: Reduser bevegelser i animasjoner
-        setting_show_application: Vis hvilken app som ble brukt til å sende innlegg
         setting_system_font_ui: Bruk systemets standardfont
         setting_theme: Sidens tema
         setting_trends: Vis dagens trender
@@ -219,12 +227,15 @@
           hide: Skjul fullstendig
           warn: Skjul med en advarsel
       form_admin_settings:
+        activity_api_enabled: Publiser samlet statistikk om brukeraktivitet i API
         backups_retention_period: Brukers oppbevaringsperiode for arkiv
         bootstrap_timeline_accounts: Anbefaler alltid disse kontoene til nye brukere
         closed_registrations_message: Egendefinert melding når registrering ikke er tilgjengelig
         content_cache_retention_period: Oppbevaringsperiode for innholdsbuffer
         custom_css: Egendefinert CSS
+        mascot: Egendefinert maskot (legacy)
         media_cache_retention_period: Oppbevaringsperiode for mediebuffer
+        peers_api_enabled: Publiser liste over oppdagede instanser i API
         profile_directory: Aktiver profilkatalog
         registrations_mode: Hvem kan opprette konto
         require_invite_text: Krev en grunn for å bli med
@@ -236,10 +247,13 @@
         site_short_description: Beskrivelse av server
         site_terms: Retningslinjer for personvern
         site_title: Servernavn
+        status_page_url: Status side lenke
         theme: Standard tema
         thumbnail: Miniatyrbilde til server
+        timeline_preview: Tillat uautentisert tilgang til offentlige tidslinjer
         trendable_by_default: Tillat trender uten foregående vurdering
         trends: Aktiver trender
+        trends_as_landing_page: Bruk trender som landingsside
       interactions:
         must_be_follower: Blokker varslinger fra ikke-følgere
         must_be_following: Blokker varslinger fra personer du ikke følger
@@ -276,6 +290,7 @@
         usable: Tillat innlegg å bruke denne emneknaggen
       user:
         role: Rolle
+        time_zone: Tidssone
       user_role:
         color: Merkefarge
         highlighted: Vis rolle som merke på brukerprofiler
@@ -284,6 +299,8 @@
         position: Prioritet
       webhook:
         events: Aktiverte hendelser
+        template: Nyttelast mal
+        url: Endepunkt lenke
     'no': Nei
     not_recommended: Ikke anbefalt
     recommended: Anbefalt
diff --git a/config/locales/simple_form.oc.yml b/config/locales/simple_form.oc.yml
index 32ecbf34cf..7159eed322 100644
--- a/config/locales/simple_form.oc.yml
+++ b/config/locales/simple_form.oc.yml
@@ -36,7 +36,6 @@ oc:
         inbox_url: Copiatz l’URL de la pagina màger del relai que volètz utilizar
         irreversible: Los tuts filtrats desapareisseràn irreversiblament, encara que lo filtre siá suprimit mai tard
         locale: La lenga de l’interfàcia d’utilizacion, los messatges e las notificacions
-        locked: Demanda qu’acceptetz manualament lo mond que vos sègon e botarà la visibilitat de vòstras publicacions coma accessiblas a vòstres seguidors solament
         password: Utilizatz almens 8 caractèrs
         phrase: Serà pres en compte que siá en majuscula o minuscula o dins un avertiment de contengut sensible
         scopes: A quinas APIs poiràn accedir las aplicacions. Se seleccionatz un encastre de naut nivèl, fa pas mestièr de seleccionar los nivèls mai basses.
@@ -46,9 +45,6 @@ oc:
         setting_display_media_default: Rescondre los mèdias marcats coma sensibles
         setting_display_media_hide_all: Totjorn rescondre los mèdias
         setting_display_media_show_all: Totjorn mostrar los mèdias marcats coma sensibles
-        setting_hide_network: Vòstre perfil mostrarà pas los que vos sègon e lo mond que seguètz
-        setting_noindex: Aquò es destinat a vòstre perfil public e vòstra pagina d’estatuts
-        setting_show_application: Lo nom de l’aplicacion qu’utilizatz per publicar serà mostrat dins la vista detalhada de vòstres tuts
         setting_use_blurhash: Los degradats venon de las colors de l’imatge rescondut en enfoscar los detalhs
         setting_use_pending_items: Rescondre las actualizacions del flux d’actualitat aprèp un clic allòc de desfilar lo flux automaticament
         whole_word: Quand lo mot-clau o frasa es solament alfranumeric, serà pas qu’aplicat se correspond al mot complèt
@@ -117,7 +113,6 @@ oc:
         context: Contèxte del filtre
         current_password: Senhal actual
         data: Donadas
-        discoverable: Far aparéisser aqueste compte a l’annuari
         display_name: Escais
         email: Corrièl
         expires_in: Expira aprèp
@@ -127,7 +122,6 @@ oc:
         inbox_url: URL de la bóstia de recepcion del relai
         irreversible: Suprimir allòc de rescondre
         locale: Lenga de l’interfàcia
-        locked: Far venir lo compte privat
         max_uses: Limit d’utilizacions
         new_password: Nòu senhal
         note: Biografia
@@ -150,9 +144,7 @@ oc:
         setting_display_media_show_all: O mostrar tot
         setting_expand_spoilers: Totjorn desplegar los tuts marcats amb un avertiment de contengut
         setting_hide_network: Amagar vòstre malhum
-        setting_noindex: Èsser pas indexat pels motors de recèrca
         setting_reduce_motion: Reduire la velocitat de las animacions
-        setting_show_application: Revelar lo nom de l’aplicacion utilizada per enviar de tuts
         setting_system_font_ui: Utilizar la polissa del sistèma
         setting_theme: Tèma del site
         setting_trends: Veire las tendéncias d’uèi
diff --git a/config/locales/simple_form.pl.yml b/config/locales/simple_form.pl.yml
index fa0f50d840..04f6f08e6f 100644
--- a/config/locales/simple_form.pl.yml
+++ b/config/locales/simple_form.pl.yml
@@ -41,13 +41,11 @@ pl:
         current_password: Ze względów bezpieczeństwa wprowadź hasło obecnego konta
         current_username: Aby potwierdzić, wprowadź nazwę użytkownika obecnego konta
         digest: Wysyłane tylko po długiej nieaktywności, jeżeli w tym czasie otrzymaleś jakąś wiadomość bezpośrednią
-        discoverable: Pozwala na odkrywanie twojego konta przez nieznajomych poprzez rekomendacje, popularne wpisy i inne funkcje
         email: Otrzymasz e-mail potwierdzający
         header: PNG, GIF lub JPG. Maksymalnie %{size}. Zostanie zmniejszony do %{dimensions}px
         inbox_url: Skopiuj adres ze strony głównej przekaźnika, którego chcesz użyć
         irreversible: Filtrowane wpisy znikną bezpowrotnie, nawet gdy filtr zostanie usunięty
         locale: Język interfejsu, wiadomości e-mail i powiadomieniach push
-        locked: Musisz akceptować prośby o możliwość obserwacji
         password: Użyj co najmniej 8 znaków
         phrase: Zostanie wykryte nawet, gdy znajduje się za ostrzeżeniem o zawartości
         scopes: Wybór API, do których aplikacja będzie miała dostęp. Jeżeli wybierzesz nadrzędny zakres, nie musisz wybierać jego elementów.
@@ -57,9 +55,6 @@ pl:
         setting_display_media_default: Ukrywaj zawartość multimedialną oznaczoną jako wrażliwa
         setting_display_media_hide_all: Zawsze ukrywaj zawartość multimedialną
         setting_display_media_show_all: Zawsze pokazuj zawartość multimedialną
-        setting_hide_network: Informacje o tym, kto Cię obserwuje i kogo obserwujesz nie będą widoczne
-        setting_noindex: Wpływa na widoczność strony profilu i Twoich wpisów
-        setting_show_application: W informacjach o wpisie będzie widoczna informacja o aplikacji, z której został wysłany
         setting_use_blurhash: Gradienty są oparte na kolorach ukrywanej zawartości, ale uniewidaczniają wszystkie szczegóły
         setting_use_pending_items: Ukryj aktualizacje osi czasu za kliknięciem, zamiast automatycznego przewijania strumienia
         username: Możesz używać liter, cyfr i podkreślników
@@ -178,7 +173,6 @@ pl:
         context: Filtruj zawartość
         current_password: Obecne hasło
         data: Dane
-        discoverable: Wyświetlaj ten profil w katalogu
         display_name: Widoczna nazwa
         email: Adres e-mail
         expires_in: Wygaśnie po
@@ -188,7 +182,6 @@ pl:
         inbox_url: Adres skrzynki przekaźnika
         irreversible: Usuwaj zamiast ukrywać
         locale: Język interfejsu
-        locked: Ustaw konto jako prywatne
         max_uses: Maksymalna liczba użyć
         new_password: Nowe hasło
         note: Biogram
@@ -211,9 +204,7 @@ pl:
         setting_display_media_show_all: Pokaż wszystko
         setting_expand_spoilers: Zawsze rozwijaj wpisy oznaczone ostrzeżeniem o zawartości
         setting_hide_network: Ukryj swoją sieć
-        setting_noindex: Nie indeksuj mojego profilu w wyszukiwarkach internetowych
         setting_reduce_motion: Ogranicz ruch w animacjach
-        setting_show_application: Informuj o aplikacji z której wysłano wpisy
         setting_system_font_ui: Używaj domyślnej czcionki systemu
         setting_theme: Motyw strony
         setting_trends: Pokazuj dzisiejsze „Na czasie”
diff --git a/config/locales/simple_form.pt-BR.yml b/config/locales/simple_form.pt-BR.yml
index 46cf516032..e770ba0a1c 100644
--- a/config/locales/simple_form.pt-BR.yml
+++ b/config/locales/simple_form.pt-BR.yml
@@ -41,13 +41,11 @@ pt-BR:
         current_password: Para fins de segurança, digite a senha da conta atual
         current_username: Para confirmar, digite o nome de usuário da conta atual
         digest: Enviado apenas após um longo período de inatividade com um resumo das menções recebidas durante ausência
-        discoverable: Permita que a sua conta seja descoberta por estranhos através de recomendações, tendências e outros recursos
         email: Você receberá um e-mail de confirmação
         header: PNG, GIF ou JPG de até %{size}. Serão redimensionados para %{dimensions}px
         inbox_url: Copie o link da página inicial do repetidor que você deseja usar
         irreversible: As publicações filtradas desaparecerão irreversivelmente, mesmo se o filtro for removido depois
         locale: O idioma da interface do usuário, e-mails e notificações
-        locked: Requer aprovação manual de seguidores
         password: Use pelo menos 8 caracteres
         phrase: Corresponderá independente de maiúsculas ou minúsculas, no texto ou no Aviso de Conteúdo de um toot
         scopes: Quais APIs o aplicativo vai ter permissão de acessar. Se você selecionar uma autorização de alto nível, você não precisa selecionar individualmente os outros.
@@ -57,9 +55,6 @@ pt-BR:
         setting_display_media_default: Sempre ocultar mídia sensível
         setting_display_media_hide_all: Sempre ocultar todas as mídias
         setting_display_media_show_all: Sempre mostrar mídia sensível
-        setting_hide_network: Quem você segue e seus seguidores não serão mostrados no seu perfil
-        setting_noindex: Afeta seu perfil público e as páginas das suas publicações
-        setting_show_application: O aplicativo que você usar para publicar será exibido na visão detalhada das suas publicações
         setting_use_blurhash: O blur é baseado nas cores da imagem oculta, ofusca a maioria dos detalhes
         setting_use_pending_items: Ocultar atualizações da linha do tempo atrás de um clique ao invés de rolar automaticamente
         username: Você pode usar letras, números e underlines
@@ -178,7 +173,6 @@ pt-BR:
         context: Contextos do filtro
         current_password: Senha atual
         data: Dados
-        discoverable: Mostrar conta no diretório de perfis
         display_name: Nome de exibição
         email: E-mail
         expires_in: Expira em
@@ -188,7 +182,6 @@ pt-BR:
         inbox_url: Link da caixa de entrada do repetidor
         irreversible: Ignorar ao invés de ocultar
         locale: Idioma da interface
-        locked: Trancar perfil
         max_uses: Limite de uso
         new_password: Nova senha
         note: Biografia
@@ -211,9 +204,7 @@ pt-BR:
         setting_display_media_show_all: Mostrar tudo
         setting_expand_spoilers: Sempre expandir toots com Aviso de Conteúdo
         setting_hide_network: Ocultar suas relações
-        setting_noindex: Não quero ser indexado por mecanismos de pesquisa
         setting_reduce_motion: Reduzir animações
-        setting_show_application: Mostrar o aplicativo usado para enviar as publicações
         setting_system_font_ui: Usar fonte padrão do sistema
         setting_theme: Tema do site
         setting_trends: Mostrar em alta hoje
diff --git a/config/locales/simple_form.pt-PT.yml b/config/locales/simple_form.pt-PT.yml
index 951a3850bf..fe364a9e56 100644
--- a/config/locales/simple_form.pt-PT.yml
+++ b/config/locales/simple_form.pt-PT.yml
@@ -41,13 +41,11 @@ pt-PT:
         current_password: Para fins de segurança, queira inserir a palavra-passe da conta atual
         current_username: Para confirmar, queira inserir o nome de utilizador da conta atual
         digest: Enviado após um longo período de inatividade e apenas se foste mencionado na tua ausência
-        discoverable: Permitir que a sua conta seja descoberta por outros através de recomendações, destaques e outras funções
         email: Será enviado um e-mail de confirmação
         header: PNG, GIF ou JPG. Ficheiros no máximo de %{size}. Serão reduzidos para %{dimensions}px
         inbox_url: Copie o URL da página inicial do repetidor que quer usar
         irreversible: Publicações filtradas irão desaparecer irremediavelmente, mesmo que o filtro seja removido posteriormente
         locale: A língua da interface de utilizador, e-mails e notificações push
-        locked: Requer aprovação manual de seguidores
         password: Use pelo menos 8 caracteres
         phrase: Será correspondido independentemente da capitalização ou do aviso de conteúdo duma publicação
         scopes: Quais as API a que será concedido acesso. Se escolher uma abrangência de nível superior, não precisará de as seleccionar individualmente.
@@ -57,9 +55,6 @@ pt-PT:
         setting_display_media_default: Esconder media marcada como problemática
         setting_display_media_hide_all: Esconder sempre toda a media
         setting_display_media_show_all: Mostrar sempre a media
-        setting_hide_network: Quem tu segues e quem te segue não será mostrado no teu perfil
-        setting_noindex: Afecta o teu perfil público e as páginas das tuas publicações
-        setting_show_application: A aplicação que usa para publicar será mostrada na vista pormenorizada das suas publicações
         setting_use_blurhash: Os gradientes são baseados nas cores das imagens escondidas, mas ofuscam quaisquer pormenores
         setting_use_pending_items: Ocultar atualizações da cronologia por detrás dum clique, em vez de rolar automaticamente o fluxo
         username: Pode utilizar letras, números e sublinhados
@@ -178,7 +173,6 @@ pt-PT:
         context: Filtrar contextos
         current_password: Palavra-passe actual
         data: Dados
-        discoverable: Sugerir esta conta a outros
         display_name: Nome a apresentar
         email: Endereço de correio electrónico
         expires_in: Expira em
@@ -188,7 +182,6 @@ pt-PT:
         inbox_url: URL da caixa de entrada do repetidor
         irreversible: Expandir em vez de esconder
         locale: Língua da interface
-        locked: Exigir pedidos de seguimento
         max_uses: Número máximo de utilizações
         new_password: Nova palavra-passe
         note: Biografia
@@ -211,9 +204,7 @@ pt-PT:
         setting_display_media_show_all: Mostrar todos
         setting_expand_spoilers: Expandir sempre as publicações marcadas com avisos de conteúdo
         setting_hide_network: Esconder a tua rede
-        setting_noindex: Não quero ser indexado por motores de pesquisa
         setting_reduce_motion: Reduz movimento em animações
-        setting_show_application: Revelar sempre qual a aplicação usada para enviar as publicações
         setting_system_font_ui: Usar o tipo de letra padrão do sistema
         setting_theme: Tema do sítio
         setting_trends: Mostrar o que está hoje em alta
diff --git a/config/locales/simple_form.ro.yml b/config/locales/simple_form.ro.yml
index d894cc0cea..cade572f38 100644
--- a/config/locales/simple_form.ro.yml
+++ b/config/locales/simple_form.ro.yml
@@ -34,7 +34,6 @@ ro:
         inbox_url: Copiază adresa URL de pe prima pagină a reului pe care vrei să îl utilizezi
         irreversible: Postările sortate vor dispărea ireversibil, chiar dacă filtrul este ulterior șters
         locale: Limba interfaței de utilizator, e-mailurile si notificările push
-        locked: Necesită aprobare manuală a urmăritorilor
         password: Utilizează cel puțin 8 caractere
         phrase: Vor fi potrivite indiferent de textul din casetă sau advertismentul unei postări
         scopes: La care API-uri aplicația are nevoie de acces. Dacă selectezi un scop principal nu mai e nevoie să selectezi fiecare sub-scop al acestuia.
@@ -43,9 +42,6 @@ ro:
         setting_display_media_default: Ascunde conținutul media marcat ca sensibil (NSFW)
         setting_display_media_hide_all: Întotdeauna ascunde tot conținutul media
         setting_display_media_show_all: Întotdeauna afișează conținutul media marcat ca sensibil
-        setting_hide_network: Pe cine urmărești și cine te urmărește nu vor fi afișați pe profilul tău
-        setting_noindex: Afecteazâ profilul tău public și statusurile tale
-        setting_show_application: Aplicația pe care o utilizați pentru a posta va fi afișată în vizualizarea detaliată a postărilor
         setting_use_blurhash: Gradienții sunt bazați pe culorile vizualelor ascunse, dar ofuscă orice detalii
         setting_use_pending_items: Ascunde actualizările cronologice din spatele unui click în loc de a derula automat fluxul
         whole_word: Când fraza sau cuvântul este doar alfanumeric, acesta se aplică doar dacă există o potrivire completă
@@ -104,7 +100,6 @@ ro:
         context: Contextele filtrului
         current_password: Parola actuală
         data: Date
-        discoverable: Listează acest cont in director
         display_name: Numele afișat
         email: Adresa de e-mail
         expires_in: Expiră după
@@ -113,7 +108,6 @@ ro:
         inbox_url: Adresa URL a inbox-ului
         irreversible: Lasă înloc să ascunzi
         locale: Limbă
-        locked: Cont Privat
         max_uses: Numărul maxim de utilizatori
         new_password: Parola nouă
         note: Descriere
@@ -134,9 +128,7 @@ ro:
         setting_display_media_show_all: Arată toate
         setting_expand_spoilers: Întotdeauna extinde postările marcate cu avertismente referitoare la conținut
         setting_hide_network: Ascunde rețeaua
-        setting_noindex: Nu permite motoarelor de căutare să indexeze rețeaua ta
         setting_reduce_motion: Redu mișcarea în animații
-        setting_show_application: Dezvăluie aplicația folosită pentru a trimite postări
         setting_system_font_ui: Utilizează fontul standard as sistemului
         setting_theme: Tema siteului
         setting_trends: Arată tendințele de astăzi
diff --git a/config/locales/simple_form.ru.yml b/config/locales/simple_form.ru.yml
index 6451a9c93a..4a4e18507d 100644
--- a/config/locales/simple_form.ru.yml
+++ b/config/locales/simple_form.ru.yml
@@ -41,13 +41,11 @@ ru:
         current_password: В целях безопасности введите пароль текущей учётной записи
         current_username: Для подтверждения, пожалуйста, введите имя пользователя текущей учётной записи
         digest: Если вы долго не заглядывали, отправим вам дайджест событий, которые происходили в период вашего отсутствия.
-        discoverable: Разрешить другим людям находить ваш профиль через рекомендации, тренды и другие функции.
         email: Вам будет отправлено электронное письмо с подтверждением.
         header: Поддерживается PNG, GIF и JPG. Максимальный размер — %{size}. Будет уменьшена до %{dimensions}px.
         inbox_url: Копировать URL с главной страницы ретранслятора, который вы хотите использовать
         irreversible: Отфильтрованные посты будут утеряны навсегда, даже если в будущем фильтр будет убран
         locale: Язык интерфейса, e-mail писем и push-уведомлений
-        locked: Вручную контролируйте, кто может подписываться на вас, утверждая запросы на подписку
         password: Укажите не менее 8 символов.
         phrase: Будет сопоставлено независимо от присутствия в тексте или предупреждения о содержании поста
         scopes: Какие API приложению будет позволено использовать. Если вы выберете самый верхний, нижестоящие будут выбраны автоматически.
@@ -57,9 +55,6 @@ ru:
         setting_display_media_default: Скрывать файлы «деликатного характера»
         setting_display_media_hide_all: Всегда скрывать любые медиафайлы
         setting_display_media_show_all: Всегда показывать любые медиафайлы
-        setting_hide_network: Другие не смогут видеть ни ваши подписки, ни ваших подписчиков.
-        setting_noindex: Ваш публичный профиль и публикации будут скрыты от поисковых систем.
-        setting_show_application: При просмотре поста будет видно из какого приложения он отправлен.
         setting_use_blurhash: Градиенты основаны на цветах скрытых медиа, но скрывают любые детали.
         setting_use_pending_items: Показывать обновления в ленте только после клика вместо автоматической прокрутки.
         username: Вы можете использовать буквы, цифры и знаки подчеркивания
@@ -178,7 +173,6 @@ ru:
         context: Контекст фильтра
         current_password: Текущий пароль
         data: Данные
-        discoverable: Рекомендовать учётную запись другим пользователям
         display_name: Отображаемое имя
         email: Адрес e-mail
         expires_in: Истекает через
@@ -188,7 +182,6 @@ ru:
         inbox_url: URL для входящих от ретрансляторов
         irreversible: Удалять, а не скрывать
         locale: Язык интерфейса
-        locked: Сделать учётную запись закрытой
         max_uses: Максимальное кол-во использований
         new_password: Новый пароль
         note: О себе
@@ -211,9 +204,7 @@ ru:
         setting_display_media_show_all: Показывать все
         setting_expand_spoilers: Всегда раскрывать посты, имеющие предупреждение о содержании
         setting_hide_network: Скрыть свои связи
-        setting_noindex: Отказаться от индексации в поисковых машинах
         setting_reduce_motion: Уменьшить движение в анимации
-        setting_show_application: Указывать приложение, с которого отправлен пост
         setting_system_font_ui: Использовать шрифт системы по умолчанию
         setting_theme: Тема сайта
         setting_trends: Показывать сегодняшние тренды
diff --git a/config/locales/simple_form.sc.yml b/config/locales/simple_form.sc.yml
index 09a55eed5b..2c47259961 100644
--- a/config/locales/simple_form.sc.yml
+++ b/config/locales/simple_form.sc.yml
@@ -38,7 +38,6 @@ sc:
         inbox_url: Còpia s'URL dae sa pàgina printzipale de su ripetidore chi boles impreare
         irreversible: Is tuts filtrados ant a isparèssere in manera irreversìbile, fintzas si prus a tardu s'at a bogare su filtru
         locale: S'idioma de s'interfache de s'utente, de is messàgios de posta eletrònica e de is notìficas push
-        locked: Gesti a manu chie ti podet sighire aprovende a manu is sighiduras
         password: Imprea a su mancu 8 caràteres
         phrase: At a cuncordare sena cunsiderare is minùsculas e is majùsculas o is avisos de cuntenutu
         scopes: A ite API s'aplicatzione at a pòdere atzèdere. Si seletzionas un'àmbitu de su livellu prus artu, non serbit a nde seletzionare de sìngulos.
@@ -47,9 +46,6 @@ sc:
         setting_display_media_default: Cua elementos multimediales marcados comente sensìbiles
         setting_display_media_hide_all: Cua semper is elementos multimediales
         setting_display_media_show_all: Ammustra semper is elementos multimediales
-        setting_hide_network: Sa gente chi sighis o chi ti sighit no at a èssere ammustrada in su profilu tuo
-        setting_noindex: Tenet efetu in su profilu pùblicu tuo e in is pàginas de is istados
-        setting_show_application: S'aplicatzione chi impreas pro publicare tuts at a èssere ammustrada in sa visualizatzione de detàlliu de is tuts
         setting_use_blurhash: Is gradientes sunt basados in subra de is colores de is immàgines cuadas ma imbelant totu is detàllios
         setting_use_pending_items: Cua is atualizatziones in segus de un'incarcu imbetzes de iscùrrere in automàticu su flussu de publicatziones
         whole_word: Cando sa crae (faeddu o fràsia) siat isceti alfanumèrica, s'at a aplicare isceti si currispondet a su faeddu intreu
@@ -120,7 +116,6 @@ sc:
         context: Filtra cuntestos
         current_password: Crae atuale
         data: Data
-        discoverable: Cussìgia custu contu a àtere
         display_name: Nòmine visìbile
         email: Indiritzu de posta eletrònica
         expires_in: Iscadit a pustis de
@@ -130,7 +125,6 @@ sc:
         inbox_url: URL de sa cartella de intrada de su ripetidore
         irreversible: Cantzella imbetzes de cuare
         locale: Idioma de s'interfache
-        locked: Rechede rechestas de sighidura
         max_uses: Nùmeru màssimu de impreos
         new_password: Crae noa
         note: Biografia
@@ -152,9 +146,7 @@ sc:
         setting_display_media_show_all: Ammustra totu
         setting_expand_spoilers: Ismànnia semper is tuts marcados cun avisos de cuntenutu
         setting_hide_network: Cua sa retza tua
-        setting_noindex: Pedi de non ti fàghere inditzizare dae is motores de chirca
         setting_reduce_motion: Mìnima su movimentu in is animatziones
-        setting_show_application: Rivela s'aplicatzione impreada pro imbiare tuts
         setting_system_font_ui: Imprea sa tipografia predefinida de su sistema
         setting_theme: Tema de su situ
         setting_trends: Ammustra is tendèntzias de oe
diff --git a/config/locales/simple_form.sco.yml b/config/locales/simple_form.sco.yml
index eb8128cd4a..85fa66ddc9 100644
--- a/config/locales/simple_form.sco.yml
+++ b/config/locales/simple_form.sco.yml
@@ -35,13 +35,11 @@ sco:
         current_password: Fir security purposes please pit in the passwird o the current accoont
         current_username: Fir tae confirm, please pit in the uisernemm o the current accoont
         digest: Ainly sent efter a lang whilie o inactivity an ainly if ye'v gotten onie personal messages whilst ye wis awa
-        discoverable: Alloo yer accoont fir tae get discovert bi strangers throu recommendations, trends an ither features
         email: Ye'll be sent a confirmation email
         header: PNG, GIF or JPG. At maist %{size}. Wull get doonscaled tae %{dimensions}px
         inbox_url: Copy the URL fae the frontpage o the relay thit ye'r wantin tae uise
         irreversible: Filtert posts wull dizappear irreversibly, even if filter is taen aff efter
         locale: The leid o the uiser interface, emails an push notes
-        locked: Control bi haun wha kin follae ye bi approvin follae requests
         password: Uise at least 8 chairecters
         phrase: Wull get matched regairdless o case in text or content warnin o a post
         scopes: Whit APIs the application wull be allooed tae access. Gin ye dinnae pick a tap-level scope, ye dinnae need tae pick anes ane at a time.
@@ -51,9 +49,6 @@ sco:
         setting_display_media_default: Hide media mairked sensitive
         setting_display_media_hide_all: Aye hide media
         setting_display_media_show_all: Aye shaw media
-        setting_hide_network: Wha ye follae an thaim thit follaes ye wull get hid on yer profile
-        setting_noindex: Affects yer public profile an post pages
-        setting_show_application: The application thit ye uise fir tae post wull be displayed in the detailt view o yer posts
         setting_use_blurhash: Gradients is based aff o the colors o the image thit's hid, but ye cannae see onie details
         setting_use_pending_items: Plank timeline updates ahin a chap insteid o automatic scrowin o the feed
         whole_word: Whan the keywird or phrase is alphanumeric ainly, it wull ainly get applied if it matches the haill wird
@@ -166,7 +161,6 @@ sco:
         context: Filter contexts
         current_password: Current passwird
         data: Data
-        discoverable: Suggest accoont tae ithers
         display_name: Display nemm
         email: Email address
         expires_in: Rin oot efter
@@ -176,7 +170,6 @@ sco:
         inbox_url: URL o the relay inbox
         irreversible: Drap insteid o plank
         locale: Interface leid
-        locked: Require follae requests
         max_uses: Maist nummer o uises
         new_password: New passwird
         note: Bio
@@ -199,9 +192,7 @@ sco:
         setting_display_media_show_all: Shaw aw
         setting_expand_spoilers: Aye expand posts mairked wi content warnins
         setting_hide_network: Plank yer social graph
-        setting_noindex: Opt-oot o seirch engine indexin
         setting_reduce_motion: Reduce motion in animations
-        setting_show_application: Disclose application uised fir tae sen posts
         setting_system_font_ui: Uise system's defaut font
         setting_theme: Steid theme
         setting_trends: Shaw the day's trends
diff --git a/config/locales/simple_form.si.yml b/config/locales/simple_form.si.yml
index 9835b126a2..23e63ef42c 100644
--- a/config/locales/simple_form.si.yml
+++ b/config/locales/simple_form.si.yml
@@ -35,13 +35,11 @@ si:
         current_password: ආරක්ෂක අරමුණු සඳහා කරුණාකර ජංගම ගිණුමේ මුරපදය ඇතුළත් කරන්න
         current_username: තහවුරු කිරීමට, කරුණාකර වත්මන් ගිණුමේ පරිශීලක නාමය ඇතුළත් කරන්න
         digest: දිගු කාලයක් අක්‍රියව සිටීමෙන් පසුව පමණක් යවන ලද අතර ඔබ නොමැති විට ඔබට කිසියම් පුද්ගලික පණිවිඩයක් ලැබී ඇත්නම් පමණි
-        discoverable: නිර්දේශ, ප්‍රවණතා සහ වෙනත් විශේෂාංග හරහා ඔබේ ගිණුම ආගන්තුකයන්ට සොයා ගැනීමට ඉඩ දෙන්න
         email: ඔබට තහවුරු කිරීමේ විද්‍යුත් තැපෑලක් එවනු ලැබේ
         header: PNG, GIF හෝ JPG. වැඩිම %{size}. %{dimensions}px දක්වා අඩු කරනු ඇත
         inbox_url: ඔබට භාවිතා කිරීමට අවශ්‍ය රිලේ හි මුල් පිටුවෙන් URL එක පිටපත් කරන්න
         irreversible: පෙරහන පසුව ඉවත් කළද, පෙරූ පළ කිරීම් ආපසු හැරවිය නොහැකි ලෙස අතුරුදහන් වනු ඇත
         locale: පරිශීලක අතුරුමුහුණතේ භාෂාව, ඊමේල් සහ තල්ලු දැනුම්දීම්
-        locked: අනුගමන ඉල්ලීම් අනුමත කිරීමෙන් ඔබව අනුගමනය කළ හැක්කේ කාටදැයි හස්තීයව පාලනය කරන්න
         password: අවම වශයෙන් අක්ෂර 8 ක් භාවිතා කරන්න
         phrase: පළ කිරීමක පෙළ හෝ අන්තර්ගත අනතුරු ඇඟවීම නොසලකා ගැලපේ
         scopes: යෙදුමට ප්‍රවේශ වීමට ඉඩ දෙන්නේ කුමන API වලටද. ඔබ ඉහළ මට්ටමේ විෂය පථයක් තෝරා ගන්නේ නම්, ඔබට තනි ඒවා තෝරා ගැනීමට අවශ්‍ය නොවේ.
@@ -51,9 +49,6 @@ si:
         setting_display_media_default: සංවේදී ලෙස සලකුණු කළ මාධ්‍ය සඟවන්න
         setting_display_media_hide_all: සෑම විටම මාධ්‍ය සඟවන්න
         setting_display_media_show_all: සෑම විටම මාධ්‍ය පෙන්වන්න
-        setting_hide_network: ඔබ අනුගමනය කරන්නේ කවුරුන්ද සහ ඔබව අනුගමනය කරන්නේ කවුරුන්ද යන්න ඔබගේ පැතිකඩෙහි සඟවනු ඇත
-        setting_noindex: ඔබගේ පොදු පැතිකඩ සහ පළ කිරීම් පිටු වලට බලපායි
-        setting_show_application: ඔබ පළ කිරීමට භාවිතා කරන යෙදුම ඔබගේ පළ කිරීම් වල සවිස්තරාත්මක දර්ශනයේ පෙන්වනු ඇත
         setting_use_blurhash: අනුක්‍රමණ සැඟවුණු දෘශ්‍යවල වර්ණ මත පදනම් වන නමුත් ඕනෑම විස්තරයක් අපැහැදිලි කරයි
         setting_use_pending_items: සංග්‍රහය ස්වයංක්‍රීයව අනුචලනය කරනවා වෙනුවට ක්ලික් කිරීමක් පිටුපස කාලරේඛා යාවත්කාලීන සඟවන්න
         whole_word: මූල පදය හෝ වාක්‍ය ඛණ්ඩය අක්ෂරාංක පමණක් වන විට, එය යෙදෙන්නේ එය සම්පූර්ණ වචනයට ගැලපේ නම් පමණි
@@ -135,7 +130,6 @@ si:
         context: සන්දර්භ පෙරහන් කරන්න
         current_password: වත්මන් මුර පදය
         data: දත්ත
-        discoverable: අන් අයට ගිණුමක් යෝජනා කරන්න
         display_name: ප්රදර්ශන නාමය
         email: වි-තැපැල් ලිපිනය
         expires_in: පසු කල් ඉකුත් වේ
@@ -145,7 +139,6 @@ si:
         inbox_url: රිලේ එන ලිපි URL
         irreversible: සැඟවීම වෙනුවට අතහරින්න
         locale: අතුරු මුහුණත භාෂාව
-        locked: ඉල්ලීම් අනුගමනය කිරීම අවශ්‍ය වේ
         max_uses: උපරිම භාවිත ගණන
         new_password: නව මුරපදය
         note: ජෛව
@@ -168,9 +161,7 @@ si:
         setting_display_media_show_all: සියල්ල පෙන්වන්න
         setting_expand_spoilers: අන්තර්ගත අනතුරු ඇඟවීම් සමඟ සලකුණු කර ඇති පළ කිරීම් සැමවිටම පුළුල් කරන්න
         setting_hide_network: ඔබගේ ජාලය සඟවන්න
-        setting_noindex: සෙවුම් යන්ත්‍ර සුචිගත කිරීමෙන් ඉවත් වීම
         setting_reduce_motion: සජීවිකරණවල චලනය අඩු කරන්න
-        setting_show_application: පළ කිරීම් යැවීමට භාවිතා කරන යෙදුම හෙළි කරන්න
         setting_system_font_ui: පද්ධතියේ පෙරනිමි අකුරු භාවිතා කරන්න
         setting_theme: අඩවියේ තේමාව
         setting_trends: අද ප්‍රවණතා පෙන්වන්න
diff --git a/config/locales/simple_form.sk.yml b/config/locales/simple_form.sk.yml
index fe9f16eb92..a89e1a4290 100644
--- a/config/locales/simple_form.sk.yml
+++ b/config/locales/simple_form.sk.yml
@@ -27,7 +27,6 @@ sk:
         inbox_url: Skopíruj adresu z hlavnej stránky mostíka, ktorý chceš používať
         irreversible: Vytriedené príspevky zmiznú nenávratne, aj keď triedenie neskôr zrušíš
         locale: Jazyk užívateľského rozhrania, emailových, a nástenkových oboznámení
-        locked: Vyžaduje sa manuálne schvaľovanie sledujúcich
         password: Zadaj aspoň osem znakov
         phrase: Zhoda sa nájde nezávisle od toho, či je text napísaný, veľkými, alebo malými písmenami, či už v tele, alebo v hlavičke
         scopes: Ktoré API budú povolené aplikácii pre prístup. Ak vyberieš vrcholný stupeň, nemusíš už potom vyberať po jednom.
@@ -36,9 +35,6 @@ sk:
         setting_display_media_default: Ukry médiá označené ako chúlostivé
         setting_display_media_hide_all: Vždy ukry všetky médiá
         setting_display_media_show_all: Vždy zobrazuj médiá
-        setting_hide_network: Koho následuješ, a kto následuje teba, nebude zobrazené na tvojom profile
-        setting_noindex: Ovplyvňuje verejný profil a stránky s príspevkami
-        setting_show_application: Aplikácia, ktorú používaš na písanie príspevkov, bude zobrazená v podrobnom náhľade jednotlivých tvojích príspevkov
         setting_use_blurhash: Prechody sú založené na farbách skrytých vizuálov, ale zahaľujú akékoľvek podrobnosti
         setting_use_pending_items: Skry aktualizovanie časovej osi tak, aby bola načitávaná iba po kliknutí, namiesto samostatného posúvania
         whole_word: Ak je kľúčové slovo, alebo fráza poskladaná iba s písmen a čísel, bude použité iba ak sa zhoduje s celým výrazom
@@ -97,7 +93,6 @@ sk:
         context: Triedenie kontextov
         current_password: Súčasné heslo
         data: Dáta
-        discoverable: Zaraď tento účet do databázy profilov
         display_name: Zobrazované meno
         email: Emailová adresa
         expires_in: Expiruj po
@@ -106,7 +101,6 @@ sk:
         inbox_url: URL adresa prechodnej schránky
         irreversible: Zahoď, namiesto ukrytia
         locale: Jazyk rozhrania
-        locked: Zamknúť účet
         max_uses: Najviac možno použiť
         new_password: Nové heslo
         note: O tebe
@@ -127,9 +121,7 @@ sk:
         setting_display_media_show_all: Ukáž všetky
         setting_expand_spoilers: Stále rozbaľ príspevky označené varovaním o chúlostivom obsahu
         setting_hide_network: Ukry svoju sieť kontaktov
-        setting_noindex: Nezaraďuj príspevky do indexu pre vyhľadávče
         setting_reduce_motion: Mierni pohyb pri animáciách
-        setting_show_application: Zverejni akú aplikáciu používaš na posielanie príspevkov
         setting_system_font_ui: Použi základné systémové písmo
         setting_theme: Vzhľad webu
         setting_trends: Ukáž dnešné trendy
diff --git a/config/locales/simple_form.sl.yml b/config/locales/simple_form.sl.yml
index d765e2ed06..655226d568 100644
--- a/config/locales/simple_form.sl.yml
+++ b/config/locales/simple_form.sl.yml
@@ -41,13 +41,11 @@ sl:
         current_password: Iz varnostnih razlogov vnesite geslo trenutnega računa
         current_username: Za potrditev vnesite uporabniško ime trenutnega računa
         digest: Pošlje se le po dolgem obdobju nedejavnosti in samo, če ste prejeli osebna sporočila v vaši odsotnosti
-        discoverable: Dovolite, da vaš račun odkrijejo neznanci prek priporočil, trendov in drugih funkcij
         email: Poslali vam bomo potrditveno e-pošto
         header: PNG, GIF ali JPG. Največ %{size}. Zmanjšana bo na %{dimensions}px
         inbox_url: Kopirajte URL naslov s prve strani releja, ki ga želite uporabiti
         irreversible: Filtrirane objave bodo nepovratno izginile, tudi če je filter kasneje odstranjen
         locale: Jezik uporabniškega vmesnika, e-poštnih sporočil in potisnih obvestil
-        locked: Zahteva, da ročno odobrite sledilce
         password: Uporabite najmanj 8 znakov
         phrase: Se bo ujemal, ne glede na začetnice v besedilu ali opozorilo o vsebini objave
         scopes: Do katerih API-jev bo imel program dostop. Če izberete obseg najvišje ravni, vam ni treba izbrati posameznih.
@@ -57,9 +55,6 @@ sl:
         setting_display_media_default: Skrij medij, ki je označen kot občutljiv
         setting_display_media_hide_all: Vedno skrij vse medije
         setting_display_media_show_all: Vedno pokaži medij, ki je označen kot občutljiv
-        setting_hide_network: Kogar spremljate in kdo vas spremlja ne bo prikazano na vašem profilu
-        setting_noindex: Vpliva na vaš javni profil in na strani z objavami
-        setting_show_application: Aplikacija, ki jo uporabljate za objavljanje, bo prikazana v podrobnem pogledu vaših objav
         setting_use_blurhash: Prelivi temeljijo na barvah skrite vizualne slike, vendar zakrivajo vse podrobnosti
         setting_use_pending_items: Skrij posodobitev časovnice za klikom namesto samodejnega posodabljanja
         username: Uporabite lahko črke, števke in podčrtaje.
@@ -134,6 +129,7 @@ sl:
         position: Višja vloga se odloča o razrešitvi sporov v določenih situacijah. Določena dejanja lahko izvede le na vlogah z nižjo prioriteto
       webhook:
         events: Izberite dogodke za pošiljanje
+        template: Sestavite svojo obremenitev JSON z uporabo interpolacije spremenljivk. Za privzeti JSON pustite prazno.
         url: Kam bodo poslani dogodki
     labels:
       account:
@@ -177,7 +173,6 @@ sl:
         context: Filtriraj vsebino
         current_password: Trenutno geslo
         data: Podatki
-        discoverable: Dodaj ta račun v imenik
         display_name: Prikazno ime
         email: E-poštni naslov
         expires_in: Preteče po
@@ -187,7 +182,6 @@ sl:
         inbox_url: URL mape "Prejeto"
         irreversible: Opusti namesto skrij
         locale: Jezik vmesnika
-        locked: Zaklenjen račun
         max_uses: Največje število uporabnikov
         new_password: Novo geslo
         note: Biografija
@@ -210,9 +204,7 @@ sl:
         setting_display_media_show_all: Prikaži vse
         setting_expand_spoilers: Vedno razširi objave, označene z opozorili o vsebini
         setting_hide_network: Skrij svoje omrežje
-        setting_noindex: Odsotnost indeksiranja iskalnikov
         setting_reduce_motion: Zmanjšanje premikanja v animacijah
-        setting_show_application: Razkrij aplikacijo za pošiljanje objav
         setting_system_font_ui: Uporabi privzeto pisavo sistema
         setting_theme: Tema strani
         setting_trends: Pokaži današnje trende
@@ -307,6 +299,7 @@ sl:
         position: Prioriteta
       webhook:
         events: Omogočeni dogodki
+        template: Predloga obremenitev
         url: URL končne točke
     'no': Ne
     not_recommended: Ni priporočeno
diff --git a/config/locales/simple_form.sq.yml b/config/locales/simple_form.sq.yml
index 496d752ebf..3fe1f73e23 100644
--- a/config/locales/simple_form.sq.yml
+++ b/config/locales/simple_form.sq.yml
@@ -41,13 +41,11 @@ sq:
         current_password: Për qëllime sigurie, ju lutemi, jepni fjalëkalimin e llogarisë së tanishme
         current_username: Që ta ripohoni, ju lutemi, jepni emrin e përdoruesit të llogarisë së tanishme
         digest: I dërguar vetëm pas një periudhe të gjatë pasiviteti dhe vetëm nëse keni marrë ndonjë mesazh personal gjatë mungesës tuaj
-        discoverable: Lejoni që llogaria juaj të zbulohet nga të huaj përmes rekomandimesh, gjërash në modë dhe veçorish të tjera
         email: Do t’ju dërgohet një email ripohimi
         header: PNG, GIF ose JPG. E shumta %{size}. Do të ripërmasohet në %{dimensions}px
         inbox_url: Kopjoni URL-në prej faqes ballore të relesë që doni të përdorni
         irreversible: Mesazhet e filtruar do të zhduken në mënyrë të pakthyeshme, edhe nëse filtri hiqet më vonë
         locale: Gjuha e ndërfaqes së përdoruesit, email-eve dhe njoftimeve <em>push</em>
-        locked: Lyp që ju të miratoni dorazi ndjekësit
         password: Përdorni të paktën 8 shenja
         phrase: Do të kërkohet përputhje pavarësish se teksti ose sinjalizimi mbi lëndën e një mesazhi është shkruar me të mëdha apo me të vogla
         scopes: Cilat API do të lejohen të përdorin aplikacioni. Nëse përzgjidhni një shkallë të epërme, nuk ju duhet të përzgjidhni individualet një nga një.
@@ -57,9 +55,6 @@ sq:
         setting_display_media_default: Fshih media me shenjën rezervat
         setting_display_media_hide_all: Fshih përherë mediat
         setting_display_media_show_all: Mediat shfaqi përherë
-        setting_hide_network: Cilët ndiqni dhe cilët ju ndjekin nuk do të shfaqen në profilin tuaj
-        setting_noindex: Prek faqet e profilit tuaj publik dhe gjendjeve
-        setting_show_application: Aplikacioni që përdorni për mesazhe do të shfaqet te pamja e hollësishme për mesazhet tuaj
         setting_use_blurhash: Gradientët bazohen në ngjyrat e elementëve pamorë të fshehur, por errësojnë çfarëdo hollësie
         setting_use_pending_items: Fshihi përditësimet e rrjedhës kohore pas një klikimi, në vend të rrëshqitjes automatike nëpër prurje
         username: Mund të përdorni shkronja, numra dhe nënvija
@@ -178,7 +173,6 @@ sq:
         context: Filtroni kontekste
         current_password: Fjalëkalimi i tanishëm
         data: Të dhëna
-        discoverable: Sugjerojuni llogari të tjerëve
         display_name: Emër në ekran
         email: Adresë email
         expires_in: Skadon pas
@@ -188,7 +182,6 @@ sq:
         inbox_url: URL e Të marrëve të relesë
         irreversible: Heqje, në vend se fshehje
         locale: Gjuhë ndërfaqeje
-        locked: Kyçe llogarinë
         max_uses: Numër maksimum përdorimesh
         new_password: Fjalëkalim i ri
         note: Jetëshkrim
@@ -211,9 +204,7 @@ sq:
         setting_display_media_show_all: Shfaqi krejt
         setting_expand_spoilers: Mesazhet me sinjalizime mbi lëndën, zgjeroji përherë
         setting_hide_network: Fshiheni rrjetin tuaj
-        setting_noindex: Zgjidhni lënien jashtë nga indeksim prej motorësh kërkimi
         setting_reduce_motion: Zvogëlo lëvizjen në animacione
-        setting_show_application: Tregoje aplikacionin e përdorur për të dërguar mesazhe
         setting_system_font_ui: Përdor shkronja parazgjedhje të sistemit
         setting_theme: Temë sajti
         setting_trends: Shfaq prirjet sot
diff --git a/config/locales/simple_form.sr-Latn.yml b/config/locales/simple_form.sr-Latn.yml
index d7e05ecb84..6149094f42 100644
--- a/config/locales/simple_form.sr-Latn.yml
+++ b/config/locales/simple_form.sr-Latn.yml
@@ -41,13 +41,11 @@ sr-Latn:
         current_password: Iz bezbednosnih razloga molimo Vas unesite lozinku trenutnog naloga
         current_username: Da biste potvrdili, Molimo Vas unesite korisničko ime trenutno aktivnog naloga
         digest: Šalje se samo posle dužeg perioda neaktivnosti i samo u slučaju da ste primili jednu ili više ličnih poruka tokom Vašeg odsustva
-        discoverable: Dozvolite nepoznatim korisnicima da otkriju Vaš nalog putem preporuka, trendova i drugih funkcija
         email: Biće Vam poslat mejl sa potvrdom
         header: PNG, GIF ili JPG. Najviše %{size}. Biće smanjeno na %{dimensions}px
         inbox_url: Kopirajte URL sa naslovne strane releja koji želite koristiti
         irreversible: Filtrirane obajve će nestati nepovratno, čak i ako je filter kasnije uklonjen
         locale: Jezik korisničkog okruženja, e-pošte i mobilnih obaveštenja
-        locked: Kontrolišite ko može da Vas prati tako što ćete pojedinačno odobravati zahteve za praćenje
         password: Koristite najmanje 8 znakova
         phrase: Biće uparena bez obzira na veliko ili malo slovo u tekstu ili upozorenja o sadržaju objave
         scopes: Kojim API-jima će aplikacija imati pristup. Ako izaberete opseg najvišeg nivoa, ne morate odabrati pojedinačne.
@@ -57,9 +55,6 @@ sr-Latn:
         setting_display_media_default: Sakrij medije označene kao osetljive
         setting_display_media_hide_all: Uvek sakrij sve medije
         setting_display_media_show_all: Uvek prikaži medije označene kao osetljive
-        setting_hide_network: Koga pratite i ko Vas prati neće biti prikazano na Vašem profilu
-        setting_noindex: Utiče na Vaš javni profil i stranice sa objavama
-        setting_show_application: Aplikacija koju koristite za objavljivanje će biti prikazana u detaljnom prikazu vaših objava
         setting_use_blurhash: Gradijenti se formiraju na osnovu bojâ skrivenih slika i zamućuju prikaz, prikrivajući detalje
         setting_use_pending_items: Sakriva ažuriranja vremenske linije iza klika umesto automatskog ažuriranja i pomeranja vremenske linije
         username: Možete koristiti slova, brojeve i donje crte
@@ -178,7 +173,6 @@ sr-Latn:
         context: Filtriraj kontekste
         current_password: Trenutna lozinka
         data: Podaci
-        discoverable: Navedite ovaj nalog u fascikli
         display_name: Ime za prikaz
         email: Adresa e-pošte
         expires_in: Ističe nakon
@@ -188,7 +182,6 @@ sr-Latn:
         inbox_url: URL od relejnog prijemnog sandučeta
         irreversible: Ispustiti umesto sakriti
         locale: Jezik
-        locked: Zahtevaj zahteve za praćenje
         max_uses: Maksimalni broj korišćenja
         new_password: Nova lozinka
         note: Biografija
@@ -211,9 +204,7 @@ sr-Latn:
         setting_display_media_show_all: Prikaži sve
         setting_expand_spoilers: Uvek proširi objave koje su označene upozorenjem sadržaja
         setting_hide_network: Sakrij svoju mrežu
-        setting_noindex: Onemogući indeksiranje pretraživača
         setting_reduce_motion: Smanji pokrete u animacijama
-        setting_show_application: Otkrij aplikaciju koja se koristi za slanje postova
         setting_system_font_ui: Koristi sistemski font
         setting_theme: Tema sajta
         setting_trends: Prikaži današnje trendove
diff --git a/config/locales/simple_form.sr.yml b/config/locales/simple_form.sr.yml
index b4a96f9808..b6c1b36e25 100644
--- a/config/locales/simple_form.sr.yml
+++ b/config/locales/simple_form.sr.yml
@@ -41,13 +41,11 @@ sr:
         current_password: Из безбедносних разлога молимо Вас унесите лозинку тренутног налога
         current_username: Да бисте потврдили, Молимо Вас унесите корисничко име тренутно активног налога
         digest: Шаље се само после дужег периода неактивности и само у случају да сте примили једну или више личних порука током Вашег одсуства
-        discoverable: Дозволите непознатим корисницима да открију Ваш налог путем препорука, трендова и других функција
         email: Биће Вам послат мејл са потврдом
         header: PNG, GIF или JPG. Највише %{size}. Биће смањено на %{dimensions}px
         inbox_url: Копирајте URL са насловне стране релеја који желите користити
         irreversible: Филтриранe обајве ће нестати неповратно, чак и ако је филтер касније уклоњен
         locale: Језик корисничког окружења, е-поште и мобилних обавештења
-        locked: Контролишите ко може да Вас прати тако што ћете појединачно одобравати захтеве за праћење
         password: Користите најмање 8 знакова
         phrase: Биће упарена без обзира на велико или мало слово у тексту или упозорења о садржају објаве
         scopes: Којим API-јима ће апликација имати приступ. Ако изаберете опсег највишег нивоа, не морате одабрати појединачне.
@@ -57,9 +55,6 @@ sr:
         setting_display_media_default: Сакриј медије означене као осетљиве
         setting_display_media_hide_all: Увек сакриј све медије
         setting_display_media_show_all: Увек прикажи медије означене као осетљиве
-        setting_hide_network: Кога пратите и ко Вас прати неће бити приказано на Вашем профилу
-        setting_noindex: Утиче на Ваш јавни профил и странице са објавама
-        setting_show_application: Апликација коју користите за објављивање ће бити приказана у детаљном приказу ваших објава
         setting_use_blurhash: Градијенти се формирају на основу бојâ скривених слика и замућују приказ, прикривајући детаље
         setting_use_pending_items: Сакрива ажурирања временске линије иза клика уместо аутоматског ажурирања и померања временске линије
         username: Можете користити слова, бројеве и доње црте
@@ -178,7 +173,6 @@ sr:
         context: Филтрирај контексте
         current_password: Тренутна лозинка
         data: Подаци
-        discoverable: Наведите овај налог у фасцикли
         display_name: Име за приказ
         email: Адреса е-поште
         expires_in: Истиче након
@@ -188,7 +182,6 @@ sr:
         inbox_url: URL од релејног пријемног сандучета
         irreversible: Испустити уместо сакрити
         locale: Језик
-        locked: Захтевај захтеве за праћење
         max_uses: Максимални број коришћења
         new_password: Нова лозинка
         note: Биографија
@@ -211,9 +204,7 @@ sr:
         setting_display_media_show_all: Прикажи све
         setting_expand_spoilers: Увек прошири објаве које су означене упозорењем садржаја
         setting_hide_network: Сакриј своју мрежу
-        setting_noindex: Онемогући индексирање претраживача
         setting_reduce_motion: Смањи покрете у анимацијама
-        setting_show_application: Откриј апликацију која се користи за слање постова
         setting_system_font_ui: Користи системски фонт
         setting_theme: Тема сајта
         setting_trends: Прикажи данашње трендове
diff --git a/config/locales/simple_form.sv.yml b/config/locales/simple_form.sv.yml
index b4b8f262f1..3f02645d90 100644
--- a/config/locales/simple_form.sv.yml
+++ b/config/locales/simple_form.sv.yml
@@ -37,13 +37,11 @@ sv:
         current_password: Av säkerhetsskäl krävs lösenordet till det nuvarande kontot
         current_username: Ange det nuvarande kontots användarnamn för att bekräfta
         digest: Skickas endast efter en lång period av inaktivitet och endast om du har fått några personliga meddelanden i din frånvaro
-        discoverable: Tillåt att ditt konto upptäcks av främlingar genom rekommendationer, trender och andra funktioner
         email: Du kommer att få ett bekräftelsemeddelande via e-post
         header: PNG, GIF eller JPG. Högst %{size}. Kommer att skalas ner till %{dimensions}px
         inbox_url: Kopiera webbadressen från hemsidan av det ombud du vill använda
         irreversible: Filtrerade inlägg kommer att försvinna oåterkalleligt, även om filter tas bort senare
         locale: Språket för användargränssnittet, e-postmeddelanden och push-aviseringar
-        locked: Kräver att du manuellt godkänner följare
         password: Använd minst 8 tecken
         phrase: Matchas oavsett användande i text eller innehållsvarning för ett inlägg
         scopes: 'Vilka API: er applikationen kommer tillåtas åtkomst till. Om du väljer en omfattning på högstanivån behöver du inte välja individuella sådana.'
@@ -53,9 +51,6 @@ sv:
         setting_display_media_default: Dölj media markerad som känslig
         setting_display_media_hide_all: Dölj alltid all media
         setting_display_media_show_all: Visa alltid media markerad som känslig
-        setting_hide_network: Vem du följer och vilka som följer dig kommer inte att visas på din profilsida
-        setting_noindex: Påverkar din offentliga profil och statussidor
-        setting_show_application: Applikationen du använder för att göra inlägg kommer visas i detaljvyn för dina inlägg
         setting_use_blurhash: Gradienter är baserade på färgerna av de dolda objekten men fördunklar alla detaljer
         setting_use_pending_items: Dölj tidslinjeuppdateringar bakom ett klick istället för att automatiskt bläddra i flödet
         username: Du kan använda bokstäver, siffror och understreck
@@ -173,7 +168,6 @@ sv:
         context: Filtrera sammanhang
         current_password: Nuvarande lösenord
         data: Data
-        discoverable: Föreslå konto för andra
         display_name: Visningsnamn
         email: E-postadress
         expires_in: Utgår efter
@@ -183,7 +177,6 @@ sv:
         inbox_url: Webbadress för ombudsinkorg
         irreversible: Släng istället för att dölja
         locale: Språk för gränssnittet
-        locked: Kräv följförfrågningar
         max_uses: Max antal användningar
         new_password: Nytt lösenord
         note: Biografi
@@ -206,9 +199,7 @@ sv:
         setting_display_media_show_all: Visa alla
         setting_expand_spoilers: Utöka alltid tutningar markerade med innehållsvarningar
         setting_hide_network: Göm ditt nätverk
-        setting_noindex: Uteslutning av sökmotorindexering
         setting_reduce_motion: Minska rörelser i animationer
-        setting_show_application: Visa programmet som används för att skicka tutningar
         setting_system_font_ui: Använd systemets standardfont
         setting_theme: Sidans tema
         setting_trends: Visa dagens trender
diff --git a/config/locales/simple_form.ta.yml b/config/locales/simple_form.ta.yml
index 3dbea2009d..a3819e5eb5 100644
--- a/config/locales/simple_form.ta.yml
+++ b/config/locales/simple_form.ta.yml
@@ -53,11 +53,9 @@ ta:
         context: அமைப்பு
         current_password: தற்போதைய கடவுச்சொல்
         data: தரவு
-        discoverable: கோப்பகத்தில் இந்த கணக்கை பட்டியலிடுங்கள்
         email: மின்னஞ்சல் முகவரி
         header: தலைப்பு
         locale: பயனர் இடைமுக மொழி
-        locked: கணக்கைப் பூட்டு
         max_uses: பயன்பாடுகளின் அதிகபட்ச எண்ணிக்கை
         new_password: புதிய கடவுச்சொல்
         note: சுயசரிதை
diff --git a/config/locales/simple_form.th.yml b/config/locales/simple_form.th.yml
index b752f0d002..f6c87f5826 100644
--- a/config/locales/simple_form.th.yml
+++ b/config/locales/simple_form.th.yml
@@ -41,13 +41,11 @@ th:
         current_password: เพื่อวัตถุประสงค์ด้านความปลอดภัย โปรดป้อนรหัสผ่านของบัญชีปัจจุบัน
         current_username: เพื่อยืนยัน โปรดป้อนชื่อผู้ใช้ของบัญชีปัจจุบัน
         digest: ส่งเฉพาะหลังจากไม่มีการใช้งานเป็นเวลานานและในกรณีที่คุณได้รับข้อความส่วนบุคคลใด ๆ เมื่อคุณไม่อยู่เท่านั้น
-        discoverable: อนุญาตให้คนแปลกหน้าค้นพบบัญชีของคุณได้ผ่านคำแนะนำ, แนวโน้ม และคุณลักษณะอื่น ๆ
         email: คุณจะได้รับอีเมลการยืนยัน
         header: PNG, GIF หรือ JPG สูงสุด %{size} จะได้รับการย่อขนาดเป็น %{dimensions}px
         inbox_url: คัดลอก URL จากหน้าแรกของรีเลย์ที่คุณต้องการใช้
         irreversible: โพสต์ที่กรองอยู่จะหายไปอย่างถาวร แม้ว่าจะเอาตัวกรองออกในภายหลังก็ตาม
         locale: ภาษาของส่วนติดต่อผู้ใช้, อีเมล และการแจ้งเตือนแบบผลัก
-        locked: ควบคุมผู้ที่สามารถติดตามคุณด้วยตนเองได้โดยอนุมัติคำขอติดตาม
         password: ใช้อย่างน้อย 8 ตัวอักษร
         phrase: จะได้รับการจับคู่โดยไม่คำนึงถึงตัวพิมพ์ใหญ่เล็กในข้อความหรือคำเตือนเนื้อหาของโพสต์
         scopes: API ใดที่จะอนุญาตให้แอปพลิเคชันเข้าถึง หากคุณเลือกขอบเขตระดับบนสุด คุณไม่จำเป็นต้องเลือกขอบเขตแต่ละรายการ
@@ -57,9 +55,6 @@ th:
         setting_display_media_default: ซ่อนสื่อที่มีการทำเครื่องหมายว่าละเอียดอ่อน
         setting_display_media_hide_all: ซ่อนสื่อเสมอ
         setting_display_media_show_all: แสดงสื่อเสมอ
-        setting_hide_network: จะซ่อนผู้ที่คุณติดตามและผู้ที่ติดตามคุณในโปรไฟล์ของคุณ
-        setting_noindex: มีผลต่อโปรไฟล์สาธารณะและหน้าโพสต์ของคุณ
-        setting_show_application: จะแสดงแอปพลิเคชันที่คุณใช้ในการโพสต์ในมุมมองโดยละเอียดของโพสต์ของคุณ
         setting_use_blurhash: อิงการไล่ระดับสีตามสีของภาพที่ซ่อนอยู่แต่ทำให้รายละเอียดใด ๆ คลุมเครือ
         setting_use_pending_items: ซ่อนการอัปเดตเส้นเวลาไว้หลังการคลิกแทนที่จะเลื่อนฟีดโดยอัตโนมัติ
         username: คุณสามารถใช้ตัวอักษร, ตัวเลข และขีดล่าง
@@ -178,7 +173,6 @@ th:
         context: บริบทตัวกรอง
         current_password: รหัสผ่านปัจจุบัน
         data: ข้อมูล
-        discoverable: เสนอแนะบัญชีให้ผู้อื่น
         display_name: ชื่อที่แสดง
         email: ที่อยู่อีเมล
         expires_in: หมดอายุหลังจาก
@@ -188,7 +182,6 @@ th:
         inbox_url: URL ของกล่องขาเข้าของรีเลย์
         irreversible: ลบแทนที่จะซ่อน
         locale: ภาษาส่วนติดต่อ
-        locked: ต้องมีคำขอติดตาม
         max_uses: จำนวนการใช้งานสูงสุด
         new_password: รหัสผ่านใหม่
         note: ชีวประวัติ
@@ -211,9 +204,7 @@ th:
         setting_display_media_show_all: แสดงทั้งหมด
         setting_expand_spoilers: ขยายโพสต์ที่มีการทำเครื่องหมายด้วยคำเตือนเนื้อหาเสมอ
         setting_hide_network: ซ่อนกราฟทางสังคมของคุณ
-        setting_noindex: เลือกไม่รับการทำดัชนีโดยเครื่องมือค้นหา
         setting_reduce_motion: ลดการเคลื่อนไหวในภาพเคลื่อนไหว
-        setting_show_application: เปิดเผยแอปพลิเคชันที่ใช้ในการส่งโพสต์
         setting_system_font_ui: ใช้แบบอักษรเริ่มต้นของระบบ
         setting_theme: ชุดรูปแบบไซต์
         setting_trends: แสดงแนวโน้มของวันนี้
diff --git a/config/locales/simple_form.tr.yml b/config/locales/simple_form.tr.yml
index 778b3df487..14da3281fa 100644
--- a/config/locales/simple_form.tr.yml
+++ b/config/locales/simple_form.tr.yml
@@ -41,13 +41,11 @@ tr:
         current_password: Güvenlik nedeniyle lütfen şu anki hesabın parolasını girin
         current_username: Onaylamak için lütfen şu anki hesabın kullanıcı adını girin
         digest: Sadece uzun bir süre hareketsiz kaldıktan sonra ve yalnızca yokluğunuzda herhangi bir kişisel mesaj aldıysanız gönderilir
-        discoverable: Hesabınızın öneriler, trendler ve diğer özellikler aracılığıyla yabancılar tarafından keşfedilmesine izin verin
         email: Onay e-postası gönderilir
         header: PNG, GIF ya da JPG. En fazla %{size}. %{dimensions}px boyutuna küçültülecek
         inbox_url: Kullanmak istediğiniz aktarıcının ön sayfasından URL'yi kopyalayın
         irreversible: Filtrelenmiş gönderiler, filtre daha sonra kaldırılsa bile, geri dönüşümsüz biçimde kaybolur
         locale: Kullanıcı arayüzünün dili, e-postalar ve push bildirimleri
-        locked: Takipçilerinizi manuel olarak kabul etmenizi ve gönderilerinizi varsayılan olarak sadece takipçilerinizin göreceği şekilde paylaşmanızı sağlar.
         password: En az 8 karakter kullanın
         phrase: Metnin büyük/küçük harf durumundan veya gönderinin içerik uyarısından bağımsız olarak eşleştirilecek
         scopes: Uygulamanın erişmesine izin verilen API'ler. Üst seviye bir kapsam seçtiyseniz, bireysel kapsam seçmenize gerek yoktur.
@@ -57,9 +55,6 @@ tr:
         setting_display_media_default: Hassas olarak işaretlenmiş medyayı gizle
         setting_display_media_hide_all: Medyayı her zaman gizle
         setting_display_media_show_all: Medyayı her zaman göster
-        setting_hide_network: Takip ettiğiniz ve sizi takip eden kişiler profilinizde gösterilmeyecek
-        setting_noindex: Herkese açık profilinizi ve durum sayfalarınızı etkiler
-        setting_show_application: Gönderi gönderimi için kullandığınız uygulama, gönderilerinizin ayrıntılı görünümünde gösterilecektir
         setting_use_blurhash: Gradyenler gizli görsellerin renklerine dayanır, ancak detayları gizler
         setting_use_pending_items: Akışı otomatik olarak kaydırmak yerine, zaman çizelgesi güncellemelerini tek bir tıklamayla gizleyin
         username: Harfleri, sayıları veya alt çizgi kullanabilirsiniz
@@ -178,7 +173,6 @@ tr:
         context: İçeriği filtrele
         current_password: Güncel parola
         data: Veri
-        discoverable: Bu hesabı dizinde listele
         display_name: Görünen isim
         email: E-posta adresi
         expires_in: Bitiş tarihi
@@ -188,7 +182,6 @@ tr:
         inbox_url: Aktarıcı gelen kutusunun URL'si
         irreversible: Gizlemek yerine benim için sil
         locale: Arayüz dili
-        locked: Hesabı kilitle
         max_uses: Maksimum kullanım sayısı
         new_password: Yeni parola
         note: Kişisel bilgiler
@@ -211,9 +204,7 @@ tr:
         setting_display_media_show_all: Tümünü göster
         setting_expand_spoilers: İçerik uyarılarıyla işaretli gönderileri her zaman genişlet
         setting_hide_network: Sosyal grafiğini gizle
-        setting_noindex: Arama motoru dizinine eklemeyi iptal et
         setting_reduce_motion: Animasyonlarda hareketi azalt
-        setting_show_application: Gönderileri göndermek için kullanılan uygulamayı belirt
         setting_system_font_ui: Sistemin varsayılan yazı tipini kullan
         setting_theme: Site teması
         setting_trends: Bugünün gündemini göster
diff --git a/config/locales/simple_form.uk.yml b/config/locales/simple_form.uk.yml
index e1401f4d41..b224607f90 100644
--- a/config/locales/simple_form.uk.yml
+++ b/config/locales/simple_form.uk.yml
@@ -41,13 +41,11 @@ uk:
         current_password: Для цілей безпеки, будь ласка, введіть пароль поточного облікового запису
         current_username: Для підтвердження, будь ласка, введіть ім'я користувача поточного облікового запису
         digest: Буде послано тільки після довгого періоду неактивності, та тільки якщо ви отримаєте персональне повідомлення у цей період
-        discoverable: Дозволити знаходити ваш обліковий запис стороннім людям за допомогою рекомендацій, трендів та інших функцій
         email: Вам надійде електронний лист з підтвердженням
         header: PNG, GIF, або JPG. Максимум - %{size}. Буде зменшено до %{dimensions}px
         inbox_url: Скопіюйте інтернет-адресу з титульної сторінки ретранслятора
         irreversible: Відфільтровані дописи зникнуть назавжди, навіть якщо фільтр потім буде вилучено
         locale: Мова інтерфейсу, електронних листів та push-сповіщень
-        locked: Вручну контролюйте, хто може слідкувати за вами, затверджуючи запити на стеження
         password: Не менше 8 символів
         phrase: Шукає без врахування регістру у тексті допису або у його попередженні про вміст
         scopes: Які API додатку буде дозволено використовувати. Якщо ви виберете самий верхній, нижчестоящі будуть обрані автоматично.
@@ -57,9 +55,6 @@ uk:
         setting_display_media_default: Приховувати медіа, позначені як делікатними
         setting_display_media_hide_all: Завжди приховувати медіа
         setting_display_media_show_all: Завжди показувати медіа
-        setting_hide_network: У вашому профілі не буде показано підписки та підписників
-        setting_noindex: Впливає на ваш загальнодоступний профіль і сторінки дописів
-        setting_show_application: Застосунок, за допомогою якого ви зробили допис, буде показано серед подробиць допису
         setting_use_blurhash: Градієнти, що базуються на кольорах прихованих медіа, але роблять нерозрізненними будь-які деталі
         setting_use_pending_items: Не додавати нові повідомлення до стрічок миттєво, показувати лише після додаткового клацання
         username: Можна використовувати літери, цифри та підкреслення
@@ -181,7 +176,6 @@ uk:
         context: Фільтр контексту
         current_password: Поточний пароль
         data: Дані
-        discoverable: Оприлюднити обліковий запис у каталозі
         display_name: Ім'я
         email: Адреса е-пошти
         expires_in: Закінчується після
@@ -191,7 +185,6 @@ uk:
         inbox_url: URL поштової скриньки ретранслятора
         irreversible: Видалити назавжди, а не просто сховати
         locale: Мова
-        locked: Зробити обліковий запис приватним
         max_uses: Максимальна кількість використань
         new_password: Новий пароль
         note: Про Вас
@@ -214,9 +207,7 @@ uk:
         setting_display_media_show_all: Показати всі
         setting_expand_spoilers: Завжди розгортати дописи з попередженнями про вміст
         setting_hide_network: Сховати вашу мережу
-        setting_noindex: Відмовитися від індексування пошуковими системами
         setting_reduce_motion: Менше руху в анімаціях
-        setting_show_application: Показувати застосунки, з яких створюються дописи
         setting_system_font_ui: Використовувати типовий системний шрифт
         setting_theme: Тема сайту
         setting_trends: Показувати популярні сьогодні дописи
diff --git a/config/locales/simple_form.vi.yml b/config/locales/simple_form.vi.yml
index 243d7a133b..d381b67779 100644
--- a/config/locales/simple_form.vi.yml
+++ b/config/locales/simple_form.vi.yml
@@ -4,7 +4,7 @@ vi:
     hints:
       account:
         display_name: Tên đầy đủ hoặc biệt danh đều được.
-        fields: Trang blog của bạn, nghề nghiệp, tuổi hay bất cứ thứ gì.
+        fields: Trang blog của bạn, nghề nghiệp, tuổi hoặc bất cứ thứ gì.
         note: 'Bạn có thể @nhắnriêng ai đó hoặc #hashtags.'
       account_alias:
         acct: Nhập tên_người_dùng@máy chủ của tài khoản cũ
@@ -19,9 +19,9 @@ vi:
         text_html: Tùy chọn. Bạn nên dùng <a href="%{path}">mẫu có sẵn</a> để tiết kiệm thời gian
         type_html: Chọn làm gì với <strong>%{acct}</strong>
         types:
-          disable: Tạm khóa đăng nhập tài khoản, nhưng không xóa hoặc ẩn tút.
+          disable: Tạm không cho đăng nhập tài khoản.
           none: Cảnh cáo tài khoản này, không áp đặt trừng phạt.
-          sensitive: Mọi tập tin của tài khoản này tải lên đều sẽ bị gắn nhãn nhạy cảm.
+          sensitive: Tất cả media tải lên sẽ bị gắn nhãn nhạy cảm.
           silence: Cấm người này đăng tút công khai, ẩn tút của họ hiện ra với những người chưa theo dõi họ.
           suspend: Vô hiệu hóa và xóa sạch dữ liệu của tài khoản này. Có thể khôi phục trước 30 ngày.
         warning_preset_id: Tùy chọn. Bạn vẫn có thể thêm chú thích riêng
@@ -41,28 +41,23 @@ vi:
         current_password: Vì mục đích bảo mật, vui lòng nhập mật khẩu của tài khoản hiện tại
         current_username: Để xác nhận, vui lòng nhập tên người dùng của tài khoản hiện tại
         digest: Chỉ gửi sau một thời gian dài không hoạt động hoặc khi bạn nhận được tin nhắn (trong thời gian vắng mặt)
-        discoverable: Cho phép tài khoản của bạn xuất hiện trong gợi ý theo dõi, thịnh hành và những tính năng khác
         email: Bạn sẽ được gửi một email xác nhận
         header: PNG, GIF hoặc JPG, tối đa %{size}. Sẽ bị nén xuống %{dimensions}px
         inbox_url: Sao chép URL của máy chủ mà bạn muốn dùng
         irreversible: Các tút đã lọc sẽ không thể phục hồi, kể cả sau khi xóa bộ lọc
         locale: Ngôn ngữ của giao diện, email và thông báo đẩy
-        locked: Tự bạn sẽ phê duyệt người theo dõi
         password: Dùng ít nhất 8 ký tự
         phrase: Sẽ được hiện thị trong văn bản hoặc cảnh báo nội dung của một tút
         scopes: API nào ứng dụng sẽ được phép truy cập. Nếu bạn chọn quyền hạn cấp cao nhất, bạn không cần chọn từng phạm vi.
         setting_aggregate_reblogs: Nếu một tút đã được đăng lại thì những lượt đăng lại sau sẽ không hiện trên bảng tin nữa
         setting_always_send_emails: Bình thường thì email thông báo sẽ không gửi khi bạn đang dùng Mastodon
-        setting_default_sensitive: Mặc định là nội dung nhạy cảm và chỉ hiện nếu nhấn vào
-        setting_display_media_default: Làm mờ nội dung nhạy cảm
-        setting_display_media_hide_all: Ẩn
-        setting_display_media_show_all: Luôn hiển thị
-        setting_hide_network: Ẩn những người bạn theo dõi và những người theo dõi bạn
-        setting_noindex: Ảnh hưởng đến trang cá nhân và tút của bạn
-        setting_show_application: Tên ứng dụng bạn dùng để đăng tút sẽ hiện trong chi tiết của tút
-        setting_use_blurhash: Lớp phủ mờ dựa trên màu sắc của hình ảnh nhạy cảm
+        setting_default_sensitive: Bắt buộc nhấn vào mới có thể xem
+        setting_display_media_default: Click để xem
+        setting_display_media_hide_all: Luôn ẩn
+        setting_display_media_show_all: Luôn hiện
+        setting_use_blurhash: Phủ lớp màu làm nhòe đi hình ảnh nhạy cảm
         setting_use_pending_items: Dồn lại toàn bộ tút mới và chỉ hiển thị khi nhấn vào
-        username: Chỉ chấp nhận ký tự, số và dấu gạch dưới
+        username: Chỉ dùng ký tự, số và dấu gạch dưới
         whole_word: Khi từ khóa hoặc cụm từ là chữ và số, nó sẽ chỉ hiện ra những từ chính xác như vậy
       domain_allow:
         domain: Máy chủ này sẽ tiếp nhận dữ liệu, rồi sau đó xử lý và lưu trữ
@@ -124,7 +119,7 @@ vi:
       tag:
         name: Bạn có thể thay đổi cách viết hoa các chữ cái để giúp nó dễ đọc hơn
       user:
-        chosen_languages: Chỉ hiển thị những tút viết bằng các ngôn ngữ được chọn sau
+        chosen_languages: Chỉ hiển thị những tút viết bằng các ngôn ngữ sau
         role: Vai trò kiểm soát những quyền mà người dùng có
       user_role:
         color: Màu được sử dụng cho vai trò trong toàn bộ giao diện người dùng, dưới dạng RGB ở định dạng hex
@@ -178,7 +173,6 @@ vi:
         context: Áp dụng
         current_password: Mật khẩu hiện tại
         data: Dữ liệu
-        discoverable: Đề xuất tài khoản
         display_name: Biệt danh
         email: Địa chỉ email
         expires_in: Hết hạn sau
@@ -188,7 +182,6 @@ vi:
         inbox_url: Hộp thư relay
         irreversible: Xóa bỏ vĩnh viễn
         locale: Ngôn ngữ
-        locked: Yêu cầu theo dõi
         max_uses: Số lần dùng tối đa
         new_password: Mật khẩu mới
         note: Giới thiệu
@@ -199,26 +192,24 @@ vi:
         setting_aggregate_reblogs: Không hiện lượt đăng lại trùng lặp
         setting_always_send_emails: Luôn gửi email thông báo
         setting_auto_play_gif: Tự động phát ảnh GIF
-        setting_boost_modal: Yêu cầu xác nhận trước khi đăng lại tút
+        setting_boost_modal: Hỏi trước khi đăng lại tút
         setting_default_language: Ngôn ngữ đăng
         setting_default_privacy: Kiểu đăng
-        setting_default_sensitive: Ảnh/video là nội dung nhạy cảm
-        setting_delete_modal: Yêu cầu xác nhận trước khi xóa tút
-        setting_disable_swiping: Vô hiệu hóa vuốt màn hình
-        setting_display_media: Nội dung nhạy cảm
+        setting_default_sensitive: Đánh dấu media nhạy cảm
+        setting_delete_modal: Hỏi trước khi xóa tút
+        setting_disable_swiping: Không dùng chuyển động vuốt
+        setting_display_media: Media nhạy cảm
         setting_display_media_default: Mặc định
         setting_display_media_hide_all: Ẩn toàn bộ
         setting_display_media_show_all: Hiện toàn bộ
-        setting_expand_spoilers: Luôn hiển thị tút có nội dung ẩn
+        setting_expand_spoilers: Luôn mở rộng tút chứa nội dung ẩn
         setting_hide_network: Ẩn quan hệ của bạn
-        setting_noindex: Không xuất hiện trong công cụ tìm kiếm
         setting_reduce_motion: Giảm chuyển động ảnh GIF
-        setting_show_application: Hiện ứng dụng đã dùng để đăng tút
-        setting_system_font_ui: Dùng phông chữ mặc định của hệ thống
+        setting_system_font_ui: Dùng phông chữ mặc định hệ thống
         setting_theme: Giao diện
         setting_trends: Hiển thị thịnh hành hôm nay
-        setting_unfollow_modal: Yêu cầu xác nhận trước khi ngưng theo dõi ai đó
-        setting_use_blurhash: Làm mờ trước ảnh/video nhạy cảm
+        setting_unfollow_modal: Hỏi trước khi bỏ theo dõi ai đó
+        setting_use_blurhash: Phủ màu media nhạy cảm
         setting_use_pending_items: Không tự động cập nhật bảng tin
         severity: Mức độ nghiêm trọng
         sign_in_token_attempt: Mã an toàn
@@ -264,9 +255,9 @@ vi:
         trends: Bật thịnh hành
         trends_as_landing_page: Dùng trang thịnh hành làm trang chào mừng
       interactions:
-        must_be_follower: Chặn thông báo từ những người không theo dõi bạn
-        must_be_following: Chặn thông báo từ những người bạn không theo dõi
-        must_be_following_dm: Chặn tin nhắn từ những người bạn không theo dõi
+        must_be_follower: Những người không theo dõi bạn
+        must_be_following: Những người bạn không theo dõi
+        must_be_following_dm: những người bạn không theo dõi (nhắn riêng)
       invite:
         comment: Bình luận
       invite_request:
@@ -315,7 +306,7 @@ vi:
     recommended: Đề xuất
     required:
       mark: "*"
-      text: yêu cầu
+      text: Bắt buộc
     title:
       sessions:
         webauthn: Dùng một trong những khóa bảo mật của bạn để đăng nhập
diff --git a/config/locales/simple_form.zgh.yml b/config/locales/simple_form.zgh.yml
index 1d55f34b52..7ba82b1bf2 100644
--- a/config/locales/simple_form.zgh.yml
+++ b/config/locales/simple_form.zgh.yml
@@ -18,7 +18,6 @@ zgh:
         data: ⵉⴼⵙⴽⴰ
         email: ⵜⴰⵏⵙⴰ ⵉⵎⴰⵢⵍ
         locale: ⵜⵓⵜⵍⴰⵢⵜ ⵏ ⵓⵏⴳⵔⵓⴷⵎ
-        locked: ⵔⴳⵍ ⴰⵎⵉⴹⴰⵏ
         new_password: ⵜⴰⴳⵓⵔⵉ ⵏ ⵓⵣⵔⴰⵢ ⵜⴰⵎⴰⵢⵏⵓⵜ
         note: ⵜⴰⵔⵉⴷⵉⵔⵜ
         password: ⵜⴰⴳⵓⵔⵉ ⵏ ⵓⵣⵔⴰⵢ
diff --git a/config/locales/simple_form.zh-CN.yml b/config/locales/simple_form.zh-CN.yml
index 607c4ac2c8..6aff155e0d 100644
--- a/config/locales/simple_form.zh-CN.yml
+++ b/config/locales/simple_form.zh-CN.yml
@@ -41,13 +41,11 @@ zh-CN:
         current_password: 为了安全起见，请输入当前账号的密码
         current_username: 请输入当前账号的用户名以确认
         digest: 仅在你长时间未登录，且收到了私信时发送
-        discoverable: 允许他人通过推荐、热门和其他途径发现你的账户
         email: 我们会向你发送一封确认邮件
         header: 文件大小限制 %{size}，只支持 PNG、GIF 或 JPG 格式。图片分辨率将会压缩至 %{dimensions}px
         inbox_url: 从你想要使用的中继站的主页上复制 URL
         irreversible: 已过滤的嘟文会不可逆转地消失，即便移除过滤器之后也一样
         locale: 用户界面、电子邮件和推送通知中使用的语言
-        locked: 你需要手动审核所有关注请求
         password: 至少需要8个字符
         phrase: 匹配将忽略嘟文或内容警告里的字母大小写
         scopes: 哪些 API 被允许使用。如果你勾选了更高一级的范围，就不用单独选中子项目了。
@@ -57,9 +55,6 @@ zh-CN:
         setting_display_media_default: 隐藏被标记为敏感内容的媒体
         setting_display_media_hide_all: 始终隐藏媒体
         setting_display_media_show_all: 始终显示媒体
-        setting_hide_network: 你的关注者和你关注的人将不会在你的个人资料页上展示
-        setting_noindex: 此设置会影响到你的公开个人资料以及嘟文页面
-        setting_show_application: 你用来发表嘟文的应用程序将会在你嘟文的详细内容中显示
         setting_use_blurhash: 渐变是基于模糊后的隐藏内容生成的
         setting_use_pending_items: 关闭自动滚动更新，时间轴会在点击后更新
         username: 您只能使用字母、数字和下划线
@@ -178,7 +173,6 @@ zh-CN:
         context: 过滤环境
         current_password: 当前密码
         data: 数据文件
-        discoverable: 在本站用户目录中收录此账号
         display_name: 昵称
         email: 电子邮件地址
         expires_in: 失效时间
@@ -188,7 +182,6 @@ zh-CN:
         inbox_url: 中继站收件箱的 URL
         irreversible: 丢弃而非隐藏
         locale: 界面语言
-        locked: 保护你的账户（锁嘟）
         max_uses: 最大使用次数
         new_password: 新密码
         note: 简介
@@ -211,9 +204,7 @@ zh-CN:
         setting_display_media_show_all: 显示全部
         setting_expand_spoilers: 一律展开具有内容警告的嘟文
         setting_hide_network: 隐藏你的社交网络
-        setting_noindex: 禁止搜索引擎建立索引
         setting_reduce_motion: 降低过渡动画效果
-        setting_show_application: 展示发布嘟文的应用
         setting_system_font_ui: 使用系统默认字体
         setting_theme: 站点主题
         setting_trends: 显示今日热门
diff --git a/config/locales/simple_form.zh-HK.yml b/config/locales/simple_form.zh-HK.yml
index 92b7b906e7..2600980890 100644
--- a/config/locales/simple_form.zh-HK.yml
+++ b/config/locales/simple_form.zh-HK.yml
@@ -37,13 +37,11 @@ zh-HK:
         current_password: 基於保安緣故，請輸入目前帳號的密碼
         current_username: 請輸入目前帳戶的使用者名稱以確認
         digest: 僅在你長時間未登錄，且收到了私信時發送
-        discoverable: 允許陌生人從推薦、趨勢及其他功能發現你的帳號
         email: 你將收到一封確認電郵
         header: 支援 PNG, GIF 或 JPG 圖片，檔案最大為 %{size}，會縮裁成 %{dimensions}px
         inbox_url: 在你想要使用的中繼站首頁，複製它的網址
         irreversible: 文章過濾是不可還原的，即使日後過濾器被移除，也無法重新看到被它濾走的文章
         locale: 使用者介面、電郵和通知的語言
-        locked: 你必須手動審核每個人對你的關注請求
         password: 使用至少 8 個字元
         phrase: 過濾器會閱讀文章和內容警告標語的字眼，然後決定過濾與否
         scopes: 選擇應用程式可以存取的 API。 若你選擇最高階的權限範圍，則無須選擇個別項目。
@@ -53,9 +51,6 @@ zh-HK:
         setting_display_media_default: 隱藏標為敏感的媒體
         setting_display_media_hide_all: 總是隱藏所有媒體
         setting_display_media_show_all: 總是顯示標為敏感的媒體
-        setting_hide_network: 你所關注的人，和關注你的人，將不會在你的個人資料頁上顯示
-        setting_noindex: 此設定會影響到你的公開個人資料以及文章頁面
-        setting_show_application: 你用來發表文章的應用程式，將會顯示在你文章的詳細檢視中
         setting_use_blurhash: 漸變圖樣會基於隱藏媒體內容產生，但所有細節會變得模糊
         setting_use_pending_items: 關閉自動滾動更新，時間軸會在點擊後更新
         whole_word: 如果關鍵字或詞組僅有字母與數字，則其將只在符合整個單字的時候才會套用
@@ -172,7 +167,6 @@ zh-HK:
         context: 所過濾情境
         current_password: 目前密碼
         data: 資料
-        discoverable: 在目錄列出此帳號
         display_name: 顯示名稱
         email: 電郵地址
         expires_in: 失效時間
@@ -182,7 +176,6 @@ zh-HK:
         inbox_url: 中繼收件匣的 URL
         irreversible: 丟棄而非隱藏
         locale: 介面語言
-        locked: 將帳號轉為「私人」
         max_uses: 最大使用次數
         new_password: 新密碼
         note: 簡介
@@ -205,9 +198,7 @@ zh-HK:
         setting_display_media_show_all: 全部顯示
         setting_expand_spoilers: 永遠展開標有內容警告的文章
         setting_hide_network: 隱藏你的社交網絡
-        setting_noindex: 聲明本站不希望搜尋器讓外界搜尋
         setting_reduce_motion: 減少動畫效果
-        setting_show_application: 顯示用來發表文章的應用程式
         setting_system_font_ui: 使用系統預設字型
         setting_theme: 網站主題
         setting_trends: 顯示今天的趨勢
diff --git a/config/locales/simple_form.zh-TW.yml b/config/locales/simple_form.zh-TW.yml
index 1485e23f4d..9826d93f25 100644
--- a/config/locales/simple_form.zh-TW.yml
+++ b/config/locales/simple_form.zh-TW.yml
@@ -41,13 +41,11 @@ zh-TW:
         current_password: 因安全因素，請輸入目前帳號的密碼
         current_username: 請輸入目前帳號的使用者名稱以確認
         digest: 僅在您長時間未登入且在未登入期間收到私訊時傳送
-        discoverable: 允許陌生人透過推薦、熱門趨勢及其他功能發現您的帳號
         email: 您將收到一封確認電子郵件
         header: 支援 PNG、GIF 或 JPG 圖片格式，檔案最大為 %{size}，會等比例縮減至 %{dimensions} 像素
         inbox_url: 從您想要使用的中繼首頁複製網址
         irreversible: 已過濾的嘟文將會不可逆地消失，即便之後移除過濾器也一樣
         locale: 使用者介面、電子郵件和推播通知的語言
-        locked: 需要您手動批准跟隨請求
         password: 使用至少 8 個字元
         phrase: 無論是嘟文的本文或是內容警告都會被過濾
         scopes: 允許讓應用程式存取的 API。 若您選擇最高階範圍，則無須選擇個別項目。
@@ -57,9 +55,6 @@ zh-TW:
         setting_display_media_default: 隱藏標為敏感內容的媒體
         setting_display_media_hide_all: 總是隱藏所有媒體
         setting_display_media_show_all: 總是顯示標為敏感內容的媒體
-        setting_hide_network: 您跟隨的人與跟隨您的人將不會在您的個人檔案頁面上顯示
-        setting_noindex: 會影響您的公開個人檔案與嘟文頁面
-        setting_show_application: 您用來發嘟文的應用程式將會在您嘟文的詳細檢視顯示
         setting_use_blurhash: 彩色漸層圖樣是基於隱藏媒體內容顏色產生，所有細節會變得模糊
         setting_use_pending_items: 關閉自動捲動更新，時間軸只會在點擊後更新
         username: 您可以使用字幕、數字與底線
@@ -178,7 +173,6 @@ zh-TW:
         context: 過濾情境
         current_password: 目前密碼
         data: 資料
-        discoverable: 在目錄列出此帳號
         display_name: 顯示名稱
         email: 電子郵件地址
         expires_in: 失效時間
@@ -188,7 +182,6 @@ zh-TW:
         inbox_url: 中繼收件匣 URL
         irreversible: 放棄而非隱藏
         locale: 介面語言
-        locked: 鎖定帳號
         max_uses: 最大使用次數
         new_password: 新密碼
         note: 個人簡介
@@ -211,9 +204,7 @@ zh-TW:
         setting_display_media_show_all: 全部顯示
         setting_expand_spoilers: 永遠展開標有內容警告的嘟文
         setting_hide_network: 隱藏您的社交網路
-        setting_noindex: 阻止搜尋引擎建立索引
         setting_reduce_motion: 減少過渡動畫效果
-        setting_show_application: 顯示用來傳送嘟文的應用程式
         setting_system_font_ui: 使用系統預設字型
         setting_theme: 佈景主題
         setting_trends: 顯示本日熱門趨勢
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index adc4e8b59d..7e055acf79 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -945,7 +945,7 @@ sk:
     carry_mutes_over_text: Tento užívateľ sa presunul z účtu %{acct}, ktorý si mal/a stíšený.
   notification_mailer:
     favourite:
-      body: 'Tvoj príspevok bol uložený medzi obľúbené užívateľa %{name}:'
+      body: 'Tvoj príspevok bol obľúbený užívateľom %{name}:'
       subject: "%{name} si obľúbil/a tvoj príspevok"
       title: Novo obľúbené
     follow:
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index b963c64673..21df7f6034 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -399,6 +399,7 @@ sl:
       confirm_suspension:
         cancel: Prekliči
         confirm: Suspendiraj
+        permanent_action: Z razveljavitvijo suzpenza ne boste obnovili nobenih podatkov ali razmerij.
         stop_communication: Vaš strežnik bo prenehal komunicirati s temi strežniki.
         title: Potrdi domenski blok za %{domain}
       created_msg: Domenski blok se sedaj obdeluje
@@ -791,6 +792,7 @@ sl:
           approved: Potrebna je odobritev za prijavo
           none: Nihče se ne more prijaviti
           open: Vsakdo se lahko prijavi
+      title: Nastavitve strežnika
     site_uploads:
       delete: Izbriši naloženo datoteko
       destroyed_msg: Prenos na strežnik uspešno izbrisan!
@@ -1163,7 +1165,6 @@ sl:
   edit_profile:
     basic_information: Osnovni podatki
     other: Drugo
-    safety_and_privacy: Varnost in zasebnost
   errors:
     '400': Zahteva, ki ste jo oddali, je neveljavna ali nepravilno oblikovana.
     '403': Nimate dovoljenja za ogled te strani.
@@ -1798,6 +1799,7 @@ sl:
     signed_in_as: 'Vpisani kot:'
   verification:
     here_is_how: Kako to poteka
+    instructions_html: Spodnjo kodo kopirajte in prilepite v HTML svojega spletnega mesta. Nato dodajte naslov svoje spletne strani v eno od dodatnih polj v svojem profilu v zavihku »Uredi profil« in shranite spremembe.
     verification: Potrditev
     verified_links: Vaše preverjene povezave
   webauthn_credentials:
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 51bf810ade..753544d97c 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -1132,7 +1132,6 @@ sq:
     basic_information: Hollësi elementare
     hint_html: "<strong>Përshtatni ç’shohin njerëzit në profilin tuaj publik dhe në krah të postimeve tuaja.</strong> Personat e tjerë ka më shumë gjasa t’ju ndjekin dhe ndërveprojnë me ju, kur keni të plotësuar profilin dhe një foto profili."
     other: Tjetër
-    safety_and_privacy: Siguri dhe privatësi
   errors:
     '400': Kërkesa që parashtruar qe e pavlefshme ose e keqformuar.
     '403': S’keni leje të shihni këtë faqe.
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index cbd60dc5b0..3c12b88ff2 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -466,7 +466,7 @@ sr-Latn:
         title: Uvezi blokirane domene
       no_file: Nijedan fajl nije odabran
     follow_recommendations:
-      description_html: "<strong>Predlozi za praćenje pomažu novim korisnicima da brzo pronađu zanimljiv sadržaj</strong>. Kada korisnik nije dovoljno interagovao sa ostalima da bi se za njega formirali personalizovani predlozi za praćenje, ovi nalozi će biti preporučeni umesto toga. Oni se generišu na dnevnoj bazi iz skupa naloga sa najviše nedavnih angažovanja i najviše lokalnih pratilaca za jedan jezik."
+      description_html: "<strong>Predlozi za praćenje pomažu novim korisnicima da brzo pronađu zanimljiv sadržaj</strong>. Kada korisnik nije dovoljno komunicirao sa drugima da bi se za njega formirali personalizovani predlozi za praćenje, ovi nalozi će biti preporučeni umesto toga. Oni se generišu na dnevnoj bazi iz skupa naloga sa najviše nedavnih angažovanja i najviše lokalnih pratilaca za jedan jezik."
       language: Za jezik
       status: Status
       suppress: Potisni preporuke za praćenje
@@ -1158,7 +1158,6 @@ sr-Latn:
     basic_information: Osnovne informacije
     hint_html: "<strong>Prilagodite šta ljudi vide na vašem javnom profilu i pored vaših objava.</strong> Veća je verovatnoća da će vas drugi pratiti i komunicirati sa vama kada imate popunjen profil i sliku profila."
     other: Ostalo
-    safety_and_privacy: Sigurnost i privatnost
   errors:
     '400': Zahtev koji ste podneli je bio nelegitiman ili u pogrešnom formatu.
     '403': Nemate dozvola da vidite ovu stranu.
@@ -1200,7 +1199,7 @@ sr-Latn:
   filters:
     contexts:
       account: Profili
-      home: Vremenska linija početne
+      home: Početna stranica i liste
       notifications: Obaveštenja
       public: Javne vremenske linije
       thread: Razgovori
@@ -1631,8 +1630,8 @@ sr-Latn:
     default_language: Isto kao jezik okruženja
     disallowed_hashtags:
       few: 'sadrži zabranjene heštegove: %{tags}'
-      one: 'sadrži zabranjeni hešteg: %{tags}'
-      other: 'sadrži zabranjene heštegove: %{tags}'
+      one: 'sadrži zabranjenu heš oznaku: %{tags}'
+      other: 'sadrži zabranjene heš oznake: %{tags}'
     edited_at_html: Izmenjeno %{date}
     errors:
       in_reply_not_found: Objava na koju pokušavate da odgovorite naizgled ne postoji.
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 8b4954d16a..994b0828fc 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -466,7 +466,7 @@ sr:
         title: Увези блокиране домене
       no_file: Ниједан фајл није одабран
     follow_recommendations:
-      description_html: "<strong>Предлози за праћење помажу новим корисницима да брзо пронађу занимљив садржај</strong>. Када корисник није довољно интераговао са осталима да би се за њега формирали персонализовани предлози за праћење, ови налози ће бити препоручени уместо тога. Они се генеришу на дневној бази из скупа налога са највише недавних ангажовања и највише локалних пратилаца за један језик."
+      description_html: "<strong>Предлози за праћење помажу новим корисницима да брзо пронађу занимљив садржај</strong>. Када корисник није довољно комуницирао са другима да би се за њега формирали персонализовани предлози за праћење, ови налози ће бити препоручени уместо тога. Они се генеришу на дневној бази из скупа налога са највише недавних ангажовања и највише локалних пратилаца за један језик."
       language: За језик
       status: Статус
       suppress: Потисни препоруке за праћење
@@ -1158,7 +1158,6 @@ sr:
     basic_information: Основне информације
     hint_html: "<strong>Прилагодите шта људи виде на вашем јавном профилу и поред ваших објава.</strong> Већа је вероватноћа да ће вас други пратити и комуницирати са вама када имате попуњен профил и слику профила."
     other: Остало
-    safety_and_privacy: Сигурност и приватност
   errors:
     '400': Захтев који сте поднели је био нелегитиман или у погрешном формату.
     '403': Немате дозвола да видите ову страну.
@@ -1200,7 +1199,7 @@ sr:
   filters:
     contexts:
       account: Профили
-      home: Временска линија почетне
+      home: Почетна страница и листе
       notifications: Обавештења
       public: Јавне временске линије
       thread: Разговори
@@ -1630,9 +1629,9 @@ sr:
     content_warning: 'Упозорење на садржај: %{warning}'
     default_language: Исто као језик окружења
     disallowed_hashtags:
-      few: 'садржи забрањене хештегове: %{tags}'
-      one: 'садржи забрањени хештег: %{tags}'
-      other: 'садржи забрањене хештегове: %{tags}'
+      few: 'садржи забрањене хеш ознаке: %{tags}'
+      one: 'садржи забрањену хеш ознаку: %{tags}'
+      other: 'садржи забрањене хеш ознаке: %{tags}'
     edited_at_html: Измењено %{date}
     errors:
       in_reply_not_found: Објава на коју покушавате да одговорите наизглед не постоји.
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 264beffaf4..2c7246d274 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -1122,7 +1122,6 @@ th:
     basic_information: ข้อมูลพื้นฐาน
     hint_html: "<strong>ปรับแต่งสิ่งที่ผู้คนเห็นในโปรไฟล์สาธารณะของคุณและถัดจากโพสต์ของคุณ</strong> ผู้คนอื่น ๆ มีแนวโน้มที่จะติดตามคุณกลับและโต้ตอบกับคุณมากขึ้นเมื่อคุณมีโปรไฟล์ที่กรอกแล้วและรูปภาพโปรไฟล์"
     other: อื่น ๆ
-    safety_and_privacy: ความปลอดภัยและความเป็นส่วนตัว
   errors:
     '400': คำขอที่คุณได้ส่งไม่ถูกต้องหรือผิดรูปแบบ
     '403': คุณไม่มีสิทธิอนุญาตเพื่อดูหน้านี้
@@ -1650,9 +1649,9 @@ th:
     mastodon-light: Mastodon (สว่าง)
   time:
     formats:
-      default: "%d %b %Y, %H:%M"
+      default: "%d %b %Y %H:%M น."
       month: "%b %Y"
-      time: "%H:%M"
+      time: "%H:%M น."
   two_factor_authentication:
     add: เพิ่ม
     disable: ปิดใช้งาน 2FA
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 8923e730a9..571e9e5ab2 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -1140,7 +1140,6 @@ tr:
     basic_information: Temel bilgiler
     hint_html: "<strong>İnsanlara herkese açık profilinizde ve gönderilerinizin yanında ne göstermek istediğinizi düzenleyin.</strong> Dolu bir profile ve bir profil resmine sahip olduğunuzda diğer insanlar daha yüksek ihtimalle sizi takip etmek ve sizinle etkileşime geçmek isteyeceklerdir."
     other: Diğer
-    safety_and_privacy: Güvenlik ve gizlilik
   errors:
     '400': Gönderdiğiniz istek geçersiz veya hatalı biçimlendirilmiş.
     '403': Bu sayfayı görmek için izniniz yok.
diff --git a/config/locales/tt.yml b/config/locales/tt.yml
index 4006aac625..3ee9b27d7c 100644
--- a/config/locales/tt.yml
+++ b/config/locales/tt.yml
@@ -337,6 +337,8 @@ tt:
       accept: Кабул итү
       back: Кире
     security: Хәвефсезлек
+    status:
+      account_status: Хисап халәте
   challenge:
     confirm: Дәвам итү
   date:
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 3fed715de0..ac36333a0f 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -1176,7 +1176,6 @@ uk:
     basic_information: Основна інформація
     hint_html: "<strong>Налаштуйте те, що люди бачитимуть у вашому загальнодоступному профілі та поруч із вашими дописами.</strong> Інші люди з більшою ймовірністю підпишуться на вас та взаємодіятимуть з вами, якщо у вас є заповнений профіль та зображення профілю."
     other: Інше
-    safety_and_privacy: Безпека та приватність
   errors:
     '400': Ваш запит був недійсним або неправильним.
     '403': У Вас немає доступу до перегляду даної сторінки.
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 08e0eeb17c..574f097905 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -31,7 +31,7 @@ vi:
     accounts:
       add_email_domain_block: Chặn tên miền email
       approve: Phê duyệt
-      approved_msg: Đã phê duyệt %{username} đăng ký thành công
+      approved_msg: Đã phê duyệt đăng ký %{username}
       are_you_sure: Bạn có chắc không?
       avatar: Ảnh đại diện
       by_domain: Máy chủ
@@ -168,14 +168,14 @@ vi:
     action_logs:
       action_types:
         approve_appeal: Chấp nhận kháng cáo
-        approve_user: Chấp nhận người dùng
+        approve_user: Chấp nhận đăng ký
         assigned_to_self_report: Tự xử lý báo cáo
         change_email_user: Đổi email
-        change_role_user: Thay đổi vai trò
+        change_role_user: Đổi vai trò
         confirm_user: Xác minh
         create_account_warning: Cảnh cáo
         create_announcement: Tạo thông báo mới
-        create_canonical_email_block: Tạo chặn tên miền email mới
+        create_canonical_email_block: Tạo chặn tên miền email
         create_custom_emoji: Tạo emoji
         create_domain_allow: Cho phép máy chủ
         create_domain_block: Chặn máy chủ
@@ -187,7 +187,7 @@ vi:
         destroy_announcement: Xóa thông báo
         destroy_canonical_email_block: Bỏ chặn tên miền email
         destroy_custom_emoji: Xóa emoji
-        destroy_domain_allow: Bỏ cho phép máy chủ
+        destroy_domain_allow: Bỏ thanh trừng máy chủ
         destroy_domain_block: Bỏ chặn máy chủ
         destroy_email_domain_block: Bỏ chặn tên miền email
         destroy_instance: Thanh trừng máy chủ
@@ -205,7 +205,7 @@ vi:
         memorialize_account: Đánh dấu tưởng niệm
         promote_user: Chỉ định vai trò
         reject_appeal: Từ chối kháng cáo
-        reject_user: Từ chối người dùng
+        reject_user: Từ chối đăng ký
         remove_avatar_user: Xóa ảnh đại diện
         reopen_report: Mở lại báo cáo
         resend_user: Gửi lại email xác nhận
@@ -343,9 +343,9 @@ vi:
     dashboard:
       active_users: người hoạt động
       interactions: tương tác
-      media_storage: Dung lượng lưu trữ
+      media_storage: Media
       new_users: người mới
-      opened_reports: tổng báo cáo
+      opened_reports: báo cáo
       pending_appeals_html:
         other: "<strong>%{count}</strong> kháng cáo đang chờ"
       pending_reports_html:
@@ -357,7 +357,7 @@ vi:
       resolved_reports: báo cáo đã xử lí
       software: Phần mềm
       sources: Nguồn đăng ký
-      space: Dung lượng lưu trữ
+      space: Lưu trữ
       title: Thống kê
       top_languages: Ngôn ngữ phổ biến
       top_servers: Máy chủ phổ biến
@@ -450,7 +450,7 @@ vi:
         title: Nhập máy chủ chặn
       no_file: Không có tập tin nào được chọn
     follow_recommendations:
-      description_html: "<strong>Gợi ý theo dõi là cách giúp những người mới nhanh chóng tìm thấy những nội dung thú vị</strong>. Khi một người chưa đủ tương tác với những người khác để hình thành các đề xuất theo dõi được cá nhân hóa, thì những người này sẽ được đề xuất. Nó bao gồm những người có số lượt tương tác gần đây cao nhất và số lượng người theo dõi cao nhất cho một ngôn ngữ nhất định trong máy chủ."
+      description_html: "<strong>Gợi ý theo dõi giúp những người mới nhanh chóng tìm thấy những nội dung thú vị</strong>. Khi một người chưa đủ tương tác với những người khác để hình thành các đề xuất theo dõi được cá nhân hóa, thì những người này sẽ được đề xuất. Nó bao gồm những người có số lượt tương tác gần đây cao nhất và số lượng người theo dõi cao nhất cho một ngôn ngữ nhất định trong máy chủ."
       language: Theo ngôn ngữ
       status: Trạng thái
       suppress: Tắt gợi ý theo dõi
@@ -835,15 +835,15 @@ vi:
           no_publisher_selected: Không có nguồn đăng nào thay đổi vì không có nguồn đăng nào được chọn
         shared_by_over_week:
           other: "%{count} người chia sẻ tuần rồi"
-        title: Liên kết nổi bật
+        title: Tin tức nổi bật
         usage_comparison: Chia sẻ %{today} lần hôm nay, so với %{yesterday} lần hôm qua
       not_allowed_to_trend: Không được phép thành xu hướng
       only_allowed: Chỉ cho phép
       pending_review: Đang chờ
       preview_card_providers:
-        allowed: Liên kết từ nguồn đăng này có thể nổi bật
+        allowed: Tin tức từ nguồn này có thể lên xu hướng
         description_html: Đây là những nguồn mà từ đó các liên kết thường được chia sẻ trên máy chủ của bạn. Các liên kết sẽ không thể thịnh hành trừ khi bạn cho phép nguồn. Sự cho phép (hoặc cấm) của bạn áp dụng luôn cho các tên miền phụ.
-        rejected: Liên kết từ nguồn đăng không thể nổi bật
+        rejected: Tin tức từ nguồn này không thể lên xu hướng
         title: Nguồn đăng
       rejected: Đã cấm
       statuses:
@@ -929,7 +929,7 @@ vi:
     new_trends:
       body: 'Các mục sau đây cần được xem xét trước khi chúng hiển thị công khai:'
       new_trending_links:
-        title: Liên kết nổi bật
+        title: Tin tức nổi bật
       new_trending_statuses:
         title: Tút nổi bật
       new_trending_tags:
@@ -946,8 +946,8 @@ vi:
     remove: Bỏ liên kết bí danh
   appearance:
     advanced_web_interface: Bố cục
-    advanced_web_interface_hint: 'Bố cục nhiều cột cho phép bạn chuyển bố cục hiển thị thành nhiều cột khác nhau. Bao gồm: Bảng tin, thông báo, thế giới, cũng như danh sách và hashtag. Thích hợp nếu bạn đang dùng màn hình rộng.'
-    animations_and_accessibility: Bảng tin
+    advanced_web_interface_hint: Bố cục nhiều cột cho phép bạn chuyển bố cục hiển thị thành nhiều cột khác nhau. Thích hợp với màn hình rộng.
+    animations_and_accessibility: Hiệu ứng
     confirmation_dialogs: Hộp thoại xác nhận
     discovery: Khám phá
     localization:
@@ -964,7 +964,7 @@ vi:
     view_profile: Xem trang hồ sơ
     view_status: Xem tút
   applications:
-    created: Đơn đăng ký được tạo thành công
+    created: Đã gửi yêu cầu đăng ký
     destroyed: Đã xóa đơn đăng ký
     logout: Đăng xuất
     regenerate_token: Tạo lại mã truy cập
@@ -1000,7 +1000,7 @@ vi:
     privacy_policy_agreement_html: Tôi đã đọc và đồng ý <a href="%{privacy_policy_path}" target="_blank">chính sách bảo mật</a>
     progress:
       confirm: Xác minh email
-      details: Thông tin của bạn
+      details: Điền thông tin
       review: Đợi duyệt
       rules: Đọc nội quy
     providers:
@@ -1021,18 +1021,18 @@ vi:
     security: Bảo mật
     set_new_password: Đặt mật khẩu mới
     setup:
-      email_below_hint_html: Kiểm tra thư rác của bạn hoặc yêu cầu gửi lại. Bạn có thể sửa địa chỉ email của mình nếu sai.
+      email_below_hint_html: Kiểm tra hộp thư rác hoặc yêu cầu gửi lại. Bạn có thể sửa địa chỉ email của mình nếu sai.
       email_settings_hint_html: Nhấn vào liên kết chúng tôi vừa gửi để xác minh %{email}. Nhanh nhé bạn.
       link_not_received: Không nhận được mã?
       new_confirmation_instructions_sent: Bạn sẽ nhận được một email mới với liên kết xác nhận sau vài phút!
-      title: Kiểm tra hộp thư của bạn
+      title: Kiểm tra email của bạn
     sign_in:
-      preamble_html: Đăng nhập bằng tài khoản <strong>%{domain}</strong>. Nếu tài khoản của bạn được lưu trữ trên một máy chủ khác, bạn sẽ không thể đăng nhập tại đây.
+      preamble_html: Đăng nhập bằng tài khoản <strong>%{domain}</strong>. Nếu đăng ký trên một máy chủ khác, bạn sẽ không thể đăng nhập tại đây.
       title: Đăng nhập %{domain}
     sign_up:
-      manual_review: Đăng ký trên %{domain} cần duyệt thủ công. Để giúp chúng tôi xử lý nhanh, hãy viết một chút về bản thân và lý do bạn muốn có một tài khoản trên %{domain}.
+      manual_review: "%{domain} sẽ duyệt đăng ký thủ công. Để giúp chúng tôi duyệt nhanh, hãy viết một chút về bản thân và lý do bạn muốn có một tài khoản trên %{domain}."
       preamble: Với tài khoản trên máy chủ Mastodon này, bạn sẽ có thể theo dõi bất kỳ người nào trên các máy chủ khác, bất kể tài khoản của họ ở đâu.
-      title: Cho phép bạn đăng ký trên %{domain}.
+      title: Đang đăng ký trên %{domain}.
     status:
       account_status: Trạng thái tài khoản
       confirming: Đang chờ xác minh email.
@@ -1120,9 +1120,8 @@ vi:
     invalid_domain: không phải là một tên miền hợp lệ
   edit_profile:
     basic_information: Thông tin cơ bản
-    hint_html: "<strong>Tùy chỉnh những gì mọi người nhìn thấy trên hồ sơ công khai của bạn và bên cạnh tút của bạn.</strong> Mọi người sẽ muốn theo dõi lại bạn và tương tác với bạn hơn khi bạn có một hồ sơ đầy đủ và một ảnh hồ sơ."
+    hint_html: "<strong>Tùy chỉnh những gì mọi người nhìn thấy trên hồ sơ công khai và bên cạnh tút của bạn.</strong> Mọi người sẽ muốn theo dõi và tương tác với bạn hơn nếu bạn có ảnh đại diện và một hồ sơ hoàn chỉnh."
     other: Khác
-    safety_and_privacy: An toàn và bảo mật
   errors:
     '400': Yêu cầu bạn gửi không hợp lệ hoặc sai hình thức.
     '403': Bạn không có quyền xem trang này.
@@ -1160,11 +1159,11 @@ vi:
     add_new: Thêm mới
     errors:
       limit: Bạn đã đạt tới số lượng hashtag tối đa
-    hint_html: "<strong>Hashtag thường dùng</strong> là gì? Chúng là những hashtag sẽ được hiển thị nổi bật trên trang hồ sơ của bạn, cho phép mọi người tìm kiếm các bài đăng công khai của bạn có chứa các hashtag đó. Tính năng này có thể dùng để đánh dấu chuỗi tác phẩm sáng tạo hoặc dự án dài hạn."
+    hint_html: "<strong>Làm nổi bật những hashtag thường dùng.</strong> Một công cụ tuyệt vời để theo dõi các tác phẩm sáng tạo và dự án dài hạn của bạn, các hashtag thường dùng sẽ hiển thị nổi bật trên hồ sơ của bạn và cho phép truy cập nhanh vào các tút."
   filters:
     contexts:
       account: Trang hồ sơ
-      home: Bảng tin
+      home: Trang chính và danh sách
       notifications: Thông báo
       public: Tin công khai
       thread: Thảo luận
@@ -1213,7 +1212,7 @@ vi:
     delete: Xóa
     deselect: Bỏ chọn tất cả
     none: Trống
-    order_by: Sắp xếp
+    order_by: Xếp theo
     save_changes: Lưu thay đổi
     select_all_matching_items:
       other: Chọn tất cả%{count} mục trùng hợp với tìm kiếm của bạn.
@@ -1409,7 +1408,7 @@ vi:
   notifications:
     email_events: Email
     email_events_hint: 'Chọn những hoạt động sẽ gửi thông báo qua email:'
-    other_settings: Thông báo khác
+    other_settings: Chặn thông báo từ
   number:
     human:
       decimal_units:
@@ -1469,14 +1468,14 @@ vi:
     invited: Đã mời
     last_active: Hoạt động lần cuối
     most_recent: Mới nhất
-    moved: Đã xóa
+    moved: Đã chuyển
     mutual: Đồng thời
-    primary: Hoạt động
+    primary: Còn
     relationship: Quan hệ
     remove_selected_domains: Xóa hết người theo dõi từ các máy chủ đã chọn
     remove_selected_followers: Xóa những người theo dõi đã chọn
     remove_selected_follows: Bỏ theo dõi những người đã chọn
-    status: Trạng thái của họ
+    status: Trạng thái
   remote_follow:
     missing_resource: Không tìm thấy URL chuyển hướng cho tài khoản của bạn
   reports:
@@ -1493,7 +1492,7 @@ vi:
     too_soon: Ngày lên lịch phải trong tương lai
   sessions:
     activity: Gần đây nhất
-    browser: Trình duyệt
+    browser: Ứng dụng
     browsers:
       alipay: Alipay
       blackberry: BlackBerry
@@ -1501,7 +1500,7 @@ vi:
       edge: Edge
       electron: Electron
       firefox: Firefox
-      generic: Trình duyệt khác
+      generic: Chưa rõ
       huawei_browser: Huawei Browser
       ie: Internet Explorer
       micro_messenger: MicroMes hành khách
@@ -1516,7 +1515,7 @@ vi:
       weibo: Weibo
     current_session: Phiên hiện tại
     description: "%{browser} trên %{platform}"
-    explanation: Đây là các trình duyệt web đã từng đăng nhập vào tài khoản Mastodon của bạn.
+    explanation: Đây là các ứng dụng đã từng đăng nhập vào tài khoản Mastodon của bạn.
     ip: IP
     platforms:
       adobe_air: Adobe Air
@@ -1592,7 +1591,7 @@ vi:
     show_more: Đọc thêm
     show_newer: Mới hơn
     show_older: Cũ hơn
-    show_thread: Trích nguyên văn
+    show_thread: Nội dung gốc
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: Nhắn riêng
@@ -1645,7 +1644,7 @@ vi:
   tags:
     does_not_match_previous_name: không khớp với tên trước
   themes:
-    contrast: Mastodon (Độ tương phản cao)
+    contrast: Mastodon (Tương phản)
     default: Mastodon (Tối)
     mastodon-light: Mastodon (Sáng)
   time:
@@ -1741,7 +1740,7 @@ vi:
     extra_instructions_html: <strong>Mẹo:</strong> Liên kết trên trang web của bạn có thể ẩn. Phần quan trọng là <code>rel="me"</code> ngăn chặn việc mạo danh trên các trang web có nội dung do người dùng tạo. Bạn thậm chí có thể sử dụng một thẻ <code>link</code> trên header của trang thay vì <code>a</code>, nhưng HTML phải có thể truy cập được mà không cần thực thi JavaScript.
     here_is_how: Cách thực hiện
     hint_html: "<strong>Xác minh danh tính trên Mastodon là dành cho tất cả mọi người.</strong> Dựa trên các tiêu chuẩn web mở, miễn phí bây giờ và mãi mãi. Tất cả những gì bạn cần là một trang web cá nhân để mọi người nhận ra bạn. Khi bạn liên kết đến trang web này từ hồ sơ của mình, chúng tôi sẽ kiểm tra xem trang web đó có liên kết lại với hồ sơ của bạn hay không và hiển thị một chỉ báo trực quan trên đó."
-    instructions_html: Sao chép và dán mã bên dưới vào HTML của trang web của bạn. Sau đó, thêm địa chỉ trang web của bạn vào một trong các trường bổ sung trên hồ sơ của bạn từ tab "Chỉnh sửa hồ sơ" và lưu các thay đổi.
+    instructions_html: Sao chép và dán mã bên dưới vào mã nguồn trang web của bạn. Sau đó, thêm địa chỉ trang web của bạn vào một trong các trường metadata trên hồ sơ của bạn từ tab "Sửa hồ sơ" và lưu thay đổi.
     verification: Xác minh
     verified_links: Những liên kết bạn đã xác minh
   webauthn_credentials:
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index bed748d81e..50f0c578c8 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -1057,18 +1057,18 @@ zh-CN:
       with_month_name: "%Y年%m月%d日"
   datetime:
     distance_in_words:
-      about_x_hours: "%{count}时"
-      about_x_months: "%{count}个月"
-      about_x_years: "%{count}年"
-      almost_x_years: "%{count}年"
+      about_x_hours: "%{count}小时前"
+      about_x_months: "%{count}个月前"
+      about_x_years: "%{count}年前"
+      almost_x_years: "%{count}年前"
       half_a_minute: 刚刚
-      less_than_x_minutes: "%{count}分"
+      less_than_x_minutes: "%{count}分钟前"
       less_than_x_seconds: 刚刚
-      over_x_years: "%{count}年"
-      x_days: "%{count}天"
-      x_minutes: "%{count}分"
-      x_months: "%{count}个月"
-      x_seconds: "%{count}秒"
+      over_x_years: "%{count}年前"
+      x_days: "%{count}天前"
+      x_minutes: "%{count}分钟前"
+      x_months: "%{count}个月前"
+      x_seconds: "%{count}秒前"
   deletes:
     challenge_not_passed: 你输入的信息不正确
     confirm_password: 输入你当前的密码来验证身份
@@ -1122,7 +1122,6 @@ zh-CN:
     basic_information: 基本信息
     hint_html: "<strong>自定义公开资料和帖子旁边显示的内容。</strong>当您填写完整的个人资料并设置了头像时，其他人更有可能关注您并与您互动。"
     other: 其他
-    safety_and_privacy: 安全和隐私
   errors:
     '400': 你提交的请求无效或格式不正确。
     '403': 你没有访问这个页面的权限。
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 7ec003135d..bb49016965 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -810,7 +810,7 @@ zh-TW:
         message_html: 不相容的 Elasticsearch 版本：%{value}
         version_comparison: Elasticsearch %{running_version} 版正在執行，需要 %{required_version} 版。
       rules_check:
-        action: 管理服务器规则
+        action: 管理伺服器規則
         message_html: 您尚未定義任何伺服器規則。
       sidekiq_process_check:
         message_html: 沒有佇列 %{value} 的 Sidekiq 行程，請檢查您的 Sidekiq 設定組態
@@ -1126,7 +1126,6 @@ zh-TW:
     basic_information: 基本資訊
     hint_html: "<strong>自訂人們可以於您個人檔案及嘟文內容。</strong>當您完成填寫個人檔案以及設定大頭貼後，其他人們比較願意跟隨您並與您互動。"
     other: 其他
-    safety_and_privacy: 安全與隱私
   errors:
     '400': 您所送出的請求無效或格式不正確。
     '403': 您沒有檢視這個頁面的權限。
diff --git a/config/navigation.rb b/config/navigation.rb
index 6975653067..8a91c59f38 100644
--- a/config/navigation.rb
+++ b/config/navigation.rb
@@ -3,7 +3,7 @@
 SimpleNavigation::Configuration.run do |navigation|
   navigation.items do |n|
     n.item :web, safe_join([fa_icon('chevron-left fw'), t('settings.back')]), root_path
-    n.item :profile, safe_join([fa_icon('user fw'), t('settings.profile')]), settings_profile_path, if: -> { current_user.functional? }, highlights_on: %r{/settings/profile|/settings/featured_tags|/settings/verification}
+    n.item :profile, safe_join([fa_icon('user fw'), t('settings.profile')]), settings_profile_path, if: -> { current_user.functional? }, highlights_on: %r{/settings/profile|/settings/featured_tags|/settings/verification|/settings/privacy}
 
     n.item :preferences, safe_join([fa_icon('cog fw'), t('settings.preferences')]), settings_preferences_path, if: -> { current_user.functional? } do |s|
       s.item :appearance, safe_join([fa_icon('desktop fw'), t('settings.appearance')]), settings_preferences_appearance_path
diff --git a/config/routes/api.rb b/config/routes/api.rb
index 207591e993..b74c12e477 100644
--- a/config/routes/api.rb
+++ b/config/routes/api.rb
@@ -97,6 +97,11 @@ namespace :api, format: false do
     resources :endorsements, only: [:index]
     resources :markers, only: [:index, :create]
 
+    namespace :profile do
+      resource :avatar, only: :destroy
+      resource :header, only: :destroy
+    end
+
     namespace :apps do
       get :verify_credentials, to: 'credentials#show'
     end
@@ -121,6 +126,7 @@ namespace :api, format: false do
       resource :privacy_policy, only: [:show], controller: 'instances/privacy_policies'
       resource :extended_description, only: [:show], controller: 'instances/extended_descriptions'
       resource :translation_languages, only: [:show], controller: 'instances/translation_languages'
+      resource :languages, only: [:show], controller: 'instances/languages'
       resource :activity, only: [:show], controller: 'instances/activity'
     end
 
diff --git a/config/routes/settings.rb b/config/routes/settings.rb
index 96281e3075..9aac8ef690 100644
--- a/config/routes/settings.rb
+++ b/config/routes/settings.rb
@@ -63,6 +63,7 @@ namespace :settings do
   resource :delete, only: [:show, :destroy]
   resource :migration, only: [:show, :create]
   resource :verification, only: :show
+  resource :privacy, only: [:show, :update], controller: 'privacy'
 
   namespace :migration do
     resource :redirect, only: [:new, :create, :destroy]
diff --git a/config/sidekiq.yml b/config/sidekiq.yml
index 2278329a56..12c45c22a1 100644
--- a/config/sidekiq.yml
+++ b/config/sidekiq.yml
@@ -23,7 +23,7 @@
       class: Scheduler::Trends::ReviewNotificationsScheduler
       queue: scheduler
     indexing_scheduler:
-      every: '5m'
+      interval: 1 minute
       class: Scheduler::IndexingScheduler
       queue: scheduler
     vacuum_scheduler:
diff --git a/config/webpack/shared.js b/config/webpack/shared.js
index b82c5d5bef..bf1b006b0a 100644
--- a/config/webpack/shared.js
+++ b/config/webpack/shared.js
@@ -2,6 +2,7 @@
 
 const { resolve } = require('path');
 
+const CircularDependencyPlugin = require('circular-dependency-plugin');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const webpack = require('webpack');
 const AssetsManifestPlugin = require('webpack-assets-manifest');
@@ -112,6 +113,9 @@ module.exports = {
       writeToDisk: true,
       publicPath: true,
     }),
+    new CircularDependencyPlugin({
+      failOnError: true,
+    })
   ],
 
   resolve: {
diff --git a/db/migrate/20170105224407_add_shortcode_to_media_attachments.rb b/db/migrate/20170105224407_add_shortcode_to_media_attachments.rb
index 5f1dd62af0..fe877d1e16 100644
--- a/db/migrate/20170105224407_add_shortcode_to_media_attachments.rb
+++ b/db/migrate/20170105224407_add_shortcode_to_media_attachments.rb
@@ -1,12 +1,19 @@
 # frozen_string_literal: true
 
 class AddShortcodeToMediaAttachments < ActiveRecord::Migration[5.0]
+  class MigrationMediaAttachment < ApplicationRecord
+    self.table_name = :media_attachments
+    scope :local, -> { where(remote_url: '') }
+  end
+
   def up
     add_column :media_attachments, :shortcode, :string, null: true, default: nil
     add_index :media_attachments, :shortcode, unique: true
 
+    MigrationMediaAttachment.reset_column_information
+
     # Migrate old links
-    MediaAttachment.local.update_all('shortcode = id')
+    MigrationMediaAttachment.local.update_all('shortcode = id')
   end
 
   def down
diff --git a/db/migrate/20170304202101_add_type_to_media_attachments.rb b/db/migrate/20170304202101_add_type_to_media_attachments.rb
index bbf14f515a..e49d87fc74 100644
--- a/db/migrate/20170304202101_add_type_to_media_attachments.rb
+++ b/db/migrate/20170304202101_add_type_to_media_attachments.rb
@@ -1,11 +1,24 @@
 # frozen_string_literal: true
 
 class AddTypeToMediaAttachments < ActiveRecord::Migration[5.0]
+  class MigrationMediaAttachment < ApplicationRecord
+    self.table_name = :media_attachments
+    enum type: [:image, :gifv, :video]
+    IMAGE_MIME_TYPES = ['image/jpeg', 'image/png', 'image/gif'].freeze
+    VIDEO_MIME_TYPES = ['video/webm', 'video/mp4'].freeze
+  end
+
   def up
     add_column :media_attachments, :type, :integer, default: 0, null: false
 
-    MediaAttachment.where(file_content_type: MediaAttachment::IMAGE_MIME_TYPES).update_all(type: MediaAttachment.types[:image])
-    MediaAttachment.where(file_content_type: MediaAttachment::VIDEO_MIME_TYPES).update_all(type: MediaAttachment.types[:video])
+    MigrationMediaAttachment.reset_column_information
+
+    MigrationMediaAttachment
+      .where(file_content_type: MigrationMediaAttachment::IMAGE_MIME_TYPES)
+      .update_all(type: MigrationMediaAttachment.types[:image])
+    MigrationMediaAttachment
+      .where(file_content_type: MigrationMediaAttachment::VIDEO_MIME_TYPES)
+      .update_all(type: MigrationMediaAttachment.types[:video])
   end
 
   def down
diff --git a/db/migrate/20181024224956_migrate_account_conversations.rb b/db/migrate/20181024224956_migrate_account_conversations.rb
index 18f9aca97c..93ef5da615 100644
--- a/db/migrate/20181024224956_migrate_account_conversations.rb
+++ b/db/migrate/20181024224956_migrate_account_conversations.rb
@@ -7,9 +7,29 @@ class MigrateAccountConversations < ActiveRecord::Migration[5.2]
 
   disable_ddl_transaction!
 
-  class Mention < ApplicationRecord
-    belongs_to :account, inverse_of: :mentions
-    belongs_to :status, -> { unscope(where: :deleted_at) }
+  class MigrationAccount < ApplicationRecord
+    self.table_name = :accounts
+    has_many :mentions, inverse_of: :account, dependent: :destroy, class_name: 'MigrationMention', foreign_key: :account_id
+  end
+
+  class MigrationConversation < ApplicationRecord
+    self.table_name = :conversations
+  end
+
+  class MigrationStatus < ApplicationRecord
+    self.table_name = :statuses
+    belongs_to :account, class_name: 'MigrationAccount'
+    has_many :mentions, dependent: :destroy, inverse_of: :status, class_name: 'MigrationMention', foreign_key: :status_id
+    scope :local, -> { where(local: true).or(where(uri: nil)) }
+    enum visibility: { public: 0, unlisted: 1, private: 2, direct: 3, limited: 4 }, _suffix: :visibility
+    has_many :active_mentions, -> { active }, class_name: 'MigrationMention', inverse_of: :status, foreign_key: :status_id
+  end
+
+  class MigrationMention < ApplicationRecord
+    self.table_name = :mentions
+    belongs_to :account, inverse_of: :mentions, class_name: 'MigrationAccount'
+    belongs_to :status, -> { unscope(where: :deleted_at) }, class_name: 'MigrationStatus'
+    scope :active, -> { where(silent: false) }
 
     delegate(
       :username,
@@ -19,22 +39,24 @@ class MigrateAccountConversations < ActiveRecord::Migration[5.2]
     )
   end
 
-  class Notification < ApplicationRecord
-    belongs_to :account, optional: true
+  class MigrationNotification < ApplicationRecord
+    self.table_name = :notifications
+    belongs_to :account, optional: true, class_name: 'MigrationAccount'
     belongs_to :activity, polymorphic: true, optional: true
 
-    belongs_to :status,  foreign_key: 'activity_id', optional: true
-    belongs_to :mention, foreign_key: 'activity_id', optional: true
+    belongs_to :status,  foreign_key: 'activity_id', optional: true, class_name: 'MigrationStatus'
+    belongs_to :mention, foreign_key: 'activity_id', optional: true, class_name: 'MigrationMention'
 
     def target_status
       mention&.status
     end
   end
 
-  class AccountConversation < ApplicationRecord
-    belongs_to :account
-    belongs_to :conversation
-    belongs_to :last_status, -> { unscope(where: :deleted_at) }, class_name: 'Status'
+  class MigrationAccountConversation < ApplicationRecord
+    self.table_name = :account_conversations
+    belongs_to :account, class_name: 'MigrationAccount'
+    belongs_to :conversation, class_name: 'MigrationConversation'
+    belongs_to :last_status, -> { unscope(where: :deleted_at) }, class_name: 'MigrationStatus'
 
     before_validation :set_last_status
 
@@ -74,7 +96,7 @@ class MigrateAccountConversations < ActiveRecord::Migration[5.2]
     last_time = Time.zone.now
 
     local_direct_statuses.includes(:account, mentions: :account).find_each do |status|
-      AccountConversation.add_status(status.account, status)
+      MigrationAccountConversation.add_status(status.account, status)
       migrated += 1
 
       if Time.zone.now - last_time > 1
@@ -84,7 +106,7 @@ class MigrateAccountConversations < ActiveRecord::Migration[5.2]
     end
 
     notifications_about_direct_statuses.includes(:account, mention: { status: [:account, mentions: :account] }).find_each do |notification|
-      AccountConversation.add_status(notification.account, notification.target_status)
+      MigrationAccountConversation.add_status(notification.account, notification.target_status)
       migrated += 1
 
       if Time.zone.now - last_time > 1
@@ -103,10 +125,10 @@ class MigrateAccountConversations < ActiveRecord::Migration[5.2]
   end
 
   def local_direct_statuses
-    Status.unscoped.local.where(visibility: :direct)
+    MigrationStatus.unscoped.local.where(visibility: :direct)
   end
 
   def notifications_about_direct_statuses
-    Notification.joins('INNER JOIN mentions ON mentions.id = notifications.activity_id INNER JOIN statuses ON statuses.id = mentions.status_id').where(activity_type: 'Mention', statuses: { visibility: :direct })
+    MigrationNotification.joins('INNER JOIN mentions ON mentions.id = notifications.activity_id INNER JOIN statuses ON statuses.id = mentions.status_id').where(activity_type: 'Mention', statuses: { visibility: :direct })
   end
 end
diff --git a/db/migrate/20181116173541_copy_account_stats.rb b/db/migrate/20181116173541_copy_account_stats.rb
index 30d07764ef..9070200fee 100644
--- a/db/migrate/20181116173541_copy_account_stats.rb
+++ b/db/migrate/20181116173541_copy_account_stats.rb
@@ -3,6 +3,10 @@
 class CopyAccountStats < ActiveRecord::Migration[5.2]
   disable_ddl_transaction!
 
+  class MigrationAccount < ApplicationRecord
+    self.table_name = :accounts
+  end
+
   def up
     safety_assured do
       if supports_upsert?
@@ -27,7 +31,7 @@ class CopyAccountStats < ActiveRecord::Migration[5.2]
   def up_fast
     say 'Upsert is available, importing counters using the fast method'
 
-    Account.unscoped.select('id').find_in_batches(batch_size: 5_000) do |accounts|
+    MigrationAccount.unscoped.select('id').find_in_batches(batch_size: 5_000) do |accounts|
       execute <<-SQL.squish
         INSERT INTO account_stats (account_id, statuses_count, following_count, followers_count, created_at, updated_at)
         SELECT id, statuses_count, following_count, followers_count, created_at, updated_at
@@ -44,7 +48,7 @@ class CopyAccountStats < ActiveRecord::Migration[5.2]
 
     # We cannot use bulk INSERT or overarching transactions here because of possible
     # uniqueness violations that we need to skip over
-    Account.unscoped.select('id, statuses_count, following_count, followers_count, created_at, updated_at').find_each do |account|
+    MigrationAccount.unscoped.select('id, statuses_count, following_count, followers_count, created_at, updated_at').find_each do |account|
       params = [account.id, account[:statuses_count], account[:following_count], account[:followers_count], account.created_at, account.updated_at]
       exec_insert('INSERT INTO account_stats (account_id, statuses_count, following_count, followers_count, created_at, updated_at) VALUES ($1, $2, $3, $4, $5, $6)', nil, params)
     rescue ActiveRecord::RecordNotUnique
diff --git a/db/migrate/20230725213448_add_image_description_to_preview_cards.rb b/db/migrate/20230725213448_add_image_description_to_preview_cards.rb
new file mode 100644
index 0000000000..03020db655
--- /dev/null
+++ b/db/migrate/20230725213448_add_image_description_to_preview_cards.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class AddImageDescriptionToPreviewCards < ActiveRecord::Migration[7.0]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    safety_assured { add_column_with_default :preview_cards, :image_description, :string, default: '', allow_null: false }
+  end
+
+  def down
+    remove_column :preview_cards, :image_description
+  end
+end
diff --git a/db/migrate/20230814223300_add_indexable_to_accounts.rb b/db/migrate/20230814223300_add_indexable_to_accounts.rb
new file mode 100644
index 0000000000..6729c05ef2
--- /dev/null
+++ b/db/migrate/20230814223300_add_indexable_to_accounts.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class AddIndexableToAccounts < ActiveRecord::Migration[7.0]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    safety_assured { add_column_with_default :accounts, :indexable, :boolean, default: false, allow_null: false }
+  end
+
+  def down
+    remove_column :accounts, :indexable
+  end
+end
diff --git a/db/migrate/20230818141056_create_global_follow_recommendations.rb b/db/migrate/20230818141056_create_global_follow_recommendations.rb
new file mode 100644
index 0000000000..b88c71b9d7
--- /dev/null
+++ b/db/migrate/20230818141056_create_global_follow_recommendations.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class CreateGlobalFollowRecommendations < ActiveRecord::Migration[7.0]
+  def change
+    create_view :global_follow_recommendations, materialized: { no_data: true }
+    safety_assured { add_index :global_follow_recommendations, :account_id, unique: true }
+  end
+end
diff --git a/db/post_migrate/20201017234926_fill_account_suspension_origin.rb b/db/post_migrate/20201017234926_fill_account_suspension_origin.rb
index ab7407d79e..b00f9df533 100644
--- a/db/post_migrate/20201017234926_fill_account_suspension_origin.rb
+++ b/db/post_migrate/20201017234926_fill_account_suspension_origin.rb
@@ -3,8 +3,15 @@
 class FillAccountSuspensionOrigin < ActiveRecord::Migration[5.2]
   disable_ddl_transaction!
 
+  class MigrationAccount < ApplicationRecord
+    self.table_name = :accounts
+    scope :suspended, -> { where.not(suspended_at: nil) }
+    enum suspension_origin: { local: 0, remote: 1 }, _prefix: true
+  end
+
   def up
-    Account.suspended.where(suspension_origin: nil).in_batches.update_all(suspension_origin: :local)
+    MigrationAccount.reset_column_information
+    MigrationAccount.suspended.where(suspension_origin: nil).in_batches.update_all(suspension_origin: :local)
   end
 
   def down; end
diff --git a/db/post_migrate/20230803082451_add_unique_index_on_preview_cards_statuses.rb b/db/post_migrate/20230803082451_add_unique_index_on_preview_cards_statuses.rb
new file mode 100644
index 0000000000..c35ad80028
--- /dev/null
+++ b/db/post_migrate/20230803082451_add_unique_index_on_preview_cards_statuses.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+class AddUniqueIndexOnPreviewCardsStatuses < ActiveRecord::Migration[6.1]
+  disable_ddl_transaction!
+
+  def up
+    add_index :preview_cards_statuses, [:status_id, :preview_card_id], name: :preview_cards_statuses_pkey, algorithm: :concurrently, unique: true
+  rescue ActiveRecord::RecordNotUnique
+    deduplicate_and_reindex!
+  end
+
+  def down
+    remove_index :preview_cards_statuses, name: :preview_cards_statuses_pkey
+  end
+
+  private
+
+  def deduplicate_and_reindex!
+    deduplicate_preview_cards!
+
+    safety_assured { execute 'REINDEX INDEX CONCURRENTLY preview_cards_statuses_pkey' }
+  rescue ActiveRecord::RecordNotUnique
+    retry
+  end
+
+  def deduplicate_preview_cards!
+    # Statuses should have only one preview card at most, even if that's not the database
+    # constraint we will end up with
+    duplicate_ids = select_all('SELECT status_id FROM preview_cards_statuses GROUP BY status_id HAVING count(*) > 1;').rows
+
+    duplicate_ids.each_slice(1000) do |ids|
+      # This one is tricky: since we don't have primary keys to keep only one record,
+      # use the physical `ctid`
+      safety_assured do
+        execute "DELETE FROM preview_cards_statuses p WHERE p.status_id IN (#{ids.join(', ')}) AND p.ctid NOT IN (SELECT q.ctid FROM preview_cards_statuses q WHERE q.status_id = p.status_id LIMIT 1)"
+      end
+    end
+  end
+end
diff --git a/db/post_migrate/20230803112520_add_primary_key_to_preview_cards_statuses_join_table.rb b/db/post_migrate/20230803112520_add_primary_key_to_preview_cards_statuses_join_table.rb
new file mode 100644
index 0000000000..34877ac672
--- /dev/null
+++ b/db/post_migrate/20230803112520_add_primary_key_to_preview_cards_statuses_join_table.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class AddPrimaryKeyToPreviewCardsStatusesJoinTable < ActiveRecord::Migration[6.1]
+  disable_ddl_transaction!
+
+  def up
+    safety_assured do
+      execute 'ALTER TABLE preview_cards_statuses ADD PRIMARY KEY USING INDEX preview_cards_statuses_pkey'
+    end
+  end
+
+  def down
+    safety_assured do
+      # I have found no way to demote the primary key to an index, instead, re-create the index
+      execute 'CREATE UNIQUE INDEX CONCURRENTLY preview_cards_statuses_pkey_tmp ON preview_cards_statuses (status_id, preview_card_id)'
+      execute 'ALTER TABLE preview_cards_statuses DROP CONSTRAINT preview_cards_statuses_pkey'
+      execute 'ALTER INDEX preview_cards_statuses_pkey_tmp RENAME TO preview_cards_statuses_pkey'
+    end
+  end
+end
diff --git a/db/post_migrate/20230811103651_remove_index_preview_cards_statuses_on_status_id_and_preview_card_id.rb b/db/post_migrate/20230811103651_remove_index_preview_cards_statuses_on_status_id_and_preview_card_id.rb
new file mode 100644
index 0000000000..11e0bf6f1b
--- /dev/null
+++ b/db/post_migrate/20230811103651_remove_index_preview_cards_statuses_on_status_id_and_preview_card_id.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class RemoveIndexPreviewCardsStatusesOnStatusIdAndPreviewCardId < ActiveRecord::Migration[7.0]
+  disable_ddl_transaction!
+
+  def change
+    remove_index :preview_cards_statuses, column: [:status_id, :preview_card_id], name: :index_preview_cards_statuses_on_status_id_and_preview_card_id
+  end
+end
diff --git a/db/post_migrate/20230818142253_drop_follow_recommendations.rb b/db/post_migrate/20230818142253_drop_follow_recommendations.rb
new file mode 100644
index 0000000000..95913d6caa
--- /dev/null
+++ b/db/post_migrate/20230818142253_drop_follow_recommendations.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class DropFollowRecommendations < ActiveRecord::Migration[7.0]
+  def up
+    drop_view :follow_recommendations, materialized: true
+  end
+
+  def down
+    create_view :follow_recommendations, version: 2, materialized: { no_data: true }
+    safety_assured { add_index :follow_recommendations, :account_id, unique: true }
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 046977ff3f..85dd98cf07 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.0].define(version: 2023_07_24_160715) do
+ActiveRecord::Schema[7.0].define(version: 2023_08_18_142253) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -185,6 +185,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_07_24_160715) do
     t.boolean "trendable"
     t.datetime "reviewed_at", precision: nil
     t.datetime "requested_review_at", precision: nil
+    t.boolean "indexable", default: false, null: false
     t.index "(((setweight(to_tsvector('simple'::regconfig, (display_name)::text), 'A'::\"char\") || setweight(to_tsvector('simple'::regconfig, (username)::text), 'B'::\"char\")) || setweight(to_tsvector('simple'::regconfig, (COALESCE(domain, ''::character varying))::text), 'C'::\"char\")))", name: "search_index", using: :gin
     t.index "lower((username)::text), COALESCE(lower((domain)::text), ''::text)", name: "index_accounts_on_username_and_domain_lower", unique: true
     t.index ["domain", "id"], name: "index_accounts_on_domain_and_id"
@@ -802,13 +803,13 @@ ActiveRecord::Schema[7.0].define(version: 2023_07_24_160715) do
     t.boolean "trendable"
     t.integer "link_type"
     t.datetime "published_at"
+    t.string "image_description", default: "", null: false
     t.index ["url"], name: "index_preview_cards_on_url", unique: true
   end
 
-  create_table "preview_cards_statuses", id: false, force: :cascade do |t|
+  create_table "preview_cards_statuses", primary_key: ["status_id", "preview_card_id"], force: :cascade do |t|
     t.bigint "preview_card_id", null: false
     t.bigint "status_id", null: false
-    t.index ["status_id", "preview_card_id"], name: "index_preview_cards_statuses_on_status_id_and_preview_card_id"
   end
 
   create_table "relays", force: :cascade do |t|
@@ -1335,34 +1336,36 @@ ActiveRecord::Schema[7.0].define(version: 2023_07_24_160715) do
   SQL
   add_index "account_summaries", ["account_id"], name: "index_account_summaries_on_account_id", unique: true
 
-  create_view "follow_recommendations", materialized: true, sql_definition: <<-SQL
+  create_view "global_follow_recommendations", materialized: true, sql_definition: <<-SQL
       SELECT t0.account_id,
       sum(t0.rank) AS rank,
       array_agg(t0.reason) AS reason
      FROM ( SELECT account_summaries.account_id,
               ((count(follows.id))::numeric / (1.0 + (count(follows.id))::numeric)) AS rank,
               'most_followed'::text AS reason
-             FROM (((follows
+             FROM ((follows
                JOIN account_summaries ON ((account_summaries.account_id = follows.target_account_id)))
                JOIN users ON ((users.account_id = follows.account_id)))
-               LEFT JOIN follow_recommendation_suppressions ON ((follow_recommendation_suppressions.account_id = follows.target_account_id)))
-            WHERE ((users.current_sign_in_at >= (now() - 'P30D'::interval)) AND (account_summaries.sensitive = false) AND (follow_recommendation_suppressions.id IS NULL))
+            WHERE ((users.current_sign_in_at >= (now() - 'P30D'::interval)) AND (account_summaries.sensitive = false) AND (NOT (EXISTS ( SELECT 1
+                     FROM follow_recommendation_suppressions
+                    WHERE (follow_recommendation_suppressions.account_id = follows.target_account_id)))))
             GROUP BY account_summaries.account_id
            HAVING (count(follows.id) >= 5)
           UNION ALL
            SELECT account_summaries.account_id,
               (sum((status_stats.reblogs_count + status_stats.favourites_count)) / (1.0 + sum((status_stats.reblogs_count + status_stats.favourites_count)))) AS rank,
               'most_interactions'::text AS reason
-             FROM (((status_stats
+             FROM ((status_stats
                JOIN statuses ON ((statuses.id = status_stats.status_id)))
                JOIN account_summaries ON ((account_summaries.account_id = statuses.account_id)))
-               LEFT JOIN follow_recommendation_suppressions ON ((follow_recommendation_suppressions.account_id = statuses.account_id)))
-            WHERE ((statuses.id >= (((date_part('epoch'::text, (now() - 'P30D'::interval)) * (1000)::double precision))::bigint << 16)) AND (account_summaries.sensitive = false) AND (follow_recommendation_suppressions.id IS NULL))
+            WHERE ((statuses.id >= (((date_part('epoch'::text, (now() - 'P30D'::interval)) * (1000)::double precision))::bigint << 16)) AND (account_summaries.sensitive = false) AND (NOT (EXISTS ( SELECT 1
+                     FROM follow_recommendation_suppressions
+                    WHERE (follow_recommendation_suppressions.account_id = statuses.account_id)))))
             GROUP BY account_summaries.account_id
            HAVING (sum((status_stats.reblogs_count + status_stats.favourites_count)) >= (5)::numeric)) t0
     GROUP BY t0.account_id
     ORDER BY (sum(t0.rank)) DESC;
   SQL
-  add_index "follow_recommendations", ["account_id"], name: "index_follow_recommendations_on_account_id", unique: true
+  add_index "global_follow_recommendations", ["account_id"], name: "index_global_follow_recommendations_on_account_id", unique: true
 
 end
diff --git a/db/views/global_follow_recommendations_v01.sql b/db/views/global_follow_recommendations_v01.sql
new file mode 100644
index 0000000000..de693c9fcd
--- /dev/null
+++ b/db/views/global_follow_recommendations_v01.sql
@@ -0,0 +1,32 @@
+SELECT
+  account_id,
+  sum(rank) AS rank,
+  array_agg(reason) AS reason
+FROM (
+  SELECT
+    account_summaries.account_id AS account_id,
+    count(follows.id) / (1.0 + count(follows.id)) AS rank,
+    'most_followed' AS reason
+  FROM follows
+  INNER JOIN account_summaries ON account_summaries.account_id = follows.target_account_id
+  INNER JOIN users ON users.account_id = follows.account_id
+  WHERE users.current_sign_in_at >= (now() - interval '30 days')
+    AND account_summaries.sensitive = 'f'
+    AND NOT EXISTS (SELECT 1 FROM follow_recommendation_suppressions WHERE follow_recommendation_suppressions.account_id = follows.target_account_id)
+  GROUP BY account_summaries.account_id
+  HAVING count(follows.id) >= 5
+  UNION ALL
+  SELECT account_summaries.account_id AS account_id,
+         sum(status_stats.reblogs_count + status_stats.favourites_count) / (1.0 + sum(status_stats.reblogs_count + status_stats.favourites_count)) AS rank,
+         'most_interactions' AS reason
+  FROM status_stats
+  INNER JOIN statuses ON statuses.id = status_stats.status_id
+  INNER JOIN account_summaries ON account_summaries.account_id = statuses.account_id
+  WHERE statuses.id >= ((date_part('epoch', now() - interval '30 days') * 1000)::bigint << 16)
+    AND account_summaries.sensitive = 'f'
+    AND NOT EXISTS (SELECT 1 FROM follow_recommendation_suppressions WHERE follow_recommendation_suppressions.account_id = statuses.account_id)
+  GROUP BY account_summaries.account_id
+  HAVING sum(status_stats.reblogs_count + status_stats.favourites_count) >= 5
+) t0
+GROUP BY account_id
+ORDER BY rank DESC
diff --git a/dist/mastodon-streaming.service b/dist/mastodon-streaming.service
index 533feb5341..66cc3474ef 100644
--- a/dist/mastodon-streaming.service
+++ b/dist/mastodon-streaming.service
@@ -1,51 +1,12 @@
 [Unit]
 Description=mastodon-streaming
 After=network.target
+Wants=mastodon-streaming@4000.service
 
 [Service]
-Type=simple
-User=mastodon
-WorkingDirectory=/home/mastodon/live
-Environment="NODE_ENV=production"
-Environment="PORT=4000"
-ExecStart=/usr/bin/node ./streaming
-TimeoutSec=15
-Restart=always
-LimitNOFILE=65536
-# Proc filesystem
-ProcSubset=pid
-ProtectProc=invisible
-# Capabilities
-CapabilityBoundingSet=
-# Security
-NoNewPrivileges=true
-# Sandboxing
-ProtectSystem=strict
-PrivateTmp=true
-PrivateDevices=true
-PrivateUsers=true
-ProtectHostname=true
-ProtectKernelLogs=true
-ProtectKernelModules=true
-ProtectKernelTunables=true
-ProtectControlGroups=true
-RestrictAddressFamilies=AF_INET
-RestrictAddressFamilies=AF_INET6
-RestrictAddressFamilies=AF_NETLINK
-RestrictAddressFamilies=AF_UNIX
-RestrictNamespaces=true
-LockPersonality=true
-RestrictRealtime=true
-RestrictSUIDSGID=true
-RemoveIPC=true
-PrivateMounts=true
-ProtectClock=true
-# System Call Filtering
-SystemCallArchitectures=native
-SystemCallFilter=~@cpu-emulation @debug @keyring @ipc @memlock @mount @obsolete @privileged @resources @setuid
-SystemCallFilter=pipe
-SystemCallFilter=pipe2
-ReadWritePaths=/home/mastodon/live
+Type=oneshot
+ExecStart=/bin/echo "mastodon-streaming exists only to collectively start and stop mastodon-streaming@ instances, shimming over the migration to templated mastodon-streaming systemd unit"
+RemainAfterExit=yes
 
 [Install]
 WantedBy=multi-user.target
diff --git a/dist/mastodon-streaming@.service b/dist/mastodon-streaming@.service
new file mode 100644
index 0000000000..f43c4ea4a6
--- /dev/null
+++ b/dist/mastodon-streaming@.service
@@ -0,0 +1,54 @@
+[Unit]
+Description=mastodon-streaming on port %I
+After=network.target
+# handles using `systemctl restart mastodon-streaming`
+PartOf=mastodon-streaming.service
+ReloadPropagatedFrom=mastodon-streaming.service
+
+[Service]
+Type=simple
+User=mastodon
+WorkingDirectory=/home/mastodon/live
+Environment="NODE_ENV=production"
+Environment="PORT=%i"
+ExecStart=/usr/bin/node ./streaming
+TimeoutSec=15
+Restart=always
+LimitNOFILE=65536
+# Proc filesystem
+ProcSubset=pid
+ProtectProc=invisible
+# Capabilities
+CapabilityBoundingSet=
+# Security
+NoNewPrivileges=true
+# Sandboxing
+ProtectSystem=strict
+PrivateTmp=true
+PrivateDevices=true
+PrivateUsers=true
+ProtectHostname=true
+ProtectKernelLogs=true
+ProtectKernelModules=true
+ProtectKernelTunables=true
+ProtectControlGroups=true
+RestrictAddressFamilies=AF_INET
+RestrictAddressFamilies=AF_INET6
+RestrictAddressFamilies=AF_NETLINK
+RestrictAddressFamilies=AF_UNIX
+RestrictNamespaces=true
+LockPersonality=true
+RestrictRealtime=true
+RestrictSUIDSGID=true
+RemoveIPC=true
+PrivateMounts=true
+ProtectClock=true
+# System Call Filtering
+SystemCallArchitectures=native
+SystemCallFilter=~@cpu-emulation @debug @keyring @ipc @memlock @mount @obsolete @privileged @resources @setuid
+SystemCallFilter=pipe
+SystemCallFilter=pipe2
+ReadWritePaths=/home/mastodon/live
+
+[Install]
+WantedBy=multi-user.target mastodon-streaming.service
diff --git a/dist/nginx.conf b/dist/nginx.conf
index fc68e9a6d1..39fa58e50d 100644
--- a/dist/nginx.conf
+++ b/dist/nginx.conf
@@ -8,7 +8,15 @@ upstream backend {
 }
 
 upstream streaming {
+    # Instruct nginx to send connections to the server with the least number of connections
+    # to ensure load is distributed evenly.
+    least_conn;
+
     server 127.0.0.1:4000 fail_timeout=0;
+    # Uncomment these lines for load-balancing multiple instances of streaming for scaling,
+    # this assumes your running the streaming server on ports 4000, 4001, and 4002:
+    # server 127.0.0.1:4001 fail_timeout=0;
+    # server 127.0.0.1:4002 fail_timeout=0;
 }
 
 proxy_cache_path /var/cache/nginx levels=1:2 keys_zone=CACHE:10m inactive=7d max_size=1g;
diff --git a/lib/chewy/index_extensions.rb b/lib/chewy/index_extensions.rb
new file mode 100644
index 0000000000..064fd56b3e
--- /dev/null
+++ b/lib/chewy/index_extensions.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Chewy
+  module IndexExtensions
+    def index_preset(base_options = {})
+      case ENV['ES_PRESET'].presence
+      when 'single_node_cluster', nil
+        base_options.merge(number_of_replicas: 0)
+      when 'small_cluster'
+        base_options.merge(number_of_replicas: 1)
+      when 'large_cluster'
+        base_options.merge(number_of_replicas: 1, number_of_shards: (base_options[:number_of_shards] || 1) * 2)
+      end
+    end
+  end
+end
+
+Chewy::Index.extend(Chewy::IndexExtensions)
diff --git a/lib/chewy/settings_extensions.rb b/lib/chewy/settings_extensions.rb
new file mode 100644
index 0000000000..0eb8b336f3
--- /dev/null
+++ b/lib/chewy/settings_extensions.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Chewy
+  module SettingsExtensions
+    def enabled?
+      settings[:enabled]
+    end
+  end
+end
+
+Chewy.extend(Chewy::SettingsExtensions)
diff --git a/lib/http_extensions.rb b/lib/http_extensions.rb
new file mode 100644
index 0000000000..048f85f87b
--- /dev/null
+++ b/lib/http_extensions.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+# Monkey patching until https://github.com/httprb/http/pull/757 is merged
+unless HTTP::Request::METHODS.include?(:purge)
+  methods = HTTP::Request::METHODS.dup
+  HTTP::Request.send(:remove_const, :METHODS)
+  HTTP::Request.const_set(:METHODS, methods.push(:purge).freeze)
+end
diff --git a/lib/mastodon/cli/search.rb b/lib/mastodon/cli/search.rb
index 33bcad5fea..41862b5b6b 100644
--- a/lib/mastodon/cli/search.rb
+++ b/lib/mastodon/cli/search.rb
@@ -15,9 +15,10 @@ module Mastodon::CLI
 
     option :concurrency, type: :numeric, default: 5, aliases: [:c], desc: 'Workload will be split between this number of threads'
     option :batch_size, type: :numeric, default: 100, aliases: [:b], desc: 'Number of records in each batch'
-    option :only, type: :array, enum: %w(accounts tags statuses), desc: 'Only process these indices'
+    option :only, type: :array, enum: %w(instances accounts tags statuses), desc: 'Only process these indices'
     option :import, type: :boolean, default: true, desc: 'Import data from the database to the index'
     option :clean, type: :boolean, default: true, desc: 'Remove outdated documents from the index'
+    option :reset_chewy, type: :boolean, default: false, desc: "Reset Chewy's internal index"
     desc 'deploy', 'Create or upgrade Elasticsearch indices and populate them'
     long_desc <<~LONG_DESC
       If Elasticsearch is empty, this command will create the necessary indices
@@ -42,6 +43,8 @@ module Mastodon::CLI
       importers = indices.index_with { |index| "Importer::#{index.name}Importer".constantize.new(batch_size: options[:batch_size], executor: pool) }
       progress  = ProgressBar.create(total: nil, format: '%t%c/%u |%b%i| %e (%r docs/s)', autofinish: false)
 
+      Chewy::Stash::Specification.reset! if options[:reset_chewy]
+
       # First, ensure all indices are created and have the correct
       # structure, so that live data can already be written
       indices.select { |index| index.specification.changed? }.each do |index|
diff --git a/lib/mastodon/migration_helpers.rb b/lib/mastodon/migration_helpers.rb
index 5a252b3512..4a43f67c27 100644
--- a/lib/mastodon/migration_helpers.rb
+++ b/lib/mastodon/migration_helpers.rb
@@ -195,7 +195,14 @@ module Mastodon
     def supports_drop_index_concurrently?
       version = select_one("SELECT current_setting('server_version_num') AS v")['v'].to_i
 
-      version >= 90200
+      version >= 90_200
+    end
+
+    # Only available on Postgresql >= 11
+    def supports_add_column_with_default?
+      version = select_one("SELECT current_setting('server_version_num') AS v")['v'].to_i
+
+      version >= 11_000
     end
 
     # Adds a foreign key with only minimal locking on the tables involved.
@@ -414,6 +421,11 @@ module Mastodon
     # This method can also take a block which is passed directly to the
     # `update_column_in_batches` method.
     def add_column_with_default(table, column, type, default:, limit: nil, allow_null: false, &block)
+      if supports_add_column_with_default?
+        add_column(table, column, type, default: default, limit: limit, null: allow_null)
+        return
+      end
+
       if transaction_open?
         raise 'add_column_with_default can not be run inside a transaction, ' \
           'you can disable transactions by calling disable_ddl_transaction! ' \
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index b0fc4f029b..c82cdc6fae 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -9,15 +9,15 @@ module Mastodon
     end
 
     def minor
-      1
+      2
     end
 
     def patch
-      6
+      0
     end
 
     def flags
-      ENV.fetch('MASTODON_VERSION_FLAGS', '')
+      ENV['MASTODON_VERSION_FLAGS'].presence || '-beta2'
     end
 
     def suffix
diff --git a/lib/paperclip/transcoder.rb b/lib/paperclip/transcoder.rb
index f4768aa602..0f2e30f7d5 100644
--- a/lib/paperclip/transcoder.rb
+++ b/lib/paperclip/transcoder.rb
@@ -40,11 +40,11 @@ module Paperclip
         unless eligible_to_passthrough?(metadata)
           @output_options['acodec'] = 'aac'
           @output_options['strict'] = 'experimental'
-        end
 
-        if high_vfr?(metadata) && !eligible_to_passthrough?(metadata)
-          @output_options['vsync'] = 'vfr'
-          @output_options['r'] = @vfr_threshold
+          if high_vfr?(metadata)
+            @output_options['vsync'] = 'vfr'
+            @output_options['r'] = @vfr_threshold
+          end
         end
       end
 
diff --git a/lib/redis/namespace_extensions.rb b/lib/redis/namespace_extensions.rb
index 310a4f465b..9af59c296e 100644
--- a/lib/redis/namespace_extensions.rb
+++ b/lib/redis/namespace_extensions.rb
@@ -2,8 +2,8 @@
 
 class Redis
   module NamespaceExtensions
-    def exists?(*args, &block)
-      call_with_namespace('exists?', *args, &block)
+    def exists?(...)
+      call_with_namespace('exists?', ...)
     end
   end
 end
diff --git a/lib/tasks/repo.rake b/lib/tasks/repo.rake
index 33c454444e..1ed1ee5c32 100644
--- a/lib/tasks/repo.rake
+++ b/lib/tasks/repo.rake
@@ -49,8 +49,8 @@ namespace :repo do
       File.open(path, 'r') do |file|
         file.each_line do |line|
           if line.start_with?('-')
-            new_line = line.gsub(/#([[:digit:]]+)*/) do |pull_request_reference|
-              pull_request_number = pull_request_reference[1..]
+            new_line = line.gsub(/[(]#([[:digit:]]+)[)]\Z/) do |pull_request_reference|
+              pull_request_number = pull_request_reference[2..-2]
               response = nil
 
               loop do
@@ -66,7 +66,7 @@ namespace :repo do
               end
 
               pull_request = Oj.load(response.to_s)
-              "[#{pull_request['user']['login']}](#{pull_request['html_url']})"
+              "([#{pull_request['user']['login']}](#{pull_request['html_url']}))"
             end
 
             tmp.puts new_line
diff --git a/lib/tasks/tests.rake b/lib/tasks/tests.rake
index 3c88ce4509..ef4d46fe09 100644
--- a/lib/tasks/tests.rake
+++ b/lib/tasks/tests.rake
@@ -63,6 +63,11 @@ namespace :tests do
         puts 'Account domains not properly normalized'
         exit(1)
       end
+
+      unless Status.find(12).preview_cards.pluck(:url) == ['https://joinmastodon.org/']
+        puts 'Preview cards not deduplicated as expected'
+        exit(1)
+      end
     end
 
     desc 'Populate the database with test data for 2.4.3'
@@ -238,6 +243,11 @@ namespace :tests do
           (10, 2, '@admin hey!', NULL, 1, 3, now(), now()),
           (11, 1, '@user hey!', 10, 1, 3, now(), now());
 
+        INSERT INTO "statuses"
+          (id, account_id, text, created_at, updated_at)
+        VALUES
+          (12, 1, 'check out https://joinmastodon.org/', now(), now());
+
         -- mentions (from previous statuses)
 
         INSERT INTO "mentions"
@@ -326,6 +336,21 @@ namespace :tests do
           (1, 6, 2, 'Follow', 2, now(), now()),
           (2, 2, 1, 'Mention', 4, now(), now()),
           (3, 1, 2, 'Mention', 5, now(), now());
+
+        -- preview cards
+
+        INSERT INTO "preview_cards"
+          (id, url, title, created_at, updated_at)
+        VALUES
+          (1, 'https://joinmastodon.org/', 'Mastodon - Decentralized social media', now(), now());
+
+        -- many-to-many association between preview cards and statuses
+
+        INSERT INTO "preview_cards_statuses"
+          (status_id, preview_card_id)
+        VALUES
+          (12, 1),
+          (12, 1);
       SQL
     end
   end
diff --git a/package.json b/package.json
index 068d5c8d04..bda3b97d11 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
     "build:development": "cross-env RAILS_ENV=development NODE_ENV=development ./bin/webpack",
     "build:production": "cross-env RAILS_ENV=production NODE_ENV=production ./bin/webpack",
     "fix:js": "yarn lint:js --fix",
-    "fix:json": "prettier --write \"**/*.json\"",
+    "fix:json": "prettier --write \"**/*.{json,json5}\"",
     "fix:md": "prettier --write \"**/*.md\"",
     "fix:sass": "stylelint --fix \"**/*.{css,scss}\" && prettier --write \"**/*.{css,scss}\"",
     "fix:yml": "prettier --write \"**/*.{yaml,yml}\"",
@@ -16,7 +16,7 @@
     "i18n:extract": "formatjs extract 'app/javascript/**/*.{js,jsx,ts,tsx}' '--ignore=**/*.d.ts' --out-file app/javascript/flavours/glitch/locales/en.json --format config/formatjs-formatter.js",
     "jest": "cross-env NODE_ENV=test jest",
     "lint:js": "eslint . --ext=.js,.jsx,.ts,.tsx --cache --report-unused-disable-directives",
-    "lint:json": "prettier --check \"**/*.json\"",
+    "lint:json": "prettier --check \"**/*.{json,json5}\"",
     "lint:md": "prettier --check \"**/*.md\"",
     "lint:sass": "stylelint \"**/*.{css,scss}\" && prettier --check \"**/*.{css,scss}\"",
     "lint:yml": "prettier --check \"**/*.{yaml,yml}\"",
@@ -60,6 +60,7 @@
     "babel-plugin-preval": "^5.1.0",
     "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
     "blurhash": "^2.0.5",
+    "circular-dependency-plugin": "^5.2.2",
     "classnames": "^2.3.2",
     "cocoon-js-vanilla": "^1.3.0",
     "color-blend": "^4.0.0",
@@ -97,6 +98,7 @@
     "pg-connection-string": "^2.6.0",
     "postcss": "^8.4.24",
     "postcss-loader": "^4.3.0",
+    "prom-client": "^14.2.0",
     "prop-types": "^15.8.1",
     "punycode": "^2.3.0",
     "react": "^18.2.0",
@@ -123,7 +125,7 @@
     "redux": "^4.2.1",
     "redux-immutable": "^4.0.0",
     "redux-thunk": "^2.4.2",
-    "regenerator-runtime": "^0.13.11",
+    "regenerator-runtime": "^0.14.0",
     "requestidlecallback": "^0.3.0",
     "reselect": "^4.1.8",
     "rimraf": "^5.0.1",
@@ -191,15 +193,15 @@
     "@typescript-eslint/parser": "^6.0.0",
     "babel-jest": "^29.5.0",
     "eslint": "^8.41.0",
-    "eslint-config-prettier": "^8.8.0",
+    "eslint-config-prettier": "^9.0.0",
     "eslint-import-resolver-typescript": "^3.5.5",
     "eslint-plugin-formatjs": "^4.10.1",
-    "eslint-plugin-import": "~2.27.5",
+    "eslint-plugin-import": "~2.28.0",
     "eslint-plugin-jsdoc": "^46.1.0",
     "eslint-plugin-jsx-a11y": "~6.7.1",
     "eslint-plugin-prettier": "^5.0.0",
     "eslint-plugin-promise": "~6.1.1",
-    "eslint-plugin-react": "~7.32.2",
+    "eslint-plugin-react": "~7.33.0",
     "eslint-plugin-react-hooks": "^4.6.0",
     "husky": "^8.0.3",
     "jest": "^29.5.0",
diff --git a/public/robots.txt b/public/robots.txt
index 771bf2160b..6672eeba1f 100644
--- a/public/robots.txt
+++ b/public/robots.txt
@@ -1,5 +1,8 @@
 # See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file
 
+User-agent: GPTBot
+Disallow: /
+
 User-agent: *
 Disallow: /media_proxy/
 Disallow: /interact/
diff --git a/spec/controllers/api/v1/instances/translation_languages_controller_spec.rb b/spec/controllers/api/v1/instances/translation_languages_controller_spec.rb
index 5b7e4abb6f..88bcc40341 100644
--- a/spec/controllers/api/v1/instances/translation_languages_controller_spec.rb
+++ b/spec/controllers/api/v1/instances/translation_languages_controller_spec.rb
@@ -16,8 +16,7 @@ describe Api::V1::Instances::TranslationLanguagesController do
     context 'when a translation service is configured' do
       before do
         service = instance_double(TranslationService::DeepL, languages: { nil => %w(en de), 'en' => ['de'] })
-        allow(TranslationService).to receive(:configured?).and_return(true)
-        allow(TranslationService).to receive(:configured).and_return(service)
+        allow(TranslationService).to receive_messages(configured?: true, configured: service)
       end
 
       it 'returns language matrix' do
diff --git a/spec/controllers/api/v1/statuses/translations_controller_spec.rb b/spec/controllers/api/v1/statuses/translations_controller_spec.rb
index 989e94750a..6257494ae1 100644
--- a/spec/controllers/api/v1/statuses/translations_controller_spec.rb
+++ b/spec/controllers/api/v1/statuses/translations_controller_spec.rb
@@ -20,8 +20,7 @@ describe Api::V1::Statuses::TranslationsController do
       before do
         translation = TranslationService::Translation.new(text: 'Hello')
         service = instance_double(TranslationService::DeepL, translate: [translation])
-        allow(TranslationService).to receive(:configured?).and_return(true)
-        allow(TranslationService).to receive(:configured).and_return(service)
+        allow(TranslationService).to receive_messages(configured?: true, configured: service)
         Rails.cache.write('translation_service/languages', { 'es' => ['en'] })
         post :create, params: { status_id: status.id }
       end
diff --git a/spec/controllers/concerns/cache_concern_spec.rb b/spec/controllers/concerns/cache_concern_spec.rb
index bf328d679d..fffd2b266e 100644
--- a/spec/controllers/concerns/cache_concern_spec.rb
+++ b/spec/controllers/concerns/cache_concern_spec.rb
@@ -13,12 +13,17 @@ RSpec.describe CacheConcern do
     def empty_relation
       render plain: cache_collection(Status.none, Status).size
     end
+
+    def account_statuses_favourites
+      render plain: cache_collection(Status.where(account_id: params[:id]), Status).map(&:favourites_count)
+    end
   end
 
   before do
     routes.draw do
-      get  'empty_array' => 'anonymous#empty_array'
-      post 'empty_relation' => 'anonymous#empty_relation'
+      get 'empty_array' => 'anonymous#empty_array'
+      get 'empty_relation' => 'anonymous#empty_relation'
+      get 'account_statuses_favourites' => 'anonymous#account_statuses_favourites'
     end
   end
 
@@ -36,5 +41,20 @@ RSpec.describe CacheConcern do
         expect(response.body).to eq '0'
       end
     end
+
+    context 'when given a collection of statuses' do
+      let!(:account) { Fabricate(:account) }
+      let!(:status)  { Fabricate(:status, account: account) }
+
+      it 'correctly updates with new interactions' do
+        get :account_statuses_favourites, params: { id: account.id }
+        expect(response.body).to eq '[0]'
+
+        FavouriteService.new.call(account, status)
+
+        get :account_statuses_favourites, params: { id: account.id }
+        expect(response.body).to eq '[1]'
+      end
+    end
   end
 end
diff --git a/spec/fabricators/fabricators_spec.rb b/spec/fabrication/fabricators_spec.rb
similarity index 100%
rename from spec/fabricators/fabricators_spec.rb
rename to spec/fabrication/fabricators_spec.rb
diff --git a/spec/features/admin/domain_blocks_spec.rb b/spec/features/admin/domain_blocks_spec.rb
index c77d604ebd..4672c1e1a9 100644
--- a/spec/features/admin/domain_blocks_spec.rb
+++ b/spec/features/admin/domain_blocks_spec.rb
@@ -57,6 +57,30 @@ describe 'blocking domains through the moderation interface' do
     end
   end
 
+  context 'when suspending a subdomain of an already-silenced domain' do
+    it 'presents a confirmation screen before suspending the domain' do
+      domain_block = Fabricate(:domain_block, domain: 'example.com', severity: 'silence')
+
+      visit new_admin_domain_block_path
+
+      fill_in 'domain_block_domain', with: 'subdomain.example.com'
+      select I18n.t('admin.domain_blocks.new.severity.suspend'), from: 'domain_block_severity'
+      click_on I18n.t('admin.domain_blocks.new.create')
+
+      # It presents a confirmation screen
+      expect(page).to have_title(I18n.t('admin.domain_blocks.confirm_suspension.title', domain: 'subdomain.example.com'))
+
+      # Confirming creates the block
+      click_on I18n.t('admin.domain_blocks.confirm_suspension.confirm')
+
+      expect(DomainBlock.where(domain: 'subdomain.example.com', severity: 'suspend')).to exist
+
+      # And leaves the previous block alone
+      expect(domain_block.reload.severity).to eq 'silence'
+      expect(domain_block.reload.domain).to eq 'example.com'
+    end
+  end
+
   context 'when editing a domain block' do
     it 'presents a confirmation screen before suspending the domain' do
       domain_block = Fabricate(:domain_block, domain: 'example.com', severity: 'silence')
diff --git a/spec/fixtures/files/attachment.gif b/spec/fixtures/files/attachment.gif
index 2937f5abef..89dd73ad3e 100644
Binary files a/spec/fixtures/files/attachment.gif and b/spec/fixtures/files/attachment.gif differ
diff --git a/spec/fixtures/files/attachment.webm b/spec/fixtures/files/attachment.webm
index 3babe5cf59..edde443960 100644
Binary files a/spec/fixtures/files/attachment.webm and b/spec/fixtures/files/attachment.webm differ
diff --git a/spec/helpers/admin/filter_helper_spec.rb b/spec/helpers/admin/filter_helper_spec.rb
index bbf90a9969..40ed63239f 100644
--- a/spec/helpers/admin/filter_helper_spec.rb
+++ b/spec/helpers/admin/filter_helper_spec.rb
@@ -7,8 +7,7 @@ describe Admin::FilterHelper do
     params = ActionController::Parameters.new(
       { test: 'test' }
     )
-    allow(helper).to receive(:params).and_return(params)
-    allow(helper).to receive(:url_for).and_return('/test')
+    allow(helper).to receive_messages(params: params, url_for: '/test')
     result = helper.filter_link_to('text', { resolved: true })
 
     expect(result).to match(/text/)
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index 654029ad3d..4b4207b2e7 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -31,10 +31,7 @@ describe ApplicationHelper do
     context 'with a body class string from a controller' do
       before do
         without_partial_double_verification do
-          allow(helper).to receive(:body_class_string).and_return('modal-layout compose-standalone')
-          allow(helper).to receive(:current_flavour).and_return('glitch')
-          allow(helper).to receive(:current_skin).and_return('default')
-          allow(helper).to receive(:current_account).and_return(Fabricate(:account))
+          allow(helper).to receive_messages(body_class_string: 'modal-layout compose-standalone', current_flavour: 'glitch', current_skin: 'default', current_account: Fabricate(:account))
         end
       end
 
diff --git a/spec/helpers/home_helper_spec.rb b/spec/helpers/home_helper_spec.rb
index 15067471ed..c6baec5a1f 100644
--- a/spec/helpers/home_helper_spec.rb
+++ b/spec/helpers/home_helper_spec.rb
@@ -25,8 +25,7 @@ RSpec.describe HomeHelper do
 
       it 'returns a link to the account' do
         without_partial_double_verification do
-          allow(helper).to receive(:current_account).and_return(account)
-          allow(helper).to receive(:prefers_autoplay?).and_return(false)
+          allow(helper).to receive_messages(current_account: account, prefers_autoplay?: false)
           result = helper.account_link_to(account)
 
           expect(result).to match "@#{account.acct}"
@@ -101,8 +100,7 @@ RSpec.describe HomeHelper do
 
     context 'with open registrations' do
       it 'returns correct sign up message' do
-        allow(helper).to receive(:closed_registrations?).and_return(false)
-        allow(helper).to receive(:open_registrations?).and_return(true)
+        allow(helper).to receive_messages(closed_registrations?: false, open_registrations?: true)
         result = helper.sign_up_message
 
         expect(result).to eq t('auth.register')
@@ -111,9 +109,7 @@ RSpec.describe HomeHelper do
 
     context 'with approved registrations' do
       it 'returns correct sign up message' do
-        allow(helper).to receive(:closed_registrations?).and_return(false)
-        allow(helper).to receive(:open_registrations?).and_return(false)
-        allow(helper).to receive(:approved_registrations?).and_return(true)
+        allow(helper).to receive_messages(closed_registrations?: false, open_registrations?: false, approved_registrations?: true)
         result = helper.sign_up_message
 
         expect(result).to eq t('auth.apply_for_account')
diff --git a/spec/lib/admin/system_check/elasticsearch_check_spec.rb b/spec/lib/admin/system_check/elasticsearch_check_spec.rb
index 1ffac89ee4..f3918d403d 100644
--- a/spec/lib/admin/system_check/elasticsearch_check_spec.rb
+++ b/spec/lib/admin/system_check/elasticsearch_check_spec.rb
@@ -11,7 +11,24 @@ describe Admin::SystemCheck::ElasticsearchCheck do
 
   describe 'pass?' do
     context 'when chewy is enabled' do
-      before { allow(Chewy).to receive(:enabled?).and_return(true) }
+      before do
+        allow(Chewy).to receive(:enabled?).and_return(true)
+        allow(Chewy.client.cluster).to receive(:health).and_return({ 'status' => 'green', 'number_of_nodes' => 1 })
+        allow(Chewy.client.indices).to receive_messages(get_mapping: {
+          AccountsIndex.index_name => AccountsIndex.mappings_hash.deep_stringify_keys,
+          StatusesIndex.index_name => StatusesIndex.mappings_hash.deep_stringify_keys,
+          InstancesIndex.index_name => InstancesIndex.mappings_hash.deep_stringify_keys,
+          TagsIndex.index_name => TagsIndex.mappings_hash.deep_stringify_keys,
+        }, get_settings: {
+          'chewy_specifications' => {
+            'settings' => {
+              'index' => {
+                'number_of_replicas' => 0,
+              },
+            },
+          },
+        })
+      end
 
       context 'when running version is present and high enough' do
         before do
@@ -49,11 +66,7 @@ describe Admin::SystemCheck::ElasticsearchCheck do
       end
 
       context 'when running version is missing' do
-        before do
-          client = instance_double(Elasticsearch::Transport::Client)
-          allow(client).to receive(:info).and_raise(Elasticsearch::Transport::Transport::Error)
-          allow(Chewy).to receive(:client).and_return(client)
-        end
+        before { stub_elasticsearch_error }
 
         it 'returns false' do
           expect(check.pass?).to be false
@@ -71,8 +84,19 @@ describe Admin::SystemCheck::ElasticsearchCheck do
   end
 
   describe 'message' do
+    before do
+      allow(Chewy).to receive(:enabled?).and_return(true)
+      allow(Chewy.client.cluster).to receive(:health).and_return({ 'status' => 'green', 'number_of_nodes' => 1 })
+      allow(Chewy.client.indices).to receive(:get_mapping).and_return({
+        AccountsIndex.index_name => AccountsIndex.mappings_hash.deep_stringify_keys,
+        StatusesIndex.index_name => StatusesIndex.mappings_hash.deep_stringify_keys,
+        InstancesIndex.index_name => InstancesIndex.mappings_hash.deep_stringify_keys,
+        TagsIndex.index_name => TagsIndex.mappings_hash.deep_stringify_keys,
+      })
+    end
+
     context 'when running version is present' do
-      before { allow(Chewy.client).to receive(:info).and_return({ 'version' => { 'number' => '999.99.9' } }) }
+      before { allow(Chewy.client).to receive(:info).and_return({ 'version' => { 'number' => '1.2.3' } }) }
 
       it 'sends class name symbol to message instance' do
         allow(Admin::SystemCheck::Message).to receive(:new)
@@ -81,11 +105,13 @@ describe Admin::SystemCheck::ElasticsearchCheck do
         check.message
 
         expect(Admin::SystemCheck::Message).to have_received(:new)
-          .with(:elasticsearch_version_check, 'Elasticsearch 999.99.9 is running while 7.x is required')
+          .with(:elasticsearch_version_check, 'Elasticsearch 1.2.3 is running while 7.x is required')
       end
     end
 
     context 'when running version is missing' do
+      before { stub_elasticsearch_error }
+
       it 'sends class name symbol to message instance' do
         allow(Admin::SystemCheck::Message).to receive(:new)
           .with(:elasticsearch_running_check)
@@ -97,4 +123,10 @@ describe Admin::SystemCheck::ElasticsearchCheck do
       end
     end
   end
+
+  def stub_elasticsearch_error
+    client = instance_double(Elasticsearch::Transport::Client)
+    allow(client).to receive(:info).and_raise(Elasticsearch::Transport::Transport::Error)
+    allow(Chewy).to receive(:client).and_return(client)
+  end
 end
diff --git a/spec/lib/cache_buster_spec.rb b/spec/lib/cache_buster_spec.rb
new file mode 100644
index 0000000000..84085608e8
--- /dev/null
+++ b/spec/lib/cache_buster_spec.rb
@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe CacheBuster do
+  subject { described_class.new(secret_header: secret_header, secret: secret, http_method: http_method) }
+
+  let(:secret_header) { nil }
+  let(:secret) { nil }
+  let(:http_method) { nil }
+
+  let(:purge_url) { 'https://example.com/test_purge' }
+
+  describe '#bust' do
+    shared_examples 'makes_request' do
+      it 'makes an HTTP purging request' do
+        method = http_method&.to_sym || :get
+        stub_request(method, purge_url).to_return(status: 200)
+
+        subject.bust(purge_url)
+
+        test_request = a_request(method, purge_url)
+
+        test_request = test_request.with(headers: { secret_header => secret }) if secret && secret_header
+
+        expect(test_request).to have_been_made.once
+      end
+    end
+
+    context 'when using default options' do
+      include_examples 'makes_request'
+    end
+
+    context 'when specifying a secret header' do
+      let(:secret_header) { 'X-Purge-Secret' }
+      let(:secret) { SecureRandom.hex(20) }
+
+      include_examples 'makes_request'
+    end
+
+    context 'when specifying a PURGE method' do
+      let(:http_method) { 'purge' }
+
+      context 'when not using headers' do
+        include_examples 'makes_request'
+      end
+
+      context 'when specifying a secret header' do
+        let(:secret_header) { 'X-Purge-Secret' }
+        let(:secret) { SecureRandom.hex(20) }
+
+        include_examples 'makes_request'
+      end
+    end
+  end
+end
diff --git a/spec/lib/link_details_extractor_spec.rb b/spec/lib/link_details_extractor_spec.rb
index ef501efbff..599bc4e6de 100644
--- a/spec/lib/link_details_extractor_spec.rb
+++ b/spec/lib/link_details_extractor_spec.rb
@@ -3,33 +3,31 @@
 require 'rails_helper'
 
 RSpec.describe LinkDetailsExtractor do
-  subject { described_class.new(original_url, html, html_charset) }
+  subject { described_class.new(original_url, html, nil) }
 
-  let(:original_url) { '' }
-  let(:html) { '' }
-  let(:html_charset) { nil }
+  let(:original_url) { 'https://example.com/dog.html?tracking=123' }
 
   describe '#canonical_url' do
-    let(:original_url) { 'https://foo.com/article?bar=baz123' }
+    let(:html) { "<!doctype html><link rel='canonical' href='#{url}'>" }
+
+    context 'when canonical URL points to the same host' do
+      let(:url) { 'https://example.com/dog.html' }
+
+      it 'ignores the canonical URLs' do
+        expect(subject.canonical_url).to eq 'https://example.com/dog.html'
+      end
+    end
 
     context 'when canonical URL points to another host' do
-      let(:html) { '<!doctype html><link rel="canonical" href="https://bar.com/different-article" />' }
+      let(:url) { 'https://different.example.net/dog.html' }
 
       it 'ignores the canonical URLs' do
         expect(subject.canonical_url).to eq original_url
       end
     end
 
-    context 'when canonical URL points to the same host' do
-      let(:html) { '<!doctype html><link rel="canonical" href="https://foo.com/article" />' }
-
-      it 'ignores the canonical URLs' do
-        expect(subject.canonical_url).to eq 'https://foo.com/article'
-      end
-    end
-
     context 'when canonical URL is set to "null"' do
-      let(:html) { '<!doctype html><link rel="canonical" href="null" />' }
+      let(:url) { 'null' }
 
       it 'ignores the canonical URLs' do
         expect(subject.canonical_url).to eq original_url
@@ -37,46 +35,103 @@ RSpec.describe LinkDetailsExtractor do
     end
   end
 
+  context 'when only basic metadata is present' do
+    let(:html) { <<~HTML }
+      <!doctype html>
+      <html lang="en">
+      <head>
+        <title>Man bites dog</title>
+        <meta name="description" content="A dog&#39;s tale">
+      </head>
+      </html>
+    HTML
+
+    describe '#title' do
+      it 'returns the title from title tag' do
+        expect(subject.title).to eq 'Man bites dog'
+      end
+    end
+
+    describe '#description' do
+      it 'returns the description from meta tag' do
+        expect(subject.description).to eq "A dog's tale"
+      end
+    end
+
+    describe '#language' do
+      it 'returns the language from lang attribute' do
+        expect(subject.language).to eq 'en'
+      end
+    end
+  end
+
   context 'when structured data is present' do
-    let(:original_url) { 'https://example.com/page.html' }
-
-    context 'when is wrapped in CDATA tags' do
-      let(:html) { <<~HTML }
-        <!doctype html>
-        <html>
-        <head>
-          <script type="application/ld+json">
-          //<![CDATA[
-          {"@context":"http://schema.org","@type":"NewsArticle","mainEntityOfPage":"https://example.com/page.html","headline":"Foo","datePublished":"2022-01-31T19:53:00+00:00","url":"https://example.com/page.html","description":"Bar","author":{"@type":"Person","name":"Hoge"},"publisher":{"@type":"Organization","name":"Baz"}}
-          //]]>
-          </script>
-        </head>
-        </html>
-      HTML
+    let(:ld_json) do
+      {
+        '@context' => 'https://schema.org',
+        '@type' => 'NewsArticle',
+        'headline' => 'Man bites dog',
+        'description' => "A dog's tale",
+        'datePublished' => '2022-01-31T19:53:00+00:00',
+        'author' => {
+          '@type' => 'Organization',
+          'name' => 'Charlie Brown',
+        },
+        'publisher' => {
+          '@type' => 'NewsMediaOrganization',
+          'name' => 'Pet News',
+          'url' => 'https://example.com',
+        },
+      }.to_json
+    end
 
+    shared_examples 'structured data' do
       describe '#title' do
         it 'returns the title from structured data' do
-          expect(subject.title).to eq 'Foo'
+          expect(subject.title).to eq 'Man bites dog'
         end
       end
 
       describe '#description' do
         it 'returns the description from structured data' do
-          expect(subject.description).to eq 'Bar'
+          expect(subject.description).to eq "A dog's tale"
         end
       end
 
-      describe '#provider_name' do
-        it 'returns the provider name from structured data' do
-          expect(subject.provider_name).to eq 'Baz'
+      describe '#published_at' do
+        it 'returns the publicaton time from structured data' do
+          expect(subject.published_at).to eq '2022-01-31T19:53:00+00:00'
         end
       end
 
       describe '#author_name' do
         it 'returns the author name from structured data' do
-          expect(subject.author_name).to eq 'Hoge'
+          expect(subject.author_name).to eq 'Charlie Brown'
         end
       end
+
+      describe '#provider_name' do
+        it 'returns the provider name from structured data' do
+          expect(subject.provider_name).to eq 'Pet News'
+        end
+      end
+    end
+
+    context 'when is wrapped in CDATA tags' do
+      let(:html) { <<~HTML }
+        <!doctype html>
+        <html>
+          <head>
+            <script type="application/ld+json">
+              //<![CDATA[
+              #{ld_json}
+              //]]>
+            </script>
+          </head>
+        </html>
+      HTML
+
+      include_examples 'structured data'
     end
 
     context 'with the first tag is invalid JSON' do
@@ -85,76 +140,152 @@ RSpec.describe LinkDetailsExtractor do
         <html>
         <body>
           <script type="application/ld+json">
-            {
-              "@context":"https://schema.org",
-              "@type":"ItemList",
-              "url":"https://example.com/page.html",
-              "name":"Foo",
-              "description":"Bar"
-            },
-            {
-              "@context": "https://schema.org",
-              "@type": "BreadcrumbList",
-              "itemListElement":[
-                {
-                  "@type":"ListItem",
-                  "position":1,
-                  "item":{
-                    "@id":"https://www.example.com",
-                    "name":"Baz"
-                  }
-                }
-              ]
-            }
+            invalid LD+JSON
           </script>
           <script type="application/ld+json">
-            {
-              "@context":"https://schema.org",
-              "@type":"NewsArticle",
-              "mainEntityOfPage": {
-                "@type":"WebPage",
-                "@id": "http://example.com/page.html"
-              },
-              "headline": "Foo",
-              "description": "Bar",
-              "datePublished": "2022-01-31T19:46:00+00:00",
-              "author": {
-                "@type": "Organization",
-                "name": "Hoge"
-              },
-              "publisher": {
-                "@type": "NewsMediaOrganization",
-                "name":"Baz",
-                "url":"https://example.com/"
-              }
-            }
+            #{ld_json}
           </script>
         </body>
         </html>
       HTML
 
-      describe '#title' do
-        it 'returns the title from structured data' do
-          expect(subject.title).to eq 'Foo'
-        end
-      end
+      include_examples 'structured data'
+    end
 
-      describe '#description' do
-        it 'returns the description from structured data' do
-          expect(subject.description).to eq 'Bar'
-        end
-      end
+    context 'with preceding block of unsupported LD+JSON' do
+      let(:html) { <<~HTML }
+        <!doctype html>
+        <html>
+        <body>
+          <script type="application/ld+json">
+            [
+              {
+                "@context": "https://schema.org",
+                "@type": "ItemList",
+                "url": "https://example.com/cat.html",
+                "name": "Man bites cat",
+                "description": "A cat's tale"
+              },
+              {
+                "@context": "https://schema.org",
+                "@type": "BreadcrumbList",
+                "itemListElement":[
+                  {
+                    "@type": "ListItem",
+                    "position": 1,
+                    "item": {
+                      "@id": "https://www.example.com",
+                      "name": "Cat News"
+                    }
+                  }
+                ]
+              }
+            ]
+          </script>
+          <script type="application/ld+json">
+            #{ld_json}
+          </script>
+        </body>
+        </html>
+      HTML
 
-      describe '#provider_name' do
-        it 'returns the provider name from structured data' do
-          expect(subject.provider_name).to eq 'Baz'
-        end
-      end
+      include_examples 'structured data'
+    end
 
-      describe '#author_name' do
-        it 'returns the author name from structured data' do
-          expect(subject.author_name).to eq 'Hoge'
-        end
+    context 'with unsupported in same block LD+JSON' do
+      let(:html) { <<~HTML }
+        <!doctype html>
+        <html>
+        <body>
+          <script type="application/ld+json">
+            [
+              {
+                "@context": "https://schema.org",
+                "@type": "ItemList",
+                "url": "https://example.com/cat.html",
+                "name": "Man bites cat",
+                "description": "A cat's tale"
+              },
+              #{ld_json}
+            ]
+          </script>
+        </body>
+        </html>
+      HTML
+
+      include_examples 'structured data'
+    end
+  end
+
+  context 'when Open Graph protocol data is present' do
+    let(:html) { <<~HTML }
+      <!doctype html>
+      <html>
+      <head>
+        <meta property="og:url" content="https://example.com/dog.html">
+        <meta property="og:title" content="Man bites dog">
+        <meta property="og:description" content="A dog's tale">
+        <meta property="article:published_time" content="2022-01-31T19:53:00+00:00">
+        <meta property="og:author" content="Charlie Brown">
+        <meta property="og:locale" content="en">
+        <meta property="og:image" content="https://example.com/snoopy.jpg">
+        <meta property="og:image:alt" content="A good boy">
+        <meta property="og:site_name" content="Pet News">
+      </head>
+      </html>
+    HTML
+
+    describe '#canonical_url' do
+      it 'returns the URL from Open Graph protocol data' do
+        expect(subject.canonical_url).to eq 'https://example.com/dog.html'
+      end
+    end
+
+    describe '#title' do
+      it 'returns the title from Open Graph protocol data' do
+        expect(subject.title).to eq 'Man bites dog'
+      end
+    end
+
+    describe '#description' do
+      it 'returns the description from Open Graph protocol data' do
+        expect(subject.description).to eq "A dog's tale"
+      end
+    end
+
+    describe '#published_at' do
+      it 'returns the publicaton time from Open Graph protocol data' do
+        expect(subject.published_at).to eq '2022-01-31T19:53:00+00:00'
+      end
+    end
+
+    describe '#author_name' do
+      it 'returns the author name from Open Graph protocol data' do
+        expect(subject.author_name).to eq 'Charlie Brown'
+      end
+    end
+
+    describe '#language' do
+      it 'returns the language from Open Graph protocol data' do
+        expect(subject.language).to eq 'en'
+      end
+    end
+
+    describe '#image' do
+      it 'returns the image from Open Graph protocol data' do
+        expect(subject.image).to eq 'https://example.com/snoopy.jpg'
+      end
+    end
+
+    describe '#image:alt' do
+      it 'returns the image description from Open Graph protocol data' do
+        expect(subject.image_alt).to eq 'A good boy'
+      end
+    end
+
+    describe '#provider_name' do
+      it 'returns the provider name from Open Graph protocol data' do
+        expect(subject.provider_name).to eq 'Pet News'
       end
     end
   end
diff --git a/spec/models/media_attachment_spec.rb b/spec/models/media_attachment_spec.rb
index d142875aa9..d57d43eda7 100644
--- a/spec/models/media_attachment_spec.rb
+++ b/spec/models/media_attachment_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe MediaAttachment, paperclip_processing: true do
   describe 'local?' do
     subject { media_attachment.local? }
 
-    let(:media_attachment) { Fabricate(:media_attachment, remote_url: remote_url) }
+    let(:media_attachment) { described_class.new(remote_url: remote_url) }
 
     context 'when remote_url is blank' do
       let(:remote_url) { '' }
@@ -28,7 +28,7 @@ RSpec.describe MediaAttachment, paperclip_processing: true do
   describe 'needs_redownload?' do
     subject { media_attachment.needs_redownload? }
 
-    let(:media_attachment) { Fabricate(:media_attachment, remote_url: remote_url, file: file) }
+    let(:media_attachment) { described_class.new(remote_url: remote_url, file: file) }
 
     context 'when file is blank' do
       let(:file) { nil }
@@ -64,11 +64,11 @@ RSpec.describe MediaAttachment, paperclip_processing: true do
   end
 
   describe '#to_param' do
-    let(:media_attachment) { Fabricate(:media_attachment, shortcode: shortcode) }
-    let(:shortcode)        { nil }
+    let(:media_attachment) { Fabricate.build(:media_attachment, shortcode: shortcode, id: id) }
 
     context 'when media attachment has a shortcode' do
       let(:shortcode) { 'foo' }
+      let(:id) { 123 }
 
       it 'returns shortcode' do
         expect(media_attachment.to_param).to eq shortcode
@@ -77,9 +77,10 @@ RSpec.describe MediaAttachment, paperclip_processing: true do
 
     context 'when media attachment does not have a shortcode' do
       let(:shortcode) { nil }
+      let(:id) { 123 }
 
       it 'returns string representation of id' do
-        expect(media_attachment.to_param).to eq media_attachment.id.to_s
+        expect(media_attachment.to_param).to eq id.to_s
       end
     end
   end
@@ -89,38 +90,33 @@ RSpec.describe MediaAttachment, paperclip_processing: true do
       media.destroy
     end
 
-    it 'saves media attachment' do
+    it 'saves media attachment with correct file metadata' do
       expect(media.persisted?).to be true
       expect(media.file).to_not be_nil
-    end
 
-    it 'completes processing' do
+      # completes processing
       expect(media.processing_complete?).to be true
-    end
 
-    it 'sets type' do
+      # sets type
       expect(media.type).to eq 'image'
-    end
 
-    it 'sets content type' do
+      # sets content type
       expect(media.file_content_type).to eq content_type
-    end
 
-    it 'sets file extension' do
+      # sets file extension
       expect(media.file_file_name).to end_with extension
     end
 
-    it 'strips original file name' do
+    it 'saves media attachment with correct size metadata' do
+      # strips original file name
       expect(media.file_file_name).to_not start_with '600x400'
-    end
 
-    it 'sets meta for original' do
+      # sets meta for original
       expect(media.file.meta['original']['width']).to eq 600
       expect(media.file.meta['original']['height']).to eq 400
       expect(media.file.meta['original']['aspect']).to eq 1.5
-    end
 
-    it 'sets meta for thumbnail' do
+      # sets meta for thumbnail
       expect(media.file.meta['small']['width']).to eq 588
       expect(media.file.meta['small']['height']).to eq 392
       expect(media.file.meta['small']['aspect']).to eq 1.5
@@ -128,54 +124,48 @@ RSpec.describe MediaAttachment, paperclip_processing: true do
   end
 
   describe 'jpeg' do
-    let(:media) { described_class.create(account: Fabricate(:account), file: attachment_fixture('600x400.jpeg')) }
+    let(:media) { Fabricate(:media_attachment, file: attachment_fixture('600x400.jpeg')) }
 
     it_behaves_like 'static 600x400 image', 'image/jpeg', '.jpeg'
   end
 
   describe 'png' do
-    let(:media) { described_class.create(account: Fabricate(:account), file: attachment_fixture('600x400.png')) }
+    let(:media) { Fabricate(:media_attachment, file: attachment_fixture('600x400.png')) }
 
     it_behaves_like 'static 600x400 image', 'image/png', '.png'
   end
 
   describe 'webp' do
-    let(:media) { described_class.create(account: Fabricate(:account), file: attachment_fixture('600x400.webp')) }
+    let(:media) { Fabricate(:media_attachment, file: attachment_fixture('600x400.webp')) }
 
     it_behaves_like 'static 600x400 image', 'image/webp', '.webp'
   end
 
   describe 'avif' do
-    let(:media) { described_class.create(account: Fabricate(:account), file: attachment_fixture('600x400.avif')) }
+    let(:media) { Fabricate(:media_attachment, file: attachment_fixture('600x400.avif')) }
 
     it_behaves_like 'static 600x400 image', 'image/jpeg', '.jpeg'
   end
 
   describe 'heic' do
-    let(:media) { described_class.create(account: Fabricate(:account), file: attachment_fixture('600x400.heic')) }
+    let(:media) { Fabricate(:media_attachment, file: attachment_fixture('600x400.heic')) }
 
     it_behaves_like 'static 600x400 image', 'image/jpeg', '.jpeg'
   end
 
   describe 'base64-encoded image' do
     let(:base64_attachment) { "data:image/jpeg;base64,#{Base64.encode64(attachment_fixture('600x400.jpeg').read)}" }
-    let(:media) { described_class.create(account: Fabricate(:account), file: base64_attachment) }
+    let(:media) { Fabricate(:media_attachment, file: base64_attachment) }
 
     it_behaves_like 'static 600x400 image', 'image/jpeg', '.jpeg'
   end
 
   describe 'animated gif' do
-    let(:media) { described_class.create(account: Fabricate(:account), file: attachment_fixture('avatar.gif')) }
+    let(:media) { Fabricate(:media_attachment, file: attachment_fixture('avatar.gif')) }
 
-    it 'sets type to gifv' do
+    it 'sets correct file metadata' do
       expect(media.type).to eq 'gifv'
-    end
-
-    it 'converts original file to mp4' do
       expect(media.file_content_type).to eq 'video/mp4'
-    end
-
-    it 'sets meta' do
       expect(media.file.meta['original']['width']).to eq 128
       expect(media.file.meta['original']['height']).to eq 128
     end
@@ -189,17 +179,11 @@ RSpec.describe MediaAttachment, paperclip_processing: true do
 
     fixtures.each do |fixture|
       context fixture[:filename] do
-        let(:media) { described_class.create(account: Fabricate(:account), file: attachment_fixture(fixture[:filename])) }
+        let(:media) { Fabricate(:media_attachment, file: attachment_fixture(fixture[:filename])) }
 
-        it 'sets type to image' do
+        it 'sets correct file metadata' do
           expect(media.type).to eq 'image'
-        end
-
-        it 'leaves original file as-is' do
           expect(media.file_content_type).to eq 'image/gif'
-        end
-
-        it 'sets meta' do
           expect(media.file.meta['original']['width']).to eq fixture[:width]
           expect(media.file.meta['original']['height']).to eq fixture[:height]
           expect(media.file.meta['original']['aspect']).to eq fixture[:aspect]
@@ -209,31 +193,19 @@ RSpec.describe MediaAttachment, paperclip_processing: true do
   end
 
   describe 'ogg with cover art' do
-    let(:media) { described_class.create(account: Fabricate(:account), file: attachment_fixture('boop.ogg')) }
+    let(:media) { Fabricate(:media_attachment, file: attachment_fixture('boop.ogg')) }
 
-    it 'detects it as an audio file' do
+    it 'sets correct file metadata' do
       expect(media.type).to eq 'audio'
-    end
-
-    it 'sets meta for the duration' do
       expect(media.file.meta['original']['duration']).to be_within(0.05).of(0.235102)
-    end
-
-    it 'extracts thumbnail' do
       expect(media.thumbnail.present?).to be true
-    end
-
-    it 'extracts colors from thumbnail' do
       expect(media.file.meta['colors']['background']).to eq '#3088d4'
-    end
-
-    it 'gives the file a random name' do
       expect(media.file_file_name).to_not eq 'boop.ogg'
     end
   end
 
   describe 'mp3 with large cover art' do
-    let(:media) { described_class.create(account: Fabricate(:account), file: attachment_fixture('boop.mp3')) }
+    let(:media) { Fabricate(:media_attachment, file: attachment_fixture('boop.mp3')) }
 
     it 'detects it as an audio file' do
       expect(media.type).to eq 'audio'
@@ -253,34 +225,36 @@ RSpec.describe MediaAttachment, paperclip_processing: true do
   end
 
   it 'is invalid without file' do
-    media = described_class.new(account: Fabricate(:account))
+    media = described_class.new
+
     expect(media.valid?).to be false
+    expect(media).to model_have_error_on_field(:file)
   end
 
   describe 'size limit validation' do
     it 'rejects video files that are too large' do
       stub_const 'MediaAttachment::IMAGE_LIMIT', 100.megabytes
       stub_const 'MediaAttachment::VIDEO_LIMIT', 1.kilobyte
-      expect { described_class.create!(account: Fabricate(:account), file: attachment_fixture('attachment.webm')) }.to raise_error(ActiveRecord::RecordInvalid)
+      expect { Fabricate(:media_attachment, file: attachment_fixture('attachment.webm')) }.to raise_error(ActiveRecord::RecordInvalid)
     end
 
     it 'accepts video files that are small enough' do
       stub_const 'MediaAttachment::IMAGE_LIMIT', 1.kilobyte
       stub_const 'MediaAttachment::VIDEO_LIMIT', 100.megabytes
-      media = described_class.create!(account: Fabricate(:account), file: attachment_fixture('attachment.webm'))
+      media = Fabricate(:media_attachment, file: attachment_fixture('attachment.webm'))
       expect(media.valid?).to be true
     end
 
     it 'rejects image files that are too large' do
       stub_const 'MediaAttachment::IMAGE_LIMIT', 1.kilobyte
       stub_const 'MediaAttachment::VIDEO_LIMIT', 100.megabytes
-      expect { described_class.create!(account: Fabricate(:account), file: attachment_fixture('attachment.jpg')) }.to raise_error(ActiveRecord::RecordInvalid)
+      expect { Fabricate(:media_attachment, file: attachment_fixture('attachment.jpg')) }.to raise_error(ActiveRecord::RecordInvalid)
     end
 
     it 'accepts image files that are small enough' do
       stub_const 'MediaAttachment::IMAGE_LIMIT', 100.megabytes
       stub_const 'MediaAttachment::VIDEO_LIMIT', 1.kilobyte
-      media = described_class.create!(account: Fabricate(:account), file: attachment_fixture('attachment.jpg'))
+      media = Fabricate(:media_attachment, file: attachment_fixture('attachment.jpg'))
       expect(media.valid?).to be true
     end
   end
diff --git a/spec/models/report_filter_spec.rb b/spec/models/report_filter_spec.rb
index 4b0852f081..6baf0ea421 100644
--- a/spec/models/report_filter_spec.rb
+++ b/spec/models/report_filter_spec.rb
@@ -23,8 +23,7 @@ describe ReportFilter do
     it 'combines filters on Report' do
       filter = described_class.new(account_id: '123', resolved: true, target_account_id: '456')
 
-      allow(Report).to receive(:where).and_return(Report.none)
-      allow(Report).to receive(:resolved).and_return(Report.none)
+      allow(Report).to receive_messages(where: Report.none, resolved: Report.none)
       filter.results
       expect(Report).to have_received(:where).with(account_id: '123')
       expect(Report).to have_received(:where).with(target_account_id: '456')
diff --git a/spec/requests/api/v1/instances/languages_spec.rb b/spec/requests/api/v1/instances/languages_spec.rb
new file mode 100644
index 0000000000..8ab8bf99ce
--- /dev/null
+++ b/spec/requests/api/v1/instances/languages_spec.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Languages' do
+  describe 'GET /api/v1/instance/languages' do
+    before do
+      get '/api/v1/instance/languages'
+    end
+
+    it 'returns http success' do
+      expect(response).to have_http_status(200)
+    end
+
+    it 'returns the supported languages' do
+      expect(body_as_json.pluck(:code)).to match_array LanguagesHelper::SUPPORTED_LOCALES.keys.map(&:to_s)
+    end
+  end
+end
diff --git a/spec/requests/api/v1/profiles_spec.rb b/spec/requests/api/v1/profiles_spec.rb
new file mode 100644
index 0000000000..26a9b848e5
--- /dev/null
+++ b/spec/requests/api/v1/profiles_spec.rb
@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Deleting profile images' do
+  let(:account) do
+    Fabricate(
+      :account,
+      avatar: fixture_file_upload('avatar.gif', 'image/gif'),
+      header: fixture_file_upload('attachment.jpg', 'image/jpeg')
+    )
+  end
+  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: account.user.id, scopes: scopes) }
+  let(:scopes)  { 'write:accounts' }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
+
+  describe 'DELETE /api/v1/profile' do
+    before do
+      allow(ActivityPub::UpdateDistributionWorker).to receive(:perform_async)
+    end
+
+    context 'when deleting an avatar' do
+      context 'with wrong scope' do
+        before do
+          delete '/api/v1/profile/avatar', headers: headers
+        end
+
+        it_behaves_like 'forbidden for wrong scope', 'read'
+      end
+
+      it 'returns http success' do
+        delete '/api/v1/profile/avatar', headers: headers
+
+        expect(response).to have_http_status(200)
+      end
+
+      it 'deletes the avatar' do
+        delete '/api/v1/profile/avatar', headers: headers
+
+        account.reload
+
+        expect(account.avatar).to_not exist
+      end
+
+      it 'does not delete the header' do
+        delete '/api/v1/profile/avatar', headers: headers
+
+        account.reload
+
+        expect(account.header).to exist
+      end
+
+      it 'queues up an account update distribution' do
+        delete '/api/v1/profile/avatar', headers: headers
+
+        expect(ActivityPub::UpdateDistributionWorker).to have_received(:perform_async).with(account.id)
+      end
+    end
+
+    context 'when deleting a header' do
+      context 'with wrong scope' do
+        before do
+          delete '/api/v1/profile/header', headers: headers
+        end
+
+        it_behaves_like 'forbidden for wrong scope', 'read'
+      end
+
+      it 'returns http success' do
+        delete '/api/v1/profile/header', headers: headers
+
+        expect(response).to have_http_status(200)
+      end
+
+      it 'does not delete the avatar' do
+        delete '/api/v1/profile/header', headers: headers
+
+        account.reload
+
+        expect(account.avatar).to exist
+      end
+
+      it 'deletes the header' do
+        delete '/api/v1/profile/header', headers: headers
+
+        account.reload
+
+        expect(account.header).to_not exist
+      end
+
+      it 'queues up an account update distribution' do
+        delete '/api/v1/profile/header', headers: headers
+
+        expect(ActivityPub::UpdateDistributionWorker).to have_received(:perform_async).with(account.id)
+      end
+    end
+  end
+end
diff --git a/spec/requests/api/v1/timelines/public_spec.rb b/spec/requests/api/v1/timelines/public_spec.rb
index 84b6c6f239..4afa40e580 100644
--- a/spec/requests/api/v1/timelines/public_spec.rb
+++ b/spec/requests/api/v1/timelines/public_spec.rb
@@ -60,6 +60,13 @@ describe 'Public' do
         it_behaves_like 'a successful request to the public timeline'
       end
 
+      context 'with local and remote params' do
+        let(:params) { { local: true, remote: true } }
+        let(:expected_statuses) { [local_status, remote_status, media_status] }
+
+        it_behaves_like 'a successful request to the public timeline'
+      end
+
       context 'with only_media param' do
         let(:params) { { only_media: true } }
         let(:expected_statuses) { [media_status] }
diff --git a/spec/services/bulk_import_row_service_spec.rb b/spec/services/bulk_import_row_service_spec.rb
index 5e09845b53..a77acc0732 100644
--- a/spec/services/bulk_import_row_service_spec.rb
+++ b/spec/services/bulk_import_row_service_spec.rb
@@ -161,6 +161,12 @@ RSpec.describe BulkImportRowService do
         end
 
         include_examples 'common behavior'
+
+        it 'does not create a new list' do
+          account.follow!(target_account)
+
+          expect { subject.call(import_row) }.to_not(change { List.where(title: 'my list').count })
+        end
       end
     end
   end
diff --git a/spec/services/suspend_account_service_spec.rb b/spec/services/suspend_account_service_spec.rb
index 7cdbc873e3..edb7050083 100644
--- a/spec/services/suspend_account_service_spec.rb
+++ b/spec/services/suspend_account_service_spec.rb
@@ -10,8 +10,7 @@ RSpec.describe SuspendAccountService, type: :service do
     let!(:list)           { Fabricate(:list, account: local_follower) }
 
     before do
-      allow(FeedManager.instance).to receive(:unmerge_from_home).and_return(nil)
-      allow(FeedManager.instance).to receive(:unmerge_from_list).and_return(nil)
+      allow(FeedManager.instance).to receive_messages(unmerge_from_home: nil, unmerge_from_list: nil)
 
       local_follower.follow!(account)
       list.accounts << account
diff --git a/spec/services/translate_status_service_spec.rb b/spec/services/translate_status_service_spec.rb
index 515dd1a997..5f6418f5d6 100644
--- a/spec/services/translate_status_service_spec.rb
+++ b/spec/services/translate_status_service_spec.rb
@@ -29,8 +29,7 @@ RSpec.describe TranslateStatusService, type: :service do
         end
       end
 
-      allow(TranslationService).to receive(:configured?).and_return(true)
-      allow(TranslationService).to receive(:configured).and_return(translation_service)
+      allow(TranslationService).to receive_messages(configured?: true, configured: translation_service)
     end
 
     it 'returns translated status content' do
diff --git a/spec/services/unsuspend_account_service_spec.rb b/spec/services/unsuspend_account_service_spec.rb
index 3c13d5bd39..c555b661ec 100644
--- a/spec/services/unsuspend_account_service_spec.rb
+++ b/spec/services/unsuspend_account_service_spec.rb
@@ -10,8 +10,7 @@ RSpec.describe UnsuspendAccountService, type: :service do
     let!(:list)           { Fabricate(:list, account: local_follower) }
 
     before do
-      allow(FeedManager.instance).to receive(:merge_into_home).and_return(nil)
-      allow(FeedManager.instance).to receive(:merge_into_list).and_return(nil)
+      allow(FeedManager.instance).to receive_messages(merge_into_home: nil, merge_into_list: nil)
 
       local_follower.follow!(account)
       list.accounts << account
diff --git a/spec/views/statuses/show.html.haml_spec.rb b/spec/views/statuses/show.html.haml_spec.rb
index 06f5132d9f..354f9d3e63 100644
--- a/spec/views/statuses/show.html.haml_spec.rb
+++ b/spec/views/statuses/show.html.haml_spec.rb
@@ -4,15 +4,9 @@ require 'rails_helper'
 
 describe 'statuses/show.html.haml', without_verify_partial_doubles: true do
   before do
-    allow(view).to receive(:api_oembed_url).and_return('')
-    allow(view).to receive(:show_landing_strip?).and_return(true)
-    allow(view).to receive(:site_title).and_return('example site')
-    allow(view).to receive(:site_hostname).and_return('example.com')
-    allow(view).to receive(:full_asset_url).and_return('//asset.host/image.svg')
+    allow(view).to receive_messages(api_oembed_url: '', show_landing_strip?: true, site_title: 'example site', site_hostname: 'example.com', full_asset_url: '//asset.host/image.svg', current_account: nil, single_user_mode?: false)
     allow(view).to receive(:local_time)
     allow(view).to receive(:local_time_ago)
-    allow(view).to receive(:current_account).and_return(nil)
-    allow(view).to receive(:single_user_mode?).and_return(false)
     assign(:instance_presenter, InstancePresenter.new)
   end
 
diff --git a/streaming/index.js b/streaming/index.js
index 09085252cf..42b095973c 100644
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -10,6 +10,7 @@ const { JSDOM } = require('jsdom');
 const log = require('npmlog');
 const pg = require('pg');
 const dbUrlToConfig = require('pg-connection-string').parse;
+const metrics = require('prom-client');
 const redis = require('redis');
 const uuid = require('uuid');
 const WebSocket = require('ws');
@@ -119,6 +120,11 @@ const pgConfigFromEnv = (env) => {
 
   if (env.DATABASE_URL) {
     baseConfig = dbUrlToConfig(env.DATABASE_URL);
+
+    // Support overriding the database password in the connection URL
+    if (!baseConfig.password && env.DB_PASS) {
+      baseConfig.password = env.DB_PASS;
+    }
   } else {
     baseConfig = pgConfigs[environment];
 
@@ -193,6 +199,73 @@ const startServer = async () => {
   const redisSubscribeClient = await redisUrlToClient(redisParams, redisUrl);
   const redisClient = await redisUrlToClient(redisParams, redisUrl);
 
+  // Collect metrics from Node.js
+  metrics.collectDefaultMetrics();
+
+  new metrics.Gauge({
+    name: 'pg_pool_total_connections',
+    help: 'The total number of clients existing within the pool',
+    collect() {
+      this.set(pgPool.totalCount);
+    },
+  });
+
+  new metrics.Gauge({
+    name: 'pg_pool_idle_connections',
+    help: 'The number of clients which are not checked out but are currently idle in the pool',
+    collect() {
+      this.set(pgPool.idleCount);
+    },
+  });
+
+  new metrics.Gauge({
+    name: 'pg_pool_waiting_queries',
+    help: 'The number of queued requests waiting on a client when all clients are checked out',
+    collect() {
+      this.set(pgPool.waitingCount);
+    },
+  });
+
+  const connectedClients = new metrics.Gauge({
+    name: 'connected_clients',
+    help: 'The number of clients connected to the streaming server',
+    labelNames: ['type'],
+  });
+
+  connectedClients.set({ type: 'websocket' }, 0);
+  connectedClients.set({ type: 'eventsource' }, 0);
+
+  const connectedChannels = new metrics.Gauge({
+    name: 'connected_channels',
+    help: 'The number of channels the streaming server is streaming to',
+    labelNames: [ 'type', 'channel' ]
+  });
+
+  const redisSubscriptions = new metrics.Gauge({
+    name: 'redis_subscriptions',
+    help: 'The number of Redis channels the streaming server is subscribed to',
+  });
+
+  // When checking metrics in the browser, the favicon is requested this
+  // prevents the request from falling through to the API Router, which would
+  // error for this endpoint:
+  app.get('/favicon.ico', (req, res) => res.status(404).end());
+
+  app.get('/api/v1/streaming/health', (req, res) => {
+    res.writeHead(200, { 'Content-Type': 'text/plain' });
+    res.end('OK');
+  });
+
+  app.get('/metrics', async (req, res) => {
+    try {
+      res.set('Content-Type', metrics.register.contentType);
+      res.end(await metrics.register.metrics());
+    } catch (ex) {
+      log.error(ex);
+      res.status(500).end();
+    }
+  });
+
   /**
    * @param {string[]} channels
    * @returns {function(): void}
@@ -250,6 +323,7 @@ const startServer = async () => {
     if (subs[channel].length === 0) {
       log.verbose(`Subscribe ${channel}`);
       redisSubscribeClient.subscribe(channel, onRedisMessage);
+      redisSubscriptions.inc();
     }
 
     subs[channel].push(callback);
@@ -271,6 +345,7 @@ const startServer = async () => {
     if (subs[channel].length === 0) {
       log.verbose(`Unsubscribe ${channel}`);
       redisSubscribeClient.unsubscribe(channel);
+      redisSubscriptions.dec();
       delete subs[channel];
     }
   };
@@ -444,7 +519,7 @@ const startServer = async () => {
 
   /**
    * @param {any} req
-   * @param {string} channelName
+   * @param {string|undefined} channelName
    * @returns {Promise.<void>}
    */
   const checkScopes = (req, channelName) => new Promise((resolve, reject) => {
@@ -547,10 +622,14 @@ const startServer = async () => {
     res.on('close', () => {
       unsubscribe(`${redisPrefix}${accessTokenChannelId}`, listener);
       unsubscribe(`${redisPrefix}${systemChannelId}`, listener);
+
+      connectedChannels.labels({ type: 'eventsource', channel: 'system' }).dec(2);
     });
 
     subscribe(`${redisPrefix}${accessTokenChannelId}`, listener);
     subscribe(`${redisPrefix}${systemChannelId}`, listener);
+
+    connectedChannels.labels({ type: 'eventsource', channel: 'system' }).inc(2);
   };
 
   /**
@@ -564,7 +643,19 @@ const startServer = async () => {
       return;
     }
 
-    accountFromRequest(req).then(() => checkScopes(req, channelNameFromPath(req))).then(() => {
+    const channelName = channelNameFromPath(req);
+
+    // If no channelName can be found for the request, then we should terminate
+    // the connection, as there's nothing to stream back
+    if (!channelName) {
+      const err = new Error('Unknown channel requested');
+      err.status = 400;
+
+      next(err);
+      return;
+    }
+
+    accountFromRequest(req).then(() => checkScopes(req, channelName)).then(() => {
       subscribeHttpToSystemChannel(req, res);
     }).then(() => {
       next();
@@ -866,6 +957,15 @@ const startServer = async () => {
   const streamToHttp = (req, res) => {
     const accountId = req.accountId || req.remoteAddress;
 
+    const channelName = channelNameFromPath(req);
+
+    connectedClients.labels({ type: 'eventsource' }).inc();
+
+    // In theory we'll always have a channel name, but channelNameFromPath can return undefined:
+    if (typeof channelName === 'string') {
+      connectedChannels.labels({ type: 'eventsource', channel: channelName }).inc();
+    }
+
     res.setHeader('Content-Type', 'text/event-stream');
     res.setHeader('Cache-Control', 'no-store');
     res.setHeader('Transfer-Encoding', 'chunked');
@@ -876,6 +976,14 @@ const startServer = async () => {
 
     req.on('close', () => {
       log.verbose(req.requestId, `Ending stream for ${accountId}`);
+      // We decrement these counters here instead of in streamHttpEnd as in that
+      // method we don't have knowledge of the channel names
+      connectedClients.labels({ type: 'eventsource' }).dec();
+      // In theory we'll always have a channel name, but channelNameFromPath can return undefined:
+      if (typeof channelName === 'string') {
+        connectedChannels.labels({ type: 'eventsource', channel: channelName }).dec();
+      }
+
       clearInterval(heartbeat);
     });
 
@@ -930,40 +1038,18 @@ const startServer = async () => {
     res.end(JSON.stringify({ error: 'Not found' }));
   };
 
-  app.use(setRequestId);
-  app.use(setRemoteAddress);
-  app.use(allowCrossDomain);
+  const api = express.Router();
 
-  app.get('/api/v1/streaming/health', (req, res) => {
-    res.writeHead(200, { 'Content-Type': 'text/plain' });
-    res.end('OK');
-  });
+  app.use(api);
 
-  app.get('/metrics', (req, res) => server.getConnections((err, count) => {
-    res.writeHeader(200, { 'Content-Type': 'application/openmetrics-text; version=1.0.0; charset=utf-8' });
-    res.write('# TYPE connected_clients gauge\n');
-    res.write('# HELP connected_clients The number of clients connected to the streaming server\n');
-    res.write(`connected_clients ${count}.0\n`);
-    res.write('# TYPE connected_channels gauge\n');
-    res.write('# HELP connected_channels The number of Redis channels the streaming server is subscribed to\n');
-    res.write(`connected_channels ${Object.keys(subs).length}.0\n`);
-    res.write('# TYPE pg_pool_total_connections gauge\n');
-    res.write('# HELP pg_pool_total_connections The total number of clients existing within the pool\n');
-    res.write(`pg_pool_total_connections ${pgPool.totalCount}.0\n`);
-    res.write('# TYPE pg_pool_idle_connections gauge\n');
-    res.write('# HELP pg_pool_idle_connections The number of clients which are not checked out but are currently idle in the pool\n');
-    res.write(`pg_pool_idle_connections ${pgPool.idleCount}.0\n`);
-    res.write('# TYPE pg_pool_waiting_queries gauge\n');
-    res.write('# HELP pg_pool_waiting_queries The number of queued requests waiting on a client when all clients are checked out\n');
-    res.write(`pg_pool_waiting_queries ${pgPool.waitingCount}.0\n`);
-    res.write('# EOF\n');
-    res.end();
-  }));
+  api.use(setRequestId);
+  api.use(setRemoteAddress);
+  api.use(allowCrossDomain);
 
-  app.use(authenticationMiddleware);
-  app.use(errorMiddleware);
+  api.use(authenticationMiddleware);
+  api.use(errorMiddleware);
 
-  app.get('/api/v1/streaming/*', (req, res) => {
+  api.get('/api/v1/streaming/*', (req, res) => {
     channelNameToIds(req, channelNameFromPath(req), req.query).then(({ channelIds, options }) => {
       const onSend = streamToHttp(req, res);
       const onEnd = streamHttpEnd(req, subscriptionHeartbeat(channelIds));
@@ -1172,15 +1258,16 @@ const startServer = async () => {
    * @typedef WebSocketSession
    * @property {any} socket
    * @property {any} request
-   * @property {Object.<string, { listener: SubscriptionListener, stopHeartbeat: function(): void }>} subscriptions
+   * @property {Object.<string, { channelName: string, listener: SubscriptionListener, stopHeartbeat: function(): void }>} subscriptions
    */
 
   /**
    * @param {WebSocketSession} session
    * @param {string} channelName
    * @param {StreamParams} params
+   * @returns {void}
    */
-  const subscribeWebsocketToChannel = ({ socket, request, subscriptions }, channelName, params) =>
+  const subscribeWebsocketToChannel = ({ socket, request, subscriptions }, channelName, params) => {
     checkScopes(request, channelName).then(() => channelNameToIds(request, channelName, params)).then(({
       channelIds,
       options,
@@ -1193,7 +1280,10 @@ const startServer = async () => {
       const stopHeartbeat = subscriptionHeartbeat(channelIds);
       const listener = streamFrom(channelIds, request, onSend, undefined, options.needsFiltering, options.allowLocalOnly);
 
+      connectedChannels.labels({ type: 'websocket', channel: channelName }).inc();
+
       subscriptions[channelIds.join(';')] = {
+        channelName,
         listener,
         stopHeartbeat,
       };
@@ -1201,35 +1291,47 @@ const startServer = async () => {
       log.verbose(request.requestId, 'Subscription error:', err.toString());
       socket.send(JSON.stringify({ error: err.toString() }));
     });
+  }
+
+
+  const removeSubscription = (subscriptions, channelIds, request) => {
+    log.verbose(request.requestId, `Ending stream from ${channelIds.join(', ')} for ${request.accountId}`);
+
+    const subscription = subscriptions[channelIds.join(';')];
+
+    if (!subscription) {
+      return;
+    }
+
+    channelIds.forEach(channelId => {
+      unsubscribe(`${redisPrefix}${channelId}`, subscription.listener);
+    });
+
+    connectedChannels.labels({ type: 'websocket', channel: subscription.channelName }).dec();
+    subscription.stopHeartbeat();
+
+    delete subscriptions[channelIds.join(';')];
+  }
 
   /**
    * @param {WebSocketSession} session
    * @param {string} channelName
    * @param {StreamParams} params
+   * @returns {void}
    */
-  const unsubscribeWebsocketFromChannel = ({ socket, request, subscriptions }, channelName, params) =>
+  const unsubscribeWebsocketFromChannel = ({ socket, request, subscriptions }, channelName, params) => {
     channelNameToIds(request, channelName, params).then(({ channelIds }) => {
-      log.verbose(request.requestId, `Ending stream from ${channelIds.join(', ')} for ${request.accountId}`);
-
-      const subscription = subscriptions[channelIds.join(';')];
-
-      if (!subscription) {
-        return;
-      }
-
-      const { listener, stopHeartbeat } = subscription;
-
-      channelIds.forEach(channelId => {
-        unsubscribe(`${redisPrefix}${channelId}`, listener);
-      });
-
-      stopHeartbeat();
-
-      delete subscriptions[channelIds.join(';')];
+      removeSubscription(subscriptions, channelIds, request);
     }).catch(err => {
-      log.verbose(request.requestId, 'Unsubscription error:', err);
-      socket.send(JSON.stringify({ error: err.toString() }));
+      log.verbose(request.requestId, 'Unsubscribe error:', err);
+
+      // If we have a socket that is alive and open still, send the error back to the client:
+      // FIXME: In other parts of the code ws === socket
+      if (socket.isAlive && socket.readyState === socket.OPEN) {
+        socket.send(JSON.stringify({ error: "Error unsubscribing from channel" }));
+      }
     });
+  }
 
   /**
    * @param {WebSocketSession} session
@@ -1250,16 +1352,20 @@ const startServer = async () => {
     subscribe(`${redisPrefix}${systemChannelId}`, listener);
 
     subscriptions[accessTokenChannelId] = {
+      channelName: 'system',
       listener,
       stopHeartbeat: () => {
       },
     };
 
     subscriptions[systemChannelId] = {
+      channelName: 'system',
       listener,
       stopHeartbeat: () => {
       },
     };
+
+    connectedChannels.labels({ type: 'websocket', channel: 'system' }).inc(2);
   };
 
   /**
@@ -1286,6 +1392,8 @@ const startServer = async () => {
       ws.isAlive = true;
     });
 
+    connectedClients.labels({ type: 'websocket' }).inc();
+
     /**
      * @type {WebSocketSession}
      */
@@ -1296,17 +1404,18 @@ const startServer = async () => {
     };
 
     const onEnd = () => {
-      const keys = Object.keys(session.subscriptions);
+      const subscriptions = Object.keys(session.subscriptions);
 
-      keys.forEach(channelIds => {
-        const { listener, stopHeartbeat } = session.subscriptions[channelIds];
-
-        channelIds.split(';').forEach(channelId => {
-          unsubscribe(`${redisPrefix}${channelId}`, listener);
-        });
-
-        stopHeartbeat();
+      subscriptions.forEach(channelIds => {
+        removeSubscription(session.subscriptions, channelIds.split(';'), req)
       });
+
+      // ensure garbage collection:
+      session.socket = null;
+      session.request = null;
+      session.subscriptions = {};
+
+      connectedClients.labels({ type: 'websocket' }).dec();
     };
 
     ws.on('close', onEnd);
diff --git a/yarn.lock b/yarn.lock
index 90a7a6e304..37ffdf4dea 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13,9 +13,9 @@ __metadata:
   linkType: hard
 
 "@adobe/css-tools@npm:^4.0.1":
-  version: 4.3.0
-  resolution: "@adobe/css-tools@npm:4.3.0"
-  checksum: 63c9702a91bfda13767fcb3107056ed19463e9a4dcb3b5918d64c8eb7e609357c59b1355c0226765b60323adbb0abd88564acfa1e2b20067219c3ad23576c0b3
+  version: 4.3.1
+  resolution: "@adobe/css-tools@npm:4.3.1"
+  checksum: ad43456379ff391132aff687ece190cb23ea69395e23c9b96690eeabe2468da89a4aaf266e4f8b6eaab53db3d1064107ce0f63c3a974e864f4a04affc768da3f
   languageName: node
   linkType: hard
 
@@ -52,7 +52,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/compat-data@npm:^7.22.5, @babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.22.9":
+"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.22.9":
   version: 7.22.9
   resolution: "@babel/compat-data@npm:7.22.9"
   checksum: bed77d9044ce948b4327b30dd0de0779fa9f3a7ed1f2d31638714ed00229fa71fc4d1617ae0eb1fad419338d3658d0e9a5a083297451e09e73e078d0347ff808
@@ -60,25 +60,25 @@ __metadata:
   linkType: hard
 
 "@babel/core@npm:^7.10.4, @babel/core@npm:^7.11.1, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.22.1":
-  version: 7.22.10
-  resolution: "@babel/core@npm:7.22.10"
+  version: 7.22.11
+  resolution: "@babel/core@npm:7.22.11"
   dependencies:
     "@ampproject/remapping": ^2.2.0
     "@babel/code-frame": ^7.22.10
     "@babel/generator": ^7.22.10
     "@babel/helper-compilation-targets": ^7.22.10
     "@babel/helper-module-transforms": ^7.22.9
-    "@babel/helpers": ^7.22.10
-    "@babel/parser": ^7.22.10
+    "@babel/helpers": ^7.22.11
+    "@babel/parser": ^7.22.11
     "@babel/template": ^7.22.5
-    "@babel/traverse": ^7.22.10
-    "@babel/types": ^7.22.10
+    "@babel/traverse": ^7.22.11
+    "@babel/types": ^7.22.11
     convert-source-map: ^1.7.0
     debug: ^4.1.0
     gensync: ^1.0.0-beta.2
-    json5: ^2.2.2
+    json5: ^2.2.3
     semver: ^6.3.1
-  checksum: cc4efa09209fe1f733cf512e9e4bb50870b191ab2dee8014e34cd6e731f204e48476cc53b4bbd0825d4d342304d577ae43ff5fd8ab3896080673c343321acb32
+  checksum: f258b2539ea2e5bfe55a708c2f3e1093a1b4744f12becc35abeb896037b66210de9a8ad6296a706046d5dc3a24e564362b73a9b814e5bfe500c8baab60c22d2e
   languageName: node
   linkType: hard
 
@@ -135,9 +135,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-create-class-features-plugin@npm:^7.22.10, @babel/helper-create-class-features-plugin@npm:^7.22.5":
-  version: 7.22.10
-  resolution: "@babel/helper-create-class-features-plugin@npm:7.22.10"
+"@babel/helper-create-class-features-plugin@npm:^7.22.11, @babel/helper-create-class-features-plugin@npm:^7.22.5":
+  version: 7.22.11
+  resolution: "@babel/helper-create-class-features-plugin@npm:7.22.11"
   dependencies:
     "@babel/helper-annotate-as-pure": ^7.22.5
     "@babel/helper-environment-visitor": ^7.22.5
@@ -150,7 +150,7 @@ __metadata:
     semver: ^6.3.1
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 9683edbf73889abce183b06eac29524448aaab1dba7bdccdd6c26cf03e5ade3903b581b4d681da88fbff824fa117b840cc945bebf7db3c1f8c745f3c5a8a2595
+  checksum: b7aeb22e29aba5327616328576363522b3b186918faeda605e300822af4a5f29416eb34b5bd825d07ab496550e271d02d7634f0022a62b5b8cbf0eb6389bc3fa
   languageName: node
   linkType: hard
 
@@ -342,14 +342,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helpers@npm:^7.22.10":
-  version: 7.22.10
-  resolution: "@babel/helpers@npm:7.22.10"
+"@babel/helpers@npm:^7.22.11":
+  version: 7.22.11
+  resolution: "@babel/helpers@npm:7.22.11"
   dependencies:
     "@babel/template": ^7.22.5
-    "@babel/traverse": ^7.22.10
-    "@babel/types": ^7.22.10
-  checksum: 3b1219e362df390b6c5d94b75a53fc1c2eb42927ced0b8022d6a29b833a839696206b9bdad45b4805d05591df49fc16b6fb7db758c9c2ecfe99e3e94cb13020f
+    "@babel/traverse": ^7.22.11
+    "@babel/types": ^7.22.11
+  checksum: 93186544228b5e371486466ec3b86a77cce91beeff24a5670ca8ec46d50328f7700dab82d532351286e9d68624dc51d6d71589b051dd9535e44be077a43ec013
   languageName: node
   linkType: hard
 
@@ -364,12 +364,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.22.10, @babel/parser@npm:^7.22.5":
-  version: 7.22.10
-  resolution: "@babel/parser@npm:7.22.10"
+"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.22.11, @babel/parser@npm:^7.22.5":
+  version: 7.22.11
+  resolution: "@babel/parser@npm:7.22.11"
   bin:
     parser: ./bin/babel-parser.js
-  checksum: af51567b7d3cdf523bc608eae057397486c7fa6c2e5753027c01fe5c36f0767b2d01ce3049b222841326cc5b8c7fda1d810ac1a01af0a97bb04679e2ef9f7049
+  checksum: 332079ed09794d3685343e9fc39c6a12dcb6ea589119f2135952cdef2424296786bb609a33f6dfa9be271797bbf8339f1865118418ea50b32a0c701734c96664
   languageName: node
   linkType: hard
 
@@ -650,8 +650,8 @@ __metadata:
   linkType: hard
 
 "@babel/plugin-transform-async-generator-functions@npm:^7.22.10":
-  version: 7.22.10
-  resolution: "@babel/plugin-transform-async-generator-functions@npm:7.22.10"
+  version: 7.22.11
+  resolution: "@babel/plugin-transform-async-generator-functions@npm:7.22.11"
   dependencies:
     "@babel/helper-environment-visitor": ^7.22.5
     "@babel/helper-plugin-utils": ^7.22.5
@@ -659,7 +659,7 @@ __metadata:
     "@babel/plugin-syntax-async-generators": ^7.8.4
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 87d77b66fda05b42450aa285fa031aa3963c52aab00190f95f6c3ddefbed683035c1f314347c888f8406fba5d436b888ff75b5e36b8ab23afd4ca4c3f086f88c
+  checksum: f11227a1d2831972a7fe28ed54a618ee251547632dc384b2f291f9d8d6aae1177a68c6bbd7709ab78275fa84e757ae795ec08061d94f6f01826f02a35ee875d4
   languageName: node
   linkType: hard
 
@@ -711,15 +711,15 @@ __metadata:
   linkType: hard
 
 "@babel/plugin-transform-class-static-block@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-class-static-block@npm:7.22.5"
+  version: 7.22.11
+  resolution: "@babel/plugin-transform-class-static-block@npm:7.22.11"
   dependencies:
-    "@babel/helper-create-class-features-plugin": ^7.22.5
+    "@babel/helper-create-class-features-plugin": ^7.22.11
     "@babel/helper-plugin-utils": ^7.22.5
     "@babel/plugin-syntax-class-static-block": ^7.14.5
   peerDependencies:
     "@babel/core": ^7.12.0
-  checksum: bc48b92dbaf625a14f2bf62382384eef01e0515802426841636ae9146e27395d068c7a8a45e9e15699491b0a01d990f38f179cbc9dc89274a393f85648772f12
+  checksum: 69f040506fad66f1c6918d288d0e0edbc5c8a07c8b4462c1184ad2f9f08995d68b057126c213871c0853ae0c72afc60ec87492049dfacb20902e32346a448bcb
   languageName: node
   linkType: hard
 
@@ -789,14 +789,14 @@ __metadata:
   linkType: hard
 
 "@babel/plugin-transform-dynamic-import@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-dynamic-import@npm:7.22.5"
+  version: 7.22.11
+  resolution: "@babel/plugin-transform-dynamic-import@npm:7.22.11"
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
     "@babel/plugin-syntax-dynamic-import": ^7.8.3
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 186a6d59f36eb3c5824739fc9c22ed0f4ca68e001662aa3a302634346a8b785cb9579b23b0c158f4570604d697d19598ca09b58c60a7fa2894da1163c4eb1907
+  checksum: 78fc9c532210bf9e8f231747f542318568ac360ee6c27e80853962c984283c73da3f8f8aebe83c2096090a435b356b092ed85de617a156cbe0729d847632be45
   languageName: node
   linkType: hard
 
@@ -813,14 +813,14 @@ __metadata:
   linkType: hard
 
 "@babel/plugin-transform-export-namespace-from@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-export-namespace-from@npm:7.22.5"
+  version: 7.22.11
+  resolution: "@babel/plugin-transform-export-namespace-from@npm:7.22.11"
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
     "@babel/plugin-syntax-export-namespace-from": ^7.8.3
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 3d197b788758044983c96b9c49bed4b456055f35a388521a405968db0f6e2ffb6fd59110e3931f4dcc5e126ae9e5e00e154a0afb47a7ea359d8d0dea79f480d7
+  checksum: 73af5883a321ed56a4bfd43c8a7de0164faebe619287706896fc6ee2f7a4e69042adaa1338c0b8b4bdb9f7e5fdceb016fb1d40694cb43ca3b8827429e8aac4bf
   languageName: node
   linkType: hard
 
@@ -849,14 +849,14 @@ __metadata:
   linkType: hard
 
 "@babel/plugin-transform-json-strings@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-json-strings@npm:7.22.5"
+  version: 7.22.11
+  resolution: "@babel/plugin-transform-json-strings@npm:7.22.11"
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
     "@babel/plugin-syntax-json-strings": ^7.8.3
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 4e00b902487a670b6c8948f33f9108133fd745cf9d1478aca515fb460b9b2f12e137988ebc1663630fb82070a870aed8b0c1aa4d007a841c18004619798f255c
+  checksum: 50665e5979e66358c50e90a26db53c55917f78175127ac2fa05c7888d156d418ffb930ec0a109353db0a7c5f57c756ce01bfc9825d24cbfd2b3ec453f2ed8cba
   languageName: node
   linkType: hard
 
@@ -872,14 +872,14 @@ __metadata:
   linkType: hard
 
 "@babel/plugin-transform-logical-assignment-operators@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-logical-assignment-operators@npm:7.22.5"
+  version: 7.22.11
+  resolution: "@babel/plugin-transform-logical-assignment-operators@npm:7.22.11"
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
     "@babel/plugin-syntax-logical-assignment-operators": ^7.10.4
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 18748e953c08f64885f18c224eac58df10a13eac4d845d16b5d9b6276907da7ca2530dfebe6ed41cdc5f8a75d9db3e36d8eb54ddce7cd0364af1cab09b435302
+  checksum: c664e9798e85afa7f92f07b867682dee7392046181d82f5d21bae6f2ca26dfe9c8375cdc52b7483c3fc09a983c1989f60eff9fbc4f373b0c0a74090553d05739
   languageName: node
   linkType: hard
 
@@ -906,30 +906,30 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-commonjs@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-modules-commonjs@npm:7.22.5"
+"@babel/plugin-transform-modules-commonjs@npm:^7.22.11, @babel/plugin-transform-modules-commonjs@npm:^7.22.5":
+  version: 7.22.11
+  resolution: "@babel/plugin-transform-modules-commonjs@npm:7.22.11"
   dependencies:
-    "@babel/helper-module-transforms": ^7.22.5
+    "@babel/helper-module-transforms": ^7.22.9
     "@babel/helper-plugin-utils": ^7.22.5
     "@babel/helper-simple-access": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 2067aca8f6454d54ffcce69b02c457cfa61428e11372f6a1d99ff4fcfbb55c396ed2ca6ca886bf06c852e38c1a205b8095921b2364fd0243f3e66bc1dda61caa
+  checksum: c15ad7f1234a930cab214224bb85f6b3a3f301fa1d4d15bef193e5c11c614ce369551e5cbb708fde8d3f7e1cb84b05e9798a3647a11b56c3d67580e362a712d4
   languageName: node
   linkType: hard
 
 "@babel/plugin-transform-modules-systemjs@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-modules-systemjs@npm:7.22.5"
+  version: 7.22.11
+  resolution: "@babel/plugin-transform-modules-systemjs@npm:7.22.11"
   dependencies:
     "@babel/helper-hoist-variables": ^7.22.5
-    "@babel/helper-module-transforms": ^7.22.5
+    "@babel/helper-module-transforms": ^7.22.9
     "@babel/helper-plugin-utils": ^7.22.5
     "@babel/helper-validator-identifier": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 04f4178589543396b3c24330a67a59c5e69af5e96119c9adda730c0f20122deaff54671ebbc72ad2df6495a5db8a758bd96942de95fba7ad427de9c80b1b38c8
+  checksum: d0991e4bdc3352b6a9f4d12b6662e3645d892cd5c3c005ba5f14e65f1e218c6a8f7f4497e64a51d82a046e507aaa7db3143b800b0270dca1824cbd214ff3363d
   languageName: node
   linkType: hard
 
@@ -969,41 +969,41 @@ __metadata:
   linkType: hard
 
 "@babel/plugin-transform-nullish-coalescing-operator@npm:^7.22.3, @babel/plugin-transform-nullish-coalescing-operator@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.22.5"
+  version: 7.22.11
+  resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.22.11"
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
     "@babel/plugin-syntax-nullish-coalescing-operator": ^7.8.3
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: e6a059169d257fc61322d0708edae423072449b7c33de396261e68dee582aec5396789a1c22bce84e5bd88a169623c2e750b513fc222930979e6accd52a44bf2
+  checksum: 167babecc8b8fe70796a7b7d34af667ebbf43da166c21689502e5e8cc93180b7a85979c77c9f64b7cce431b36718bd0a6df9e5e0ffea4ae22afb22cfef886372
   languageName: node
   linkType: hard
 
 "@babel/plugin-transform-numeric-separator@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-numeric-separator@npm:7.22.5"
+  version: 7.22.11
+  resolution: "@babel/plugin-transform-numeric-separator@npm:7.22.11"
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
     "@babel/plugin-syntax-numeric-separator": ^7.10.4
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 9e7837d4eae04f211ebaa034fe5003d2927b6bf6d5b9dc09f2b1183c01482cdde5a75b8bd5c7ff195c2abc7b923339eb0b2a9d27cb78359d38248a3b2c2367c4
+  checksum: af064d06a4a041767ec396a5f258103f64785df290e038bba9f0ef454e6c914f2ac45d862bbdad8fac2c7ad47fa4e95356f29053c60c100a0160b02a995fe2a3
   languageName: node
   linkType: hard
 
 "@babel/plugin-transform-object-rest-spread@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-object-rest-spread@npm:7.22.5"
+  version: 7.22.11
+  resolution: "@babel/plugin-transform-object-rest-spread@npm:7.22.11"
   dependencies:
-    "@babel/compat-data": ^7.22.5
-    "@babel/helper-compilation-targets": ^7.22.5
+    "@babel/compat-data": ^7.22.9
+    "@babel/helper-compilation-targets": ^7.22.10
     "@babel/helper-plugin-utils": ^7.22.5
     "@babel/plugin-syntax-object-rest-spread": ^7.8.3
     "@babel/plugin-transform-parameters": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 3b5e091f0dc67108f2e41ed5a97e15bbe4381a19d9a7eea80b71c7de1d8169fd28784e1e41a3d2ad12709ab212e58fc481282a5bb65d591fae7b443048de3330
+  checksum: b9c9ed8df8d6d7563eb42844d8e3e6748ba8f7568998230f7317bc49304db65828df48fc4b93bf4421772a6c9f7b389f3dd1c4e84379c17dd9ee223fb3fc5245
   languageName: node
   linkType: hard
 
@@ -1020,27 +1020,27 @@ __metadata:
   linkType: hard
 
 "@babel/plugin-transform-optional-catch-binding@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-optional-catch-binding@npm:7.22.5"
+  version: 7.22.11
+  resolution: "@babel/plugin-transform-optional-catch-binding@npm:7.22.11"
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
     "@babel/plugin-syntax-optional-catch-binding": ^7.8.3
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: b0e8b4233ff06b5c9d285257f49c5bd441f883189b24282e6200f9ebdf5db29aeeebbffae57fbbcd5df9f4387b3e66e5d322aaae5652a78e89685ddbae46bbd1
+  checksum: f17abd90e1de67c84d63afea29c8021c74abb2794d3a6eeafb0bbe7372d3db32aefca386e392116ec63884537a4a2815d090d26264d259bacc08f6e3ed05294c
   languageName: node
   linkType: hard
 
 "@babel/plugin-transform-optional-chaining@npm:^7.22.10, @babel/plugin-transform-optional-chaining@npm:^7.22.5":
-  version: 7.22.10
-  resolution: "@babel/plugin-transform-optional-chaining@npm:7.22.10"
+  version: 7.22.12
+  resolution: "@babel/plugin-transform-optional-chaining@npm:7.22.12"
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
     "@babel/helper-skip-transparent-expression-wrappers": ^7.22.5
     "@babel/plugin-syntax-optional-chaining": ^7.8.3
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 522d6214bb9f6ede8a2fc56a873e791aabd62f0b3be78fb8e62ca801a9033bcadabfb77aec6739f0e67f0f15f7c739c08bafafd66d3676edf1941fe6429cebcd
+  checksum: 47065439bb721a0967cdcc83895700bb7b18b146b2ef27e43449d7b5a7130a2497afadddc42c616253858cac6732546646b9f0c581f4bb8a3d362baeb4c30bbb
   languageName: node
   linkType: hard
 
@@ -1068,16 +1068,16 @@ __metadata:
   linkType: hard
 
 "@babel/plugin-transform-private-property-in-object@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-private-property-in-object@npm:7.22.5"
+  version: 7.22.11
+  resolution: "@babel/plugin-transform-private-property-in-object@npm:7.22.11"
   dependencies:
     "@babel/helper-annotate-as-pure": ^7.22.5
-    "@babel/helper-create-class-features-plugin": ^7.22.5
+    "@babel/helper-create-class-features-plugin": ^7.22.11
     "@babel/helper-plugin-utils": ^7.22.5
     "@babel/plugin-syntax-private-property-in-object": ^7.14.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 9ac019fb2772f3af6278a7f4b8b14b0663accb3fd123d87142ceb2fbc57fd1afa07c945d1329029b026b9ee122096ef71a3f34f257a9e04cf4245b87298c38b4
+  checksum: 4d029d84901e53c46dead7a46e2990a7bc62470f4e4ca58a0d063394f86652fd58fe4eea1eb941da3669cd536b559b9d058b342b59300026346b7a2a51badac8
   languageName: node
   linkType: hard
 
@@ -1259,17 +1259,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-typescript@npm:^7.22.5":
-  version: 7.22.10
-  resolution: "@babel/plugin-transform-typescript@npm:7.22.10"
+"@babel/plugin-transform-typescript@npm:^7.22.11":
+  version: 7.22.11
+  resolution: "@babel/plugin-transform-typescript@npm:7.22.11"
   dependencies:
     "@babel/helper-annotate-as-pure": ^7.22.5
-    "@babel/helper-create-class-features-plugin": ^7.22.10
+    "@babel/helper-create-class-features-plugin": ^7.22.11
     "@babel/helper-plugin-utils": ^7.22.5
     "@babel/plugin-syntax-typescript": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: e15ca8cd9f9715db5ca42a4b7883bc85356424497a711ea01ccb39793e647c54d9bd8ab37d9953ed9bed5d06b705fca681dce1f41d121bc47638f50a5b5ce9ee
+  checksum: a0dc3c2427b55602944705c9a91b4c074524badd5ea87edb603ddeabe7fae531bcbe68475106d7a00079b67bb422dbf2e9f50e15c25ac24d7e9fe77f37ebcfb4
   languageName: node
   linkType: hard
 
@@ -1440,17 +1440,17 @@ __metadata:
   linkType: hard
 
 "@babel/preset-typescript@npm:^7.21.5":
-  version: 7.22.5
-  resolution: "@babel/preset-typescript@npm:7.22.5"
+  version: 7.22.11
+  resolution: "@babel/preset-typescript@npm:7.22.11"
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
     "@babel/helper-validator-option": ^7.22.5
     "@babel/plugin-syntax-jsx": ^7.22.5
-    "@babel/plugin-transform-modules-commonjs": ^7.22.5
-    "@babel/plugin-transform-typescript": ^7.22.5
+    "@babel/plugin-transform-modules-commonjs": ^7.22.11
+    "@babel/plugin-transform-typescript": ^7.22.11
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 7be1670cb4404797d3a473bd72d66eb2b3e0f2f8a672a5e40bdb0812cc66085ec84bcd7b896709764cabf042fdc6b7f2d4755ac7cce10515eb596ff61dab5154
+  checksum: 8ae7162c31db896f5eeecd6f67ab2e58555fdc06fe84e95fe4a3f60b64cd6f782d2d7dfbde0c0eac04b55dac18222752d91dd8786245cccedd7e42f080e07233
   languageName: node
   linkType: hard
 
@@ -1471,11 +1471,11 @@ __metadata:
   linkType: hard
 
 "@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.8, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.2.0, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.22.3, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.3, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2":
-  version: 7.22.10
-  resolution: "@babel/runtime@npm:7.22.10"
+  version: 7.22.11
+  resolution: "@babel/runtime@npm:7.22.11"
   dependencies:
     regenerator-runtime: ^0.14.0
-  checksum: 524d41517e68953dbc73a4f3616b8475e5813f64e28ba89ff5fca2c044d535c2ea1a3f310df1e5bb06162e1f0b401b5c4af73fe6e2519ca2450d9d8c44cf268d
+  checksum: a5cd6683a8fcdb8065cb1677f221e22f6c67ec8f15ad1d273b180b93ab3bd86c66da2c48f500d4e72d8d2cfa85ff4872a3f350e5aa3855630036af5da765c001
   languageName: node
   linkType: hard
 
@@ -1490,9 +1490,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/traverse@npm:7, @babel/traverse@npm:^7.22.10":
-  version: 7.22.10
-  resolution: "@babel/traverse@npm:7.22.10"
+"@babel/traverse@npm:7, @babel/traverse@npm:^7.22.11":
+  version: 7.22.11
+  resolution: "@babel/traverse@npm:7.22.11"
   dependencies:
     "@babel/code-frame": ^7.22.10
     "@babel/generator": ^7.22.10
@@ -1500,22 +1500,22 @@ __metadata:
     "@babel/helper-function-name": ^7.22.5
     "@babel/helper-hoist-variables": ^7.22.5
     "@babel/helper-split-export-declaration": ^7.22.6
-    "@babel/parser": ^7.22.10
-    "@babel/types": ^7.22.10
+    "@babel/parser": ^7.22.11
+    "@babel/types": ^7.22.11
     debug: ^4.1.0
     globals: ^11.1.0
-  checksum: 9f7b358563bfb0f57ac4ed639f50e5c29a36b821a1ce1eea0c7db084f5b925e3275846d0de63bde01ca407c85d9804e0efbe370d92cd2baaafde3bd13b0f4cdb
+  checksum: 4ad62d548ca8b95dbf45bae16cc167428f174f3c837d55a5878b1f17bdbc8b384d6df741dc7c461b62c04d881cf25644d3ab885909ba46e3ac43224e2b15b504
   languageName: node
   linkType: hard
 
-"@babel/types@npm:^7.0.0, @babel/types@npm:^7.0.0-beta.49, @babel/types@npm:^7.12.11, @babel/types@npm:^7.12.6, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.10, @babel/types@npm:^7.22.5, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
-  version: 7.22.10
-  resolution: "@babel/types@npm:7.22.10"
+"@babel/types@npm:^7.0.0, @babel/types@npm:^7.0.0-beta.49, @babel/types@npm:^7.12.11, @babel/types@npm:^7.12.6, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.10, @babel/types@npm:^7.22.11, @babel/types@npm:^7.22.5, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
+  version: 7.22.11
+  resolution: "@babel/types@npm:7.22.11"
   dependencies:
     "@babel/helper-string-parser": ^7.22.5
     "@babel/helper-validator-identifier": ^7.22.5
     to-fast-properties: ^2.0.0
-  checksum: 095c4f4b7503fa816e4094113f0ec2351ef96ff32012010b771693066ff628c7c664b21c6bd3fb93aeb46fe7c61f6b3a3c9e4ed0034d6a2481201c417371c8af
+  checksum: 431a6446896adb62c876d0fe75263835735d3c974aae05356a87eb55f087c20a777028cf08eadcace7993e058bbafe3b21ce2119363222c6cef9eedd7a204810
   languageName: node
   linkType: hard
 
@@ -1526,7 +1526,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/css-parser-algorithms@npm:^2.3.0":
+"@csstools/css-parser-algorithms@npm:^2.3.1":
   version: 2.3.1
   resolution: "@csstools/css-parser-algorithms@npm:2.3.1"
   peerDependencies:
@@ -1535,14 +1535,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/css-tokenizer@npm:^2.1.1":
+"@csstools/css-tokenizer@npm:^2.2.0":
   version: 2.2.0
   resolution: "@csstools/css-tokenizer@npm:2.2.0"
   checksum: d6b3ead496e187cbf89b5e08a55be7a8393676c2b93526f7f051418376d08146f9f533708aca5eec6a07d925ea6a7e65b0e0bb36aabeba657666e968b8d89cd0
   languageName: node
   linkType: hard
 
-"@csstools/media-query-list-parser@npm:^2.1.2":
+"@csstools/media-query-list-parser@npm:^2.1.4":
   version: 2.1.4
   resolution: "@csstools/media-query-list-parser@npm:2.1.4"
   peerDependencies:
@@ -1708,9 +1708,9 @@ __metadata:
   linkType: hard
 
 "@eslint-community/regexpp@npm:^4.5.1, @eslint-community/regexpp@npm:^4.6.1":
-  version: 4.6.2
-  resolution: "@eslint-community/regexpp@npm:4.6.2"
-  checksum: a3c341377b46b54fa228f455771b901d1a2717f95d47dcdf40199df30abc000ba020f747f114f08560d119e979d882a94cf46cfc51744544d54b00319c0f2724
+  version: 4.8.0
+  resolution: "@eslint-community/regexpp@npm:4.8.0"
+  checksum: 601e6d033d556e98e8c929905bef335f20d7389762812df4d0f709d9b4d2631610dda975fb272e23b5b68e24a163b3851b114c8080a0a19fb4c141a1eff6305b
   languageName: node
   linkType: hard
 
@@ -1731,10 +1731,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint/js@npm:^8.47.0":
-  version: 8.47.0
-  resolution: "@eslint/js@npm:8.47.0"
-  checksum: 0ef57fe27b6d4c305b33f3b2d2fee1ab397a619006f1d6f4ce5ee4746b8f03d11a4e098805a7d78601ca534cf72917d37f0ac19896c992a32e26299ecb9f9de1
+"@eslint/js@npm:8.48.0":
+  version: 8.48.0
+  resolution: "@eslint/js@npm:8.48.0"
+  checksum: b2755f9c0ee810c886eba3c50dcacb184ba5a5cd1cbc01988ee506ad7340653cae0bd55f1d95c64b56dfc6d25c2caa7825335ffd2c50165bae9996fe0f396851
   languageName: node
   linkType: hard
 
@@ -1982,50 +1982,50 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jest/console@npm:^29.6.2":
-  version: 29.6.2
-  resolution: "@jest/console@npm:29.6.2"
+"@jest/console@npm:^29.6.4":
+  version: 29.6.4
+  resolution: "@jest/console@npm:29.6.4"
   dependencies:
-    "@jest/types": ^29.6.1
+    "@jest/types": ^29.6.3
     "@types/node": "*"
     chalk: ^4.0.0
-    jest-message-util: ^29.6.2
-    jest-util: ^29.6.2
+    jest-message-util: ^29.6.3
+    jest-util: ^29.6.3
     slash: ^3.0.0
-  checksum: 1198667bda0430770c3e9b92681c0ee9f8346394574071c633f306192ac5f08e12972d6a5fdf03eb0d441051c8439bce0f6f9f355dc60d98777a35328331ba2e
+  checksum: 1caf061a39266b86e96ca13358401839e4d930742cbaa9e87e79d7ce170a83195e52e5b2d22eb5aa9a949219b61a163a81e337ec98b8323d88d79853051df96c
   languageName: node
   linkType: hard
 
-"@jest/core@npm:^29.6.2":
-  version: 29.6.2
-  resolution: "@jest/core@npm:29.6.2"
+"@jest/core@npm:^29.6.4":
+  version: 29.6.4
+  resolution: "@jest/core@npm:29.6.4"
   dependencies:
-    "@jest/console": ^29.6.2
-    "@jest/reporters": ^29.6.2
-    "@jest/test-result": ^29.6.2
-    "@jest/transform": ^29.6.2
-    "@jest/types": ^29.6.1
+    "@jest/console": ^29.6.4
+    "@jest/reporters": ^29.6.4
+    "@jest/test-result": ^29.6.4
+    "@jest/transform": ^29.6.4
+    "@jest/types": ^29.6.3
     "@types/node": "*"
     ansi-escapes: ^4.2.1
     chalk: ^4.0.0
     ci-info: ^3.2.0
     exit: ^0.1.2
     graceful-fs: ^4.2.9
-    jest-changed-files: ^29.5.0
-    jest-config: ^29.6.2
-    jest-haste-map: ^29.6.2
-    jest-message-util: ^29.6.2
-    jest-regex-util: ^29.4.3
-    jest-resolve: ^29.6.2
-    jest-resolve-dependencies: ^29.6.2
-    jest-runner: ^29.6.2
-    jest-runtime: ^29.6.2
-    jest-snapshot: ^29.6.2
-    jest-util: ^29.6.2
-    jest-validate: ^29.6.2
-    jest-watcher: ^29.6.2
+    jest-changed-files: ^29.6.3
+    jest-config: ^29.6.4
+    jest-haste-map: ^29.6.4
+    jest-message-util: ^29.6.3
+    jest-regex-util: ^29.6.3
+    jest-resolve: ^29.6.4
+    jest-resolve-dependencies: ^29.6.4
+    jest-runner: ^29.6.4
+    jest-runtime: ^29.6.4
+    jest-snapshot: ^29.6.4
+    jest-util: ^29.6.3
+    jest-validate: ^29.6.3
+    jest-watcher: ^29.6.4
     micromatch: ^4.0.4
-    pretty-format: ^29.6.2
+    pretty-format: ^29.6.3
     slash: ^3.0.0
     strip-ansi: ^6.0.0
   peerDependencies:
@@ -2033,76 +2033,76 @@ __metadata:
   peerDependenciesMeta:
     node-notifier:
       optional: true
-  checksum: 6bbb3886430248c0092f275b1b946a701406732f7442c04e63e4ee2297c2ec02d8ceeec508a202e08128197699b2bcddbae2c2f74adb2cf30f2f0d7d94a7c2dc
+  checksum: 0f36532c909775814cb7d4310d61881beaefdec6229ef0b7493c6191dfca20ae5222120846ea5ef8cdeaa8cef265aae9cea8989dcab572d8daea9afd14247c7a
   languageName: node
   linkType: hard
 
-"@jest/environment@npm:^29.6.2":
-  version: 29.6.2
-  resolution: "@jest/environment@npm:29.6.2"
+"@jest/environment@npm:^29.6.4":
+  version: 29.6.4
+  resolution: "@jest/environment@npm:29.6.4"
   dependencies:
-    "@jest/fake-timers": ^29.6.2
-    "@jest/types": ^29.6.1
+    "@jest/fake-timers": ^29.6.4
+    "@jest/types": ^29.6.3
     "@types/node": "*"
-    jest-mock: ^29.6.2
-  checksum: c7de0e4c0d9166e02d0eb166574e05ec460e1db3b69d6476e63244edd52d7c917e6876af55fe723ff3086f52c0b1869dec60654054735a7a48c9d4ac43af2a25
+    jest-mock: ^29.6.3
+  checksum: 810d8f1fc26d293acfc44927bcb78adc58ed4ea580a64c8d94aa6c67239dcb149186bf25b94ff28b79de15253e0c877ad8d330feac205f185f3517593168510c
   languageName: node
   linkType: hard
 
-"@jest/expect-utils@npm:^29.6.2":
-  version: 29.6.2
-  resolution: "@jest/expect-utils@npm:29.6.2"
+"@jest/expect-utils@npm:^29.6.4":
+  version: 29.6.4
+  resolution: "@jest/expect-utils@npm:29.6.4"
   dependencies:
-    jest-get-type: ^29.4.3
-  checksum: 0decf2009aa3735f9df469e78ce1721c2815e4278439887e0cf0321ca8979541a22515d114a59b2445a6cd70a074b09dc9c00b5e7b3b3feac5174b9c4a78b2e1
+    jest-get-type: ^29.6.3
+  checksum: a17059e02a4c0fca98e2abb7e9e58c70df3cd3d4ebcc6a960cb57c571726f7bd738c6cd008a9bf99770b77e92f7e21c75fe1f9ceec9b7a7710010f9340bb28ad
   languageName: node
   linkType: hard
 
-"@jest/expect@npm:^29.6.2":
-  version: 29.6.2
-  resolution: "@jest/expect@npm:29.6.2"
+"@jest/expect@npm:^29.6.4":
+  version: 29.6.4
+  resolution: "@jest/expect@npm:29.6.4"
   dependencies:
-    expect: ^29.6.2
-    jest-snapshot: ^29.6.2
-  checksum: bd2d88a4e7c5420079c239afef341ec53dc7e353816cd13acbb42631a31fd321fe58677bb43a4dba851028f4c7e31da7980314e9094cd5b348896cb6cd3d42b2
+    expect: ^29.6.4
+    jest-snapshot: ^29.6.4
+  checksum: e9d7306a96e2f9f9f7a0d93d41850cbad987ebda951a5d9a63d3f5fb61da4c1e41adb54af7f7222e4a185454ecb17ddc77845e18001ee28ac114f7a7fe9e671d
   languageName: node
   linkType: hard
 
-"@jest/fake-timers@npm:^29.6.2":
-  version: 29.6.2
-  resolution: "@jest/fake-timers@npm:29.6.2"
+"@jest/fake-timers@npm:^29.6.4":
+  version: 29.6.4
+  resolution: "@jest/fake-timers@npm:29.6.4"
   dependencies:
-    "@jest/types": ^29.6.1
+    "@jest/types": ^29.6.3
     "@sinonjs/fake-timers": ^10.0.2
     "@types/node": "*"
-    jest-message-util: ^29.6.2
-    jest-mock: ^29.6.2
-    jest-util: ^29.6.2
-  checksum: 1abcda02f22d2ba32e178b7ab80a9180235a6c75ec9faef33324627b19a70dad64889a9ea49b8f07230e14a6e683b9120542c6d1d6b2ecaf937f4efde32dad88
+    jest-message-util: ^29.6.3
+    jest-mock: ^29.6.3
+    jest-util: ^29.6.3
+  checksum: 3f06d1090cbaaf781920fe59b10509ad86b587c401818a066ee1550101c6203e0718f0f83bbd2afa8bdf7b43eb280f89fb9f8c98886094e53ccabe5e64de9be1
   languageName: node
   linkType: hard
 
-"@jest/globals@npm:^29.6.2":
-  version: 29.6.2
-  resolution: "@jest/globals@npm:29.6.2"
+"@jest/globals@npm:^29.6.4":
+  version: 29.6.4
+  resolution: "@jest/globals@npm:29.6.4"
   dependencies:
-    "@jest/environment": ^29.6.2
-    "@jest/expect": ^29.6.2
-    "@jest/types": ^29.6.1
-    jest-mock: ^29.6.2
-  checksum: aa4a54f19cc025205bc696546940e1fe9c752c2d4d825852088aa76d44677ebba1ec66fabb78e615480cff23a06a70b5a3f893ab5163d901cdfa0d2267870b10
+    "@jest/environment": ^29.6.4
+    "@jest/expect": ^29.6.4
+    "@jest/types": ^29.6.3
+    jest-mock: ^29.6.3
+  checksum: a41b18871a248151264668a38b13cb305f03db112bfd89ec44e858af0e79066e0b03d6b68c8baf1ec6c578be6fdb87519389c83438608b91471d17a5724858e0
   languageName: node
   linkType: hard
 
-"@jest/reporters@npm:^29.6.2":
-  version: 29.6.2
-  resolution: "@jest/reporters@npm:29.6.2"
+"@jest/reporters@npm:^29.6.4":
+  version: 29.6.4
+  resolution: "@jest/reporters@npm:29.6.4"
   dependencies:
     "@bcoe/v8-coverage": ^0.2.3
-    "@jest/console": ^29.6.2
-    "@jest/test-result": ^29.6.2
-    "@jest/transform": ^29.6.2
-    "@jest/types": ^29.6.1
+    "@jest/console": ^29.6.4
+    "@jest/test-result": ^29.6.4
+    "@jest/transform": ^29.6.4
+    "@jest/types": ^29.6.3
     "@jridgewell/trace-mapping": ^0.3.18
     "@types/node": "*"
     chalk: ^4.0.0
@@ -2111,13 +2111,13 @@ __metadata:
     glob: ^7.1.3
     graceful-fs: ^4.2.9
     istanbul-lib-coverage: ^3.0.0
-    istanbul-lib-instrument: ^5.1.0
+    istanbul-lib-instrument: ^6.0.0
     istanbul-lib-report: ^3.0.0
     istanbul-lib-source-maps: ^4.0.0
     istanbul-reports: ^3.1.3
-    jest-message-util: ^29.6.2
-    jest-util: ^29.6.2
-    jest-worker: ^29.6.2
+    jest-message-util: ^29.6.3
+    jest-util: ^29.6.3
+    jest-worker: ^29.6.4
     slash: ^3.0.0
     string-length: ^4.0.1
     strip-ansi: ^6.0.0
@@ -2127,88 +2127,88 @@ __metadata:
   peerDependenciesMeta:
     node-notifier:
       optional: true
-  checksum: 7cf880d0730cee7d24ee96928003ef6946bf93423b0ae9a2edb53cae2c231b8ac50ec264f48a73744e3f11ca319cd414edacf99b2e7bf37cd72fe0b362090dd1
+  checksum: 9ee0db497f3a826f535d3af0575ceb67984f9708bc6386450359517c212c67218ae98b8ea93ab05df2f920aed9c4166ef64209d66a09b7e30fc0077c91347ad0
   languageName: node
   linkType: hard
 
-"@jest/schemas@npm:^29.6.0":
-  version: 29.6.0
-  resolution: "@jest/schemas@npm:29.6.0"
+"@jest/schemas@npm:^29.6.3":
+  version: 29.6.3
+  resolution: "@jest/schemas@npm:29.6.3"
   dependencies:
     "@sinclair/typebox": ^0.27.8
-  checksum: c00511c69cf89138a7d974404d3a5060af375b5a52b9c87215d91873129b382ca11c1ff25bd6d605951404bb381ddce5f8091004a61e76457da35db1f5c51365
+  checksum: 910040425f0fc93cd13e68c750b7885590b8839066dfa0cd78e7def07bbb708ad869381f725945d66f2284de5663bbecf63e8fdd856e2ae6e261ba30b1687e93
   languageName: node
   linkType: hard
 
-"@jest/source-map@npm:^29.6.0":
-  version: 29.6.0
-  resolution: "@jest/source-map@npm:29.6.0"
+"@jest/source-map@npm:^29.6.3":
+  version: 29.6.3
+  resolution: "@jest/source-map@npm:29.6.3"
   dependencies:
     "@jridgewell/trace-mapping": ^0.3.18
     callsites: ^3.0.0
     graceful-fs: ^4.2.9
-  checksum: 9c6c40387410bb70b2fae8124287fc28f6bdd1b2d7f24348e8611e1bb638b404518228a4ce64a582365b589c536ae8e7ebab0126cef59a87874b71061d19783b
+  checksum: bcc5a8697d471396c0003b0bfa09722c3cd879ad697eb9c431e6164e2ea7008238a01a07193dfe3cbb48b1d258eb7251f6efcea36f64e1ebc464ea3c03ae2deb
   languageName: node
   linkType: hard
 
-"@jest/test-result@npm:^29.6.2":
-  version: 29.6.2
-  resolution: "@jest/test-result@npm:29.6.2"
+"@jest/test-result@npm:^29.6.4":
+  version: 29.6.4
+  resolution: "@jest/test-result@npm:29.6.4"
   dependencies:
-    "@jest/console": ^29.6.2
-    "@jest/types": ^29.6.1
+    "@jest/console": ^29.6.4
+    "@jest/types": ^29.6.3
     "@types/istanbul-lib-coverage": ^2.0.0
     collect-v8-coverage: ^1.0.0
-  checksum: 8aff37f18c8d2df4d9f453d57ec018a6479eb697fabcf74b1ca06e34553da1d7a2b85580a290408ba0b02e58543263244a2cb065c7c7180c8d8180cc78444fbd
+  checksum: a13c82d29038e80059191a1a443240678c6934ea832fdabaec12b3ece397b6303022a064494a6bbd167a024f04e6b4d9ace1001300927ff70405ec9d854f1193
   languageName: node
   linkType: hard
 
-"@jest/test-sequencer@npm:^29.6.2":
-  version: 29.6.2
-  resolution: "@jest/test-sequencer@npm:29.6.2"
+"@jest/test-sequencer@npm:^29.6.4":
+  version: 29.6.4
+  resolution: "@jest/test-sequencer@npm:29.6.4"
   dependencies:
-    "@jest/test-result": ^29.6.2
+    "@jest/test-result": ^29.6.4
     graceful-fs: ^4.2.9
-    jest-haste-map: ^29.6.2
+    jest-haste-map: ^29.6.4
     slash: ^3.0.0
-  checksum: 12dc2577e45eeb98b85d1769846b7d6effa536907986ad3c4cbd014df9e24431a564cc8cd94603332e4b1f9bfb421371883efc6a5085b361a52425ffc2a52dc6
+  checksum: 517fc66b74a87431a8a1429e4505d85bd09c11f2ba835e46c07c79911fbee23b89c01ec444c7c1d12d1b36f9eba60fcbbccc8e1bc1ae54a1a8b03b5f530ff81b
   languageName: node
   linkType: hard
 
-"@jest/transform@npm:^29.6.2":
-  version: 29.6.2
-  resolution: "@jest/transform@npm:29.6.2"
+"@jest/transform@npm:^29.6.4":
+  version: 29.6.4
+  resolution: "@jest/transform@npm:29.6.4"
   dependencies:
     "@babel/core": ^7.11.6
-    "@jest/types": ^29.6.1
+    "@jest/types": ^29.6.3
     "@jridgewell/trace-mapping": ^0.3.18
     babel-plugin-istanbul: ^6.1.1
     chalk: ^4.0.0
     convert-source-map: ^2.0.0
     fast-json-stable-stringify: ^2.1.0
     graceful-fs: ^4.2.9
-    jest-haste-map: ^29.6.2
-    jest-regex-util: ^29.4.3
-    jest-util: ^29.6.2
+    jest-haste-map: ^29.6.4
+    jest-regex-util: ^29.6.3
+    jest-util: ^29.6.3
     micromatch: ^4.0.4
     pirates: ^4.0.4
     slash: ^3.0.0
     write-file-atomic: ^4.0.2
-  checksum: ffb8c3c344cd48bedadec295d9c436737eccc39c1f0868aa9753b76397b33b2e5b121058af6f287ba6f2036181137e37df1212334bfa9d9a712986a4518cdc18
+  checksum: 0341a200a0bb926fc67ab9aede91c7b4009458206495e92057e72a115c55da5fed117457e68c6ea821e24c58b55da75c6a7b0f272ed63c2693db583d689a3383
   languageName: node
   linkType: hard
 
-"@jest/types@npm:^29.6.1":
-  version: 29.6.1
-  resolution: "@jest/types@npm:29.6.1"
+"@jest/types@npm:^29.6.3":
+  version: 29.6.3
+  resolution: "@jest/types@npm:29.6.3"
   dependencies:
-    "@jest/schemas": ^29.6.0
+    "@jest/schemas": ^29.6.3
     "@types/istanbul-lib-coverage": ^2.0.0
     "@types/istanbul-reports": ^3.0.0
     "@types/node": "*"
     "@types/yargs": ^17.0.8
     chalk: ^4.0.0
-  checksum: 89fc1ccf71a84fe0da643e0675b1cfe6a6f19ea72e935b2ab1dbdb56ec547e94433fb59b3536d3832a6e156c077865b7176fe9dae707dab9c3d2f9405ba6233c
+  checksum: a0bcf15dbb0eca6bdd8ce61a3fb055349d40268622a7670a3b2eb3c3dbafe9eb26af59938366d520b86907b9505b0f9b29b85cec11579a9e580694b87cd90fcc
   languageName: node
   linkType: hard
 
@@ -2334,6 +2334,7 @@ __metadata:
     babel-plugin-transform-react-remove-prop-types: ^0.4.24
     blurhash: ^2.0.5
     bufferutil: ^4.0.7
+    circular-dependency-plugin: ^5.2.2
     classnames: ^2.3.2
     cocoon-js-vanilla: ^1.3.0
     color-blend: ^4.0.0
@@ -2347,15 +2348,15 @@ __metadata:
     emoji-mart: "npm:emoji-mart-lazyload@latest"
     escape-html: ^1.0.3
     eslint: ^8.41.0
-    eslint-config-prettier: ^8.8.0
+    eslint-config-prettier: ^9.0.0
     eslint-import-resolver-typescript: ^3.5.5
     eslint-plugin-formatjs: ^4.10.1
-    eslint-plugin-import: ~2.27.5
+    eslint-plugin-import: ~2.28.0
     eslint-plugin-jsdoc: ^46.1.0
     eslint-plugin-jsx-a11y: ~6.7.1
     eslint-plugin-prettier: ^5.0.0
     eslint-plugin-promise: ~6.1.1
-    eslint-plugin-react: ~7.32.2
+    eslint-plugin-react: ~7.33.0
     eslint-plugin-react-hooks: ^4.6.0
     exif-js: ^2.3.0
     express: ^4.18.2
@@ -2387,6 +2388,7 @@ __metadata:
     postcss: ^8.4.24
     postcss-loader: ^4.3.0
     prettier: ^3.0.0
+    prom-client: ^14.2.0
     prop-types: ^15.8.1
     punycode: ^2.3.0
     react: ^18.2.0
@@ -2414,7 +2416,7 @@ __metadata:
     redux: ^4.2.1
     redux-immutable: ^4.0.0
     redux-thunk: ^2.4.2
-    regenerator-runtime: ^0.13.11
+    regenerator-runtime: ^0.14.0
     requestidlecallback: ^0.3.0
     reselect: ^4.1.8
     rimraf: ^5.0.1
@@ -2456,9 +2458,9 @@ __metadata:
   linkType: soft
 
 "@material-design-icons/svg@npm:^0.14.10":
-  version: 0.14.10
-  resolution: "@material-design-icons/svg@npm:0.14.10"
-  checksum: e64fbec79eb957056658355f30bd550bf5a47e965a3d815a238747aee33c72ad465700aeffe5139795e672a1d873a2bf2f235739cbd33647f7be05095633d90d
+  version: 0.14.11
+  resolution: "@material-design-icons/svg@npm:0.14.11"
+  checksum: 1244d375cb8965f99394647145fb7554d3cef7bb97985ee295a24f5a4ca6f49620f5a94b926a2edae1bf2626b1a9765d13534be477df21c15b69717fd23cca29
   languageName: node
   linkType: hard
 
@@ -2569,14 +2571,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@redis/client@npm:1.5.8":
-  version: 1.5.8
-  resolution: "@redis/client@npm:1.5.8"
+"@redis/client@npm:1.5.9":
+  version: 1.5.9
+  resolution: "@redis/client@npm:1.5.9"
   dependencies:
     cluster-key-slot: 1.1.2
     generic-pool: 3.9.0
     yallist: 4.0.0
-  checksum: ff4a6cbf4f132baad7e481cd4a60af7031a3528e290a646695a9a3be704ed5818f50e9676070c8bad5e4b18d99369b46fcdc052ef6c023fa2391be8696808ff1
+  checksum: 63ff34faca3ac076c76234901a47897a39bc971ab988508087d1513903b533620c54ee09a28f11b3d7b07464e239b6e756d76cc50694ed5b59418c514d2bf923
   languageName: node
   linkType: hard
 
@@ -2607,12 +2609,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@redis/time-series@npm:1.0.4":
-  version: 1.0.4
-  resolution: "@redis/time-series@npm:1.0.4"
+"@redis/time-series@npm:1.0.5":
+  version: 1.0.5
+  resolution: "@redis/time-series@npm:1.0.5"
   peerDependencies:
     "@redis/client": ^1.0.0
-  checksum: a5fca079deb04a2f204a7f9a375a6ff698a119d5dd53f7581fa8fd9e3bacacf1ecb0253b97fada484a012fea7a98014bc0f4f79707d4e92ff61c00318f2bfe04
+  checksum: 6bbdb0b793dcbd13518aa60a09a980f953554e4c745bfacc1611baa8098f360e0378e8ee6b7faf600a67f1de83f4b68bbec6f95a0740faee6164c14be3a30752
   languageName: node
   linkType: hard
 
@@ -3051,14 +3053,14 @@ __metadata:
   linkType: hard
 
 "@types/express-serve-static-core@npm:^4.17.33":
-  version: 4.17.35
-  resolution: "@types/express-serve-static-core@npm:4.17.35"
+  version: 4.17.36
+  resolution: "@types/express-serve-static-core@npm:4.17.36"
   dependencies:
     "@types/node": "*"
     "@types/qs": "*"
     "@types/range-parser": "*"
     "@types/send": "*"
-  checksum: cc8995d10c6feda475ec1b3a0e69eb0f35f21ab6b49129ad5c6f279e0bc5de8175bc04ec51304cb79a43eec3ed2f5a1e01472eb6d5f827b8c35c6ca8ad24eb6e
+  checksum: 410b13cbd663f18c0f8729e7f2ff54d960d96de76ebbae7cadb612972f85cc66c54051e00d32f11aa230c0a683d81a6d6fc7f7e4e383a95c0801494c517f36e1
   languageName: node
   linkType: hard
 
@@ -3159,12 +3161,12 @@ __metadata:
   linkType: hard
 
 "@types/jest@npm:*, @types/jest@npm:^29.5.2":
-  version: 29.5.3
-  resolution: "@types/jest@npm:29.5.3"
+  version: 29.5.4
+  resolution: "@types/jest@npm:29.5.4"
   dependencies:
     expect: ^29.0.0
     pretty-format: ^29.0.0
-  checksum: e36bb92e0b9e5ea7d6f8832baa42f087fc1697f6cd30ec309a07ea4c268e06ec460f1f0cfd2581daf5eff5763475190ec1ad8ac6520c49ccfe4f5c0a48bfa676
+  checksum: 38ed5942f44336452efd0f071eab60aaa57cd8d46530348d0a3aa5a691dcbf1366c4ca8f6ee8364efb45b4413bfefae443e5d4f469246a472a03b21ac11cd4ed
   languageName: node
   linkType: hard
 
@@ -3243,9 +3245,9 @@ __metadata:
   linkType: hard
 
 "@types/node@npm:*":
-  version: 20.4.10
-  resolution: "@types/node@npm:20.4.10"
-  checksum: 02a1ca415d9cc91144c4250383aa0ef1e48241bd36067ed7d1b239d8bacc2a11139dd90e223e11ac289345eeae624cc5dcf73359e684bd2e5a6c31bdfbab4811
+  version: 20.5.6
+  resolution: "@types/node@npm:20.5.6"
+  checksum: d2ce44f1cfa3fd00fe7426f7cf9a46d680cd57802b874ed5618e7d9101a9c6b8de37f08c0e7185ee06fb363ad492549c3ea69665c7e8e31c7813210ed8e89005
   languageName: node
   linkType: hard
 
@@ -3468,13 +3470,13 @@ __metadata:
   linkType: hard
 
 "@types/react@npm:^18.0.26":
-  version: 18.2.20
-  resolution: "@types/react@npm:18.2.20"
+  version: 18.2.21
+  resolution: "@types/react@npm:18.2.21"
   dependencies:
     "@types/prop-types": "*"
     "@types/scheduler": "*"
     csstype: ^3.0.2
-  checksum: 30f699c60e5e4bfef273ce64d320651cdd60f5c6a08361c6c7eca8cebcccda1ac953d2ee57c9f321b5ae87f8a62c72b6d35ca42df0e261d337849952daab2141
+  checksum: ffed203bfe7aad772b8286f7953305c9181ac3a8f27d3f5400fbbc2a8e27ca8e5bbff818ee014f39ca0d19d2b3bb154e5bdbec7e232c6f80b59069375aa78349
   languageName: node
   linkType: hard
 
@@ -3655,19 +3657,18 @@ __metadata:
   linkType: hard
 
 "@typescript-eslint/eslint-plugin@npm:^6.0.0":
-  version: 6.3.0
-  resolution: "@typescript-eslint/eslint-plugin@npm:6.3.0"
+  version: 6.4.1
+  resolution: "@typescript-eslint/eslint-plugin@npm:6.4.1"
   dependencies:
     "@eslint-community/regexpp": ^4.5.1
-    "@typescript-eslint/scope-manager": 6.3.0
-    "@typescript-eslint/type-utils": 6.3.0
-    "@typescript-eslint/utils": 6.3.0
-    "@typescript-eslint/visitor-keys": 6.3.0
+    "@typescript-eslint/scope-manager": 6.4.1
+    "@typescript-eslint/type-utils": 6.4.1
+    "@typescript-eslint/utils": 6.4.1
+    "@typescript-eslint/visitor-keys": 6.4.1
     debug: ^4.3.4
     graphemer: ^1.4.0
     ignore: ^5.2.4
     natural-compare: ^1.4.0
-    natural-compare-lite: ^1.4.0
     semver: ^7.5.4
     ts-api-utils: ^1.0.1
   peerDependencies:
@@ -3676,44 +3677,44 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 1493c6c661993640eef56893a7919cb964165cb46653c62468e71ce02a5ec8c654dd7e9767587aea67ec16c026a5630011bc7ea6c04e2fa8a4afee7f26a51358
+  checksum: aa5f2f516a4ea07d1a9878d347dcb915808862f41efd3c4acd4955e616d265e051c4c93d597d30e54bee10bab9b965e2ef9cea1b497bf16f23a475d7911a8078
   languageName: node
   linkType: hard
 
 "@typescript-eslint/parser@npm:^6.0.0":
-  version: 6.3.0
-  resolution: "@typescript-eslint/parser@npm:6.3.0"
+  version: 6.4.1
+  resolution: "@typescript-eslint/parser@npm:6.4.1"
   dependencies:
-    "@typescript-eslint/scope-manager": 6.3.0
-    "@typescript-eslint/types": 6.3.0
-    "@typescript-eslint/typescript-estree": 6.3.0
-    "@typescript-eslint/visitor-keys": 6.3.0
+    "@typescript-eslint/scope-manager": 6.4.1
+    "@typescript-eslint/types": 6.4.1
+    "@typescript-eslint/typescript-estree": 6.4.1
+    "@typescript-eslint/visitor-keys": 6.4.1
     debug: ^4.3.4
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: ec739adbe4a972a696b4a4625dc5c2f5b4e072968decdcafd0a9b972d0167007230951a6450becb52e187b1b90a2858debba26f73162e293f7846b373888b8e9
+  checksum: cb61c757963f2a7964c2f846087eadda044720da769d96600f9f0069fe796d612caef5d9bb0c785aa4fa95028b2d231e7c83847ce44f02b1fa41f2102d6f444c
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:6.3.0":
-  version: 6.3.0
-  resolution: "@typescript-eslint/scope-manager@npm:6.3.0"
+"@typescript-eslint/scope-manager@npm:6.4.1":
+  version: 6.4.1
+  resolution: "@typescript-eslint/scope-manager@npm:6.4.1"
   dependencies:
-    "@typescript-eslint/types": 6.3.0
-    "@typescript-eslint/visitor-keys": 6.3.0
-  checksum: 1690465f620f2b4517d45516864ef107258b2b608293d72606d0f115e11a8c1416b3d57e1b67f1daa1838f0239f71464aead57fe77c53ebd54b0aeee5fd4cf5e
+    "@typescript-eslint/types": 6.4.1
+    "@typescript-eslint/visitor-keys": 6.4.1
+  checksum: 8f7f90aa378a19838301b31cfa58a4b0641d2b84891705c8c006c67aacb5c0d07112b714e1f0e7a159c5736779c934ec26dadef42a0711fccb635596aba391fc
   languageName: node
   linkType: hard
 
-"@typescript-eslint/type-utils@npm:6.3.0":
-  version: 6.3.0
-  resolution: "@typescript-eslint/type-utils@npm:6.3.0"
+"@typescript-eslint/type-utils@npm:6.4.1":
+  version: 6.4.1
+  resolution: "@typescript-eslint/type-utils@npm:6.4.1"
   dependencies:
-    "@typescript-eslint/typescript-estree": 6.3.0
-    "@typescript-eslint/utils": 6.3.0
+    "@typescript-eslint/typescript-estree": 6.4.1
+    "@typescript-eslint/utils": 6.4.1
     debug: ^4.3.4
     ts-api-utils: ^1.0.1
   peerDependencies:
@@ -3721,7 +3722,7 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: cf2ab9d576bc9f3c0554318d20cb92671e4f46a07c24271fc47f144139b3843dab54592ee2e0962f81ad588f57a0b0a7c09d7e1047c720143a54bb1ec3ac4007
+  checksum: 33bcdd48bd4e07258ed1919b598d50354dd67d8f01702cd2fd46aa9250b7b7cba9caab640df01f4dc0e45dabeddbb3ca47bee88f81fe2087350ed6f70a4cbe5d
   languageName: node
   linkType: hard
 
@@ -3732,10 +3733,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:6.3.0":
-  version: 6.3.0
-  resolution: "@typescript-eslint/types@npm:6.3.0"
-  checksum: 3c133e4c1b06d009739f1a4387831eb99758ba45b06b6f632fe9cf14c2839fc92dcbdbb6d94ca42c1cb5ab4ca1b31a5ead50a72e0a084b62e4de15255c451160
+"@typescript-eslint/types@npm:6.4.1":
+  version: 6.4.1
+  resolution: "@typescript-eslint/types@npm:6.4.1"
+  checksum: 16ba46140dbe426407bbb940e87fb347e7eb53b64f74e8f6a819cd662aa25ccd0c25b1e588867ce3cd36a8b4eccea7bd81f4d429595e6e86d9a24c655b1c8617
   languageName: node
   linkType: hard
 
@@ -3757,12 +3758,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:6.3.0":
-  version: 6.3.0
-  resolution: "@typescript-eslint/typescript-estree@npm:6.3.0"
+"@typescript-eslint/typescript-estree@npm:6.4.1":
+  version: 6.4.1
+  resolution: "@typescript-eslint/typescript-estree@npm:6.4.1"
   dependencies:
-    "@typescript-eslint/types": 6.3.0
-    "@typescript-eslint/visitor-keys": 6.3.0
+    "@typescript-eslint/types": 6.4.1
+    "@typescript-eslint/visitor-keys": 6.4.1
     debug: ^4.3.4
     globby: ^11.1.0
     is-glob: ^4.0.3
@@ -3771,24 +3772,24 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: b2bb03411a5d079a9fd3310eec0af3b81a99827569cb3957724071aa54ac6c88449fbd1ebb72d7a356d5994d7e9542b5292a385ca3c3b0bc8049bb61a40a8ae9
+  checksum: 34c289e50a6337321154efe6c20c762e94fea308f9032971e356a266f63e99b908b1a00dd8cf51eba50a6f69db01d665faf2cf13454b355767fd167eebe60f1c
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:6.3.0":
-  version: 6.3.0
-  resolution: "@typescript-eslint/utils@npm:6.3.0"
+"@typescript-eslint/utils@npm:6.4.1":
+  version: 6.4.1
+  resolution: "@typescript-eslint/utils@npm:6.4.1"
   dependencies:
     "@eslint-community/eslint-utils": ^4.4.0
     "@types/json-schema": ^7.0.12
     "@types/semver": ^7.5.0
-    "@typescript-eslint/scope-manager": 6.3.0
-    "@typescript-eslint/types": 6.3.0
-    "@typescript-eslint/typescript-estree": 6.3.0
+    "@typescript-eslint/scope-manager": 6.4.1
+    "@typescript-eslint/types": 6.4.1
+    "@typescript-eslint/typescript-estree": 6.4.1
     semver: ^7.5.4
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0
-  checksum: 98a078a3948e8b6a45dec8f3be9bcb72dc98faa2fe84336b1925efb7caa06c05a2fbf7290cddb420465b415cc05252548e2b839b9311f99bce84cf856fd32888
+  checksum: 54e642a345790f912393a6f2821495e2359eff0f874a94cbe6fb3ef4411702983ed54fe88ca3ea9d28f2e93800a74dee22b7888838154bc1afd57c7e119e17ec
   languageName: node
   linkType: hard
 
@@ -3802,13 +3803,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:6.3.0":
-  version: 6.3.0
-  resolution: "@typescript-eslint/visitor-keys@npm:6.3.0"
+"@typescript-eslint/visitor-keys@npm:6.4.1":
+  version: 6.4.1
+  resolution: "@typescript-eslint/visitor-keys@npm:6.4.1"
   dependencies:
-    "@typescript-eslint/types": 6.3.0
+    "@typescript-eslint/types": 6.4.1
     eslint-visitor-keys: ^3.4.1
-  checksum: fc3148c3284de3f42724736f312a4fd0c3c2029617ae2ea9a84cf6601d31f600ee6563f9288de162028ffffde85b58d92feaafbe75a2da863ff2c4e3a0b5ed8c
+  checksum: bd9cd56fc793e1d880c24193f939c4992b2653f330baece41cd461d1fb48edb2c53696987cba0e29074bbb452dd181fd009db92dd19060fdcc417ad76768f18a
   languageName: node
   linkType: hard
 
@@ -4168,7 +4169,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ansi-escapes@npm:^4.2.1, ansi-escapes@npm:^4.3.0":
+"ansi-escapes@npm:^4.2.1":
   version: 4.3.2
   resolution: "ansi-escapes@npm:4.3.2"
   dependencies:
@@ -4177,6 +4178,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ansi-escapes@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "ansi-escapes@npm:5.0.0"
+  dependencies:
+    type-fest: ^1.0.2
+  checksum: d4b5eb8207df38367945f5dd2ef41e08c28edc192dc766ef18af6b53736682f49d8bfcfa4e4d6ecbc2e2f97c258fda084fb29a9e43b69170b71090f771afccac
+  languageName: node
+  linkType: hard
+
 "ansi-html-community@npm:0.0.8":
   version: 0.0.8
   resolution: "ansi-html-community@npm:0.0.8"
@@ -4422,6 +4432,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"array.prototype.findlastindex@npm:^1.2.2":
+  version: 1.2.2
+  resolution: "array.prototype.findlastindex@npm:1.2.2"
+  dependencies:
+    call-bind: ^1.0.2
+    define-properties: ^1.1.4
+    es-abstract: ^1.20.4
+    es-shim-unscopables: ^1.0.0
+    get-intrinsic: ^1.1.3
+  checksum: 8a166359f69a2a751c843f26b9c8cd03d0dc396a92cdcb85f4126b5f1cecdae5b2c0c616a71ea8aff026bde68165b44950b3664404bb73db0673e288495ba264
+  languageName: node
+  linkType: hard
+
 "array.prototype.flat@npm:^1.3.1":
   version: 1.3.1
   resolution: "array.prototype.flat@npm:1.3.1"
@@ -4582,6 +4605,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"asynciterator.prototype@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "asynciterator.prototype@npm:1.0.0"
+  dependencies:
+    has-symbols: ^1.0.3
+  checksum: e8ebfd9493ac651cf9b4165e9d64030b3da1d17181bb1963627b59e240cdaf021d9b59d44b827dc1dde4e22387ec04c2d0f8720cf58a1c282e34e40cc12721b3
+  languageName: node
+  linkType: hard
+
 "asynckit@npm:^0.4.0":
   version: 0.4.0
   resolution: "asynckit@npm:0.4.0"
@@ -4613,11 +4645,11 @@ __metadata:
   linkType: hard
 
 "autoprefixer@npm:^10.4.14":
-  version: 10.4.14
-  resolution: "autoprefixer@npm:10.4.14"
+  version: 10.4.15
+  resolution: "autoprefixer@npm:10.4.15"
   dependencies:
-    browserslist: ^4.21.5
-    caniuse-lite: ^1.0.30001464
+    browserslist: ^4.21.10
+    caniuse-lite: ^1.0.30001520
     fraction.js: ^4.2.0
     normalize-range: ^0.1.2
     picocolors: ^1.0.0
@@ -4626,7 +4658,7 @@ __metadata:
     postcss: ^8.1.0
   bin:
     autoprefixer: bin/autoprefixer
-  checksum: e9f18e664a4e4a54a8f4ec5f6b49ed228ec45afaa76efcae361c93721795dc5ab644f36d2fdfc0dea446b02a8067b9372f91542ea431994399e972781ed46d95
+  checksum: d490b14fb098c043e109fc13cd23628f146af99a493d35b9df3a26f8ec0b4dd8937c5601cdbaeb465b98ea31d3ea05aa7184711d4d93dfb52358d073dcb67032
   languageName: node
   linkType: hard
 
@@ -4645,13 +4677,13 @@ __metadata:
   linkType: hard
 
 "axios@npm:^1.4.0":
-  version: 1.4.0
-  resolution: "axios@npm:1.4.0"
+  version: 1.5.0
+  resolution: "axios@npm:1.5.0"
   dependencies:
     follow-redirects: ^1.15.0
     form-data: ^4.0.0
     proxy-from-env: ^1.1.0
-  checksum: 7fb6a4313bae7f45e89d62c70a800913c303df653f19eafec88e56cea2e3821066b8409bc68be1930ecca80e861c52aa787659df0ffec6ad4d451c7816b9386b
+  checksum: e7405a5dbbea97760d0e6cd58fecba311b0401ddb4a8efbc4108f5537da9b3f278bde566deb777935a960beec4fa18e7b8353881f2f465e4f2c0e949fead35be
   languageName: node
   linkType: hard
 
@@ -4664,20 +4696,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-jest@npm:^29.5.0, babel-jest@npm:^29.6.2":
-  version: 29.6.2
-  resolution: "babel-jest@npm:29.6.2"
+"babel-jest@npm:^29.5.0, babel-jest@npm:^29.6.4":
+  version: 29.6.4
+  resolution: "babel-jest@npm:29.6.4"
   dependencies:
-    "@jest/transform": ^29.6.2
+    "@jest/transform": ^29.6.4
     "@types/babel__core": ^7.1.14
     babel-plugin-istanbul: ^6.1.1
-    babel-preset-jest: ^29.5.0
+    babel-preset-jest: ^29.6.3
     chalk: ^4.0.0
     graceful-fs: ^4.2.9
     slash: ^3.0.0
   peerDependencies:
     "@babel/core": ^7.8.0
-  checksum: 3936b5d6ed6f08670c830ed919e38a4a593d0643b8e30fdeb16f4588b262ea5255fb96fd1849c02fba0b082ecfa4e788ce9a128ad1b9e654d46aac09c3a55504
+  checksum: c574f1805ab6b51a7d0f5a028aad19eec4634be81e66e6f4631b79b34d8ea05dfb53629f3686c77345163872730aa0408c9e5937ed85f846984228f7ab5e5d96
   languageName: node
   linkType: hard
 
@@ -4728,15 +4760,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-plugin-jest-hoist@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "babel-plugin-jest-hoist@npm:29.5.0"
+"babel-plugin-jest-hoist@npm:^29.6.3":
+  version: 29.6.3
+  resolution: "babel-plugin-jest-hoist@npm:29.6.3"
   dependencies:
     "@babel/template": ^7.3.3
     "@babel/types": ^7.3.3
     "@types/babel__core": ^7.1.14
     "@types/babel__traverse": ^7.0.6
-  checksum: 099b5254073b6bc985b6d2d045ad26fb8ed30ff8ae6404c4fe8ee7cd0e98a820f69e3dfb871c7c65aae0f4b65af77046244c07bb92d49ef9005c90eedf681539
+  checksum: 51250f22815a7318f17214a9d44650ba89551e6d4f47a2dc259128428324b52f5a73979d010cefd921fd5a720d8c1d55ad74ff601cd94c7bd44d5f6292fde2d1
   languageName: node
   linkType: hard
 
@@ -4841,15 +4873,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-preset-jest@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "babel-preset-jest@npm:29.5.0"
+"babel-preset-jest@npm:^29.6.3":
+  version: 29.6.3
+  resolution: "babel-preset-jest@npm:29.6.3"
   dependencies:
-    babel-plugin-jest-hoist: ^29.5.0
+    babel-plugin-jest-hoist: ^29.6.3
     babel-preset-current-node-syntax: ^1.0.0
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 5566ca2762766c9319b4973d018d2fa08c0fcf6415c72cc54f4c8e7199e851ea8f5e6c6730f03ed7ed44fc8beefa959dd15911f2647dee47c615ff4faeddb1ad
+  checksum: aa4ff2a8a728d9d698ed521e3461a109a1e66202b13d3494e41eea30729a5e7cc03b3a2d56c594423a135429c37bf63a9fa8b0b9ce275298be3095a88c69f6fb
   languageName: node
   linkType: hard
 
@@ -4933,6 +4965,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"bintrees@npm:1.0.2":
+  version: 1.0.2
+  resolution: "bintrees@npm:1.0.2"
+  checksum: 56a52b7d3634e30002b1eda740d2517a22fa8e9e2eb088e919f37c030a0ed86e364ab59e472fc770fc8751308054bb1c892979d150e11d9e11ac33bcc1b5d16e
+  languageName: node
+  linkType: hard
+
 "blueimp-load-image@npm:^3.0.0":
   version: 3.0.0
   resolution: "blueimp-load-image@npm:3.0.0"
@@ -5144,7 +5183,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"browserslist@npm:^4.0.0, browserslist@npm:^4.21.4, browserslist@npm:^4.21.5, browserslist@npm:^4.21.9":
+"browserslist@npm:^4.0.0, browserslist@npm:^4.21.10, browserslist@npm:^4.21.4, browserslist@npm:^4.21.9":
   version: 4.21.10
   resolution: "browserslist@npm:4.21.10"
   dependencies:
@@ -5290,14 +5329,14 @@ __metadata:
   linkType: hard
 
 "cacache@npm:^17.0.0":
-  version: 17.1.3
-  resolution: "cacache@npm:17.1.3"
+  version: 17.1.4
+  resolution: "cacache@npm:17.1.4"
   dependencies:
     "@npmcli/fs": ^3.1.0
     fs-minipass: ^3.0.0
     glob: ^10.2.2
     lru-cache: ^7.7.1
-    minipass: ^5.0.0
+    minipass: ^7.0.3
     minipass-collect: ^1.0.2
     minipass-flush: ^1.0.5
     minipass-pipeline: ^1.2.4
@@ -5305,7 +5344,7 @@ __metadata:
     ssri: ^10.0.0
     tar: ^6.1.11
     unique-filename: ^3.0.0
-  checksum: 385756781e1e21af089160d89d7462b7ed9883c978e848c7075b90b73cb823680e66092d61513050164588387d2ca87dd6d910e28d64bc13a9ac82cd8580c796
+  checksum: b7751df756656954a51201335addced8f63fc53266fa56392c9f5ae83c8d27debffb4458ac2d168a744a4517ec3f2163af05c20097f93d17bdc2dc8a385e14a6
   languageName: node
   linkType: hard
 
@@ -5381,17 +5420,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001464, caniuse-lite@npm:^1.0.30001517":
-  version: 1.0.30001520
-  resolution: "caniuse-lite@npm:1.0.30001520"
-  checksum: 59991ad8f36cf282f81abbcc6074c3097c21914cdd54bd2b3f73ac9462f57fc74e90371cd22bcdff4d085d09da42a07dcea384cb81e4ac260496e1bd79e1fe7c
+"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001517, caniuse-lite@npm:^1.0.30001520":
+  version: 1.0.30001523
+  resolution: "caniuse-lite@npm:1.0.30001523"
+  checksum: 3a007dc8147d4b5a6c22661d424e6d4e4e9595d0dcb279d25b93161cc7d54363eb12d053f40a186ba7e42a8bc4f59e6e121474b7aa339bf7ec200258400d39bc
   languageName: node
   linkType: hard
 
-"chalk@npm:5.2.0":
-  version: 5.2.0
-  resolution: "chalk@npm:5.2.0"
-  checksum: 03d8060277de6cf2fd567dc25fcf770593eb5bb85f460ce443e49255a30ff1242edd0c90a06a03803b0466ff0687a939b41db1757bec987113e83de89a003caa
+"chalk@npm:5.3.0":
+  version: 5.3.0
+  resolution: "chalk@npm:5.3.0"
+  checksum: 623922e077b7d1e9dedaea6f8b9e9352921f8ae3afe739132e0e00c275971bdd331268183b2628cf4ab1727c45ea1f28d7e24ac23ce1db1eb653c414ca8a5a80
   languageName: node
   linkType: hard
 
@@ -5506,6 +5545,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"circular-dependency-plugin@npm:^5.2.2":
+  version: 5.2.2
+  resolution: "circular-dependency-plugin@npm:5.2.2"
+  peerDependencies:
+    webpack: ">=4.0.1"
+  checksum: d1a51e7f86e72d9e7a08c47234511cc7a5c3050781c2d6dcc77c0b22214f94f272702488c952e59b2af589c67944160ad1c9c0b7b3e0d4f89222f2a27ebf085e
+  languageName: node
+  linkType: hard
+
 "cjs-module-lexer@npm:^1.0.0":
   version: 1.2.3
   resolution: "cjs-module-lexer@npm:1.2.3"
@@ -5539,22 +5587,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cli-cursor@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "cli-cursor@npm:3.1.0"
+"cli-cursor@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "cli-cursor@npm:4.0.0"
   dependencies:
-    restore-cursor: ^3.1.0
-  checksum: 2692784c6cd2fd85cfdbd11f53aea73a463a6d64a77c3e098b2b4697a20443f430c220629e1ca3b195ea5ac4a97a74c2ee411f3807abf6df2b66211fec0c0a29
-  languageName: node
-  linkType: hard
-
-"cli-truncate@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "cli-truncate@npm:2.1.0"
-  dependencies:
-    slice-ansi: ^3.0.0
-    string-width: ^4.2.0
-  checksum: bf1e4e6195392dc718bf9cd71f317b6300dc4a9191d052f31046b8773230ece4fa09458813bf0e3455a5e68c0690d2ea2c197d14a8b85a7b5e01c97f4b5feb5d
+    restore-cursor: ^4.0.0
+  checksum: ab3f3ea2076e2176a1da29f9d64f72ec3efad51c0960898b56c8a17671365c26e67b735920530eaf7328d61f8bd41c27f46b9cf6e4e10fe2fa44b5e8c0e392cc
   languageName: node
   linkType: hard
 
@@ -5705,7 +5743,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"colorette@npm:^2.0.19":
+"colorette@npm:^2.0.20":
   version: 2.0.20
   resolution: "colorette@npm:2.0.20"
   checksum: 0c016fea2b91b733eb9f4bcdb580018f52c0bc0979443dad930e5037a968237ac53d9beb98e218d2e9235834f8eebce7f8e080422d6194e957454255bde71d3d
@@ -5728,10 +5766,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"commander@npm:^10.0.0":
-  version: 10.0.1
-  resolution: "commander@npm:10.0.1"
-  checksum: 436901d64a818295803c1996cd856621a74f30b9f9e28a588e726b2b1670665bccd7c1a77007ebf328729f0139838a88a19265858a0fa7a8728c4656796db948
+"commander@npm:11.0.0":
+  version: 11.0.0
+  resolution: "commander@npm:11.0.0"
+  checksum: 6621954e1e1d078b4991c1f5bbd9439ad37aa7768d6ab4842de1dbd4d222c8a27e1b8e62108b3a92988614af45031d5bb2a2aaa92951f4d0c934d1a1ac564bb4
   languageName: node
   linkType: hard
 
@@ -5903,11 +5941,11 @@ __metadata:
   linkType: hard
 
 "core-js-compat@npm:^3.31.0":
-  version: 3.32.0
-  resolution: "core-js-compat@npm:3.32.0"
+  version: 3.32.1
+  resolution: "core-js-compat@npm:3.32.1"
   dependencies:
-    browserslist: ^4.21.9
-  checksum: e740b348dfd8dc25ac851ab625a1d5a63c012252bdd6d8ae92d1b2ebf46e6cf57ca6cbec4494cbacdd90d3f8ed822480c8a7106c990dbe9055ebdf5b79fbb92e
+    browserslist: ^4.21.10
+  checksum: 2ce0002d6d2acabfc6f4c1ea32915683406a10051a186db354b761303cb6f5728f83887d070fb8d0072b5601bb16cb0d24555ee72bfa6df244f7b3ef74d61f76
   languageName: node
   linkType: hard
 
@@ -5919,9 +5957,9 @@ __metadata:
   linkType: hard
 
 "core-js@npm:^3.30.2":
-  version: 3.32.0
-  resolution: "core-js@npm:3.32.0"
-  checksum: 52921395028550e4c9d21d47b9836439bb5b6b9eefc34d45a3948a68d81fdd093acc0fadf69f9cf632b82f01f95f22f484408a93dd9e940b19119ac204cd2925
+  version: 3.32.1
+  resolution: "core-js@npm:3.32.1"
+  checksum: e4af91d9c6be7b59235feb3f273d16705126ce09a0b4a787144d131d874f0cd10be3c24fc52e5eea7d7cb03ceabe4be7b255abcd9474b5eb1ff365d2c5611f9a
   languageName: node
   linkType: hard
 
@@ -6349,7 +6387,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4":
+"debug@npm:4, debug@npm:4.3.4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4":
   version: 4.3.4
   resolution: "debug@npm:4.3.4"
   dependencies:
@@ -6655,10 +6693,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"diff-sequences@npm:^29.4.3":
-  version: 29.4.3
-  resolution: "diff-sequences@npm:29.4.3"
-  checksum: 28b265e04fdddcf7f9f814effe102cc95a9dec0564a579b5aed140edb24fc345c611ca52d76d725a3cab55d3888b915b5e8a4702e0f6058968a90fa5f41fcde7
+"diff-sequences@npm:^29.6.3":
+  version: 29.6.3
+  resolution: "diff-sequences@npm:29.6.3"
+  checksum: f4914158e1f2276343d98ff5b31fc004e7304f5470bf0f1adb2ac6955d85a531a6458d33e87667f98f6ae52ebd3891bb47d420bb48a5bd8b7a27ee25b20e33aa
   languageName: node
   linkType: hard
 
@@ -6873,9 +6911,9 @@ __metadata:
   linkType: hard
 
 "electron-to-chromium@npm:^1.4.477":
-  version: 1.4.490
-  resolution: "electron-to-chromium@npm:1.4.490"
-  checksum: c81bf177ff64ceb54fa90f715f1d52fb9106b0ef4426b816c4ae0471c562d8f4d110531df1a164ce17eda13ad9481f6bcd15f1368b6d5442a1d2f93102ef221a
+  version: 1.4.503
+  resolution: "electron-to-chromium@npm:1.4.503"
+  checksum: 77198f5d4365931fb6f18670f1cc2bc6833516dfe935e69209da45ba06fd9e3bb02678216ab8c1cf7b047655559b7d591d922d9a781a1f91c7f5a32d5f51f778
   languageName: node
   linkType: hard
 
@@ -7052,7 +7090,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"es-abstract@npm:^1.17.2, es-abstract@npm:^1.19.0, es-abstract@npm:^1.20.4, es-abstract@npm:^1.21.2":
+"es-abstract@npm:^1.17.2, es-abstract@npm:^1.19.0, es-abstract@npm:^1.20.4, es-abstract@npm:^1.21.2, es-abstract@npm:^1.21.3":
   version: 1.22.1
   resolution: "es-abstract@npm:1.22.1"
   dependencies:
@@ -7123,6 +7161,28 @@ __metadata:
   languageName: node
   linkType: hard
 
+"es-iterator-helpers@npm:^1.0.12":
+  version: 1.0.13
+  resolution: "es-iterator-helpers@npm:1.0.13"
+  dependencies:
+    asynciterator.prototype: ^1.0.0
+    call-bind: ^1.0.2
+    define-properties: ^1.2.0
+    es-abstract: ^1.21.3
+    es-set-tostringtag: ^2.0.1
+    function-bind: ^1.1.1
+    get-intrinsic: ^1.2.1
+    globalthis: ^1.0.3
+    has-property-descriptors: ^1.0.0
+    has-proto: ^1.0.1
+    has-symbols: ^1.0.3
+    internal-slot: ^1.0.5
+    iterator.prototype: ^1.1.0
+    safe-array-concat: ^1.0.0
+  checksum: 1b08ae7388439121fee1129cb23497abd7bf23dd440f7fa44d119c9f92f38f9b7d75b7d98453fcd15948a7eb58abb2a48c673c7250d2e15871abe3641f567ed7
+  languageName: node
+  linkType: hard
+
 "es-set-tostringtag@npm:^2.0.1":
   version: 2.0.1
   resolution: "es-set-tostringtag@npm:2.0.1"
@@ -7207,14 +7267,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-config-prettier@npm:^8.8.0":
-  version: 8.10.0
-  resolution: "eslint-config-prettier@npm:8.10.0"
+"eslint-config-prettier@npm:^9.0.0":
+  version: 9.0.0
+  resolution: "eslint-config-prettier@npm:9.0.0"
   peerDependencies:
     eslint: ">=7.0.0"
   bin:
     eslint-config-prettier: bin/cli.js
-  checksum: 153266badd477e49b0759816246b2132f1dbdb6c7f313ca60a9af5822fd1071c2bc5684a3720d78b725452bbac04bb130878b2513aea5e72b1b792de5a69fec8
+  checksum: 362e991b6cb343f79362bada2d97c202e5303e6865888918a7445c555fb75e4c078b01278e90be98aa98ae22f8597d8e93d48314bec6824f540f7efcab3ce451
   languageName: node
   linkType: hard
 
@@ -7247,7 +7307,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-module-utils@npm:^2.7.4":
+"eslint-module-utils@npm:^2.7.4, eslint-module-utils@npm:^2.8.0":
   version: 2.8.0
   resolution: "eslint-module-utils@npm:2.8.0"
   dependencies:
@@ -7280,34 +7340,36 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-plugin-import@npm:~2.27.5":
-  version: 2.27.5
-  resolution: "eslint-plugin-import@npm:2.27.5"
+"eslint-plugin-import@npm:~2.28.0":
+  version: 2.28.1
+  resolution: "eslint-plugin-import@npm:2.28.1"
   dependencies:
     array-includes: ^3.1.6
+    array.prototype.findlastindex: ^1.2.2
     array.prototype.flat: ^1.3.1
     array.prototype.flatmap: ^1.3.1
     debug: ^3.2.7
     doctrine: ^2.1.0
     eslint-import-resolver-node: ^0.3.7
-    eslint-module-utils: ^2.7.4
+    eslint-module-utils: ^2.8.0
     has: ^1.0.3
-    is-core-module: ^2.11.0
+    is-core-module: ^2.13.0
     is-glob: ^4.0.3
     minimatch: ^3.1.2
+    object.fromentries: ^2.0.6
+    object.groupby: ^1.0.0
     object.values: ^1.1.6
-    resolve: ^1.22.1
-    semver: ^6.3.0
-    tsconfig-paths: ^3.14.1
+    semver: ^6.3.1
+    tsconfig-paths: ^3.14.2
   peerDependencies:
     eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8
-  checksum: f500571a380167e25d72a4d925ef9a7aae8899eada57653e5f3051ec3d3c16d08271fcefe41a30a9a2f4fefc232f066253673ee4ea77b30dba65ae173dade85d
+  checksum: e8ae6dd8f06d8adf685f9c1cfd46ac9e053e344a05c4090767e83b63a85c8421ada389807a39e73c643b9bff156715c122e89778169110ed68d6428e12607edf
   languageName: node
   linkType: hard
 
 "eslint-plugin-jsdoc@npm:^46.1.0":
-  version: 46.4.6
-  resolution: "eslint-plugin-jsdoc@npm:46.4.6"
+  version: 46.5.0
+  resolution: "eslint-plugin-jsdoc@npm:46.5.0"
   dependencies:
     "@es-joy/jsdoccomment": ~0.40.1
     are-docs-informative: ^0.0.2
@@ -7320,7 +7382,7 @@ __metadata:
     spdx-expression-parse: ^3.0.1
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0
-  checksum: 67b90a251008fbe4ff61a9d959b49f1f6fda542bf6e56745a231f6140477a3debacd549f18dbba7c0e2908f559f9ca1ce9c19d17736355311a36f7cf42eb28c1
+  checksum: 6e182b25e136250cd0bde076bdb051d4e82efc50c20f99cb436aa136a49769ec44a2346df384deba399ca8f303f9ae3be80e21e546d0e921b23f9a0c6330e32e
   languageName: node
   linkType: hard
 
@@ -7387,14 +7449,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-plugin-react@npm:~7.32.2":
-  version: 7.32.2
-  resolution: "eslint-plugin-react@npm:7.32.2"
+"eslint-plugin-react@npm:~7.33.0":
+  version: 7.33.2
+  resolution: "eslint-plugin-react@npm:7.33.2"
   dependencies:
     array-includes: ^3.1.6
     array.prototype.flatmap: ^1.3.1
     array.prototype.tosorted: ^1.1.1
     doctrine: ^2.1.0
+    es-iterator-helpers: ^1.0.12
     estraverse: ^5.3.0
     jsx-ast-utils: ^2.4.1 || ^3.0.0
     minimatch: ^3.1.2
@@ -7404,11 +7467,11 @@ __metadata:
     object.values: ^1.1.6
     prop-types: ^15.8.1
     resolve: ^2.0.0-next.4
-    semver: ^6.3.0
+    semver: ^6.3.1
     string.prototype.matchall: ^4.0.8
   peerDependencies:
     eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
-  checksum: 2232b3b8945aa50b7773919c15cd96892acf35d2f82503667a79e2f55def90f728ed4f0e496f0f157acbe1bd4397c5615b676ae7428fe84488a544ca53feb944
+  checksum: b4c3d76390b0ae6b6f9fed78170604cc2c04b48e6778a637db339e8e3911ec9ef22510b0ae77c429698151d0f1b245f282177f384105b6830e7b29b9c9b26610
   languageName: node
   linkType: hard
 
@@ -7440,13 +7503,13 @@ __metadata:
   linkType: hard
 
 "eslint@npm:^8.41.0":
-  version: 8.47.0
-  resolution: "eslint@npm:8.47.0"
+  version: 8.48.0
+  resolution: "eslint@npm:8.48.0"
   dependencies:
     "@eslint-community/eslint-utils": ^4.2.0
     "@eslint-community/regexpp": ^4.6.1
     "@eslint/eslintrc": ^2.1.2
-    "@eslint/js": ^8.47.0
+    "@eslint/js": 8.48.0
     "@humanwhocodes/config-array": ^0.11.10
     "@humanwhocodes/module-importer": ^1.0.1
     "@nodelib/fs.walk": ^1.2.8
@@ -7482,7 +7545,7 @@ __metadata:
     text-table: ^0.2.0
   bin:
     eslint: bin/eslint.js
-  checksum: 1988617f703eadc5c7540468d54dc8e5171cf2bb9483f6172799cd1ff54a9a5e4470f003784e8cef92687eaa14de37172732787040e67817581a20bcb9c15970
+  checksum: f20b359a4f8123fec5c033577368cc020d42978b1b45303974acd8da7a27063168ee3fe297ab5b35327162f6a93154063e3ce6577102f70f9809aff793db9bd0
   languageName: node
   linkType: hard
 
@@ -7574,6 +7637,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"eventemitter3@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "eventemitter3@npm:5.0.1"
+  checksum: 543d6c858ab699303c3c32e0f0f47fc64d360bf73c3daf0ac0b5079710e340d6fe9f15487f94e66c629f5f82cd1a8678d692f3dbb6f6fcd1190e1b97fcad36f8
+  languageName: node
+  linkType: hard
+
 "events@npm:^3.0.0, events@npm:^3.3.0":
   version: 3.3.0
   resolution: "events@npm:3.3.0"
@@ -7599,6 +7669,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"execa@npm:7.2.0, execa@npm:^7.1.1":
+  version: 7.2.0
+  resolution: "execa@npm:7.2.0"
+  dependencies:
+    cross-spawn: ^7.0.3
+    get-stream: ^6.0.1
+    human-signals: ^4.3.0
+    is-stream: ^3.0.0
+    merge-stream: ^2.0.0
+    npm-run-path: ^5.1.0
+    onetime: ^6.0.0
+    signal-exit: ^3.0.7
+    strip-final-newline: ^3.0.0
+  checksum: 14fd17ba0ca8c87b277584d93b1d9fc24f2a65e5152b31d5eb159a3b814854283eaae5f51efa9525e304447e2f757c691877f7adff8fde5746aae67eb1edd1cc
+  languageName: node
+  linkType: hard
+
 "execa@npm:^1.0.0":
   version: 1.0.0
   resolution: "execa@npm:1.0.0"
@@ -7631,23 +7718,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"execa@npm:^7.0.0, execa@npm:^7.1.1":
-  version: 7.2.0
-  resolution: "execa@npm:7.2.0"
-  dependencies:
-    cross-spawn: ^7.0.3
-    get-stream: ^6.0.1
-    human-signals: ^4.3.0
-    is-stream: ^3.0.0
-    merge-stream: ^2.0.0
-    npm-run-path: ^5.1.0
-    onetime: ^6.0.0
-    signal-exit: ^3.0.7
-    strip-final-newline: ^3.0.0
-  checksum: 14fd17ba0ca8c87b277584d93b1d9fc24f2a65e5152b31d5eb159a3b814854283eaae5f51efa9525e304447e2f757c691877f7adff8fde5746aae67eb1edd1cc
-  languageName: node
-  linkType: hard
-
 "exif-js@npm:^2.3.0":
   version: 2.3.0
   resolution: "exif-js@npm:2.3.0"
@@ -7686,17 +7756,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"expect@npm:^29.0.0, expect@npm:^29.6.2":
-  version: 29.6.2
-  resolution: "expect@npm:29.6.2"
+"expect@npm:^29.0.0, expect@npm:^29.6.4":
+  version: 29.6.4
+  resolution: "expect@npm:29.6.4"
   dependencies:
-    "@jest/expect-utils": ^29.6.2
-    "@types/node": "*"
-    jest-get-type: ^29.4.3
-    jest-matcher-utils: ^29.6.2
-    jest-message-util: ^29.6.2
-    jest-util: ^29.6.2
-  checksum: 71f7b0c560e58bf6d27e0fded261d4bdb7ef81552a6bb4bd1ee09ce7a1f7dca67fbf83cf9b07a6645a88ef52e65085a0dcbe17f6c063b53ff7c2f0f3ea4ef69e
+    "@jest/expect-utils": ^29.6.4
+    jest-get-type: ^29.6.3
+    jest-matcher-utils: ^29.6.4
+    jest-message-util: ^29.6.3
+    jest-util: ^29.6.3
+  checksum: 019b187d665562e4948b239e011a8791363e916f3076a229298d625e67fdadb06e8c2748798c49b4cf418ea223673eadd1de06537e08ba3c055c6f0efefc2306
   languageName: node
   linkType: hard
 
@@ -8003,16 +8072,17 @@ __metadata:
   linkType: hard
 
 "flat-cache@npm:^3.0.4":
-  version: 3.0.4
-  resolution: "flat-cache@npm:3.0.4"
+  version: 3.1.0
+  resolution: "flat-cache@npm:3.1.0"
   dependencies:
-    flatted: ^3.1.0
+    flatted: ^3.2.7
+    keyv: ^4.5.3
     rimraf: ^3.0.2
-  checksum: 4fdd10ecbcbf7d520f9040dd1340eb5dfe951e6f0ecf2252edeec03ee68d989ec8b9a20f4434270e71bcfd57800dc09b3344fca3966b2eb8f613072c7d9a2365
+  checksum: 99312601d5b90f44aef403f17f056dc09be7e437703740b166cdc9386d99e681f74e6b6e8bd7d010bda66904ea643c9527276b1b80308a2119741d94108a4d8f
   languageName: node
   linkType: hard
 
-"flatted@npm:^3.1.0":
+"flatted@npm:^3.2.7":
   version: 3.2.7
   resolution: "flatted@npm:3.2.7"
   checksum: 427633049d55bdb80201c68f7eb1cbd533e03eac541f97d3aecab8c5526f12a20ccecaeede08b57503e772c769e7f8680b37e8d482d1e5f8d7e2194687f9ea35
@@ -8081,9 +8151,9 @@ __metadata:
   linkType: hard
 
 "fraction.js@npm:^4.2.0":
-  version: 4.2.0
-  resolution: "fraction.js@npm:4.2.0"
-  checksum: 8c76a6e21dedea87109d6171a0ac77afa14205794a565d71cb10d2925f629a3922da61bf45ea52dbc30bce4d8636dc0a27213a88cbd600eab047d82f9a3a94c5
+  version: 4.2.1
+  resolution: "fraction.js@npm:4.2.1"
+  checksum: 94cc9844bf1e3071734fa70c7410cf26c09636a0e95f956f2f90d839bf516d60f07bac6f33fbe018dbdbba7bda360794c0232810900475295415a164c3c9cf78
   languageName: node
   linkType: hard
 
@@ -8125,11 +8195,11 @@ __metadata:
   linkType: hard
 
 "fs-minipass@npm:^3.0.0":
-  version: 3.0.2
-  resolution: "fs-minipass@npm:3.0.2"
+  version: 3.0.3
+  resolution: "fs-minipass@npm:3.0.3"
   dependencies:
-    minipass: ^5.0.0
-  checksum: e9cc0e1f2d01c6f6f62f567aee59530aba65c6c7b2ae88c5027bc34c711ebcfcfaefd0caf254afa6adfe7d1fba16bc2537508a6235196bac7276747d078aef0a
+    minipass: ^7.0.3
+  checksum: 8722a41109130851d979222d3ec88aabaceeaaf8f57b2a8f744ef8bd2d1ce95453b04a61daa0078822bc5cd21e008814f06fe6586f56fef511e71b8d2394d802
   languageName: node
   linkType: hard
 
@@ -8152,11 +8222,11 @@ __metadata:
   linkType: hard
 
 "fsevents@npm:^2.3.2, fsevents@npm:~2.3.2":
-  version: 2.3.2
-  resolution: "fsevents@npm:2.3.2"
+  version: 2.3.3
+  resolution: "fsevents@npm:2.3.3"
   dependencies:
     node-gyp: latest
-  checksum: 97ade64e75091afee5265e6956cb72ba34db7819b4c3e94c431d4be2b19b8bb7a2d4116da417950c3425f17c8fe693d25e20212cac583ac1521ad066b77ae31f
+  checksum: 11e6ea6fea15e42461fc55b4b0e4a0a3c654faa567f1877dbd353f39156f69def97a69936d1746619d656c4b93de2238bf731f6085a03a50cabf287c9d024317
   conditions: os=darwin
   languageName: node
   linkType: hard
@@ -8172,8 +8242,8 @@ __metadata:
   linkType: hard
 
 "fsevents@patch:fsevents@^2.3.2#~builtin<compat/fsevents>, fsevents@patch:fsevents@~2.3.2#~builtin<compat/fsevents>":
-  version: 2.3.2
-  resolution: "fsevents@patch:fsevents@npm%3A2.3.2#~builtin<compat/fsevents>::version=2.3.2&hash=df0bf1"
+  version: 2.3.3
+  resolution: "fsevents@patch:fsevents@npm%3A2.3.3#~builtin<compat/fsevents>::version=2.3.3&hash=df0bf1"
   dependencies:
     node-gyp: latest
   conditions: os=darwin
@@ -8976,9 +9046,9 @@ __metadata:
   linkType: hard
 
 "immutable@npm:^4.0.0, immutable@npm:^4.0.0-rc.1, immutable@npm:^4.3.0":
-  version: 4.3.2
-  resolution: "immutable@npm:4.3.2"
-  checksum: bb1d0f3eb8ebef04aa9e2c698ba1a248976a4dc0257fa2f1bffaaae575f891395fe9ef39eaf49856d6c4edd31704e300ec563ed44ea9d7c7996186deab91d0ff
+  version: 4.3.4
+  resolution: "immutable@npm:4.3.4"
+  checksum: de3edd964c394bab83432429d3fb0b4816b42f56050f2ca913ba520bd3068ec3e504230d0800332d3abc478616e8f55d3787424a90d0952e6aba864524f1afc3
   languageName: node
   linkType: hard
 
@@ -9240,6 +9310,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-async-function@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "is-async-function@npm:2.0.0"
+  dependencies:
+    has-tostringtag: ^1.0.0
+  checksum: e3471d95e6c014bf37cad8a93f2f4b6aac962178e0a5041e8903147166964fdc1c5c1d2ef87e86d77322c370ca18f2ea004fa7420581fa747bcaf7c223069dbd
+  languageName: node
+  linkType: hard
+
 "is-bigint@npm:^1.0.1":
   version: 1.0.4
   resolution: "is-bigint@npm:1.0.4"
@@ -9399,6 +9478,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-finalizationregistry@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "is-finalizationregistry@npm:1.0.2"
+  dependencies:
+    call-bind: ^1.0.2
+  checksum: 4f243a8e06228cd45bdab8608d2cb7abfc20f6f0189c8ac21ea8d603f1f196eabd531ce0bb8e08cbab047e9845ef2c191a3761c9a17ad5cabf8b35499c4ad35d
+  languageName: node
+  linkType: hard
+
 "is-fullwidth-code-point@npm:^2.0.0":
   version: 2.0.0
   resolution: "is-fullwidth-code-point@npm:2.0.0"
@@ -9427,6 +9515,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-generator-function@npm:^1.0.10":
+  version: 1.0.10
+  resolution: "is-generator-function@npm:1.0.10"
+  dependencies:
+    has-tostringtag: ^1.0.0
+  checksum: d54644e7dbaccef15ceb1e5d91d680eb5068c9ee9f9eb0a9e04173eb5542c9b51b5ab52c5537f5703e48d5fddfd376817c1ca07a84a407b7115b769d4bdde72b
+  languageName: node
+  linkType: hard
+
 "is-glob@npm:^3.1.0":
   version: 3.1.0
   resolution: "is-glob@npm:3.1.0"
@@ -9766,7 +9863,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"istanbul-lib-instrument@npm:^5.0.4, istanbul-lib-instrument@npm:^5.1.0":
+"istanbul-lib-instrument@npm:^5.0.4":
   version: 5.2.1
   resolution: "istanbul-lib-instrument@npm:5.2.1"
   dependencies:
@@ -9779,6 +9876,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"istanbul-lib-instrument@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "istanbul-lib-instrument@npm:6.0.0"
+  dependencies:
+    "@babel/core": ^7.12.3
+    "@babel/parser": ^7.14.7
+    "@istanbuljs/schema": ^0.1.2
+    istanbul-lib-coverage: ^3.2.0
+    semver: ^7.5.4
+  checksum: b9dc3723a769e65dbe1b912f935088ffc07cf393fa78a3ce79022c91aabb0ad01405ffd56083cdd822e514798e9daae3ea7bfe85633b094ecb335d28eb0a3f97
+  languageName: node
+  linkType: hard
+
 "istanbul-lib-report@npm:^3.0.0":
   version: 3.0.1
   resolution: "istanbul-lib-report@npm:3.0.1"
@@ -9811,16 +9921,29 @@ __metadata:
   languageName: node
   linkType: hard
 
+"iterator.prototype@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "iterator.prototype@npm:1.1.0"
+  dependencies:
+    define-properties: ^1.1.4
+    get-intrinsic: ^1.1.3
+    has-symbols: ^1.0.3
+    has-tostringtag: ^1.0.0
+    reflect.getprototypeof: ^1.0.3
+  checksum: 462fe16c770affeb9c08620b13fc98d38307335821f4fabd489f491d38c79855c6a93d4b56f6146eaa56711f61690aa5c7eb0ce8586c95145d2f665a3834d916
+  languageName: node
+  linkType: hard
+
 "jackspeak@npm:^2.0.3":
-  version: 2.2.3
-  resolution: "jackspeak@npm:2.2.3"
+  version: 2.3.0
+  resolution: "jackspeak@npm:2.3.0"
   dependencies:
     "@isaacs/cliui": ^8.0.2
     "@pkgjs/parseargs": ^0.11.0
   dependenciesMeta:
     "@pkgjs/parseargs":
       optional: true
-  checksum: 8add557045eb51f619d247ac9786dbfa7ee4d52a0eb3fb488c2637aecfd15d12c284a4ff7dead2c1aba34d6228d9452e4509fb771daae87793a48786b095ee07
+  checksum: 71bf716f4b5793226d4aeb9761ebf2605ee093b59f91a61451d57d998dd64bbf2b54323fb749b8b2ae8b6d8a463de4f6e3fedab50108671f247bbc80195a6306
   languageName: node
   linkType: hard
 
@@ -9838,58 +9961,59 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-changed-files@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "jest-changed-files@npm:29.5.0"
+"jest-changed-files@npm:^29.6.3":
+  version: 29.6.3
+  resolution: "jest-changed-files@npm:29.6.3"
   dependencies:
     execa: ^5.0.0
+    jest-util: ^29.6.3
     p-limit: ^3.1.0
-  checksum: a67a7cb3c11f8f92bd1b7c79e84f724cbd11a9ad51f3cdadafe3ce7ee3c79ee50dbea128f920f5fddc807e9e4e83f5462143094391feedd959a77dd20ab96cf3
+  checksum: 55bc820a70c220a02fec214d5c48d5e0d829549e5c7b9959776b4ca3f76f5ff20c7c8ff816a847822766f1d712477ab3027f7a66ec61bf65de3f852e878b4dfd
   languageName: node
   linkType: hard
 
-"jest-circus@npm:^29.6.2":
-  version: 29.6.2
-  resolution: "jest-circus@npm:29.6.2"
+"jest-circus@npm:^29.6.4":
+  version: 29.6.4
+  resolution: "jest-circus@npm:29.6.4"
   dependencies:
-    "@jest/environment": ^29.6.2
-    "@jest/expect": ^29.6.2
-    "@jest/test-result": ^29.6.2
-    "@jest/types": ^29.6.1
+    "@jest/environment": ^29.6.4
+    "@jest/expect": ^29.6.4
+    "@jest/test-result": ^29.6.4
+    "@jest/types": ^29.6.3
     "@types/node": "*"
     chalk: ^4.0.0
     co: ^4.6.0
     dedent: ^1.0.0
     is-generator-fn: ^2.0.0
-    jest-each: ^29.6.2
-    jest-matcher-utils: ^29.6.2
-    jest-message-util: ^29.6.2
-    jest-runtime: ^29.6.2
-    jest-snapshot: ^29.6.2
-    jest-util: ^29.6.2
+    jest-each: ^29.6.3
+    jest-matcher-utils: ^29.6.4
+    jest-message-util: ^29.6.3
+    jest-runtime: ^29.6.4
+    jest-snapshot: ^29.6.4
+    jest-util: ^29.6.3
     p-limit: ^3.1.0
-    pretty-format: ^29.6.2
+    pretty-format: ^29.6.3
     pure-rand: ^6.0.0
     slash: ^3.0.0
     stack-utils: ^2.0.3
-  checksum: 4f5a96a68c3c808c3d5a9279a2f39a2937386e2cebba5096971f267d79562ce2133a13bc05356a39f8f1ba68fcfe1eb39c4572b3fb0f91affbd932950e89c1e3
+  checksum: 31f64ddf6df4aefe30ef5f8de9da137c9cba58ab5e2a25cf749450735088dc88a9974591a4256d481af0fe64608173c921219f9fad9a7dd87cbe47a79e111be8
   languageName: node
   linkType: hard
 
-"jest-cli@npm:^29.6.2":
-  version: 29.6.2
-  resolution: "jest-cli@npm:29.6.2"
+"jest-cli@npm:^29.6.4":
+  version: 29.6.4
+  resolution: "jest-cli@npm:29.6.4"
   dependencies:
-    "@jest/core": ^29.6.2
-    "@jest/test-result": ^29.6.2
-    "@jest/types": ^29.6.1
+    "@jest/core": ^29.6.4
+    "@jest/test-result": ^29.6.4
+    "@jest/types": ^29.6.3
     chalk: ^4.0.0
     exit: ^0.1.2
     graceful-fs: ^4.2.9
     import-local: ^3.0.2
-    jest-config: ^29.6.2
-    jest-util: ^29.6.2
-    jest-validate: ^29.6.2
+    jest-config: ^29.6.4
+    jest-util: ^29.6.3
+    jest-validate: ^29.6.3
     prompts: ^2.0.1
     yargs: ^17.3.1
   peerDependencies:
@@ -9899,34 +10023,34 @@ __metadata:
       optional: true
   bin:
     jest: bin/jest.js
-  checksum: 0b7b09ae4bd327caf1981eac5a14679ddda3c5c836c9f8ea0ecfe1e5e10e9a39a5ed783fa38d25383604c4d3405595e74b391d955e99aea7e51acb41a59ea108
+  checksum: 87a85a27eff0e502717b6ee0ce861d3e50d8c47d7298477f8ca10964b958f06c20241d28f1360ce2a85072763483e4924248106a8ed530ca460a56db3fdfc53e
   languageName: node
   linkType: hard
 
-"jest-config@npm:^29.6.2":
-  version: 29.6.2
-  resolution: "jest-config@npm:29.6.2"
+"jest-config@npm:^29.6.4":
+  version: 29.6.4
+  resolution: "jest-config@npm:29.6.4"
   dependencies:
     "@babel/core": ^7.11.6
-    "@jest/test-sequencer": ^29.6.2
-    "@jest/types": ^29.6.1
-    babel-jest: ^29.6.2
+    "@jest/test-sequencer": ^29.6.4
+    "@jest/types": ^29.6.3
+    babel-jest: ^29.6.4
     chalk: ^4.0.0
     ci-info: ^3.2.0
     deepmerge: ^4.2.2
     glob: ^7.1.3
     graceful-fs: ^4.2.9
-    jest-circus: ^29.6.2
-    jest-environment-node: ^29.6.2
-    jest-get-type: ^29.4.3
-    jest-regex-util: ^29.4.3
-    jest-resolve: ^29.6.2
-    jest-runner: ^29.6.2
-    jest-util: ^29.6.2
-    jest-validate: ^29.6.2
+    jest-circus: ^29.6.4
+    jest-environment-node: ^29.6.4
+    jest-get-type: ^29.6.3
+    jest-regex-util: ^29.6.3
+    jest-resolve: ^29.6.4
+    jest-runner: ^29.6.4
+    jest-util: ^29.6.3
+    jest-validate: ^29.6.3
     micromatch: ^4.0.4
     parse-json: ^5.2.0
-    pretty-format: ^29.6.2
+    pretty-format: ^29.6.3
     slash: ^3.0.0
     strip-json-comments: ^3.1.1
   peerDependencies:
@@ -9937,156 +10061,156 @@ __metadata:
       optional: true
     ts-node:
       optional: true
-  checksum: 3bd104a3ac2dd9d34986238142437606354169766dcf88359a7a12ac106d0dc17dcc6b627e4f20db97a58bac5b0502b5436c9cc4722b3629b2a114bba6da9128
+  checksum: 177352658774344896df3988dbe892e0b117579f45cc43aebc588493665bf19a557e202f097f5b4a987314ec2d84afa0769299ac6e702c5923d1fd3cfa4692b0
   languageName: node
   linkType: hard
 
-"jest-diff@npm:^29.6.2":
-  version: 29.6.2
-  resolution: "jest-diff@npm:29.6.2"
+"jest-diff@npm:^29.6.4":
+  version: 29.6.4
+  resolution: "jest-diff@npm:29.6.4"
   dependencies:
     chalk: ^4.0.0
-    diff-sequences: ^29.4.3
-    jest-get-type: ^29.4.3
-    pretty-format: ^29.6.2
-  checksum: 0effd66a0c23f8c139ebf7ca99ed30b479b86fff66f19ad4869f130aaf7ae6a24ca1533f697b7e4930cbe2ddffc85387723fcca673501c653fb77a38f538e959
+    diff-sequences: ^29.6.3
+    jest-get-type: ^29.6.3
+    pretty-format: ^29.6.3
+  checksum: e205c45ab6dbcc660dc2a682cddb20f6a3cbbbdecd2821cce2050619f96dbd7560ee25f7f51d42c302596aeaddbea54390b78be3ab639340d24d67e4d270a8b0
   languageName: node
   linkType: hard
 
-"jest-docblock@npm:^29.4.3":
-  version: 29.4.3
-  resolution: "jest-docblock@npm:29.4.3"
+"jest-docblock@npm:^29.6.3":
+  version: 29.6.3
+  resolution: "jest-docblock@npm:29.6.3"
   dependencies:
     detect-newline: ^3.0.0
-  checksum: e0e9df1485bb8926e5b33478cdf84b3387d9caf3658e7dc1eaa6dc34cb93dea0d2d74797f6e940f0233a88f3dadd60957f2288eb8f95506361f85b84bf8661df
+  checksum: 6f3213a1e79e7eedafeb462acfa9a41303f9c0167893b140f6818fa16d7eb6bf3f9b9cf4669097ca6b7154847793489ecd6b4f6cfb0e416b88cfa3b4b36715b6
   languageName: node
   linkType: hard
 
-"jest-each@npm:^29.6.2":
-  version: 29.6.2
-  resolution: "jest-each@npm:29.6.2"
+"jest-each@npm:^29.6.3":
+  version: 29.6.3
+  resolution: "jest-each@npm:29.6.3"
   dependencies:
-    "@jest/types": ^29.6.1
+    "@jest/types": ^29.6.3
     chalk: ^4.0.0
-    jest-get-type: ^29.4.3
-    jest-util: ^29.6.2
-    pretty-format: ^29.6.2
-  checksum: b64194f4ca27afc6070a42b7ecccbc68be0ded19a849f8cd8f91a2abb23fadae2d38d47559a315f4d1f576927761f3ea437a75ab6cf19206332abb8527d7c165
+    jest-get-type: ^29.6.3
+    jest-util: ^29.6.3
+    pretty-format: ^29.6.3
+  checksum: fe06e80b3554e2a8464f5f5c61943e02db1f8a7177139cb55b3201a1d1513cb089d8800401f102729a31bf8dd6f88229044e6088fea9dd5647ed11e841b6b88c
   languageName: node
   linkType: hard
 
 "jest-environment-jsdom@npm:^29.5.0":
-  version: 29.6.2
-  resolution: "jest-environment-jsdom@npm:29.6.2"
+  version: 29.6.4
+  resolution: "jest-environment-jsdom@npm:29.6.4"
   dependencies:
-    "@jest/environment": ^29.6.2
-    "@jest/fake-timers": ^29.6.2
-    "@jest/types": ^29.6.1
+    "@jest/environment": ^29.6.4
+    "@jest/fake-timers": ^29.6.4
+    "@jest/types": ^29.6.3
     "@types/jsdom": ^20.0.0
     "@types/node": "*"
-    jest-mock: ^29.6.2
-    jest-util: ^29.6.2
+    jest-mock: ^29.6.3
+    jest-util: ^29.6.3
     jsdom: ^20.0.0
   peerDependencies:
     canvas: ^2.5.0
   peerDependenciesMeta:
     canvas:
       optional: true
-  checksum: 82db2bfbbc9c810c73408ada6169d62a8cdcb6eb0d7343903abd1154dabeabae16a5d847e3f943d354bcb719b8192a1762483b8686bd4ac5bd37d332048af824
+  checksum: 2afe105f12d7d93ca56e2e6f67ab07ada3dd3da0516d1198f254930683ab9feb2b8c14417baaca53544eed88fd7fb5744f0dbce2e100269746187317ce0347df
   languageName: node
   linkType: hard
 
-"jest-environment-node@npm:^29.6.2":
-  version: 29.6.2
-  resolution: "jest-environment-node@npm:29.6.2"
+"jest-environment-node@npm:^29.6.4":
+  version: 29.6.4
+  resolution: "jest-environment-node@npm:29.6.4"
   dependencies:
-    "@jest/environment": ^29.6.2
-    "@jest/fake-timers": ^29.6.2
-    "@jest/types": ^29.6.1
+    "@jest/environment": ^29.6.4
+    "@jest/fake-timers": ^29.6.4
+    "@jest/types": ^29.6.3
     "@types/node": "*"
-    jest-mock: ^29.6.2
-    jest-util: ^29.6.2
-  checksum: 0b754ac2d3bdb7ce5d6fc28595b9d1c64176f20506b6f773b18b0280ab0b396ed7d927c8519779d3c560fa2b13236ee7077092ccb19a13bea23d40dd30f06450
+    jest-mock: ^29.6.3
+    jest-util: ^29.6.3
+  checksum: 518221505af4bd32c84f2af2c03f9d771de2711bd69fe7723b648fcc2e05d95b4e75f493afa9010209e26a4a3309ebee971f9b18c45b540891771d3b68c3a16e
   languageName: node
   linkType: hard
 
-"jest-get-type@npm:^29.4.3":
-  version: 29.4.3
-  resolution: "jest-get-type@npm:29.4.3"
-  checksum: 6ac7f2dde1c65e292e4355b6c63b3a4897d7e92cb4c8afcf6d397f2682f8080e094c8b0b68205a74d269882ec06bf696a9de6cd3e1b7333531e5ed7b112605ce
+"jest-get-type@npm:^29.6.3":
+  version: 29.6.3
+  resolution: "jest-get-type@npm:29.6.3"
+  checksum: 88ac9102d4679d768accae29f1e75f592b760b44277df288ad76ce5bf038c3f5ce3719dea8aa0f035dac30e9eb034b848ce716b9183ad7cc222d029f03e92205
   languageName: node
   linkType: hard
 
-"jest-haste-map@npm:^29.6.2":
-  version: 29.6.2
-  resolution: "jest-haste-map@npm:29.6.2"
+"jest-haste-map@npm:^29.6.4":
+  version: 29.6.4
+  resolution: "jest-haste-map@npm:29.6.4"
   dependencies:
-    "@jest/types": ^29.6.1
+    "@jest/types": ^29.6.3
     "@types/graceful-fs": ^4.1.3
     "@types/node": "*"
     anymatch: ^3.0.3
     fb-watchman: ^2.0.0
     fsevents: ^2.3.2
     graceful-fs: ^4.2.9
-    jest-regex-util: ^29.4.3
-    jest-util: ^29.6.2
-    jest-worker: ^29.6.2
+    jest-regex-util: ^29.6.3
+    jest-util: ^29.6.3
+    jest-worker: ^29.6.4
     micromatch: ^4.0.4
     walker: ^1.0.8
   dependenciesMeta:
     fsevents:
       optional: true
-  checksum: 726233972030eb2e5bce6c9468e497310436b455c88b40e744bd053e20a6f3ff19aec340edcbd89537c629ed5cf8916506bc895d690cc39a0862c74dcd95b7b8
+  checksum: 4f720fd3813bb38400b7a9a094e55664cbddd907ba1769457ed746f6c870c615167647a5b697a788183d832b1dcb1b66143e52990a6f4403283f6686077fa868
   languageName: node
   linkType: hard
 
-"jest-leak-detector@npm:^29.6.2":
-  version: 29.6.2
-  resolution: "jest-leak-detector@npm:29.6.2"
+"jest-leak-detector@npm:^29.6.3":
+  version: 29.6.3
+  resolution: "jest-leak-detector@npm:29.6.3"
   dependencies:
-    jest-get-type: ^29.4.3
-    pretty-format: ^29.6.2
-  checksum: e00152acdba8aa8f9334775b77375947508051c34646fbeb702275da2b6ac6145f8cad6d5893112e76484d00fa8c0b4fd71b78ab0b4ef34950f5b6a84f37ae67
+    jest-get-type: ^29.6.3
+    pretty-format: ^29.6.3
+  checksum: 27548fcfc7602fe1b88f8600185e35ffff71751f3631e52bbfdfc72776f5a13a430185cf02fc632b41320a74f99ae90e40ce101c8887509f0f919608a7175129
   languageName: node
   linkType: hard
 
-"jest-matcher-utils@npm:^29.6.2":
-  version: 29.6.2
-  resolution: "jest-matcher-utils@npm:29.6.2"
+"jest-matcher-utils@npm:^29.6.4":
+  version: 29.6.4
+  resolution: "jest-matcher-utils@npm:29.6.4"
   dependencies:
     chalk: ^4.0.0
-    jest-diff: ^29.6.2
-    jest-get-type: ^29.4.3
-    pretty-format: ^29.6.2
-  checksum: 3e1b65dd30d05f75fe56dc45fbe4135aec2ff96a3d1e21afbf6a66f3a45a7e29cd0fd37cf80b9564e0381d6205833f77ccaf766c6f7e1aad6b7924d117be504e
+    jest-diff: ^29.6.4
+    jest-get-type: ^29.6.3
+    pretty-format: ^29.6.3
+  checksum: 9e17bce282e74bdbba2ce5475c490e0bba4f464cd42132bfc5df0337e0853af4dba925c7f4f61cbb0a4818fa121d28d7ff0196ec8829773a22fce59a822976d2
   languageName: node
   linkType: hard
 
-"jest-message-util@npm:^29.6.2":
-  version: 29.6.2
-  resolution: "jest-message-util@npm:29.6.2"
+"jest-message-util@npm:^29.6.3":
+  version: 29.6.3
+  resolution: "jest-message-util@npm:29.6.3"
   dependencies:
     "@babel/code-frame": ^7.12.13
-    "@jest/types": ^29.6.1
+    "@jest/types": ^29.6.3
     "@types/stack-utils": ^2.0.0
     chalk: ^4.0.0
     graceful-fs: ^4.2.9
     micromatch: ^4.0.4
-    pretty-format: ^29.6.2
+    pretty-format: ^29.6.3
     slash: ^3.0.0
     stack-utils: ^2.0.3
-  checksum: e8e3c8d2301e2ca4038ed6df8cbba7fedc6949d1ede4c0e3f1f44f53afb56d77eb35983fa460140d0eadeab99a5f3ae04b703fe77cd7b316b40b361228b5aa1a
+  checksum: 59f5229a06c073a8877ba4d2e304cc07d63b0062bf5764d4bed14364403889e77f1825d1bd9017c19a840847d17dffd414dc06f1fcb537b5f9e03dbc65b84ada
   languageName: node
   linkType: hard
 
-"jest-mock@npm:^29.6.2":
-  version: 29.6.2
-  resolution: "jest-mock@npm:29.6.2"
+"jest-mock@npm:^29.6.3":
+  version: 29.6.3
+  resolution: "jest-mock@npm:29.6.3"
   dependencies:
-    "@jest/types": ^29.6.1
+    "@jest/types": ^29.6.3
     "@types/node": "*"
-    jest-util: ^29.6.2
-  checksum: 0bacb5d58441462c0e531ec4d2f7377eecbe21f664d8a460e72f94ba61d22635028931678e7a0f1c3e3f5894973db8e409432f7db4c01283456c8fdbd85f5b3b
+    jest-util: ^29.6.3
+  checksum: 35772968010c0afb1bb1ef78570b9cbea907c6f967d24b4e95e1a596a1000c63d60e225fb9ddfdd5218674da4aa61d92a09927fc26310cecbbfaa8278d919e32
   languageName: node
   linkType: hard
 
@@ -10102,168 +10226,168 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-regex-util@npm:^29.4.3":
-  version: 29.4.3
-  resolution: "jest-regex-util@npm:29.4.3"
-  checksum: 96fc7fc28cd4dd73a63c13a526202c4bd8b351d4e5b68b1a2a2c88da3308c2a16e26feaa593083eb0bac38cca1aa9dd05025412e7de013ba963fb8e66af22b8a
+"jest-regex-util@npm:^29.6.3":
+  version: 29.6.3
+  resolution: "jest-regex-util@npm:29.6.3"
+  checksum: 0518beeb9bf1228261695e54f0feaad3606df26a19764bc19541e0fc6e2a3737191904607fb72f3f2ce85d9c16b28df79b7b1ec9443aa08c3ef0e9efda6f8f2a
   languageName: node
   linkType: hard
 
-"jest-resolve-dependencies@npm:^29.6.2":
-  version: 29.6.2
-  resolution: "jest-resolve-dependencies@npm:29.6.2"
+"jest-resolve-dependencies@npm:^29.6.4":
+  version: 29.6.4
+  resolution: "jest-resolve-dependencies@npm:29.6.4"
   dependencies:
-    jest-regex-util: ^29.4.3
-    jest-snapshot: ^29.6.2
-  checksum: d40ee11af2c9d2ef0dbbcf9a5b7dda37c2b86cf4e5de1705795919fd8927907569115c502116ab56de0dca576d5faa31ec9b636240333b6830a568a63004da17
+    jest-regex-util: ^29.6.3
+    jest-snapshot: ^29.6.4
+  checksum: 34f81d22cbd72203130cc14cbb66d5783d9f59fba4d366b9653f8fb4f6feeaac25d89696f2f77c700659843d5440dc92f58ad443ba05da1da46c39234866d916
   languageName: node
   linkType: hard
 
-"jest-resolve@npm:^29.6.2":
-  version: 29.6.2
-  resolution: "jest-resolve@npm:29.6.2"
+"jest-resolve@npm:^29.6.4":
+  version: 29.6.4
+  resolution: "jest-resolve@npm:29.6.4"
   dependencies:
     chalk: ^4.0.0
     graceful-fs: ^4.2.9
-    jest-haste-map: ^29.6.2
+    jest-haste-map: ^29.6.4
     jest-pnp-resolver: ^1.2.2
-    jest-util: ^29.6.2
-    jest-validate: ^29.6.2
+    jest-util: ^29.6.3
+    jest-validate: ^29.6.3
     resolve: ^1.20.0
     resolve.exports: ^2.0.0
     slash: ^3.0.0
-  checksum: 01721957e61821a576b2ded043eeab8b392166e0e6d8d680f75657737e2ea7481ff29c2716b866ccd12e743f3a8da465504b1028e78b6a3c68b9561303de7ec8
+  checksum: 5f0ef260aec79ef00e16e0ba7b27d527054e1faed08a144279cd191b5c5b71af67c52b9ddfd24aa2f563d254618ce9bf7519809f23fb2abf6c4fa375503caa28
   languageName: node
   linkType: hard
 
-"jest-runner@npm:^29.6.2":
-  version: 29.6.2
-  resolution: "jest-runner@npm:29.6.2"
+"jest-runner@npm:^29.6.4":
+  version: 29.6.4
+  resolution: "jest-runner@npm:29.6.4"
   dependencies:
-    "@jest/console": ^29.6.2
-    "@jest/environment": ^29.6.2
-    "@jest/test-result": ^29.6.2
-    "@jest/transform": ^29.6.2
-    "@jest/types": ^29.6.1
+    "@jest/console": ^29.6.4
+    "@jest/environment": ^29.6.4
+    "@jest/test-result": ^29.6.4
+    "@jest/transform": ^29.6.4
+    "@jest/types": ^29.6.3
     "@types/node": "*"
     chalk: ^4.0.0
     emittery: ^0.13.1
     graceful-fs: ^4.2.9
-    jest-docblock: ^29.4.3
-    jest-environment-node: ^29.6.2
-    jest-haste-map: ^29.6.2
-    jest-leak-detector: ^29.6.2
-    jest-message-util: ^29.6.2
-    jest-resolve: ^29.6.2
-    jest-runtime: ^29.6.2
-    jest-util: ^29.6.2
-    jest-watcher: ^29.6.2
-    jest-worker: ^29.6.2
+    jest-docblock: ^29.6.3
+    jest-environment-node: ^29.6.4
+    jest-haste-map: ^29.6.4
+    jest-leak-detector: ^29.6.3
+    jest-message-util: ^29.6.3
+    jest-resolve: ^29.6.4
+    jest-runtime: ^29.6.4
+    jest-util: ^29.6.3
+    jest-watcher: ^29.6.4
+    jest-worker: ^29.6.4
     p-limit: ^3.1.0
     source-map-support: 0.5.13
-  checksum: 46bd506a08ddf79628a509aed4105ab74c0b03727a3e24c90bbc2915531860b3da99f7ace2fd9603194440553cffac9cfb1a3b7d0ce03d5fc9c5f2d5ffbb3d3f
+  checksum: ca977dd30262171fe000de8407a3187c16e7057ddf690bcc21068155aacd4824ee927b544e0fa9f2885948b47a5123b472da41e095e3bcbdebb79f1fa2f2fc56
   languageName: node
   linkType: hard
 
-"jest-runtime@npm:^29.6.2":
-  version: 29.6.2
-  resolution: "jest-runtime@npm:29.6.2"
+"jest-runtime@npm:^29.6.4":
+  version: 29.6.4
+  resolution: "jest-runtime@npm:29.6.4"
   dependencies:
-    "@jest/environment": ^29.6.2
-    "@jest/fake-timers": ^29.6.2
-    "@jest/globals": ^29.6.2
-    "@jest/source-map": ^29.6.0
-    "@jest/test-result": ^29.6.2
-    "@jest/transform": ^29.6.2
-    "@jest/types": ^29.6.1
+    "@jest/environment": ^29.6.4
+    "@jest/fake-timers": ^29.6.4
+    "@jest/globals": ^29.6.4
+    "@jest/source-map": ^29.6.3
+    "@jest/test-result": ^29.6.4
+    "@jest/transform": ^29.6.4
+    "@jest/types": ^29.6.3
     "@types/node": "*"
     chalk: ^4.0.0
     cjs-module-lexer: ^1.0.0
     collect-v8-coverage: ^1.0.0
     glob: ^7.1.3
     graceful-fs: ^4.2.9
-    jest-haste-map: ^29.6.2
-    jest-message-util: ^29.6.2
-    jest-mock: ^29.6.2
-    jest-regex-util: ^29.4.3
-    jest-resolve: ^29.6.2
-    jest-snapshot: ^29.6.2
-    jest-util: ^29.6.2
+    jest-haste-map: ^29.6.4
+    jest-message-util: ^29.6.3
+    jest-mock: ^29.6.3
+    jest-regex-util: ^29.6.3
+    jest-resolve: ^29.6.4
+    jest-snapshot: ^29.6.4
+    jest-util: ^29.6.3
     slash: ^3.0.0
     strip-bom: ^4.0.0
-  checksum: 8e7e4486b23b01a9c407313681bed0def39680c2ae21cf01347f111983252ec3a024c56493c5411fed53633f02863eed0816099110cbe04b3889aa5babf1042d
+  checksum: 93deacd06f8f2bb808dbfb8acbcbc0b724187b3d3fffafd497a32c939bf385ca21f5a3f03eebd5b958a0e93865d0e68a0db73bd0fe16dafbd5e922558aa7b359
   languageName: node
   linkType: hard
 
-"jest-snapshot@npm:^29.6.2":
-  version: 29.6.2
-  resolution: "jest-snapshot@npm:29.6.2"
+"jest-snapshot@npm:^29.6.4":
+  version: 29.6.4
+  resolution: "jest-snapshot@npm:29.6.4"
   dependencies:
     "@babel/core": ^7.11.6
     "@babel/generator": ^7.7.2
     "@babel/plugin-syntax-jsx": ^7.7.2
     "@babel/plugin-syntax-typescript": ^7.7.2
     "@babel/types": ^7.3.3
-    "@jest/expect-utils": ^29.6.2
-    "@jest/transform": ^29.6.2
-    "@jest/types": ^29.6.1
+    "@jest/expect-utils": ^29.6.4
+    "@jest/transform": ^29.6.4
+    "@jest/types": ^29.6.3
     babel-preset-current-node-syntax: ^1.0.0
     chalk: ^4.0.0
-    expect: ^29.6.2
+    expect: ^29.6.4
     graceful-fs: ^4.2.9
-    jest-diff: ^29.6.2
-    jest-get-type: ^29.4.3
-    jest-matcher-utils: ^29.6.2
-    jest-message-util: ^29.6.2
-    jest-util: ^29.6.2
+    jest-diff: ^29.6.4
+    jest-get-type: ^29.6.3
+    jest-matcher-utils: ^29.6.4
+    jest-message-util: ^29.6.3
+    jest-util: ^29.6.3
     natural-compare: ^1.4.0
-    pretty-format: ^29.6.2
+    pretty-format: ^29.6.3
     semver: ^7.5.3
-  checksum: c1c70a9dbce7fca62ed73ac38234b4ee643e8b667acf71b4417ab67776c1188bb08b8ad450e56a2889ad182903ffd416386fa8082a477724ccf8d8c29a4c6906
+  checksum: 0c9b5ec640457fb780ac6c9b6caa814436e9e16bf744772eee3bfd055ae5f7a3085a6a09b2f30910e31915dafc3955d92357cc98189e4d5dcb417b5fdafda6e3
   languageName: node
   linkType: hard
 
-"jest-util@npm:^29.6.2":
-  version: 29.6.2
-  resolution: "jest-util@npm:29.6.2"
+"jest-util@npm:^29.6.3":
+  version: 29.6.3
+  resolution: "jest-util@npm:29.6.3"
   dependencies:
-    "@jest/types": ^29.6.1
+    "@jest/types": ^29.6.3
     "@types/node": "*"
     chalk: ^4.0.0
     ci-info: ^3.2.0
     graceful-fs: ^4.2.9
     picomatch: ^2.2.3
-  checksum: 8aedc0c80083d0cabd6c6c4f04dea1cbcac609fd7bc3b1fc05a3999291bd6e63dd52b0c806f9378d5cae28eff5a6191709a4987861001293f8d03e53984adca4
+  checksum: 7bf3ba3ac67ac6ceff7d8fdd23a86768e23ddd9133ecd9140ef87cc0c28708effabaf67a6cd45cd9d90a63d645a522ed0825d09ee59ac4c03b9c473b1fef4c7c
   languageName: node
   linkType: hard
 
-"jest-validate@npm:^29.6.2":
-  version: 29.6.2
-  resolution: "jest-validate@npm:29.6.2"
+"jest-validate@npm:^29.6.3":
+  version: 29.6.3
+  resolution: "jest-validate@npm:29.6.3"
   dependencies:
-    "@jest/types": ^29.6.1
+    "@jest/types": ^29.6.3
     camelcase: ^6.2.0
     chalk: ^4.0.0
-    jest-get-type: ^29.4.3
+    jest-get-type: ^29.6.3
     leven: ^3.1.0
-    pretty-format: ^29.6.2
-  checksum: 32648d002189c0ad8a958eace7c6b7d05ea1dc440a1b91e0f22dc1aef489899446ec80b2d527fd13713862d89dfb4606e24a3bf8a10c4ddac3c911e93b7f0374
+    pretty-format: ^29.6.3
+  checksum: caa489ed11080441c636b8035ab71bafbdc0c052b1e452855e4d2dd24ac15e497710a270ea6fc5ef8926b22c1ce4d6e07ec2dc193f0810cff5851d7a2222c045
   languageName: node
   linkType: hard
 
-"jest-watcher@npm:^29.6.2":
-  version: 29.6.2
-  resolution: "jest-watcher@npm:29.6.2"
+"jest-watcher@npm:^29.6.4":
+  version: 29.6.4
+  resolution: "jest-watcher@npm:29.6.4"
   dependencies:
-    "@jest/test-result": ^29.6.2
-    "@jest/types": ^29.6.1
+    "@jest/test-result": ^29.6.4
+    "@jest/types": ^29.6.3
     "@types/node": "*"
     ansi-escapes: ^4.2.1
     chalk: ^4.0.0
     emittery: ^0.13.1
-    jest-util: ^29.6.2
+    jest-util: ^29.6.3
     string-length: ^4.0.1
-  checksum: 14624190fc8b5fbae466a2ec81458a88c15716d99f042bb4674d53e9623d305cb2905bc1dffeda05fd1a10a05c2a83efe5ac41942477e2b15eaebb08d0aaab32
+  checksum: 13c0f96f7e9212e4f3ef2daf3e787045bdcec414061bf286eca934c7f4083fb04d38df9ced9c0edfbe15f3521ca581eb2ed6108c338a0db1f3e1def65687992f
   languageName: node
   linkType: hard
 
@@ -10278,26 +10402,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-worker@npm:^29.6.2":
-  version: 29.6.2
-  resolution: "jest-worker@npm:29.6.2"
+"jest-worker@npm:^29.6.4":
+  version: 29.6.4
+  resolution: "jest-worker@npm:29.6.4"
   dependencies:
     "@types/node": "*"
-    jest-util: ^29.6.2
+    jest-util: ^29.6.3
     merge-stream: ^2.0.0
     supports-color: ^8.0.0
-  checksum: 11035564534bf181ead80b25be138c2d42372bd5626151a3e705200d47a74fd9da3ca79f8a7b15806cdc325ad73c3d21d23acceeed99d50941589ff02915ed38
+  checksum: 05d19a5759ebfeb964036065be55ad8d8e8ddffa85d9b3a4c0b95765695efb1d8226ec824a4d8e660c38cda3389bfeb98d819f47232acf9fb0e79f553b7c0a76
   languageName: node
   linkType: hard
 
 "jest@npm:^29.5.0":
-  version: 29.6.2
-  resolution: "jest@npm:29.6.2"
+  version: 29.6.4
+  resolution: "jest@npm:29.6.4"
   dependencies:
-    "@jest/core": ^29.6.2
-    "@jest/types": ^29.6.1
+    "@jest/core": ^29.6.4
+    "@jest/types": ^29.6.3
     import-local: ^3.0.2
-    jest-cli: ^29.6.2
+    jest-cli: ^29.6.4
   peerDependencies:
     node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
   peerDependenciesMeta:
@@ -10305,7 +10429,7 @@ __metadata:
       optional: true
   bin:
     jest: bin/jest.js
-  checksum: dd63facd4e6aefc35d2c42acd7e4c9fb0d8fe4705df4b3ccedd953605424d7aa89c88af8cf4c9951752709cac081d29c35b264e1794643d5688ea724ccc9a485
+  checksum: ba28ca7a86d029bcd742bb254c0c8d0119c1e002ddae128ff6409ebabc0b29c36f69dbf3fdd326aff16e7b2500c9a918bbc6a9a5db4d966e035127242239439f
   languageName: node
   linkType: hard
 
@@ -10461,6 +10585,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"json-buffer@npm:3.0.1":
+  version: 3.0.1
+  resolution: "json-buffer@npm:3.0.1"
+  checksum: 9026b03edc2847eefa2e37646c579300a1f3a4586cfb62bf857832b60c852042d0d6ae55d1afb8926163fa54c2b01d83ae24705f34990348bdac6273a29d4581
+  languageName: node
+  linkType: hard
+
 "json-parse-better-errors@npm:^1.0.2":
   version: 1.0.2
   resolution: "json-parse-better-errors@npm:1.0.2"
@@ -10523,7 +10654,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"json5@npm:^2.1.2, json5@npm:^2.2.0, json5@npm:^2.2.2":
+"json5@npm:^2.1.2, json5@npm:^2.2.0, json5@npm:^2.2.3":
   version: 2.2.3
   resolution: "json5@npm:2.2.3"
   bin:
@@ -10578,6 +10709,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"keyv@npm:^4.5.3":
+  version: 4.5.3
+  resolution: "keyv@npm:4.5.3"
+  dependencies:
+    json-buffer: 3.0.1
+  checksum: 3ffb4d5b72b6b4b4af443bbb75ca2526b23c750fccb5ac4c267c6116888b4b65681015c2833cb20d26cf3e6e32dac6b988c77f7f022e1a571b7d90f1442257da
+  languageName: node
+  linkType: hard
+
 "killable@npm:^1.0.1":
   version: 1.0.1
   resolution: "killable@npm:1.0.1"
@@ -10606,10 +10746,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"known-css-properties@npm:^0.27.0":
-  version: 0.27.0
-  resolution: "known-css-properties@npm:0.27.0"
-  checksum: 8584fcf0526f984fe5a358af20200dec3b944373dd005dc23a3ce988895e1acd03e7d69c49533dda07d6d9b6d53990ed1119bd9d3e927f17545f8764c434a5cd
+"known-css-properties@npm:^0.28.0":
+  version: 0.28.0
+  resolution: "known-css-properties@npm:0.28.0"
+  checksum: c9e0d6948e31386e872d348eb955e9db80edd58f9d7f7fc9b072180bfb26708a629d5942d4478f66fc766fb913c4552a220950730cef85f8c3bc9830e33b00c8
   languageName: node
   linkType: hard
 
@@ -10661,46 +10801,41 @@ __metadata:
   linkType: hard
 
 "lint-staged@npm:^13.2.2":
-  version: 13.2.3
-  resolution: "lint-staged@npm:13.2.3"
+  version: 13.3.0
+  resolution: "lint-staged@npm:13.3.0"
   dependencies:
-    chalk: 5.2.0
-    cli-truncate: ^3.1.0
-    commander: ^10.0.0
-    debug: ^4.3.4
-    execa: ^7.0.0
+    chalk: 5.3.0
+    commander: 11.0.0
+    debug: 4.3.4
+    execa: 7.2.0
     lilconfig: 2.1.0
-    listr2: ^5.0.7
-    micromatch: ^4.0.5
-    normalize-path: ^3.0.0
-    object-inspect: ^1.12.3
-    pidtree: ^0.6.0
-    string-argv: ^0.3.1
-    yaml: ^2.2.2
+    listr2: 6.6.1
+    micromatch: 4.0.5
+    pidtree: 0.6.0
+    string-argv: 0.3.2
+    yaml: 2.3.1
   bin:
     lint-staged: bin/lint-staged.js
-  checksum: ff51a1e33072f488b28b938ed47323816a1ff278ef6d0e5cbe1704b292773a6c8ce945b504eae3a9b5702917a979523a741f17023e16077bd5fa35be687cc067
+  checksum: f7c146cc2849c9ce4f1d2808d990fcbdef5e0bb79e6e79cc895f53c91f5ac4dcefdb8c3465156b38a015dcb051f2795c6bda4f20a1e2f2fa654c7ba521b2d2e0
   languageName: node
   linkType: hard
 
-"listr2@npm:^5.0.7":
-  version: 5.0.8
-  resolution: "listr2@npm:5.0.8"
+"listr2@npm:6.6.1":
+  version: 6.6.1
+  resolution: "listr2@npm:6.6.1"
   dependencies:
-    cli-truncate: ^2.1.0
-    colorette: ^2.0.19
-    log-update: ^4.0.0
-    p-map: ^4.0.0
+    cli-truncate: ^3.1.0
+    colorette: ^2.0.20
+    eventemitter3: ^5.0.1
+    log-update: ^5.0.1
     rfdc: ^1.3.0
-    rxjs: ^7.8.0
-    through: ^2.3.8
-    wrap-ansi: ^7.0.0
+    wrap-ansi: ^8.1.0
   peerDependencies:
     enquirer: ">= 2.3.0 < 3"
   peerDependenciesMeta:
     enquirer:
       optional: true
-  checksum: 8be9f5632627c4df0dc33f452c98d415a49e5f1614650d3cab1b103c33e95f2a7a0e9f3e1e5de00d51bf0b4179acd8ff11b25be77dbe097cf3773c05e728d46c
+  checksum: 99600e8a51f838f7208bce7e16d6b3d91d361f13881e6aa91d0b561a9a093ddcf63b7bc2a7b47aec7fdbff9d0e8c9f68cb66e6dfe2d857e5b1df8ab045c26ce8
   languageName: node
   linkType: hard
 
@@ -10854,15 +10989,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"log-update@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "log-update@npm:4.0.0"
+"log-update@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "log-update@npm:5.0.1"
   dependencies:
-    ansi-escapes: ^4.3.0
-    cli-cursor: ^3.1.0
-    slice-ansi: ^4.0.0
-    wrap-ansi: ^6.2.0
-  checksum: ae2f85bbabc1906034154fb7d4c4477c79b3e703d22d78adee8b3862fa913942772e7fa11713e3d96fb46de4e3cabefbf5d0a544344f03b58d3c4bff52aa9eb2
+    ansi-escapes: ^5.0.0
+    cli-cursor: ^4.0.0
+    slice-ansi: ^5.0.0
+    strip-ansi: ^7.0.1
+    wrap-ansi: ^8.0.1
+  checksum: 2c6b47dcce6f9233df6d232a37d9834cb3657a0749ef6398f1706118de74c55f158587d4128c225297ea66803f35c5ac3db4f3f617046d817233c45eedc32ef1
   languageName: node
   linkType: hard
 
@@ -10935,11 +11071,11 @@ __metadata:
   linkType: hard
 
 "magic-string@npm:^0.30.0":
-  version: 0.30.2
-  resolution: "magic-string@npm:0.30.2"
+  version: 0.30.3
+  resolution: "magic-string@npm:0.30.3"
   dependencies:
     "@jridgewell/sourcemap-codec": ^1.4.15
-  checksum: c0bbb9b27b2772e6bfaa5d0f6452d47c462d588ae7c43fbaac062b07836d3ec0140fcdd42a57aa53ed990abafcdd0fc17907813921b5df04eccf43e67674bc57
+  checksum: a5a9ddf9bd3bf49a2de1048bf358464f1bda7b3cc1311550f4a0ba8f81a4070e25445d53a5ee28850161336f1bff3cf28aa3320c6b4aeff45ce3e689f300b2f3
   languageName: node
   linkType: hard
 
@@ -11165,6 +11301,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"micromatch@npm:4.0.5, micromatch@npm:^4.0.4, micromatch@npm:^4.0.5":
+  version: 4.0.5
+  resolution: "micromatch@npm:4.0.5"
+  dependencies:
+    braces: ^3.0.2
+    picomatch: ^2.3.1
+  checksum: 02a17b671c06e8fefeeb6ef996119c1e597c942e632a21ef589154f23898c9c6a9858526246abb14f8bca6e77734aa9dcf65476fca47cedfb80d9577d52843fc
+  languageName: node
+  linkType: hard
+
 "micromatch@npm:^3.0.4, micromatch@npm:^3.1.10, micromatch@npm:^3.1.4":
   version: 3.1.10
   resolution: "micromatch@npm:3.1.10"
@@ -11186,16 +11332,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"micromatch@npm:^4.0.4, micromatch@npm:^4.0.5":
-  version: 4.0.5
-  resolution: "micromatch@npm:4.0.5"
-  dependencies:
-    braces: ^3.0.2
-    picomatch: ^2.3.1
-  checksum: 02a17b671c06e8fefeeb6ef996119c1e597c942e632a21ef589154f23898c9c6a9858526246abb14f8bca6e77734aa9dcf65476fca47cedfb80d9577d52843fc
-  languageName: node
-  linkType: hard
-
 "miller-rabin@npm:^4.0.0":
   version: 4.0.1
   resolution: "miller-rabin@npm:4.0.1"
@@ -11345,17 +11481,17 @@ __metadata:
   linkType: hard
 
 "minipass-fetch@npm:^3.0.0":
-  version: 3.0.3
-  resolution: "minipass-fetch@npm:3.0.3"
+  version: 3.0.4
+  resolution: "minipass-fetch@npm:3.0.4"
   dependencies:
     encoding: ^0.1.13
-    minipass: ^5.0.0
+    minipass: ^7.0.3
     minipass-sized: ^1.0.3
     minizlib: ^2.1.2
   dependenciesMeta:
     encoding:
       optional: true
-  checksum: af5ab2552a16fcf505d35fd7ffb84b57f4a0eeb269e6e1d9a2a75824dda48b36e527083250b7cca4a4def21d9544e2ade441e4730e233c0bc2133f6abda31e18
+  checksum: af7aad15d5c128ab1ebe52e043bdf7d62c3c6f0cecb9285b40d7b395e1375b45dcdfd40e63e93d26a0e8249c9efd5c325c65575aceee192883970ff8cb11364a
   languageName: node
   linkType: hard
 
@@ -11402,7 +11538,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0":
+"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0, minipass@npm:^7.0.3":
   version: 7.0.3
   resolution: "minipass@npm:7.0.3"
   checksum: 6f1614f5b5b55568a46bca5fec0e7c46dac027691db27d0e1923a8192866903144cd962ac772c0e9f89b608ea818b702709c042bce98e190d258847d85461531
@@ -11549,13 +11685,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"natural-compare-lite@npm:^1.4.0":
-  version: 1.4.0
-  resolution: "natural-compare-lite@npm:1.4.0"
-  checksum: 5222ac3986a2b78dd6069ac62cbb52a7bf8ffc90d972ab76dfe7b01892485d229530ed20d0c62e79a6b363a663b273db3bde195a1358ce9e5f779d4453887225
-  languageName: node
-  linkType: hard
-
 "natural-compare@npm:^1.4.0":
   version: 1.4.0
   resolution: "natural-compare@npm:1.4.0"
@@ -11585,8 +11714,8 @@ __metadata:
   linkType: hard
 
 "node-fetch@npm:^2.6.0":
-  version: 2.6.12
-  resolution: "node-fetch@npm:2.6.12"
+  version: 2.7.0
+  resolution: "node-fetch@npm:2.7.0"
   dependencies:
     whatwg-url: ^5.0.0
   peerDependencies:
@@ -11594,7 +11723,7 @@ __metadata:
   peerDependenciesMeta:
     encoding:
       optional: true
-  checksum: 3bc1655203d47ee8e313c0d96664b9673a3d4dd8002740318e9d27d14ef306693a4b2ef8d6525775056fd912a19e23f3ac0d7111ad8925877b7567b29a625592
+  checksum: d76d2f5edb451a3f05b15115ec89fc6be39de37c6089f1b6368df03b91e1633fd379a7e01b7ab05089a25034b2023d959b47e59759cb38d88341b2459e89d6e5
   languageName: node
   linkType: hard
 
@@ -11606,13 +11735,13 @@ __metadata:
   linkType: hard
 
 "node-gyp-build@npm:^4.3.0":
-  version: 4.6.0
-  resolution: "node-gyp-build@npm:4.6.0"
+  version: 4.6.1
+  resolution: "node-gyp-build@npm:4.6.1"
   bin:
     node-gyp-build: bin.js
     node-gyp-build-optional: optional.js
     node-gyp-build-test: build-test.js
-  checksum: 25d78c5ef1f8c24291f4a370c47ba52fcea14f39272041a90a7894cd50d766f7c8cb8fb06c0f42bf6f69b204b49d9be3c8fc344aac09714d5bdb95965499eb15
+  checksum: c3676d337b36803bc7792e35bf7fdcda7cdcb7e289b8f9855a5535702a82498eb976842fefcf487258c58005ca32ce3d537fbed91280b04409161dcd7232a882
   languageName: node
   linkType: hard
 
@@ -11902,6 +12031,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"object.groupby@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "object.groupby@npm:1.0.0"
+  dependencies:
+    call-bind: ^1.0.2
+    define-properties: ^1.2.0
+    es-abstract: ^1.21.2
+    get-intrinsic: ^1.2.1
+  checksum: 64b00b287d57580111c958e7ff375c9b61811fa356f2cf0d35372d43cab61965701f00fac66c19fd8f49c4dfa28744bee6822379c69a73648ad03e09fcdeae70
+  languageName: node
+  linkType: hard
+
 "object.hasown@npm:^1.1.2":
   version: 1.1.2
   resolution: "object.hasown@npm:1.1.2"
@@ -12414,8 +12555,8 @@ __metadata:
   linkType: hard
 
 "pg@npm:^8.5.0":
-  version: 8.11.2
-  resolution: "pg@npm:8.11.2"
+  version: 8.11.3
+  resolution: "pg@npm:8.11.3"
   dependencies:
     buffer-writer: 2.0.0
     packet-reader: 1.0.0
@@ -12433,7 +12574,7 @@ __metadata:
   peerDependenciesMeta:
     pg-native:
       optional: true
-  checksum: dfea8a2269d500dee8c17291207e5a25897163480037beb7a59be35f51e33b519c297c943ea6898b285d6a74a0d661901dc9cff2e587cc4be0bbf09b833a71a5
+  checksum: 8af9468b8969fa0d73a6b349216c8cbc953d938fcae5594f2d24043060e9226a072c8085fc4230172b5576fcab4c39c8563c655f271dc2a9209b6ad5370cafe5
   languageName: node
   linkType: hard
 
@@ -12460,7 +12601,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pidtree@npm:^0.6.0":
+"pidtree@npm:0.6.0":
   version: 0.6.0
   resolution: "pidtree@npm:0.6.0"
   bin:
@@ -12914,11 +13055,11 @@ __metadata:
   linkType: hard
 
 "postcss-scss@npm:^4.0.6":
-  version: 4.0.6
-  resolution: "postcss-scss@npm:4.0.6"
+  version: 4.0.7
+  resolution: "postcss-scss@npm:4.0.7"
   peerDependencies:
     postcss: ^8.4.19
-  checksum: 133a1cba31e2e167f4e841e66ec6a798eaf44c7911f9182ade0b5b1e71a8198814aa390b8c9d5db6b01358115232e5b15b1a4f8c5198acfccfb1f3fdbd328cdf
+  checksum: 579aa6807bf4934dd9bd3f8a257736c1121e189f2aa23853512e2a1be1005bac0136020d08e626998bcd3537080a1403f7a03a8cae277f3e0e314eb3c779db9c
   languageName: node
   linkType: hard
 
@@ -12962,14 +13103,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss@npm:^8.2.15, postcss@npm:^8.4.24, postcss@npm:^8.4.25":
-  version: 8.4.27
-  resolution: "postcss@npm:8.4.27"
+"postcss@npm:^8.2.15, postcss@npm:^8.4.24, postcss@npm:^8.4.27":
+  version: 8.4.28
+  resolution: "postcss@npm:8.4.28"
   dependencies:
     nanoid: ^3.3.6
     picocolors: ^1.0.0
     source-map-js: ^1.0.2
-  checksum: 1cdd0c298849df6cd65f7e646a3ba36870a37b65f55fd59d1a165539c263e9b4872a402bf4ed1ca1bc31f58b68b2835545e33ea1a23b161a1f8aa6d5ded81e78
+  checksum: f605c24a36f7e400bad379735fbfc893ccb8d293ad6d419bb824db77cdcb69f43d614ef35f9f7091f32ca588d130ec60dbcf53b366e6bf88a8a64bbeb3c05f6d
   languageName: node
   linkType: hard
 
@@ -13057,11 +13198,11 @@ __metadata:
   linkType: hard
 
 "prettier@npm:^3.0.0":
-  version: 3.0.1
-  resolution: "prettier@npm:3.0.1"
+  version: 3.0.2
+  resolution: "prettier@npm:3.0.2"
   bin:
     prettier: bin/prettier.cjs
-  checksum: e1f3f16c7fe0495de3faa182597871f74927d787cce3c52095a66ff5d7eacc05173371d5f58bf12141a0a1b6bfe739a338531d6cf18b92c7256c1319f2c84e73
+  checksum: 118b59ddb6c80abe2315ab6d0f4dd1b253be5cfdb20622fa5b65bb1573dcd362e6dd3dcf2711dd3ebfe64aecf7bdc75de8a69dc2422dcd35bdde7610586b677a
   languageName: node
   linkType: hard
 
@@ -13083,14 +13224,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pretty-format@npm:^29.0.0, pretty-format@npm:^29.6.2":
-  version: 29.6.2
-  resolution: "pretty-format@npm:29.6.2"
+"pretty-format@npm:^29.0.0, pretty-format@npm:^29.6.3":
+  version: 29.6.3
+  resolution: "pretty-format@npm:29.6.3"
   dependencies:
-    "@jest/schemas": ^29.6.0
+    "@jest/schemas": ^29.6.3
     ansi-styles: ^5.0.0
     react-is: ^18.0.0
-  checksum: a0f972a44f959023c0df9cdfe9eed7540264d7f7ddf74667db8a5294444d5aa153fd47d20327df10ae86964e2ceec10e46ea06b1a5c9c12e02348b78c952c9fc
+  checksum: 4e1c0db48e65571c22e80ff92123925ff8b3a2a89b71c3a1683cfde711004d492de32fe60c6bc10eea8bf6c678e5cbe544ac6c56cb8096e1eb7caf856928b1c4
   languageName: node
   linkType: hard
 
@@ -13108,6 +13249,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"prom-client@npm:^14.2.0":
+  version: 14.2.0
+  resolution: "prom-client@npm:14.2.0"
+  dependencies:
+    tdigest: ^0.1.1
+  checksum: d4c04e57616c72643dd02862d0d4bde09cf8869a19d0aef5e7b785e6e27d02439b66cdc165e3492f62d579fa91579183820870cc757a09b99399d2d02f46b9f1
+  languageName: node
+  linkType: hard
+
 "promise-inflight@npm:^1.0.1":
   version: 1.0.1
   resolution: "promise-inflight@npm:1.0.1"
@@ -13702,15 +13852,15 @@ __metadata:
   linkType: hard
 
 "react-textarea-autosize@npm:*, react-textarea-autosize@npm:^8.4.1":
-  version: 8.5.2
-  resolution: "react-textarea-autosize@npm:8.5.2"
+  version: 8.5.3
+  resolution: "react-textarea-autosize@npm:8.5.3"
   dependencies:
     "@babel/runtime": ^7.20.13
     use-composed-ref: ^1.3.0
     use-latest: ^1.2.1
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: 48504e1c7bea01ea9632a2f663271519693926bb4dbdba7f7353178078df95a877fb298ff56e8ba41a324b212da2b3df13524de54c6a32a2de8241e46dceba98
+  checksum: b317c3763f37a89621bbafd0e6e2d068e7876790a5ae77f497adfd6ba9334ceea138c8a0b7d907bae0f79c765cb24e8b2ca2b8033b4144c0bce28571a3658921
   languageName: node
   linkType: hard
 
@@ -13854,16 +14004,16 @@ __metadata:
   linkType: hard
 
 "redis@npm:^4.6.5":
-  version: 4.6.7
-  resolution: "redis@npm:4.6.7"
+  version: 4.6.8
+  resolution: "redis@npm:4.6.8"
   dependencies:
     "@redis/bloom": 1.2.0
-    "@redis/client": 1.5.8
+    "@redis/client": 1.5.9
     "@redis/graph": 1.1.0
     "@redis/json": 1.0.4
     "@redis/search": 1.1.3
-    "@redis/time-series": 1.0.4
-  checksum: d48ff22269d9f22962b40ecd7623c10ad18a26aaffea0987cf80d9ba4f5d72708c6d2782062e6fc1f4255e6aa111b3356e48f636ef26aa0cc75864470d1e60f8
+    "@redis/time-series": 1.0.5
+  checksum: 1626d0d739e5f2047824b77b472967af5938fba488a039bd0a5ad90814eb81cb29b7939e16adf0bc39b133165ec1bf147e4f944d0c54a2f9c32c8f004b015940
   languageName: node
   linkType: hard
 
@@ -13894,6 +14044,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"reflect.getprototypeof@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "reflect.getprototypeof@npm:1.0.3"
+  dependencies:
+    call-bind: ^1.0.2
+    define-properties: ^1.1.4
+    es-abstract: ^1.20.4
+    get-intrinsic: ^1.1.1
+    globalthis: ^1.0.3
+    which-builtin-type: ^1.1.3
+  checksum: 843e2506c013da66f83635f943c5bd41243bc6c7703298531cfb16eb6baaefd92f83031fa37140ad31c4edc86938b6eb385e6fc85bf1628e79348ed49e044f3d
+  languageName: node
+  linkType: hard
+
 "regenerate-unicode-properties@npm:^10.1.0":
   version: 10.1.0
   resolution: "regenerate-unicode-properties@npm:10.1.0"
@@ -13917,7 +14081,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"regenerator-runtime@npm:^0.13.11, regenerator-runtime@npm:^0.13.3":
+"regenerator-runtime@npm:^0.13.3":
   version: 0.13.11
   resolution: "regenerator-runtime@npm:0.13.11"
   checksum: 27481628d22a1c4e3ff551096a683b424242a216fee44685467307f14d58020af1e19660bf2e26064de946bad7eff28950eae9f8209d55723e2d9351e632bbb4
@@ -14133,7 +14297,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@npm:^1.14.2, resolve@npm:^1.19.0, resolve@npm:^1.20.0, resolve@npm:^1.22.1, resolve@npm:^1.22.4":
+"resolve@npm:^1.14.2, resolve@npm:^1.19.0, resolve@npm:^1.20.0, resolve@npm:^1.22.4":
   version: 1.22.4
   resolution: "resolve@npm:1.22.4"
   dependencies:
@@ -14159,7 +14323,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@patch:resolve@^1.14.2#~builtin<compat/resolve>, resolve@patch:resolve@^1.19.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.20.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.1#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.4#~builtin<compat/resolve>":
+"resolve@patch:resolve@^1.14.2#~builtin<compat/resolve>, resolve@patch:resolve@^1.19.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.20.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.4#~builtin<compat/resolve>":
   version: 1.22.4
   resolution: "resolve@patch:resolve@npm%3A1.22.4#~builtin<compat/resolve>::version=1.22.4&hash=c3c19d"
   dependencies:
@@ -14185,13 +14349,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"restore-cursor@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "restore-cursor@npm:3.1.0"
+"restore-cursor@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "restore-cursor@npm:4.0.0"
   dependencies:
     onetime: ^5.1.0
     signal-exit: ^3.0.2
-  checksum: f877dd8741796b909f2a82454ec111afb84eb45890eb49ac947d87991379406b3b83ff9673a46012fca0d7844bb989f45cc5b788254cf1a39b6b5a9659de0630
+  checksum: 5b675c5a59763bf26e604289eab35711525f11388d77f409453904e1e69c0d37ae5889295706b2c81d23bd780165084d040f9b68fffc32cc921519031c4fa4af
   languageName: node
   linkType: hard
 
@@ -14319,15 +14483,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rxjs@npm:^7.8.0":
-  version: 7.8.1
-  resolution: "rxjs@npm:7.8.1"
-  dependencies:
-    tslib: ^2.1.0
-  checksum: de4b53db1063e618ec2eca0f7965d9137cabe98cf6be9272efe6c86b47c17b987383df8574861bcced18ebd590764125a901d5506082be84a8b8e364bf05f119
-  languageName: node
-  linkType: hard
-
 "safe-array-concat@npm:^1.0.0":
   version: 1.0.0
   resolution: "safe-array-concat@npm:1.0.0"
@@ -14407,15 +14562,15 @@ __metadata:
   linkType: hard
 
 "sass@npm:^1.62.1":
-  version: 1.65.1
-  resolution: "sass@npm:1.65.1"
+  version: 1.66.1
+  resolution: "sass@npm:1.66.1"
   dependencies:
     chokidar: ">=3.0.0 <4.0.0"
     immutable: ^4.0.0
     source-map-js: ">=0.6.2 <2.0.0"
   bin:
     sass: sass.js
-  checksum: 33e325fc80cd07489992e0814cd4929496f87493ffe78c423c2dbafa5746a574e6f3bde20c2a3e4ea47b16ee3d6bc5afcf1d36b405227b829d6c4c9ddcc7f8e2
+  checksum: 74fc11d0fcd5e16c5331b57dd59865705a299c64e89f2b99646869caeb011dc8d0b6144a6c74a90c264e9ef70654207dbf44fc9b7e3393f8bd14809b904c8a52
   languageName: node
   linkType: hard
 
@@ -14748,17 +14903,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"slice-ansi@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "slice-ansi@npm:3.0.0"
-  dependencies:
-    ansi-styles: ^4.0.0
-    astral-regex: ^2.0.0
-    is-fullwidth-code-point: ^3.0.0
-  checksum: 5ec6d022d12e016347e9e3e98a7eb2a592213a43a65f1b61b74d2c78288da0aded781f665807a9f3876b9daa9ad94f64f77d7633a0458876c3a4fdc4eb223f24
-  languageName: node
-  linkType: hard
-
 "slice-ansi@npm:^4.0.0":
   version: 4.0.0
   resolution: "slice-ansi@npm:4.0.0"
@@ -15051,11 +15195,11 @@ __metadata:
   linkType: hard
 
 "ssri@npm:^10.0.0":
-  version: 10.0.4
-  resolution: "ssri@npm:10.0.4"
+  version: 10.0.5
+  resolution: "ssri@npm:10.0.5"
   dependencies:
-    minipass: ^5.0.0
-  checksum: fb14da9f8a72b04eab163eb13a9dda11d5962cd2317f85457c4e0b575e9a6e0e3a6a87b5bf122c75cb36565830cd5f263fb457571bf6f1587eb5f95d095d6165
+    minipass: ^7.0.3
+  checksum: 0a31b65f21872dea1ed3f7c200d7bc1c1b91c15e419deca14f282508ba917cbb342c08a6814c7f68ca4ca4116dd1a85da2bbf39227480e50125a1ceffeecb750
   languageName: node
   linkType: hard
 
@@ -15177,7 +15321,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"string-argv@npm:^0.3.1":
+"string-argv@npm:0.3.2":
   version: 0.3.2
   resolution: "string-argv@npm:0.3.2"
   checksum: 8703ad3f3db0b2641ed2adbb15cf24d3945070d9a751f9e74a924966db9f325ac755169007233e8985a39a6a292f14d4fee20482989b89b96e473c4221508a0f
@@ -15504,12 +15648,12 @@ __metadata:
   linkType: hard
 
 "stylelint@npm:^15.10.1":
-  version: 15.10.2
-  resolution: "stylelint@npm:15.10.2"
+  version: 15.10.3
+  resolution: "stylelint@npm:15.10.3"
   dependencies:
-    "@csstools/css-parser-algorithms": ^2.3.0
-    "@csstools/css-tokenizer": ^2.1.1
-    "@csstools/media-query-list-parser": ^2.1.2
+    "@csstools/css-parser-algorithms": ^2.3.1
+    "@csstools/css-tokenizer": ^2.2.0
+    "@csstools/media-query-list-parser": ^2.1.4
     "@csstools/selector-specificity": ^3.0.0
     balanced-match: ^2.0.0
     colord: ^2.9.3
@@ -15517,7 +15661,7 @@ __metadata:
     css-functions-list: ^3.2.0
     css-tree: ^2.3.1
     debug: ^4.3.4
-    fast-glob: ^3.3.0
+    fast-glob: ^3.3.1
     fastest-levenshtein: ^1.0.16
     file-entry-cache: ^6.0.1
     global-modules: ^2.0.0
@@ -15528,13 +15672,13 @@ __metadata:
     import-lazy: ^4.0.0
     imurmurhash: ^0.1.4
     is-plain-object: ^5.0.0
-    known-css-properties: ^0.27.0
+    known-css-properties: ^0.28.0
     mathml-tag-names: ^2.1.3
     meow: ^10.1.5
     micromatch: ^4.0.5
     normalize-path: ^3.0.0
     picocolors: ^1.0.0
-    postcss: ^8.4.25
+    postcss: ^8.4.27
     postcss-resolve-nested-selector: ^0.1.1
     postcss-safe-parser: ^6.0.0
     postcss-selector-parser: ^6.0.13
@@ -15549,7 +15693,7 @@ __metadata:
     write-file-atomic: ^5.0.1
   bin:
     stylelint: bin/stylelint.mjs
-  checksum: 1a7dc0385bddc604f6633340dd3eb58dfc8860e677576d7ad688a94064140d73fd70ea21038994a9f8884457098ee297ce625bbddd9477cde35faa4bf7aff848
+  checksum: eb70dd0e4d500141f4868ddb7403ad7eb8732b02a3f2fe3907d0859369cedd395b60b0075da758b5be07de771c586b1bf64de4eead8159d46b0d16beff827e67
   languageName: node
   linkType: hard
 
@@ -15731,6 +15875,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tdigest@npm:^0.1.1":
+  version: 0.1.2
+  resolution: "tdigest@npm:0.1.2"
+  dependencies:
+    bintrees: 1.0.2
+  checksum: 44de8246752b6f8c2924685f969fd3d94c36949f22b0907e99bef2b2220726dd8467f4730ea96b06040b9aa2587c0866049640039d1b956952dfa962bc2075a3
+  languageName: node
+  linkType: hard
+
 "temp-dir@npm:^2.0.0":
   version: 2.0.0
   resolution: "temp-dir@npm:2.0.0"
@@ -15829,13 +15982,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"through@npm:^2.3.8":
-  version: 2.3.8
-  resolution: "through@npm:2.3.8"
-  checksum: a38c3e059853c494af95d50c072b83f8b676a9ba2818dcc5b108ef252230735c54e0185437618596c790bbba8fcdaef5b290405981ffa09dce67b1f1bf190cbd
-  languageName: node
-  linkType: hard
-
 "thunky@npm:^1.0.2":
   version: 1.1.0
   resolution: "thunky@npm:1.1.0"
@@ -16009,15 +16155,15 @@ __metadata:
   linkType: hard
 
 "ts-api-utils@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "ts-api-utils@npm:1.0.1"
+  version: 1.0.2
+  resolution: "ts-api-utils@npm:1.0.2"
   peerDependencies:
     typescript: ">=4.2.0"
-  checksum: 78794fc7270d295b36c1ac613465b5dc7e7226907a533125b30f177efef9dd630d4e503b00be31b44335eb2ebf9e136ebe97353f8fc5d383885d5fead9d54c09
+  checksum: 6375e12ba90b6cbe73f564405248da14c52aa44b62b386e1cbbb1da2640265dd33e99d3e019688dffa874e365cf596b161ccd49351e90638be825c2639697640
   languageName: node
   linkType: hard
 
-"tsconfig-paths@npm:^3.14.1":
+"tsconfig-paths@npm:^3.14.2":
   version: 3.14.2
   resolution: "tsconfig-paths@npm:3.14.2"
   dependencies:
@@ -16043,10 +16189,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tslib@npm:^2.1.0, tslib@npm:^2.4.0, tslib@npm:^2.5.0, tslib@npm:^2.6.0":
-  version: 2.6.1
-  resolution: "tslib@npm:2.6.1"
-  checksum: b0d176d176487905b66ae4d5856647df50e37beea7571c53b8d10ba9222c074b81f1410fb91da13debaf2cbc970663609068bdebafa844ea9d69b146527c38fe
+"tslib@npm:^2.4.0, tslib@npm:^2.5.0, tslib@npm:^2.6.0":
+  version: 2.6.2
+  resolution: "tslib@npm:2.6.2"
+  checksum: 329ea56123005922f39642318e3d1f0f8265d1e7fcb92c633e0809521da75eeaca28d2cf96d7248229deb40e5c19adf408259f4b9640afd20d13aecc1430f3ad
   languageName: node
   linkType: hard
 
@@ -16124,7 +16270,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"type-fest@npm:^1.0.1, type-fest@npm:^1.2.1, type-fest@npm:^1.2.2":
+"type-fest@npm:^1.0.1, type-fest@npm:^1.0.2, type-fest@npm:^1.2.1, type-fest@npm:^1.2.2":
   version: 1.4.0
   resolution: "type-fest@npm:1.4.0"
   checksum: b011c3388665b097ae6a109a437a04d6f61d81b7357f74cbcb02246f2f5bd72b888ae33631b99871388122ba0a87f4ff1c94078e7119ff22c70e52c0ff828201
@@ -16189,22 +16335,22 @@ __metadata:
   linkType: hard
 
 "typescript@npm:^4.7 || 5, typescript@npm:^5.0.4":
-  version: 5.1.6
-  resolution: "typescript@npm:5.1.6"
+  version: 5.2.2
+  resolution: "typescript@npm:5.2.2"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: b2f2c35096035fe1f5facd1e38922ccb8558996331405eb00a5111cc948b2e733163cc22fab5db46992aba7dd520fff637f2c1df4996ff0e134e77d3249a7350
+  checksum: 7912821dac4d962d315c36800fe387cdc0a6298dba7ec171b350b4a6e988b51d7b8f051317786db1094bd7431d526b648aba7da8236607febb26cf5b871d2d3c
   languageName: node
   linkType: hard
 
 "typescript@patch:typescript@^4.7 || 5#~builtin<compat/typescript>, typescript@patch:typescript@^5.0.4#~builtin<compat/typescript>":
-  version: 5.1.6
-  resolution: "typescript@patch:typescript@npm%3A5.1.6#~builtin<compat/typescript>::version=5.1.6&hash=1f5320"
+  version: 5.2.2
+  resolution: "typescript@patch:typescript@npm%3A5.2.2#~builtin<compat/typescript>::version=5.2.2&hash=1f5320"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 21e88b0a0c0226f9cb9fd25b9626fb05b4c0f3fddac521844a13e1f30beb8f14e90bd409a9ac43c812c5946d714d6e0dee12d5d02dfc1c562c5aacfa1f49b606
+  checksum: 07106822b4305de3f22835cbba949a2b35451cad50888759b6818421290ff95d522b38ef7919e70fb381c5fe9c1c643d7dea22c8b31652a717ddbd57b7f4d554
   languageName: node
   linkType: hard
 
@@ -16566,9 +16712,9 @@ __metadata:
   linkType: hard
 
 "v8-compile-cache@npm:^2.1.1":
-  version: 2.3.0
-  resolution: "v8-compile-cache@npm:2.3.0"
-  checksum: adb0a271eaa2297f2f4c536acbfee872d0dd26ec2d76f66921aa7fc437319132773483344207bdbeee169225f4739016d8d2dbf0553913a52bb34da6d0334f8e
+  version: 2.4.0
+  resolution: "v8-compile-cache@npm:2.4.0"
+  checksum: 8eb6ddb59d86f24566503f1e6ca98f3e6f43599f05359bd3ab737eaaf1585b338091478a4d3d5c2646632cf8030288d7888684ea62238cdce15a65ae2416718f
   languageName: node
   linkType: hard
 
@@ -16987,6 +17133,26 @@ __metadata:
   languageName: node
   linkType: hard
 
+"which-builtin-type@npm:^1.1.3":
+  version: 1.1.3
+  resolution: "which-builtin-type@npm:1.1.3"
+  dependencies:
+    function.prototype.name: ^1.1.5
+    has-tostringtag: ^1.0.0
+    is-async-function: ^2.0.0
+    is-date-object: ^1.0.5
+    is-finalizationregistry: ^1.0.2
+    is-generator-function: ^1.0.10
+    is-regex: ^1.1.4
+    is-weakref: ^1.0.2
+    isarray: ^2.0.5
+    which-boxed-primitive: ^1.0.2
+    which-collection: ^1.0.1
+    which-typed-array: ^1.1.9
+  checksum: 43730f7d8660ff9e33d1d3f9f9451c4784265ee7bf222babc35e61674a11a08e1c2925019d6c03154fcaaca4541df43abe35d2720843b9b4cbcebdcc31408f36
+  languageName: node
+  linkType: hard
+
 "which-collection@npm:^1.0.1":
   version: 1.0.1
   resolution: "which-collection@npm:1.0.1"
@@ -17291,18 +17457,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"wrap-ansi@npm:^6.2.0":
-  version: 6.2.0
-  resolution: "wrap-ansi@npm:6.2.0"
-  dependencies:
-    ansi-styles: ^4.0.0
-    string-width: ^4.1.0
-    strip-ansi: ^6.0.0
-  checksum: 6cd96a410161ff617b63581a08376f0cb9162375adeb7956e10c8cd397821f7eb2a6de24eb22a0b28401300bf228c86e50617cd568209b5f6775b93c97d2fe3a
-  languageName: node
-  linkType: hard
-
-"wrap-ansi@npm:^8.1.0":
+"wrap-ansi@npm:^8.0.1, wrap-ansi@npm:^8.1.0":
   version: 8.1.0
   resolution: "wrap-ansi@npm:8.1.0"
   dependencies:
@@ -17428,6 +17583,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"yaml@npm:2.3.1":
+  version: 2.3.1
+  resolution: "yaml@npm:2.3.1"
+  checksum: 2c7bc9a7cd4c9f40d3b0b0a98e370781b68b8b7c4515720869aced2b00d92f5da1762b4ffa947f9e795d6cd6b19f410bd4d15fdd38aca7bd96df59bd9486fb54
+  languageName: node
+  linkType: hard
+
 "yaml@npm:^1.10.0":
   version: 1.10.2
   resolution: "yaml@npm:1.10.2"
@@ -17435,13 +17597,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yaml@npm:^2.2.2":
-  version: 2.3.1
-  resolution: "yaml@npm:2.3.1"
-  checksum: 2c7bc9a7cd4c9f40d3b0b0a98e370781b68b8b7c4515720869aced2b00d92f5da1762b4ffa947f9e795d6cd6b19f410bd4d15fdd38aca7bd96df59bd9486fb54
-  languageName: node
-  linkType: hard
-
 "yargs-parser@npm:^13.1.2":
   version: 13.1.2
   resolution: "yargs-parser@npm:13.1.2"